diff --git a/server/ldap-admin/internal/logic/getldaporganizationmemberslogic.go b/server/ldap-admin/internal/logic/getldaporganizationmemberslogic.go index 0840862c..fb73cfc2 100644 --- a/server/ldap-admin/internal/logic/getldaporganizationmemberslogic.go +++ b/server/ldap-admin/internal/logic/getldaporganizationmemberslogic.go @@ -36,7 +36,11 @@ func (l *GetLdapOrganizationMembersLogic) GetLdapOrganizationMembers(req *types. if len(req.OrganizationDN) <= 3 || req.OrganizationDN[:3] != "ou=" { return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误,无效的组织DN") } - + //先获取组织信息 + /*ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN) + filter := "(objectClass=groupOfUniqueNames)" + fields := "" + ldapServer.Search(req.OrganizationDN, ldap.ScopeWholeSubtree, filter, nil, nil)*/ return resp.SetStatus(basic.CodeOK) } diff --git a/server/ldap-admin/internal/logic/getldapuserinfologic.go b/server/ldap-admin/internal/logic/getldapuserinfologic.go index 918bee64..e754915e 100644 --- a/server/ldap-admin/internal/logic/getldapuserinfologic.go +++ b/server/ldap-admin/internal/logic/getldapuserinfologic.go @@ -38,15 +38,14 @@ func (l *GetLdapUserInfoLogic) GetLdapUserInfo(req *types.GetLdapUserInfoReq, us return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误,用户DN错误") } ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN) - res, err := ldapServer.Search(req.UserDN, ldap.ScopeWholeSubtree, "", nil, nil) + res, err := ldapServer.Search(req.UserDN, ldap.ScopeWholeSubtree, "(objectClass=inetOrgPerson)", nil, nil) if err != nil { logx.Error(err) return resp.SetStatusWithMessage(basic.CodeServiceErr, "获取用户信息失败:"+err.Error()) } - if len(res.Entries) > 1 { - return resp.SetStatusWithMessage(basic.CodeServiceErr, "查询到的不是用户信息") + if len(res.Entries) != 1 { + return resp.SetStatusWithMessage(basic.CodeServiceErr, "查询到不到用户信息") } - isUser := false apiRsp := types.GetLdapUserInfoRsp{ UserId: 0, Status: 0, @@ -55,15 +54,6 @@ func (l *GetLdapUserInfoLogic) GetLdapUserInfo(req *types.GetLdapUserInfoReq, us apiRsp.UserDN = entry.DN for _, attr := range entry.Attributes { switch attr.Name { - case "objectClass": //objectcalss属性特别处理 - for _, objectClassVal := range attr.Values { - if objectClassVal == "inetOrgPerson" { - isUser = true - } - } - if !isUser { - return resp.SetStatusWithMessage(basic.CodeServiceErr, "查询到的不是用户信息!!") - } case "uidNumber": //用户id if len(attr.Values) == 0 { return resp.SetStatusWithMessage(basic.CodeServiceErr, "用户id不存在")