go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-04-15 11:56:49 +02:00
Code Issues Releases Activity

Attempt to log still on template errors

Browse Source
This commit is contained in:
Nick Meves 2020-07-20 19:29:31 -07:00
parent 542bf1fad1
commit 45222395e0
No known key found for this signature in database
GPG Key ID: 93BA8A3CEDCDD1CF
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oauthproxy.go
View File

@ -647,7 +647,7 @@ func (p *OAuthProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
func (p *OAuthProxy) SignIn(rw http.ResponseWriter, req *http.Request) { func (p *OAuthProxy) SignIn(rw http.ResponseWriter, req *http.Request) {
redirect, err := p.GetRedirect(req) redirect, err := p.GetRedirect(req)
if err != nil { if err != nil {
logger.Printf("Error obtaining redirect: %s", err.Error()) logger.Printf("Error obtaining redirect: %v", err)
p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error()) p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
return return
} }
@ -657,7 +657,7 @@ func (p *OAuthProxy) SignIn(rw http.ResponseWriter, req *http.Request) {
session := &sessionsapi.SessionState{User: user} session := &sessionsapi.SessionState{User: user}
err = p.SaveSession(rw, req, session) err = p.SaveSession(rw, req, session)
if err != nil { if err != nil {
logger.Printf("Error saving session: %s", err.Error()) logger.Printf("Error saving session: %v", err)
p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error()) p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
return return
} }

28
pkg/logger/logger.go
View File

@ -137,8 +137,15 @@ func (l *Logger) Output(calldepth int, message string) {
File: file, File: file,
Message: message, Message: message,
}) })
// Fallback for template errors
if err != nil { if err != nil {
panic(err) _, ferr := fmt.Fprintf(l.writer, "[%s] [%s] %s",
FormatTimestamp(now),
file,
message)
if ferr != nil {
panic(ferr)
}
} }
_, err = l.writer.Write([]byte("\n")) _, err = l.writer.Write([]byte("\n"))
@ -177,8 +184,17 @@ func (l *Logger) PrintAuthf(username string, req *http.Request, status AuthStatu
Status: string(status), Status: string(status),
Message: fmt.Sprintf(format, a...), Message: fmt.Sprintf(format, a...),
}) })
// Fallback for template errors
if err != nil { if err != nil {
panic(err) _, ferr := fmt.Fprintf(l.writer, "%s - %s [%s] [%s] %s",
client,
username,
FormatTimestamp(now),
string(status),
fmt.Sprintf(format, a...))
if ferr != nil {
panic(ferr)
}
} }
_, err = l.writer.Write([]byte("\n")) _, err = l.writer.Write([]byte("\n"))
@ -234,8 +250,14 @@ func (l *Logger) PrintReq(username, upstream string, req *http.Request, url url.
UserAgent: fmt.Sprintf("%q", req.UserAgent()), UserAgent: fmt.Sprintf("%q", req.UserAgent()),
Username: username, Username: username,
}) })
// Fallback for template errors
if err != nil { if err != nil {
panic(err) _, ferr := fmt.Fprintf(l.writer, "%s - %s [%s] %s %s %s %q %s %q %d %d %0.3f",
client, username, FormatTimestamp(ts), req.Host, req.Method, upstream,
url.RequestURI(), req.Proto, req.UserAgent(), status, size, duration)
if ferr != nil {
panic(ferr)
}
} }
_, err = l.writer.Write([]byte("\n")) _, err = l.writer.Write([]byte("\n"))

7
pkg/sessions/persistence/manager.go
View File

@ -49,12 +49,7 @@ func (m *Manager) Save(rw http.ResponseWriter, req *http.Request, s *sessions.Se
return err return err
} }
err = tckt.setCookie(rw, req, s) return tckt.setCookie(rw, req, s)
if err != nil {
return err
}
return nil
} }
// Load reads sessions.SessionState information from a session store. It will // Load reads sessions.SessionState information from a session store. It will