@@ -363,12 +363,13 @@ func (p *OAuthProxy) SaveSession(rw http.ResponseWriter, req *http.Request, s *s
363363
364364// RobotsTxt disallows scraping pages from the OAuthProxy
365365func (p *OAuthProxy) RobotsTxt(rw http.ResponseWriter) {
366− rw.WriteHeader(http.StatusOK)
367366 _, err := fmt.Fprintf(rw, "User-agent: *\nDisallow: /")
368367 if err != nil {
369− logger.Printf("Error writing robots.txt: %s", err.Error())
370− p.ErrorPage(rw, 500, "Internal Error", err.Error())
368+ logger.Printf("Error writing robots.txt: %v", err)
369+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
370+ return
371371 }
372+ rw.WriteHeader(http.StatusOK)
372373}
373374
374375// ErrorPage writes an error response
@@ -385,7 +386,7 @@ func (p *OAuthProxy) ErrorPage(rw http.ResponseWriter, code int, title string, m
385386 }
386387 err := p.templates.ExecuteTemplate(rw, "error.html", t)
387388 if err != nil {
388− logger.Printf("Error rendering error.html template: %s", err.Error())
389+ logger.Printf("Error rendering error.html template: %v", err)
389390 http.Error(rw, "Internal Server Error", http.StatusInternalServerError)
390391 }
391392}
@@ -395,16 +396,16 @@ func (p *OAuthProxy) SignInPage(rw http.ResponseWriter, req *http.Request, code
395396 prepareNoCache(rw)
396397 err := p.ClearSessionCookie(rw, req)
397398 if err != nil {
398− logger.Printf("Error clearing session cookie: %s", err.Error())
399− p.ErrorPage(rw, 500, "Internal Error", err.Error())
399+ logger.Printf("Error clearing session cookie: %v", err)
400+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
400401 return
401402 }
402403 rw.WriteHeader(code)
403404
404405 redirectURL, err := p.GetRedirect(req)
405406 if err != nil {
406− logger.Printf("Error obtaining redirect: %s", err.Error())
407− p.ErrorPage(rw, 500, "Internal Error", err.Error())
407+ logger.Printf("Error obtaining redirect: %v", err)
408+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
408409 return
409410 }
410411
@@ -434,8 +435,8 @@ func (p *OAuthProxy) SignInPage(rw http.ResponseWriter, req *http.Request, code
434435 }
435436 err = p.templates.ExecuteTemplate(rw, "sign_in.html", t)
436437 if err != nil {
437− logger.Printf("Error rendering sign_in.html template: %s", err.Error())
438− p.ErrorPage(rw, 500, "Internal Error", err.Error())
438+ logger.Printf("Error rendering sign_in.html template: %v", err)
439+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
439440 }
440441}
441442
@@ -645,7 +646,7 @@ func (p *OAuthProxy) SignIn(rw http.ResponseWriter, req *http.Request) {
645646 redirect, err := p.GetRedirect(req)
646647 if err != nil {
647648 logger.Printf("Error obtaining redirect: %s", err.Error())
648− p.ErrorPage(rw, 500, "Internal Error", err.Error())
649+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
649650 return
650651 }
651652
@@ -655,7 +656,7 @@ func (p *OAuthProxy) SignIn(rw http.ResponseWriter, req *http.Request) {
655656 err = p.SaveSession(rw, req, session)
656657 if err != nil {
657658 logger.Printf("Error saving session: %s", err.Error())
658− p.ErrorPage(rw, 500, "Internal Error", err.Error())
659+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
659660 return
660661 }
661662 http.Redirect(rw, req, redirect, http.StatusFound)
@@ -687,8 +688,8 @@ func (p *OAuthProxy) UserInfo(rw http.ResponseWriter, req *http.Request) {
687688 rw.WriteHeader(http.StatusOK)
688689 err = json.NewEncoder(rw).Encode(userInfo)
689690 if err != nil {
690− logger.Printf("Error encoding user info: %s", err.Error())
691− p.ErrorPage(rw, 500, "Internal Error", err.Error())
691+ logger.Printf("Error encoding user info: %v", err)
692+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
692693 }
693694}
694695
@@ -696,14 +697,14 @@ func (p *OAuthProxy) UserInfo(rw http.ResponseWriter, req *http.Request) {
696697func (p *OAuthProxy) SignOut(rw http.ResponseWriter, req *http.Request) {
697698 redirect, err := p.GetRedirect(req)
698699 if err != nil {
699− logger.Printf("Error obtaining redirect: %s", err.Error())
700− p.ErrorPage(rw, 500, "Internal Error", err.Error())
700+ logger.Printf("Error obtaining redirect: %v", err)
701+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
701702 return
702703 }
703704 err = p.ClearSessionCookie(rw, req)
704705 if err != nil {
705− logger.Printf("Error clearing session cookie: %s", err.Error())
706− p.ErrorPage(rw, 500, "Internal Error", err.Error())
706+ logger.Printf("Error clearing session cookie: %v", err)
707+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
707708 return
708709 }
709710 http.Redirect(rw, req, redirect, http.StatusFound)
@@ -714,15 +715,15 @@ func (p *OAuthProxy) OAuthStart(rw http.ResponseWriter, req *http.Request) {
714715 prepareNoCache(rw)
715716 nonce, err := encryption.Nonce()
716717 if err != nil {
717− logger.Printf("Error obtaining nonce: %s", err.Error())
718− p.ErrorPage(rw, 500, "Internal Error", err.Error())
718+ logger.Printf("Error obtaining nonce: %v", err)
719+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
719720 return
720721 }
721722 p.SetCSRFCookie(rw, req, nonce)
722723 redirect, err := p.GetRedirect(req)
723724 if err != nil {
724− logger.Printf("Error obtaining redirect: %s", err.Error())
725− p.ErrorPage(rw, 500, "Internal Error", err.Error())
725+ logger.Printf("Error obtaining redirect: %v", err)
726+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
726727 return
727728 }
728729 redirectURI := p.GetRedirectURI(req.Host)
@@ -737,42 +738,42 @@ func (p *OAuthProxy) OAuthCallback(rw http.ResponseWriter, req *http.Request) {
737738 // finish the oauth cycle
738739 err := req.ParseForm()
739740 if err != nil {
740− logger.Printf("Error while parsing OAuth2 callback: %s" + err.Error())
741− p.ErrorPage(rw, 500, "Internal Error", err.Error())
741+ logger.Printf("Error while parsing OAuth2 callback: %v", err)
742+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
742743 return
743744 }
744745 errorString := req.Form.Get("error")
745746 if errorString != "" {
746− logger.Printf("Error while parsing OAuth2 callback: %s ", errorString)
747− p.ErrorPage(rw, 403, "Permission Denied", errorString)
747+ logger.Printf("Error while parsing OAuth2 callback: %s", errorString)
748+ p.ErrorPage(rw, http.StatusForbidden, "Permission Denied", errorString)
748749 return
749750 }
750751
751752 session, err := p.redeemCode(req.Context(), req.Host, req.Form.Get("code"))
752753 if err != nil {
753− logger.Printf("Error redeeming code during OAuth2 callback: %s ", err.Error())
754− p.ErrorPage(rw, 500, "Internal Error", "Internal Error")
754+ logger.Printf("Error redeeming code during OAuth2 callback: %v", err)
755+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", "Internal Error")
755756 return
756757 }
757758
758759 s := strings.SplitN(req.Form.Get("state"), ":", 2)
759760 if len(s) != 2 {
760761 logger.Printf("Error while parsing OAuth2 state: invalid length")
761− p.ErrorPage(rw, 500, "Internal Error", "Invalid State")
762+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", "Invalid State")
762763 return
763764 }
764765 nonce := s[0]
765766 redirect := s[1]
766767 c, err := req.Cookie(p.CSRFCookieName)
767768 if err != nil {
768− logger.PrintAuthf(session.Email, req, logger.AuthFailure, "Invalid authentication via OAuth2: unable too obtain CSRF cookie")
769− p.ErrorPage(rw, 403, "Permission Denied", err.Error())
769+ logger.PrintAuthf(session.Email, req, logger.AuthFailure, "Invalid authentication via OAuth2: unable to obtain CSRF cookie")
770+ p.ErrorPage(rw, http.StatusForbidden, "Permission Denied", err.Error())
770771 return
771772 }
772773 p.ClearCSRFCookie(rw, req)
773774 if c.Value != nonce {
774− logger.PrintAuthf(session.Email, req, logger.AuthFailure, "Invalid authentication via OAuth2: csrf token mismatch, potential attack")
775− p.ErrorPage(rw, 403, "Permission Denied", "csrf failed")
775+ logger.PrintAuthf(session.Email, req, logger.AuthFailure, "Invalid authentication via OAuth2: CSRF token mismatch, potential attack")
776+ p.ErrorPage(rw, http.StatusForbidden, "Permission Denied", "CSRF Failed")
776777 return
777778 }
778779
@@ -785,14 +786,14 @@ func (p *OAuthProxy) OAuthCallback(rw http.ResponseWriter, req *http.Request) {
785786 logger.PrintAuthf(session.Email, req, logger.AuthSuccess, "Authenticated via OAuth2: %s", session)
786787 err := p.SaveSession(rw, req, session)
787788 if err != nil {
788− logger.Printf("%s %s", remoteAddr, err)
789− p.ErrorPage(rw, 500, "Internal Error", "Internal Error")
789+ logger.Printf("Error saving session state for %s: %v", remoteAddr, err)
790+ p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", err.Error())
790791 return
791792 }
792793 http.Redirect(rw, req, redirect, http.StatusFound)
793794 } else {
794795 logger.PrintAuthf(session.Email, req, logger.AuthFailure, "Invalid authentication via OAuth2: unauthorized")
795− p.ErrorPage(rw, 403, "Permission Denied", "Invalid Account")
796+ p.ErrorPage(rw, http.StatusForbidden, "Permission Denied", "Invalid Account")
796797 }
797798}
798799
@@ -870,7 +871,7 @@ func (p *OAuthProxy) getAuthenticatedSession(rw http.ResponseWriter, req *http.R
870871 // Invalid session, clear it
871872 err := p.ClearSessionCookie(rw, req)
872873 if err != nil {
873− logger.Printf("Error clearing session cookie: %s", err.Error())
874+ logger.Printf("Error clearing session cookie: %v", err)
874875 }
875876 return nil, ErrNeedsLogin
876877 }