Skip to content

Fix static linking. #2342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 2 commits into from
Aug 7, 2019
Merged

Fix static linking. #2342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0797879
Fix static linking.
PiotrSikora Aug 7, 2019
86d90b2
Fix initialization-order-fiasco.
PiotrSikora Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 38 additions & 30 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Copied from https://github.com/envoyproxy/envoy/blob/master/tools/bazel.rc
# =====================================================================
# Envoy specific Bazel build/test options.
# Copied from: https://github.com/envoyproxy/envoy/blob/master/.bazelrc
# =====================================================================

# Bazel doesn't need more than 200MB of memory based on memory profiling:
# https://docs.bazel.build/versions/master/skylark/performance.html#memory-profiling
Expand All @@ -8,11 +10,15 @@
startup --host_jvm_args=-Xmx512m

build --workspace_status_command=tools/bazel_get_workspace_status
# enable path normalization by default. See https://github.com/envoyproxy/envoy/pull/6519
build --define path_normalization_by_default=true
build --host_force_python=PY2

# Link (statically) against libstdc++.
build --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a
build --action_env=BAZEL_LINKOPTS=-lm:-static-libgcc
Copy link
Copy Markdown
Contributor Author

@PiotrSikora PiotrSikora Aug 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I synchronized the other options with upstream while at it, but those lines are the real fix.


# Basic ASAN/UBSAN that works for gcc
build:asan --action_env=BAZEL_LINKLIBS=
build:asan --action_env=BAZEL_LINKOPTS=-lstdc++:-lm
build:asan --define ENVOY_CONFIG_ASAN=1
build:asan --copt -fsanitize=address,undefined
build:asan --linkopt -fsanitize=address,undefined
Expand All @@ -23,43 +29,45 @@ build:asan --define tcmalloc=disabled
build:asan --build_tag_filters=-no_asan
build:asan --test_tag_filters=-no_asan
build:asan --define signal_trace=disabled
build:asan --copt -DADDRESS_SANITIZER=1
build:asan --copt -D__SANITIZE_ADDRESS__
build:asan --test_env=ASAN_OPTIONS=handle_abort=1:allow_addr2line=true:check_initialization_order=true:strict_init_order=true:detect_odr_violation=1
build:asan --test_env=UBSAN_OPTIONS=halt_on_error=true:print_stacktrace=1
build:asan --test_env=ASAN_SYMBOLIZER_PATH

# Clang 5.0 ASAN
build:clang-asan --define ENVOY_CONFIG_ASAN=1
build:clang-asan --copt -D__SANITIZE_ADDRESS__
build:clang-asan --copt -DADDRESS_SANITIZER=1
build:clang-asan --copt -fsanitize=address,undefined
build:clang-asan --linkopt -fsanitize=address,undefined
build:clang-asan --copt -fno-sanitize=vptr
build:clang-asan --linkopt -fno-sanitize=vptr
build:clang-asan --copt -fno-sanitize-recover=all
build:clang-asan --linkopt -ldl
build:clang-asan --define tcmalloc=disabled
build:clang-asan --build_tag_filters=-no_asan
build:clang-asan --test_tag_filters=-no_asan
build:clang-asan --define signal_trace=disabled
build:clang-asan --test_env=ASAN_SYMBOLIZER_PATH
# Clang ASAN/UBSAN
build:clang-asan --config=asan
build:clang-asan --linkopt -fuse-ld=lld

# Clang 5.0 TSAN
# macOS ASAN/UBSAN
build:macos-asan --config=asan
# Workaround, see https://github.com/bazelbuild/bazel/issues/6932
build:macos-asan --copt -Wno-macro-redefined
build:macos-asan --copt -D_FORTIFY_SOURCE=0
# Workaround, see https://github.com/bazelbuild/bazel/issues/4341
build:macos-asan --copt -DGRPC_BAZEL_BUILD
# Dynamic link cause issues like: `dyld: malformed mach-o: load commands size (59272) > 32768`
build:macos-asan --dynamic_mode=off

# Clang TSAN
build:clang-tsan --define ENVOY_CONFIG_TSAN=1
build:clang-tsan --copt -fsanitize=thread
build:clang-tsan --linkopt -fsanitize=thread
build:clang-tsan --define tcmalloc=disabled
build:clang-tsan --linkopt -fuse-ld=lld

# Clang 5.0 MSAN - broken today since we need to rebuild lib[std]c++ and external deps with MSAN
# support (see https://github.com/envoyproxy/envoy/issues/443).
build:clang-msan --define ENVOY_CONFIG_MSAN=1
build:clang-msan --copt -fsanitize=memory
build:clang-msan --linkopt -fsanitize=memory
build:clang-msan --define tcmalloc=disabled
build:clang-msan --copt -fsanitize-memory-track-origins=2
build:clang-tsan --linkopt -static-libsan
build:clang-tsan --define tcmalloc=disabled
# Needed due to https://github.com/libevent/libevent/issues/777
build:clang-tsan --copt -DEVENT__DISABLE_DEBUG_MODE

# Test options
test --test_env=HEAPCHECK=normal --test_env=PPROF_PATH
build --test_env=HEAPCHECK=normal --test_env=PPROF_PATH

# ========================================
# Istio specific Bazel build/test options.
# ========================================

# enable path normalization by default. See https://github.com/envoyproxy/envoy/pull/6519
test --define path_normalization_by_default=true
build --define path_normalization_by_default=true

# Release builds without debug symbols.
build:release -c opt
Expand Down
22 changes: 11 additions & 11 deletions src/envoy/http/authn/http_filter_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ static const Envoy::Http::LowerCaseString kSecIstioAuthnPayloadHeaderKey(
"sec-istio-authn-payload");

// Default request for testing.
static const Http::TestHeaderMapImpl kSimpleRequestHeader{{
{":method", "GET"},
{":path", "/"},
{":scheme", "http"},
{":authority", "host"},
{"x-forwarded-for", "10.0.0.1"},
}};
Http::TestHeaderMapImpl SimpleRequestHeaders() {
return Http::TestHeaderMapImpl{{":method", "GET"},
{":path", "/"},
{":scheme", "http"},
{":authority", "host"},
{"x-forwarded-for", "10.0.0.1"}};
}

// Keep the same as issuer in the policy below.
static const char kJwtIssuer[] = "some@issuer";
Expand Down Expand Up @@ -89,7 +89,7 @@ TEST_P(AuthenticationFilterIntegrationTest, EmptyPolicy) {
initialize();
codec_client_ =
makeHttpConnection(makeClientConnection((lookupPort("http"))));
auto response = codec_client_->makeHeaderOnlyRequest(kSimpleRequestHeader);
auto response = codec_client_->makeHeaderOnlyRequest(SimpleRequestHeaders());
// Wait for request to upstream (backend)
waitForNextUpstreamRequest();

Expand All @@ -115,7 +115,7 @@ TEST_P(AuthenticationFilterIntegrationTest, SourceMTlsFail) {
// would be rejected.
codec_client_ =
makeHttpConnection(makeClientConnection((lookupPort("http"))));
auto response = codec_client_->makeHeaderOnlyRequest(kSimpleRequestHeader);
auto response = codec_client_->makeHeaderOnlyRequest(SimpleRequestHeaders());

// Request is rejected, there will be no upstream request (thus no
// waitForNextUpstreamRequest).
Expand All @@ -134,7 +134,7 @@ TEST_P(AuthenticationFilterIntegrationTest, OriginJwtRequiredHeaderNoJwtFail) {
// would be rejected.
codec_client_ =
makeHttpConnection(makeClientConnection((lookupPort("http"))));
auto response = codec_client_->makeHeaderOnlyRequest(kSimpleRequestHeader);
auto response = codec_client_->makeHeaderOnlyRequest(SimpleRequestHeaders());

// Request is rejected, there will be no upstream request (thus no
// waitForNextUpstreamRequest).
Expand All @@ -152,7 +152,7 @@ TEST_P(AuthenticationFilterIntegrationTest, CheckValidJwtPassAuthentication) {
// the authentication should succeed.
codec_client_ =
makeHttpConnection(makeClientConnection((lookupPort("http"))));
auto response = codec_client_->makeHeaderOnlyRequest(kSimpleRequestHeader);
auto response = codec_client_->makeHeaderOnlyRequest(SimpleRequestHeaders());

// Wait for request to upstream (backend)
waitForNextUpstreamRequest();
Expand Down