Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 27 additions & 16 deletions core/src/main/java/google/registry/bsa/persistence/Queries.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import java.time.Instant;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/** Helpers for querying BSA JPA entities. */
Expand Down Expand Up @@ -114,21 +113,33 @@ static ImmutableList<BsaUnblockableDomain> batchReadUnblockables(
}

static ImmutableSet<String> queryUnblockablesByNames(ImmutableSet<String> domains) {
String labelTldParis =
domains.stream()
.map(
domain -> {
List<String> parts = DOMAIN_SPLITTER.splitToList(domain);
verify(parts.size() == 2, "Invalid domain name %s", domain);
return String.format("('%s','%s')", parts.get(0), parts.get(1));
})
.collect(Collectors.joining(","));
String sql =
String.format(
"SELECT CONCAT(d.label, '.', d.tld) FROM \"BsaUnblockableDomain\" d "
+ "WHERE (d.label, d.tld) IN (%s)",
labelTldParis);
return ImmutableSet.copyOf(tm().getEntityManager().createNativeQuery(sql).getResultList());
if (domains.isEmpty()) {
return ImmutableSet.of();
}
ImmutableList<String> domainList = ImmutableList.copyOf(domains);
StringBuilder sqlBuilder =
new StringBuilder(
"SELECT CONCAT(d.label, '.', d.tld) FROM \"BsaUnblockableDomain\" d WHERE (d.label,"
+ " d.tld) IN (");
for (int i = 0; i < domainList.size(); i++) {
if (i > 0) {
sqlBuilder.append(",");
}
sqlBuilder.append("(:label").append(i).append(", :tld").append(i).append(")");
}
sqlBuilder.append(")");

var query = tm().getEntityManager().createNativeQuery(sqlBuilder.toString());
for (int i = 0; i < domainList.size(); i++) {
List<String> parts = DOMAIN_SPLITTER.splitToList(domainList.get(i));
verify(parts.size() == 2, "Invalid domain name %s", domainList.get(i));
query.setParameter("label" + i, parts.get(0));
query.setParameter("tld" + i, parts.get(1));
}

@SuppressWarnings("unchecked")
List<String> resultList = (List<String>) query.getResultList();
return ImmutableSet.copyOf(resultList);
}

static ImmutableSet<String> queryNewlyCreatedDomains(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,4 +316,21 @@ void batchReadUnblockables_multiBatch() {
.domainName())
.isEqualTo("label3.app");
}

@Test
void testQueryUnblockablesByNames_sqlInjectionSafe() {
setupUnblockableDomains();
// Verify standard lookup works
assertThat(tm().transact(() -> queryUnblockablesByNames(ImmutableSet.of("a.tld1"))))
.containsExactly("a.tld1");

// Attempt SQL Injection payload in the name. Should be treated as literal and return empty.
assertThat(tm().transact(() -> queryUnblockablesByNames(ImmutableSet.of("a' OR '1'='1.tld1"))))
.isEmpty();
}

@Test
void testQueryUnblockablesByNames_emptySet() {
assertThat(tm().transact(() -> queryUnblockablesByNames(ImmutableSet.of()))).isEmpty();
}
}
Loading