Merge 3b343e9 into 22f57bd

Author: dcherednik

ydb/core/viewer/json_autocomplete.h

@@ -5,8 +5,9 @@
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/library/services/services.pb.h>
 #include <ydb/core/viewer/json/json.h>
-#include "viewer.h"
+
 #include "query_autocomplete_helper.h"
+#include "viewer_request.h"
 
 namespace NKikimr {
 namespace NViewer {
@@ -139,17 +140,8 @@ class TJsonAutocomplete : public TViewerPipeClient<TJsonAutocomplete> {
         }
     }
 
-    bool IsPostContent() {
-        if (Event->Get()->Request.GetMethod() == HTTP_METHOD_POST) {
-            const THttpHeaders& headers = Event->Get()->Request.GetHeaders();
-            auto itContentType = FindIf(headers, [](const auto& header) { return header.Name() == "Content-Type"; });
-            if (itContentType != headers.end()) {
-                TStringBuf contentTypeHeader = itContentType->Value();
-                TStringBuf contentType = contentTypeHeader.NextTok(';');
-                return contentType == "application/json";
-            }
-        }
-        return false;
+    bool IsPostContent() const {
+        return NViewer::IsPostContent(Event);
     }
 
     TAutoPtr<NSchemeCache::TSchemeCacheNavigate> MakeSchemeCacheRequest() {

ydb/core/viewer/json_query.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "viewer.h"
-#include <unordered_map>
 #include <ydb/library/actors/core/actor_bootstrapped.h>
 #include <ydb/library/actors/core/interconnect.h>
 #include <ydb/library/actors/core/mon.h>
@@ -12,7 +11,6 @@
 #include <ydb/core/kqp/common/kqp.h>
 #include <ydb/core/kqp/executer_actor/kqp_executer.h>
 #include <ydb/core/viewer/json/json.h>
-//#include <ydb/public/lib/deprecated/kicli/kicli.h>
 #include <ydb/public/lib/json_value/ydb_json_value.h>
 #include <ydb/public/sdk/cpp/client/ydb_result/result.h>
 #include "json_pipe_req.h"
@@ -102,17 +100,8 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
         }
     }
 
-    bool IsPostContent() {
-        if (Event->Get()->Request.GetMethod() == HTTP_METHOD_POST) {
-            const THttpHeaders& headers = Event->Get()->Request.GetHeaders();
-            auto itContentType = FindIf(headers, [](const auto& header) { return header.Name() == "Content-Type"; });
-            if (itContentType != headers.end()) {
-                TStringBuf contentTypeHeader = itContentType->Value();
-                TStringBuf contentType = contentTypeHeader.NextTok(';');
-                return contentType == "application/json";
-            }
-        }
-        return false;
+    bool IsPostContent() const {
+        return NViewer::IsPostContent(Event);
     }
 
     TJsonQuery(IViewer* viewer, NMon::TEvHttpInfo::TPtr& ev)

ydb/core/viewer/viewer_request.cpp

@@ -89,5 +89,22 @@ IActor* CreateViewerRequestHandler(TEvViewer::TEvViewerRequest::TPtr& request) {
     return nullptr;
 }
 
+bool IsPostContent(const NMon::TEvHttpInfo::TPtr& event) {
+    if (event->Get()->Request.GetMethod() == HTTP_METHOD_POST) {
+        const THttpHeaders& headers = event->Get()->Request.GetHeaders();
+
+        auto itContentType = FindIf(headers, [](const auto& header) {
+            return AsciiEqualsIgnoreCase(header.Name(),  "Content-Type");
+        });
+
+        if (itContentType != headers.end()) {
+            TStringBuf contentTypeHeader = itContentType->Value();
+            TStringBuf contentType = contentTypeHeader.NextTok(';');
+            return contentType == "application/json";
+        }
+    }
+    return false;
+}
+
 }
 }

ydb/core/viewer/viewer_request.h

@@ -38,6 +38,7 @@ union ViewerWhiteboardCookie {
 };
 
 IActor* CreateViewerRequestHandler(TEvViewer::TEvViewerRequest::TPtr& request);
+bool IsPostContent(const NMon::TEvHttpInfo::TPtr& event);
 
 }
 }

ydb/core/viewer/viewer_ut.cpp

@@ -1108,7 +1108,7 @@ Y_UNIT_TEST_SUITE(Viewer) {
         }
     }
 
-    void JsonAutocompleteTest(HTTP_METHOD method, NJson::TJsonValue& value, TString prefix = "", TString database = "", TVector<TString> tables = {}, ui32 limit = 10) {
+    void JsonAutocompleteTest(HTTP_METHOD method, NJson::TJsonValue& value, TString prefix = "", TString database = "", TVector<TString> tables = {}, ui32 limit = 10, bool lowerCaseContentType = false) {
         TPortManager tp;
         ui16 port = tp.GetPort(2134);
         ui16 grpcPort = tp.GetPort(2135);
@@ -1148,7 +1148,8 @@ Y_UNIT_TEST_SUITE(Viewer) {
                 {"prefix", prefix}
             };
             httpReq.PostContent = NJson::WriteJson(root);
-            httpReq.HttpHeaders.AddHeader("Content-Type", "application/json");
+            auto contType = lowerCaseContentType ? "content-type" : "Content-Type";
+            httpReq.HttpHeaders.AddHeader(contType, "application/json");
         }
         httpReq.CgiParameters.emplace("limit", ToString(limit));
         httpReq.CgiParameters.emplace("direct", "1");
@@ -1275,6 +1276,13 @@ Y_UNIT_TEST_SUITE(Viewer) {
             "/Root/MyDatabase",
             "/Root/TestDatabase"
         });
+
+        JsonAutocompleteTest(HTTP_METHOD_POST, value, "/Root/Database", "", {}, 2, true);
+        VerifyJsonAutocompleteSuccess(value, {
+            "/Root/MyDatabase",
+            "/Root/TestDatabase"
+        });
+
     }
 
     Y_UNIT_TEST(JsonAutocompleteScheme) {