Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yujianwangzivayy
MaxKey
提交
d00feb32
MaxKey
项目概览
yujianwangzivayy
/
MaxKey
与 Fork 源项目一致
Fork自
MaxKey单点登录官方(MaxKeyTop) / MaxKey
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MaxKey
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d00feb32
编写于
9月 09, 2022
作者:
M
MaxKey
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
LDAP Synchronize fix
上级
03a8ae6f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
4 deletion
+23
-4
maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java
...r/activedirectory/ActiveDirectoryOrganizationService.java
+5
-1
maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java
...hronizer/activedirectory/ActiveDirectoryUsersService.java
+6
-1
maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java
...org/maxkey/synchronizer/ldap/LdapOrganizationService.java
+6
-1
maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java
...n/java/org/maxkey/synchronizer/ldap/LdapUsersService.java
+6
-1
未找到文件。
maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java
浏览文件 @
d00feb32
...
...
@@ -180,7 +180,11 @@ public class ActiveDirectoryOrganizationService extends AbstractSynchronizerSer
try
{
Organizations
org
=
new
Organizations
();
org
.
setLdapDn
(
nameInNamespace
);
String
[]
namePaths
=
name
.
replaceAll
(
",OU="
,
"/"
).
replaceAll
(
"OU="
,
"/"
).
split
(
"/"
);
String
[]
namePaths
=
name
.
replaceAll
(
",OU="
,
"/"
)
.
replaceAll
(
"OU="
,
"/"
)
.
replaceAll
(
",ou="
,
"/"
)
.
replaceAll
(
"ou="
,
"/"
)
.
split
(
"/"
);
String
namePah
=
"/"
+
rootOrganization
.
getOrgName
();
for
(
int
i
=
namePaths
.
length
-
1
;
i
>=
0
;
i
--)
{
namePah
=
namePah
+
"/"
+
namePaths
[
i
];
...
...
maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java
浏览文件 @
d00feb32
...
...
@@ -119,7 +119,12 @@ public class ActiveDirectoryUsersService extends AbstractSynchronizerService
UserInfo
userInfo
=
new
UserInfo
();
userInfo
.
setLdapDn
(
nameInNamespace
);
String
[]
namePaths
=
name
.
replaceAll
(
",OU="
,
"/"
).
replaceAll
(
"OU="
,
"/"
).
split
(
"/"
);
String
[]
namePaths
=
name
.
replaceAll
(
",OU="
,
"/"
)
.
replaceAll
(
"OU="
,
"/"
)
.
replaceAll
(
",ou="
,
"/"
)
.
replaceAll
(
"ou="
,
"/"
)
.
split
(
"/"
);
String
namePah
=
"/"
+
rootOrganization
.
getOrgName
();
for
(
int
i
=
namePaths
.
length
-
1
;
i
>=
0
;
i
--)
{
namePah
=
namePah
+
"/"
+
namePaths
[
i
];
...
...
maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java
浏览文件 @
d00feb32
...
...
@@ -174,7 +174,12 @@ public class LdapOrganizationService extends AbstractSynchronizerService implem
try
{
Organizations
org
=
new
Organizations
();
org
.
setLdapDn
(
nameInNamespace
);
String
[]
namePaths
=
name
.
replaceAll
(
",OU="
,
"/"
).
replaceAll
(
"OU="
,
"/"
).
split
(
"/"
);
String
[]
namePaths
=
name
.
replaceAll
(
",OU="
,
"/"
)
.
replaceAll
(
"OU="
,
"/"
)
.
replaceAll
(
",ou="
,
"/"
)
.
replaceAll
(
"ou="
,
"/"
)
.
split
(
"/"
);
String
namePah
=
"/"
+
rootOrganization
.
getOrgName
();
for
(
int
i
=
namePaths
.
length
-
1
;
i
>=
0
;
i
--)
{
namePah
=
namePah
+
"/"
+
namePaths
[
i
];
...
...
maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java
浏览文件 @
d00feb32
...
...
@@ -52,6 +52,7 @@ public class LdapUsersService extends AbstractSynchronizerService implements IS
constraints
.
setSearchScope
(
ldapUtils
.
getSearchScope
());
String
filter
=
StringUtils
.
isNotBlank
(
this
.
getSynchronizer
().
getFilters
())
?
getSynchronizer
().
getFilters
()
:
"(&(objectClass=inetOrgPerson))"
;
_logger
.
debug
(
" User filter {} "
,
filter
);
NamingEnumeration
<
SearchResult
>
results
=
ldapUtils
.
getConnection
().
search
(
ldapUtils
.
getBaseDN
(),
filter
,
constraints
);
...
...
@@ -110,7 +111,11 @@ public class LdapUsersService extends AbstractSynchronizerService implements IS
public
UserInfo
buildUserInfo
(
HashMap
<
String
,
Attribute
>
attributeMap
,
String
name
,
String
nameInNamespace
)
{
UserInfo
userInfo
=
new
UserInfo
();
userInfo
.
setLdapDn
(
nameInNamespace
);
String
[]
namePaths
=
name
.
replaceAll
(
",OU="
,
"/"
).
replaceAll
(
"OU="
,
"/"
).
split
(
"/"
);
String
[]
namePaths
=
name
.
replaceAll
(
",OU="
,
"/"
)
.
replaceAll
(
"OU="
,
"/"
)
.
replaceAll
(
",ou="
,
"/"
)
.
replaceAll
(
"ou="
,
"/"
)
.
split
(
"/"
);
String
namePah
=
"/"
+
rootOrganization
.
getOrgName
();
for
(
int
i
=
namePaths
.
length
-
1
;
i
>=
0
;
i
--)
{
namePah
=
namePah
+
"/"
+
namePaths
[
i
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录