Merge pull request #190 from IABTechLab/tjm-UID2-2808-allow-null-userdata

thomasm-ttd · web-flow · commit 7b2bf15eaedf · 2024-02-20T09:54:36.000+11:00
Allow for empty user_data
diff --git a/src/main/java/com/uid2/shared/secure/NitroCoreAttestationService.java b/src/main/java/com/uid2/shared/secure/NitroCoreAttestationService.java
@@ -56,8 +56,10 @@ private AttestationResult attestInternal(byte[] publicKey, AttestationRequest aR
         }
 
         String givenAttestationUrl = aDoc.getUserDataString();
-        if (!UrlEquivalenceValidator.areUrlsEquivalent(this.attestationUrl, givenAttestationUrl, LOGGER)) {
-            return new AttestationResult(AttestationFailure.UNKNOWN_ATTESTATION_URL);
+        if (givenAttestationUrl != null && !givenAttestationUrl.isEmpty()) {
+            if (!UrlEquivalenceValidator.areUrlsEquivalent(this.attestationUrl, givenAttestationUrl, LOGGER)) {
+                return new AttestationResult(AttestationFailure.UNKNOWN_ATTESTATION_URL);
+            }
         }
 
         NitroEnclaveIdentifier id = NitroEnclaveIdentifier.fromRaw(aDoc.getPcr(0));

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,10 @@ private AttestationResult attestInternal(byte[] publicKey, AttestationRequest aR`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`String givenAttestationUrl = aDoc.getUserDataString();`
`59`		`- if (!UrlEquivalenceValidator.areUrlsEquivalent(this.attestationUrl, givenAttestationUrl, LOGGER)) {`
`60`		`- return new AttestationResult(AttestationFailure.UNKNOWN_ATTESTATION_URL);`
	`59`	`+ if (givenAttestationUrl != null && !givenAttestationUrl.isEmpty()) {`
	`60`	`+ if (!UrlEquivalenceValidator.areUrlsEquivalent(this.attestationUrl, givenAttestationUrl, LOGGER)) {`
	`61`	`+ return new AttestationResult(AttestationFailure.UNKNOWN_ATTESTATION_URL);`
	`62`	`+ }`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`NitroEnclaveIdentifier id = NitroEnclaveIdentifier.fromRaw(aDoc.getPcr(0));`