pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-shared</artifactId>
-    <version>9.3.0</version>
+    <version>10.8.6</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Library for all the shared uid2 operations</description>
     <url>https://github.com/IABTechLab/uid2docs</url>
@@ -34,8 +34,9 @@
 
     <repositories>
         <repository>
-            <id>snapshots-repo</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <name>Central Portal Snapshots</name>
+            <id>central-portal-snapshots</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
@@ -49,10 +50,11 @@
             <url>https://repo.maven.apache.org/maven2/</url>
         </repository>
     </repositories>
+
     <distributionManagement>
         <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <id>central</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
 
@@ -297,17 +299,6 @@
                     <argLine>-XX:+EnableDynamicAgentLoading</argLine>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.7.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>false</autoReleaseAfterClose>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -376,6 +367,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <version>0.7.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <publishingServerId>central</publishingServerId>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

src/main/java/com/uid2/shared/Const.java

@@ -30,6 +30,8 @@ public static class Config {
         // this file stores integration config values, e.g. it communicates with other uid2 services that runs locally.
         public static final String INTEG_CONFIG_PATH = "conf" + File.separator + "integ-config.json";
 
+        public static final String UidInstanceIdPrefixProp = "uid_instance_id_prefix";
+
         // GCP
         public static final String GoogleCredentialsProp = "google_credentials";
         public static final String GcpEnclaveParamsProp = "gcp_enclave_params";

src/main/java/com/uid2/shared/attest/AttestationResponseHandler.java

@@ -2,6 +2,8 @@
 
 import com.uid2.enclave.IAttestationProvider;
 import com.uid2.shared.*;
+import com.uid2.shared.audit.Audit;
+import com.uid2.shared.audit.UidInstanceIdProvider;
 import com.uid2.shared.util.URLConnectionHttpClient;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
@@ -41,6 +43,7 @@ public class AttestationResponseHandler {
     private final IClock clock;
     private final Vertx vertx;
     private final URLConnectionHttpClient httpClient;
+    private final UidInstanceIdProvider uidInstanceIdProvider;
     private boolean isExpiryCheckScheduled;
     private AtomicBoolean isAttesting;
     // Set this to be Instant.MAX so that if it's not set it won't trigger the re-attest
@@ -59,8 +62,9 @@ public AttestationResponseHandler(Vertx vertx,
                                       ApplicationVersion appVersion,
                                       IAttestationProvider attestationProvider,
                                       Handler<Pair<AttestationResponseCode, String>> responseWatcher,
-                                      Proxy proxy) {
-        this(vertx, attestationEndpoint, clientApiToken, operatorType, appVersion, attestationProvider, responseWatcher, proxy, new InstantClock(), null, null, 60000);
+                                      Proxy proxy,
+                                      UidInstanceIdProvider uidInstanceIdProvider) {
+        this(vertx, attestationEndpoint, clientApiToken, operatorType, appVersion, attestationProvider, responseWatcher, proxy, new InstantClock(), null, null, 60000, uidInstanceIdProvider);
     }
 
     public AttestationResponseHandler(Vertx vertx,
@@ -74,7 +78,8 @@ public AttestationResponseHandler(Vertx vertx,
                                       IClock clock,
                                       URLConnectionHttpClient httpClient,
                                       AttestationTokenDecryptor attestationTokenDecryptor,
-                                      int attestCheckMilliseconds) {
+                                      int attestCheckMilliseconds,
+                                      UidInstanceIdProvider uidInstanceIdProvider) {
         this.vertx = vertx;
         this.attestationEndpoint = attestationEndpoint;
         this.encodedAttestationEndpoint = this.encodeStringUnicodeAttestationEndpoint(attestationEndpoint);
@@ -110,7 +115,7 @@ public AttestationResponseHandler(Vertx vertx,
                     .append(kv.getValue());
         }
         this.appVersionHeader = builder.toString();
-
+        this.uidInstanceIdProvider = uidInstanceIdProvider;
     }
 
     private void attestationExpirationCheck(long timerId) {
@@ -174,6 +179,7 @@ public void attest() throws IOException, AttestationResponseHandlerException {
             headers.put("Content-Type", "application/json");
             headers.put("Authorization", "Bearer " + this.clientApiToken);
             headers.put(Const.Http.AppVersionHeader, this.appVersionHeader);
+            headers.put(Audit.UID_INSTANCE_ID_HEADER, this.uidInstanceIdProvider.getInstanceId());
 
             HttpResponse<String> response = httpClient.post(attestationEndpoint, requestJson.toString(), headers);
 

src/main/java/com/uid2/shared/attest/JwtService.java

@@ -73,14 +73,19 @@ public JwtValidationResponse validateJwt(String jwt, String audience, String iss
                 // verify checks that the token has not expired
                 JsonWebSignature signature = tokenVerifier.verify(jwt);
                 JsonWebToken.Payload webToken = signature.getPayload();
+                String jti = webToken.get("jti").toString();
+                if (jti == null) {
+                    jti = "unknown";
+                }
                 response = new JwtValidationResponse(true)
                         .withSubject(webToken.get("sub").toString())
                         .withRoles(webToken.get("roles").toString())
                         .withEnclaveId(webToken.get("enclaveId").toString())
                         .withEnclaveType(webToken.get("enclaveType").toString())
                         .withSiteId(Integer.valueOf(webToken.get("siteId").toString()))
                         .withOperatorVersion(webToken.get("operatorVersion").toString())
-                        .withAudience(webToken.get("aud").toString());
+                        .withAudience(webToken.get("aud").toString())
+                        .withJti(jti);
 
                 // return the first verified response
                 return response;

src/main/java/com/uid2/shared/attest/JwtValidationResponse.java

@@ -18,6 +18,7 @@ public class JwtValidationResponse {
 
     private String audience;
     private String subject;
+    private String jti;
 
     public JwtValidationResponse(boolean isValid) {
         this.isValid = isValid;
@@ -66,6 +67,11 @@ public JwtValidationResponse withSubject(String subject) {
         return this;
     }
 
+    public JwtValidationResponse withJti(String jti) {
+        this.jti = jti;
+        return this;
+    }
+
     public Set<Role> getRoles() {
         return this.roles;
     }
@@ -103,4 +109,6 @@ public String getAudience() {
     public String getSubject() {
         return subject;
     }
+
+    public String getJti() { return jti; }
 }

src/main/java/com/uid2/shared/attest/UidCoreClient.java

@@ -2,6 +2,8 @@
 
 import com.uid2.shared.Const;
 import com.uid2.shared.Utils;
+import com.uid2.shared.audit.Audit;
+import com.uid2.shared.audit.UidInstanceIdProvider;
 import com.uid2.shared.cloud.*;
 import com.uid2.shared.util.URLConnectionHttpClient;
 import org.slf4j.Logger;
@@ -18,34 +20,32 @@ public class UidCoreClient implements IUidCoreClient, DownloadCloudStorage {
     private final ICloudStorage contentStorage;
     private final Proxy proxy;
     private final URLConnectionHttpClient httpClient;
+    private final UidInstanceIdProvider uidInstanceIdProvider;
     private String userToken;
     private final String appVersionHeader;
     private boolean allowContentFromLocalFileSystem = false;
     private boolean encryptionEnabled;
     private final AttestationResponseHandler attestationResponseHandler;
 
 
-    public static UidCoreClient createNoAttest(String userToken, AttestationResponseHandler attestationResponseHandler) {
-        return new UidCoreClient(userToken, CloudUtils.defaultProxy, attestationResponseHandler, null, false);
+    public static UidCoreClient createNoAttest(String userToken, AttestationResponseHandler attestationResponseHandler, UidInstanceIdProvider uidInstanceIdProvider) {
+        return new UidCoreClient(userToken, CloudUtils.defaultProxy, attestationResponseHandler, null, false, uidInstanceIdProvider);
     }
 
     public UidCoreClient(String userToken,
                          Proxy proxy,
-                         AttestationResponseHandler attestationResponseHandler) {
-        this(userToken, proxy, attestationResponseHandler, null, false);
-    }
-
-    public UidCoreClient(String userToken,
-            Proxy proxy,
-            AttestationResponseHandler attestationResponseHandler, boolean encryptionEnabled) {
-        this(userToken, proxy, attestationResponseHandler, null, encryptionEnabled);
+                         AttestationResponseHandler attestationResponseHandler,
+                         boolean encryptionEnabled,
+                         UidInstanceIdProvider uidInstanceIdProvider) {
+        this(userToken, proxy, attestationResponseHandler, null, encryptionEnabled, uidInstanceIdProvider);
     }
 
     public UidCoreClient(String userToken,
                          Proxy proxy,
                          AttestationResponseHandler attestationResponseHandler,
-            URLConnectionHttpClient httpClient,
-            boolean encryptionEnabled) {
+                         URLConnectionHttpClient httpClient,
+                         boolean encryptionEnabled,
+                         UidInstanceIdProvider uidInstanceIdProvider) {
         this.encryptionEnabled = encryptionEnabled;
         this.proxy = proxy;
         this.userToken = userToken;
@@ -62,6 +62,7 @@ public UidCoreClient(String userToken,
         }
 
         this.appVersionHeader = attestationResponseHandler.getAppVersionHeader();
+        this.uidInstanceIdProvider = uidInstanceIdProvider;
     }
 
     @Override
@@ -125,6 +126,7 @@ private HttpResponse<String> sendHttpRequest(String path, String attestationToke
         if (attestationToken != null && !attestationToken.isBlank()) {
             headers.put(Const.Attestation.AttestationTokenHeader, attestationToken);
         }
+        headers.put(Audit.UID_INSTANCE_ID_HEADER, this.uidInstanceIdProvider.getInstanceId());
 
         String jwtToken = this.getJWT();
         if (jwtToken != null && !jwtToken.isBlank()) {

src/main/java/com/uid2/shared/attest/UidOptOutClient.java

@@ -1,5 +1,6 @@
 package com.uid2.shared.attest;
 
+import com.uid2.shared.audit.UidInstanceIdProvider;
 import com.uid2.shared.cloud.CloudStorageException;
 import com.uid2.shared.util.URLConnectionHttpClient;
 import org.slf4j.Logger;
@@ -16,16 +17,18 @@ public class UidOptOutClient extends UidCoreClient {
 
     public UidOptOutClient(String userToken,
                            Proxy proxy,
-                           AttestationResponseHandler attestationResponseHandler) {
-        super(userToken, proxy, attestationResponseHandler, null, false);
+                           AttestationResponseHandler attestationResponseHandler,
+                           UidInstanceIdProvider uidInstanceIdProvider) {
+        super(userToken, proxy, attestationResponseHandler, null, false, uidInstanceIdProvider);
         this.attestationResponseHandler = attestationResponseHandler;
     }
 
     public UidOptOutClient(String userToken,
                            Proxy proxy,
                            AttestationResponseHandler attestationResponseHandler,
-                           URLConnectionHttpClient httpClient) {
-        super(userToken, proxy, attestationResponseHandler, httpClient, false);
+                           URLConnectionHttpClient httpClient,
+                           UidInstanceIdProvider uidInstanceIdProvider) {
+        super(userToken, proxy, attestationResponseHandler, httpClient, false, uidInstanceIdProvider);
         this.attestationResponseHandler = attestationResponseHandler;
     }