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

Fix TenantAwareUserProperies (#1672)

Browse Source 
Fixed in order to get properties of form hawkbit.security.user.<username>.<property>

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-02-29 16:03:11 +02:00
committed by GitHub
parent 311922c4aa
commit f45d8f0180
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java
View File

@@ -82,7 +82,7 @@ public class SecurityAutoConfiguration {
@ConditionalOnMissingBean @ConditionalOnMissingBean
public UserAuthoritiesResolver inMemoryAuthoritiesResolver(final SecurityProperties securityProperties, public UserAuthoritiesResolver inMemoryAuthoritiesResolver(final SecurityProperties securityProperties,
final TenantAwareUserProperties tenantAwareUserProperties) { final TenantAwareUserProperties tenantAwareUserProperties) {
final Map<String, User> tenantAwareUsers = tenantAwareUserProperties.getUsers(); final Map<String, User> tenantAwareUsers = tenantAwareUserProperties.getUser();
final Map<String, List<String>> usersToPermissions; final Map<String, List<String>> usersToPermissions;
if (!CollectionUtils.isEmpty(tenantAwareUsers)) { if (!CollectionUtils.isEmpty(tenantAwareUsers)) {
usersToPermissions = tenantAwareUsers.entrySet().stream().collect( usersToPermissions = tenantAwareUsers.entrySet().stream().collect(

2
hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/StaticAuthenticationProvider.java
View File

@@ -59,7 +59,7 @@ public class StaticAuthenticationProvider extends DaoAuthenticationProvider {
final TenantAwareUserProperties tenantAwareUserProperties, final TenantAwareUserProperties tenantAwareUserProperties,
final PasswordEncoder passwordEncoder) { final PasswordEncoder passwordEncoder) {
final List<User> userPrincipals = new ArrayList<>(); final List<User> userPrincipals = new ArrayList<>();
tenantAwareUserProperties.getUsers().forEach((username, user) -> { tenantAwareUserProperties.getUser().forEach((username, user) -> {
final String password = password(user.getPassword(), passwordEncoder); final String password = password(user.getPassword(), passwordEncoder);
final List<GrantedAuthority> credentials = final List<GrantedAuthority> credentials =
createAuthorities(user.getRoles(), user.getPermissions(), Collections::emptyList); createAuthorities(user.getRoles(), user.getPermissions(), Collections::emptyList);

4
hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/TenantAwareUserProperties.java
View File

@@ -23,10 +23,10 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*/ */
@Data @Data
@ToString @ToString
@ConfigurationProperties("hawkbit.security.user") @ConfigurationProperties("hawkbit.security")
public class TenantAwareUserProperties { public class TenantAwareUserProperties {
private Map<String, User> users = new HashMap<>(); private Map<String, User> user = new HashMap<>();
@Data @Data
@ToString @ToString