Fix escaping cgi, according to RFC 3986 standart

https://www.ietf.org/rfc/rfc3986.txt

Символ `^` не входит в допустимые символы URI

4 files changed, 10 insertions, 10 deletions

diff --git a/library/cpp/string_utils/quote/quote.cpp b/library/cpp/string_utils/quote/quote.cpp
index a7a4749d99..6a117c424a 100644
--- a/library/cpp/string_utils/quote/quote.cpp
+++ b/library/cpp/string_utils/quote/quote.cpp
@@ -75,18 +75,18 @@ static inline const char* FixZero(const char* s) noexcept {
 // '%',  '&', '+', ',',
 // '#',  '<', '=', '>',
 // '[',  '\\',']', '?',
-//  ':', '{', '}',
+//  ':', '{', '}', '^'
 // all below ' ' (0x20) and above '~' (0x7E).
 // ' ' converted to '+'
 static const bool chars_to_url_escape[256] = {
-    //  0  1  2  3   4  5  6  7   8  9  A  B   C  D  E  F
+//  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, //0
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, //1
     0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, //2
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, //3
 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //4
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, //5
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, //5
     1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //6
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, //7
 
diff --git a/library/cpp/string_utils/quote/quote_ut.cpp b/library/cpp/string_utils/quote/quote_ut.cpp
index 6c552b279e..9d6f56ffbb 100644
--- a/library/cpp/string_utils/quote/quote_ut.cpp
+++ b/library/cpp/string_utils/quote/quote_ut.cpp
@@ -22,27 +22,27 @@ Y_UNIT_TEST_SUITE(TCGIEscapeTest) {
     Y_UNIT_TEST(StringBuf) {
         char tmp[100];
 
-        UNIT_ASSERT_VALUES_EQUAL(CgiEscape(tmp, "!@#$%^&*(){}[]\" "), TStringBuf("!@%23$%25^%26*%28%29%7B%7D%5B%5D%22+"));
+        UNIT_ASSERT_VALUES_EQUAL(CgiEscape(tmp, "!@#$%^&*(){}[]\" "), TStringBuf("!@%23$%25%5E%26*%28%29%7B%7D%5B%5D%22+"));
     }
 
     Y_UNIT_TEST(StrokaRet) {
-        UNIT_ASSERT_VALUES_EQUAL(CGIEscapeRet("!@#$%^&*(){}[]\" "), TString("!@%23$%25^%26*%28%29%7B%7D%5B%5D%22+"));
+        UNIT_ASSERT_VALUES_EQUAL(CGIEscapeRet("!@#$%^&*(){}[]\" "), TString("!@%23$%25%5E%26*%28%29%7B%7D%5B%5D%22+"));
     }
 
     Y_UNIT_TEST(StrokaAppendRet) {
         TString param;
         AppendCgiEscaped("!@#$%^&*(){}[]\" ", param);
-        UNIT_ASSERT_VALUES_EQUAL(param, TString("!@%23$%25^%26*%28%29%7B%7D%5B%5D%22+"));
+        UNIT_ASSERT_VALUES_EQUAL(param, TString("!@%23$%25%5E%26*%28%29%7B%7D%5B%5D%22+"));
 
         TString param2 = "&param=";
         AppendCgiEscaped("!@#$%^&*(){}[]\" ", param2);
         UNIT_ASSERT_VALUES_EQUAL(param2,
-            TString("&param=!@%23$%25^%26*%28%29%7B%7D%5B%5D%22+"));
+            TString("&param=!@%23$%25%5E%26*%28%29%7B%7D%5B%5D%22+"));
 
         param2.append("&param_param=");
         AppendCgiEscaped("!@#$%^&*(){}[]\" ", param2);
         UNIT_ASSERT_VALUES_EQUAL(param2,
-            TString("&param=!@%23$%25^%26*%28%29%7B%7D%5B%5D%22+&param_param=!@%23$%25^%26*%28%29%7B%7D%5B%5D%22+"));
+            TString("&param=!@%23$%25%5E%26*%28%29%7B%7D%5B%5D%22+&param_param=!@%23$%25%5E%26*%28%29%7B%7D%5B%5D%22+"));
     }
 
 }
diff --git a/ydb/library/backup/ut/ut.cpp b/ydb/library/backup/ut/ut.cpp
index 5967e9dfa3..3639acc604 100644
--- a/ydb/library/backup/ut/ut.cpp
+++ b/ydb/library/backup/ut/ut.cpp
@@ -397,7 +397,7 @@ Y_UNIT_TEST(ResultSetStringPrintTest) {
         << "\"simplestring\","
            "\"Space_And_Underscore+Containing+String\","
            "\"String%22with%22quote%22marks\"" << Endl
-        << "\"~Allowed.symbols_string;!*@$^/\","
+        << "\"~Allowed.symbols_string;!*@$%5E/\","
            "\"NotAllowed%22%3A%0A%23%25%26%28%29%2C%5C%7C\","
            "\"String%2Cwith%2Ccommas.and.dots\"" << Endl;
     TestResultSetParsedOk(resultSetStr, expect);
diff --git a/ydb/library/yql/utils/url_builder_ut.cpp b/ydb/library/yql/utils/url_builder_ut.cpp
index 791cf08731..ad15a91698 100644
--- a/ydb/library/yql/utils/url_builder_ut.cpp
+++ b/ydb/library/yql/utils/url_builder_ut.cpp
@@ -24,7 +24,7 @@ Y_UNIT_TEST_SUITE(TUrlBuilder) {
                         .AddUrlParam("param2", "val2")
                         .Build();
 
-        UNIT_ASSERT_VALUES_EQUAL(url, "https://localhost/abc?param1=%3D!@%23$%25^%26*%28%29%7B%7D%5B%5D%22+&param2=val2");
+        UNIT_ASSERT_VALUES_EQUAL(url, "https://localhost/abc?param1=%3D!@%23$%25%5E%26*%28%29%7B%7D%5B%5D%22+&param2=val2");
     }
 
     Y_UNIT_TEST(EmptyPathComponent) {