Naeel
e9a26f7975
Phase 1 (Critical): - #1 JWT auth (done in v0.1.16) - #2 Batch message size validation in send_message_batch.go - #10 RLock in GetQueueUrlV1 (data race fix) Phase 2 (AWS-compatible limits): - #3 QueueName validation: max 80 chars, [a-zA-Z0-9_-](.fifo)? - #4 WaitTimeSeconds clamped to 0-20 - #5 ReceiveMessageWaitTimeSeconds clamped to 0-20 - #6 DelaySeconds clamped to 0-900 - #7 VisibilityTimeout clamped to 0-43200 - #8 MaxNumberOfMessages clamped to 1-10 - #9 Message attributes limited to 10 per message - #15 BatchEntryId length validated (max 80) - #16 DeduplicationID length validated (max 128) - #17 GroupID length validated (max 128) Phase 3 (Per-tenant resource limits): - #11 Max messages per queue (120K standard, 20K FIFO) - #12 Global tenant limit (1000) - #3.5 HTTP request body size limit (1MB via MaxBytesReader) Phase 4 (Stability): - #14 Duplicates map cleanup (already in PeriodicTasks) - #13 FIFO group lock timeout (already in visibility timeout reset) - #18 Redis size guard: skip save if >50MB Skipped (Low, no real risk): - #19 {account} URL param (informational only, not used for access) - #20 ReceiptHandle format (self-validating UUID#UUID) New file: app/gosqs/validation.go — centralized AWS SQS limits and validators
72 lines
2.6 KiB
Go
72 lines
2.6 KiB
Go
// Изменено: 2026-04-10 — добавлена Redis persistence
|
|
// CreateQueueV1 — создаёт очередь для тенанта из request context.
|
|
// Ключ в SyncQueues: "{tenantAccessKey}:{queueName}" для изоляции между тенантами.
|
|
package gosqs
|
|
|
|
import (
|
|
"net/http"
|
|
"time"
|
|
|
|
"shared-sqs/app/interfaces"
|
|
"shared-sqs/app/models"
|
|
"shared-sqs/app/persistence"
|
|
"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)
|
|
}
|
|
|
|
t := getTenantFromContext(req)
|
|
if t == nil {
|
|
return utils.CreateErrorResponseV1("InvalidClientTokenId", true)
|
|
}
|
|
|
|
// Валидация имени очереди по AWS правилам: макс 80 chars, [a-zA-Z0-9_-], опц. .fifo
|
|
queueName := requestBody.QueueName
|
|
if err := ValidateQueueName(queueName); err != nil {
|
|
return utils.CreateErrorResponseV1("InvalidParameterValue", true)
|
|
}
|
|
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
|
|
}
|
|
// Сохраняем очередь в Redis пока держим Lock — консистентный снапшот
|
|
persistence.SaveQueue(key, models.SyncQueues.Queues[key])
|
|
models.SyncQueues.Unlock()
|
|
respStruct := models.CreateQueueResponse{
|
|
Xmlns: models.BaseXmlns,
|
|
Result: models.CreateQueueResult{QueueUrl: queueUrl},
|
|
Metadata: models.BaseResponseMetadata,
|
|
}
|
|
return http.StatusOK, respStruct
|
|
}
|