Skip to content

LOGBROKER 8891 fix parsing queue url #8203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 23, 2024
Merged

LOGBROKER 8891 fix parsing queue url #8203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions ydb/core/ymq/base/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
34 changes: 8 additions & 26 deletions ydb/core/ymq/http/http.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -48,8 +49,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) {
Expand Down Expand Up @@ -264,26 +263,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)
Expand All @@ -296,9 +278,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) {
Expand Down Expand Up @@ -381,9 +365,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 {
Expand Down
1 change: 0 additions & 1 deletion ydb/core/ymq/http/http.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 7 additions & 3 deletions ydb/services/ymq/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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));
}
}
}
Loading