AY's Macbook Pro 3 жил өмнө
parent
commit
27c5f9e6ac

+ 1 - 1
ldap.go

@@ -32,6 +32,6 @@ func ldapInit() {
 	adminRouter.HandleFunc("/system/auth/ldap/config/read", ldapHandler.ReadConfig)
 	adminRouter.HandleFunc("/system/auth/ldap/config/write", ldapHandler.WriteConfig)
 	adminRouter.HandleFunc("/system/auth/ldap/config/testConnection", ldapHandler.TestConnection)
-	adminRouter.HandleFunc("/system/auth/ldap/config/syncorizeUser", ldapHandler.SyncorizeUser)
+	adminRouter.HandleFunc("/system/auth/ldap/config/syncorizeUser", ldapHandler.SynchronizeUser)
 
 }

+ 1 - 1
mod/auth/ldap/ldap.go

@@ -225,7 +225,7 @@ func (ldap *ldapHandler) TestConnection(w http.ResponseWriter, r *http.Request)
 	common.SendJSONResponse(w, string(accountJSON))
 }
 
-func (ldap *ldapHandler) SyncorizeUser(w http.ResponseWriter, r *http.Request) {
+func (ldap *ldapHandler) SynchronizeUser(w http.ResponseWriter, r *http.Request) {
 	//currentLoggedInUser, err := ldap.userHandler.GetUserInfoFromRequest(w, r)
 	//if err != nil {
 	//	common.SendErrorResponse(w, "Error while getting user info")

+ 9 - 2
mod/auth/ldap/ldapreader/reader.go

@@ -26,8 +26,15 @@ func NewLDAPReader(username string, password string, server string, basedn strin
 	return &LDAPHandler
 }
 
-func (handler *LdapReader) GetUser(username string) ([]*ldap.Entry, error) {
-	return handler.retrieveInformation("uid="+username+","+handler.basedn, "(objectClass=*)", ldap.ScopeBaseObject)
+func (handler *LdapReader) GetUser(username string) (*ldap.Entry, error) {
+	returnVal, err := handler.retrieveInformation("uid="+username+","+handler.basedn, "(objectClass=*)", ldap.ScopeBaseObject)
+	if err != nil {
+		return nil, err
+	}
+	if len(returnVal) == 0 {
+		return nil, fmt.Errorf("nothing found for user %s", username)
+	}
+	return returnVal[0], nil
 }
 
 func (handler *LdapReader) GetAllUser() ([]*ldap.Entry, error) {