Merge pull request #14692 from liggitt/log-state-error

Merged by openshift-bot
openshift · Jun 18, 2017 · 2d90d52 · 2d90d52
2 parents a2d9765 + d2782fa
commit 2d90d52
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pkg/auth/oauth/external/handler.go b/pkg/auth/oauth/external/handler.go
@@ -161,14 +161,14 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 
 	// Validate state before making any server-to-server calls
 	ok, err := h.state.Check(authData.State, req)
-	if !ok {
-		glog.V(4).Infof("State is invalid")
-		err := errors.New("State is invalid")
+	if err != nil {
+		glog.V(4).Infof("Error verifying state: %v", err)
 		h.handleError(err, w, req)
 		return
 	}
-	if err != nil {
-		glog.V(4).Infof("Error verifying state: %v", err)
+	if !ok {
+		glog.V(4).Infof("State is invalid")
+		err := errors.New("State is invalid")
 		h.handleError(err, w, req)
 		return
 	}