Fix pre-Windows 2000 logon for username (issue #8)

abbas-gheydi · Feb 13, 2024 · 95faf0d · 95faf0d
1 parent fb7310a
commit 95faf0d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pkgs/authentiate/ldap.go b/pkgs/authentiate/ldap.go
@@ -53,10 +53,9 @@ func (l LdapProvider) isUserAuthorized(groups []string) bool {
 }
 
 func (l LdapProvider) IsUserAuthenticated(username string, password string, checkForVendorFortinetGroup bool) (isAuthenticated bool, vendorFortinetGroupName []string) {
-
-	if strings.Contains(username, "\\") {
-		splitChar := "\\"
-		username = strings.Split(username, splitChar)[0]
+	winNTSplitChar := "\\"
+	if strings.Contains(username, winNTSplitChar) && strings.Split(username, winNTSplitChar)[1] != "" {
+		username = strings.Split(username, winNTSplitChar)[1]
 	}
 
 	verifyPasswordAndRetrieveGroupsFromLdap := func(groups []string) (isAuthenticated bool, joinedGroupsName []string, err error) {

diff --git a/pkgs/storage/postgres_otp.go b/pkgs/storage/postgres_otp.go
@@ -103,9 +103,9 @@ func (p postgresOtp) Delete(username string) error {
 
 func (p postgresOtp) Get(username string) (password string, err error) {
 	username = strings.ToLower(username)
-	if strings.Contains(username, "\\") {
-		splitChar := "\\"
-		username = strings.Split(username, splitChar)[0]
+	winNTSplitChar := "\\"
+	if strings.Contains(username, winNTSplitChar) && strings.Split(username, winNTSplitChar)[1] != "" {
+		username = strings.Split(username, winNTSplitChar)[1]
 	}
 	otpUser := otps{Username: username}