crypto: moving core code to core (envoyproxy#18236)

Part of envoyproxy#9953 Signed-off-by: Alyssa Wilk <[email protected]>
pchaseh · Sep 27, 2021 · 55fc06b · 55fc06b
1 parent 2137383
commit 55fc06b
Show file tree

Hide file tree

Showing 20 changed files with 17 additions and 53 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -101,8 +101,6 @@ extensions/filters/common/original_src @snowp @klarose
 /*/extensions/wasm_runtime/ @PiotrSikora @mathetake @lizan
 # common matcher
 /*/extensions/common/matcher @mattklein123 @yangminzhu
-# common crypto extension
-/*/extensions/common/crypto @lizan @bdecoste @asraa
 /*/extensions/common/proxy_protocol @alyssawilk @wez470
 /*/extensions/filters/http/grpc_http1_bridge @snowp @jose
 /*/extensions/filters/http/gzip @gsagula @dio

diff --git a/source/common/crypto/BUILD b/source/common/crypto/BUILD
@@ -10,8 +10,17 @@ envoy_package()
 
 envoy_cc_library(
     name = "utility_lib",
+    srcs = [
+        "crypto_impl.cc",
+        "utility_impl.cc",
+    ],
     hdrs = [
+        "crypto_impl.h",
         "utility.h",
+        "utility_impl.h",
+    ],
+    external_deps = [
+        "ssl",
     ],
     deps = [
         "//envoy/buffer:buffer_interface",

diff --git a/...e/extensions/common/crypto/crypto_impl.cc → source/common/crypto/crypto_impl.cc b/...e/extensions/common/crypto/crypto_impl.cc → source/common/crypto/crypto_impl.cc
@@ -1,4 +1,4 @@
-#include "source/extensions/common/crypto/crypto_impl.h"
+#include "source/common/crypto/crypto_impl.h"
 
 namespace Envoy {
 namespace Common {

diff --git a/...ce/extensions/common/crypto/crypto_impl.h → source/common/crypto/crypto_impl.h b/...ce/extensions/common/crypto/crypto_impl.h → source/common/crypto/crypto_impl.h
diff --git a/.../extensions/common/crypto/utility_impl.cc → source/common/crypto/utility_impl.cc b/.../extensions/common/crypto/utility_impl.cc → source/common/crypto/utility_impl.cc
@@ -1,7 +1,7 @@
-#include "source/extensions/common/crypto/utility_impl.h"
+#include "source/common/crypto/utility_impl.h"
 
 #include "source/common/common/assert.h"
-#include "source/extensions/common/crypto/crypto_impl.h"
+#include "source/common/crypto/crypto_impl.h"
 
 #include "absl/container/fixed_array.h"
 #include "absl/strings/ascii.h"

diff --git a/...e/extensions/common/crypto/utility_impl.h → source/common/crypto/utility_impl.h b/...e/extensions/common/crypto/utility_impl.h → source/common/crypto/utility_impl.h
diff --git a/source/extensions/all_extensions.bzl b/source/extensions/all_extensions.bzl
@@ -4,7 +4,6 @@ load("@envoy_build_config//:extensions_build_config.bzl", "EXTENSIONS")
 # These extensions are registered using the extension system but are required for the core Envoy build.
 # The map may be overridden by extensions specified in envoy_build_config.
 _required_extensions = {
-    "envoy.common.crypto.utility_lib": "//source/extensions/common/crypto:utility_lib",
     "envoy.http.original_ip_detection.xff": "//source/extensions/http/original_ip_detection/xff:config",
     "envoy.request_id.uuid": "//source/extensions/request_id/uuid:config",
     "envoy.transport_sockets.tls": "//source/extensions/transport_sockets/tls:config",

diff --git a/source/extensions/common/aws/BUILD b/source/extensions/common/aws/BUILD
@@ -31,7 +31,6 @@ envoy_cc_library(
         "//source/common/crypto:utility_lib",
         "//source/common/http:headers_lib",
         "//source/common/singleton:const_singleton",
-        "//source/extensions/common/crypto:utility_lib",
     ],
 )
 

diff --git a/source/extensions/common/crypto/BUILD b/source/extensions/common/crypto/BUILD
diff --git a/source/extensions/filters/http/lua/BUILD b/source/extensions/filters/http/lua/BUILD
@@ -44,7 +44,6 @@ envoy_cc_library(
         "//source/common/crypto:utility_lib",
         "//source/common/http:header_utility_lib",
         "//source/common/http:utility_lib",
-        "//source/extensions/common/crypto:utility_lib",
         "//source/extensions/filters/common/lua:lua_lib",
         "//source/extensions/filters/common/lua:wrappers_lib",
     ],

diff --git a/source/extensions/filters/http/lua/lua_filter.cc b/source/extensions/filters/http/lua/lua_filter.cc
@@ -9,6 +9,7 @@
 #include "source/common/common/assert.h"
 #include "source/common/common/enum_to_int.h"
 #include "source/common/config/datasource.h"
+#include "source/common/crypto/crypto_impl.h"
 #include "source/common/crypto/utility.h"
 #include "source/common/http/message_impl.h"
 

diff --git a/source/extensions/filters/http/lua/wrappers.h b/source/extensions/filters/http/lua/wrappers.h
@@ -4,7 +4,6 @@
 #include "envoy/stream_info/stream_info.h"
 
 #include "source/common/crypto/utility.h"
-#include "source/extensions/common/crypto/crypto_impl.h"
 #include "source/extensions/filters/common/lua/lua.h"
 #include "source/extensions/filters/common/lua/wrappers.h"
 

diff --git a/source/extensions/filters/http/oauth2/BUILD b/source/extensions/filters/http/oauth2/BUILD
@@ -49,10 +49,10 @@ envoy_cc_library(
         "//source/common/common:assert_lib",
         "//source/common/common:empty_string",
         "//source/common/config:datasource_lib",
+        "//source/common/crypto:utility_lib",
         "//source/common/formatter:substitution_formatter_lib",
         "//source/common/http:rest_api_fetcher_lib",
         "//source/common/protobuf:utility_lib",
-        "//source/extensions/common/crypto:utility_lib",
         "//source/extensions/filters/http/common:pass_through_filter_lib",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/http/oauth2/v3alpha:pkg_cc_proto",

diff --git a/test/common/config/BUILD b/test/common/config/BUILD
@@ -486,9 +486,9 @@ envoy_cc_test(
     deps = [
         "//source/common/common:empty_string",
         "//source/common/config:datasource_lib",
+        "//source/common/crypto:utility_lib",
         "//source/common/http:message_lib",
         "//source/common/protobuf:utility_lib",
-        "//source/extensions/common/crypto:utility_lib",
         "//test/mocks/event:event_mocks",
         "//test/mocks/init:init_mocks",
         "//test/mocks/runtime:runtime_mocks",

diff --git a/test/common/crypto/BUILD b/test/common/crypto/BUILD
@@ -22,7 +22,6 @@ envoy_cc_test(
         "//source/common/buffer:buffer_lib",
         "//source/common/common:hex_lib",
         "//source/common/crypto:utility_lib",
-        "//source/extensions/common/crypto:utility_lib",
     ],
 )
 
@@ -35,7 +34,7 @@ envoy_cc_fuzz_test(
     name = "get_sha_256_digest_fuzz_test",
     srcs = ["get_sha_256_digest_fuzz_test.cc"],
     corpus = "get_sha_256_digest_corpus",
-    deps = ["//source/extensions/common/crypto:utility_lib"],
+    deps = ["//source/common/crypto:utility_lib"],
 )
 
 envoy_cc_fuzz_test(
@@ -47,6 +46,5 @@ envoy_cc_fuzz_test(
         ":verify_signature_fuzz_proto_cc_proto",
         "//source/common/common:hex_lib",
         "//source/common/crypto:utility_lib",
-        "//source/extensions/common/crypto:utility_lib",
     ],
 )
diff --git a/test/common/crypto/utility_test.cc b/test/common/crypto/utility_test.cc
@@ -1,7 +1,7 @@
 #include "source/common/buffer/buffer_impl.h"
 #include "source/common/common/hex.h"
+#include "source/common/crypto/crypto_impl.h"
 #include "source/common/crypto/utility.h"
-#include "source/extensions/common/crypto/crypto_impl.h"
 
 #include "gtest/gtest.h"
 

diff --git a/test/extensions/common/wasm/BUILD b/test/extensions/common/wasm/BUILD
@@ -46,7 +46,6 @@ envoy_cc_test(
         "//source/common/event:dispatcher_lib",
         "//source/common/stats:isolated_store_lib",
         "//source/common/stats:stats_lib",
-        "//source/extensions/common/crypto:utility_lib",
         "//source/extensions/common/wasm:wasm_lib",
         "//test/extensions/common/wasm:wasm_runtime",
         "//test/extensions/common/wasm/test_data:test_context_cpp_plugin",

diff --git a/test/extensions/filters/http/wasm/BUILD b/test/extensions/filters/http/wasm/BUILD
@@ -63,7 +63,6 @@ envoy_extension_cc_test(
         "//source/common/common:hex_lib",
         "//source/common/crypto:utility_lib",
         "//source/common/http:message_lib",
-        "//source/extensions/common/crypto:utility_lib",
         "//source/extensions/common/wasm:wasm_lib",
         "//source/extensions/filters/http/wasm:config",
         "//test/extensions/common/wasm:wasm_runtime",

diff --git a/test/extensions/filters/network/wasm/BUILD b/test/extensions/filters/network/wasm/BUILD
@@ -28,7 +28,6 @@ envoy_extension_cc_test(
         "//source/common/common:base64_lib",
         "//source/common/common:hex_lib",
         "//source/common/crypto:utility_lib",
-        "//source/extensions/common/crypto:utility_lib",
         "//source/extensions/common/wasm:wasm_lib",
         "//source/extensions/filters/network/wasm:config",
         "//test/extensions/common/wasm:wasm_runtime",

diff --git a/test/per_file_coverage.sh b/test/per_file_coverage.sh
@@ -22,7 +22,6 @@ declare -a KNOWN_LOW_COVERAGE=(
 "source/common/watchdog:42.9" # Death tests don't report LCOV
 "source/common/config/xds_mux:94.5"
 "source/exe:94.3"
-"source/extensions/common/crypto:91.5"
 "source/extensions/common/tap:95.9"
 "source/extensions/common/wasm:95.3" # flaky: be careful adjusting
 "source/extensions/common/wasm/null:77.8"