Update extensions & release 1.0.0-rc (#281)

plugins/wasm-cpp/extensions/request_block/BUILD

@@ -1,3 +1,17 @@
+# Copyright (c) 2022 Alibaba Group Holding Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 load("@proxy_wasm_cpp_sdk//bazel/wasm:wasm.bzl", "wasm_cc_binary")
 load("//bazel:wasm.bzl", "declare_wasm_image_targets")
 
@@ -11,9 +25,9 @@ wasm_cc_binary(
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
         "//common:json_util",
-        "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics",
         "//common:http_util",
         "//common:rule_util",
+        "@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics",
     ],
 )
 
@@ -30,8 +44,8 @@ cc_library(
         "@com_google_absl//absl/strings",
         "//common:json_util",
         "@proxy_wasm_cpp_host//:lib",
-        "//common:http_util",
-        "//common:rule_util",
+        "//common:http_util_nullvm",
+        "//common:rule_util_nullvm",
     ],
 )
 

plugins/wasm-cpp/extensions/request_block/plugin.cc

@@ -108,24 +108,24 @@ bool PluginRootContext::parsePluginConfig(const json& configuration,
     return false;
   }
   if (!JsonArrayIterate(
-          configuration, "block_bodies", [&](const json& item) -> bool {
+          configuration, "block_bodys", [&](const json& item) -> bool {
             auto body = JsonValueAs<std::string>(item);
             if (body.second != Wasm::Common::JsonParserResultDetail::OK) {
-              LOG_WARN("cannot parse block_bodies");
+              LOG_WARN("cannot parse block_bodys");
               return false;
             }
             if (rule.case_sensitive) {
-              rule.block_bodies.push_back(std::move(body.first.value()));
+              rule.block_bodys.push_back(std::move(body.first.value()));
             } else {
-              rule.block_bodies.push_back(
+              rule.block_bodys.push_back(
                   absl::AsciiStrToLower(body.first.value()));
             }
             return true;
           })) {
-    LOG_WARN("failed to parse configuration for block_bodies.");
+    LOG_WARN("failed to parse configuration for block_bodys.");
     return false;
   }
-  if (rule.block_bodies.empty() && rule.block_headers.empty() &&
+  if (rule.block_bodys.empty() && rule.block_headers.empty() &&
       rule.block_urls.empty()) {
     LOG_WARN("there is no block rules");
     return false;
@@ -137,8 +137,7 @@ bool PluginRootContext::onConfigure(size_t size) {
   // Parse configuration JSON string.
   if (size > 0 && !configure(size)) {
     LOG_WARN("configuration has errors initialization will not continue.");
-    setInvalidConfig();
-    return true;
+    return false;
   }
   return true;
 }
@@ -197,7 +196,7 @@ bool PluginRootContext::checkHeader(const RequestBlockConfigRule& rule,
       }
     }
   }
-  if (!rule.block_bodies.empty()) {
+  if (!rule.block_bodys.empty()) {
     check_body = true;
   }
   return true;
@@ -212,7 +211,7 @@ bool PluginRootContext::checkBody(const RequestBlockConfigRule& rule,
     bodystr = absl::AsciiStrToLower(request_body);
     body = bodystr;
   }
-  for (const auto& block_body : rule.block_bodies) {
+  for (const auto& block_body : rule.block_bodys) {
     if (absl::StrContains(body, block_body)) {
       sendLocalResponse(rule.blocked_code, "", rule.blocked_message, {});
       return false;

plugins/wasm-cpp/extensions/request_block/plugin.h

@@ -45,7 +45,7 @@ struct RequestBlockConfigRule {
   bool case_sensitive = true;
   std::vector<std::string> block_urls;
   std::vector<std::string> block_headers;
-  std::vector<std::string> block_bodies;
+  std::vector<std::string> block_bodys;
 };
 
 // PluginRootContext is the root context for all streams processed by the

plugins/wasm-cpp/extensions/request_block/plugin_test.cc

@@ -128,7 +128,7 @@ TEST_F(RequestBlockTest, CaseSensitive) {
 {
    "block_urls": ["?foo=bar", "swagger.html"],
    "block_headers": ["headerKey", "headerValue"],
-   "block_bodies": ["Hello World"]
+   "block_bodys": ["Hello World"]
 })";
 
   config_.set({configuration.data(), configuration.size()});
@@ -188,7 +188,7 @@ TEST_F(RequestBlockTest, CaseInsensitive) {
    "blocked_code": 404,
    "block_urls": ["?foo=bar", "swagger.html"],
    "block_headers": ["headerKey", "headerValue"],
-   "block_bodies": ["Hello World"]
+   "block_bodys": ["Hello World"]
 })";
 
   config_.set({configuration.data(), configuration.size()});