shared-sqs: Этап 4 — изоляция очередей по тенанту

2026-04-09 12:53:10 +03:00
parent f4352a17b1
commit 08053ca8e5
16 changed files with 1243 additions and 882 deletions
@@ -1,54 +1,65 @@
+// Изменено: 2026-04-09
+// CreateQueueV1 — создаёт очередь для тенанта из request context.
+// Ключ в SyncQueues: "{tenantAccessKey}:{queueName}" для изоляции между тенантами.
 package gosqs

 import (
-	"net/http"
-	"time"
+"net/http"
+"time"

-	"shared-sqs/app/interfaces"
-	"shared-sqs/app/models"
-	"shared-sqs/app/utils"
-	log "github.com/sirupsen/logrus"
+"shared-sqs/app/interfaces"
+"shared-sqs/app/models"
+"shared-sqs/app/utils"
+log "github.com/sirupsen/logrus"
 )

 func CreateQueueV1(req *http.Request) (int, interfaces.AbstractResponseBody) {
-	requestBody := models.NewCreateQueueRequest()
-	ok := utils.REQUEST_TRANSFORMER(requestBody, req, false)
-	if !ok {
-		log.Error("Invalid Request - CreateQueueV1")
-		return utils.CreateErrorResponseV1("InvalidParameterValue", true)
-	}
-	queueName := requestBody.QueueName
-
-	queueUrl := "http://" + models.CurrentEnvironment.Host + ":" + models.CurrentEnvironment.Port +
-		"/" + models.CurrentEnvironment.AccountID + "/" + queueName
-	if models.CurrentEnvironment.Region != "" {
-		queueUrl = "http://" + models.CurrentEnvironment.Region + "." + models.CurrentEnvironment.Host + ":" +
-			models.CurrentEnvironment.Port + "/" + models.CurrentEnvironment.AccountID + "/" + queueName
-	}
-	queueArn := "arn:aws:sqs:" + models.CurrentEnvironment.Region + ":" + models.CurrentEnvironment.AccountID + ":" + queueName
-
-	if _, ok := models.SyncQueues.Queues[queueName]; !ok {
-		log.Infof("Creating Queue: %s", queueName)
-		queue := &models.Queue{
-			Name:             queueName,
-			URL:              queueUrl,
-			Arn:              queueArn,
-			IsFIFO:           utils.HasFIFOQueueName(queueName),
-			EnableDuplicates: models.CurrentEnvironment.EnableDuplicates,
-			Duplicates:       make(map[string]time.Time),
-		}
-		if err := setQueueAttributesV1(queue, requestBody.Attributes); err != nil {
-			return utils.CreateErrorResponseV1(err.Error(), true)
-		}
-		models.SyncQueues.Lock()
-		models.SyncQueues.Queues[queueName] = queue
-		models.SyncQueues.Unlock()
-	}
-
-	respStruct := models.CreateQueueResponse{
-		Xmlns:    models.BaseXmlns,
-		Result:   models.CreateQueueResult{QueueUrl: queueUrl},
-		Metadata: models.BaseResponseMetadata,
-	}
-	return http.StatusOK, respStruct
+requestBody := models.NewCreateQueueRequest()
+ok := utils.REQUEST_TRANSFORMER(requestBody, req, false)
+if !ok {
+log.Error("Invalid Request - CreateQueueV1")
+return utils.CreateErrorResponseV1("InvalidParameterValue", true)
+}
+
+t := getTenantFromContext(req)
+if t == nil {
+return utils.CreateErrorResponseV1("InvalidClientTokenId", true)
+}
+
+// Ловушка #8: передаём queueName (не key) в HasFIFOQueueName — иначе .fifo не определится
+queueName := requestBody.QueueName
+key := tenantQueueKey(t.AccessKey, queueName)
+queueUrl := tenantQueueURL(t, queueName)
+queueArn := tenantQueueARN(t, queueName)
+
+models.SyncQueues.Lock()
+if _, exists := models.SyncQueues.Queues[key]; !exists {
+// Проверка лимита очередей тенанта
+if t.MaxQueues > 0 && countTenantQueues(t.AccessKey) >= t.MaxQueues {
+models.SyncQueues.Unlock()
+return utils.CreateErrorResponseV1("LimitExceeded", true)
+}
+log.Infof("Creating Queue: %s (tenant: %s)", queueName, t.ID)
+queue := &models.Queue{
+Name:             queueName,
+URL:              queueUrl,
+Arn:              queueArn,
+IsFIFO:           utils.HasFIFOQueueName(queueName),
+EnableDuplicates: models.CurrentEnvironment.EnableDuplicates,
+Duplicates:       make(map[string]time.Time),
+}
+if err := setQueueAttributesV1(queue, requestBody.Attributes); err != nil {
+models.SyncQueues.Unlock()
+return utils.CreateErrorResponseV1(err.Error(), true)
+}
+models.SyncQueues.Queues[key] = queue
+}
+models.SyncQueues.Unlock()
+
+respStruct := models.CreateQueueResponse{
+Xmlns:    models.BaseXmlns,
+Result:   models.CreateQueueResult{QueueUrl: queueUrl},
+Metadata: models.BaseResponseMetadata,
+}
+return http.StatusOK, respStruct
 }