Add option to derive queueUrl from incoming request, rather than conf…

…ig/default.
bsycorp · Mar 4, 2020 · 2f32176 · 2f32176
1 parent 669d010
commit 2f32176
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/app/common.go b/app/common.go
@@ -28,6 +28,7 @@ type EnvQueueAttributes struct {
 type Environment struct {
 	Host                   string
 	Port                   string
+	DeriveHostAndPort      bool
 	SqsPort                string
 	SnsPort                string
 	Region                 string

diff --git a/app/common/common.go b/app/common/common.go
@@ -7,9 +7,12 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
+	"net/http"
 	"hash"
 	"io"
 	"sort"
+	"strings"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/p4tin/goaws/app"
 )
@@ -58,6 +61,12 @@ func HashAttributes(attributes map[string]app.MessageAttributeValue) string {
 	return hex.EncodeToString(hasher.Sum(nil))
 }
 
+func DeriveQueueUrl(queueUrl string, req *http.Request) string {
+	derivedQueueUrl := strings.Replace(queueUrl, app.CurrentEnvironment.Host + ":" + app.CurrentEnvironment.Port, req.Host, -1)
+	log.Debugf("Derived new queue URL: %s from request: %s with original: %s", derivedQueueUrl, req.Host, queueUrl)
+	return derivedQueueUrl
+}
+
 func sortedKeys(attributes map[string]app.MessageAttributeValue) []string {
 	var keys []string
 	for key := range attributes {

diff --git a/app/gosqs/gosqs.go b/app/gosqs/gosqs.go
@@ -92,7 +92,12 @@ func ListQueues(w http.ResponseWriter, req *http.Request) {
 	for _, queue := range app.SyncQueues.Queues {
 		app.SyncQueues.RLock()
 		if strings.HasPrefix(queue.Name, queueNamePrefix) {
-			respStruct.Result.QueueUrl = append(respStruct.Result.QueueUrl, queue.URL)
+			queueUrl := queue.URL
+			// If derive host is enabled, generate it dynamically from the incoming requests, solves for multiple ingress paths.
+			if app.CurrentEnvironment.DeriveHostAndPort {
+				queueUrl = common.DeriveQueueUrl(queueUrl, req)
+			}
+			respStruct.Result.QueueUrl = append(respStruct.Result.QueueUrl, queueUrl)
 		}
 		app.SyncQueues.RUnlock()
 	}
@@ -754,6 +759,10 @@ func GetQueueUrl(w http.ResponseWriter, req *http.Request) {
 	queueName := req.FormValue("QueueName")
 	if queue, ok := app.SyncQueues.Queues[queueName]; ok {
 		url := queue.URL
+		// If derive host is enabled, generate it dynamically from the incoming requests, solves for multiple ingress paths.
+		if app.CurrentEnvironment.DeriveHostAndPort {
+			url = common.DeriveQueueUrl(url, req)
+		}
 		log.Infof("Get Queue URL: %s", queueName)
 		// Create, encode/xml and send response
 		result := app.GetQueueUrlResult{QueueUrl: url}

diff --git a/app/router/router.go b/app/router/router.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 
 	"github.com/gorilla/mux"
+	app "github.com/p4tin/goaws/app"
 	sns "github.com/p4tin/goaws/app/gosns"
 	sqs "github.com/p4tin/goaws/app/gosqs"
 )
@@ -73,7 +74,7 @@ func actionHandler(w http.ResponseWriter, req *http.Request) {
 		}).Debug("Handling URL request")
 	fn, ok := routingTable[req.FormValue("Action")]
 	if !ok {
-		log.Println("Bad Request - Action:", req.FormValue("Action"))
+		log.Warnf("Bad Request - Action: %s", req.FormValue("Action"))
 		w.WriteHeader(http.StatusBadRequest)
 		io.WriteString(w, "Bad Request")
 		return