fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
momo 2023-11-20 14:34:18 +08:00
commit e806342959
10 changed files with 90 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/ldap-admin/internal/logic/addldaporganizationmemberlogic.go
View File

@ -3,6 +3,7 @@ package logic
import ( import (
"fusenapi/utils/auth" "fusenapi/utils/auth"
"fusenapi/utils/basic" "fusenapi/utils/basic"
"fusenapi/utils/email"
"fusenapi/utils/ldap_lib" "fusenapi/utils/ldap_lib"
"strings" "strings"
@ -41,6 +42,10 @@ func (l *AddLdapOrganizationMemberLogic) AddLdapOrganizationMember(req *types.Ad
if len(req.UserDN) <= 3 || req.UserDN[:3] != "cn=" { if len(req.UserDN) <= 3 || req.UserDN[:3] != "cn=" {
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "无效的用户DN") return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "无效的用户DN")
} }
cnEmail := strings.Split(req.UserDN, ",")[0][3:]
if !email.IsEmailValid(cnEmail) {
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "错误的用户cn")
}
ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN) ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN)
err := ldapServer.AddUserToOrganization(req.OrganizationDN, req.UserDN) err := ldapServer.AddUserToOrganization(req.OrganizationDN, req.UserDN)
if err != nil { if err != nil {

10
server/ldap-admin/internal/logic/createldaporganizationlogic.go
View File

@ -36,7 +36,7 @@ func NewCreateLdapOrganizationLogic(ctx context.Context, svcCtx *svc.ServiceCont
func (l *CreateLdapOrganizationLogic) CreateLdapOrganization(req *types.CreateLdapOrganizationReq, userinfo *auth.UserInfo) (resp *basic.Response) { func (l *CreateLdapOrganizationLogic) CreateLdapOrganization(req *types.CreateLdapOrganizationReq, userinfo *auth.UserInfo) (resp *basic.Response) {
req.OrganizationEnName = strings.Trim(req.OrganizationEnName, " ") req.OrganizationEnName = strings.Trim(req.OrganizationEnName, " ")
req.ParentOrganizationDN = strings.Trim(req.ParentOrganizationDN, " ") req.ParentOrganizationDN = strings.Trim(req.ParentOrganizationDN, " ")
req.OrganizationName = strings.Trim(req.OrganizationName, " ") req.BusinessCategory = strings.Trim(req.BusinessCategory, " ")
if len(strings.Split(req.OrganizationEnName, ",")) != 1 { if len(strings.Split(req.OrganizationEnName, ",")) != 1 {
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误,组织英文名不符合规范") return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误,组织英文名不符合规范")
} }
@ -47,17 +47,17 @@ func (l *CreateLdapOrganizationLogic) CreateLdapOrganization(req *types.CreateLd
if req.ParentOrganizationDN == "" { if req.ParentOrganizationDN == "" {
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误,父级DN不能为空") return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误,父级DN不能为空")
} }
if req.OrganizationName == "" { if req.BusinessCategory == "" {
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误,组织中文名不能为空") return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误,组织分类名不能为空")
} }
//组装organization dn //组装organization dn
organizationDN := "ou=" + req.OrganizationEnName + "," + req.ParentOrganizationDN organizationDN := "ou=" + req.OrganizationEnName + "," + req.ParentOrganizationDN
ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN) ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN)
err := ldapServer.Create(organizationDN, map[string][]string{ err := ldapServer.Create(organizationDN, map[string][]string{
"objectClass": {"top", "groupOfUniqueNames"}, "objectClass": {"top", "groupOfUniqueNames"},
"cn": {req.OrganizationName}, "cn": {req.OrganizationEnName},
"ou": {req.OrganizationEnName}, "ou": {req.OrganizationEnName},
"businessCategory": {req.OrganizationName}, "businessCategory": {req.BusinessCategory},
"uniqueMember": {l.svcCtx.Config.Ldap.RootDN}, //创建groupOfUniqueNames对象类型需要至少一个member,把root加进去 "uniqueMember": {l.svcCtx.Config.Ldap.RootDN}, //创建groupOfUniqueNames对象类型需要至少一个member,把root加进去
}) })
if err != nil { if err != nil {

1
server/ldap-admin/internal/logic/createldapuserlogic.go
View File

@ -74,6 +74,7 @@ func (l *CreateLdapUserLogic) CreateLdapUser(req *types.CreateLdapUserReq, useri
"shadowWarning": {"7"}, //固有属性 "shadowWarning": {"7"}, //固有属性
"loginShell": {"/usr/sbin/nologin"}, //固有属性 "loginShell": {"/usr/sbin/nologin"}, //固有属性
"homeDirectory": {"/home/users/" + userNamePinyin}, "homeDirectory": {"/home/users/" + userNamePinyin},
"employeeType": {fmt.Sprintf("%d", req.EmployeeType)}, //1正式 2实习 3外包
"uidNumber": {fmt.Sprintf("%d", userData.Id)}, "uidNumber": {fmt.Sprintf("%d", userData.Id)},
"gidNumber": {fmt.Sprintf("%d", userData.Id)}, "gidNumber": {fmt.Sprintf("%d", userData.Id)},
"uid": {userNamePinyin}, "uid": {userNamePinyin},

15
server/ldap-admin/internal/logic/getldapuserinfologic.go
View File

@ -46,13 +46,14 @@ func (l *GetLdapUserInfoLogic) GetLdapUserInfo(req *types.GetLdapUserInfoReq, us
return resp.SetStatusWithMessage(basic.CodeServiceErr, err.Error()) return resp.SetStatusWithMessage(basic.CodeServiceErr, err.Error())
} }
return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetLdapUserInfoRsp{ return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetLdapUserInfoRsp{
UserId: user.UserId, UserId: user.UserId,
UserDN: user.UserDN, UserDN: user.UserDN,
UserName: user.UserName, UserName: user.UserName,
Email: user.Email, Email: user.Email,
Mobile: user.Mobile, Mobile: user.Mobile,
Avatar: user.Avatar, Avatar: user.Avatar,
Status: user.Status, Status: user.Status,
EmployeeTpye: user.EmployeeType,
}) })
} }

5
server/ldap-admin/internal/logic/removeldaporganizationmemberlogic.go
View File

@ -3,6 +3,7 @@ package logic
import ( import (
"fusenapi/utils/auth" "fusenapi/utils/auth"
"fusenapi/utils/basic" "fusenapi/utils/basic"
"fusenapi/utils/email"
"fusenapi/utils/ldap_lib" "fusenapi/utils/ldap_lib"
"strings" "strings"
@ -41,6 +42,10 @@ func (l *RemoveLdapOrganizationMemberLogic) RemoveLdapOrganizationMember(req *ty
if len(req.UserDN) <= 3 || req.UserDN[:3] != "cn=" { if len(req.UserDN) <= 3 || req.UserDN[:3] != "cn=" {
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误，无效的用户DN") return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误，无效的用户DN")
} }
cnEmail := strings.Split(req.UserDN, ",")[0][3:]
if !email.IsEmailValid(cnEmail) {
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "错误的用户cn")
}
ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN) ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN)
err := ldapServer.RemoveUserFromOrganization(req.OrganizationDN, req.UserDN) err := ldapServer.RemoveUserFromOrganization(req.OrganizationDN, req.UserDN)
if err != nil { if err != nil {

1
server/ldap-admin/internal/logic/updateldaporganizationlogic.go
View File

@ -42,7 +42,6 @@ func (l *UpdateLdapOrganizationLogic) UpdateLdapOrganization(req *types.UpdateLd
} }
ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN) ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN)
if err := ldapServer.Update(req.OrganizationDN, map[string][]string{ if err := ldapServer.Update(req.OrganizationDN, map[string][]string{
"cn": {req.BusinessCategory},
"businessCategory": {req.BusinessCategory}, "businessCategory": {req.BusinessCategory},
}); err != nil { }); err != nil {
logx.Error(err) logx.Error(err)

1
server/ldap-admin/internal/logic/updateldapuserlogic.go
View File

@ -62,6 +62,7 @@ func (l *UpdateLdapUserLogic) UpdateLdapUser(req *types.UpdateLdapUserReq, useri
"mobile": {req.Mobile}, "mobile": {req.Mobile},
"postalAddress": {req.Avatar}, "postalAddress": {req.Avatar},
"postalCode": {fmt.Sprintf("%d", req.Status)}, "postalCode": {fmt.Sprintf("%d", req.Status)},
"employeeType": {fmt.Sprintf("%d", req.EmployeeType)},
} }
err := ldapServer.Update(req.UserDN, attr) err := ldapServer.Update(req.UserDN, attr)
if err != nil { if err != nil {

43
server/ldap-admin/internal/types/types.go
View File

@ -117,7 +117,7 @@ type MenuItem struct {
type CreateLdapOrganizationReq struct { type CreateLdapOrganizationReq struct {
OrganizationEnName string `json:"organization_en_name"` //组织英文名 OrganizationEnName string `json:"organization_en_name"` //组织英文名
OrganizationName string `json:"organization_name"` //组织中文名称 BusinessCategory string `json:"business_category"` //组织类别
ParentOrganizationDN string `json:"parent_organization_dn"` //父级dn ParentOrganizationDN string `json:"parent_organization_dn"` //父级dn
} }
@ -131,21 +131,23 @@ type UpdateLdapOrganizationReq struct {
} }
type CreateLdapUserReq struct { type CreateLdapUserReq struct {
UserName string `json:"user_name"` //用户名 UserName string `json:"user_name"` //用户名
Email string `json:"email"` //邮箱 Email string `json:"email"` //邮箱
Password string `json:"password"` //密码 Password string `json:"password"` //密码
Mobile string `json:"mobile"` //手机号 Mobile string `json:"mobile"` //手机号
Avatar string `json:"avatar"` //头像地址 Avatar string `json:"avatar"` //头像地址
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包
Status int64 `json:"status,options=0|1"` //状态 1正常0离职
} }
type UpdateLdapUserReq struct { type UpdateLdapUserReq struct {
UserDN string `json:"user_dn"` //用户dn UserDN string `json:"user_dn"` //用户dn
UserName string `json:"user_name"` //用户名 UserName string `json:"user_name"` //用户名
Mobile string `json:"mobile,optional"` //手机号 Mobile string `json:"mobile,optional"` //手机号
Avatar string `json:"avatar,optional"` //头像地址 Avatar string `json:"avatar,optional"` //头像地址
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 Status int64 `json:"status,options=0|1"` //状态 1正常0离职
AuthGroupId int64 `json:"auth_group_id,optional"` //权限分组id EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包
AuthGroupId int64 `json:"auth_group_id,optional"` //权限分组id
} }
type UpdateLdapUserPwdReq struct { type UpdateLdapUserPwdReq struct {
@ -163,13 +165,14 @@ type GetLdapUserInfoReq struct {
} }
type GetLdapUserInfoRsp struct { type GetLdapUserInfoRsp struct {
UserId int64 `json:"userId"` UserId int64 `json:"userId"`
UserDN string `json:"user_dn"` UserDN string `json:"user_dn"`
UserName string `json:"user_name"` //用户名 UserName string `json:"user_name"` //用户名
Email string `json:"email"` //邮箱 Email string `json:"email"` //邮箱
Mobile string `json:"mobile"` //手机号 Mobile string `json:"mobile"` //手机号
Avatar string `json:"avatar"` //头像地址 Avatar string `json:"avatar"` //头像地址
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 EmployeeTpye int64 `json:"employee_tpye"` //雇佣类型 1正式 2实习 3外包
Status int64 `json:"status,options=0|1"` //状态 1正常0离职
} }
type AddLdapOrganizationMemberReq struct { type AddLdapOrganizationMemberReq struct {

47
server_api/ldap-admin.api
View File

@ -62,7 +62,7 @@ service ldap-admin {
//修改ldap组织 //修改ldap组织
@handler UpdateLdapOrganizationHandler @handler UpdateLdapOrganizationHandler
post /api/ldap-admin/update_ldap_organization(UpdateLdapOrganizationReq) returns (response); post /api/ldap-admin/update_ldap_organization(UpdateLdapOrganizationReq) returns (response);
//添加ldap用户到员工基本组中 //添加ldap用户帐号
@handler CreateLdapUserHandler @handler CreateLdapUserHandler
post /api/ldap-admin/create_ldap_user(CreateLdapUserReq) returns (response); post /api/ldap-admin/create_ldap_user(CreateLdapUserReq) returns (response);
//修改ldap用户信息 //修改ldap用户信息
@ -198,7 +198,7 @@ type MenuItem {
//增加ldap组织 //增加ldap组织
type CreateLdapOrganizationReq { type CreateLdapOrganizationReq {
OrganizationEnName string `json:"organization_en_name"` //组织英文名 OrganizationEnName string `json:"organization_en_name"` //组织英文名
OrganizationName string `json:"organization_name"` //组织中文名称 BusinessCategory string `json:"business_category"` //组织类别
ParentOrganizationDN string `json:"parent_organization_dn"` //父级dn ParentOrganizationDN string `json:"parent_organization_dn"` //父级dn
} }
//删除ldap组织 //删除ldap组织
@ -210,23 +210,25 @@ type UpdateLdapOrganizationReq {
OrganizationDN string `json:"organization_dn"` //组织dn OrganizationDN string `json:"organization_dn"` //组织dn
BusinessCategory string `json:"business_category"` //组织分类名称 BusinessCategory string `json:"business_category"` //组织分类名称
} }
//添加ldap用户到员工基本组中 //添加ldap用户帐号
type CreateLdapUserReq { type CreateLdapUserReq {
UserName string `json:"user_name"` //用户名 UserName string `json:"user_name"` //用户名
Email string `json:"email"` //邮箱 Email string `json:"email"` //邮箱
Password string `json:"password"` //密码 Password string `json:"password"` //密码
Mobile string `json:"mobile"` //手机号 Mobile string `json:"mobile"` //手机号
Avatar string `json:"avatar"` //头像地址 Avatar string `json:"avatar"` //头像地址
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包
Status int64 `json:"status,options=0|1"` //状态 1正常0离职
} }
//修改ldap用户信息 //修改ldap用户信息
type UpdateLdapUserReq { type UpdateLdapUserReq {
UserDN string `json:"user_dn"` //用户dn UserDN string `json:"user_dn"` //用户dn
UserName string `json:"user_name"` //用户名 UserName string `json:"user_name"` //用户名
Mobile string `json:"mobile,optional"` //手机号 Mobile string `json:"mobile,optional"` //手机号
Avatar string `json:"avatar,optional"` //头像地址 Avatar string `json:"avatar,optional"` //头像地址
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 Status int64 `json:"status,options=0|1"` //状态 1正常0离职
AuthGroupId int64 `json:"auth_group_id,optional"` //权限分组id EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包
AuthGroupId int64 `json:"auth_group_id,optional"` //权限分组id
} }
//修改用户密码 //修改用户密码
type UpdateLdapUserPwdReq { type UpdateLdapUserPwdReq {
@ -243,13 +245,14 @@ type GetLdapUserInfoReq {
UserDN string `form:"user_dn"` //用户dn UserDN string `form:"user_dn"` //用户dn
} }
type GetLdapUserInfoRsp { type GetLdapUserInfoRsp {
UserId int64 `json:"userId"` UserId int64 `json:"userId"`
UserDN string `json:"user_dn"` UserDN string `json:"user_dn"`
UserName string `json:"user_name"` //用户名 UserName string `json:"user_name"` //用户名
Email string `json:"email"` //邮箱 Email string `json:"email"` //邮箱
Mobile string `json:"mobile"` //手机号 Mobile string `json:"mobile"` //手机号
Avatar string `json:"avatar"` //头像地址 Avatar string `json:"avatar"` //头像地址
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 EmployeeTpye int64 `json:"employee_tpye"` //雇佣类型 1正式 2实习 3外包
Status int64 `json:"status,options=0|1"` //状态 1正常0离职
} }
//ldap组织添加成员 //ldap组织添加成员
type AddLdapOrganizationMemberReq { type AddLdapOrganizationMemberReq {

25
utils/ldap_lib/ldap_user.go
View File

@ -9,14 +9,15 @@ import (
) )
type GetLdapUserInfoRsp struct { type GetLdapUserInfoRsp struct {
UserId int64 `json:"userId"` UserId int64 `json:"userId"`
UserDN string `json:"user_dn"` UserDN string `json:"user_dn"`
UserName string `json:"user_name"` //用户名 UserName string `json:"user_name"` //用户名
Password string `json:"password"` //密码 Password string `json:"password"` //密码
Email string `json:"email"` //邮箱 Email string `json:"email"` //邮箱
Mobile string `json:"mobile"` //手机号 Mobile string `json:"mobile"` //手机号
Avatar string `json:"avatar"` //头像地址 Avatar string `json:"avatar"` //头像地址
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 EmployeeType int64 `json:"employee_type"` //1正式 2实习 3外包
Status int64 `json:"status,options=0|1"` //状态 1正常0离职
} }
func (l *Ldap) GetLdapUserInfo(userDN string) (*GetLdapUserInfoRsp, error) { func (l *Ldap) GetLdapUserInfo(userDN string) (*GetLdapUserInfoRsp, error) {
@ -54,6 +55,14 @@ func (l *Ldap) GetLdapUserInfo(userDN string) (*GetLdapUserInfoRsp, error) {
user.Avatar = strings.Join(attr.Values, "") user.Avatar = strings.Join(attr.Values, "")
case "userPassword": //密码 case "userPassword": //密码
user.Password = strings.Join(attr.Values, ",") user.Password = strings.Join(attr.Values, ",")
case "employeeType": //员工类型
if len(attr.Values) == 0 {
continue
}
user.EmployeeType, err = strconv.ParseInt(attr.Values[0], 10, 64)
if err != nil {
return nil, errors.New("用户类型转数字失败")
}
case "postalCode": //状态 case "postalCode": //状态
if len(attr.Values) == 0 { if len(attr.Values) == 0 {
continue continue