-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into ISSUE_754_acl
- Loading branch information
Showing
25 changed files
with
459 additions
and
170 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package com.provectus.kafka.ui.config.auth; | ||
|
|
||
| import lombok.Data; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.boot.context.properties.ConfigurationProperties; | ||
|
|
||
| @ConfigurationProperties("spring.ldap") | ||
| @Data | ||
| public class LdapProperties { | ||
|
|
||
| private String urls; | ||
| private String base; | ||
| private String adminUser; | ||
| private String adminPassword; | ||
| private String userFilterSearchBase; | ||
| private String userFilterSearchFilter; | ||
|
|
||
| @Value("${oauth2.ldap.activeDirectory:false}") | ||
| private boolean isActiveDirectory; | ||
| @Value("${oauth2.ldap.aсtiveDirectory.domain:@null}") | ||
| private String activeDirectoryDomain; | ||
|
|
||
| @Value("${oauth2.ldap.groupRoleAttribute:cn}") | ||
| private String groupRoleAttribute; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacLdapUser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| package com.provectus.kafka.ui.config.auth; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.stream.Collectors; | ||
| import org.springframework.security.core.GrantedAuthority; | ||
| import org.springframework.security.core.userdetails.UserDetails; | ||
|
|
||
| public class RbacLdapUser implements UserDetails, RbacUser { | ||
|
|
||
| private final UserDetails userDetails; | ||
|
|
||
| public RbacLdapUser(UserDetails userDetails) { | ||
| this.userDetails = userDetails; | ||
| } | ||
|
|
||
| @Override | ||
| public String name() { | ||
| return userDetails.getUsername(); | ||
| } | ||
|
|
||
| @Override | ||
| public Collection<String> groups() { | ||
| return userDetails.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toSet()); | ||
| } | ||
|
|
||
| @Override | ||
| public Collection<? extends GrantedAuthority> getAuthorities() { | ||
| return userDetails.getAuthorities(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getPassword() { | ||
| return userDetails.getPassword(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getUsername() { | ||
| return userDetails.getUsername(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isAccountNonExpired() { | ||
| return userDetails.isAccountNonExpired(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isAccountNonLocked() { | ||
| return userDetails.isAccountNonLocked(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isCredentialsNonExpired() { | ||
| return userDetails.isCredentialsNonExpired(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isEnabled() { | ||
| return userDetails.isEnabled(); | ||
| } | ||
| } |
21 changes: 21 additions & 0 deletions
21
.../src/main/java/com/provectus/kafka/ui/config/auth/condition/ActiveDirectoryCondition.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package com.provectus.kafka.ui.config.auth.condition; | ||
|
|
||
| import org.springframework.boot.autoconfigure.condition.AllNestedConditions; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||
|
|
||
| public class ActiveDirectoryCondition extends AllNestedConditions { | ||
|
|
||
| public ActiveDirectoryCondition() { | ||
| super(ConfigurationPhase.PARSE_CONFIGURATION); | ||
| } | ||
|
|
||
| @ConditionalOnProperty(value = "auth.type", havingValue = "LDAP") | ||
| public static class OnAuthType { | ||
|
|
||
| } | ||
|
|
||
| @ConditionalOnProperty(value = "${oauth2.ldap.activeDirectory}:false", havingValue = "true", matchIfMissing = false) | ||
| public static class OnActiveDirectory { | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
...-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/FieldsSelector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package com.provectus.kafka.ui.service.masking.policies; | ||
|
|
||
| import com.provectus.kafka.ui.config.ClustersProperties; | ||
| import com.provectus.kafka.ui.exception.ValidationException; | ||
| import java.util.regex.Pattern; | ||
| import org.springframework.util.CollectionUtils; | ||
| import org.springframework.util.StringUtils; | ||
|
|
||
| interface FieldsSelector { | ||
|
|
||
| static FieldsSelector create(ClustersProperties.Masking property) { | ||
| if (StringUtils.hasText(property.getFieldsNamePattern()) && !CollectionUtils.isEmpty(property.getFields())) { | ||
| throw new ValidationException("You can't provide both fieldNames & fieldsNamePattern for masking"); | ||
| } | ||
| if (StringUtils.hasText(property.getFieldsNamePattern())) { | ||
| Pattern pattern = Pattern.compile(property.getFieldsNamePattern()); | ||
| return f -> pattern.matcher(f).matches(); | ||
| } | ||
| if (!CollectionUtils.isEmpty(property.getFields())) { | ||
| return f -> property.getFields().contains(f); | ||
| } | ||
| //no pattern, no field names - mean all fields should be masked | ||
| return fieldName -> true; | ||
| } | ||
|
|
||
| boolean shouldBeMasked(String fieldName); | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.