lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix auth -> authentication in some props in SDK (#2839)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-11-28 09:13:41 +02:00
committed by GitHub
parent 42384b7e31
commit 203598f3a4
29 changed files with 129 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hawkbit-sdk/hawkbit-sdk-commons/src/main/java/org/eclipse/hawkbit/sdk/HawkbitClient.java
View File

@@ -106,7 +106,7 @@ public class HawkbitClient {
template.header(AUTHORIZATION, "GatewayToken " + tenant.getGatewayToken());
} else if (!ObjectUtils.isEmpty(controller.getSecurityToken())) {
template.header(AUTHORIZATION, "TargetToken " + controller.getSecurityToken());
} // else do not send auth, no auth or certificate based
} // else do not send authentication, no authentication or certificate based
};
// @formatter:on
private static final ErrorDecoder DEFAULT_ERROR_DECODER_0 = new ErrorDecoder.Default();
@@ -279,7 +279,7 @@ public class HawkbitClient {
(controller == null ? hawkBitServer.getMgmtUrl() : hawkBitServer.getDdiUrl()) + path).openConnection();
conn.setRequestMethod("POST");
// deal with auth - only from headers1
// deal with authentication - only from headers1
final RequestTemplate requestTemplate = new RequestTemplate();
requestInterceptorFn.apply(tenant, controller).apply(requestTemplate);
requestTemplate.headers().forEach((k, v) -> v.forEach(e -> conn.setRequestProperty(k, e)));

2
hawkbit-sdk/hawkbit-sdk-commons/src/main/java/org/eclipse/hawkbit/sdk/Tenant.java
View File

@@ -26,7 +26,7 @@ public class Tenant {
@NonNull
private String tenantId = "DEFAULT";
// basic auth user, to access management api
// basic authentication user, to access management api
@Nullable
private String username = "admin";
@ToString.Exclude

22
hawkbit-sdk/hawkbit-sdk-mgmt/src/main/java/org/eclipse/hawkbit/sdk/mgmt/AuthenticationSetupHelper.java
View File

@@ -32,17 +32,17 @@ import org.eclipse.hawkbit.sdk.ca.CA;
import org.springframework.util.ObjectUtils;
/**
* Helper for auth setup
* Helper for authentication setup
*/
@Slf4j
@AllArgsConstructor
public class AuthenticationSetupHelper {
private static final String AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY = "auth.gatewaytoken.key";
private static final String AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_ENABLED = "auth.gatewaytoken.enabled";
private static final String AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED = "auth.targettoken.enabled";
private static final String AUTHENTICATION_MODE_HEADER_ENABLED = "auth.header.enabled";
private static final String AUTHENTICATION_MODE_HEADER_AUTHORITY_NAME = "auth.header.authority";
private static final String AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY = "authentication.gatewaytoken.key";
private static final String AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_ENABLED = "authentication.gatewaytoken.enabled";
private static final String AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED = "authentication.targettoken.enabled";
private static final String AUTHENTICATION_MODE_HEADER_ENABLED = "authentication.header.enabled";
private static final String AUTHENTICATION_MODE_HEADER_AUTHORITY_NAME = "authentication.header.authority";
private static final Random RND = new SecureRandom();
@@ -57,7 +57,7 @@ public class AuthenticationSetupHelper {
return Base64.getEncoder().encodeToString(rnd);
}
// sets up a certificate auth, if DdiCA is null - generate self signed CA
// sets up a certificate authentication, if DdiCA is null - generate self signed CA
public void setupCertificateAuthentication() throws CertificateException {
final MgmtTenantManagementRestApi mgmtTenantManagementRestApi = hawkbitClient.mgmtService(MgmtTenantManagementRestApi.class, tenant);
CA ddiCA = tenant.getDdiCA();
@@ -80,7 +80,7 @@ public class AuthenticationSetupHelper {
}
}
// enables secure token auth
// enables secure token authentication
public void setupSecureTokenAuthentication() {
final MgmtTenantManagementRestApi mgmtTenantManagementRestApi = hawkbitClient.mgmtService(MgmtTenantManagementRestApi.class, tenant);
if (!(Boolean.TRUE.equals(Objects.requireNonNull(mgmtTenantManagementRestApi
@@ -90,7 +90,7 @@ public class AuthenticationSetupHelper {
}
}
// set gateway token auth (generate and sets gateway token to tenant, if not set up)
// set gateway token authentication (generate and sets gateway token to tenant, if not set up)
// return the gateway token
public void setupGatewayTokenAuthentication() {
String gatewayToken = tenant.getGatewayToken();
@@ -112,8 +112,8 @@ public class AuthenticationSetupHelper {
}
}
// if gateway token is configured then the gateway auth is enabled, so all devices use gateway token auth.
// otherwise, target token auth is enabled - then all devices shall be registered and the target token shall be set to the one from
// if gateway token is configured then the gateway authentication is enabled, so all devices use gateway token authentication.
// otherwise, target token authentication is enabled - then all devices shall be registered and the target token shall be set to the one from
// the DDI controller instance
public void setupTargetAuthentication() {
final String gatewayToken = tenant.getGatewayToken();