Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EPMRPP-87165 || Add PBKDF2 encoding types #293

Closed
wants to merge 3 commits into from
Closed

EPMRPP-87165 || Add PBKDF2 encoding types #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d03b51f
EPMRPP-87165 || Add PBKDF2 encoding types
IvanKustau Dec 4, 2023
9a95c34
Merge remote-tracking branch 'origin/develop' into EPMRPP-87165-add-p…
IvanKustau Jan 30, 2024
caa6dfd
EPMRPP-87165 || Update dao version
IvanKustau Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependencies {
api 'com.epam.reportportal:commons-rules'
api 'com.epam.reportportal:commons-model'
} else {
api 'com.github.reportportal:commons-dao:83903f0'
api 'com.github.reportportal:commons-dao:17f6d28343'
api 'com.github.reportportal:commons-rules:83eda6051be4'
api 'com.github.reportportal:commons-model:af61954'
}
Expand Down
48 changes: 27 additions & 21 deletions src/main/java/com/epam/reportportal/auth/integration/ldap/LdapAuthProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.epam.ta.reportportal.dao.IntegrationRepository;
import com.epam.ta.reportportal.entity.integration.Integration;
import com.epam.ta.reportportal.exception.ReportPortalException;
import java.util.Map;
import org.jasypt.util.text.BasicTextEncryptor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
Expand All @@ -33,12 +34,14 @@
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.authentication.configurers.ldap.LdapAuthenticationProviderConfigurer;
import org.springframework.security.crypto.factory.PasswordEncoderFactories;
import org.springframework.security.crypto.password.DelegatingPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
import org.springframework.security.ldap.DefaultSpringSecurityContextSource;
import org.springframework.security.ldap.authentication.NullLdapAuthoritiesPopulator;

/**
* Plain LDAP auth provider.
* Plain LDAP auth provider
*
* @author Andrei Varabyeu
*/
Expand All @@ -50,8 +53,7 @@ public class LdapAuthProvider extends EnableableAuthProvider {
private BasicTextEncryptor encryptor;

public LdapAuthProvider(IntegrationRepository integrationRepository,
ApplicationEventPublisher eventPublisher,
DetailsContextMapper detailsContextMapper) {
ApplicationEventPublisher eventPublisher, DetailsContextMapper detailsContextMapper) {
super(integrationRepository, eventPublisher);
this.detailsContextMapper = detailsContextMapper;
}
Expand All @@ -65,24 +67,22 @@ protected boolean isEnabled() {
@Override
protected AuthenticationProvider getDelegate() {

Integration integration = integrationRepository.findAllByTypeIn(
AuthIntegrationType.LDAP.getName())
.stream()
.findFirst()
.orElseThrow(() -> new BadCredentialsException("LDAP is not configured"));
Integration integration =
integrationRepository.findAllByTypeIn(AuthIntegrationType.LDAP.getName()).stream()
.findFirst().orElseThrow(() -> new BadCredentialsException("LDAP is not configured"));

DefaultSpringSecurityContextSource contextSource = new DefaultSpringSecurityContextSource(
singletonList(LdapParameter.URL.getRequiredParameter(
integration)), LdapParameter.BASE_DN.getRequiredParameter(integration));
singletonList(LdapParameter.URL.getRequiredParameter(integration)),
LdapParameter.BASE_DN.getRequiredParameter(integration)
);
LdapParameter.MANAGER_PASSWORD.getParameter(integration)
.ifPresent(it -> contextSource.setPassword(encryptor.decrypt(it)));
LdapParameter.MANAGER_DN.getParameter(integration).ifPresent(contextSource::setUserDn);
contextSource.afterPropertiesSet();

LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder> builder =
new LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder>()
.contextSource(contextSource)
.ldapAuthoritiesPopulator(new NullLdapAuthoritiesPopulator())
new LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder>().contextSource(
contextSource).ldapAuthoritiesPopulator(new NullLdapAuthoritiesPopulator())
.userDetailsContextMapper(detailsContextMapper);

/*
Expand All @@ -94,20 +94,27 @@ protected AuthenticationProvider getDelegate() {
LdapParameter.USER_SEARCH_FILTER.getParameter(integration).ifPresent(builder::userSearchFilter);

LdapParameter.PASSWORD_ENCODER_TYPE.getParameter(integration).ifPresent(it -> {
LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder>
.PasswordCompareConfigurer passwordCompareConfigurer = builder.passwordCompare();
LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder>.PasswordCompareConfigurer
passwordCompareConfigurer = builder.passwordCompare();
LdapParameter.PASSWORD_ATTRIBUTE.getParameter(integration)
.ifPresent(passwordCompareConfigurer::passwordAttribute);

/*
* DIRTY HACK. If LDAP password has salt, ldaptemplate.compare operation does not work
* DIRTY HACK. If LDAP's password has solt, ldaptemplate.compare operation does not work
* since we don't know server's salt.
* To enable local password comparison, we need to provide password encoder from crypto's
* package
* To enable local password comparison, we need to provide password encoder from crypto's package
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [reviewdog] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> reported by reviewdog 🐶
Line is longer than 100 characters (found 103).

* This is why we just wrap old encoder with new one interface
* New encoder cannot be used everywhere since it does not have implementation for LDAP
*/
final PasswordEncoder delegate = PasswordEncoderFactories.createDelegatingPasswordEncoder();
final PasswordEncoder delegate;
if (it.equalsIgnoreCase("PBKDF2-HMAC-SHA512")) {
Pbkdf2PasswordEncoder pbkdf2HmacSha512Encoder = new Pbkdf2PasswordEncoder();
pbkdf2HmacSha512Encoder.setAlgorithm(
Pbkdf2PasswordEncoder.SecretKeyFactoryAlgorithm.PBKDF2WithHmacSHA512);
delegate = new DelegatingPasswordEncoder(it, Map.of(it, pbkdf2HmacSha512Encoder));
} else {
delegate = PasswordEncoderFactories.createDelegatingPasswordEncoder();
}
builder.passwordEncoder(new org.springframework.security.crypto.password.PasswordEncoder() {

@Override
Expand All @@ -126,8 +133,7 @@ public boolean matches(CharSequence rawPassword, String encodedPassword) {

try {
return (AuthenticationProvider) Accessible.on(builder)
.method(LdapAuthenticationProviderConfigurer.class.getDeclaredMethod("build"))
.invoke();
.method(LdapAuthenticationProviderConfigurer.class.getDeclaredMethod("build")).invoke();
} catch (Throwable e) {
throw new ReportPortalException("Cannot build LDAP auth provider", e);
}
Expand Down
Loading