feat: get rid of cid claim in EndpointDataReference auth token (#…

…3541)

feat: get rid of cid claim in EDR auth token

extensions/control-plane/transfer/transfer-data-plane/src/main/java/org/eclipse/edc/connector/transfer/dataplane/TransferDataPlaneCoreExtension.java

@@ -16,7 +16,6 @@
 package org.eclipse.edc.connector.transfer.dataplane;
 
 import org.eclipse.edc.connector.api.control.configuration.ControlApiConfiguration;
-import org.eclipse.edc.connector.contract.spi.negotiation.store.ContractNegotiationStore;
 import org.eclipse.edc.connector.dataplane.selector.spi.client.DataPlaneSelectorClient;
 import org.eclipse.edc.connector.dataplane.spi.client.DataPlaneClient;
 import org.eclipse.edc.connector.transfer.dataplane.api.ConsumerPullTransferTokenValidationApiController;
@@ -25,7 +24,6 @@
 import org.eclipse.edc.connector.transfer.dataplane.proxy.ConsumerPullDataPlaneProxyResolver;
 import org.eclipse.edc.connector.transfer.dataplane.spi.security.DataEncrypter;
 import org.eclipse.edc.connector.transfer.dataplane.spi.token.ConsumerPullTokenExpirationDateFunction;
-import org.eclipse.edc.connector.transfer.dataplane.validation.ContractValidationRule;
 import org.eclipse.edc.connector.transfer.dataplane.validation.ExpirationDateValidationRule;
 import org.eclipse.edc.connector.transfer.spi.callback.ControlApiUrl;
 import org.eclipse.edc.connector.transfer.spi.flow.DataFlowManager;
@@ -59,9 +57,6 @@ public class TransferDataPlaneCoreExtension implements ServiceExtension {
 
     public static final String NAME = "Transfer Data Plane Core";
 
-    @Inject
-    private ContractNegotiationStore contractNegotiationStore;
-
     @Inject
     private Vault vault;
 
@@ -114,7 +109,7 @@ public void initialize(ServiceExtensionContext context) {
         var keyPair = keyPairFromConfig(context);
         var controller = new ConsumerPullTransferTokenValidationApiController(tokenValidationService(keyPair.getPublic()), dataEncrypter, typeManager);
         webService.registerResource(controlApiConfiguration.getContextAlias(), controller);
-        
+
         var resolver = new ConsumerPullDataPlaneProxyResolver(dataEncrypter, typeManager, new TokenGenerationServiceImpl(keyPair.getPrivate()), tokenExpirationDateFunction);
         dataFlowManager.register(new ConsumerPullTransferDataFlowController(selectorClient, resolver));
         dataFlowManager.register(new ProviderPushTransferDataFlowController(callbackUrl, dataPlaneClient));
@@ -137,7 +132,6 @@ private KeyPair keyPairFromConfig(ServiceExtensionContext context) {
 
     private TokenValidationService tokenValidationService(PublicKey publicKey) {
         var registry = new TokenValidationRulesRegistryImpl();
-        registry.addRule(new ContractValidationRule(contractNegotiationStore, clock));
         registry.addRule(new ExpirationDateValidationRule(clock));
         return new TokenValidationServiceImpl(id -> publicKey, registry);
     }

extensions/control-plane/transfer/transfer-data-plane/src/main/java/org/eclipse/edc/connector/transfer/dataplane/proxy/ConsumerPullDataPlaneProxyResolver.java

@@ -74,7 +74,7 @@ private Result<String> resolveProxyUrl(DataPlaneInstance instance) {
     private Result<String> generateAccessToken(DataAddress source, String contractId) {
         var encryptedDataAddress = dataEncrypter.encrypt(typeManager.writeValueAsString(source));
         return tokenExpirationDateFunction.expiresAt(source, contractId)
-                .compose(expiration -> tokenGenerationService.generate(new ConsumerPullDataPlaneProxyTokenDecorator(expiration, contractId, encryptedDataAddress)))
+                .compose(expiration -> tokenGenerationService.generate(new ConsumerPullDataPlaneProxyTokenDecorator(expiration, encryptedDataAddress)))
                 .map(TokenRepresentation::getToken);
     }
 }

extensions/control-plane/transfer/transfer-data-plane/src/main/java/org/eclipse/edc/connector/transfer/dataplane/proxy/ConsumerPullDataPlaneProxyTokenDecorator.java

@@ -20,7 +20,6 @@
 import java.util.Map;
 
 import static java.util.Collections.emptyMap;
-import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.CONTRACT_ID;
 import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.DATA_ADDRESS;
 import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.EXPIRATION_TIME;
 
@@ -32,20 +31,17 @@
 class ConsumerPullDataPlaneProxyTokenDecorator implements JwtDecorator {
 
     private final Date expirationDate;
-    private final String contractId;
     private final String encryptedDataAddress;
 
-    ConsumerPullDataPlaneProxyTokenDecorator(Date expirationDate, String contractId, String encryptedDataAddress) {
+    ConsumerPullDataPlaneProxyTokenDecorator(Date expirationDate, String encryptedDataAddress) {
         this.expirationDate = expirationDate;
-        this.contractId = contractId;
         this.encryptedDataAddress = encryptedDataAddress;
     }
 
     @Override
     public Map<String, Object> claims() {
         return Map.of(
                 EXPIRATION_TIME, expirationDate,
-                CONTRACT_ID, contractId,
                 DATA_ADDRESS, encryptedDataAddress
         );
     }

extensions/control-plane/transfer/transfer-data-plane/src/test/java/org/eclipse/edc/connector/transfer/dataplane/proxy/ConsumerPullDataPlaneProxyResolverTest.java

@@ -33,7 +33,6 @@
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.CONTRACT_ID;
 import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.DATA_ADDRESS;
 import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.HTTP_PROXY;
 import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.EXPIRATION_TIME;
@@ -89,7 +88,6 @@ void verifyToDataAddressSuccess() {
         var decorator = captor.getValue();
 
         assertThat(decorator.claims())
-                .containsEntry(CONTRACT_ID, request.getContractId())
                 .containsEntry(DATA_ADDRESS, encryptedAddress)
                 .containsEntry(EXPIRATION_TIME, expiration);
     }

extensions/control-plane/transfer/transfer-data-plane/src/test/java/org/eclipse/edc/connector/transfer/dataplane/proxy/ConsumerPullDataPlaneProxyTokenDecoratorTest.java

@@ -23,7 +23,6 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.CONTRACT_ID;
 import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.DATA_ADDRESS;
 import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.EXPIRATION_TIME;
 
@@ -40,15 +39,14 @@ public void setUp() {
         expiration = Date.from(Instant.now().plusSeconds(ThreadLocalRandom.current().nextInt(1, 10)));
         contractId = UUID.randomUUID().toString();
         encryptedDataAddress = UUID.randomUUID().toString();
-        decorator = new ConsumerPullDataPlaneProxyTokenDecorator(expiration, contractId, encryptedDataAddress);
+        decorator = new ConsumerPullDataPlaneProxyTokenDecorator(expiration, encryptedDataAddress);
     }
 
     @Test
     void claims() {
         var result = decorator.claims();
 
         assertThat(result)
-                .containsEntry(CONTRACT_ID, contractId)
                 .containsEntry(DATA_ADDRESS, encryptedDataAddress)
                 .containsEntry(EXPIRATION_TIME, expiration);
     }

spi/control-plane/transfer-data-plane-spi/src/main/java/org/eclipse/edc/connector/transfer/dataplane/spi/TransferDataPlaneConstants.java

@@ -16,8 +16,6 @@
 
 import org.eclipse.edc.spi.types.domain.transfer.DataFlowRequest;
 
-import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
-
 /**
  * Type of Data Plane transfer.
  */
@@ -32,14 +30,4 @@ public interface TransferDataPlaneConstants {
      * data source as an encrypted string.
      */
     String DATA_ADDRESS = "dad";
-
-    /**
-     * Claim of the token used in input of Data Plane public API containing the contract id.
-     */
-    String CONTRACT_ID = "cid";
-
-    /**
-     * Claim of the token used in input of Data Plane public API containing the contract id with namespace.
-     */
-    String EDC_CONTRACT_ID = EDC_NAMESPACE + "cid";
 }