melon/tokidoki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auth/*: more consistent logging

Browse Source
This commit is contained in:
Conrad Hoffmann 2024-02-05 22:23:58 +01:00
parent 96e33a0777
commit a115c50037
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auth/imap.go
View File

@ -44,7 +44,7 @@ func (prov *IMAPProvider) doAuth(next http.Handler,
conn, err := prov.dial() conn, err := prov.dial()
if err != nil { if err != nil {
log.Debug().Err(err).Msg("auth dial error") log.Warn().Err(err).Msg("auth dial error")
http.Error(w, "Temporary authentication error, try again later", http.StatusServiceUnavailable) http.Error(w, "Temporary authentication error, try again later", http.StatusServiceUnavailable)
return return
} }
@ -52,7 +52,7 @@ func (prov *IMAPProvider) doAuth(next http.Handler,
auth := sasl.NewPlainClient("", user, pass) auth := sasl.NewPlainClient("", user, pass)
if err := conn.Authenticate(auth); err != nil { if err := conn.Authenticate(auth); err != nil {
log.Debug().Err(err).Msg("auth error") log.Debug().Str("user", user).Err(err).Msg("auth error")
http.Error(w, "Invalid username or password", http.StatusUnauthorized) http.Error(w, "Invalid username or password", http.StatusUnauthorized)
return return
} }

8
auth/pam.go
View File

@ -44,26 +44,26 @@ func pamAuth(next http.Handler, w http.ResponseWriter, r *http.Request) {
} }
}) })
if err != nil { if err != nil {
log.Debug().Err(err).Msg("failed to start PAM conversation") log.Warn().Err(err).Msg("failed to start PAM conversation")
http.Error(w, "Temporary authentication error, try again later", http.StatusServiceUnavailable) http.Error(w, "Temporary authentication error, try again later", http.StatusServiceUnavailable)
return return
} }
if err := t.Authenticate(0); err != nil { if err := t.Authenticate(0); err != nil {
log.Debug().Err(err).Msg("auth error") log.Debug().Str("user", user).Err(err).Msg("auth error")
http.Error(w, "Invalid username or password", http.StatusUnauthorized) http.Error(w, "Invalid username or password", http.StatusUnauthorized)
return return
} }
if err := t.AcctMgmt(0); err != nil { if err := t.AcctMgmt(0); err != nil {
log.Debug().Err(err).Msg("account unavailable") log.Debug().Str("user", user).Err(err).Msg("account unavailable")
http.Error(w, "Account unavailable", http.StatusUnauthorized) http.Error(w, "Account unavailable", http.StatusUnauthorized)
return return
} }
user, err = t.GetItem(pam.User) user, err = t.GetItem(pam.User)
if err != nil { if err != nil {
log.Debug().Err(err).Msg("failed to get PAM username") log.Warn().Str("user", user).Err(err).Msg("failed to get PAM username")
http.Error(w, "Temporary authentication error, try again later", http.StatusServiceUnavailable) http.Error(w, "Temporary authentication error, try again later", http.StatusServiceUnavailable)
return return
} }