testing testing

Signed-off-by: Ted Poole <[email protected]>

Author: tedjpoole

bssl-compat/prefixer/prefixer.cpp

@@ -470,6 +470,8 @@ void MyFrontendAction::EndSourceFileAction() {
     std::ofstream cstr (opt::cfile());
 
     cstr << "//" << std::endl << "// THIS FILE IS GENERATED BY THE PREFIXER TOOL DO NOT EDIT" << std::endl << "//" << std::endl
+         << "#define _GNU_SOURCE" << std::endl
+         << "#include <link.h>" << std::endl
          << "#include <dlfcn.h>" << std::endl
          << "#include <errno.h>" << std::endl
          << "#include <assert.h>" << std::endl
@@ -491,8 +493,6 @@ void MyFrontendAction::EndSourceFileAction() {
          << "  const char *s = symbol + " << opt::prefix.size() + 1 << ";" << std::endl
          << "  if ((result = dlsym(libcrypto, s)) != NULL) return result;" << std::endl
          << "  if((result = dlsym(libssl, s)) != NULL) return result;" << std::endl
-         << "//fprintf(stderr, \"dlsym(%s) : %s\\n\", s, dlerror());" << std::endl
-         << "//exit(ELIBACC);" << std::endl
          << "  return NULL;" << std::endl
          << "}" << std::endl
          << std::endl
@@ -507,6 +507,17 @@ void MyFrontendAction::EndSourceFileAction() {
          << "    exit(ELIBACC);" << std::endl
          << "  }" << std::endl
          << std::endl
+         << "  if(getenv(\"BSSL_COMPAT_DEBUG_DLINFO\")) {" << std::endl
+         << "    char libcryptoorigin[PATH_MAX];" << std::endl
+         << "    if (dlinfo(libcrypto, RTLD_DI_ORIGIN, libcryptoorigin) == 0) {" << std::endl
+         << "      fprintf(stderr, \"bssl-compat: Loaded %s from %s\\n\", LIBCRYPTO_SO, libcryptoorigin);" << std::endl
+         << "    }" << std::endl
+         << "    char libsslorigin[PATH_MAX];" << std::endl
+         << "    if (dlinfo(libssl, RTLD_DI_ORIGIN, libsslorigin) == 0) {" << std::endl
+         << "      fprintf(stderr, \"bssl-compat: Loaded %s from %s\\n\", LIBSSL_SO, libsslorigin);" << std::endl
+         << "    }" << std::endl
+         << "  }" << std::endl
+         << std::endl
          << "  ossl.ossl_OpenSSL_version_num = (ossl_OpenSSL_version_num_t)lookup(\"ossl_OpenSSL_version_num\");" << std::endl
          << "  if (ossl.ossl_OpenSSL_version_num == NULL) {" << std::endl
          << "    fprintf(stderr, \"Failed to load OpenSSL_version_num()\\n\");" << std::endl

openssl/bazelrc

@@ -23,3 +23,6 @@ build:ppc --//source/extensions/filters/common/lua:luajit2=1 --linkopt=-fuse-ld=
 
 common --action_env=Clang_DIR=/opt/llvm
 common --action_env=LLVM_DIR=/opt/llvm
+
+build --verbose_failures
+build --keep_going

test/common/router/BUILD

@@ -257,11 +257,6 @@ sh_binary(
 envoy_directory_genrule(
     name = "corpus_from_config_impl",
     testonly = 1,
-    srcs = [
-        # This is deliberately in srcs, since we run into host/target confusion
-        # otherwise in oss-fuzz builds.
-        ":config_impl_test_static",
-    ],
     cmd = " ".join([
         "$(location corpus_from_config_impl_sh)",
         "$(location //test/common/router:config_impl_test_static)",
@@ -270,7 +265,10 @@ envoy_directory_genrule(
         "//bazel:engflow_rbe_x86_64": {"Pool": "6gig"},
         "//conditions:default": {},
     }),
-    tools = [":corpus_from_config_impl_sh"],
+    tools = [
+        ":config_impl_test_static",
+        ":corpus_from_config_impl_sh",
+    ],
 )
 
 filegroup(

test/common/router/corpus_from_config_impl.sh

@@ -1,5 +1,40 @@
 #!/bin/sh
 
+set +x
+
+echo "TED: \$0 = '$0'"
+echo "TED: \$@ = '$@'"
+
+echo "TED:"
+echo "TED: readelf -d \"$1\" ...."
+readelf -d "$1" | sed 's/^/TED: /g'
+
+echo "TED:"
+echo "TED: ldd \"$1\" ...."
+ldd "$1" | sed 's/^/TED: /g'
+
+ORIGIN="$(dirname "$(readlink -f "$1")")"
+
+readelf -d "$1" | awk '/RUNPATH/ {match($0, /Library runpath: \[(.*)\]/, a); print a[1]}' | \
+tr ':' '\n' | while IFS= read -r RUNPATH; do
+    echo "TED:"
+    echo "TED: RUNPATH    : $RUNPATH"
+    ABSRUNPATH="$(readlink -f "$(echo "$RUNPATH" | sed "s|\$ORIGIN|$ORIGIN|g")")"
+    if [ -d "${ABSRUNPATH}" ]; then
+        echo "TED: ABSRUNPATH : $ABSRUNPATH"
+        find "$ABSRUNPATH" -name "*.so*" | while IFS= read -r SOFILE; do
+            echo "TED: SOFILE     : $SOFILE"
+            ls -l "$SOFILE" | sed 's/^/TED:            :   /g'
+            file "$SOFILE" | sed 's/^/TED:            :   /g'
+            file --dereference "$SOFILE" | sed 's/^/TED:            :   /g'
+            ldd "$SOFILE" | sed 's/^/TED:            :   /g'
+        done
+    else
+        echo "TED: ABSRUNPATH not found: $ABSRUNPATH"
+    fi
+done
+
+
 # Helper shell script for :corpus_from_config_impl genrule in BUILD.
 
 # Set NORUNFILES so test/main doesn't fail when runfiles manifest is not found.