fix #6 log error when URL is not set and render index

simongottschlag · Oct 2, 2018 · ee0c30d · ee0c30d
1 parent f41664e
commit ee0c30d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/handlers/handlers.go b/handlers/handlers.go
@@ -277,9 +277,10 @@ func LogoutHandler(w http.ResponseWriter, r *http.Request) {
 	session.Save(r, w)
 	sessstore.MaxAge(300)
 
-	var redirectURL = r.URL.Query().Get("url")
-	if redirectURL != "" {
-		http.Redirect(w, r, redirectURL, 302);
+
+	var requestedURL = r.URL.Query().Get("url")
+	if requestedURL != "" {
+		http.Redirect(w, r, requestedURL, 302);
 	} else {
 		renderIndex(w, "you have been logged out")
 	}
@@ -297,36 +298,41 @@ func LoginHandler(w http.ResponseWriter, r *http.Request) {
 		log.Error(err)
 	}
 
-	// set the state varialbe in the session
+	// set the state variable in the session
 	var state = randString()
 	session.Values["state"] = state
 	log.Debugf("session state set to %s", session.Values["state"])
 
 	// increment the failure counter for this domain
 
-	// redirectURL comes from nginx in the query string
-	var redirectURL = r.URL.Query().Get("url")
-	if redirectURL != "" {
-		// TODO store the originally requested URL so we can redirec on the roundtrip
-		session.Values["requestedURL"] = redirectURL
+	// requestedURL comes from nginx in the query string via a 302 redirect
+	// it sets the ultimate destination
+	// https://lasso.yoursite.com/login?url=
+	var requestedURL = r.URL.Query().Get("url");
+	if (requestedURL == "") {
+		renderIndex(w, "no destination URL requested")
+		log.Error("no destination URL requested")
+		return
+	} else {
+		session.Values["requestedURL"] = requestedURL
 		log.Debugf("session requestedURL set to %s", session.Values["requestedURL"])
 	}
 
 	// stop them after three failures for this URL
 	var failcount = 0
-	if session.Values[redirectURL] != nil {
-		failcount = session.Values[redirectURL].(int)
-		log.Debugf("failcount for %s is %d", redirectURL, failcount)
+	if session.Values[requestedURL] != nil {
+		failcount = session.Values[requestedURL].(int)
+		log.Debugf("failcount for %s is %d", requestedURL, failcount)
 	}
 	failcount++
-	session.Values[redirectURL] = failcount
+	session.Values[requestedURL] = failcount
 
 	log.Debug("saving session")
 	session.Save(r, w)
 
 	if failcount > 2 {
 		var lassoError = r.URL.Query().Get("error")
-		renderIndex(w, "too many redirects for "+redirectURL+" - "+lassoError)
+		renderIndex(w, "too many redirects for "+requestedURL+" - "+lassoError)
 	} else {
 		// bounce to oauth provider for login
 		var lURL = loginURL(r, state)
@@ -412,16 +418,16 @@ func CallbackHandler(w http.ResponseWriter, r *http.Request) {
 	cookie.SetCookie(w, r, tokenstring)
 
 	// get the originally requested URL so we can send them on their way
-	redirectURL := session.Values["requestedURL"].(string)
-	if redirectURL != "" {
+	requestedURL := session.Values["requestedURL"].(string)
+	if requestedURL != "" {
 		// clear out the session value
 		session.Values["requestedURL"] = ""
-		session.Values[redirectURL] = 0
+		session.Values[requestedURL] = 0
 		session.Save(r, w)
 
 		// and redirect
 		context.WithValue(r.Context(), lctx.StatusCode, 302)
-		http.Redirect(w, r, redirectURL, 302)
+		http.Redirect(w, r, requestedURL, 302)
 		return
 	}
 	// otherwise serve an html page

diff --git a/templates/index.tmpl b/templates/index.tmpl
@@ -3,6 +3,7 @@
   <head>
     <link rel="icon" type="image/png" href="/static/img/favicon.ico" />
     <link rel="stylesheet" href="/static/css/main.css" />
+    <title>Lasso: {{ .Msg }}.</title>
   </head>
   <body>
 
@@ -15,5 +16,9 @@
   <li><a href="{{ .TestURL }}">{{ .TestURL }}</a></li>
 </ul>
 
+For support, please contact your network administrator or whomever setup nginx to use Lasso.
+<p/>
+For help with <a href="https://github.com/LassoProject/lasso">Lasso</a> or to file a bug report, please see the project page at <a href="https://github.com/LassoProject/lasso">https://github.com/LassoProject/lasso</a>
+<p/>
   </body>
 </html>