add config value for refresh endpoint

eclipse-tractusx · Mar 14, 2024 · 1ebc7db · 1ebc7db
1 parent 9e9bc25
commit 1ebc7db
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/...lipse/tractusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceExtension.java b/...lipse/tractusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceExtension.java
@@ -26,7 +26,9 @@
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
 import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.security.PrivateKeyResolver;
+import org.eclipse.edc.spi.system.Hostname;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.token.JwtGenerationService;
@@ -46,7 +48,11 @@ public class DataPlaneTokenRefreshServiceExtension implements ServiceExtension {
     public static final String NAME = "DataPlane Token Refresh Service extension";
     public static final int DEFAULT_TOKEN_EXPIRY_TOLERANCE_SECONDS = 5;
     @Setting(value = "Token expiry tolerance period in seconds to allow for clock skew", defaultValue = "" + DEFAULT_TOKEN_EXPIRY_TOLERANCE_SECONDS)
-    public static final String TOKEN_EXPIRY_TOLERANCE_SECONDS_PROPERTY = "edc.dataplane.api.token.expiry.tolerance";
+    public static final String TOKEN_EXPIRY_TOLERANCE_SECONDS_PROPERTY = "edc.dataplane.token.expiry.tolerance";
+
+    @Setting(value = "The HTTP endpoint where clients can request a renewal of their access token for the public dataplane API")
+    public static final String REFRESH_ENDPOINT_PROPERTY = "edc.dataplane.token.refresh.endpoint";
+
     @Inject
     private TokenValidationService tokenValidationService;
     @Inject
@@ -57,6 +63,8 @@ public class DataPlaneTokenRefreshServiceExtension implements ServiceExtension {
     private PrivateKeyResolver privateKeyResolver;
     @Inject
     private Clock clock;
+    @Inject
+    private Hostname hostname;
     private DataPlaneTokenRefreshServiceImpl tokenRefreshService;
 
     @Override
@@ -76,15 +84,35 @@ public DataPlaneTokenRefreshService createRefreshTokenService(ServiceExtensionCo
         return getTokenRefreshService(context);
     }
 
+    private Integer getExpiryToleranceConfig(ServiceExtensionContext context) {
+        return context.getConfig().getInteger(TOKEN_EXPIRY_TOLERANCE_SECONDS_PROPERTY, DEFAULT_TOKEN_EXPIRY_TOLERANCE_SECONDS);
+    }
+
     @NotNull
     private DataPlaneTokenRefreshServiceImpl getTokenRefreshService(ServiceExtensionContext context) {
         if (tokenRefreshService == null) {
-            var epsilon = context.getConfig().getInteger(TOKEN_EXPIRY_TOLERANCE_SECONDS_PROPERTY, DEFAULT_TOKEN_EXPIRY_TOLERANCE_SECONDS);
-            tokenRefreshService = new DataPlaneTokenRefreshServiceImpl(clock, tokenValidationService, didPkResolver, accessTokenDataStore, new JwtGenerationService(), getPrivateKeySupplier(context), context.getMonitor(), null, epsilon);
+            var monitor = context.getMonitor().withPrefix("DataPlane Token Refresh");
+            var expiryTolerance = getExpiryToleranceConfig(context);
+            var refreshEndpoint = getRefreshEndpointConfig(context, monitor);
+            monitor.debug("Token refresh endpoint: %s".formatted(refreshEndpoint));
+            monitor.debug("Token refresh time tolerance: %ds".formatted(expiryTolerance));
+            tokenRefreshService = new DataPlaneTokenRefreshServiceImpl(clock, tokenValidationService, didPkResolver, accessTokenDataStore, new JwtGenerationService(),
+                    getPrivateKeySupplier(context), context.getMonitor(), refreshEndpoint, expiryTolerance);
         }
         return tokenRefreshService;
     }
 
+    private String getRefreshEndpointConfig(ServiceExtensionContext context, Monitor monitor) {
+        var refreshEndpoint = context.getConfig().getString(REFRESH_ENDPOINT_PROPERTY, null);
+        if (refreshEndpoint == null) {
+            var port = context.getConfig().getInteger("web.http.public.port", 8185);
+            var path = context.getConfig().getString("web.http.public.path", "/api/v2/public");
+            refreshEndpoint = "http://%s:%d%s".formatted(hostname.get(), port, path);
+            monitor.warning("Config property '%s' was not specified, the default '%s' will be used.".formatted(REFRESH_ENDPOINT_PROPERTY, refreshEndpoint));
+        }
+        return refreshEndpoint;
+    }
+
     @NotNull
     private Supplier<PrivateKey> getPrivateKeySupplier(ServiceExtensionContext context) {
         return () -> {

diff --git a/...rg/eclipse/tractusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceImpl.java b/...rg/eclipse/tractusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceImpl.java
@@ -82,7 +82,8 @@ public DataPlaneTokenRefreshServiceImpl(Clock clock, TokenValidationService toke
                                             TokenGenerationService tokenGenerationService,
                                             Supplier<PrivateKey> privateKeySupplier,
                                             Monitor monitor,
-                                            String refreshEndpoint, int tokenExpiryToleranceSeconds) {
+                                            String refreshEndpoint,
+                                            int tokenExpiryToleranceSeconds) {
         this.tokenValidationService = tokenValidationService;
         this.publicKeyResolver = publicKeyResolver;
         this.accessTokenDataStore = accessTokenDataStore;