yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-01 05:03:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix fetch loginConfiguration. (#17402)

Browse Source
This commit is contained in:
Siddhant 2024-08-12 19:37:58 +05:30 committed by GitHub
parent 34dc79b5fe
commit 330b97a669
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openmetadata-service/src/main/java/org/openmetadata/service/security/SecurityUtil.java
View File

@ -32,7 +32,10 @@ import javax.ws.rs.core.SecurityContext;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.api.configuration.LoginConfiguration;
import org.openmetadata.schema.settings.SettingsType;
import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.OpenMetadataApplicationConfig;
import org.openmetadata.service.resources.settings.SettingsCache;
@Slf4j @Slf4j
public final class SecurityUtil { public final class SecurityUtil {
@ -45,6 +48,10 @@ public final class SecurityUtil {
return principal == null ? null : principal.getName().split("[/@]")[0]; return principal == null ? null : principal.getName().split("[/@]")[0];
} }
public static LoginConfiguration getLoginConfiguration() {
return SettingsCache.getSetting(SettingsType.LOGIN_CONFIGURATION, LoginConfiguration.class);
}
public static Map<String, String> authHeaders(String username) { public static Map<String, String> authHeaders(String username) {
Builder<String, String> builder = ImmutableMap.builder(); Builder<String, String> builder = ImmutableMap.builder();
if (username != null) { if (username != null) {

15
openmetadata-service/src/main/java/org/openmetadata/service/security/auth/BasicAuthenticator.java
View File

@ -57,7 +57,6 @@ import javax.ws.rs.core.UriInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.TokenInterface; import org.openmetadata.schema.TokenInterface;
import org.openmetadata.schema.api.configuration.LoginConfiguration;
import org.openmetadata.schema.api.security.AuthorizerConfiguration; import org.openmetadata.schema.api.security.AuthorizerConfiguration;
import org.openmetadata.schema.api.teams.CreateUser; import org.openmetadata.schema.api.teams.CreateUser;
import org.openmetadata.schema.auth.BasicAuthMechanism; import org.openmetadata.schema.auth.BasicAuthMechanism;
@ -74,15 +73,14 @@ import org.openmetadata.schema.auth.TokenRefreshRequest;
import org.openmetadata.schema.email.SmtpSettings; import org.openmetadata.schema.email.SmtpSettings;
import org.openmetadata.schema.entity.teams.AuthenticationMechanism; import org.openmetadata.schema.entity.teams.AuthenticationMechanism;
import org.openmetadata.schema.entity.teams.User; import org.openmetadata.schema.entity.teams.User;
import org.openmetadata.schema.settings.SettingsType;
import org.openmetadata.service.Entity; import org.openmetadata.service.Entity;
import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.OpenMetadataApplicationConfig;
import org.openmetadata.service.auth.JwtResponse; import org.openmetadata.service.auth.JwtResponse;
import org.openmetadata.service.exception.CustomExceptionMessage; import org.openmetadata.service.exception.CustomExceptionMessage;
import org.openmetadata.service.jdbi3.TokenRepository; import org.openmetadata.service.jdbi3.TokenRepository;
import org.openmetadata.service.jdbi3.UserRepository; import org.openmetadata.service.jdbi3.UserRepository;
import org.openmetadata.service.resources.settings.SettingsCache;
import org.openmetadata.service.security.AuthenticationException; import org.openmetadata.service.security.AuthenticationException;
import org.openmetadata.service.security.SecurityUtil;
import org.openmetadata.service.security.jwt.JWTTokenGenerator; import org.openmetadata.service.security.jwt.JWTTokenGenerator;
import org.openmetadata.service.util.EmailUtil; import org.openmetadata.service.util.EmailUtil;
import org.openmetadata.service.util.EntityUtil; import org.openmetadata.service.util.EntityUtil;
@ -99,7 +97,6 @@ public class BasicAuthenticator implements AuthenticatorHandler {
private TokenRepository tokenRepository; private TokenRepository tokenRepository;
private LoginAttemptCache loginAttemptCache; private LoginAttemptCache loginAttemptCache;
private AuthorizerConfiguration authorizerConfiguration; private AuthorizerConfiguration authorizerConfiguration;
private LoginConfiguration loginConfiguration;
private boolean isEmailServiceEnabled; private boolean isEmailServiceEnabled;
private boolean isSelfSignUpAvailable; private boolean isSelfSignUpAvailable;
@ -112,8 +109,6 @@ public class BasicAuthenticator implements AuthenticatorHandler {
SmtpSettings smtpSettings = config.getSmtpSettings(); SmtpSettings smtpSettings = config.getSmtpSettings();
this.isEmailServiceEnabled = smtpSettings != null && smtpSettings.getEnableSmtpServer(); this.isEmailServiceEnabled = smtpSettings != null && smtpSettings.getEnableSmtpServer();
this.isSelfSignUpAvailable = config.getAuthenticationConfiguration().getEnableSelfSignup(); this.isSelfSignUpAvailable = config.getAuthenticationConfiguration().getEnableSelfSignup();
this.loginConfiguration =
SettingsCache.getSetting(SettingsType.LOGIN_CONFIGURATION, LoginConfiguration.class);
} }
@Override @Override
@ -389,7 +384,7 @@ public class BasicAuthenticator implements AuthenticatorHandler {
getRoleListFromUser(storedUser), getRoleListFromUser(storedUser),
!nullOrEmpty(storedUser.getIsAdmin()) && storedUser.getIsAdmin(), !nullOrEmpty(storedUser.getIsAdmin()) && storedUser.getIsAdmin(),
storedUser.getEmail(), storedUser.getEmail(),
loginConfiguration.getJwtTokenExpiryTime(), SecurityUtil.getLoginConfiguration().getJwtTokenExpiryTime(),
false, false,
ServiceTokenType.OM_USER); ServiceTokenType.OM_USER);
JwtResponse response = new JwtResponse(); JwtResponse response = new JwtResponse();
@ -471,7 +466,7 @@ public class BasicAuthenticator implements AuthenticatorHandler {
checkIfLoginBlocked(userName); checkIfLoginBlocked(userName);
User storedUser = lookUserInProvider(userName); User storedUser = lookUserInProvider(userName);
validatePassword(userName, storedUser, loginRequest.getPassword()); validatePassword(userName, storedUser, loginRequest.getPassword());
return getJwtResponse(storedUser, loginConfiguration.getJwtTokenExpiryTime()); return getJwtResponse(storedUser, SecurityUtil.getLoginConfiguration().getJwtTokenExpiryTime());
} }
@Override @Override
@ -486,13 +481,13 @@ public class BasicAuthenticator implements AuthenticatorHandler {
throws TemplateException, IOException { throws TemplateException, IOException {
loginAttemptCache.recordFailedLogin(providedIdentity); loginAttemptCache.recordFailedLogin(providedIdentity);
int failedLoginAttempt = loginAttemptCache.getUserFailedLoginCount(providedIdentity); int failedLoginAttempt = loginAttemptCache.getUserFailedLoginCount(providedIdentity);
if (failedLoginAttempt == loginConfiguration.getMaxLoginFailAttempts()) { if (failedLoginAttempt == SecurityUtil.getLoginConfiguration().getMaxLoginFailAttempts()) {
EmailUtil.sendAccountStatus( EmailUtil.sendAccountStatus(
storedUser, storedUser,
"Multiple Failed Login Attempts.", "Multiple Failed Login Attempts.",
String.format( String.format(
"Someone is trying to access your account. Login is Blocked for %s minutes. Please change your password.", "Someone is trying to access your account. Login is Blocked for %s minutes. Please change your password.",
loginConfiguration.getAccessBlockTime())); SecurityUtil.getLoginConfiguration().getAccessBlockTime()));
} }
} }

13
openmetadata-service/src/main/java/org/openmetadata/service/security/auth/LdapAuthenticator.java
View File

@ -33,7 +33,6 @@ import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.api.configuration.LoginConfiguration;
import org.openmetadata.schema.api.teams.CreateUser; import org.openmetadata.schema.api.teams.CreateUser;
import org.openmetadata.schema.auth.LdapConfiguration; import org.openmetadata.schema.auth.LdapConfiguration;
import org.openmetadata.schema.auth.LoginRequest; import org.openmetadata.schema.auth.LoginRequest;
@ -41,7 +40,6 @@ import org.openmetadata.schema.auth.RefreshToken;
import org.openmetadata.schema.entity.teams.Role; import org.openmetadata.schema.entity.teams.Role;
import org.openmetadata.schema.entity.teams.User; import org.openmetadata.schema.entity.teams.User;
import org.openmetadata.schema.services.connections.metadata.AuthProvider; import org.openmetadata.schema.services.connections.metadata.AuthProvider;
import org.openmetadata.schema.settings.SettingsType;
import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.EntityReference;
import org.openmetadata.service.Entity; import org.openmetadata.service.Entity;
import org.openmetadata.service.OpenMetadataApplicationConfig; import org.openmetadata.service.OpenMetadataApplicationConfig;
@ -52,8 +50,8 @@ import org.openmetadata.service.exception.UnhandledServerException;
import org.openmetadata.service.jdbi3.RoleRepository; import org.openmetadata.service.jdbi3.RoleRepository;
import org.openmetadata.service.jdbi3.TokenRepository; import org.openmetadata.service.jdbi3.TokenRepository;
import org.openmetadata.service.jdbi3.UserRepository; import org.openmetadata.service.jdbi3.UserRepository;
import org.openmetadata.service.resources.settings.SettingsCache;
import org.openmetadata.service.security.AuthenticationException; import org.openmetadata.service.security.AuthenticationException;
import org.openmetadata.service.security.SecurityUtil;
import org.openmetadata.service.util.EmailUtil; import org.openmetadata.service.util.EmailUtil;
import org.openmetadata.service.util.JsonUtils; import org.openmetadata.service.util.JsonUtils;
import org.openmetadata.service.util.LdapUtil; import org.openmetadata.service.util.LdapUtil;
@ -71,7 +69,6 @@ public class LdapAuthenticator implements AuthenticatorHandler {
private LoginAttemptCache loginAttemptCache; private LoginAttemptCache loginAttemptCache;
private LdapConfiguration ldapConfiguration; private LdapConfiguration ldapConfiguration;
private LDAPConnectionPool ldapLookupConnectionPool; private LDAPConnectionPool ldapLookupConnectionPool;
private LoginConfiguration loginConfiguration;
@Override @Override
public void init(OpenMetadataApplicationConfig config) { public void init(OpenMetadataApplicationConfig config) {
@ -87,8 +84,6 @@ public class LdapAuthenticator implements AuthenticatorHandler {
this.tokenRepository = Entity.getTokenRepository(); this.tokenRepository = Entity.getTokenRepository();
this.ldapConfiguration = config.getAuthenticationConfiguration().getLdapConfiguration(); this.ldapConfiguration = config.getAuthenticationConfiguration().getLdapConfiguration();
this.loginAttemptCache = new LoginAttemptCache(); this.loginAttemptCache = new LoginAttemptCache();
this.loginConfiguration =
SettingsCache.getSetting(SettingsType.LOGIN_CONFIGURATION, LoginConfiguration.class);
} }
private LDAPConnectionPool getLdapConnectionPool(LdapConfiguration ldapConfiguration) { private LDAPConnectionPool getLdapConnectionPool(LdapConfiguration ldapConfiguration) {
@ -133,7 +128,7 @@ public class LdapAuthenticator implements AuthenticatorHandler {
User omUser = User omUser =
checkAndCreateUser( checkAndCreateUser(
storedUser.getEmail(), storedUser.getFullyQualifiedName(), storedUser.getName()); storedUser.getEmail(), storedUser.getFullyQualifiedName(), storedUser.getName());
return getJwtResponse(omUser, loginConfiguration.getJwtTokenExpiryTime()); return getJwtResponse(omUser, SecurityUtil.getLoginConfiguration().getJwtTokenExpiryTime());
} }
/** /**
@ -178,13 +173,13 @@ public class LdapAuthenticator implements AuthenticatorHandler {
throws TemplateException, IOException { throws TemplateException, IOException {
loginAttemptCache.recordFailedLogin(providedIdentity); loginAttemptCache.recordFailedLogin(providedIdentity);
int failedLoginAttempt = loginAttemptCache.getUserFailedLoginCount(providedIdentity); int failedLoginAttempt = loginAttemptCache.getUserFailedLoginCount(providedIdentity);
if (failedLoginAttempt == loginConfiguration.getMaxLoginFailAttempts()) { if (failedLoginAttempt == SecurityUtil.getLoginConfiguration().getMaxLoginFailAttempts()) {
EmailUtil.sendAccountStatus( EmailUtil.sendAccountStatus(
storedUser, storedUser,
"Multiple Failed Login Attempts.", "Multiple Failed Login Attempts.",
String.format( String.format(
"Someone is tried accessing your account. Login is Blocked for %s seconds.", "Someone is tried accessing your account. Login is Blocked for %s seconds.",
loginConfiguration.getAccessBlockTime())); SecurityUtil.getLoginConfiguration().getAccessBlockTime()));
} }
} }