صفحهٔ اصلی گشت‌و‌گذار راهنما
ورود
golang
/
netmaker
mirrorاز https://github.com/gravitl/netmaker
2
0
انشعاب 0
پرونده‌ها مشکلات 0 ویکی
فهرست منبع

check for invalid oauth state

abhishek9686 1 سال پیش
والد
32bcdc728d
کامیت
7227437508
4فایلهای تغییر یافته به همراه7 افزوده شده و 7 حذف شده
نمای یکپارچه نمایش آمار تفاوت ها
  1. 2 2
      auth/azure-ad.go
  2. 1 1
      auth/error.go
  3. 2 2
      auth/github.go
  4. 2 2
      auth/google.go

+ 2 - 2
auth/azure-ad.go
مشاهده فایل 

@@ -3,10 +3,10 @@ package auth
 
 import (
 
 import (
 
 	"context"
 
 	"context"
 
 	"encoding/json"
 
 	"encoding/json"
 
-	"errors"
 
 	"fmt"
 
 	"fmt"
 
 	"io"
 
 	"io"
 
 	"net/http"
 
 	"net/http"
 
+	"strings"
 
 
 
 	"github.com/gravitl/netmaker/database"
 
 	"github.com/gravitl/netmaker/database"
 
 	"github.com/gravitl/netmaker/logger"
 
 	"github.com/gravitl/netmaker/logger"
 
@@ -59,7 +59,7 @@ 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")) {
 
+		if strings.Contains(err.Error(), "invalid oauth state") {
 
 			handleOauthNotValid(w)
 
 			handleOauthNotValid(w)
 
 			return
 
 			return
 
 		}
 
 		}

+ 1 - 1
auth/error.go
مشاهده فایل 

@@ -12,7 +12,7 @@ const oauthNotConfigured = `<!DOCTYPE html><html>
 
 
 
 const oauthStateInvalid = `<!DOCTYPE html><html>
 
 const oauthStateInvalid = `<!DOCTYPE html><html>
 
 <body>
 
 <body>
 
-<h3>Invalid OAuth Session.Please re-try again</h3>
 
+<h3>Invalid OAuth Session. Please re-try again.</h3>
 
 </body>
 
 </body>
 
 </html>`
 
 </html>`

+ 2 - 2
auth/github.go
مشاهده فایل 

@@ -3,10 +3,10 @@ package auth
 
 import (
 
 import (
 
 	"context"
 
 	"context"
 
 	"encoding/json"
 
 	"encoding/json"
 
-	"errors"
 
 	"fmt"
 
 	"fmt"
 
 	"io"
 
 	"io"
 
 	"net/http"
 
 	"net/http"
 
+	"strings"
 
 
 
 	"github.com/gravitl/netmaker/database"
 
 	"github.com/gravitl/netmaker/database"
 
 	"github.com/gravitl/netmaker/logger"
 
 	"github.com/gravitl/netmaker/logger"
 
@@ -59,7 +59,7 @@ 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")) {
 
+		if strings.Contains(err.Error(), "invalid oauth state") {
 
 			handleOauthNotValid(w)
 
 			handleOauthNotValid(w)
 
 			return
 
 			return
 
 		}
 
 		}

+ 2 - 2
auth/google.go
مشاهده فایل 

@@ -3,10 +3,10 @@ package auth
 
 import (
 
 import (
 
 	"context"
 
 	"context"
 
 	"encoding/json"
 
 	"encoding/json"
 
-	"errors"
 
 	"fmt"
 
 	"fmt"
 
 	"io"
 
 	"io"
 
 	"net/http"
 
 	"net/http"
 
+	"strings"
 
 	"time"
 
 	"time"
 
 
 
 	"github.com/gravitl/netmaker/database"
 
 	"github.com/gravitl/netmaker/database"
 
@@ -61,7 +61,7 @@ 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")) {
 
+		if strings.Contains(err.Error(), "invalid oauth state") {
 
 			handleOauthNotValid(w)
 
 			handleOauthNotValid(w)
 
 			return
 
 			return
 
 		}
 
 		}