Skip to content

Commit 83d1c4e

Browse files
authored
fix: remove logging of api key from TokenBasedAuthenticationExtension (#1788)
1 parent a9b98b7 commit 83d1c4e

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

extensions/api/auth-tokenbased/src/main/java/org/eclipse/dataspaceconnector/api/auth/TokenBasedAuthenticationExtension.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* Contributors:
1111
* Microsoft Corporation - initial API and implementation
1212
* Mercedes-Benz Tech Innovation GmbH - add README.md; authentication key can be retrieved from vault
13+
* Fraunhofer Institute for Software and Systems Engineering - update monitor info
1314
*
1415
*/
1516

@@ -24,8 +25,6 @@
2425

2526
import java.util.UUID;
2627

27-
import static java.lang.String.format;
28-
2928
/**
3029
* Extension that registers an AuthenticationService that uses API Keys
3130
*/
@@ -42,12 +41,15 @@ public class TokenBasedAuthenticationExtension implements ServiceExtension {
4241
private Vault vault;
4342

4443
@Override
45-
public void initialize(ServiceExtensionContext context) {
44+
public String name() {
45+
return "Static token API Authentication";
46+
}
4647

48+
@Override
49+
public void initialize(ServiceExtensionContext context) {
4750
String apiKey = null;
4851

4952
var apiKeyAlias = context.getSetting(AUTH_SETTING_APIKEY_ALIAS, null);
50-
5153
if (apiKeyAlias != null) {
5254
apiKey = vault.resolveSecret(apiKeyAlias);
5355
}
@@ -56,9 +58,6 @@ public void initialize(ServiceExtensionContext context) {
5658
apiKey = context.getSetting(AUTH_SETTING_APIKEY, UUID.randomUUID().toString());
5759
}
5860

59-
context.getMonitor().info(format("API Authentication: using static API Key '%s'", apiKey));
60-
61-
var authService = new TokenBasedAuthenticationService(apiKey);
62-
context.registerService(AuthenticationService.class, authService);
61+
context.registerService(AuthenticationService.class, new TokenBasedAuthenticationService(apiKey));
6362
}
6463
}

extensions/api/data-management/api-configuration/src/main/java/org/eclipse/dataspaceconnector/api/datamanagement/configuration/DataManagementApiConfigurationExtension.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void initialize(ServiceExtensionContext context) {
5454
var path = "/api";
5555
var config = context.getConfig(WEB_DATA_CONFIG);
5656
if (config.getEntries().isEmpty()) {
57-
monitor.warning("No [web.http.data.port] or [web.http.data.path] configuration has been provided, therefor the default will be used. " +
57+
monitor.warning("No [web.http.data.port] or [web.http.data.path] configuration has been provided, therefore the default will be used. " +
5858
"This means that the AuthenticationRequestFilter and the EdcApiExceptionMapper " + "will also be registered for the default context and fire for EVERY request on that context!");
5959
} else {
6060
contextAlias = "data";

0 commit comments

Comments
 (0)