added functionallity for multiple API Tokens in API_TOKEN and API_TOKENS

Author: CodeShellDev

internals/proxy/middlewares/auth.go

@@ -6,12 +6,13 @@ import (
 	"net/url"
 	"strings"
 
+	"github.com/codeshelldev/secured-signal-api/utils"
 	log "github.com/codeshelldev/secured-signal-api/utils/logger"
 )
 
 type AuthMiddleware struct {
 	Next  http.Handler
-	Token string
+	Tokens []string
 }
 
 type authType string
@@ -34,12 +35,16 @@ func getAuthType(str string) authType {
 	}
 }
 
+func isValidToken(tokens []string, match string) (bool) {
+	return utils.Contains(tokens, match)
+}
+
 func (data AuthMiddleware) Use() http.Handler {
 	next := data.Next
-	token := data.Token
+	tokens := data.Tokens
 
 	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		if token == "" {
+		if len(tokens) <= 0 {
 			next.ServeHTTP(w, req)
 			return
 		}
@@ -60,7 +65,7 @@ func (data AuthMiddleware) Use() http.Handler {
 
 			switch authType {
 			case Bearer:
-				if authToken == token {
+				if isValidToken(tokens, authToken) {
 					success = true
 				}
 
@@ -76,7 +81,7 @@ func (data AuthMiddleware) Use() http.Handler {
 
 				user := "api"
 
-				if basicAuthParams[0] == user && basicAuthParams[1] == token {
+				if basicAuthParams[0] == user && isValidToken(tokens, basicAuthParams[1]) {
 					success = true
 				}
 			}
@@ -86,7 +91,7 @@ func (data AuthMiddleware) Use() http.Handler {
 
 			authToken, _ := url.QueryUnescape(authQuery)
 
-			if authToken == token {
+			if isValidToken(tokens, authToken) {
 				success = true
 
 				modifiedQuery := req.URL.Query()

main.go

@@ -42,8 +42,8 @@ func main() {
 	}
 
 	auth_m1 := AuthMiddleware{
-		Next:  endp_m2.Use(),
-		Token: ENV.API_TOKEN,
+		Next:   endp_m2.Use(),
+		Tokens: ENV.API_TOKENS,
 	}
 
 	log_m0 := LogMiddleware{

utils/env/env.go

@@ -1,17 +1,17 @@
 package env
 
 import (
-	"encoding/json"
 	"os"
 
 	middlewares "github.com/codeshelldev/secured-signal-api/internals/proxy/middlewares"
+	"github.com/codeshelldev/secured-signal-api/utils"
 	log "github.com/codeshelldev/secured-signal-api/utils/logger"
 )
 
 type ENV_ struct {
 	PORT 				string
 	API_URL 			string
-	API_TOKEN 			string
+	API_TOKENS 			[]string
 	BLOCKED_ENDPOINTS 	[]string
 	VARIABLES 			map[string]any
 	MESSAGE_ALIASES 	[]middlewares.MessageAlias
@@ -76,7 +76,11 @@ func Load() {
 	ENV.PORT = os.Getenv("PORT")
 	ENV.API_URL = os.Getenv("SIGNAL_API_URL")
 
-	ENV.API_TOKEN = os.Getenv("API_TOKEN")
+	apiToken := os.Getenv("API_TOKENS")
+
+	if apiToken == "" {
+		apiToken = os.Getenv("API_TOKEN")
+	}
 
 	blockedEndpointJSON := os.Getenv("BLOCKED_ENDPOINTS")
 	recipientsJSON := os.Getenv("RECIPIENTS")
@@ -85,59 +89,21 @@ func Load() {
 
 	log.Info("Loaded Environment Variables")
 
-	if ENV.API_TOKEN == "" {
+	apiTokens, err := utils.StringToArray(apiToken)
+
+	if err != nil {
 		log.Warn("No API TOKEN provided this is NOT recommended")
 
 		log.Info("Disabling Security Features due to incomplete Congfiguration")
 
 		ENV.BLOCKED_ENDPOINTS = []string{}
+	} else {
+		ENV.API_TOKENS = apiTokens
 	}
 
-	if blockedEndpointJSON != "" {
-		var blockedEndpoints []string
+	ENV.BLOCKED_ENDPOINTS = utils.GetJson[[]string](blockedEndpointJSON)
+	ENV.MESSAGE_ALIASES = utils.GetJson[[]middlewares.MessageAlias](messageAliasesJSON)
 
-		err := json.Unmarshal([]byte(blockedEndpointJSON), &blockedEndpoints)
-
-		if err != nil {
-			log.Error("Could not decode Blocked Endpoints: ", blockedEndpointJSON)
-		}
-
-		ENV.BLOCKED_ENDPOINTS = blockedEndpoints
-	}
-
-	if messageAliasesJSON != "" {
-		var msgAliases []middlewares.MessageAlias
-
-		err := json.Unmarshal([]byte(messageAliasesJSON), &msgAliases)
-
-		if err != nil {
-			log.Error("Could not decode Message Aliases ", variablesJSON)
-		}
-
-		ENV.MESSAGE_ALIASES = msgAliases
-	}
-
-	if variablesJSON != "" {
-		var variables map[string]interface{}
-
-		err := json.Unmarshal([]byte(variablesJSON), &variables)
-
-		if err != nil {
-			log.Error("Could not decode Variables ", variablesJSON)
-		}
-
-		ENV.VARIABLES = variables
-	}
-
-	if recipientsJSON != "" {
-		var recipients []string
-
-		err := json.Unmarshal([]byte(recipientsJSON), &recipients)
-
-		if err != nil {
-			log.Error("Could not decode Variables ", variablesJSON)
-		}
-
-		ENV.VARIABLES["RECIPIENTS"] = recipients
-	}
+	ENV.VARIABLES = utils.GetJson[map[string]any](variablesJSON)
+	ENV.VARIABLES["RECIPIENTS"] = utils.GetJson[[]string](recipientsJSON)
 }