Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
golang
/
netmaker
-ын хуулбар https://github.com/gravitl/netmaker
2
0
Салаа 0
Файлууд Асуудлууд 0 Мэдлэгийн сан
Эх сурвалжийг харах

handle oauth state not valid with appropirate message

abhishek9686 1 жил өмнө
parent
573ce7a7b6
commit
ceaca70d83
5 өөрчлөгдсөн 32 нэмэгдсэн , 0 устгасан
Өөрчлөллтийг нэгтгэж харах Өөрчлөлтийн статистик харах
  1. 5 0
      auth/azure-ad.go
  2. 12 0
      auth/error.go
  3. 5 0
      auth/github.go
  4. 5 0
      auth/google.go
  5. 5 0
      auth/oidc.go

+ 5 - 0
auth/azure-ad.go
Файл харах 

@@ -3,6 +3,7 @@ package auth
 
 import (
 
 import (
 
 	"context"
 
 	"context"
 
 	"encoding/json"
 
 	"encoding/json"
 
+	"errors"
 
 	"fmt"
 
 	"fmt"
 
 	"io"
 
 	"io"
 
 	"net/http"
 
 	"net/http"
 
@@ -58,6 +59,10 @@ func handleAzureCallback(w http.ResponseWriter, r *http.Request) {
 
 	var content, err = getAzureUserInfo(rState, rCode)
 
 	var content, err = getAzureUserInfo(rState, rCode)
 
 	if err != nil {
 
 	if err != nil {
 
 		logger.Log(1, "error when getting user info from azure:", err.Error())
 
 		logger.Log(1, "error when getting user info from azure:", err.Error())
 
+		if errors.Is(err, errors.New("invalid oauth state")) {
 
+			handleOauthNotValid(w)
 
+			return
 
+		}
 
 		handleOauthNotConfigured(w)
 
 		handleOauthNotConfigured(w)
 
 		return
 
 		return
 
 	}
 
 	}

+ 12 - 0
auth/error.go
Файл харах 

@@ -10,6 +10,12 @@ const oauthNotConfigured = `<!DOCTYPE html><html>
 
 </body>
 
 </body>
 
 </html>`
 
 </html>`
 
 
 
+const oauthStateInvalid = `<!DOCTYPE html><html>
 
+<body>
 
+<h3>Invalid OAuth Session.Please re-try again</h3>
 
+</body>
 
+</html>`
 
+
 
 const userNotAllowed = `<!DOCTYPE html><html>
 
 const userNotAllowed = `<!DOCTYPE html><html>
 
 <body>
 
 <body>
 
 <h3>Only administrators can access the Dashboard. Please contact your administrator to elevate your account.</h3>
 
 <h3>Only administrators can access the Dashboard. Please contact your administrator to elevate your account.</h3>
 
@@ -86,6 +92,12 @@ func handleOauthNotConfigured(response http.ResponseWriter) {
 
 	response.Write([]byte(oauthNotConfigured))
 
 	response.Write([]byte(oauthNotConfigured))
 
 }
 
 }
 
 
 
+func handleOauthNotValid(response http.ResponseWriter) {
 
+	response.Header().Set("Content-Type", "text/html; charset=utf-8")
 
+	response.WriteHeader(http.StatusInternalServerError)
 
+	response.Write([]byte(oauthStateInvalid))
 
+}
 
+
 
 func handleSomethingWentWrong(response http.ResponseWriter) {
 
 func handleSomethingWentWrong(response http.ResponseWriter) {
 
 	response.Header().Set("Content-Type", "text/html; charset=utf-8")
 
 	response.Header().Set("Content-Type", "text/html; charset=utf-8")
 
 	response.WriteHeader(http.StatusInternalServerError)
 
 	response.WriteHeader(http.StatusInternalServerError)

+ 5 - 0
auth/github.go
Файл харах 

@@ -3,6 +3,7 @@ package auth
 
 import (
 
 import (
 
 	"context"
 
 	"context"
 
 	"encoding/json"
 
 	"encoding/json"
 
+	"errors"
 
 	"fmt"
 
 	"fmt"
 
 	"io"
 
 	"io"
 
 	"net/http"
 
 	"net/http"
 
@@ -58,6 +59,10 @@ func handleGithubCallback(w http.ResponseWriter, r *http.Request) {
 
 	var content, err = getGithubUserInfo(rState, rCode)
 
 	var content, err = getGithubUserInfo(rState, rCode)
 
 	if err != nil {
 
 	if err != nil {
 
 		logger.Log(1, "error when getting user info from github:", err.Error())
 
 		logger.Log(1, "error when getting user info from github:", err.Error())
 
+		if errors.Is(err, errors.New("invalid oauth state")) {
 
+			handleOauthNotValid(w)
 
+			return
 
+		}
 
 		handleOauthNotConfigured(w)
 
 		handleOauthNotConfigured(w)
 
 		return
 
 		return
 
 	}
 
 	}

+ 5 - 0
auth/google.go
Файл харах 

@@ -3,6 +3,7 @@ package auth
 
 import (
 
 import (
 
 	"context"
 
 	"context"
 
 	"encoding/json"
 
 	"encoding/json"
 
+	"errors"
 
 	"fmt"
 
 	"fmt"
 
 	"io"
 
 	"io"
 
 	"net/http"
 
 	"net/http"
 
@@ -60,6 +61,10 @@ func handleGoogleCallback(w http.ResponseWriter, r *http.Request) {
 
 	var content, err = getGoogleUserInfo(rState, rCode)
 
 	var content, err = getGoogleUserInfo(rState, rCode)
 
 	if err != nil {
 
 	if err != nil {
 
 		logger.Log(1, "error when getting user info from google:", err.Error())
 
 		logger.Log(1, "error when getting user info from google:", err.Error())
 
+		if errors.Is(err, errors.New("invalid oauth state")) {
 
+			handleOauthNotValid(w)
 
+			return
 
+		}
 
 		handleOauthNotConfigured(w)
 
 		handleOauthNotConfigured(w)
 
 		return
 
 		return
 
 	}
 
 	}

+ 5 - 0
auth/oidc.go
Файл харах 

@@ -2,6 +2,7 @@ package auth
 
 
 
 import (
 
 import (
 
 	"context"
 
 	"context"
 
+	"errors"
 
 	"fmt"
 
 	"fmt"
 
 	"net/http"
 
 	"net/http"
 
 	"time"
 
 	"time"
 
@@ -71,6 +72,10 @@ func handleOIDCCallback(w http.ResponseWriter, r *http.Request) {
 
 	var content, err = getOIDCUserInfo(rState, rCode)
 
 	var content, err = getOIDCUserInfo(rState, rCode)
 
 	if err != nil {
 
 	if err != nil {
 
 		logger.Log(1, "error when getting user info from callback:", err.Error())
 
 		logger.Log(1, "error when getting user info from callback:", err.Error())
 
+		if errors.Is(err, errors.New("invalid oauth state")) {
 
+			handleOauthNotValid(w)
 
+			return
 
+		}
 
 		handleOauthNotConfigured(w)
 
 		handleOauthNotConfigured(w)
 
 		return
 
 		return
 
 	}
 
 	}