Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuomo Ala-Vannesluoma <tuomoav@gmail.com>2018-09-10 15:37:22 +0300
committerTuomo Ala-Vannesluoma <tuomoav@gmail.com>2018-09-10 15:37:22 +0300
commitce5d10b13b433220a9e8a9c1f91b430098382b4e (patch)
tree0918a6ea412f13cbc34d25676b07152b53a1b3fb
parent9977423ac9ac8b6a58d4602f808dccc3fa08428b (diff)
Fix panic serving errors
-rw-r--r--internal/auth/auth.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/internal/auth/auth.go b/internal/auth/auth.go
index 8b0396d4..f1fe03c0 100644
--- a/internal/auth/auth.go
+++ b/internal/auth/auth.go
@@ -73,19 +73,19 @@ func (a *Auth) getSessionFromStore(r *http.Request) (*sessions.Session, error) {
func (a *Auth) checkSession(w http.ResponseWriter, r *http.Request) (*sessions.Session, error) {
// Create or get session
- session, err := a.getSessionFromStore(r)
+ session, errsession := a.getSessionFromStore(r)
- if err != nil {
+ if errsession != nil {
// Save cookie again
- err := session.Save(r, w)
- if err != nil {
- log.WithError(err).Error("Failed to save the session")
+ errsave := session.Save(r, w)
+ if errsave != nil {
+ log.WithError(errsave).Error("Failed to save the session")
httperrors.Serve500(w)
- return nil, err
+ return nil, errsave
}
http.Redirect(w, r, getRequestAddress(r), 302)
- return nil, err
+ return nil, errsession
}
return session, nil