-
Notifications
You must be signed in to change notification settings - Fork 271
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add an IDN helper Add a helper that checks the validity of labels in IDNs. All organizes TLDs according to the IDNs they support.
- Loading branch information
Showing
5 changed files
with
233 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
// Copyright 2023 The Nomulus Authors. All Rights Reserved. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package google.registry.bsa; | ||
|
||
import static com.google.common.collect.ImmutableSet.toImmutableSet; | ||
import static com.google.common.collect.Maps.transformValues; | ||
|
||
import com.google.common.annotations.VisibleForTesting; | ||
import com.google.common.collect.ImmutableMap; | ||
import com.google.common.collect.ImmutableMultimap; | ||
import com.google.common.collect.ImmutableSet; | ||
import com.google.common.collect.Sets; | ||
import com.google.common.collect.Sets.SetView; | ||
import google.registry.model.tld.Tld; | ||
import google.registry.model.tld.Tld.TldType; | ||
import google.registry.model.tld.Tlds; | ||
import google.registry.tldconfig.idn.IdnLabelValidator; | ||
import google.registry.tldconfig.idn.IdnTableEnum; | ||
import google.registry.util.Clock; | ||
import javax.inject.Inject; | ||
import org.joda.time.DateTime; | ||
|
||
/** | ||
* Checks labels' validity wrt Idns in TLDs enrolled with BSA. | ||
* | ||
* <p>Each instance takes a snapshot of the TLDs at instantiation time, and should be limited to the | ||
* Request scope. | ||
*/ | ||
public class IdnChecker { | ||
private static final IdnLabelValidator IDN_LABEL_VALIDATOR = new IdnLabelValidator(); | ||
|
||
private final ImmutableMap<IdnTableEnum, ImmutableSet<Tld>> idnToTlds; | ||
private final ImmutableSet<Tld> allTlds; | ||
|
||
@Inject | ||
IdnChecker(Clock clock) { | ||
this.idnToTlds = getIdnToTldMap(clock.nowUtc()); | ||
allTlds = idnToTlds.values().stream().flatMap(ImmutableSet::stream).collect(toImmutableSet()); | ||
} | ||
|
||
// TODO(11/30/2023): Remove below when new Tld schema is deployed and the `getBsaEnrollStartTime` | ||
// method is no longer hardcoded. | ||
@VisibleForTesting | ||
IdnChecker(ImmutableMap<IdnTableEnum, ImmutableSet<Tld>> idnToTlds) { | ||
this.idnToTlds = idnToTlds; | ||
allTlds = idnToTlds.values().stream().flatMap(ImmutableSet::stream).collect(toImmutableSet()); | ||
} | ||
|
||
/** Returns all IDNs in which the {@code label} is valid. */ | ||
ImmutableSet<IdnTableEnum> getAllValidIdns(String label) { | ||
return idnToTlds.keySet().stream() | ||
.filter(idnTable -> idnTable.getTable().isValidLabel(label)) | ||
.collect(toImmutableSet()); | ||
} | ||
|
||
/** | ||
* Returns the TLDs that support at least one IDN in the {@code idnTables}. | ||
* | ||
* @param idnTables String names of {@link IdnTableEnum} values | ||
*/ | ||
public ImmutableSet<Tld> getSupportingTlds(ImmutableSet<String> idnTables) { | ||
return idnTables.stream() | ||
.map(IdnTableEnum::valueOf) | ||
.filter(idnToTlds::containsKey) | ||
.map(idnToTlds::get) | ||
.flatMap(ImmutableSet::stream) | ||
.collect(toImmutableSet()); | ||
} | ||
|
||
/** | ||
* Returns the TLDs that do not support any IDN in the {@code idnTables}. | ||
* | ||
* @param idnTables String names of {@link IdnTableEnum} values | ||
*/ | ||
public SetView<Tld> getForbiddingTlds(ImmutableSet<String> idnTables) { | ||
return Sets.difference(allTlds, getSupportingTlds(idnTables)); | ||
} | ||
|
||
private static boolean isEnrolledWithBsa(Tld tld, DateTime now) { | ||
DateTime enrollTime = tld.getBsaEnrollStartTime(); | ||
return enrollTime != null && enrollTime.isBefore(now); | ||
} | ||
|
||
private static ImmutableMap<IdnTableEnum, ImmutableSet<Tld>> getIdnToTldMap(DateTime now) { | ||
ImmutableMultimap.Builder<IdnTableEnum, Tld> idnToTldMap = new ImmutableMultimap.Builder(); | ||
Tlds.getTldEntitiesOfType(TldType.REAL).stream() | ||
.filter(tld -> isEnrolledWithBsa(tld, now)) | ||
.forEach( | ||
tld -> { | ||
for (IdnTableEnum idn : IDN_LABEL_VALIDATOR.getIdnTablesForTld(tld)) { | ||
idnToTldMap.put(idn, tld); | ||
} | ||
}); | ||
return ImmutableMap.copyOf(transformValues(idnToTldMap.build().asMap(), ImmutableSet::copyOf)); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
core/src/test/java/google/registry/bsa/IdnCheckerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
// Copyright 2023 The Nomulus Authors. All Rights Reserved. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package google.registry.bsa; | ||
|
||
import static com.google.common.truth.Truth.assertThat; | ||
import static google.registry.tldconfig.idn.IdnTableEnum.EXTENDED_LATIN; | ||
import static google.registry.tldconfig.idn.IdnTableEnum.JA; | ||
import static google.registry.tldconfig.idn.IdnTableEnum.UNCONFUSABLE_LATIN; | ||
|
||
import com.google.common.collect.ImmutableMap; | ||
import com.google.common.collect.ImmutableSet; | ||
import google.registry.model.tld.Tld; | ||
import org.junit.jupiter.api.BeforeEach; | ||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.ExtendWith; | ||
import org.mockito.Mock; | ||
import org.mockito.junit.jupiter.MockitoExtension; | ||
|
||
@ExtendWith(MockitoExtension.class) | ||
public class IdnCheckerTest { | ||
|
||
@Mock Tld jaonly; | ||
@Mock Tld jandelatin; | ||
@Mock Tld strictlatin; | ||
IdnChecker idnChecker; | ||
|
||
@BeforeEach | ||
void setup() { | ||
idnChecker = | ||
new IdnChecker( | ||
ImmutableMap.of( | ||
JA, | ||
ImmutableSet.of(jandelatin, jaonly), | ||
EXTENDED_LATIN, | ||
ImmutableSet.of(jandelatin), | ||
UNCONFUSABLE_LATIN, | ||
ImmutableSet.of(strictlatin))); | ||
} | ||
|
||
@Test | ||
void getAllValidIdns_allTlds() { | ||
assertThat(idnChecker.getAllValidIdns("all")) | ||
.containsExactly(EXTENDED_LATIN, JA, UNCONFUSABLE_LATIN); | ||
} | ||
|
||
@Test | ||
void getAllValidIdns_notJa() { | ||
assertThat(idnChecker.getAllValidIdns("à")).containsExactly(EXTENDED_LATIN, UNCONFUSABLE_LATIN); | ||
} | ||
|
||
@Test | ||
void getAllValidIdns_extendedLatinOnly() { | ||
assertThat(idnChecker.getAllValidIdns("á")).containsExactly(EXTENDED_LATIN); | ||
} | ||
|
||
@Test | ||
void getAllValidIdns_jaOnly() { | ||
assertThat(idnChecker.getAllValidIdns("っ")).containsExactly(JA); | ||
} | ||
|
||
@Test | ||
void getAllValidIdns_none() { | ||
assertThat(idnChecker.getAllValidIdns("д")).isEmpty(); | ||
} | ||
|
||
@Test | ||
void getSupportingTlds_singleTld_success() { | ||
assertThat(idnChecker.getSupportingTlds(ImmutableSet.of("EXTENDED_LATIN"))) | ||
.containsExactly(jandelatin); | ||
} | ||
|
||
@Test | ||
void getSupportingTlds_multiTld_success() { | ||
assertThat(idnChecker.getSupportingTlds(ImmutableSet.of("JA"))) | ||
.containsExactly(jandelatin, jaonly); | ||
} | ||
|
||
@Test | ||
void getForbiddingTlds_success() { | ||
assertThat(idnChecker.getForbiddingTlds(ImmutableSet.of("JA"))).containsExactly(strictlatin); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters