diff options
author | trofimenkov <trofimenkov@yandex-team.ru> | 2022-02-10 16:49:30 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:49:30 +0300 |
commit | 30cebc2cfa79af3b577760a113e203a79450e6b6 (patch) | |
tree | 49327bf3c28fab534b04b312a39179e70f7c2763 /library/cpp/http/misc | |
parent | a2d2743094c8d255cda4011b317235874db4d01c (diff) | |
download | ydb-30cebc2cfa79af3b577760a113e203a79450e6b6.tar.gz |
Restoring authorship annotation for <trofimenkov@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/http/misc')
-rw-r--r-- | library/cpp/http/misc/httpreqdata.cpp | 8 | ||||
-rw-r--r-- | library/cpp/http/misc/httpreqdata.h | 10 | ||||
-rw-r--r-- | library/cpp/http/misc/httpreqdata_ut.cpp | 62 |
3 files changed, 40 insertions, 40 deletions
diff --git a/library/cpp/http/misc/httpreqdata.cpp b/library/cpp/http/misc/httpreqdata.cpp index f6951f68cd..4384caf0cf 100644 --- a/library/cpp/http/misc/httpreqdata.cpp +++ b/library/cpp/http/misc/httpreqdata.cpp @@ -21,7 +21,7 @@ TBaseServerRequestData::TBaseServerRequestData(const char* qs, SOCKET s) , Path(nullptr) , Search((char*)qs) , SearchLength(qs ? strlen(qs) : 0) - , OrigSearch(Search, SearchLength) + , OrigSearch(Search, SearchLength) , Socket(s) , BeginTime(MicroSeconds()) { @@ -110,7 +110,7 @@ const char* TBaseServerRequestData::Environment(const char* key) const { void TBaseServerRequestData::Clear() { HeadersIn_.clear(); Addr = Path = Search = nullptr; - OrigSearch = {}; + OrigSearch = {}; SearchLength = 0; Host.clear(); Port.clear(); @@ -174,8 +174,8 @@ bool TBaseServerRequestData::Parse(const char* origReq) { } else { SearchLength = 0; } - OrigSearch = {Search, SearchLength}; - + OrigSearch = {Search, SearchLength}; + return true; } diff --git a/library/cpp/http/misc/httpreqdata.h b/library/cpp/http/misc/httpreqdata.h index 16e59c4d78..09389fa4af 100644 --- a/library/cpp/http/misc/httpreqdata.h +++ b/library/cpp/http/misc/httpreqdata.h @@ -51,10 +51,10 @@ public: return TStringBuf(Search, SearchLength); } - TStringBuf OrigQueryStringBuf() const { - return OrigSearch; - } - + TStringBuf OrigQueryStringBuf() const { + return OrigSearch; + } + void AppendQueryString(const char* str, size_t length); const char* RemoteAddr() const; void SetRemoteAddr(TStringBuf addr); @@ -94,7 +94,7 @@ private: char* Path; char* Search; size_t SearchLength; // length of Search - TStringBuf OrigSearch; + TStringBuf OrigSearch; THttpHeadersContainer HeadersIn_; mutable char AddrData[INET6_ADDRSTRLEN]; SOCKET Socket; diff --git a/library/cpp/http/misc/httpreqdata_ut.cpp b/library/cpp/http/misc/httpreqdata_ut.cpp index e7f16ef27c..a0ae26ea84 100644 --- a/library/cpp/http/misc/httpreqdata_ut.cpp +++ b/library/cpp/http/misc/httpreqdata_ut.cpp @@ -51,9 +51,9 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) { // This should work UNIT_ASSERT(rd.Parse(" /yandsearch?>a=fake&haha=da HTTP 1.1 OK")); - UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), ">a=fake&haha=da"); - UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), rd.OrigQueryStringBuf()); - + UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), ">a=fake&haha=da"); + UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), rd.OrigQueryStringBuf()); + rd.Scan(); UNIT_ASSERT(rd.CgiParam.Has("gta", "fake")); UNIT_ASSERT(rd.CgiParam.Has("haha", "da")); @@ -63,27 +63,27 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) { } Y_UNIT_TEST(Ctor) { - const TString qs("gta=fake&haha=da"); - TServerRequestData rd(qs.c_str()); - - UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs); - UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), qs); - + const TString qs("gta=fake&haha=da"); + TServerRequestData rd(qs.c_str()); + + UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs); + UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), qs); + UNIT_ASSERT(rd.CgiParam.Has("gta")); UNIT_ASSERT(rd.CgiParam.Has("haha")); UNIT_ASSERT(!rd.CgiParam.Has("no-param")); } Y_UNIT_TEST(HashCut) { - const TString qs(">a=fake&haha=da"); - const TString header = " /yandsearch?" + qs + "#&uberParam=yes&q=? HTTP 1.1 OK"; - + const TString qs(">a=fake&haha=da"); + const TString header = " /yandsearch?" + qs + "#&uberParam=yes&q=? HTTP 1.1 OK"; + TServerRequestData rd; - rd.Parse(header.c_str()); - - UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs); - UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), qs); + rd.Parse(header.c_str()); + UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs); + UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), qs); + rd.Scan(); UNIT_ASSERT(rd.CgiParam.Has("gta")); UNIT_ASSERT(rd.CgiParam.Has("haha")); @@ -94,9 +94,9 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) { TServerRequestData rd; rd.Parse(" /y#ndsearch?>a=fake&haha=da&uberParam=yes&q=? HTTP 1.1 OK"); - UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), ""); - UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), ""); - + UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), ""); + UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), ""); + rd.Scan(); UNIT_ASSERT(rd.CgiParam.empty()); } @@ -105,29 +105,29 @@ Y_UNIT_TEST_SUITE(TRequestServerDataTest) { TServerRequestData rd; rd.Parse(" /yandsearch?#"); - UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), ""); - UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), ""); - + UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), ""); + UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), ""); + rd.Scan(); UNIT_ASSERT(rd.CgiParam.empty()); } Y_UNIT_TEST(AppendQueryString) { - const TString qs("gta=fake&haha=da"); - TServerRequestData rd(qs.c_str()); + const TString qs("gta=fake&haha=da"); + TServerRequestData rd(qs.c_str()); UNIT_ASSERT(rd.CgiParam.Has("gta", "fake")); UNIT_ASSERT(rd.CgiParam.Has("haha", "da")); - UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs); - UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), rd.OrigQueryStringBuf()); - + UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs); + UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), rd.OrigQueryStringBuf()); + constexpr TStringBuf appendix = "gta=true>a=new"; rd.AppendQueryString(appendix.data(), appendix.size()); - - UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs + '&' + appendix); - UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), qs); - + + UNIT_ASSERT_STRINGS_EQUAL(rd.QueryStringBuf(), qs + '&' + appendix); + UNIT_ASSERT_STRINGS_EQUAL(rd.OrigQueryStringBuf(), qs); + rd.Scan(); UNIT_ASSERT(rd.CgiParam.Has("gta", "true")); |