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

Fix Sonar Findings (#2683)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-09-19 16:01:57 +03:00
committed by GitHub
parent 8bdcc51985
commit 117f2bf683
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java
View File

@@ -170,7 +170,7 @@ public class JpaRepositoryConfiguration {
} }
@Bean @Bean
public static BeanPostProcessor entityManagerBeanPostProcessor( public BeanPostProcessor entityManagerBeanPostProcessor(
@Autowired(required = false) final AccessController<JpaArtifact> artifactAccessController, @Autowired(required = false) final AccessController<JpaArtifact> artifactAccessController,
@Autowired(required = false) final AccessController<JpaSoftwareModuleType> softwareModuleTypeAccessController, @Autowired(required = false) final AccessController<JpaSoftwareModuleType> softwareModuleTypeAccessController,
@Autowired(required = false) final AccessController<JpaSoftwareModule> softwareModuleAccessController, @Autowired(required = false) final AccessController<JpaSoftwareModule> softwareModuleAccessController,

17
hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java
View File

@@ -61,14 +61,15 @@ import static java.util.Collections.emptyList;
@Import(FeignClientsConfiguration.class) @Import(FeignClientsConfiguration.class)
public class SimpleUIApp implements AppShellConfigurator { public class SimpleUIApp implements AppShellConfigurator {
private static final String AUTHORIZATION_HEADER = "Authorization";
private static final Function<OAuth2TokenManager, RequestInterceptor> AUTHORIZATION = oAuth2TokenManager -> requestTemplate -> { private static final Function<OAuth2TokenManager, RequestInterceptor> AUTHORIZATION = oAuth2TokenManager -> requestTemplate -> {
final Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication instanceof OAuth2AuthenticationToken authenticationToken) { if (authentication instanceof OAuth2AuthenticationToken authenticationToken) {
String bearerToken = oAuth2TokenManager.getToken(authenticationToken); String bearerToken = oAuth2TokenManager.getToken(authenticationToken);
requestTemplate.header("Authorization", "Bearer " + bearerToken); requestTemplate.header(AUTHORIZATION_HEADER, "Bearer " + bearerToken);
} else { } else {
requestTemplate.header( requestTemplate.header(
"Authorization", "Basic " + Base64.getEncoder().encodeToString( AUTHORIZATION_HEADER, "Basic " + Base64.getEncoder().encodeToString(
(Objects.requireNonNull(authentication.getPrincipal(), "User is null!") + ":" + Objects.requireNonNull( (Objects.requireNonNull(authentication.getPrincipal(), "User is null!") + ":" + Objects.requireNonNull(
authentication.getCredentials(), "Password is not available!")).getBytes(ISO_8859_1)) authentication.getCredentials(), "Password is not available!")).getBytes(ISO_8859_1))
); );
@@ -113,7 +114,7 @@ public class SimpleUIApp implements AppShellConfigurator {
@Bean @Bean
OAuth2UserService<OidcUserRequest, OidcUser> oidcUserService(final HawkbitMgmtClient hawkbitClient) { OAuth2UserService<OidcUserRequest, OidcUser> oidcUserService(final HawkbitMgmtClient hawkbitClient) {
final OidcUserService delegate = new OidcUserService(); final OidcUserService delegate = new OidcUserService();
return (userRequest) -> { return userRequest -> {
OidcUser oidcUser = delegate.loadUser(userRequest); OidcUser oidcUser = delegate.loadUser(userRequest);
final OAuth2AuthenticationToken tempToken = new OAuth2AuthenticationToken( final OAuth2AuthenticationToken tempToken = new OAuth2AuthenticationToken(
oidcUser, oidcUser,
@@ -121,11 +122,7 @@ public class SimpleUIApp implements AppShellConfigurator {
userRequest.getClientRegistration().getRegistrationId() userRequest.getClientRegistration().getRegistrationId()
); );
final List<SimpleGrantedAuthority> grantedAuthorities = getGrantedAuthorities(hawkbitClient, tempToken); final List<SimpleGrantedAuthority> grantedAuthorities = getGrantedAuthorities(hawkbitClient, tempToken);
return new DefaultOidcUser( return new DefaultOidcUser(grantedAuthorities, oidcUser.getIdToken(), oidcUser.getUserInfo());
grantedAuthorities,
oidcUser.getIdToken(),
oidcUser.getUserInfo()
);
}; };
} }
@@ -191,7 +188,7 @@ public class SimpleUIApp implements AppShellConfigurator {
final String auth = username + ":" + password; final String auth = username + ":" + password;
final String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes()); final String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes());
conn.setRequestProperty("Authorization", "Basic " + encodedAuth); conn.setRequestProperty(AUTHORIZATION_HEADER, "Basic " + encodedAuth);
return conn.getResponseCode() != 401; return conn.getResponseCode() != 401;
} catch (final Exception ex) { } catch (final Exception ex) {
@@ -199,4 +196,4 @@ public class SimpleUIApp implements AppShellConfigurator {
return false; return false;
} }
} }
} }