Fix parsing queue url in new SQS Json API

Author: siarheivesialou

ydb/core/ymq/base/utils.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <util/generic/string.h>
+#include <util/string/split.h>
+
+constexpr TStringBuf PRIVATE_REQUEST_PATH_PREFIX = "/private";
+
+namespace NKikimr::NSQS {
+    static inline bool IsPrivateRequest(const TStringBuf& path) {
+        return path.StartsWith(PRIVATE_REQUEST_PATH_PREFIX);
+    }
+
+    static inline TString GetRequestPathPart(TStringBuf path, size_t partIdx, bool isPrivateRequest) {
+        if (isPrivateRequest) {
+            path.SkipPrefix(PRIVATE_REQUEST_PATH_PREFIX);
+        }
+
+        TVector<TStringBuf> items;
+        StringSplitter(path).Split('/').AddTo(&items);
+        if (items.size() > partIdx) {
+            return TString(items[partIdx]);
+        }
+        return TString();
+    }
+
+    static inline TString ExtractQueueNameFromPath(const TStringBuf path, bool isPrivateRequest) {
+        return GetRequestPathPart(path, 2, isPrivateRequest);
+    }
+
+    static inline TString ExtractAccountNameFromPath(const TStringBuf path, bool isPrivateRequest) {
+        return GetRequestPathPart(path, 1, isPrivateRequest);
+    }
+}

ydb/core/ymq/http/http.cpp

@@ -11,6 +11,7 @@
 #include <ydb/core/ymq/base/helpers.h>
 #include <ydb/core/ymq/base/limits.h>
 #include <ydb/core/ymq/base/secure_protobuf_printer.h>
+#include <ydb/core/ymq/base/utils.h>
 
 #include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/log.h>
@@ -28,6 +29,7 @@
 #include <util/string/split.h>
 #include <library/cpp/string_utils/url/url.h>
 
+
 namespace NKikimr::NSQS {
 
 using NKikimrClient::TSqsRequest;
@@ -48,8 +50,6 @@ const std::vector<TStringBuf> PRIVATE_TOKENS_HEADERS = {
 
 const TString CREDENTIAL_PARAM = "credential";
 
-constexpr TStringBuf PRIVATE_REQUEST_PATH_PREFIX = "/private";
-
 const TSet<TString> ModifyPermissionsActions = {"GrantPermissions", "RevokePermissions", "SetPermissions"};
 
 bool IsPrivateTokenHeader(TStringBuf headerName) {
@@ -264,26 +264,9 @@ bool THttpRequest::DoReply(const TReplyParams& p) {
     }
 }
 
-TString THttpRequest::GetRequestPathPart(TStringBuf path, size_t partIdx) const {
-    if (IsPrivateRequest_) {
-        path.SkipPrefix(PRIVATE_REQUEST_PATH_PREFIX);
-    }
-
-    TVector<TStringBuf> items;
-    StringSplitter(path).Split('/').AddTo(&items);
-    if (items.size() > partIdx) {
-        return TString(items[partIdx]);
-    }
-    return TString();
-}
-
 TString THttpRequest::ExtractQueueNameFromPath(const TStringBuf path) {
-    return GetRequestPathPart(path, 2);
-}
-
-TString THttpRequest::ExtractAccountNameFromPath(const TStringBuf path) {
-    return GetRequestPathPart(path, 1);
-}
+    return NKikimr::NSQS::ExtractQueueNameFromPath(path, IsPrivateRequest_);
+};
 
 void THttpRequest::ExtractQueueAndAccountNames(const TStringBuf path) {
     if (Action_ == EAction::ModifyPermissions)
@@ -296,9 +279,11 @@ void THttpRequest::ExtractQueueAndAccountNames(const TStringBuf path) {
 
         QueueName_ = *QueryParams_.QueueName;
     } else {
-        const auto pathAndQuery = QueryParams_.QueueUrl ? GetPathAndQuery(*QueryParams_.QueueUrl) : GetPathAndQuery(path);
+        const auto pathAndQuery = QueryParams_.QueueUrl
+            ? GetPathAndQuery(*QueryParams_.QueueUrl)
+            : GetPathAndQuery(path);
         QueueName_ = ExtractQueueNameFromPath(pathAndQuery);
-        AccountName_ = ExtractAccountNameFromPath(pathAndQuery);
+        AccountName_ = NKikimr::NSQS::ExtractAccountNameFromPath(pathAndQuery, IsPrivateRequest_);
 
         if (IsProxyAction(Action_)) {
             if (QueryParams_.QueueUrl && *QueryParams_.QueueUrl) {
@@ -381,9 +366,7 @@ void THttpRequest::ParseCgiParameters(const TCgiParameters& params) {
 }
 
 void THttpRequest::ParsePrivateRequestPathPrefix(const TStringBuf& path) {
-    if (path.StartsWith(PRIVATE_REQUEST_PATH_PREFIX)) {
-        IsPrivateRequest_ = true;
-    }
+    IsPrivateRequest_ = NKikimr::NSQS::IsPrivateRequest(path);
 }
 
 ui64 THttpRequest::CalculateRequestSizeInBytes(const THttpInput& input, const ui64 contentLength) const {

ydb/core/ymq/http/http.h

@@ -56,7 +56,6 @@ class THttpRequest : public TRequestReplier {
 
     TString GetRequestPathPart(TStringBuf path, size_t partIdx) const;
     TString ExtractQueueNameFromPath(const TStringBuf path);
-    TString ExtractAccountNameFromPath(const TStringBuf path);
 
     ui64 CalculateRequestSizeInBytes(const THttpInput& input, const ui64 contentLength) const;
     void ExtractQueueAndAccountNames(const TStringBuf path);

ydb/services/ymq/utils.h

@@ -3,6 +3,7 @@
 #include <util/generic/string.h>
 #include <util/generic/maybe.h>
 #include <util/string/split.h>
+#include <ydb/core/ymq/base/utils.h>
 
 namespace NKikimr::NYmq {
     inline static TMaybe<std::pair<TString, TString>> CloudIdAndResourceIdFromQueueUrl(const TString& queueUrl) {
@@ -13,10 +14,13 @@ namespace NKikimr::NYmq {
 
         auto restOfUrl = queueUrl.substr(protocolSeparator + 3);
         auto parts = StringSplitter(restOfUrl).Split('/').ToList<TString>();
-        if (parts.size() != 4) {
+        if (parts.size() < 3) {
             return Nothing();
         }
 
-        return std::pair<TString, TString>(parts[1], parts[2]);
+        bool isPrivateRequest = NKikimr::NSQS::IsPrivateRequest(restOfUrl);
+        TString queueName = NKikimr::NSQS::ExtractQueueNameFromPath(restOfUrl, isPrivateRequest);
+        TString accountName = NKikimr::NSQS::ExtractAccountNameFromPath(restOfUrl, isPrivateRequest);
+        return std::pair<TString, TString>(std::move(accountName), std::move(queueName));
     }
-}
+}