mirror of
https://github.com/google/nomulus
synced 2026-01-06 21:47:31 +00:00
Use constant-time comparison when validating client cert hashes (#2147)
Per b/298447714, non-constant-time comparison is prone to brute-force attacks.
This commit is contained in:
@@ -16,6 +16,7 @@ package google.registry.flows;
|
||||
|
||||
import static com.google.common.base.MoreObjects.toStringHelper;
|
||||
import static google.registry.request.RequestParameters.extractOptionalHeader;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
@@ -33,6 +34,7 @@ import google.registry.request.Header;
|
||||
import google.registry.util.CidrAddressBlock;
|
||||
import google.registry.util.ProxyHttpHeaders;
|
||||
import java.net.InetAddress;
|
||||
import java.security.MessageDigest;
|
||||
import java.util.Optional;
|
||||
import javax.inject.Inject;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
@@ -137,8 +139,16 @@ public class TlsCredentials implements TransportCredentials {
|
||||
throw new MissingRegistrarCertificateException();
|
||||
}
|
||||
// Check if the certificate hash is equal to the one on file for the registrar.
|
||||
if (!clientCertificateHash.equals(registrar.getClientCertificateHash())
|
||||
&& !clientCertificateHash.equals(registrar.getFailoverClientCertificateHash())) {
|
||||
byte[] certBytes = clientCertificateHash.get().getBytes(UTF_8);
|
||||
if (!MessageDigest.isEqual(
|
||||
certBytes,
|
||||
registrar.getClientCertificateHash().map(x -> x.getBytes(UTF_8)).orElse(null))
|
||||
&& !MessageDigest.isEqual(
|
||||
certBytes,
|
||||
registrar
|
||||
.getFailoverClientCertificateHash()
|
||||
.map(x -> x.getBytes(UTF_8))
|
||||
.orElse(null))) {
|
||||
logger.atWarning().log(
|
||||
"Non-matching certificate hash (%s) for %s, wanted either %s or %s.",
|
||||
clientCertificateHash,
|
||||
|
||||
Reference in New Issue
Block a user