From 176355d7a6af57e9206e3fd6ed21845d955c431f Mon Sep 17 00:00:00 2001 From: shimingxy Date: Tue, 12 Nov 2024 10:02:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=8Aactivedirectory=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0org.dromara.maxkey.ldap.activedirect?= =?UTF-8?q?ory=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maxkey/authn/realm/ldap/ActiveDirectoryServer.java | 2 +- .../authn/realm/ldap/LdapAuthenticationRealmService.java | 2 +- .../maxkey/authn/realm/ldap/ActiveDirectoryServer.java | 2 +- .../authn/realm/ldap/LdapAuthenticationRealmService.java | 2 +- .../ldap/{ => activedirectory}/ActiveDirectoryUtils.java | 3 ++- .../{ => activedirectory}/constants/ActiveDirectoryUser.java | 2 +- .../constants/ActiveDirectoryUserAccountControl.java | 2 +- .../maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java | 2 +- .../saml20/provider/xml/AttributeStatementGenerator.java | 2 +- .../activedirectory/ActiveDirectoryOrganizationService.java | 2 +- .../activedirectory/ActiveDirectorySynchronizerService.java | 2 +- .../activedirectory/ActiveDirectoryUsersService.java | 4 ++-- .../web/config/contorller/CnfLdapContextController.java | 2 +- 13 files changed, 15 insertions(+), 14 deletions(-) rename maxkey-common/src/main/java/org/dromara/maxkey/ldap/{ => activedirectory}/ActiveDirectoryUtils.java (97%) rename maxkey-common/src/main/java/org/dromara/maxkey/ldap/{ => activedirectory}/constants/ActiveDirectoryUser.java (99%) rename maxkey-common/src/main/java/org/dromara/maxkey/ldap/{ => activedirectory}/constants/ActiveDirectoryUserAccountControl.java (97%) diff --git a/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java b/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java index 8cd4a988..55dde105 100644 --- a/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java +++ b/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java @@ -21,7 +21,7 @@ package org.dromara.maxkey.authn.realm.ldap; import org.dromara.maxkey.authn.realm.IAuthenticationServer; -import org.dromara.maxkey.ldap.ActiveDirectoryUtils; +import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java b/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java index 3bd221ab..26d749c2 100644 --- a/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java +++ b/maxkey-authentications/maxkey-authentication-provider-mgt/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java @@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit; import org.dromara.maxkey.authn.realm.IAuthenticationServer; import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.dromara.maxkey.entity.cnf.CnfLdapContext; -import org.dromara.maxkey.ldap.ActiveDirectoryUtils; import org.dromara.maxkey.ldap.LdapUtils; +import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils; import org.dromara.maxkey.persistence.service.CnfLdapContextService; import com.github.benmanes.caffeine.cache.Cache; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java index 8cd4a988..55dde105 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java @@ -21,7 +21,7 @@ package org.dromara.maxkey.authn.realm.ldap; import org.dromara.maxkey.authn.realm.IAuthenticationServer; -import org.dromara.maxkey.ldap.ActiveDirectoryUtils; +import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java index 3bd221ab..26d749c2 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealmService.java @@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit; import org.dromara.maxkey.authn.realm.IAuthenticationServer; import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.dromara.maxkey.entity.cnf.CnfLdapContext; -import org.dromara.maxkey.ldap.ActiveDirectoryUtils; import org.dromara.maxkey.ldap.LdapUtils; +import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils; import org.dromara.maxkey.persistence.service.CnfLdapContextService; import com.github.benmanes.caffeine.cache.Cache; diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/ActiveDirectoryUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java similarity index 97% rename from maxkey-common/src/main/java/org/dromara/maxkey/ldap/ActiveDirectoryUtils.java rename to maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java index f0590873..c7b6b473 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/ActiveDirectoryUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/ActiveDirectoryUtils.java @@ -15,7 +15,7 @@ */ -package org.dromara.maxkey.ldap; +package org.dromara.maxkey.ldap.activedirectory; import java.util.Properties; @@ -23,6 +23,7 @@ import javax.naming.Context; import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; +import org.dromara.maxkey.ldap.LdapUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/ActiveDirectoryUser.java b/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java similarity index 99% rename from maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/ActiveDirectoryUser.java rename to maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java index fec831a1..c116b64a 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/ActiveDirectoryUser.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUser.java @@ -15,7 +15,7 @@ */ -package org.dromara.maxkey.ldap.constants; +package org.dromara.maxkey.ldap.activedirectory.constants; import java.io.UnsupportedEncodingException; import java.util.ArrayList; diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/ActiveDirectoryUserAccountControl.java b/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java similarity index 97% rename from maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/ActiveDirectoryUserAccountControl.java rename to maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java index 02c4eb95..954d8df1 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/ldap/constants/ActiveDirectoryUserAccountControl.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/ldap/activedirectory/constants/ActiveDirectoryUserAccountControl.java @@ -15,7 +15,7 @@ */ -package org.dromara.maxkey.ldap.constants; +package org.dromara.maxkey.ldap.activedirectory.constants; /** userAccountControl值得说明 * http://support.microsoft.com/zh-cn/kb/305144 diff --git a/maxkey-core/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java b/maxkey-core/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java index 94675d63..e47d11fc 100644 --- a/maxkey-core/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java +++ b/maxkey-core/src/test/java/org/dromara/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java @@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.ldap; import javax.naming.NamingException; import javax.naming.directory.DirContext; -import org.dromara.maxkey.ldap.ActiveDirectoryUtils; +import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils; public class ActiveDirectoryUtilsTest { public static void main(String[] args) throws Exception { diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java index 7a8d064d..01812901 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/xml/AttributeStatementGenerator.java @@ -29,7 +29,7 @@ import org.dromara.maxkey.entity.ExtraAttr; import org.dromara.maxkey.entity.ExtraAttrs; import org.dromara.maxkey.entity.apps.AppsSAML20Details; import org.dromara.maxkey.entity.idm.UserInfo; -import org.dromara.maxkey.ldap.constants.ActiveDirectoryUser; +import org.dromara.maxkey.ldap.activedirectory.constants.ActiveDirectoryUser; import org.opensaml.Configuration; import org.opensaml.saml2.core.Attribute; import org.opensaml.saml2.core.AttributeStatement; diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java index 04d8aab3..928a0327 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java @@ -33,8 +33,8 @@ import org.dromara.maxkey.constants.ConstsStatus; import org.dromara.maxkey.entity.SynchroRelated; import org.dromara.maxkey.entity.history.HistorySynchronizer; import org.dromara.maxkey.entity.idm.Organizations; -import org.dromara.maxkey.ldap.ActiveDirectoryUtils; import org.dromara.maxkey.ldap.LdapUtils; +import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils; import org.dromara.maxkey.ldap.constants.OrganizationalUnit; import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; import org.dromara.maxkey.synchronizer.ISynchronizerService; diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java index 672d928f..d250e0fd 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectorySynchronizerService.java @@ -18,7 +18,7 @@ package org.dromara.maxkey.synchronizer.activedirectory; import org.dromara.maxkey.entity.Synchronizers; -import org.dromara.maxkey.ldap.ActiveDirectoryUtils; +import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils; import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java index 533bb21b..f2459b7d 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/dromara/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java @@ -34,9 +34,9 @@ import org.dromara.maxkey.entity.SynchroRelated; import org.dromara.maxkey.entity.history.HistorySynchronizer; import org.dromara.maxkey.entity.idm.Organizations; import org.dromara.maxkey.entity.idm.UserInfo; -import org.dromara.maxkey.ldap.ActiveDirectoryUtils; import org.dromara.maxkey.ldap.LdapUtils; -import org.dromara.maxkey.ldap.constants.ActiveDirectoryUser; +import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils; +import org.dromara.maxkey.ldap.activedirectory.constants.ActiveDirectoryUser; import org.dromara.maxkey.synchronizer.AbstractSynchronizerService; import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.dromara.maxkey.entity.SyncJobConfigField; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfLdapContextController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfLdapContextController.java index 7d2c28c7..3244709b 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfLdapContextController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/CnfLdapContextController.java @@ -23,8 +23,8 @@ import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.cnf.CnfLdapContext; import org.dromara.maxkey.entity.idm.UserInfo; -import org.dromara.maxkey.ldap.ActiveDirectoryUtils; import org.dromara.maxkey.ldap.LdapUtils; +import org.dromara.maxkey.ldap.activedirectory.ActiveDirectoryUtils; import org.dromara.maxkey.persistence.service.CnfLdapContextService; import org.slf4j.Logger; import org.slf4j.LoggerFactory;