diff --git a/.azure-pipelines/pipelines.yml b/.azure-pipelines/pipelines.yml index 582d2e221699..9a6dd664f547 100644 --- a/.azure-pipelines/pipelines.yml +++ b/.azure-pipelines/pipelines.yml @@ -10,166 +10,282 @@ trigger: # PR build config is manually overridden in Azure pipelines UI with different secrets pr: none -jobs: - - job: format - dependsOn: [] # this removes the implicit dependency on previous stage and causes this to run in parallel. - pool: - vmImage: "ubuntu-18.04" - steps: - - task: Cache@2 - inputs: - key: "format | ./WORKSPACE | **/*.bzl" - path: $(Build.StagingDirectory)/repository_cache - continueOnError: true - - - script: ci/run_envoy_docker.sh 'ci/check_and_fix_format.sh' - workingDirectory: $(Build.SourcesDirectory) - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - displayName: "Run check format scripts" - - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: "$(Build.StagingDirectory)/fix_format.diff" - artifactName: format - condition: failed() - - - job: release - displayName: "Linux-x64 release" - dependsOn: ["format"] - # For master builds, continue even if format fails - condition: and(not(canceled()), or(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))) - timeoutInMinutes: 360 - pool: - vmImage: "ubuntu-18.04" - steps: - - template: bazel.yml - parameters: - ciTarget: bazel.release - - - job: release_arm64 - displayName: "Linux-arm64 release.server_only" - dependsOn: ["format"] - condition: ne(variables['Build.Reason'], 'PullRequest') - pool: "arm-large" - steps: - - template: bazel.yml - parameters: - managedAgent: false - ciTarget: bazel.release.server_only - rbe: false - artifactSuffix: ".arm64" - - - job: bazel - displayName: "Linux-x64" - dependsOn: ["release"] - # For master builds, continue even if format fails - condition: and(not(canceled()), or(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))) - strategy: - maxParallel: 3 - matrix: - gcc: - CI_TARGET: "bazel.gcc" - clang_tidy: - CI_TARGET: "bazel.clang_tidy" - asan: - CI_TARGET: "bazel.asan" - tsan: - CI_TARGET: "bazel.tsan" - compile_time_options: - CI_TARGET: "bazel.compile_time_options" - timeoutInMinutes: 360 - pool: - vmImage: "ubuntu-18.04" - steps: - - template: bazel.yml - parameters: - ciTarget: $(CI_TARGET) - - - job: coverage - displayName: "Linux-x64 coverage" - dependsOn: ["format"] - timeoutInMinutes: 360 - pool: "x64-large" - steps: - - template: bazel.yml - parameters: - managedAgent: false - ciTarget: bazel.coverage - rbe: false - # /tmp/sandbox_base is a tmpfs in CI environment to optimize large I/O for coverage traces - bazelBuildExtraOptions: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --sandbox_base=/tmp/sandbox_base" - - - script: ci/run_envoy_docker.sh 'ci/upload_gcs_artifact.sh /source/generated/coverage coverage' - displayName: "Upload Report to GCS" - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - GCS_ARTIFACT_BUCKET: $(GcsArtifactBucket) - condition: always() - - - job: docker - displayName: "Linux-x64 docker" - dependsOn: ["release"] - condition: and(succeeded(), eq(variables['PostSubmit'], 'true'), ne(variables['Build.Reason'], 'PullRequest')) - pool: - vmImage: "ubuntu-18.04" - steps: - - task: DownloadBuildArtifacts@0 - inputs: - buildType: current - artifactName: "bazel.release" - itemPattern: "bazel.release/envoy_binary.tar.gz" - downloadType: single - targetPath: $(Build.StagingDirectory) - - - bash: | - set -e - tar zxf $(Build.StagingDirectory)/bazel.release/envoy_binary.tar.gz - ci/docker_ci.sh - workingDirectory: $(Build.SourcesDirectory) - env: - AZP_BRANCH: $(Build.SourceBranch) - AZP_SHA1: $(Build.SourceVersion) - DOCKERHUB_USERNAME: $(DockerUsername) - DOCKERHUB_PASSWORD: $(DockerPassword) - - - job: macOS - dependsOn: ["format"] - timeoutInMinutes: 360 - pool: - vmImage: "macos-latest" - steps: - - script: ./ci/mac_ci_setup.sh - displayName: "Install dependencies" - - - script: ./ci/mac_ci_steps.sh - displayName: "Run Mac CI" - env: - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - - - task: PublishTestResults@2 - inputs: - testResultsFiles: "**/bazel-testlogs/**/test.xml" - testRunTitle: "macOS" - condition: always() - - - job: Windows - dependsOn: ["format"] - timeoutInMinutes: 360 - pool: - vmImage: "windows-latest" - steps: - - bash: ci/run_envoy_docker_windows.sh ci/windows_ci_steps.sh - displayName: "Run Windows CI" - env: - ENVOY_RBE: "true" - BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --config=remote-msvc-cl --jobs=$(RbeJobs)" - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) +stages: + - stage: precheck + jobs: + - job: format + dependsOn: [] # this removes the implicit dependency on previous stage and causes this to run in parallel. + pool: + vmImage: "ubuntu-18.04" + steps: + - task: Cache@2 + inputs: + key: "format | ./WORKSPACE | **/*.bzl" + path: $(Build.StagingDirectory)/repository_cache + continueOnError: true + + - script: ci/run_envoy_docker.sh 'ci/check_and_fix_format.sh' + workingDirectory: $(Build.SourcesDirectory) + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + displayName: "Run check format scripts" + + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: "$(Build.StagingDirectory)/fix_format.diff" + artifactName: format + condition: failed() + + - job: docs + dependsOn: [] # this removes the implicit dependency on previous stage and causes this to run in parallel. + pool: + vmImage: "ubuntu-18.04" + steps: + - task: Cache@2 + inputs: + key: "docs | ./WORKSPACE | **/*.bzl" + path: $(Build.StagingDirectory)/repository_cache + continueOnError: true + + - script: ci/run_envoy_docker.sh 'ci/do_ci.sh docs' + workingDirectory: $(Build.SourcesDirectory) + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + displayName: "Generate docs" + + - script: ci/run_envoy_docker.sh 'ci/upload_gcs_artifact.sh /source/generated/docs docs' + displayName: "Upload Docs to GCS" + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + GCS_ARTIFACT_BUCKET: $(GcsArtifactBucket) + + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: "$(Build.SourcesDirectory)/generated/docs" + artifactName: docs + + - task: InstallSSHKey@0 + inputs: + hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" + sshPublicKey: "$(DocsPublicKey)" + sshPassphrase: "$(SshDeployKeyPassphrase)" + sshKeySecureFile: "$(DocsPrivateKey)" + condition: and(succeeded(), eq(variables['PostSubmit'], true), ne(variables['NoSync'], true)) + + - script: docs/publish.sh + displayName: "Publish to GitHub" + workingDirectory: $(Build.SourcesDirectory) + env: + AZP_BRANCH: $(Build.SourceBranch) + AZP_SHA1: $(Build.SourceVersion) + condition: and(succeeded(), eq(variables['PostSubmit'], true), ne(variables['NoSync'], true)) + + - stage: sync + condition: and(succeeded(), eq(variables['PostSubmit'], true), ne(variables['NoSync'], true)) + dependsOn: [] + jobs: + - job: filter_example + dependsOn: [] + pool: + vmImage: "ubuntu-18.04" + steps: + - task: InstallSSHKey@0 + inputs: + hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" + sshPublicKey: "$(FilterExamplePublicKey)" + sshPassphrase: "$(SshDeployKeyPassphrase)" + sshKeySecureFile: "$(FilterExamplePrivateKey)" + + - bash: ci/filter_example_mirror.sh + displayName: "Sync envoy-filter-example" + workingDirectory: $(Build.SourcesDirectory) + env: + AZP_BRANCH: $(Build.SourceBranch) + + - job: data_plane_api + dependsOn: [] + pool: + vmImage: "ubuntu-18.04" + steps: + - task: InstallSSHKey@0 + inputs: + hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" + sshPublicKey: "$(DataPlaneApiPublicKey)" + sshPassphrase: "$(SshDeployKeyPassphrase)" + sshKeySecureFile: "$(DataPlaneApiPrivateKey)" + + - bash: ci/api_mirror.sh + displayName: "Sync data-plane-api" + workingDirectory: $(Build.SourcesDirectory) + env: + AZP_BRANCH: $(Build.SourceBranch) + + - job: go_control_plane + dependsOn: [] + pool: + vmImage: "ubuntu-18.04" + steps: + - task: InstallSSHKey@0 + inputs: + hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" + sshPublicKey: "$(GoControlPlanePublicKey)" + sshPassphrase: "$(SshDeployKeyPassphrase)" + sshKeySecureFile: "$(GoControlPlanePrivateKey)" + + - bash: | + cp -a ~/.ssh $(Build.StagingDirectory)/ + ci/run_envoy_docker.sh 'ci/go_mirror.sh' + displayName: "Sync go-control-plane" + workingDirectory: $(Build.SourcesDirectory) + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + AZP_BRANCH: $(Build.SourceBranch) + + - stage: linux_x64 + dependsOn: ["precheck"] + # For post-submit builds, continue even if precheck fails + condition: and(not(canceled()), or(succeeded(), eq(variables['PostSubmit'], true))) + jobs: + - job: release + timeoutInMinutes: 120 + pool: + vmImage: "ubuntu-18.04" + steps: + - template: bazel.yml + parameters: + ciTarget: bazel.release + + - stage: linux_arm64 + dependsOn: ["precheck"] + # For post-submit builds, continue even if precheck fails + condition: and(not(canceled()), or(succeeded(), eq(variables['PostSubmit'], true))) + jobs: + - job: release + timeoutInMinutes: 120 + pool: "arm-large" + steps: + - template: bazel.yml + parameters: + managedAgent: false + ciTarget: bazel.release.server_only + rbe: false + artifactSuffix: ".arm64" + bazelBuildExtraOptions: "--sandbox_base=/tmp/sandbox_base" + + - stage: check + dependsOn: ["linux_x64"] + jobs: + - job: bazel + displayName: "linux_x64" + dependsOn: [] + strategy: + maxParallel: 3 + matrix: + api: + CI_TARGET: "bazel.api" + gcc: + CI_TARGET: "bazel.gcc" + clang_tidy: + CI_TARGET: "bazel.clang_tidy" + asan: + CI_TARGET: "bazel.asan" + tsan: + CI_TARGET: "bazel.tsan" + compile_time_options: + CI_TARGET: "bazel.compile_time_options" + timeoutInMinutes: 120 + pool: + vmImage: "ubuntu-18.04" + steps: + - template: bazel.yml + parameters: + ciTarget: $(CI_TARGET) + + - job: coverage + displayName: "linux_x64" + dependsOn: [] + timeoutInMinutes: 120 + pool: "x64-large" + strategy: + matrix: + coverage: + CI_TARGET: "coverage" + steps: + - template: bazel.yml + parameters: + managedAgent: false + ciTarget: bazel.$(CI_TARGET) + rbe: false + # /tmp/sandbox_base is a tmpfs in CI environment to optimize large I/O for coverage traces + bazelBuildExtraOptions: "--define=no_debug_info=1 --linkopt=-Wl,-s --test_env=ENVOY_IP_TEST_VERSIONS=v4only --sandbox_base=/tmp/sandbox_base" + + - script: ci/run_envoy_docker.sh 'ci/upload_gcs_artifact.sh /source/generated/$(CI_TARGET) $(CI_TARGET)' + displayName: "Upload $(CI_TARGET) Report to GCS" + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + GCS_ARTIFACT_BUCKET: $(GcsArtifactBucket) + condition: always() + + - stage: docker + dependsOn: ["linux_x64"] + jobs: + - job: docker + displayName: "linux multiarch" + pool: + vmImage: "ubuntu-18.04" + steps: + - bash: .azure-pipelines/cleanup.sh + displayName: "Removing tools from agent" + - task: DownloadBuildArtifacts@0 + inputs: + buildType: current + artifactName: "bazel.release" + itemPattern: "bazel.release/envoy_binary.tar.gz" + downloadType: single + targetPath: $(Build.StagingDirectory) + - bash: | + set -e + tar zxf $(Build.StagingDirectory)/bazel.release/envoy_binary.tar.gz + ci/docker_ci.sh + workingDirectory: $(Build.SourcesDirectory) + env: + AZP_BRANCH: $(Build.SourceBranch) + AZP_SHA1: $(Build.SourceVersion) + DOCKERHUB_USERNAME: $(DockerUsername) + DOCKERHUB_PASSWORD: $(DockerPassword) + + - stage: macos + dependsOn: ["precheck"] + jobs: + - job: test + timeoutInMinutes: 180 + pool: + vmImage: "macos-latest" + steps: + - script: ./ci/mac_ci_setup.sh + displayName: "Install dependencies" + + - script: ./ci/mac_ci_steps.sh + displayName: "Run Mac CI" + env: + BAZEL_BUILD_EXTRA_OPTIONS: "--remote_download_toplevel --flaky_test_attempts=2" + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + + - task: PublishTestResults@2 + inputs: + testResultsFiles: "**/bazel-testlogs/**/test.xml" + testRunTitle: "macOS" + condition: always() diff --git a/.bazelrc b/.bazelrc index 3079386b6981..7ab65f187f8d 100644 --- a/.bazelrc +++ b/.bazelrc @@ -81,6 +81,8 @@ build:clang-tsan --define ENVOY_CONFIG_TSAN=1 build:clang-tsan --copt -fsanitize=thread build:clang-tsan --linkopt -fsanitize=thread build:clang-tsan --linkopt -fuse-ld=lld +build:clang-tsan --build_tag_filters=-no_san,-no_tsan +build:clang-tsan --test_tag_filters=-no_san,-no_tsan # Needed due to https://github.com/libevent/libevent/issues/777 build:clang-tsan --copt -DEVENT__DISABLE_DEBUG_MODE @@ -155,6 +157,10 @@ build:rbe-toolchain-msan --linkopt=-L/opt/libcxx_msan/lib build:rbe-toolchain-msan --linkopt=-Wl,-rpath,/opt/libcxx_msan/lib build:rbe-toolchain-msan --config=clang-msan +build:rbe-toolchain-tsan --linkopt=-L/opt/libcxx_tsan/lib +build:rbe-toolchain-tsan --linkopt=-Wl,-rpath,/opt/libcxx_tsan/lib +build:rbe-toolchain-tsan --config=clang-tsan + build:rbe-toolchain-gcc --config=rbe-toolchain build:rbe-toolchain-gcc --crosstool_top=@rbe_ubuntu_gcc//cc:toolchain build:rbe-toolchain-gcc --extra_toolchains=@rbe_ubuntu_gcc//config:cc-toolchain @@ -221,6 +227,10 @@ build:docker-msan --config=docker-sandbox build:docker-msan --config=rbe-toolchain-clang-libc++ build:docker-msan --config=rbe-toolchain-msan +build:docker-tsan --config=docker-sandbox +build:docker-tsan --config=rbe-toolchain-clang-libc++ +build:docker-tsan --config=rbe-toolchain-tsan + # CI configurations build:remote-ci --remote_cache=grpcs://remotebuildexecution.googleapis.com build:remote-ci --remote_executor=grpcs://remotebuildexecution.googleapis.com diff --git a/VERSION b/VERSION index 3e192b03ce01..e4ae2348371a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.15.1-dev +1.15.4-dev diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index f82bb904b576..d252706282f5 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -478,7 +478,7 @@ DEPENDENCY_REPOSITORIES = dict( kafka_server_binary = dict( sha256 = "b9582bab0c3e8d131953b1afa72d6885ca1caae0061c2623071e7f396f2ccfee", strip_prefix = "kafka_2.12-2.4.0", - urls = ["http://us.mirrors.quenda.co/apache/kafka/2.4.0/kafka_2.12-2.4.0.tgz"], + urls = ["https://mirrors.gigenet.com/apache/kafka/2.4.0/kafka_2.12-2.4.0.tgz"], use_category = ["test"], ), kafka_python_client = dict( diff --git a/ci/Dockerfile-envoy-google-vrp b/ci/Dockerfile-envoy-google-vrp index 868b6a5840df..730f8daabbb5 100644 --- a/ci/Dockerfile-envoy-google-vrp +++ b/ci/Dockerfile-envoy-google-vrp @@ -15,6 +15,9 @@ ADD configs/google-vrp/supervisor.conf /etc/supervisor.conf ADD test/config/integration/certs/serverkey.pem /etc/envoy/certs/serverkey.pem ADD test/config/integration/certs/servercert.pem /etc/envoy/certs/servercert.pem # ADD %local envoy bin% /usr/local/bin/envoy +RUN chmod 777 /var/log/supervisor +RUN chmod a+r /etc/supervisor.conf /etc/envoy/* /etc/envoy/certs/* +RUN chmod a+rx /usr/local/bin/launch_envoy.sh EXPOSE 10000 EXPOSE 10001 diff --git a/ci/api_mirror.sh b/ci/api_mirror.sh index 077cdd1d3cfe..03e8ab85d80c 100755 --- a/ci/api_mirror.sh +++ b/ci/api_mirror.sh @@ -3,16 +3,15 @@ set -e CHECKOUT_DIR=../data-plane-api +MAIN_BRANCH="refs/heads/master" +API_MAIN_BRANCH="master" -if [ -z "$CIRCLE_PULL_REQUEST" ] && [ "$CIRCLE_BRANCH" == "master" ] -then +if [[ "${AZP_BRANCH}" == "${MAIN_BRANCH}" ]]; then echo "Cloning..." - git clone git@github.com:envoyproxy/data-plane-api "$CHECKOUT_DIR" + git clone git@github.com:envoyproxy/data-plane-api "$CHECKOUT_DIR" -b "${API_MAIN_BRANCH}" - git -C "$CHECKOUT_DIR" config user.name "data-plane-api(CircleCI)" + git -C "$CHECKOUT_DIR" config user.name "data-plane-api(Azure Pipelines)" git -C "$CHECKOUT_DIR" config user.email data-plane-api@users.noreply.github.com - git -C "$CHECKOUT_DIR" fetch - git -C "$CHECKOUT_DIR" checkout -B master origin/master # Determine last envoyproxy/envoy SHA in envoyproxy/data-plane-api MIRROR_MSG="Mirrored from https://github.com/envoyproxy/envoy" @@ -40,6 +39,6 @@ then done echo "Pushing..." - git -C "$CHECKOUT_DIR" push origin master + git -C "$CHECKOUT_DIR" push origin "${API_MAIN_BRANCH}" echo "Done" fi diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 9d074485d086..82517435f38d 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -164,7 +164,13 @@ elif [[ "$CI_TARGET" == "bazel.tsan" ]]; then setup_clang_toolchain echo "bazel TSAN debug build with tests" echo "Building and testing envoy tests ${TEST_TARGETS}" - bazel_with_collection test ${BAZEL_BUILD_OPTIONS} -c dbg --config=clang-tsan --build_tests_only ${TEST_TARGETS} + bazel_with_collection test --config=rbe-toolchain-tsan ${BAZEL_BUILD_OPTIONS} -c dbg --build_tests_only ${TEST_TARGETS} + if [ "${ENVOY_BUILD_FILTER_EXAMPLE}" == "1" ]; then + echo "Building and testing envoy-filter-example tests..." + pushd "${ENVOY_FILTER_EXAMPLE_SRCDIR}" + bazel_with_collection test ${BAZEL_BUILD_OPTIONS} -c dbg --config=clang-tsan ${ENVOY_FILTER_EXAMPLE_TESTS} + popd + fi exit 0 elif [[ "$CI_TARGET" == "bazel.msan" ]]; then ENVOY_STDLIB=libc++ @@ -219,9 +225,16 @@ elif [[ "$CI_TARGET" == "bazel.compile_time_options" ]]; then exit 0 elif [[ "$CI_TARGET" == "bazel.api" ]]; then + # Use libstdc++ because the API booster links to prebuilt libclang*/libLLVM* installed in /opt/llvm/lib, + # which is built with libstdc++. Using libstdc++ for whole of the API CI job to avoid unnecessary rebuild. + ENVOY_STDLIB="libstdc++" setup_clang_toolchain + export LLVM_CONFIG="${LLVM_ROOT}"/bin/llvm-config echo "Validating API structure..." ./tools/api/validate_structure.py + echo "Testing API and API Boosting..." + bazel_with_collection test "${BAZEL_BUILD_OPTIONS[@]}" -c fastbuild @envoy_api_canonical//test/... @envoy_api_canonical//tools/... \ + @envoy_api_canonical//tools:tap2pcap_test @envoy_dev//clang_tools/api_booster/... echo "Building API..." bazel build ${BAZEL_BUILD_OPTIONS} -c fastbuild @envoy_api_canonical//envoy/... echo "Testing API..." @@ -231,7 +244,7 @@ elif [[ "$CI_TARGET" == "bazel.api" ]]; then bazel_with_collection test ${BAZEL_BUILD_OPTIONS} -c fastbuild @envoy_dev//clang_tools/api_booster/... echo "Testing API boosting (golden C++ tests)..." # We use custom BAZEL_BUILD_OPTIONS here; the API booster isn't capable of working with libc++ yet. - LLVM_CONFIG="${LLVM_ROOT}"/bin/llvm-config BAZEL_BUILD_OPTIONS="--config=clang" python3.8 ./tools/api_boost/api_boost_test.py + BAZEL_BUILD_OPTIONS="${BAZEL_BUILD_OPTIONS[*]}" python3.8 ./tools/api_boost/api_boost_test.py exit 0 elif [[ "$CI_TARGET" == "bazel.coverage" ]]; then setup_clang_toolchain diff --git a/ci/filter_example_mirror.sh b/ci/filter_example_mirror.sh index 1d6d5ae05b23..8602b1677e4b 100755 --- a/ci/filter_example_mirror.sh +++ b/ci/filter_example_mirror.sh @@ -4,16 +4,15 @@ set -e ENVOY_SRCDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd) CHECKOUT_DIR=../envoy-filter-example +MAIN_BRANCH="refs/heads/master" +FILTER_EXAMPLE_MAIN_BRANCH="master" -if [ -z "$CIRCLE_PULL_REQUEST" ] && [ "$CIRCLE_BRANCH" == "master" ] -then +if [[ "${AZP_BRANCH}" == "${MAIN_BRANCH}" ]]; then echo "Cloning..." - git clone git@github.com:envoyproxy/envoy-filter-example "$CHECKOUT_DIR" + git clone git@github.com:envoyproxy/envoy-filter-example "$CHECKOUT_DIR" -b "${FILTER_EXAMPLE_MAIN_BRANCH}" - git -C "$CHECKOUT_DIR" config user.name "envoy-filter-example(CircleCI)" + git -C "$CHECKOUT_DIR" config user.name "envoy-filter-example(Azure Pipelines)" git -C "$CHECKOUT_DIR" config user.email envoy-filter-example@users.noreply.github.com - git -C "$CHECKOUT_DIR" fetch - git -C "$CHECKOUT_DIR" checkout -B master origin/master echo "Updating Submodule..." # Update submodule to latest Envoy SHA @@ -26,6 +25,6 @@ then echo "Committing, and Pushing..." git -C "$CHECKOUT_DIR" commit -a -m "Update Envoy submodule to $ENVOY_SHA" - git -C "$CHECKOUT_DIR" push origin master + git -C "$CHECKOUT_DIR" push origin "${FILTER_EXAMPLE_MAIN_BRANCH}" echo "Done" fi diff --git a/ci/go_mirror.sh b/ci/go_mirror.sh index 80be4cc0b532..63f96d0d7969 100755 --- a/ci/go_mirror.sh +++ b/ci/go_mirror.sh @@ -2,7 +2,11 @@ set -e -if [ -z "$CIRCLE_PULL_REQUEST" ] && [ "$CIRCLE_BRANCH" == "master" ] -then - tools/api/generate_go_protobuf.py +MAIN_BRANCH="refs/heads/master" + +# shellcheck source=ci/setup_cache.sh +. "$(dirname "$0")"/setup_cache.sh + +if [[ "${AZP_BRANCH}" == "${MAIN_BRANCH}" ]]; then + BAZEL_BUILD_OPTIONS="${BAZEL_BUILD_EXTRA_OPTIONS}" tools/api/generate_go_protobuf.py fi diff --git a/ci/mac_ci_setup.sh b/ci/mac_ci_setup.sh index b9870f942696..5cd363afa60e 100755 --- a/ci/mac_ci_setup.sh +++ b/ci/mac_ci_setup.sh @@ -20,9 +20,23 @@ function install { fi } -if ! brew update; then - echo "Failed to update homebrew" - exit 1 +function retry () { + local returns=1 i=1 + while ((i<=HOMEBREW_RETRY_ATTEMPTS)); do + if "$@"; then + returns=0 + break + else + sleep "$HOMEBREW_RETRY_INTERVAL"; + ((i++)) + fi + done + return "$returns" +} + +if ! retry brew update; then + # Do not exit early if update fails. + echo "Failed to update homebrew" fi DEPS="automake cmake coreutils go libtool wget ninja" diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh index 886a2347d378..585e4739b861 100755 --- a/ci/run_envoy_docker.sh +++ b/ci/run_envoy_docker.sh @@ -18,6 +18,7 @@ USER_GROUP=root [[ -t 1 ]] && ENVOY_DOCKER_OPTIONS+=" -it" [[ -f .git ]] && [[ ! -d .git ]] && ENVOY_DOCKER_OPTIONS+=" -v $(git rev-parse --git-common-dir):$(git rev-parse --git-common-dir)" +[[ -n "${SSH_AUTH_SOCK}" ]] && ENVOY_DOCKER_OPTIONS+=" -v ${SSH_AUTH_SOCK}:${SSH_AUTH_SOCK} -e SSH_AUTH_SOCK" export ENVOY_BUILD_IMAGE="${IMAGE_NAME}:${IMAGE_ID}" @@ -25,6 +26,7 @@ mkdir -p "${ENVOY_DOCKER_BUILD_DIR}" # Since we specify an explicit hash, docker-run will pull from the remote repo if missing. docker run --rm ${ENVOY_DOCKER_OPTIONS} -e HTTP_PROXY=${http_proxy} -e HTTPS_PROXY=${https_proxy} -e NO_PROXY=${no_proxy} \ -u "${USER}":"${USER_GROUP}" -v "${ENVOY_DOCKER_BUILD_DIR}":/build -v /var/run/docker.sock:/var/run/docker.sock \ + -e AZP_BRANCH \ -e BAZEL_BUILD_EXTRA_OPTIONS -e BAZEL_EXTRA_TEST_OPTIONS -e BAZEL_REMOTE_CACHE -e ENVOY_STDLIB -e BUILD_REASON \ -e BAZEL_REMOTE_INSTANCE -e GCP_SERVICE_ACCOUNT_KEY -e NUM_CPUS -e ENVOY_RBE -e FUZZIT_API_KEY -e ENVOY_BUILD_IMAGE \ -e ENVOY_SRCDIR -e ENVOY_BUILD_TARGET -e SYSTEM_PULLREQUEST_TARGETBRANCH -e SYSTEM_PULLREQUEST_PULLREQUESTNUMBER \ diff --git a/configs/google-vrp/supervisor.conf b/configs/google-vrp/supervisor.conf index e019581d079c..1e1d09f33660 100644 --- a/configs/google-vrp/supervisor.conf +++ b/configs/google-vrp/supervisor.conf @@ -1,5 +1,6 @@ [supervisord] nodaemon=true +logfile=/var/log/supervisor/supervisord.log [program:envoy-edge] command=launch_envoy.sh -c /etc/envoy/envoy-edge.yaml %(ENV_ENVOY_EDGE_EXTRA_ARGS)s diff --git a/docs/build.sh b/docs/build.sh index bc0c302414a1..ab9e4fcad562 100755 --- a/docs/build.sh +++ b/docs/build.sh @@ -4,15 +4,20 @@ set -e +RELEASE_TAG_REGEX="^refs/tags/v.*" + +if [[ "${AZP_BRANCH}" =~ ${RELEASE_TAG_REGEX} ]]; then + DOCS_TAG="${AZP_BRANCH/refs\/tags\//}" +fi + # We need to set ENVOY_DOCS_VERSION_STRING and ENVOY_DOCS_RELEASE_LEVEL for Sphinx. # We also validate that the tag and version match at this point if needed. -if [ -n "$CIRCLE_TAG" ] -then +if [[ -n "${DOCS_TAG}" ]]; then # Check the git tag matches the version number in the VERSION file. VERSION_NUMBER=$(cat VERSION) - if [ "v${VERSION_NUMBER}" != "${CIRCLE_TAG}" ]; then + if [[ "v${VERSION_NUMBER}" != "${DOCS_TAG}" ]]; then echo "Given git tag does not match the VERSION file content:" - echo "${CIRCLE_TAG} vs $(cat VERSION)" + echo "${DOCS_TAG} vs $(cat VERSION)" exit 1 fi # Check the version_history.rst contains current release version. @@ -20,9 +25,9 @@ then || (echo "Git tag not found in version_history/current.rst" && exit 1) # Now that we know there is a match, we can use the tag. - export ENVOY_DOCS_VERSION_STRING="tag-$CIRCLE_TAG" + export ENVOY_DOCS_VERSION_STRING="tag-${DOCS_TAG}" export ENVOY_DOCS_RELEASE_LEVEL=tagged - export ENVOY_BLOB_SHA="$CIRCLE_TAG" + export ENVOY_BLOB_SHA="${DOCS_TAG}" else BUILD_SHA=$(git rev-parse HEAD) VERSION_NUM=$(cat VERSION) diff --git a/docs/publish.sh b/docs/publish.sh index b146c42994cb..c56e9bb31066 100755 --- a/docs/publish.sh +++ b/docs/publish.sh @@ -10,35 +10,36 @@ set -e DOCS_DIR=generated/docs -CHECKOUT_DIR=../envoy-docs -BUILD_SHA=`git rev-parse HEAD` - -if [ -n "$CIRCLE_TAG" ] -then - PUBLISH_DIR="$CHECKOUT_DIR"/docs/envoy/"$CIRCLE_TAG" -elif [ -z "$CIRCLE_PULL_REQUEST" ] && [ "$CIRCLE_BRANCH" == "master" ] -then - PUBLISH_DIR="$CHECKOUT_DIR"/docs/envoy/latest +CHECKOUT_DIR=envoy-docs +BUILD_SHA=$(git rev-parse HEAD) + +MAIN_BRANCH="refs/heads/master" +RELEASE_TAG_REGEX="^refs/tags/v.*" + +if [[ "${AZP_BRANCH}" =~ ${RELEASE_TAG_REGEX} ]]; then + PUBLISH_DIR="${CHECKOUT_DIR}"/docs/envoy/"${AZP_BRANCH/refs\/tags\//}" +elif [[ "$AZP_BRANCH" == "${MAIN_BRANCH}" ]]; then + PUBLISH_DIR="${CHECKOUT_DIR}"/docs/envoy/latest else echo "Ignoring docs push" exit 0 fi +DOCS_MAIN_BRANCH="master" + echo 'cloning' -git clone git@github.com:envoyproxy/envoyproxy.github.io "$CHECKOUT_DIR" +git clone git@github.com:envoyproxy/envoyproxy.github.io "${CHECKOUT_DIR}" -b "${DOCS_MAIN_BRANCH}" --depth 1 -git -C "$CHECKOUT_DIR" fetch -git -C "$CHECKOUT_DIR" checkout -B master origin/master rm -fr "$PUBLISH_DIR" mkdir -p "$PUBLISH_DIR" cp -r "$DOCS_DIR"/* "$PUBLISH_DIR" -cd "$CHECKOUT_DIR" +cd "${CHECKOUT_DIR}" -git config user.name "envoy-docs(travis)" +git config user.name "envoy-docs(Azure Pipelines)" git config user.email envoy-docs@users.noreply.github.com -echo 'add' + +set -x + git add . -echo 'commit' git commit -m "docs envoy@$BUILD_SHA" -echo 'push' -git push origin master +git push origin "${DOCS_MAIN_BRANCH}" diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst index fc649bc0d0cb..e2008e716a13 100644 --- a/docs/root/version_history/current.rst +++ b/docs/root/version_history/current.rst @@ -1,2 +1,11 @@ 1.15.1 (Pending) ================ +1.15.4 (Pending) +================ + +Changes +------- + +* http: fixed URL parsing for HTTP/1.1 fully qualified URLs and connect requests containing IPv6 addresses. +* http: fixed bugs in datadog and squash filter's handling of responses with no bodies. +* tls: fix detection of the upstream connection close event. diff --git a/docs/root/version_history/v1.15.1.rst b/docs/root/version_history/v1.15.1.rst index 57b2acb3f307..4ef2bab95bdd 100644 --- a/docs/root/version_history/v1.15.1.rst +++ b/docs/root/version_history/v1.15.1.rst @@ -1,5 +1,5 @@ -1.15.1 (TBD) -============ +1.15.1 (September 29, 2020) +=========================== Changes ------- @@ -7,7 +7,7 @@ Changes headers. This patch changes the default behavior to always logically match on all headers. Multiple individual headers will be logically concatenated with ',' similar to what is done with inline headers. This makes the behavior effectively consistent. This behavior can be temporary - reverted by setting the runtime value "envoy.reloadable_features.header_match_on_all_headers" to + reverted by setting the runtime value `envoy.reloadable_features.header_match_on_all_headers` to "false". Targeted fixes have been additionally performed on the following extensions which make them @@ -19,9 +19,9 @@ Changes 4. The Lua filter. Like primary header matching used in routing, RBAC, etc. this behavior can be disabled by setting - the runtime value "envoy.reloadable_features.header_match_on_all_headers" to false. -* http: The setCopy() header map API previously only set the first header in the case of duplicate + the runtime value `envoy.reloadable_features.header_match_on_all_headers` to false. +* http: the setCopy() header map API previously only set the first header in the case of duplicate non-inline headers. setCopy() now behaves similarly to the other set*() APIs and replaces all found headers with a single value. This may have had security implications in the extauth filter which uses this API. This behavior can be disabled by setting the runtime value - "envoy.reloadable_features.http_set_copy_replace_all_headers" to false. + `envoy.reloadable_features.http_set_copy_replace_all_headers` to false. diff --git a/docs/root/version_history/v1.15.2.rst b/docs/root/version_history/v1.15.2.rst new file mode 100644 index 000000000000..19150c303646 --- /dev/null +++ b/docs/root/version_history/v1.15.2.rst @@ -0,0 +1,6 @@ +1.15.2 (September 29, 2020) +=========================== + +Changes +------- +* docs: fix docs for v1.15.1. diff --git a/docs/root/version_history/v1.15.3.rst b/docs/root/version_history/v1.15.3.rst new file mode 100644 index 000000000000..768e779f1b7b --- /dev/null +++ b/docs/root/version_history/v1.15.3.rst @@ -0,0 +1,10 @@ +1.15.3 (December 7, 2020) +========================= + +Changes +------- +* listener: fix crash when disabling or re-enabling listeners due to overload while processing LDS updates. +* proxy_proto: fixed a bug where network filters would not have the correct downstreamRemoteAddress() when accessed from the StreamInfo. This could result in incorrect enforcement of RBAC rules in the RBAC network filter (but not in the RBAC HTTP filter), or incorrect access log addresses from tcp_proxy. +* tls: fix read resumption after triggering buffer high-watermark and all remaining request/response bytes are stored in the SSL connection's internal buffers. +* udp: fixed issue in which receiving truncated UDP datagrams would cause Envoy to crash. +* vrp: allow supervisord to open its log file. diff --git a/docs/root/version_history/version_history.rst b/docs/root/version_history/version_history.rst index d9d9993e500c..20b0f463a04b 100644 --- a/docs/root/version_history/version_history.rst +++ b/docs/root/version_history/version_history.rst @@ -7,6 +7,8 @@ Version history :titlesonly: current + v1.15.3 + v1.15.2 v1.15.1 v1.15.0 v1.14.3 diff --git a/include/envoy/network/io_handle.h b/include/envoy/network/io_handle.h index bd569c56179e..e989bfe4d01f 100644 --- a/include/envoy/network/io_handle.h +++ b/include/envoy/network/io_handle.h @@ -85,6 +85,9 @@ class IoHandle { Address::InstanceConstSharedPtr peer_address_; // The payload length of this packet. unsigned int msg_len_{0}; + // If true indicates a successful syscall, but the packet was dropped due to truncation. We do + // not support receiving truncated packets. + bool truncated_and_dropped_{false}; }; /** diff --git a/source/common/api/win32/os_sys_calls_impl.cc b/source/common/api/win32/os_sys_calls_impl.cc index 49a05b9fda2a..d66aa4dcee68 100644 --- a/source/common/api/win32/os_sys_calls_impl.cc +++ b/source/common/api/win32/os_sys_calls_impl.cc @@ -145,14 +145,22 @@ SysCallSizeResult OsSysCallsImpl::recv(os_fd_t socket, void* buffer, size_t leng } SysCallSizeResult OsSysCallsImpl::recvmsg(os_fd_t sockfd, msghdr* msg, int flags) { - DWORD bytes_received; + DWORD bytes_received = 0; LPFN_WSARECVMSG recvmsg_fn_ptr = getFnPtrWSARecvMsg(); WSAMSGPtr wsa_msg = msghdrToWSAMSG(msg); // Windows supports only a single flag on input to WSARecvMsg wsa_msg->dwFlags = flags & MSG_PEEK; const int rc = recvmsg_fn_ptr(sockfd, wsa_msg.get(), &bytes_received, nullptr, nullptr); if (rc == SOCKET_ERROR) { - return {-1, ::WSAGetLastError()}; + // We try to match the UNIX behavior for truncated packages. In that case the return code is + // the length of the allocated buffer and we get the value from `dwFlags`. + auto last_error = ::WSAGetLastError(); + if (last_error == WSAEMSGSIZE) { + msg->msg_flags = wsamsg.wsamsg_->dwFlags; + return {bytes_received, 0}; + } + + return {rc, last_error}; } msg->msg_namelen = wsa_msg->namelen; msg->msg_flags = wsa_msg->dwFlags; diff --git a/source/common/common/utility.cc b/source/common/common/utility.cc index eb7ba3619a39..fce6f4e385ae 100644 --- a/source/common/common/utility.cc +++ b/source/common/common/utility.cc @@ -306,7 +306,7 @@ bool StringUtil::findToken(absl::string_view source, absl::string_view delimiter absl::string_view key_token, bool trim_whitespace) { const auto tokens = splitToken(source, delimiters, trim_whitespace); if (trim_whitespace) { - for (const auto token : tokens) { + for (const auto& token : tokens) { if (key_token == trim(token)) { return true; } diff --git a/source/common/filesystem/posix/filesystem_impl.cc b/source/common/filesystem/posix/filesystem_impl.cc index 580e980273a9..e24814d0ca70 100644 --- a/source/common/filesystem/posix/filesystem_impl.cc +++ b/source/common/filesystem/posix/filesystem_impl.cc @@ -96,8 +96,6 @@ std::string InstanceImplPosix::fileReadToEnd(const std::string& path) { throw EnvoyException(absl::StrCat("Invalid path: ", path)); } - std::ios::sync_with_stdio(false); - std::ifstream file(path); if (file.fail()) { throw EnvoyException(absl::StrCat("unable to read file: ", path)); diff --git a/source/common/http/utility.cc b/source/common/http/utility.cc index a48bea5d08ae..3c0176536805 100644 --- a/source/common/http/utility.cc +++ b/source/common/http/utility.cc @@ -207,6 +207,30 @@ namespace Http { static const char kDefaultPath[] = "/"; +// If http_parser encounters an IP address [address] as the host it will set the offset and +// length to point to 'address' rather than '[address]'. Fix this by adjusting the offset +// and length to include the brackets. +// @param absolute_url the absolute URL. This is usually of the form // http://host/path +// but may be host:port for CONNECT requests +// @param offset the offset for the first character of the host. For IPv6 hosts +// this will point to the first character inside the brackets and will be +// adjusted to point at the brackets +// @param len the length of the host-and-port field. For IPv6 hosts this will +// not include the brackets and will be adjusted to do so. +bool maybeAdjustForIpv6(absl::string_view absolute_url, uint64_t& offset, uint64_t& len) { + // According to https://tools.ietf.org/html/rfc3986#section-3.2.2 the only way a hostname + // may begin with '[' is if it's an ipv6 address. + if (offset == 0 || *(absolute_url.data() + offset - 1) != '[') { + return false; + } + // Start one character sooner and end one character later. + offset--; + len += 2; + // HTTP parser ensures that any [ has a closing ] + ASSERT(absolute_url.length() >= offset + len); + return true; +} + bool Utility::Url::initialize(absl::string_view absolute_url, bool is_connect) { struct http_parser_url u; http_parser_url_init(&u); @@ -223,20 +247,27 @@ bool Utility::Url::initialize(absl::string_view absolute_url, bool is_connect) { scheme_ = absl::string_view(absolute_url.data() + u.field_data[UF_SCHEMA].off, u.field_data[UF_SCHEMA].len); - uint16_t authority_len = u.field_data[UF_HOST].len; + uint64_t authority_len = u.field_data[UF_HOST].len; if ((u.field_set & (1 << UF_PORT)) == (1 << UF_PORT)) { authority_len = authority_len + u.field_data[UF_PORT].len + 1; } - host_and_port_ = - absl::string_view(absolute_url.data() + u.field_data[UF_HOST].off, authority_len); + + uint64_t authority_beginning = u.field_data[UF_HOST].off; + const bool is_ipv6 = maybeAdjustForIpv6(absolute_url, authority_beginning, authority_len); + host_and_port_ = absl::string_view(absolute_url.data() + authority_beginning, authority_len); + if (is_ipv6 && !parseAuthority(host_and_port_).is_ip_address_) { + return false; + } // RFC allows the absolute-uri to not end in /, but the absolute path form - // must start with - uint64_t path_len = absolute_url.length() - (u.field_data[UF_HOST].off + hostAndPort().length()); - if (path_len > 0) { - uint64_t path_beginning = u.field_data[UF_HOST].off + hostAndPort().length(); - path_and_query_params_ = absl::string_view(absolute_url.data() + path_beginning, path_len); + // must start with. Determine if there's a non-zero path, and if so determine + // the length of the path, query params etc. + uint64_t path_etc_len = absolute_url.length() - (authority_beginning + hostAndPort().length()); + if (path_etc_len > 0) { + uint64_t path_beginning = authority_beginning + hostAndPort().length(); + path_and_query_params_ = absl::string_view(absolute_url.data() + path_beginning, path_etc_len); } else if (!is_connect) { + ASSERT((u.field_set & (1 << UF_PATH)) == 0); path_and_query_params_ = absl::string_view(kDefaultPath, 1); } return true; @@ -329,7 +360,7 @@ std::string Utility::parseCookieValue(const HeaderMap& headers, const std::strin if (header.key() == Http::Headers::get().Cookie.get()) { // Split the cookie header into individual cookies. - for (const auto s : StringUtil::splitToken(header.value().getStringView(), ";")) { + for (const auto& s : StringUtil::splitToken(header.value().getStringView(), ";")) { // Find the key part of the cookie (i.e. the name of the cookie). size_t first_non_space = s.find_first_not_of(" "); size_t equals_index = s.find('='); diff --git a/source/common/network/connection_impl.cc b/source/common/network/connection_impl.cc index 649e8057d6d2..6415261e7345 100644 --- a/source/common/network/connection_impl.cc +++ b/source/common/network/connection_impl.cc @@ -56,7 +56,8 @@ ConnectionImpl::ConnectionImpl(Event::Dispatcher& dispatcher, ConnectionSocketPt []() -> void { /* TODO(adisuissa): Handle overflow watermark */ })), write_buffer_above_high_watermark_(false), detect_early_close_(true), enable_half_close_(false), read_end_stream_raised_(false), read_end_stream_(false), - write_end_stream_(false), current_write_end_stream_(false), dispatch_buffered_data_(false) { + write_end_stream_(false), current_write_end_stream_(false), dispatch_buffered_data_(false), + transport_wants_read_(false) { // Treat the lack of a valid fd (which in practice only happens if we run out of FDs) as an OOM // condition and just crash. RELEASE_ASSERT(SOCKET_VALID(ConnectionImpl::ioHandle().fd()), ""); @@ -189,7 +190,7 @@ Connection::State ConnectionImpl::state() const { void ConnectionImpl::closeConnectionImmediately() { closeSocket(ConnectionEvent::LocalClose); } -bool ConnectionImpl::consumerWantsToRead() { +bool ConnectionImpl::filterChainWantsData() { return read_disable_count_ == 0 || (read_disable_count_ == 1 && read_buffer_.highWatermarkTriggered()); } @@ -268,7 +269,7 @@ void ConnectionImpl::noDelay(bool enable) { } void ConnectionImpl::onRead(uint64_t read_buffer_size) { - if (inDelayedClose() || !consumerWantsToRead()) { + if (inDelayedClose() || !filterChainWantsData()) { return; } ASSERT(ioHandle().isOpen()); @@ -354,11 +355,17 @@ void ConnectionImpl::readDisable(bool disable) { file_event_->setEnabled(Event::FileReadyType::Read | Event::FileReadyType::Write); } - if (consumerWantsToRead() && read_buffer_.length() > 0) { - // If the connection has data buffered there's no guarantee there's also data in the kernel - // which will kick off the filter chain. Alternately if the read buffer has data the fd could - // be read disabled. To handle these cases, fake an event to make sure the buffered data gets - // processed regardless and ensure that we dispatch it via onRead. + if (filterChainWantsData() && (read_buffer_.length() > 0 || transport_wants_read_)) { + // If the read_buffer_ is not empty or transport_wants_read_ is true, the connection may be + // able to process additional bytes even if there is no data in the kernel to kick off the + // filter chain. Alternately if the read buffer has data the fd could be read disabled. To + // handle these cases, fake an event to make sure the buffered data in the read buffer or in + // transport socket internal buffers gets processed regardless and ensure that we dispatch it + // via onRead. + + // Sanity check: resumption with read_disable_count_ > 0 should only happen if the read + // buffer's high watermark has triggered. + ASSERT(read_buffer_.length() > 0 || read_disable_count_ == 0); dispatch_buffered_data_ = true; setReadBufferReady(); } @@ -553,12 +560,19 @@ void ConnectionImpl::onReadReady() { // 2) The consumer of connection data called readDisable(true), and instead of reading from the // socket we simply need to dispatch already read data. if (read_disable_count_ != 0) { - if (latched_dispatch_buffered_data && consumerWantsToRead()) { + // Do not clear transport_wants_read_ when returning early; the early return skips the transport + // socket doRead call. + if (latched_dispatch_buffered_data && filterChainWantsData()) { onRead(read_buffer_.length()); } return; } + // Clear transport_wants_read_ just before the call to doRead. This is the only way to ensure that + // the transport socket read resumption happens as requested; onReadReady() returns early without + // reading from the transport if the read buffer is above high watermark at the start of the + // method. + transport_wants_read_ = false; IoResult result = transport_socket_->doRead(read_buffer_); uint64_t new_buffer_size = read_buffer_.length(); updateReadBufferStats(result.bytes_processed_, new_buffer_size); diff --git a/source/common/network/connection_impl.h b/source/common/network/connection_impl.h index b464e2af96d1..f66cca701e63 100644 --- a/source/common/network/connection_impl.h +++ b/source/common/network/connection_impl.h @@ -115,7 +115,10 @@ class ConnectionImpl : public ConnectionImplBase, public TransportSocketCallback // TODO(htuch): While this is the basis for also yielding to other connections to provide some // fair sharing of CPU resources, the underlying event loop does not make any fairness guarantees. // Reconsider how to make fairness happen. - void setReadBufferReady() override { file_event_->activate(Event::FileReadyType::Read); } + void setReadBufferReady() override { + transport_wants_read_ = true; + file_event_->activate(Event::FileReadyType::Read); + } void flushWriteBuffer() override; // Obtain global next connection ID. This should only be used in tests. @@ -125,11 +128,10 @@ class ConnectionImpl : public ConnectionImplBase, public TransportSocketCallback // A convenience function which returns true if // 1) The read disable count is zero or // 2) The read disable count is one due to the read buffer being overrun. - // In either case the consumer of the data would like to read from the buffer. - // If the read count is greater than one, or equal to one when the buffer is - // not overrun, then the consumer of the data has called readDisable, and does - // not want to read. - bool consumerWantsToRead(); + // In either case the filter chain would like to process data from the read buffer or transport + // socket. If the read count is greater than one, or equal to one when the buffer is not overrun, + // then the filter chain has called readDisable, and does not want additional data. + bool filterChainWantsData(); // Network::ConnectionImplBase void closeConnectionImmediately() override; @@ -195,6 +197,11 @@ class ConnectionImpl : public ConnectionImplBase, public TransportSocketCallback bool write_end_stream_ : 1; bool current_write_end_stream_ : 1; bool dispatch_buffered_data_ : 1; + // True if the most recent call to the transport socket's doRead method invoked setReadBufferReady + // to schedule read resumption after yielding due to shouldDrainReadBuffer(). When true, + // readDisable must schedule read resumption when read_disable_count_ == 0 to ensure that read + // resumption happens when remaining bytes are held in transport socket internal buffers. + bool transport_wants_read_ : 1; }; /** diff --git a/source/common/network/io_socket_handle_impl.cc b/source/common/network/io_socket_handle_impl.cc index bb30a4a3b204..9e84e165b4e8 100644 --- a/source/common/network/io_socket_handle_impl.cc +++ b/source/common/network/io_socket_handle_impl.cc @@ -13,6 +13,20 @@ using Envoy::Api::SysCallIntResult; using Envoy::Api::SysCallSizeResult; namespace Envoy { + +namespace { +constexpr int messageTruncatedOption() { +#if defined(__APPLE__) + // OSX does not support passing `MSG_TRUNC` to recvmsg and recvmmsg. This does not effect + // functionality and it primarily used for logging. + return 0; +#else + return MSG_TRUNC; +#endif +} + +} // namespace + namespace Network { IoSocketHandleImpl::~IoSocketHandleImpl() { @@ -191,7 +205,7 @@ Address::InstanceConstSharedPtr maybeGetDstAddressFromHeader(const cmsghdr& cmsg return getAddressFromSockAddrOrDie(ss, sizeof(sockaddr_in), fd); } return nullptr; -} +} // namespace Network absl::optional maybeGetPacketsDroppedFromHeader( #ifdef SO_RXQ_OVFL @@ -203,7 +217,7 @@ absl::optional maybeGetPacketsDroppedFromHeader( const cmsghdr&) { #endif return absl::nullopt; -} +} // namespace Envoy Api::IoCallUint64Result IoSocketHandleImpl::recvmsg(Buffer::RawSlice* slices, const uint64_t num_slice, uint32_t self_port, @@ -235,10 +249,18 @@ Api::IoCallUint64Result IoSocketHandleImpl::recvmsg(Buffer::RawSlice* slices, hdr.msg_flags = 0; hdr.msg_control = cbuf.begin(); hdr.msg_controllen = cmsg_space_; - const Api::SysCallSizeResult result = Api::OsSysCallsSingleton::get().recvmsg(fd_, &hdr, 0); + Api::SysCallSizeResult result = + Api::OsSysCallsSingleton::get().recvmsg(fd_, &hdr, messageTruncatedOption()); if (result.rc_ < 0) { return sysCallResultToIoCallResult(result); } + if ((hdr.msg_flags & MSG_TRUNC) != 0) { + ENVOY_LOG_MISC(debug, "Dropping truncated UDP packet with size: {}.", result.rc_); + result.rc_ = 0; + (*output.dropped_packets_)++; + output.msg_[0].truncated_and_dropped_ = true; + return sysCallResultToIoCallResult(result); + } RELEASE_ASSERT((hdr.msg_flags & MSG_CTRUNC) == 0, fmt::format("Incorrectly set control message length: {}", hdr.msg_controllen)); @@ -261,7 +283,8 @@ Api::IoCallUint64Result IoSocketHandleImpl::recvmsg(Buffer::RawSlice* slices, if (output.dropped_packets_ != nullptr) { absl::optional maybe_dropped = maybeGetPacketsDroppedFromHeader(*cmsg); if (maybe_dropped) { - *output.dropped_packets_ = *maybe_dropped; + *output.dropped_packets_ += *maybe_dropped; + continue; } } } @@ -307,8 +330,9 @@ Api::IoCallUint64Result IoSocketHandleImpl::recvmmsg(RawSliceArrays& slices, uin // Set MSG_WAITFORONE so that recvmmsg will not waiting for // |num_packets_per_mmsg_call| packets to arrive before returning when the // socket is a blocking socket. - const Api::SysCallIntResult result = Api::OsSysCallsSingleton::get().recvmmsg( - fd_, mmsg_hdr.data(), num_packets_per_mmsg_call, MSG_TRUNC | MSG_WAITFORONE, nullptr); + const Api::SysCallIntResult result = + Api::OsSysCallsSingleton::get().recvmmsg(fd_, mmsg_hdr.data(), num_packets_per_mmsg_call, + messageTruncatedOption() | MSG_WAITFORONE, nullptr); if (result.rc_ <= 0) { return sysCallResultToIoCallResult(result); @@ -317,18 +341,18 @@ Api::IoCallUint64Result IoSocketHandleImpl::recvmmsg(RawSliceArrays& slices, uin int num_packets_read = result.rc_; for (int i = 0; i < num_packets_read; ++i) { - if (mmsg_hdr[i].msg_len == 0) { + msghdr& hdr = mmsg_hdr[i].msg_hdr; + if ((hdr.msg_flags & MSG_TRUNC) != 0) { + ENVOY_LOG_MISC(debug, "Dropping truncated UDP packet with size: {}.", mmsg_hdr[i].msg_len); + (*output.dropped_packets_)++; + output.msg_[i].truncated_and_dropped_ = true; continue; } - msghdr& hdr = mmsg_hdr[i].msg_hdr; + RELEASE_ASSERT((hdr.msg_flags & MSG_CTRUNC) == 0, fmt::format("Incorrectly set control message length: {}", hdr.msg_controllen)); RELEASE_ASSERT(hdr.msg_namelen > 0, fmt::format("Unable to get remote address from recvmmsg() for fd: {}", fd_)); - if ((hdr.msg_flags & MSG_TRUNC) != 0) { - ENVOY_LOG_MISC(warn, "Dropping truncated UDP packet with size: {}.", mmsg_hdr[i].msg_len); - continue; - } output.msg_[i].msg_len_ = mmsg_hdr[i].msg_len; // Get local and peer addresses for each packet. @@ -354,7 +378,7 @@ Api::IoCallUint64Result IoSocketHandleImpl::recvmmsg(RawSliceArrays& slices, uin for (cmsg = CMSG_FIRSTHDR(&hdr); cmsg != nullptr; cmsg = CMSG_NXTHDR(&hdr, cmsg)) { absl::optional maybe_dropped = maybeGetPacketsDroppedFromHeader(*cmsg); if (maybe_dropped) { - *output.dropped_packets_ = *maybe_dropped; + *output.dropped_packets_ += *maybe_dropped; } } } diff --git a/source/common/network/udp_listener_impl.h b/source/common/network/udp_listener_impl.h index 2184b4419c10..8c0f6a4e1735 100644 --- a/source/common/network/udp_listener_impl.h +++ b/source/common/network/udp_listener_impl.h @@ -24,8 +24,8 @@ class UdpListenerImpl : public BaseListenerImpl, public: UdpListenerImpl(Event::DispatcherImpl& dispatcher, SocketSharedPtr socket, UdpListenerCallbacks& cb, TimeSource& time_source); - ~UdpListenerImpl() override; + uint32_t packetsDropped() { return packets_dropped_; } // Network::Listener Interface void disable() override; diff --git a/source/common/network/utility.cc b/source/common/network/utility.cc index 2cdb3e614de4..20e94b52e142 100644 --- a/source/common/network/utility.cc +++ b/source/common/network/utility.cc @@ -569,6 +569,10 @@ Api::IoCallUint64Result Utility::readFromSocket(IoHandle& handle, uint64_t packets_read = result.rc_; ENVOY_LOG_MISC(trace, "recvmmsg read {} packets", packets_read); for (uint64_t i = 0; i < packets_read; ++i) { + if (output.msg_[i].truncated_and_dropped_) { + continue; + } + Buffer::RawSlice* slice = slices[i].data(); const uint64_t msg_len = output.msg_[i].msg_len_; ASSERT(msg_len <= slice->len_); @@ -589,7 +593,7 @@ Api::IoCallUint64Result Utility::readFromSocket(IoHandle& handle, Api::IoCallUint64Result result = handle.recvmsg(&slice, num_slices, local_address.ip()->port(), output); - if (!result.ok()) { + if (!result.ok() || output.msg_[0].truncated_and_dropped_) { return result; } @@ -616,12 +620,6 @@ Api::IoErrorPtr Utility::readPacketsFromSocket(IoHandle& handle, return std::move(result.err_); } - if (result.rc_ == 0) { - // TODO(conqerAtapple): Is zero length packet interesting? If so add stats - // for it. Otherwise remove the warning log below. - ENVOY_LOG_MISC(trace, "received 0-length packet"); - } - if (packets_dropped != old_packets_dropped) { // The kernel tracks SO_RXQ_OVFL as a uint32 which can overflow to a smaller // value. So as long as this count differs from previously recorded value, diff --git a/source/common/router/retry_state_impl.cc b/source/common/router/retry_state_impl.cc index 09d3b1016804..7180d4d92d90 100644 --- a/source/common/router/retry_state_impl.cc +++ b/source/common/router/retry_state_impl.cc @@ -113,7 +113,7 @@ RetryStateImpl::RetryStateImpl(const RetryPolicy& route_policy, } if (request_headers.EnvoyRetriableStatusCodes()) { - for (const auto code : + for (const auto& code : StringUtil::splitToken(request_headers.getEnvoyRetriableStatusCodesValue(), ",")) { unsigned int out; if (absl::SimpleAtoi(code, &out)) { @@ -128,7 +128,7 @@ RetryStateImpl::RetryStateImpl(const RetryPolicy& route_policy, // to provide HeaderMatcher serialized into a string. To avoid this extra // complexity we only support name-only header matchers via request // header. Anything more sophisticated needs to be provided via config. - for (const auto header_name : StringUtil::splitToken( + for (const auto& header_name : StringUtil::splitToken( request_headers.EnvoyRetriableHeaderNames()->value().getStringView(), ",")) { envoy::config::route::v3::HeaderMatcher header_matcher; header_matcher.set_name(std::string(absl::StripAsciiWhitespace(header_name))); @@ -152,7 +152,7 @@ void RetryStateImpl::enableBackoffTimer() { std::pair RetryStateImpl::parseRetryOn(absl::string_view config) { uint32_t ret = 0; bool all_fields_valid = true; - for (const auto retry_on : StringUtil::splitToken(config, ",", false, true)) { + for (const auto& retry_on : StringUtil::splitToken(config, ",", false, true)) { if (retry_on == Http::Headers::get().EnvoyRetryOnValues._5xx) { ret |= RetryPolicy::RETRY_ON_5XX; } else if (retry_on == Http::Headers::get().EnvoyRetryOnValues.GatewayError) { @@ -180,7 +180,7 @@ std::pair RetryStateImpl::parseRetryOn(absl::string_view config) std::pair RetryStateImpl::parseRetryGrpcOn(absl::string_view retry_grpc_on_header) { uint32_t ret = 0; bool all_fields_valid = true; - for (const auto retry_on : StringUtil::splitToken(retry_grpc_on_header, ",", false, true)) { + for (const auto& retry_on : StringUtil::splitToken(retry_grpc_on_header, ",", false, true)) { if (retry_on == Http::Headers::get().EnvoyRetryOnGrpcValues.Cancelled) { ret |= RetryPolicy::RETRY_ON_GRPC_CANCELLED; } else if (retry_on == Http::Headers::get().EnvoyRetryOnGrpcValues.DeadlineExceeded) { diff --git a/source/common/runtime/runtime_impl.cc b/source/common/runtime/runtime_impl.cc index 6eb490d2015b..21f2440ebf44 100644 --- a/source/common/runtime/runtime_impl.cc +++ b/source/common/runtime/runtime_impl.cc @@ -411,7 +411,7 @@ void DiskLayer::walkDirectory(const std::string& path, const std::string& prefix // Comments are useful for placeholder files with no value. const std::string text_file{api.fileSystem().fileReadToEnd(full_path)}; const auto lines = StringUtil::splitToken(text_file, "\n"); - for (const auto line : lines) { + for (const auto& line : lines) { if (!line.empty() && line.front() == '#') { continue; } diff --git a/source/extensions/filters/http/common/compressor/compressor.cc b/source/extensions/filters/http/common/compressor/compressor.cc index 482abaf348dd..3ed87b4b34aa 100644 --- a/source/extensions/filters/http/common/compressor/compressor.cc +++ b/source/extensions/filters/http/common/compressor/compressor.cc @@ -214,7 +214,7 @@ CompressorFilter::chooseEncoding(const Http::ResponseHeaderMap& headers) const { } // Find all encodings accepted by the user agent and adjust the list of allowed compressors. - for (const auto token : StringUtil::splitToken(*accept_encoding_, ",", false /* keep_empty */)) { + for (const auto& token : StringUtil::splitToken(*accept_encoding_, ",", false /* keep_empty */)) { EncPair pair = std::make_pair(StringUtil::trim(StringUtil::cropRight(token, ";")), static_cast(1)); const auto params = StringUtil::cropLeft(token, ";"); diff --git a/source/extensions/filters/http/squash/squash_filter.cc b/source/extensions/filters/http/squash/squash_filter.cc index 0c5d42fe1f6a..d5efd32ed32a 100644 --- a/source/extensions/filters/http/squash/squash_filter.cc +++ b/source/extensions/filters/http/squash/squash_filter.cc @@ -308,9 +308,7 @@ void SquashFilter::cleanup() { } Json::ObjectSharedPtr SquashFilter::getJsonBody(Http::ResponseMessagePtr&& m) { - Buffer::InstancePtr& data = m->body(); - std::string jsonbody = data->toString(); - return Json::Factory::loadFromString(jsonbody); + return Json::Factory::loadFromString(m->bodyAsString()); } } // namespace Squash diff --git a/source/extensions/tracers/datadog/datadog_tracer_impl.cc b/source/extensions/tracers/datadog/datadog_tracer_impl.cc index 1f56b1718528..aa1b490d0a54 100644 --- a/source/extensions/tracers/datadog/datadog_tracer_impl.cc +++ b/source/extensions/tracers/datadog/datadog_tracer_impl.cc @@ -140,7 +140,7 @@ void TraceReporter::onSuccess(const Http::AsyncClient::Request& request, } else { ENVOY_LOG(debug, "traces successfully submitted to datadog agent"); driver_.tracerStats().reports_sent_.inc(); - encoder_->handleResponse(http_response->body()->toString()); + encoder_->handleResponse(http_response->bodyAsString()); } } diff --git a/source/extensions/transport_sockets/tls/ssl_socket.cc b/source/extensions/transport_sockets/tls/ssl_socket.cc index 03f3f8b44e4a..6bb9ae48d221 100644 --- a/source/extensions/transport_sockets/tls/ssl_socket.cc +++ b/source/extensions/transport_sockets/tls/ssl_socket.cc @@ -128,10 +128,18 @@ Network::IoResult SslSocket::doRead(Buffer::Instance& read_buffer) { case SSL_ERROR_WANT_READ: break; case SSL_ERROR_ZERO_RETURN: + // Graceful shutdown using close_notify TLS alert. end_stream = true; break; + case SSL_ERROR_SYSCALL: + if (result.error_.value() == 0) { + // Non-graceful shutdown by closing the underlying socket. + end_stream = true; + break; + } + FALLTHRU; case SSL_ERROR_WANT_WRITE: - // Renegotiation has started. We don't handle renegotiation so just fall through. + // Renegotiation has started. We don't handle renegotiation so just fall through. default: drainErrorQueue(); action = PostIoAction::Close; diff --git a/source/server/connection_handler_impl.cc b/source/server/connection_handler_impl.cc index 24b694f82659..0b7a1c8bbb65 100644 --- a/source/server/connection_handler_impl.cc +++ b/source/server/connection_handler_impl.cc @@ -375,6 +375,18 @@ void emitLogs(Network::ListenerConfig& config, StreamInfo::StreamInfo& stream_in } } // namespace +void ConnectionHandlerImpl::ActiveTcpListener::pauseListening() { + if (listener_ != nullptr) { + listener_->disable(); + } +} + +void ConnectionHandlerImpl::ActiveTcpListener::resumeListening() { + if (listener_ != nullptr) { + listener_->enable(); + } +} + void ConnectionHandlerImpl::ActiveTcpListener::newConnection( Network::ConnectionSocketPtr&& socket, const envoy::config::core::v3::Metadata& dynamic_metadata) { diff --git a/source/server/connection_handler_impl.h b/source/server/connection_handler_impl.h index df6fa758bd5b..7c5e7581e265 100644 --- a/source/server/connection_handler_impl.h +++ b/source/server/connection_handler_impl.h @@ -134,8 +134,8 @@ class ConnectionHandlerImpl : public Network::ConnectionHandler, // ActiveListenerImplBase Network::Listener* listener() override { return listener_.get(); } - void pauseListening() override { listener_->disable(); } - void resumeListening() override { listener_->enable(); } + void pauseListening() override; + void resumeListening() override; void shutdownListener() override { listener_.reset(); } // Network::BalancedConnectionHandler diff --git a/test/common/http/utility_test.cc b/test/common/http/utility_test.cc index 8751acddb024..472381c7d9c2 100644 --- a/test/common/http/utility_test.cc +++ b/test/common/http/utility_test.cc @@ -1090,6 +1090,9 @@ TEST(Url, ParsingFails) { EXPECT_FALSE(url.initialize("random_scheme://host.com/path", false)); EXPECT_FALSE(url.initialize("http://www.foo.com", true)); EXPECT_FALSE(url.initialize("foo.com", true)); + EXPECT_FALSE(url.initialize("http://[notaddress]:80/?query=param", false)); + EXPECT_FALSE(url.initialize("http://[1::z::2]:80/?query=param", false)); + EXPECT_FALSE(url.initialize("http://1.2.3.4:65536/?query=param", false)); } void validateUrl(absl::string_view raw_url, absl::string_view expected_scheme, @@ -1101,12 +1104,17 @@ void validateUrl(absl::string_view raw_url, absl::string_view expected_scheme, EXPECT_EQ(url.pathAndQueryParams(), expected_path); } -void validateConnectUrl(absl::string_view raw_url, absl::string_view expected_host_port) { +void validateConnectUrl(absl::string_view raw_url) { Utility::Url url; ASSERT_TRUE(url.initialize(raw_url, true)) << "Failed to initialize " << raw_url; EXPECT_TRUE(url.scheme().empty()); EXPECT_TRUE(url.pathAndQueryParams().empty()); - EXPECT_EQ(url.hostAndPort(), expected_host_port); + EXPECT_EQ(url.hostAndPort(), raw_url); +} + +void invalidConnectUrl(absl::string_view raw_url) { + Utility::Url url; + ASSERT_FALSE(url.initialize(raw_url, true)) << "Unexpectedly initialized " << raw_url; } TEST(Url, ParsingTest) { @@ -1141,6 +1149,14 @@ TEST(Url, ParsingTest) { validateUrl("http://www.host.com:80/?query=param", "http", "www.host.com:80", "/?query=param"); validateUrl("http://www.host.com/?query=param", "http", "www.host.com", "/?query=param"); + // Test with an ipv4 host address. + validateUrl("http://1.2.3.4/?query=param", "http", "1.2.3.4", "/?query=param"); + validateUrl("http://1.2.3.4:80/?query=param", "http", "1.2.3.4:80", "/?query=param"); + + // Test with an ipv6 address + validateUrl("http://[1::2:3]/?query=param", "http", "[1::2:3]", "/?query=param"); + validateUrl("http://[1::2:3]:80/?query=param", "http", "[1::2:3]:80", "/?query=param"); + // Test url with query parameter but without slash validateUrl("http://www.host.com:80?query=param", "http", "www.host.com:80", "?query=param"); validateUrl("http://www.host.com?query=param", "http", "www.host.com", "?query=param"); @@ -1163,8 +1179,16 @@ TEST(Url, ParsingTest) { } TEST(Url, ParsingForConnectTest) { - validateConnectUrl("host.com:443", "host.com:443"); - validateConnectUrl("host.com:80", "host.com:80"); + validateConnectUrl("host.com:443"); + validateConnectUrl("host.com:80"); + validateConnectUrl("1.2.3.4:80"); + validateConnectUrl("[1:2::3:4]:80"); + + invalidConnectUrl("[::12345678]:80"); + invalidConnectUrl("[1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1]:80"); + invalidConnectUrl("[1:1]:80"); + invalidConnectUrl("[:::]:80"); + invalidConnectUrl("[::1::]:80"); } void validatePercentEncodingEncodeDecode(absl::string_view source, diff --git a/test/common/network/connection_impl_test.cc b/test/common/network/connection_impl_test.cc index 72168e2a666d..086962d34c2c 100644 --- a/test/common/network/connection_impl_test.cc +++ b/test/common/network/connection_impl_test.cc @@ -1657,6 +1657,197 @@ TEST_F(MockTransportConnectionImplTest, ObjectDestructOrder) { file_ready_cb_(Event::FileReadyType::Read); } +// Verify that read resumptions requested via setReadBufferReady() are scheduled once read is +// re-enabled. +TEST_F(MockTransportConnectionImplTest, ReadBufferReadyResumeAfterReadDisable) { + InSequence s; + + std::shared_ptr read_filter(new StrictMock()); + connection_->enableHalfClose(true); + connection_->addReadFilter(read_filter); + + EXPECT_CALL(*file_event_, setEnabled(Event::FileReadyType::Write)); + connection_->readDisable(true); + EXPECT_CALL(*file_event_, setEnabled(Event::FileReadyType::Read | Event::FileReadyType::Write)); + // No calls to activate when re-enabling if there are no pending read requests. + EXPECT_CALL(*file_event_, activate(_)).Times(0); + connection_->readDisable(false); + + // setReadBufferReady triggers an immediate call to activate. + EXPECT_CALL(*file_event_, activate(Event::FileReadyType::Read)); + connection_->setReadBufferReady(); + + // When processing a sequence of read disable/read enable, changes to the enabled event mask + // happen only when the disable count transitions to/from 0. + EXPECT_CALL(*file_event_, setEnabled(Event::FileReadyType::Write)); + connection_->readDisable(true); + connection_->readDisable(true); + connection_->readDisable(true); + connection_->readDisable(false); + connection_->readDisable(false); + EXPECT_CALL(*file_event_, setEnabled(Event::FileReadyType::Read | Event::FileReadyType::Write)); + // Expect a read activation since there have been no transport doRead calls since the call to + // setReadBufferReady. + EXPECT_CALL(*file_event_, activate(Event::FileReadyType::Read)); + connection_->readDisable(false); + + // No calls to doRead when file_ready_cb is invoked while read disabled. + EXPECT_CALL(*file_event_, setEnabled(_)); + connection_->readDisable(true); + EXPECT_CALL(*transport_socket_, doRead(_)).Times(0); + file_ready_cb_(Event::FileReadyType::Read); + + // Expect a read activate when re-enabling since the file ready cb has not done a read. + EXPECT_CALL(*file_event_, setEnabled(_)); + EXPECT_CALL(*file_event_, activate(Event::FileReadyType::Read)); + connection_->readDisable(false); + + // Do a read to clear the transport_wants_read_ flag, verify that no read activation is scheduled. + EXPECT_CALL(*transport_socket_, doRead(_)) + .WillOnce(Return(IoResult{PostIoAction::KeepOpen, 0, false})); + file_ready_cb_(Event::FileReadyType::Read); + EXPECT_CALL(*file_event_, setEnabled(_)); + connection_->readDisable(true); + EXPECT_CALL(*file_event_, setEnabled(_)); + // No read activate call. + EXPECT_CALL(*file_event_, activate(_)).Times(0); + connection_->readDisable(false); +} + +// Verify that read resumption is scheduled when read is re-enabled while the read buffer is +// non-empty. +TEST_F(MockTransportConnectionImplTest, ReadBufferResumeAfterReadDisable) { + InSequence s; + + std::shared_ptr read_filter(new StrictMock()); + connection_->setBufferLimits(5); + connection_->enableHalfClose(true); + connection_->addReadFilter(read_filter); + + // Add some data to the read buffer to trigger read activate calls when re-enabling read. + EXPECT_CALL(*transport_socket_, doRead(_)) + .WillOnce(Invoke([](Buffer::Instance& buffer) -> IoResult { + buffer.add("0123456789"); + return {PostIoAction::KeepOpen, 10, false}; + })); + // Expect a change to the event mask when hitting the read buffer high-watermark. + EXPECT_CALL(*file_event_, setEnabled(Event::FileReadyType::Write)); + EXPECT_CALL(*read_filter, onNewConnection()).WillOnce(Return(FilterStatus::Continue)); + EXPECT_CALL(*read_filter, onData(_, false)).WillOnce(Return(FilterStatus::Continue)); + file_ready_cb_(Event::FileReadyType::Read); + + // Already read disabled, expect no changes to enabled events mask. + EXPECT_CALL(*file_event_, setEnabled(_)).Times(0); + connection_->readDisable(true); + connection_->readDisable(true); + connection_->readDisable(false); + // Read buffer is at the high watermark so read_disable_count should be == 1. Expect a read + // activate but no call to setEnable to change the registration mask. + EXPECT_CALL(*file_event_, setEnabled(_)).Times(0); + EXPECT_CALL(*file_event_, activate(Event::FileReadyType::Read)); + connection_->readDisable(false); + + // Invoke the file event cb while read_disable_count_ == 1 to partially drain the read buffer. + // Expect no transport reads. + EXPECT_CALL(*transport_socket_, doRead(_)).Times(0); + EXPECT_CALL(*read_filter, onData(_, _)) + .WillRepeatedly(Invoke([&](Buffer::Instance& data, bool) -> FilterStatus { + EXPECT_EQ(10, data.length()); + data.drain(data.length() - 1); + return FilterStatus::Continue; + })); + // Partial drain of the read buffer below low watermark triggers an update to the fd enabled mask + // and a read activate since the read buffer is not empty. + EXPECT_CALL(*file_event_, setEnabled(Event::FileReadyType::Read | Event::FileReadyType::Write)); + EXPECT_CALL(*file_event_, activate(Event::FileReadyType::Read)); + file_ready_cb_(Event::FileReadyType::Read); + + // Drain the rest of the buffer and verify there are no spurious read activate calls. + EXPECT_CALL(*transport_socket_, doRead(_)) + .WillOnce(Return(IoResult{PostIoAction::KeepOpen, 0, false})); + EXPECT_CALL(*read_filter, onData(_, _)) + .WillRepeatedly(Invoke([&](Buffer::Instance& data, bool) -> FilterStatus { + EXPECT_EQ(1, data.length()); + data.drain(1); + return FilterStatus::Continue; + })); + file_ready_cb_(Event::FileReadyType::Read); + + EXPECT_CALL(*file_event_, setEnabled(_)); + connection_->readDisable(true); + EXPECT_CALL(*file_event_, setEnabled(_)); + // read buffer is empty, no read activate call. + EXPECT_CALL(*file_event_, activate(_)).Times(0); + connection_->readDisable(false); +} + +// Verify that transport_wants_read_ read resumption is not lost when processing read buffer +// high-watermark resumptions. +TEST_F(MockTransportConnectionImplTest, ResumeWhileAndAfterReadDisable) { + InSequence s; + + std::shared_ptr read_filter(new StrictMock()); + connection_->setBufferLimits(5); + connection_->enableHalfClose(true); + connection_->addReadFilter(read_filter); + + // Add some data to the read buffer and also call setReadBufferReady to mimic what transport + // sockets are expected to do when the read buffer high watermark is hit. + EXPECT_CALL(*transport_socket_, doRead(_)) + .WillOnce(Invoke([this](Buffer::Instance& buffer) -> IoResult { + buffer.add("0123456789"); + connection_->setReadBufferReady(); + return {PostIoAction::KeepOpen, 10, false}; + })); + // Expect a change to the event mask when hitting the read buffer high-watermark. + EXPECT_CALL(*file_event_, setEnabled(Event::FileReadyType::Write)); + // The setReadBufferReady call adds a spurious read activation. + // TODO(antoniovicente) Skip the read activate in setReadBufferReady when read_disable_count_ > 0. + EXPECT_CALL(*file_event_, activate(Event::FileReadyType::Read)); + EXPECT_CALL(*read_filter, onNewConnection()).WillOnce(Return(FilterStatus::Continue)); + EXPECT_CALL(*read_filter, onData(_, false)).WillOnce(Return(FilterStatus::Continue)); + file_ready_cb_(Event::FileReadyType::Read); + + // Already read disabled, expect no changes to enabled events mask. + EXPECT_CALL(*file_event_, setEnabled(_)).Times(0); + connection_->readDisable(true); + connection_->readDisable(true); + connection_->readDisable(false); + // Read buffer is at the high watermark so read_disable_count should be == 1. Expect a read + // activate but no call to setEnable to change the registration mask. + EXPECT_CALL(*file_event_, setEnabled(_)).Times(0); + EXPECT_CALL(*file_event_, activate(Event::FileReadyType::Read)); + connection_->readDisable(false); + + // Invoke the file event cb while read_disable_count_ == 1 and fully drain the read buffer. + // Expect no transport reads. Expect a read resumption due to transport_wants_read_ being true + // when read is re-enabled due to going under the low watermark. + EXPECT_CALL(*transport_socket_, doRead(_)).Times(0); + EXPECT_CALL(*read_filter, onData(_, _)) + .WillRepeatedly(Invoke([&](Buffer::Instance& data, bool) -> FilterStatus { + EXPECT_EQ(10, data.length()); + data.drain(data.length()); + return FilterStatus::Continue; + })); + // The buffer is fully drained. Expect a read activation because setReadBufferReady set + // transport_wants_read_ and no transport doRead calls have happened. + EXPECT_CALL(*file_event_, setEnabled(Event::FileReadyType::Read | Event::FileReadyType::Write)); + EXPECT_CALL(*file_event_, activate(Event::FileReadyType::Read)); + file_ready_cb_(Event::FileReadyType::Read); + + EXPECT_CALL(*transport_socket_, doRead(_)) + .WillOnce(Return(IoResult{PostIoAction::KeepOpen, 0, false})); + file_ready_cb_(Event::FileReadyType::Read); + + // Verify there are no read activate calls the event callback does a transport read and clears the + // transport_wants_read_ state. + EXPECT_CALL(*file_event_, setEnabled(_)); + connection_->readDisable(true); + EXPECT_CALL(*file_event_, setEnabled(_)); + EXPECT_CALL(*file_event_, activate(_)).Times(0); + connection_->readDisable(false); +} + // Test that BytesSentCb is invoked at the correct times TEST_F(MockTransportConnectionImplTest, BytesSentCallback) { uint64_t bytes_sent = 0; diff --git a/test/common/network/udp_listener_impl_test.cc b/test/common/network/udp_listener_impl_test.cc index 0d139b887e43..e67e762ca30f 100644 --- a/test/common/network/udp_listener_impl_test.cc +++ b/test/common/network/udp_listener_impl_test.cc @@ -32,14 +32,31 @@ namespace Envoy { namespace Network { namespace { +// `UdpGro` is only supported on Linux versions >= 5.0. Also, the +// underlying platform only performs the payload concatenation when +// packets are sent from a network namespace different to that of +// the client. Currently, the testing framework does not support +// this behavior. +// This helper allows to intercept syscalls and +// toggle the behavior as per individual test requirements. +class OverrideOsSysCallsImpl : public Api::OsSysCallsImpl { +public: + MOCK_METHOD(bool, supportsUdpGro, (), (const)); + MOCK_METHOD(bool, supportsMmsg, (), (const)); +}; + class UdpListenerImplTest : public ListenerImplTestBase { public: UdpListenerImplTest() : server_socket_(createServerSocket(true)), send_to_addr_(getServerLoopbackAddress()) { time_system_.advanceTimeWait(std::chrono::milliseconds(100)); } - void SetUp() override { + ON_CALL(override_syscall_, supportsUdpGro()).WillByDefault(Return(false)); + // Return the real version by default. + ON_CALL(override_syscall_, supportsMmsg()) + .WillByDefault(Return(os_calls.latched().supportsMmsg())); + // Set listening socket options. server_socket_->addOptions(SocketOptionFactory::buildIpPacketInfoOptions()); server_socket_->addOptions(SocketOptionFactory::buildRxQueueOverFlowOptions()); @@ -70,7 +87,7 @@ class UdpListenerImplTest : public ListenerImplTestBase { } // Validates receive data, source/destination address and received time. - void validateRecvCallbackParams(const UdpRecvData& data) { + void validateRecvCallbackParams(const UdpRecvData& data, size_t num_packet_per_recv) { ASSERT_NE(data.addresses_.local_, nullptr); ASSERT_NE(data.addresses_.peer_, nullptr); @@ -83,10 +100,6 @@ class UdpListenerImplTest : public ListenerImplTestBase { EXPECT_EQ(*data.addresses_.local_, *send_to_addr_); - size_t num_packet_per_recv = 1u; - if (Api::OsSysCallsSingleton::get().supportsMmsg()) { - num_packet_per_recv = 16u; - } EXPECT_EQ(time_system_.monotonicTime(), data.receive_time_ + std::chrono::milliseconds( @@ -99,9 +112,11 @@ class UdpListenerImplTest : public ListenerImplTestBase { SocketSharedPtr server_socket_; Network::Test::UdpSyncPeer client_{GetParam()}; Address::InstanceConstSharedPtr send_to_addr_; - MockUdpListenerCallbacks listener_callbacks_; + NiceMock listener_callbacks_; std::unique_ptr listener_; size_t num_packets_received_by_listener_{0}; + NiceMock override_syscall_; + TestThreadsafeSingletonInjector os_calls{&override_syscall_}; }; INSTANTIATE_TEST_SUITE_P(IpVersions, UdpListenerImplTest, @@ -144,12 +159,12 @@ TEST_P(UdpListenerImplTest, UseActualDstUdp) { EXPECT_CALL(listener_callbacks_, onReadReady()); EXPECT_CALL(listener_callbacks_, onData(_)) .WillOnce(Invoke([&](const UdpRecvData& data) -> void { - validateRecvCallbackParams(data); + validateRecvCallbackParams(data, Api::OsSysCallsSingleton::get().supportsMmsg() ? 16u : 1u); EXPECT_EQ(data.buffer_->toString(), first); })) .WillOnce(Invoke([&](const UdpRecvData& data) -> void { - validateRecvCallbackParams(data); + validateRecvCallbackParams(data, Api::OsSysCallsSingleton::get().supportsMmsg() ? 16u : 1u); EXPECT_EQ(data.buffer_->toString(), second); @@ -164,6 +179,54 @@ TEST_P(UdpListenerImplTest, UseActualDstUdp) { dispatcher_->run(Event::Dispatcher::RunType::Block); } +// Test a large datagram that gets dropped using recvmmsg if supported. +TEST_P(UdpListenerImplTest, LargeDatagramRecvmmsg) { + // This will get dropped. + const std::string first(4096, 'a'); + client_.write(first, *send_to_addr_); + const std::string second("second"); + client_.write(second, *send_to_addr_); + // This will get dropped. + const std::string third(4096, 'b'); + client_.write(third, *send_to_addr_); + + EXPECT_CALL(listener_callbacks_, onReadReady()); + EXPECT_CALL(listener_callbacks_, onData(_)).WillOnce(Invoke([&](const UdpRecvData& data) -> void { + validateRecvCallbackParams(data, Api::OsSysCallsSingleton::get().supportsMmsg() ? 16u : 1u); + EXPECT_EQ(data.buffer_->toString(), second); + + dispatcher_->exit(); + })); + + dispatcher_->run(Event::Dispatcher::RunType::Block); + EXPECT_EQ(2, listener_->packetsDropped()); +} + +// Test a large datagram that gets dropped using recvmsg. +TEST_P(UdpListenerImplTest, LargeDatagramRecvmsg) { + ON_CALL(override_syscall_, supportsMmsg()).WillByDefault(Return(false)); + + // This will get dropped. + const std::string first(4096, 'a'); + client_.write(first, *send_to_addr_); + const std::string second("second"); + client_.write(second, *send_to_addr_); + // This will get dropped. + const std::string third(4096, 'b'); + client_.write(third, *send_to_addr_); + + EXPECT_CALL(listener_callbacks_, onReadReady()); + EXPECT_CALL(listener_callbacks_, onData(_)).WillOnce(Invoke([&](const UdpRecvData& data) -> void { + validateRecvCallbackParams(data, Api::OsSysCallsSingleton::get().supportsMmsg() ? 16u : 1u); + EXPECT_EQ(data.buffer_->toString(), second); + + dispatcher_->exit(); + })); + + dispatcher_->run(Event::Dispatcher::RunType::Block); + EXPECT_EQ(2, listener_->packetsDropped()); +} + /** * Tests UDP listener for read and write callbacks with actual data. */ @@ -185,7 +248,7 @@ TEST_P(UdpListenerImplTest, UdpEcho) { EXPECT_CALL(listener_callbacks_, onReadReady()); EXPECT_CALL(listener_callbacks_, onData(_)) .WillOnce(Invoke([&](const UdpRecvData& data) -> void { - validateRecvCallbackParams(data); + validateRecvCallbackParams(data, Api::OsSysCallsSingleton::get().supportsMmsg() ? 16u : 1u); test_peer_address = data.addresses_.peer_; @@ -195,7 +258,7 @@ TEST_P(UdpListenerImplTest, UdpEcho) { server_received_data.push_back(data_str); })) .WillRepeatedly(Invoke([&](const UdpRecvData& data) -> void { - validateRecvCallbackParams(data); + validateRecvCallbackParams(data, Api::OsSysCallsSingleton::get().supportsMmsg() ? 16u : 1u); const std::string data_str = data.buffer_->toString(); EXPECT_EQ(data_str, client_data[num_packets_received_by_listener_ - 1]); @@ -271,7 +334,7 @@ TEST_P(UdpListenerImplTest, UdpListenerEnableDisable) { .Times(2) .WillOnce(Return()) .WillOnce(Invoke([&](const UdpRecvData& data) -> void { - validateRecvCallbackParams(data); + validateRecvCallbackParams(data, Api::OsSysCallsSingleton::get().supportsMmsg() ? 16u : 1u); EXPECT_EQ(data.buffer_->toString(), second); diff --git a/test/common/stats/stat_test_utility.cc b/test/common/stats/stat_test_utility.cc index cc0f0a8d47a7..9ee2ea2be10a 100644 --- a/test/common/stats/stat_test_utility.cc +++ b/test/common/stats/stat_test_utility.cc @@ -119,20 +119,28 @@ MemoryTest::Mode MemoryTest::mode() { const size_t end_mem = Memory::Stats::totalCurrentlyAllocated(); bool can_measure_memory = end_mem > start_mem; + // As of Oct 8, 2020, tcmalloc has changed such that Memory::Stats::totalCurrentlyAllocated + // is not deterministic, even with single-threaded tests. When possible, this should be fixed, + // and the following block of code uncommented. This affects approximate comparisons, not + // just exact ones. +#if 0 if (getenv("ENVOY_MEMORY_TEST_EXACT") != nullptr) { // Set in "ci/do_ci.sh" for 'release' tests. RELEASE_ASSERT(can_measure_memory, "$ENVOY_MEMORY_TEST_EXACT is set for canonical memory measurements, " "but memory measurement looks broken"); return Mode::Canonical; } else { - // Different versions of STL and other compiler/architecture differences may - // also impact memory usage, so when not compiling with MEMORY_TEST_EXACT, - // memory comparisons must be given some slack. There have recently emerged - // some memory-allocation differences between development and Envoy CI and - // Bazel CI (which compiles Envoy as a test of Bazel). - return can_measure_memory ? Mode::Approximate : Mode::Disabled; +#endif + // Different versions of STL and other compiler/architecture differences may + // also impact memory usage, so when not compiling with MEMORY_TEST_EXACT, + // memory comparisons must be given some slack. There have recently emerged + // some memory-allocation differences between development and Envoy CI and + // Bazel CI (which compiles Envoy as a test of Bazel). + return can_measure_memory ? Mode::Approximate : Mode::Disabled; +#if 0 } #endif +#endif } Counter& TestStore::counterFromString(const std::string& name) { diff --git a/test/config/integration/certs/cacert.pem b/test/config/integration/certs/cacert.pem index 021f465ac3ef..a3aba5dafb3d 100644 --- a/test/config/integration/certs/cacert.pem +++ b/test/config/integration/certs/cacert.pem @@ -1,23 +1,23 @@ -----BEGIN CERTIFICATE----- -MIID0jCCArqgAwIBAgIJAJxgLCQiz7YlMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow -djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQCpZHOUq+nidd+Gz44RC80QG9De9jcFUStEMGucXlnvvp2cH3GV4GmO -IZPdCwasxuruO3VM/Yt8tUAO2OrTQayuL9GXTt8MTpkCrviebMBzjYjbgyLgDpZy -cMoEJjBx0JsfQV+9IUDROLlIehTYzjcIWuLEOqMjZXQQCOI+jA3CEWZx1TFhRWhi -9aBnQQzWCSZPV5ErKSSRg2T2Xnuhusue7ETtgSt36hDrOxLhJaeS1/YlovyhX94j -JPhASK3LutJUDO2tk8L713Y3WHkFzDMfkGrklRbBB/ZKXRRGiJDWElpbUCUVFbuw -7laBtTn0t74DQxBXqal9sIr9vV7LLQszAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB -Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQUM9b2kmz7njy/vuxkzKiwDLZN -5DAfBgNVHSMEGDAWgBQUM9b2kmz7njy/vuxkzKiwDLZN5DANBgkqhkiG9w0BAQsF -AAOCAQEAkWqORue+2exZldWbYaDUX3ANP0ATBNIbZM70uTNO8Iy+r5Fvxtae/PsV -Iac9LzVY5dY5eqIND9wo7osFfxEhJdJn+/tpTU2h9IhsuWMm0Ogj87NS3sy0xwDc -xBhnVXI8nCDYU3qU3p+AeC0VfEbNb+dRKHH/FL77jvIL64GP/WGxxS9u7LRTUUoR -g97ZWeayKEsHAicRao4/k3jgpNIUN0BOlkjLvCe1ExU0id5R3UtdITmbuSSe6GJx -j8xsEV8PxmOIaJ/M+fqE+Zi2Ljp3a+9X/nLakR6ohMNTbrGMQWrGIpFqCj6pIwek -6Uemmmca+JeVohl8P3enMlW1d6/24w== +MIID3TCCAsWgAwIBAgIUBOC8PypZjuDVmzvxsSv/Af8lrCAwDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjAwNjE2WhcNMjIx +MjIxMjAwNjE2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBDQTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBANBls8kBq1EtTrr4136Cvaup0dOvwMzCb1eoIfd1 +iuzMIrSczTmqDgyfeEvtXcyKKitoSPUR+KB/N1uHYdfF0d3EIZQC/fte7e9KWbsW ++BOS7W7Z0iP7Zw5plGLi8cwOZ/tlpRC0Na/UMkdhzd5C2SHkGnlt3DAE2TLYW/wW +KRi9eh9PxJpCP9h8DbJiY6OmsalJ8ar3FbCFmqQ6nXGLH460/mGSuSC8QilnTX5v +3yfag2f+IlbR/LFiSJC3majPZ8CAYeIhHmn/UOvYzxYxT0lU5eVtUSgtAt0l/Vgs +tqjhIwbheDscIIZGs+9YdaJAj+IXKd+LZfnA7GeEei7K0psCAwEAAaNjMGEwDwYD +VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFK0dgJsWn0rm +M2+COvVdQax98En+MB8GA1UdIwQYMBaAFK0dgJsWn0rmM2+COvVdQax98En+MA0G +CSqGSIb3DQEBCwUAA4IBAQCz+n2xQzsb5u5Giah36PzS3V5nYrALlz+Y4WRLyxSU +TQ3lIU07O36QrJwvujD2jXj+7Tc/f7q8G6QbxAlrRolo+qIbW+Kf6LPjhmqv6wct +bkoyUPevDTUsxASbwPvJig5uChFHHnSadIii7YWu1FYnR8EgDFEQT9qZf6GRB++S +BFKMhlGn22hujj0Zsq/VTgigQSZO+WiVTQLOLUcbJ+KsZYDkqiXOX2Pywjm9uaYx +ENQlVUhDEFwuhIZjeKrukJG2hpEPu7pIDaZldvxdfMP2IsyA120EdOlhtXTy0oYt +A6lTuF2PTBIMwEPv435rkBETbSScXNkPa72Lr6dau0qQ -----END CERTIFICATE----- diff --git a/test/config/integration/certs/cakey.pem b/test/config/integration/certs/cakey.pem index 030b80b3d860..9cff47151ab4 100644 --- a/test/config/integration/certs/cakey.pem +++ b/test/config/integration/certs/cakey.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/config/integration/certs/client_ecdsacert.pem b/test/config/integration/certs/client_ecdsacert.pem index d32aea145091..10dcbff1a87b 100644 --- a/test/config/integration/certs/client_ecdsacert.pem +++ b/test/config/integration/certs/client_ecdsacert.pem @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDmTCCAoGgAwIBAgIJAILStmLgUUcYMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow -gagxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T -YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu -ZWVyaW5nMRswGQYDVQQDDBJUZXN0IEZyb250ZW5kIFRlYW0xJTAjBgkqhkiG9w0B -CQEWFmZyb250ZW5kLXRlYW1AbHlmdC5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMB -BwNCAAT9UPlVN7p2GE0w7a7G7v+AqYYKwpsI1exZyLK4MiEBdiFxnQnjPP0Cfjpq -8PvQCZdthQ7+WL+HhRirpCHPaVHno4HBMIG+MAwGA1UdEwEB/wQCMAAwCwYDVR0P -BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBCBgNVHREEOzA5 -hh9zcGlmZmU6Ly9seWZ0LmNvbS9mcm9udGVuZC10ZWFtgghseWZ0LmNvbYIMd3d3 -Lmx5ZnQuY29tMB0GA1UdDgQWBBQLeMuyYBahRJ6gH43BRFYhMfBYxTAfBgNVHSME -GDAWgBQUM9b2kmz7njy/vuxkzKiwDLZN5DANBgkqhkiG9w0BAQsFAAOCAQEAEh3S -cW+nQzgbRCbfDkj+qcEslAOWJc6pNf6npKHtfn78YehVUKOiKkMdqTcW4zuhGjYA -ifVkoyTgTHyqdxkNdgELIi7/7JDY0N73AgndCpA/F/OqqMHATVtUMzTZzk7EB+yx -L6KyGuXVH6WtNnJ9Zo+f87FgjCtVZvnWqZKEynqtBRv930UaMkPPXQ/YLsrjkMC0 -VX2cyUG6tblYNxCeT73SRTs07KeT9wXOoZaUNxBJo0zPUYk3D1gEaCVCPMpqIOUF -kHkEPCdBDeGE1/UT/rPeFcWI+fCpKDU7c41ojMQ4/HxxorecyzBHxCpuqKZFGzD5 -+SAdcodf60sCDUt8lA== +MIIDpDCCAoygAwIBAgIUEZuPOXLzWVN5tU4FphryrFQ8wmwwDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjAwNjE2WhcNMjIx +MjIxMjAwNjE2WjCBqDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx +FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM +EEx5ZnQgRW5naW5lZXJpbmcxGzAZBgNVBAMMElRlc3QgRnJvbnRlbmQgVGVhbTEl +MCMGCSqGSIb3DQEJARYWZnJvbnRlbmQtdGVhbUBseWZ0LmNvbTBZMBMGByqGSM49 +AgEGCCqGSM49AwEHA0IABAvqevTRPd4nDxxtsVswWlRPevzfVv+ToJwAEj1qT52C +wx0TcGGeucwy1938eFD+925CGFouN8VkZqczjEqAJpqjgcEwgb4wDAYDVR0TAQH/ +BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB +MEIGA1UdEQQ7MDmGH3NwaWZmZTovL2x5ZnQuY29tL2Zyb250ZW5kLXRlYW2CCGx5 +ZnQuY29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFCdt8wInCOX2LC7/ZJx66fgJ +GBHpMB8GA1UdIwQYMBaAFK0dgJsWn0rmM2+COvVdQax98En+MA0GCSqGSIb3DQEB +CwUAA4IBAQCGKGqIeh3I5g2vbUu+q8gHB/xQQlbSeUqiDBmxM7RS/B6SN+yQJ4d7 +arF5qG8bAvlymLvBRWiQUvVFd2HyuuXpfghFaCIpwpv8NVKuEhoU2BZMfngQ/O5U +LF503OODDQqAEdQFwq7r2y48DbTtGLVqc2dotPLK0nRzx2SMjISauorlh187A/vd +LWx6a0fUAlBIEdiUS9wZMOFfvFgycLMID2xNztPmtUiCEv/jQWumJG09DnFxTxU4 +2Kk5TonHNMySgtRYXF01FWSFT1liXCMsnUIrkCM0VucDXg2mlofzsxaCwroI1Jqk +Dkl2/b5AejoVG01z3O8BOOAH95YOB2jJ -----END CERTIFICATE----- diff --git a/test/config/integration/certs/client_ecdsacert_hash.h b/test/config/integration/certs/client_ecdsacert_hash.h index 787f4511b3b4..cff2e7ac101d 100644 --- a/test/config/integration/certs/client_ecdsacert_hash.h +++ b/test/config/integration/certs/client_ecdsacert_hash.h @@ -1,3 +1,3 @@ // NOLINT(namespace-envoy) -constexpr char TEST_CLIENT_ECDSA_CERT_HASH[] = "DC:B2:C0:82:AD:8C:C3:4E:06:2E:65:15:F9:F7:39:D0:4C:" - "8A:60:AF:1E:B6:01:18:C5:90:AE:AE:47:7D:B8:FC"; +constexpr char TEST_CLIENT_ECDSA_CERT_HASH[] = "0A:36:73:B2:1D:75:75:01:62:29:91:28:DA:A9:A0:EC:18:" + "4B:AB:BB:2E:40:89:05:9B:04:17:B8:1D:1A:22:12"; diff --git a/test/config/integration/certs/client_ecdsakey.pem b/test/config/integration/certs/client_ecdsakey.pem index e352e35a540f..449242bd54a9 100644 --- a/test/config/integration/certs/client_ecdsakey.pem +++ b/test/config/integration/certs/client_ecdsakey.pem @@ -2,7 +2,7 @@ BggqhkjOPQMBBw== -----END EC PARAMETERS----- -----BEGIN EC PRIVATE KEY----- -MHcCAQEEIOoeoqRYQ6raBXh0ejEFGvOvP8XNgbKnj7tDYDLFH7t1oAoGCCqGSM49 -AwEHoUQDQgAE/VD5VTe6dhhNMO2uxu7/gKmGCsKbCNXsWciyuDIhAXYhcZ0J4zz9 -An46avD70AmXbYUO/li/h4UYq6Qhz2lR5w== +MHcCAQEEIHAYUpXK4YXMHO5cV0s/qsbLLfnJoHgDYLidLWBYVoPFoAoGCCqGSM49 +AwEHoUQDQgAEC+p69NE93icPHG2xWzBaVE96/N9W/5OgnAASPWpPnYLDHRNwYZ65 +zDLX3fx4UP73bkIYWi43xWRmpzOMSoAmmg== -----END EC PRIVATE KEY----- diff --git a/test/config/integration/certs/clientcert.pem b/test/config/integration/certs/clientcert.pem index edca455abfba..55e0b3e5e444 100644 --- a/test/config/integration/certs/clientcert.pem +++ b/test/config/integration/certs/clientcert.pem @@ -1,26 +1,26 @@ -----BEGIN CERTIFICATE----- -MIIEZDCCA0ygAwIBAgIJAILStmLgUUcXMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow -gagxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T -YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu -ZWVyaW5nMRswGQYDVQQDDBJUZXN0IEZyb250ZW5kIFRlYW0xJTAjBgkqhkiG9w0B -CQEWFmZyb250ZW5kLXRlYW1AbHlmdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQCouLlGbMfpOV5Sh/zbUNo6GHzhpB1Q/UqxzkdmgdF4tzm3w83Q -qka2/Q4R4/Xi3gmbUlszfw2Ax8ouIbPlx5m/1/ytvUVOcyvksu+ae92WP62nukL3 -RLLt4ctvSiA0i9FeFrNmuM+R/cSdMf9tl20heL2/bgCmIlNr6i+KMsZQlWm3GRna -rfh8RWwyzqVDLLTvOO+h9jxHfKanN1BwIm0RYHRgxfyehel4av6t9xsylE4dtGvk -4DO7aO98IfNtn6rHyuIY2g8Wp4Mwbs9Z+uXSCc8/NTCOm9GSvG2hJSMIdqdnETLf -5eTiRUB3FF4el3nXNhOTFr0iAydL7bIYqkprAgMBAAGjgcEwgb4wDAYDVR0TAQH/ -BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB -MEIGA1UdEQQ7MDmGH3NwaWZmZTovL2x5ZnQuY29tL2Zyb250ZW5kLXRlYW2CCGx5 -ZnQuY29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFJD5l1K7mp/dUUNXvXPBWJ5l -oJOnMB8GA1UdIwQYMBaAFBQz1vaSbPuePL++7GTMqLAMtk3kMA0GCSqGSIb3DQEB -CwUAA4IBAQCJOUQB5d8ZCEeMrY0jLwefY8L0UluhPFWNlw1t2LyDjAa8qRNkWJ/2 -bky7IHBMxPQIdYBVPsQGOQ4bkg3S7Eqyc0WZYpLlKEQeUFPG752642GInzjgY3KG -f1hIHz1quIYARjF5GJ+buZpw3DgcGDnhYygFQDWqgyRnfz84M1ycEx06yHidupyp -eMHZHXcrSXPcGin7a6tBEppDFm5CcrJQ2hySDVkl9qnbgHr0+0JZg/Qekik4aWv5 -ACWk3wTxIPUv6mc8kbBMRMPkETzWt4m/qdLnUUhFKJdyACPlb6onJe1TGuYJvc2x -rNV3U8Yo8a1iskQtHqNfc+kqVd3MpgsB +MIIEbzCCA1egAwIBAgIUEZuPOXLzWVN5tU4FphryrFQ8wmswDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjAwNjE2WhcNMjIx +MjIxMjAwNjE2WjCBqDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx +FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM +EEx5ZnQgRW5naW5lZXJpbmcxGzAZBgNVBAMMElRlc3QgRnJvbnRlbmQgVGVhbTEl +MCMGCSqGSIb3DQEJARYWZnJvbnRlbmQtdGVhbUBseWZ0LmNvbTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAJz7N5NbR+E8gzebRmysVrdzDAfqbooRBXAv +yka/eNGLu6DXz1RyiyDwpdZx9YgSWDvHcQkQWff7PfwirLNU9PpjWo5qvIne80oY +TbQFwSbhYcQSAei6EE/9kI58hl5VNWYWu9/5A2aMi2Z4Cos9yHrJUu7Cy54aHl0H +gKnX0HZwy21n3a0EAC+2Rr1xrawFpyWazBRZmDipGcORI5W7MTDiX7XcQymy8ONt +NFs4zFylAxVPxmMgEEFeUxWBNTf3a/VAPy+GTxUHNNXgJWoUdIb6bxyp8VPCqWOE +zhrIDk8bPpCPqp2kIlZSYeQRsiwDPj6njZsXFvwp/mcvTt/IPOcCAwEAAaOBwTCB +vjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD +AgYIKwYBBQUHAwEwQgYDVR0RBDswOYYfc3BpZmZlOi8vbHlmdC5jb20vZnJvbnRl +bmQtdGVhbYIIbHlmdC5jb22CDHd3dy5seWZ0LmNvbTAdBgNVHQ4EFgQUMaRyVxmr +lNMWGUdI0H6H4xgN2vswHwYDVR0jBBgwFoAUrR2AmxafSuYzb4I69V1BrH3wSf4w +DQYJKoZIhvcNAQELBQADggEBALZAZk4vbZLAmGUa7KGBKCiuOTGHlYvfa2tm1Exj +eaB5rtwGHlBgNIxBEH5ACfVgWMlyIToGRA1mpfuQULsPkJ9WfrW+XgsXByPFkYCd +/872YBjVKQ5k0TEZoDKLxYxvuoMMFOauQWzD7ltQHSXSJ+h2cyAbo73Syd/ZDs8w +iNqEnHy9sz0l69BMY4s4exA5A4fFiQFYEP4Dav76cB9qrdMxcckfpwFIY3YWHU+8 +WQIrPbL/dkEPfQmfJZP2TCBvt6AUpLY33a20wCoYE4rScaEz4lj+CyCsaRcjK7BN +TyBgnIAJln8KiW22Dq5rhc3S/E71Y187wBjhj+QCcU1vV+A= -----END CERTIFICATE----- diff --git a/test/config/integration/certs/clientcert_hash.h b/test/config/integration/certs/clientcert_hash.h index cd77a55df7cf..d62cf013c66a 100644 --- a/test/config/integration/certs/clientcert_hash.h +++ b/test/config/integration/certs/clientcert_hash.h @@ -1,3 +1,3 @@ // NOLINT(namespace-envoy) -constexpr char TEST_CLIENT_CERT_HASH[] = "90:CA:A3:E0:B0:AD:8E:E6:4F:BC:11:6C:7B:E5:9D:35:11:2B:46:" - "71:5F:4D:5C:52:85:37:23:08:38:28:B4:D6"; +constexpr char TEST_CLIENT_CERT_HASH[] = "5F:DA:F6:7E:E7:0F:94:81:E8:A8:DE:06:79:3C:67:0B:8C:D9:99:" + "F8:32:43:FB:27:C3:6A:34:33:6F:DF:10:6C"; diff --git a/test/config/integration/certs/clientkey.pem b/test/config/integration/certs/clientkey.pem index e1b46d735ec6..10caf8b3126b 100644 --- a/test/config/integration/certs/clientkey.pem +++ b/test/config/integration/certs/clientkey.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/config/integration/certs/server_ecdsacert.pem b/test/config/integration/certs/server_ecdsacert.pem index d63b3852359f..a4ec65a92b3f 100644 --- a/test/config/integration/certs/server_ecdsacert.pem +++ b/test/config/integration/certs/server_ecdsacert.pem @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDljCCAn6gAwIBAgIJAILStmLgUUcWMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow -gaYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T -YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu -ZWVyaW5nMRowGAYDVQQDDBFUZXN0IEJhY2tlbmQgVGVhbTEkMCIGCSqGSIb3DQEJ -ARYVYmFja2VuZC10ZWFtQGx5ZnQuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD -QgAEgVE4DzGyifdO4yefn1bEhFfkTrUjfV3Lay9NQz6D1SosrCnk7KZtl6Nbc/U6 -KiGlN+9GpD0ulKEljgjn7TTtT6OBwDCBvTAMBgNVHRMBAf8EAjAAMAsGA1UdDwQE -AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwQQYDVR0RBDowOIYe -c3BpZmZlOi8vbHlmdC5jb20vYmFja2VuZC10ZWFtgghseWZ0LmNvbYIMd3d3Lmx5 -ZnQuY29tMB0GA1UdDgQWBBQDO72plAAjzF3GWFAC+8fyzUpl0zAfBgNVHSMEGDAW -gBQUM9b2kmz7njy/vuxkzKiwDLZN5DANBgkqhkiG9w0BAQsFAAOCAQEAppJXn2t3 -7qER7Dj4HjNq3GdASgiLsCgjus5Mbfje4rGbb73WJnsMVpOZtWwC4KyIxDHBzFmR -ntS3g4eJ3FxFkr5ls+RDzSAyIJBzh/Bwt1Yrkn3Yh3HxgsYy6Rd7z4+hHgaqnrza -ESdmWHoMGg7AJy17drIDmxAK7Os5qObWxytsrUL+lTIBJ3OS2IDiB2tT/WrRMSx9 -umYff6YsGLsOGtVgRsc640wKex7r468p1tkwj5r2PxvH9V9L3hp9QuH+W4gR6IYe -HhcCTllp+3iH0vmcXCZRP984nnwRBPP3tBuT+/zmUyDp0UPBHqF+jcHxMB/YA9An -SziyfTA1g4CzRA== +MIIDoTCCAomgAwIBAgIUEZuPOXLzWVN5tU4FphryrFQ8wmowDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjAwNjE2WhcNMjIx +MjIxMjAwNjE2WjCBpjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx +FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM +EEx5ZnQgRW5naW5lZXJpbmcxGjAYBgNVBAMMEVRlc3QgQmFja2VuZCBUZWFtMSQw +IgYJKoZIhvcNAQkBFhViYWNrZW5kLXRlYW1AbHlmdC5jb20wWTATBgcqhkjOPQIB +BggqhkjOPQMBBwNCAASe9xmGmBdu4qvYXI8ktkiRXX06XPfLu9ePuKSlDE5H60U0 +Qp7Fl5GwyMCH3n5SJ+O9eRHy0JdWjA5i8yjZCDpro4HAMIG9MAwGA1UdEwEB/wQC +MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBB +BgNVHREEOjA4hh5zcGlmZmU6Ly9seWZ0LmNvbS9iYWNrZW5kLXRlYW2CCGx5ZnQu +Y29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFImFgDHOslxmeTG1WURKizNggeS1 +MB8GA1UdIwQYMBaAFK0dgJsWn0rmM2+COvVdQax98En+MA0GCSqGSIb3DQEBCwUA +A4IBAQARNlpixQx5NpCHQwtWBjTecH1OJqJexLfxc8/UpARwzg3z7u31ul3AMWjK +kTXb6z2eqQRiqgtB9v10pmPw4a8XeR2J3/w3kqau21peXrK4KDDiJ3jhXGHmZyKm +8IEdCBjoLLYp5RlHYTyjtYJEWQsVxmgicWyXRF0JlswxSpld5/ZBLu+bXK8a2g9G +L2LGPxoeAdmJleY4JgeZjo9nnm+/M8EE7hJuNHszCa4GedwKot/fJ/sz7YytR91H +G94hHd7Vh/El1ePu7okmc/3b/UVcLD3wDe+0vVosRAffBVm5v4TEZ1PozE2lkKRR +Wo9akXIKcA/2y5pIhZZKR054tu4F -----END CERTIFICATE----- diff --git a/test/config/integration/certs/server_ecdsacert_hash.h b/test/config/integration/certs/server_ecdsacert_hash.h index 309feff18643..4034e2b20aa7 100644 --- a/test/config/integration/certs/server_ecdsacert_hash.h +++ b/test/config/integration/certs/server_ecdsacert_hash.h @@ -1,3 +1,3 @@ // NOLINT(namespace-envoy) -constexpr char TEST_SERVER_ECDSA_CERT_HASH[] = "95:9A:D0:18:52:40:D9:88:35:B9:52:96:C1:50:86:82:76:" - "FD:24:AD:48:F9:8F:0C:13:36:BA:2D:36:F2:4C:F3"; +constexpr char TEST_SERVER_ECDSA_CERT_HASH[] = "E5:7E:84:03:37:A2:C4:0A:0F:E2:63:C2:AC:5F:B2:3C:FB:" + "2C:E9:10:A0:41:E7:2B:20:95:F1:F4:82:53:0A:D2"; diff --git a/test/config/integration/certs/server_ecdsakey.pem b/test/config/integration/certs/server_ecdsakey.pem index a46830f1a653..7cfc7e15ce1b 100644 --- a/test/config/integration/certs/server_ecdsakey.pem +++ b/test/config/integration/certs/server_ecdsakey.pem @@ -2,7 +2,7 @@ BggqhkjOPQMBBw== -----END EC PARAMETERS----- -----BEGIN EC PRIVATE KEY----- -MHcCAQEEICqemTBghfUmDlTHDq5GCz5CV51QLvQEkUGOxhtOR6hboAoGCCqGSM49 -AwEHoUQDQgAEgVE4DzGyifdO4yefn1bEhFfkTrUjfV3Lay9NQz6D1SosrCnk7KZt -l6Nbc/U6KiGlN+9GpD0ulKEljgjn7TTtTw== +MHcCAQEEIER6AVINflh2lFyvK+3CMAmi4xrPJUo769cEBTAIJCRjoAoGCCqGSM49 +AwEHoUQDQgAEnvcZhpgXbuKr2FyPJLZIkV19Olz3y7vXj7ikpQxOR+tFNEKexZeR +sMjAh95+UifjvXkR8tCXVowOYvMo2Qg6aw== -----END EC PRIVATE KEY----- diff --git a/test/config/integration/certs/servercert.pem b/test/config/integration/certs/servercert.pem index f65b3b34ae7c..c59d1d50e08c 100644 --- a/test/config/integration/certs/servercert.pem +++ b/test/config/integration/certs/servercert.pem @@ -1,26 +1,26 @@ -----BEGIN CERTIFICATE----- -MIIEYTCCA0mgAwIBAgIJAILStmLgUUcVMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow -gaYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T -YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu -ZWVyaW5nMRowGAYDVQQDDBFUZXN0IEJhY2tlbmQgVGVhbTEkMCIGCSqGSIb3DQEJ -ARYVYmFja2VuZC10ZWFtQGx5ZnQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAuvPdQdmwZongPAgQho/Vipd3PZWrQ6BKxIb4l/RvqtVP321IUTLs -4vVwpXoYJ+12L+XOO3jCInszs53tHjFpTI1GE8/sasmgR6LRr2krwSoVRHPqUoc9 -tzkDG1SzKP2TRTi1MTI3FO+TnLFahntO9Zstxhv1Epz5GZ/xQLE0/LLoRYzcynL/ -iflk18iL1KM8i0Hy4cKjclOaUdnh2nh753iJfxCSb5wJfx4FH1qverYHHT6FopYR -V40Cg0yYXcYo8yNwrg+EBY8QAT2JOMDokXNKbZpmVKiBlh0QYMX6BBiW249v3sYl -3Ve+fZvCkle3W0xP0xJw8PdX0NRbvGOrBQIDAQABo4HAMIG9MAwGA1UdEwEB/wQC -MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBB -BgNVHREEOjA4hh5zcGlmZmU6Ly9seWZ0LmNvbS9iYWNrZW5kLXRlYW2CCGx5ZnQu -Y29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFLHmMm0DV9jCHJSWVRwyPYpBw62r -MB8GA1UdIwQYMBaAFBQz1vaSbPuePL++7GTMqLAMtk3kMA0GCSqGSIb3DQEBCwUA -A4IBAQAwx3/M2o00W8GlQ3OT4y/hQGb5K2aytxx8QeSmJaaZTJbvaHhe0x3/fLgq -uWrW3WEWFtwasilySjOrFOtB9UNmJmNOHSJD3Bslbv5htRaWnoFPCXdwZtVMdoTq -IHIQqLoos/xj3kVD5sJSYySrveMeKaeUILTkb5ZubSivye1X2yiJLR7AtuwuiMio -CdIOqhn6xJqYhT7z0IhdKpLNPk4w1tBZSKOXqzrXS4uoJgTC67hWslWWZ2VC6IvZ -FmKuuGZamCCj6F1QF2IjMVM8evl84hEnN0ajdkA/QWnil9kcWvBm15Ho+oTvvJ7s -M8MD3RDSq/90FSiME4vbyNEyTmj0 +MIIEbDCCA1SgAwIBAgIUEZuPOXLzWVN5tU4FphryrFQ8wmkwDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjAwNjE2WhcNMjIx +MjIxMjAwNjE2WjCBpjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx +FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM +EEx5ZnQgRW5naW5lZXJpbmcxGjAYBgNVBAMMEVRlc3QgQmFja2VuZCBUZWFtMSQw +IgYJKoZIhvcNAQkBFhViYWNrZW5kLXRlYW1AbHlmdC5jb20wggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQDfVG+M55HiwItgfY+RalvUADl1DMfjh6SXzfL9 +pdvFVVjdDXueafAOcQYOm2N9fpdH1TAGnt/sneY2DWjmY9XAMS9e3XIHjIDGNWrz +TtIUEh9taxLtaVl4o354lNBO512iQkmBQUOHwlSYdTp3nhtJYqxy3Q8m/MeNxgCa +7WIADRDDkUcgeDNRUv1vnjkBoO1leoZA99hrRtQHgYmdpbFJTsTeLQ3egil4Scy9 +8CMwmaCEoBc1q4nvA+E9dip8p/q3iT3jHJl3rrHrzdQV0oxs/sY3fpv1jydA/wzT +FxOsC9EW1/ostxyvvoihHaPLZCM2l99v2ByIOMx7qkS1TfoJAgMBAAGjgcAwgb0w +DAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG +CCsGAQUFBwMBMEEGA1UdEQQ6MDiGHnNwaWZmZTovL2x5ZnQuY29tL2JhY2tlbmQt +dGVhbYIIbHlmdC5jb22CDHd3dy5seWZ0LmNvbTAdBgNVHQ4EFgQUvg4vdJuWBCru +6phSWWpiQShS99AwHwYDVR0jBBgwFoAUrR2AmxafSuYzb4I69V1BrH3wSf4wDQYJ +KoZIhvcNAQELBQADggEBALJ172/bN8sW0nNtkafIn+71a5KA32X8wYJ4tOGftTIA +bSpSFHXjwyvzcK6zfwPDuzydS30fKhW9lqq9kroTm5Uq80PQ0kZHMNEAZp//BoV9 +727sezR5SRBB69VB7zSqeJ6zMutJGog3ELDg91pTMvTmDCTsNwehxHa2aUz5Hdei +SUAVhuZAKtX6qUonia+4doc7wCjMnlkLpvUQVM8laisQv/BaG6T8uyLc7Eyse4rF +Ke0e2Ef36kQDaWcSKv/pmxURW9OxXzsRK/pkJ9uOrNo/2NL3RwFS4ZyHCM38UiZ4 +6ZUixRm9CZCVNutl4W6FLPaWt3SUe6vJ33jUP2yayv8= -----END CERTIFICATE----- diff --git a/test/config/integration/certs/servercert_hash.h b/test/config/integration/certs/servercert_hash.h index 6e83ce970527..41bfcbbcf082 100644 --- a/test/config/integration/certs/servercert_hash.h +++ b/test/config/integration/certs/servercert_hash.h @@ -1,3 +1,3 @@ // NOLINT(namespace-envoy) -constexpr char TEST_SERVER_CERT_HASH[] = "D3:F5:97:8F:8F:7E:CA:63:C3:FF:61:89:95:D7:47:31:E3:BA:9B:" - "3C:44:10:A1:57:61:B7:9F:4D:65:90:F8:7F"; +constexpr char TEST_SERVER_CERT_HASH[] = "97:10:61:E6:BB:58:B9:83:71:34:8A:37:E6:F4:E4:F8:5F:E6:33:" + "F4:DE:E0:EB:D7:9F:46:E4:DB:8C:2D:5E:BC"; diff --git a/test/config/integration/certs/serverkey.pem b/test/config/integration/certs/serverkey.pem index 6870eed5bfc6..c5bad3676f0d 100644 --- a/test/config/integration/certs/serverkey.pem +++ b/test/config/integration/certs/serverkey.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/config/integration/certs/upstreamcacert.pem b/test/config/integration/certs/upstreamcacert.pem index c3d5692354bd..588cb52970ee 100644 --- a/test/config/integration/certs/upstreamcacert.pem +++ b/test/config/integration/certs/upstreamcacert.pem @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -MIID7zCCAtegAwIBAgIUQygBeIE4nv9JGaDKixnhwkK5viEwDQYJKoZIhvcNAQEL +MIID7zCCAtegAwIBAgIUNQgZSE10ZWfbur5YbR9pvZXOz50wDQYJKoZIhvcNAQEL BQAwfzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n -aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMTkwNzA4MjE0 -NTU2WhcNMjEwNzA3MjE0NTU2WjB/MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2Fs +aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMjAxMjIxMjAw +NjE2WhcNMjIxMjIxMjAwNjE2WjB/MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2Fs aWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZ MBcGA1UECwwQTHlmdCBFbmdpbmVlcmluZzEZMBcGA1UEAwwQVGVzdCBVcHN0cmVh -bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJ7AetbhOCUxB/A -yYt+4rxyMVUFX9izqbOU9nuUxsB/avGhYpVjj5cNaLPdGX+c7g65Vz0yGDSskDGD -ukcSFqRSZ2E4/S4gKSIMEslBr2OX+Dqh0XmoAwl4IrtZefCE3inivJdzm0JwI7Yr -k2qQqsTpJnsWkMSxXUQJYTJ56UFXTkKqF3jSReIQtFMV65T/2x2NLRJ8KuMS7Mbo -BTBATRsUfbJJWCnzcp2LrKV5sZ/HsJLK/F74jdcvfJQMW49Lq1TZaB5NYSVyFEf6 -tiT43JOcvVkRPBgHDtaiDhWF2WTmPSEB6cHaRwGgBFwjQ1SvZR6f6xexocn44GZE -oSqWJN8CAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw -HQYDVR0OBBYEFOLTMLryzNAcuxe3cKEhClkL7IduMB8GA1UdIwQYMBaAFOLTMLry -zNAcuxe3cKEhClkL7IduMA0GCSqGSIb3DQEBCwUAA4IBAQBT88sT8RsoAk6PnnVs -KWBoC75BnIZr8o1nxBK0zog6Ez4J32aVzEXPicgBg6hf6v77eqbbQ+O7Ayf+YQWj -l9w9IiXRW1x94tKBrX44O85qTr/xtkfpmQWGKq5fBpdJnZp7lSfGfaG9gasPUNpG -gfvF/vlYrrJoyvUOG6HQjZ7n7m6f8GEUymCtC68oJcLVL0xkvx/jcvGeJfI5U6yr -z9nc1W7FcOhrFEetOIH2BwlIN5To3vPbN4zEzt9VPUHZ3m2899hUiMZJaanEexp7 -TZJJ12rHSIJ4MKwQQ5fEmioeluM0uY7EIR72VEsudA8bkXSkbDGs6Q49K9OX+nRB -4P3c +bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0vYkiLnkTxFCyD +BJ7oTyXsltTDUbc+cUqhvBszS7V8o1h2fBRhh2aD2DFFZxzFlrqaLnFT5/UYydol +C+3mYnejIWcJcuuOKROY803tdLEVSlG4afha/7y/UC0KbAyx3/CBuOHBmgPAbIdU +YLV2azHNckhLYBYDY/FsAjYgTBrAMHRLTf/eL4E6Qh6dZxNL82Lf2o9toPlS99lZ +MBmffQvydhRfu8uwPz19/tmntmoX3XCu6tzgX9eDLyvYOFMPz7vgd40PWMahe7dR +WeK8atAKTI2VDV2e3EkDT3uW79IWngg1RuvzY1x6J6zyZllT2fHcl/gZJIyv/qQ/ +Wpm6Bh0CAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw +HQYDVR0OBBYEFLIfGPFD+Ad/pOX8BGf15b2vDDAGMB8GA1UdIwQYMBaAFLIfGPFD ++Ad/pOX8BGf15b2vDDAGMA0GCSqGSIb3DQEBCwUAA4IBAQCZ8dodFVmk711fEpjX ++cJdq9GcAxsX1B/qyC3bREczDrpgiGR6iVTFi6YkpWept05sb9/ANBrH5VAPuLfk +nunq/pMOxAGh+ebnpyxE2iJKuGu2heB/uj3GQBG/W2Yl3t4T0MTgifhjE2y7eT/a +LKpZtVlQSLBK2Xxn2W7jWFS1LnRqpLimljbSYFshxjHELqYjB+UAGH02NLuvp2GJ +46laWTWiUT2KwICJl1t8jP1BfGJHrszz5QQPxiiAiCjpd2JjD+vTPiDINwE6HwH/ +tFBkh6aQwPpo9jp5WL/rn11LnGlUCeJ3HTxXE8VqN3FSFXaCbiqfFfxeIz0TA7ha +EDO5 -----END CERTIFICATE----- diff --git a/test/config/integration/certs/upstreamcakey.pem b/test/config/integration/certs/upstreamcakey.pem index 2fe99b9c2c10..95be96d7d874 100644 --- a/test/config/integration/certs/upstreamcakey.pem +++ b/test/config/integration/certs/upstreamcakey.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/config/integration/certs/upstreamcert.pem b/test/config/integration/certs/upstreamcert.pem index 509397d6caa8..c385e441a56a 100644 --- a/test/config/integration/certs/upstreamcert.pem +++ b/test/config/integration/certs/upstreamcert.pem @@ -1,25 +1,25 @@ -----BEGIN CERTIFICATE----- -MIIEPjCCAyagAwIBAgIUS0ht/ypqxlVqt86GiCya6cw/jJwwDQYJKoZIhvcNAQEL +MIIEPjCCAyagAwIBAgIURwqnVTBMZbcg4eybF0oSa0Wl49QwDQYJKoZIhvcNAQEL BQAwfzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n -aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMTkwNzA4MjE0 -NTU3WhcNMjEwNzA3MjE0NTU3WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh +aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMjAxMjIxMjAw +NjE2WhcNMjIxMjIxMjAwNjE2WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh bGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQx GTAXBgNVBAsMEEx5ZnQgRW5naW5lZXJpbmcxHTAbBgNVBAMMFFRlc3QgVXBzdHJl -YW0gU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+evHY2ld -y4iKlGEHtenqIK26QeFpU9t2iqiRjUz0+lZ+92haR+I+x1nL41SO71i2SaHp8L2Q -5cWkOS0zuYivsZSz/l9dHinAS+N50QsERo01moWOMyxfqSEbnZHMQS4OI/mf1dja -Rykp7zhCXie2BlUtmiBMW+YnvLmBm1z6icwg7ZBJ8mt2ChpeH6qBggzwQQms9wvK -/mcHR5HYHalLQdjhou3wwa6MB9bbeEoDd8I0tueRgnrq55mVJrm3yg1TSgUwkWCB -J3VUrvdk3olgGwHv4njAB+uNfUn3od7MuipyHL8GJQJHOcus63M/Ax/UVxu0BiDy -LfWW4MVO/5OX5QIDAQABo4GsMIGpMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg +YW0gU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzshtqR4+ +6rq2gn1NV/j13QYCMDMTZLm4YTOlBJ8nV68W1U2RKZYhHhoEqyp9bn/ORFGUrjhx +vzLU7s8EPy/FZvUVBeATWV2xkbhY7yXklgf+BAFX9cFh+P5+ep8ZN6td4IgppL9K +6BUoM8e2HPmOea05CGUgLEkf2wQv/Le5/vTtKbZ5hwWIDwfB3JBzqw9JKKDj4tNa +f/iYebIOSLfMRKqQSuCg871AqGkxn2wjQF29Oxl+HPiswPpqxn01vpgRxOKyBTkB +Ebm5Ly81EM4W0IBbjXMcVGT/3A9+e8zR9MsAIjBAkZS9JPnKcuHVG3XiD9E190MU +snZm7Vtd1jJkkwIDAQABo4GsMIGpMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAtBgNVHREEJjAkggoqLmx5 -ZnQuY29thwQAAAAAhxAAAAAAAAAAAAAAAAAAAAAAMB0GA1UdDgQWBBR3BvXiz3zi -p+/5cojIhCEz3nn39jAfBgNVHSMEGDAWgBTi0zC68szQHLsXt3ChIQpZC+yHbjAN -BgkqhkiG9w0BAQsFAAOCAQEAEB9RWuGIcRhZMM2AqXyOr4FOG63yfVg4fi3/WIcu -p7iVPhtdByefx4FQxg7913rdJyeQrI+hab0uPl/CjylwMVwWtBqRx4oKo8im59/4 -N7MRYZKJ44/fBSIGoM0pibSpDzfd7y6Drusp1mqi3CXGPXsVFIDQ66d7yoFt+t7h -nB2A565e/C1eXaS80XTHeJzfS5dJ6ssjgyszTGM5PdN9C335pDGfQV0CqGNAMZqo -tbBI1B0NgQ2KJJ787Wi3pexxi3haliMNrSKEAkLVDZ6R0a1PgpN/hBth3Nf2Oj+O -+pBNtkiA0fnkoKS6ps9Vgj+NB08OLeYNpfGFHa9xxFdPoA== +ZnQuY29thwQAAAAAhxAAAAAAAAAAAAAAAAAAAAAAMB0GA1UdDgQWBBR6clmAiRP1 +GBq2T8bNZLb7Y8vxPjAfBgNVHSMEGDAWgBSyHxjxQ/gHf6Tl/ARn9eW9rwwwBjAN +BgkqhkiG9w0BAQsFAAOCAQEA1rOSAbBt7IvI2+Z2bUbiiQbZQdS+iTmEAFrAqTbx +1zZVE1zme47TRsNMx4Y1j5HDTCobmcy1DevLMDjmCMppA0iuIHwicUFg7PBV5fs8 +j9RwEWD8dmGMeNYRanfzxsJLLY1ZOR4aSnegI3T+/PuETu0mraqKezkPm+4M8ZAg +f7DRol2C27uqs8iyXzkfB8CStImtmbmJs05fVg5Z1zbi9hC0+bRWvbbDquIDTJha +M/9Sw3SYE7OV6RLDxLjKAz7BSiAQfA7mUQoA9K50PU5GQAwybRwsx1uTcmMhbkgy +rtETyKO7z0wQdID9YhQMvl/TZjWwcf1zFcyzrPkqCeIiRw== -----END CERTIFICATE----- diff --git a/test/config/integration/certs/upstreamcert_hash.h b/test/config/integration/certs/upstreamcert_hash.h index 4342078b9380..dd2d4a65c968 100644 --- a/test/config/integration/certs/upstreamcert_hash.h +++ b/test/config/integration/certs/upstreamcert_hash.h @@ -1,3 +1,3 @@ // NOLINT(namespace-envoy) -constexpr char TEST_UPSTREAM_CERT_HASH[] = "57:0E:EF:74:60:9C:8E:3D:AA:EA:3F:3E:02:69:89:40:E6:00:" - "AD:CA:86:69:73:BA:9E:0B:01:A2:E2:F3:75:7F"; +constexpr char TEST_UPSTREAM_CERT_HASH[] = "FF:60:3A:90:79:91:74:E3:1B:B0:D1:F7:5C:8B:84:8B:02:B2:" + "73:E8:2F:A2:19:1D:67:4A:3E:25:A0:BA:AF:14"; diff --git a/test/config/integration/certs/upstreamkey.pem b/test/config/integration/certs/upstreamkey.pem index 58945f2125ad..2d0c7f5d4aab 100644 --- a/test/config/integration/certs/upstreamkey.pem +++ b/test/config/integration/certs/upstreamkey.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/config/integration/certs/upstreamlocalhostcert.pem b/test/config/integration/certs/upstreamlocalhostcert.pem index 169d1c63e568..3dbacf3ece62 100644 --- a/test/config/integration/certs/upstreamlocalhostcert.pem +++ b/test/config/integration/certs/upstreamlocalhostcert.pem @@ -1,25 +1,25 @@ -----BEGIN CERTIFICATE----- -MIIEPTCCAyWgAwIBAgIUfoTig3pqtlASJyyhMZ2/x0Hg33UwDQYJKoZIhvcNAQEL +MIIEPTCCAyWgAwIBAgIURwqnVTBMZbcg4eybF0oSa0Wl49UwDQYJKoZIhvcNAQEL BQAwfzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n -aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMTkwNzEyMjI0 -MzQ1WhcNMjEwNzExMjI0MzQ1WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh +aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMjAxMjIxMjAw +NjE3WhcNMjIxMjIxMjAwNjE3WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh bGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQx GTAXBgNVBAsMEEx5ZnQgRW5naW5lZXJpbmcxHTAbBgNVBAMMFFRlc3QgVXBzdHJl -YW0gU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApWnYvUff -dh+TcLEYxQiw+ZUaGfBedmVmaxOHAbsWwBcMcwt3ITAjRPLPFEUt/DUxgmXO80zo -6YOc9uUIUGU0vqIFTQP3JfS9kMevrvQIkZbsO2rtNMYQ+F7HOmGUS3RiKdNNbHnX -NKKPsHe/UFiFCBwxVCT+NSGI3yHZFUSFlvH9BEO+a1lx4pp2R7UJTLdBVaGx42t1 -pTTR2E2S6E1tKXhtS/qN4+X+dDaUFfi7mz+QiNFsYKu5QgO9f8ewfdOPj9MImZvG -4l37/eNtNjzwTMx8Ph4moTSo4yH9ZBGHffPDm4ljPXpLUfiVyIvzR6ygG468ODcP -umQjprHM3TTxlQIDAQABo4GrMIGoMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg +YW0gU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1GgFLWQ3 +kbuVbabKIIkrg66KT5S6rSqKhkd2IHHoJSFhA0DzosBhAeegOc5keSj4qZQ4dkjp +Tan9BIVSI84ITE9BcoQ+wwA4F4Y5mA3EBAXxN4r2ybU3dHpVPMYRm4a5mv/UfQJ1 +U7rRcmKo3GsJO0AxxNMyJaxe2pBLA7qhdko0Z+nU6dJjt2sRi3ENrLmncVLx6o/Y +Zv/W7hwIzwVtTerWH2L63a4gIms7/zDlyoToxWWa7GVgNN+7LQT15OjkVULJl3It +jpdSrqIgTyAOdIVcamoHqlXqlB5SFsDlkFRlMVia8Rw4ehvxUmz7kh3WG5Dz+7TU +tgOO+CFhcgEyoQIDAQABo4GrMIGoMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAsBgNVHREEJTAjgglsb2Nh -bGhvc3SHBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAEwHQYDVR0OBBYEFFhoq2tgE+IN -uLyrUa1YpgsOpkwTMB8GA1UdIwQYMBaAFOLTMLryzNAcuxe3cKEhClkL7IduMA0G -CSqGSIb3DQEBCwUAA4IBAQB6jYcrAtO+8rLWdBp2W2tj9lgTHE8+W9BzMONrFwVo -PNMPHKPl2XfqKbv64sW3Z9sIA7ThSUu0nAe8i3ddaL4xQvPnaOwTdSnhykyMg2Hp -dDVAT8nCQb7Q87cuiFKE7o87XaQeOS3hgKeQ4uKexA48MkKwNYTVRMb7iC64yZcg -DY5H0nxRISs6pIAD9SPvPOQv+KZ35/LDJy59Kvso1zPoM9e+CJcdHU3hKM3RBK5J -FOjDL8qFair7vyjO9DUPDgoAZJntCQYGC0ToYxTe8cQVJD+sW5gqqIBLRchMr3gL -ni7rAL+oUyufHIEu3upRId+FdVF/hQMCLF2xk54/KX0V +bGhvc3SHBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAEwHQYDVR0OBBYEFPlTqmjkHIoF +VQ2D4N2d4PYWeAgfMB8GA1UdIwQYMBaAFLIfGPFD+Ad/pOX8BGf15b2vDDAGMA0G +CSqGSIb3DQEBCwUAA4IBAQDZ1VwnaRmg4pUXxrDMqg82WHKJxTVb0qB25q1gJQ2o +fF7LtieeQjyBfJ3B1OEP3jG6GpBxN/sdfRR/6Xqb0J0oMH+KGTMAJZTONqz3NY71 +OSgZQl7n6022LZjRu+qToPfTynOgz576gnCXzh7nZCyh7YwwNx309/vlcszqQ+gu +upnXxZs2vLNBsgbicsHaTqSzZJUhQ7j9IxbZBOnbj+uuWgNpMQWBaQZjFhHbkfVS +68xWwLe6MKZ3T7j8SSHK4SSh+MWC5WH6gfZ7nmkUirthvCDAq0o2wHPBjY7HaQ8A +ol0zgHrBVNoiuhDsj2Rk9BpXNkQujzSgp1y8ymc0gyiZ -----END CERTIFICATE----- diff --git a/test/config/integration/certs/upstreamlocalhostcert_hash.h b/test/config/integration/certs/upstreamlocalhostcert_hash.h index 9f81e65fcd83..a67d84c0a959 100644 --- a/test/config/integration/certs/upstreamlocalhostcert_hash.h +++ b/test/config/integration/certs/upstreamlocalhostcert_hash.h @@ -1,4 +1,4 @@ // NOLINT(namespace-envoy) constexpr char TEST_UPSTREAMLOCALHOST_CERT_HASH[] = - "44:A1:C4:AD:71:B5:AE:A0:A2:24:63:DA:C8:FF:0C:FC:26:6E:4B:D7:08:DE:64:60:34:A0:72:42:6E:18:BA:" - "87"; + "50:BF:9C:B5:09:4D:E9:8E:83:31:06:52:48:D2:F7:08:42:27:D2:74:7D:A8:A7:E4:4F:F2:A7:1C:F3:44:1C:" + "AF"; diff --git a/test/config/integration/certs/upstreamlocalhostkey.pem b/test/config/integration/certs/upstreamlocalhostkey.pem index 5331d810952c..91eba16b5285 100644 --- a/test/config/integration/certs/upstreamlocalhostkey.pem +++ b/test/config/integration/certs/upstreamlocalhostkey.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/filters/http/squash/squash_filter_test.cc b/test/extensions/filters/http/squash/squash_filter_test.cc index d2cb53bf52b6..03c4c4b537ab 100644 --- a/test/extensions/filters/http/squash/squash_filter_test.cc +++ b/test/extensions/filters/http/squash/squash_filter_test.cc @@ -412,6 +412,19 @@ TEST_F(SquashFilterTest, InvalidJsonForGetAttachment) { completeRequest("200", "This is not a JSON object"); } +TEST_F(SquashFilterTest, InvalidResponseWithNoBody) { + doDownstreamRequest(); + // Expect the get attachment request + expectAsyncClientSend(); + completeCreateRequest(); + + auto retry_timer = new NiceMock(&filter_callbacks_.dispatcher_); + EXPECT_CALL(*retry_timer, enableTimer(config_->attachmentPollPeriod(), _)); + Http::ResponseMessagePtr msg(new Http::ResponseMessageImpl(Http::ResponseHeaderMapPtr{ + new Http::TestResponseHeaderMapImpl{{":status", "200"}, {"content-length", "0"}}})); + popPendingCallback()->onSuccess(request_, std::move(msg)); +} + TEST_F(SquashFilterTest, DestroyedInFlight) { doDownstreamRequest(); diff --git a/test/extensions/quic_listeners/quiche/quic_io_handle_wrapper_test.cc b/test/extensions/quic_listeners/quiche/quic_io_handle_wrapper_test.cc index 4357d75edeae..3a45d92fa24f 100644 --- a/test/extensions/quic_listeners/quiche/quic_io_handle_wrapper_test.cc +++ b/test/extensions/quic_listeners/quiche/quic_io_handle_wrapper_test.cc @@ -78,18 +78,19 @@ TEST_F(QuicIoHandleWrapperTest, DelegateIoHandleCalls) { addr = wrapper_->peerAddress(); Network::IoHandle::RecvMsgOutput output(1, nullptr); - EXPECT_CALL(os_sys_calls_, recvmsg(fd, _, 0)).WillOnce(Invoke([](os_fd_t, msghdr* msg, int) { - sockaddr_storage ss; - auto ipv6_addr = reinterpret_cast(&ss); - memset(ipv6_addr, 0, sizeof(sockaddr_in6)); - ipv6_addr->sin6_family = AF_INET6; - ipv6_addr->sin6_addr = in6addr_loopback; - ipv6_addr->sin6_port = htons(54321); - *reinterpret_cast(msg->msg_name) = *ipv6_addr; - msg->msg_namelen = sizeof(sockaddr_in6); - msg->msg_controllen = 0; - return Api::SysCallSizeResult{5u, 0}; - })); + EXPECT_CALL(os_sys_calls_, recvmsg(fd, _, MSG_TRUNC)) + .WillOnce(Invoke([](os_fd_t, msghdr* msg, int) { + sockaddr_storage ss; + auto ipv6_addr = reinterpret_cast(&ss); + memset(ipv6_addr, 0, sizeof(sockaddr_in6)); + ipv6_addr->sin6_family = AF_INET6; + ipv6_addr->sin6_addr = in6addr_loopback; + ipv6_addr->sin6_port = htons(54321); + *reinterpret_cast(msg->msg_name) = *ipv6_addr; + msg->msg_namelen = sizeof(sockaddr_in6); + msg->msg_controllen = 0; + return Api::SysCallSizeResult{5u, 0}; + })); wrapper_->recvmsg(&slice, 1, /*self_port=*/12345, output); size_t num_packet_per_call = 1u; @@ -98,7 +99,7 @@ TEST_F(QuicIoHandleWrapperTest, DelegateIoHandleCalls) { absl::FixedArray({Buffer::RawSlice{data, 5}})); EXPECT_CALL(os_sys_calls_, recvmmsg(fd, _, num_packet_per_call, _, nullptr)) .WillOnce(Invoke([](os_fd_t, struct mmsghdr*, unsigned int, int, struct timespec*) { - return Api::SysCallIntResult{1u, 0}; + return Api::SysCallIntResult{-1, SOCKET_ERROR_AGAIN}; })); wrapper_->recvmmsg(slices, /*self_port=*/12345, output2); diff --git a/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc b/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc index 5043808dd78b..48394f40f955 100644 --- a/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc +++ b/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc @@ -184,6 +184,47 @@ TEST_F(DatadogDriverTest, FlushSpansTimer) { EXPECT_EQ(0U, stats_.counter("tracing.datadog.reports_failed").value()); } +TEST_F(DatadogDriverTest, NoBody) { + setupValidDriver(); + + Http::MockAsyncClientRequest request(&cm_.async_client_); + Http::AsyncClient::Callbacks* callback; + const absl::optional timeout(std::chrono::seconds(1)); + EXPECT_CALL(cm_.async_client_, + send_(_, _, Http::AsyncClient::RequestOptions().setTimeout(timeout))) + .WillOnce( + Invoke([&](Http::RequestMessagePtr& message, Http::AsyncClient::Callbacks& callbacks, + const Http::AsyncClient::RequestOptions&) -> Http::AsyncClient::Request* { + callback = &callbacks; + + EXPECT_EQ("fake_cluster", message->headers().getHostValue()); + EXPECT_EQ("application/msgpack", message->headers().getContentTypeValue()); + + return &request; + })); + + Tracing::SpanPtr span = driver_->startSpan(config_, request_headers_, operation_name_, + start_time_, {Tracing::Reason::Sampling, true}); + span->finishSpan(); + + // Timer should be re-enabled. + EXPECT_CALL(*timer_, enableTimer(std::chrono::milliseconds(900), _)); + + timer_->invokeCallback(); + + EXPECT_EQ(1U, stats_.counter("tracing.datadog.timer_flushed").value()); + EXPECT_EQ(1U, stats_.counter("tracing.datadog.traces_sent").value()); + + Http::ResponseMessagePtr msg(new Http::ResponseMessageImpl(Http::ResponseHeaderMapPtr{ + new Http::TestResponseHeaderMapImpl{{":status", "200"}, {"content-length", "0"}}})); + callback->onSuccess(request, std::move(msg)); + + EXPECT_EQ(0U, stats_.counter("tracing.datadog.reports_skipped_no_cluster").value()); + EXPECT_EQ(1U, stats_.counter("tracing.datadog.reports_sent").value()); + EXPECT_EQ(0U, stats_.counter("tracing.datadog.reports_dropped").value()); + EXPECT_EQ(0U, stats_.counter("tracing.datadog.reports_failed").value()); +} + TEST_F(DatadogDriverTest, SkipReportIfCollectorClusterHasBeenRemoved) { Upstream::ClusterUpdateCallbacks* cluster_update_callbacks; EXPECT_CALL(cm_, addThreadLocalClusterUpdateCallbacks_(_)) diff --git a/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc b/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc index 9994f8ca314b..66cf82b905d2 100644 --- a/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc +++ b/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc @@ -19,6 +19,7 @@ #include "extensions/transport_sockets/tls/context_config_impl.h" #include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "test/integration/autonomous_upstream.h" #include "test/integration/integration.h" #include "test/integration/utility.h" #include "test/test_common/network_utility.h" @@ -177,6 +178,103 @@ TEST_P(SslIntegrationTest, AdminCertEndpoint) { EXPECT_EQ("200", response->headers().getStatusValue()); } +class RawWriteSslIntegrationTest : public SslIntegrationTest { +protected: + std::unique_ptr + testFragmentedRequestWithBufferLimit(std::list request_chunks, + uint32_t buffer_limit) { + autonomous_upstream_ = true; + config_helper_.setBufferLimits(buffer_limit, buffer_limit); + initialize(); + + // write_request_cb will write each of the items in request_chunks as a separate SSL_write. + auto write_request_cb = [&request_chunks](Network::ClientConnection& client) { + if (!request_chunks.empty()) { + Buffer::OwnedImpl buffer(request_chunks.front()); + client.write(buffer, false); + request_chunks.pop_front(); + } + }; + + auto client_transport_socket_factory_ptr = + createClientSslTransportSocketFactory({}, *context_manager_, *api_); + std::string response; + auto connection = createConnectionDriver( + lookupPort("http"), write_request_cb, + [&](Network::ClientConnection&, const Buffer::Instance& data) -> void { + response.append(data.toString()); + }, + client_transport_socket_factory_ptr->createTransportSocket({})); + + // Drive the connection until we get a response. + while (response.empty()) { + connection->run(Event::Dispatcher::RunType::NonBlock); + } + EXPECT_THAT(response, testing::HasSubstr("HTTP/1.1 200 OK\r\n")); + + connection->close(); + return reinterpret_cast(fake_upstreams_.front().get()) + ->lastRequestHeaders(); + } +}; + +INSTANTIATE_TEST_SUITE_P(IpVersions, RawWriteSslIntegrationTest, + testing::ValuesIn(TestEnvironment::getIpVersionsForTest()), + TestUtility::ipTestParamsToString); + +// Regression test for https://github.com/envoyproxy/envoy/issues/12304 +TEST_P(RawWriteSslIntegrationTest, HighWatermarkReadResumptionProcessingHeaders) { + // The raw writer will perform a separate SSL_write for each of the chunks below. Chunk sizes were + // picked such that the connection's high watermark will trigger while processing the last SSL + // record containing the request headers. Verify that read resumption works correctly after + // hitting the receive buffer high watermark. + std::list request_chunks = { + "GET / HTTP/1.1\r\nHost: host\r\n", + "key1:" + std::string(14000, 'a') + "\r\n", + "key2:" + std::string(16000, 'b') + "\r\n\r\n", + }; + + std::unique_ptr upstream_headers = + testFragmentedRequestWithBufferLimit(request_chunks, 15 * 1024); + ASSERT_TRUE(upstream_headers != nullptr); + EXPECT_EQ(upstream_headers->Host()->value(), "host"); + EXPECT_EQ(std::string(14000, 'a'), + upstream_headers->get(Envoy::Http::LowerCaseString("key1"))->value().getStringView()); + EXPECT_EQ(std::string(16000, 'b'), + upstream_headers->get(Envoy::Http::LowerCaseString("key2"))->value().getStringView()); +} + +// Regression test for https://github.com/envoyproxy/envoy/issues/12304 +TEST_P(RawWriteSslIntegrationTest, HighWatermarkReadResumptionProcesingBody) { + // The raw writer will perform a separate SSL_write for each of the chunks below. Chunk sizes were + // picked such that the connection's high watermark will trigger while processing the last SSL + // record containing the POST body. Verify that read resumption works correctly after hitting the + // receive buffer high watermark. + std::list request_chunks = { + "POST / HTTP/1.1\r\nHost: host\r\ncontent-length: 30000\r\n\r\n", + std::string(14000, 'a'), + std::string(16000, 'a'), + }; + + std::unique_ptr upstream_headers = + testFragmentedRequestWithBufferLimit(request_chunks, 15 * 1024); + ASSERT_TRUE(upstream_headers != nullptr); +} + +// Regression test for https://github.com/envoyproxy/envoy/issues/12304 +TEST_P(RawWriteSslIntegrationTest, HighWatermarkReadResumptionProcesingLargerBody) { + std::list request_chunks = { + "POST / HTTP/1.1\r\nHost: host\r\ncontent-length: 150000\r\n\r\n", + }; + for (int i = 0; i < 10; ++i) { + request_chunks.push_back(std::string(15000, 'a')); + } + + std::unique_ptr upstream_headers = + testFragmentedRequestWithBufferLimit(request_chunks, 16 * 1024); + ASSERT_TRUE(upstream_headers != nullptr); +} + // Validate certificate selection across different certificate types and client TLS versions. class SslCertficateIntegrationTest : public testing::TestWithParam< diff --git a/test/extensions/transport_sockets/tls/integration/ssl_integration_test.h b/test/extensions/transport_sockets/tls/integration/ssl_integration_test.h index 133e73bd433e..5af886e851bf 100644 --- a/test/extensions/transport_sockets/tls/integration/ssl_integration_test.h +++ b/test/extensions/transport_sockets/tls/integration/ssl_integration_test.h @@ -36,8 +36,6 @@ class SslIntegrationTestBase : public HttpIntegrationTest { // Set this true to debug SSL handshake issues with openssl s_client. The // verbose trace will be in the logs, openssl must be installed separately. bool debug_with_s_client_{false}; - -private: std::unique_ptr context_manager_; }; diff --git a/test/extensions/transport_sockets/tls/ssl_socket_test.cc b/test/extensions/transport_sockets/tls/ssl_socket_test.cc index 764f3af7cc98..2c4d191f0784 100644 --- a/test/extensions/transport_sockets/tls/ssl_socket_test.cc +++ b/test/extensions/transport_sockets/tls/ssl_socket_test.cc @@ -2462,6 +2462,182 @@ TEST_P(SslSocketTest, HalfClose) { dispatcher_->run(Event::Dispatcher::RunType::Block); } +TEST_P(SslSocketTest, ShutdownWithCloseNotify) { + const std::string server_ctx_yaml = R"EOF( + common_tls_context: + tls_certificates: + certificate_chain: + filename: "{{ test_tmpdir }}/unittestcert.pem" + private_key: + filename: "{{ test_tmpdir }}/unittestkey.pem" + validation_context: + trusted_ca: + filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/ca_certificates.pem" +)EOF"; + + envoy::extensions::transport_sockets::tls::v3::DownstreamTlsContext server_tls_context; + TestUtility::loadFromYaml(TestEnvironment::substitute(server_ctx_yaml), server_tls_context); + auto server_cfg = std::make_unique(server_tls_context, factory_context_); + ContextManagerImpl manager(time_system_); + Stats::TestUtil::TestStore server_stats_store; + ServerSslSocketFactory server_ssl_socket_factory(std::move(server_cfg), manager, + server_stats_store, std::vector{}); + + auto socket = std::make_shared( + Network::Test::getCanonicalLoopbackAddress(GetParam()), nullptr, true); + Network::MockListenerCallbacks listener_callbacks; + Network::MockConnectionHandler connection_handler; + Network::ListenerPtr listener = dispatcher_->createListener(socket, listener_callbacks, true); + std::shared_ptr server_read_filter(new Network::MockReadFilter()); + std::shared_ptr client_read_filter(new Network::MockReadFilter()); + + const std::string client_ctx_yaml = R"EOF( + common_tls_context: + )EOF"; + + envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext tls_context; + TestUtility::loadFromYaml(TestEnvironment::substitute(client_ctx_yaml), tls_context); + auto client_cfg = std::make_unique(tls_context, factory_context_); + Stats::TestUtil::TestStore client_stats_store; + ClientSslSocketFactory client_ssl_socket_factory(std::move(client_cfg), manager, + client_stats_store); + Network::ClientConnectionPtr client_connection = dispatcher_->createClientConnection( + socket->localAddress(), Network::Address::InstanceConstSharedPtr(), + client_ssl_socket_factory.createTransportSocket(nullptr), nullptr); + Network::MockConnectionCallbacks client_connection_callbacks; + client_connection->enableHalfClose(true); + client_connection->addReadFilter(client_read_filter); + client_connection->addConnectionCallbacks(client_connection_callbacks); + client_connection->connect(); + + Network::ConnectionPtr server_connection; + Network::MockConnectionCallbacks server_connection_callbacks; + EXPECT_CALL(listener_callbacks, onAccept_(_)) + .WillOnce(Invoke([&](Network::ConnectionSocketPtr& socket) -> void { + server_connection = dispatcher_->createServerConnection( + std::move(socket), server_ssl_socket_factory.createTransportSocket(nullptr), + stream_info_); + server_connection->enableHalfClose(true); + server_connection->addReadFilter(server_read_filter); + server_connection->addConnectionCallbacks(server_connection_callbacks); + })); + EXPECT_CALL(*server_read_filter, onNewConnection()); + EXPECT_CALL(server_connection_callbacks, onEvent(Network::ConnectionEvent::Connected)) + .WillOnce(Invoke([&](Network::ConnectionEvent) -> void { + Buffer::OwnedImpl data("hello"); + server_connection->write(data, true); + EXPECT_EQ(data.length(), 0); + })); + + EXPECT_CALL(*client_read_filter, onNewConnection()) + .WillOnce(Return(Network::FilterStatus::Continue)); + EXPECT_CALL(client_connection_callbacks, onEvent(Network::ConnectionEvent::Connected)); + EXPECT_CALL(*client_read_filter, onData(BufferStringEqual("hello"), true)) + .WillOnce(Invoke([&](Buffer::Instance& read_buffer, bool) -> Network::FilterStatus { + read_buffer.drain(read_buffer.length()); + client_connection->close(Network::ConnectionCloseType::NoFlush); + return Network::FilterStatus::StopIteration; + })); + EXPECT_CALL(*server_read_filter, onData(_, true)); + + EXPECT_CALL(client_connection_callbacks, onEvent(Network::ConnectionEvent::LocalClose)); + EXPECT_CALL(server_connection_callbacks, onEvent(Network::ConnectionEvent::RemoteClose)) + .WillOnce(Invoke([&](Network::ConnectionEvent) -> void { + server_connection->close(Network::ConnectionCloseType::NoFlush); + dispatcher_->exit(); + })); + + dispatcher_->run(Event::Dispatcher::RunType::Block); +} + +TEST_P(SslSocketTest, ShutdownWithoutCloseNotify) { + const std::string server_ctx_yaml = R"EOF( + common_tls_context: + tls_certificates: + certificate_chain: + filename: "{{ test_tmpdir }}/unittestcert.pem" + private_key: + filename: "{{ test_tmpdir }}/unittestkey.pem" + validation_context: + trusted_ca: + filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/ca_certificates.pem" +)EOF"; + + envoy::extensions::transport_sockets::tls::v3::DownstreamTlsContext server_tls_context; + TestUtility::loadFromYaml(TestEnvironment::substitute(server_ctx_yaml), server_tls_context); + auto server_cfg = std::make_unique(server_tls_context, factory_context_); + ContextManagerImpl manager(time_system_); + Stats::TestUtil::TestStore server_stats_store; + ServerSslSocketFactory server_ssl_socket_factory(std::move(server_cfg), manager, + server_stats_store, std::vector{}); + + auto socket = std::make_shared( + Network::Test::getCanonicalLoopbackAddress(GetParam()), nullptr, true); + Network::MockListenerCallbacks listener_callbacks; + Network::MockConnectionHandler connection_handler; + Network::ListenerPtr listener = dispatcher_->createListener(socket, listener_callbacks, true); + std::shared_ptr server_read_filter(new Network::MockReadFilter()); + std::shared_ptr client_read_filter(new Network::MockReadFilter()); + + const std::string client_ctx_yaml = R"EOF( + common_tls_context: + )EOF"; + + envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext tls_context; + TestUtility::loadFromYaml(TestEnvironment::substitute(client_ctx_yaml), tls_context); + auto client_cfg = std::make_unique(tls_context, factory_context_); + Stats::TestUtil::TestStore client_stats_store; + ClientSslSocketFactory client_ssl_socket_factory(std::move(client_cfg), manager, + client_stats_store); + Network::ClientConnectionPtr client_connection = dispatcher_->createClientConnection( + socket->localAddress(), Network::Address::InstanceConstSharedPtr(), + client_ssl_socket_factory.createTransportSocket(nullptr), nullptr); + Network::MockConnectionCallbacks client_connection_callbacks; + client_connection->enableHalfClose(true); + client_connection->addReadFilter(client_read_filter); + client_connection->addConnectionCallbacks(client_connection_callbacks); + client_connection->connect(); + + Network::ConnectionPtr server_connection; + Network::MockConnectionCallbacks server_connection_callbacks; + EXPECT_CALL(listener_callbacks, onAccept_(_)) + .WillOnce(Invoke([&](Network::ConnectionSocketPtr& socket) -> void { + server_connection = dispatcher_->createServerConnection( + std::move(socket), server_ssl_socket_factory.createTransportSocket(nullptr), + stream_info_); + server_connection->enableHalfClose(true); + server_connection->addReadFilter(server_read_filter); + server_connection->addConnectionCallbacks(server_connection_callbacks); + })); + EXPECT_CALL(server_connection_callbacks, onEvent(Network::ConnectionEvent::Connected)) + .WillOnce(Invoke([&](Network::ConnectionEvent) -> void { + Buffer::OwnedImpl data("hello"); + server_connection->write(data, false); + EXPECT_EQ(data.length(), 0); + // Close without sending close_notify alert. + const SslSocketInfo* ssl_socket = + dynamic_cast(client_connection->ssl().get()); + SSL_set_quiet_shutdown(ssl_socket->ssl(), 1); + server_connection->close(Network::ConnectionCloseType::NoFlush); + })); + + EXPECT_CALL(*client_read_filter, onNewConnection()) + .WillOnce(Return(Network::FilterStatus::Continue)); + EXPECT_CALL(client_connection_callbacks, onEvent(Network::ConnectionEvent::Connected)); + EXPECT_CALL(*client_read_filter, onData(BufferStringEqual("hello"), true)) + .WillOnce(Invoke([&](Buffer::Instance& read_buffer, bool) -> Network::FilterStatus { + read_buffer.drain(read_buffer.length()); + client_connection->close(Network::ConnectionCloseType::NoFlush); + return Network::FilterStatus::StopIteration; + })); + + EXPECT_CALL(server_connection_callbacks, onEvent(Network::ConnectionEvent::LocalClose)); + EXPECT_CALL(client_connection_callbacks, onEvent(Network::ConnectionEvent::LocalClose)) + .WillOnce(Invoke([&](Network::ConnectionEvent) -> void { dispatcher_->exit(); })); + + dispatcher_->run(Event::Dispatcher::RunType::Block); +} + TEST_P(SslSocketTest, ClientAuthMultipleCAs) { const std::string server_ctx_yaml = R"EOF( common_tls_context: diff --git a/test/extensions/transport_sockets/tls/test_data/ca_cert.crl b/test/extensions/transport_sockets/tls/test_data/ca_cert.crl index 45a4c85a7b54..390ee0094b12 100644 --- a/test/extensions/transport_sockets/tls/test_data/ca_cert.crl +++ b/test/extensions/transport_sockets/tls/test_data/ca_cert.crl @@ -1,13 +1,13 @@ -----BEGIN X509 CRL----- -MIIB7TCB1gIBATANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJVUzETMBEGA1UE +MIIB+DCB4QIBATANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJVUzETMBEGA1UE CAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwE THlmdDEZMBcGA1UECwwQTHlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBD -QRcNMTgxMjE4MDE1MDM3WhcNMjgxMjE1MDE1MDM3WjAcMBoCCQC4tezImPISShcN -MTgxMjE4MDE1MDM3WqAOMAwwCgYDVR0UBAMCAQAwDQYJKoZIhvcNAQELBQADggEB -ADyOntMRaZ9+nnGrWEd0t6+WhmSSuu8Mx4Ho/9tqFXEf8zVP90Y9QXlWhnJoKThy -sOFeRPc8fZH4nh5grY6afwaOA5AJjVvfizCDBNyj6tcniyWbViG+qAC7+JEdKINU -8/ATBFKTKt9hU84+NyAt9CB7X8Nzv6dC65XF/t9LZHEo3cYf7ZMP0BZoMQNOTGlD -2vrIBr4xcJNaE7G9cDyM7YVaNFuJfSf5QLA0sz5IMp/W4WhKiftnLOpREsbpz7pt -zMlMdBzY2aAu2mixPOcOtqm7Ty6YGhj/nx11qeeB1Alf1oNUI8tNq5ssCVDr0TTn -z49wwXND+/QqT3RwiUEaXnE= +QRcNMjAxMjIxMjI1NjA4WhcNMzAxMjE5MjI1NjA4WjAnMCUCFDnD+z9jwEr5LjiW ++IW3hoJXneI2Fw0yMDEyMjEyMjU2MDhaoA4wDDAKBgNVHRQEAwIBADANBgkqhkiG +9w0BAQsFAAOCAQEAa8cKxVpUzNkG3wz6hInm7ZDmthErLTRYW1z8FEaFtduF4PZw +KpLEj07oVkhEn3w3X9S+y+UlpXMd5EV41w1t2PH+D3T+E5k2S0ty5gFUZ5pjIarA +AaMrmopTpULc5opp9dxPMycu9ugEWpv+TmOzHEPMS+RyGtlLqfpE9MNhttxT/sKZ +/qb1fN83SD8ju7bMGB7Qkzw//6AiEwf3S8Ti0keGQfq06HuWXzSsNGNDDeQTiLXB +rdCvv54GjS1q1uACbta63nP56PEhJiCnHHXTGw+vB6rTpxPKY/LbaRPyHjmFchQ5 +Za4rNp+RqkXYlQ912Du6LXS6nuUXICCfIX5Riw== -----END X509 CRL----- diff --git a/test/extensions/transport_sockets/tls/test_data/ca_cert.pem b/test/extensions/transport_sockets/tls/test_data/ca_cert.pem index addaf9d49477..3f1d5765ffe6 100644 --- a/test/extensions/transport_sockets/tls/test_data/ca_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/ca_cert.pem @@ -1,23 +1,23 @@ -----BEGIN CERTIFICATE----- -MIID0jCCArqgAwIBAgIJANagOJjOojEuMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzM1oXDTIwMTIxNzAxNTAzM1ow -djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQC+qck5ri2uMuga33i+2ourLrqLQFdP5YUMb4FqM4RVLkDAB0VOApvY -WTPD+T8bqZTAQXUs6aMczhQQrGs+cgdzB5CznLq72uNphZ0RTHhNHk1K1QoHqB13 -AhrqcBgznAGClGrDYtbUTi1LNaSJEKBDqo/morg44xTolsgsP+R0OXAS2AoquRUv -b5q/rutnVGxLRoI1O6SLwEJIXEbM5ksj2YtzfN5ngGOaOWsqJsXnYfO1q1CHuQse -z7VJTZEHpZug0QN0kqH4bf7NbPRZJv0HgHGs7xXCpwVfuj3mfawyXmd3Tarrm7W0 -VFygMzAk5cI5cBQIaZYNC4YtDasVisCNAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB -Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSLgpmApTtprdcKFiTUZxUkLNRh -ZTAfBgNVHSMEGDAWgBSLgpmApTtprdcKFiTUZxUkLNRhZTANBgkqhkiG9w0BAQsF -AAOCAQEAlNQMMQEFv6JTwV0gFt1Fzs4DG+d7vtvS8by/OjvTJ+Qkr2qqe9A1M36E -XsPBELsK+AecyKekPWFnQOyVw1vqLuFAmgkrhvgv4yeTNPyFD0vw21BePhotWpsH -xKNsxbTiwOJFeVnA5dqeKcRH7QvWdB5cjEpGrNrgdXNXFyLp+HUU0fxt+d1taycI -4uiJ3e+4SjDQ59ELee6vuYePLklIAVQ+CyOhCjZj24Nfd7QS2ol18wyFB3VmjK8m -3giApQTu9oG1Y5bL46OpnOfJW1Ta/c8xjpEkqRj1DiKgl2m81vW1as4DZvLJv7V8 -SVKBxp3gLliCE0MuJAaHR3vvNX6Ryg== +MIID3TCCAsWgAwIBAgIUOcP7P2PASvkuOJb4hbeGgled4jMwDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjI1NjA0WhcNMjIx +MjIxMjI1NjA0WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBDQTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAN1KoxKCrfWhlmMBodJQBVBZFKkwqMaFtj8x3/+M +BNWrUNAa+4Pdo8Hd0H1W0pxYvuayi/+7ehXTAbkNAPYG6Aq3rornkANuaiisbomi +qtEGZARpog6Co1AcI2ZLHmVsTmcyCo51VQkF8p1NLqyKzyIKYW7U7+LYp7+TrmuH +H+wU/l/WwgTMmaTpqaTieaMQmu9mm7pZ5H0MgtEiEBV/PKLf0r1eNIKQTQj9WdLu +GqQ8oepX6z7sAAArwK1E5IRC+PwupNEuvYQFM4z+QCUK4ecqG7PuPgj41Ty8Zzox +fE70GdavEULbdgq6IwxNuRo5D5uDSvt6MwufkCsrVE9tqTkCAwEAAaNjMGEwDwYD +VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFOKyf/0Ygeqh +7b6seZ6iPypsrC74MB8GA1UdIwQYMBaAFOKyf/0Ygeqh7b6seZ6iPypsrC74MA0G +CSqGSIb3DQEBCwUAA4IBAQA02fVVYLYlT4U2hM396vdnTo6Ew+H6bzBRMCKMhySb +HIAHKurG87q3BToQganfYQdxjL7m5lAfvdwuaGOB1AvjSQW/6WKcBYjPUn6hqwGO +4kcC0srLz/0txzOjGB0Xbxh456LcBBIU2Ic1jWqVPEc3rEjeVYb6PsM+F2BFdxxM +KJqn0tAq3p+uixdBk1NhRX4bIb7rtXAPn7xyQxFuC3QZy0WWfY+uoUwSnC6ng9Ms +ERAaBMBKvtF1itAstDw8AF/S+BqJx+wTlpYq5PZfbwgh/yIaGjvv/Inoi1ZYVuDr +ipbCEj/ZEqfXMDl2dOw0C+qiw2OGnZJz2i4K60ICtDBX -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/ca_cert_info.h b/test/extensions/transport_sockets/tls/test_data/ca_cert_info.h index 15d3acda5264..218562f562b4 100644 --- a/test/extensions/transport_sockets/tls/test_data/ca_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/ca_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_CA_CERT_HASH[] = - "c5959f7acae680b6cf2efb551d610a63e57cd58ab2287a81cf10aa5be1ac2249"; -constexpr char TEST_CA_CERT_SPKI[] = "zIIa7OiHpXvDj44AZpzq1DW6YuBHlMHYackUeUq4XkQ="; -constexpr char TEST_CA_CERT_SERIAL[] = "9116b918b16d8341"; -constexpr char TEST_CA_CERT_NOT_BEFORE[] = "Mar 6 02:28:59 2020 GMT"; -constexpr char TEST_CA_CERT_NOT_AFTER[] = "Mar 6 02:28:59 2022 GMT"; + "5c63b9938f7605698651a17e8994c7d7c562fe871b313717c679fb7976406bd2"; +constexpr char TEST_CA_CERT_SPKI[] = "Dz+Z/yB7B99TcLMmckTS3gDvPiN33vf4XYVQji4RIhg="; +constexpr char TEST_CA_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de233"; +constexpr char TEST_CA_CERT_NOT_BEFORE[] = "Dec 21 22:56:04 2020 GMT"; +constexpr char TEST_CA_CERT_NOT_AFTER[] = "Dec 21 22:56:04 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/ca_cert_with_crl.pem b/test/extensions/transport_sockets/tls/test_data/ca_cert_with_crl.pem index f8808b563dc5..17578444039a 100644 --- a/test/extensions/transport_sockets/tls/test_data/ca_cert_with_crl.pem +++ b/test/extensions/transport_sockets/tls/test_data/ca_cert_with_crl.pem @@ -1,36 +1,36 @@ -----BEGIN CERTIFICATE----- -MIID0jCCArqgAwIBAgIJANagOJjOojEuMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzM1oXDTIwMTIxNzAxNTAzM1ow -djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQC+qck5ri2uMuga33i+2ourLrqLQFdP5YUMb4FqM4RVLkDAB0VOApvY -WTPD+T8bqZTAQXUs6aMczhQQrGs+cgdzB5CznLq72uNphZ0RTHhNHk1K1QoHqB13 -AhrqcBgznAGClGrDYtbUTi1LNaSJEKBDqo/morg44xTolsgsP+R0OXAS2AoquRUv -b5q/rutnVGxLRoI1O6SLwEJIXEbM5ksj2YtzfN5ngGOaOWsqJsXnYfO1q1CHuQse -z7VJTZEHpZug0QN0kqH4bf7NbPRZJv0HgHGs7xXCpwVfuj3mfawyXmd3Tarrm7W0 -VFygMzAk5cI5cBQIaZYNC4YtDasVisCNAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB -Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSLgpmApTtprdcKFiTUZxUkLNRh -ZTAfBgNVHSMEGDAWgBSLgpmApTtprdcKFiTUZxUkLNRhZTANBgkqhkiG9w0BAQsF -AAOCAQEAlNQMMQEFv6JTwV0gFt1Fzs4DG+d7vtvS8by/OjvTJ+Qkr2qqe9A1M36E -XsPBELsK+AecyKekPWFnQOyVw1vqLuFAmgkrhvgv4yeTNPyFD0vw21BePhotWpsH -xKNsxbTiwOJFeVnA5dqeKcRH7QvWdB5cjEpGrNrgdXNXFyLp+HUU0fxt+d1taycI -4uiJ3e+4SjDQ59ELee6vuYePLklIAVQ+CyOhCjZj24Nfd7QS2ol18wyFB3VmjK8m -3giApQTu9oG1Y5bL46OpnOfJW1Ta/c8xjpEkqRj1DiKgl2m81vW1as4DZvLJv7V8 -SVKBxp3gLliCE0MuJAaHR3vvNX6Ryg== +MIID3TCCAsWgAwIBAgIUOcP7P2PASvkuOJb4hbeGgled4jMwDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjI1NjA0WhcNMjIx +MjIxMjI1NjA0WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBDQTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAN1KoxKCrfWhlmMBodJQBVBZFKkwqMaFtj8x3/+M +BNWrUNAa+4Pdo8Hd0H1W0pxYvuayi/+7ehXTAbkNAPYG6Aq3rornkANuaiisbomi +qtEGZARpog6Co1AcI2ZLHmVsTmcyCo51VQkF8p1NLqyKzyIKYW7U7+LYp7+TrmuH +H+wU/l/WwgTMmaTpqaTieaMQmu9mm7pZ5H0MgtEiEBV/PKLf0r1eNIKQTQj9WdLu +GqQ8oepX6z7sAAArwK1E5IRC+PwupNEuvYQFM4z+QCUK4ecqG7PuPgj41Ty8Zzox +fE70GdavEULbdgq6IwxNuRo5D5uDSvt6MwufkCsrVE9tqTkCAwEAAaNjMGEwDwYD +VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFOKyf/0Ygeqh +7b6seZ6iPypsrC74MB8GA1UdIwQYMBaAFOKyf/0Ygeqh7b6seZ6iPypsrC74MA0G +CSqGSIb3DQEBCwUAA4IBAQA02fVVYLYlT4U2hM396vdnTo6Ew+H6bzBRMCKMhySb +HIAHKurG87q3BToQganfYQdxjL7m5lAfvdwuaGOB1AvjSQW/6WKcBYjPUn6hqwGO +4kcC0srLz/0txzOjGB0Xbxh456LcBBIU2Ic1jWqVPEc3rEjeVYb6PsM+F2BFdxxM +KJqn0tAq3p+uixdBk1NhRX4bIb7rtXAPn7xyQxFuC3QZy0WWfY+uoUwSnC6ng9Ms +ERAaBMBKvtF1itAstDw8AF/S+BqJx+wTlpYq5PZfbwgh/yIaGjvv/Inoi1ZYVuDr +ipbCEj/ZEqfXMDl2dOw0C+qiw2OGnZJz2i4K60ICtDBX -----END CERTIFICATE----- -----BEGIN X509 CRL----- -MIIB7TCB1gIBATANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJVUzETMBEGA1UE +MIIB+DCB4QIBATANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJVUzETMBEGA1UE CAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwE THlmdDEZMBcGA1UECwwQTHlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBD -QRcNMTgxMjE4MDE1MDM3WhcNMjgxMjE1MDE1MDM3WjAcMBoCCQC4tezImPISShcN -MTgxMjE4MDE1MDM3WqAOMAwwCgYDVR0UBAMCAQAwDQYJKoZIhvcNAQELBQADggEB -ADyOntMRaZ9+nnGrWEd0t6+WhmSSuu8Mx4Ho/9tqFXEf8zVP90Y9QXlWhnJoKThy -sOFeRPc8fZH4nh5grY6afwaOA5AJjVvfizCDBNyj6tcniyWbViG+qAC7+JEdKINU -8/ATBFKTKt9hU84+NyAt9CB7X8Nzv6dC65XF/t9LZHEo3cYf7ZMP0BZoMQNOTGlD -2vrIBr4xcJNaE7G9cDyM7YVaNFuJfSf5QLA0sz5IMp/W4WhKiftnLOpREsbpz7pt -zMlMdBzY2aAu2mixPOcOtqm7Ty6YGhj/nx11qeeB1Alf1oNUI8tNq5ssCVDr0TTn -z49wwXND+/QqT3RwiUEaXnE= +QRcNMjAxMjIxMjI1NjA4WhcNMzAxMjE5MjI1NjA4WjAnMCUCFDnD+z9jwEr5LjiW ++IW3hoJXneI2Fw0yMDEyMjEyMjU2MDhaoA4wDDAKBgNVHRQEAwIBADANBgkqhkiG +9w0BAQsFAAOCAQEAa8cKxVpUzNkG3wz6hInm7ZDmthErLTRYW1z8FEaFtduF4PZw +KpLEj07oVkhEn3w3X9S+y+UlpXMd5EV41w1t2PH+D3T+E5k2S0ty5gFUZ5pjIarA +AaMrmopTpULc5opp9dxPMycu9ugEWpv+TmOzHEPMS+RyGtlLqfpE9MNhttxT/sKZ +/qb1fN83SD8ju7bMGB7Qkzw//6AiEwf3S8Ti0keGQfq06HuWXzSsNGNDDeQTiLXB +rdCvv54GjS1q1uACbta63nP56PEhJiCnHHXTGw+vB6rTpxPKY/LbaRPyHjmFchQ5 +Za4rNp+RqkXYlQ912Du6LXS6nuUXICCfIX5Riw== -----END X509 CRL----- diff --git a/test/extensions/transport_sockets/tls/test_data/ca_certificates.pem b/test/extensions/transport_sockets/tls/test_data/ca_certificates.pem index f5b0adc202a0..b293171d537c 100644 --- a/test/extensions/transport_sockets/tls/test_data/ca_certificates.pem +++ b/test/extensions/transport_sockets/tls/test_data/ca_certificates.pem @@ -1,46 +1,46 @@ -----BEGIN CERTIFICATE----- -MIID0jCCArqgAwIBAgIJALuj6F1BLlksMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdGYWtlIENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow -djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxEDAOBgNVBAMMB0Zha2UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQDHsTXPjNKXh6HecrOQEM+m846BXEXKFNd9qsWQtA92G0M4HRP2PkYZ -pHKr9HiHFmbqUciOGGJv3gEkVBO3YlwOOJH4pAy7Y0q/9yvxlByfsRMuvhxZqrk1 -6gTjvSMuUcilUYmX+t+6emAaoHiDSFBgT64H/B6L75Ed1KUTEzSz1KuX+A7GO7Tp -p/ZfjXIxdtPw0nigKiHtGgX2KQaZbD0mJYmk3YPzM7EjhCjohmRnKcBI0mZ9kr4E -9Nq+SJYo0fU7QIo3kKopdhs/Mv7kFjzTxBmDfpc8YrLuvlCENOUE+oRlA0YXFCnq -IvQZdnKTGq2LpKjl/e/NZx4DphgYjVhXAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB -Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS4iJCg8HwgaK+XwT3d8b4cDxAL -QTAfBgNVHSMEGDAWgBS4iJCg8HwgaK+XwT3d8b4cDxALQTANBgkqhkiG9w0BAQsF -AAOCAQEATI/97ZMR8EZpNmnYATUJ6oeKmigkzZssEcaGuFpA6t0ahkBXuk4/AKLl -cjizHW52G2T8AUxWckVylZuTOLfauOFdgUaJEO+BdtWUm9KTDA2j7cIZazW9LZKM -ezBB4l1pK9sOnzsNm5Hn90pNt6GL4aC33LaSUWY2WqPLKyBQ1VoZJ2/iFs7stX+X -seUlYajUc4q9oP8IcVxEmzjTKla+CuO4Mxwxl/Lq9iwFWdPC2nrSyk4+sR4MF96C -6SeMO7jqVtELYq7X7Wcx5KyVkr9cIEeZGY7tSvdWwPevGsiojqev2fbiMMbI/Xlc -9HZ5soYEzRTdm+WR+E9UJdrkVylBpw== +MIID3TCCAsWgAwIBAgIUM5GO8R7pxn0ea/auJwqJszTa1y0wDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB0Zha2UgQ0EwHhcNMjAxMjIxMjI1NjA1WhcNMjIx +MjIxMjI1NjA1WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHRmFrZSBDQTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAMeuJHOEr/j7298/5GZwNAHnGb2oVhG5sm1ymTA9 +m20t3jJzyqV5+3pa8i3nQXS9pnfCGXtHYicXBx1C8aJ6Kn4hdU6HqhDj+ESHtAq5 +OBL4i/SQapITrKLCAgVVfGQcs8VPZAn4/ToOG3TvDGAxOhADwNboseo2BCSLM1Jr +82kSVnSUo1mwoPBiS9auvxo0GQ5L503RkHKBxj/r7XiNhsfL8bnJAQNvbhHv/LwM +c9c0ztoUAzEKmffZPLdW5//wJypnrTj7qwsI4sdND+gZM0P+oszwMoqOmfyKOhop +Lbd+YrbmCazZhcNVJARPUOl7KLvxoIeqDQlXejY/oyby62kCAwEAAaNjMGEwDwYD +VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFIkaADiRk+B1 +QbT6UXn/g4DN2ueVMB8GA1UdIwQYMBaAFIkaADiRk+B1QbT6UXn/g4DN2ueVMA0G +CSqGSIb3DQEBCwUAA4IBAQCkCJtQGWGLEAsJL/+yg5uQhB6dvT7OCi4qWd4/p1ZM +el12DMXnidg8a9lKwApUMczTZ6SPq/OVEUjVtVcJrG4oEyCTm2uyqkBXA1p2sC2r +gxr4U1Z6nIxaDwNuSG19a18vbw9Yi0bIEF1iJtWh0kJ0jq8wtXgImihcE9guNxo5 +zyI3VnDejm5Df3OrxEherQF4U46i1g/JRW6r5PfwaS26ppgzZsm/AK/o1BxNnc6t +6qRVekwxzhsRh44Md/25IAxc2hyANzVkpRMZ5CTlpPkjxW4v1zvWEirrNXGkvddT +r35flrNS6YApV0b2ef0UmwJlbf+PnRgn4Y9bzffHfFXd -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIID0jCCArqgAwIBAgIJANagOJjOojEuMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzM1oXDTIwMTIxNzAxNTAzM1ow -djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQC+qck5ri2uMuga33i+2ourLrqLQFdP5YUMb4FqM4RVLkDAB0VOApvY -WTPD+T8bqZTAQXUs6aMczhQQrGs+cgdzB5CznLq72uNphZ0RTHhNHk1K1QoHqB13 -AhrqcBgznAGClGrDYtbUTi1LNaSJEKBDqo/morg44xTolsgsP+R0OXAS2AoquRUv -b5q/rutnVGxLRoI1O6SLwEJIXEbM5ksj2YtzfN5ngGOaOWsqJsXnYfO1q1CHuQse -z7VJTZEHpZug0QN0kqH4bf7NbPRZJv0HgHGs7xXCpwVfuj3mfawyXmd3Tarrm7W0 -VFygMzAk5cI5cBQIaZYNC4YtDasVisCNAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB -Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSLgpmApTtprdcKFiTUZxUkLNRh -ZTAfBgNVHSMEGDAWgBSLgpmApTtprdcKFiTUZxUkLNRhZTANBgkqhkiG9w0BAQsF -AAOCAQEAlNQMMQEFv6JTwV0gFt1Fzs4DG+d7vtvS8by/OjvTJ+Qkr2qqe9A1M36E -XsPBELsK+AecyKekPWFnQOyVw1vqLuFAmgkrhvgv4yeTNPyFD0vw21BePhotWpsH -xKNsxbTiwOJFeVnA5dqeKcRH7QvWdB5cjEpGrNrgdXNXFyLp+HUU0fxt+d1taycI -4uiJ3e+4SjDQ59ELee6vuYePLklIAVQ+CyOhCjZj24Nfd7QS2ol18wyFB3VmjK8m -3giApQTu9oG1Y5bL46OpnOfJW1Ta/c8xjpEkqRj1DiKgl2m81vW1as4DZvLJv7V8 -SVKBxp3gLliCE0MuJAaHR3vvNX6Ryg== +MIID3TCCAsWgAwIBAgIUOcP7P2PASvkuOJb4hbeGgled4jMwDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjI1NjA0WhcNMjIx +MjIxMjI1NjA0WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBDQTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAN1KoxKCrfWhlmMBodJQBVBZFKkwqMaFtj8x3/+M +BNWrUNAa+4Pdo8Hd0H1W0pxYvuayi/+7ehXTAbkNAPYG6Aq3rornkANuaiisbomi +qtEGZARpog6Co1AcI2ZLHmVsTmcyCo51VQkF8p1NLqyKzyIKYW7U7+LYp7+TrmuH +H+wU/l/WwgTMmaTpqaTieaMQmu9mm7pZ5H0MgtEiEBV/PKLf0r1eNIKQTQj9WdLu +GqQ8oepX6z7sAAArwK1E5IRC+PwupNEuvYQFM4z+QCUK4ecqG7PuPgj41Ty8Zzox +fE70GdavEULbdgq6IwxNuRo5D5uDSvt6MwufkCsrVE9tqTkCAwEAAaNjMGEwDwYD +VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFOKyf/0Ygeqh +7b6seZ6iPypsrC74MB8GA1UdIwQYMBaAFOKyf/0Ygeqh7b6seZ6iPypsrC74MA0G +CSqGSIb3DQEBCwUAA4IBAQA02fVVYLYlT4U2hM396vdnTo6Ew+H6bzBRMCKMhySb +HIAHKurG87q3BToQganfYQdxjL7m5lAfvdwuaGOB1AvjSQW/6WKcBYjPUn6hqwGO +4kcC0srLz/0txzOjGB0Xbxh456LcBBIU2Ic1jWqVPEc3rEjeVYb6PsM+F2BFdxxM +KJqn0tAq3p+uixdBk1NhRX4bIb7rtXAPn7xyQxFuC3QZy0WWfY+uoUwSnC6ng9Ms +ERAaBMBKvtF1itAstDw8AF/S+BqJx+wTlpYq5PZfbwgh/yIaGjvv/Inoi1ZYVuDr +ipbCEj/ZEqfXMDl2dOw0C+qiw2OGnZJz2i4K60ICtDBX -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/ca_key.pem b/test/extensions/transport_sockets/tls/test_data/ca_key.pem index 331fea897d9d..a0127b139fcd 100644 --- a/test/extensions/transport_sockets/tls/test_data/ca_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/ca_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/certs.sh b/test/extensions/transport_sockets/tls/test_data/certs.sh index aa8c25b6c232..6f8febfe53ff 100755 --- a/test/extensions/transport_sockets/tls/test_data/certs.sh +++ b/test/extensions/transport_sockets/tls/test_data/certs.sh @@ -186,6 +186,10 @@ generate_rsa_key expired_san_uri generate_x509_cert expired_san_uri ca -365 rm -f expired_san_uri_cert.cfg +# Generate extensions_cert.pem with "1.2.3.4.5.6.7.8" extension. +generate_rsa_key extenssions +generate_x509_cert extensions ca + # Initialize information for CRL process touch crl_index.txt crl_index.txt.attr echo 00 > crl_number diff --git a/test/extensions/transport_sockets/tls/test_data/expired_cert.pem b/test/extensions/transport_sockets/tls/test_data/expired_cert.pem index 7e85f616c3f3..51c9bc2f7b99 100644 --- a/test/extensions/transport_sockets/tls/test_data/expired_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/expired_cert.pem @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/expired_cert_info.h b/test/extensions/transport_sockets/tls/test_data/expired_cert_info.h index 00478f2bdec2..ed87da439be9 100644 --- a/test/extensions/transport_sockets/tls/test_data/expired_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/expired_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_EXPIRED_CERT_HASH[] = - "9fcc6c35f2b11b3d7f83d9f29e6522c58f1c2915163582b362118f1da15032d9"; -constexpr char TEST_EXPIRED_CERT_SPKI[] = "kZWKpY3SlkVCIky+/7eOpkuH/qS1H5k7xXi8G/YG/Nc="; -constexpr char TEST_EXPIRED_CERT_SERIAL[] = "b8b5ecc898f21250"; -constexpr char TEST_EXPIRED_CERT_NOT_BEFORE[] = "Dec 18 01:50:37 2018 GMT"; -constexpr char TEST_EXPIRED_CERT_NOT_AFTER[] = "Dec 18 01:50:37 2017 GMT"; + "cd7ef241c6d518e2e6e4a66eda161994563cc081f6a495a2ad1f28cd648865bb"; +constexpr char TEST_EXPIRED_CERT_SPKI[] = "ZlRNppGoreY8IStWklmC+PWxGmHAX7SDaIpHTcsE6Qg="; +constexpr char TEST_EXPIRED_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de23d"; +constexpr char TEST_EXPIRED_CERT_NOT_BEFORE[] = "Dec 21 22:56:08 2020 GMT"; +constexpr char TEST_EXPIRED_CERT_NOT_AFTER[] = "Dec 22 22:56:08 2019 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/expired_key.pem b/test/extensions/transport_sockets/tls/test_data/expired_key.pem index e30a4c284c69..6f0ce7027a37 100644 --- a/test/extensions/transport_sockets/tls/test_data/expired_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/expired_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert.pem b/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert.pem index ca0681cfc146..df0f16b1ff8b 100644 --- a/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert.pem @@ -1,24 +1,25 @@ -----BEGIN CERTIFICATE----- -MIIEGTCCAwGgAwIBAgIJALi17MiY8hJRMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzN1oXDTE3MTIxODAxNTAzN1ow -ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAr92OxJ/WZ1VM2jxTV2t1YT0laplTsuksMJzjPtJSEkmjkUxK -RiRbPGTxxxjHm0Dx/+ikOQtGJArRP+hOsu7bQKa2kqRTIs+d+lB6reHodONWDAcs -9A3dowY/U2OVsfRoboymLTR5SqNYDnBb/gpCyGUXNfKVGX7cGfb2QJIWTORp4nOW -Aoq4NF8Z7w8pzyUi+mXxvZM2YJ3phYuMGKeMzytJ40lhs/6rPUe5dJQ8aGeQDJfx -VQPP/u8g9Vuc+eqdfy21DKPZ6c+m+SE0LTbLdCkc7Te1XmWyirKbOVe2eBUTLY2E -P+71ScNZL1yNRDSNg5jfR1EvUw3+uU1OAg3NnQIDAQABo4GlMIGiMAwGA1UdEwEB -/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD -ATAmBgNVHREEHzAdhhtzcGlmZmU6Ly9seWZ0LmNvbS90ZXN0LXRlYW0wHQYDVR0O -BBYEFIsT1Y9NAch0sQORvly90owXcpWVMB8GA1UdIwQYMBaAFIuCmYClO2mt1woW -JNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQBcijE/G4Si/YeVUZFkxTrcKO3V -5lHWnSx5oZV9z4CdtDyfkOQ22Z7K2bYPyWFS2yNddg1KOJgE5E3Xp2Ptmhdgwp29 -OYJmtkX+SpVX6gYWsuNYirdt4Q0ydqP1UsLGP+h7IFNN7z9Mgg0jSSHbBotf96qR -agzm+td4+jKYR/uGeF/dHyHhVXMBnd7Cv7f9gXkdQMbItDrFMR5edwuyKZIe3KyK -gC0s+M18OJ1CdW9Oh6101RdoVsM+UALG7S1q1YZoiLTKOyGwKqMCzT72S4lhMmvc -TbTXp/eUKs7mfkMFhnzB3QW0dMaOMxXJYuAY8DY/nAwmp0BQiIOM6GR2FsGZ +MIIEJDCCAwygAwIBAgIUOcP7P2PASvkuOJb4hbeGgled4j4wDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjI1NjA4WhcNMTkx +MjIyMjI1NjA4WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQD030WdPwiyRLzPxuwb45hZy+Eh1M0xCrN+ +d9EHR2H4zI4Wj3Lji4KAc7cJkSboq0Y9qsn4Zi9jg+NEoAT0WYkH02aXNHO0qzHn +0Kr1pjIxJNCnRK5M/6PNwVjThUSTC6FcSc5LWdpxB2ONBj/G2w2J+Ag98l3O+Tzd +oAH9n6gpV6wyHFlOikL1ehfaiUE7W9aqGiBzXTnXcLTO0lWOU+i9TyI9Z5Pg2h5O +3/mahVheHy46+Cdcor+/bJaWnjl+yGcoGtb2kfiDuBDQkDR0hv3uvwLtC5xO8Elh +R9mLWmt3ZCcSyIlUJRZl4daRudiUEU188Ee5FezCVWCOLv7Pf5XLAgMBAAGjgaUw +gaIwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH +AwIGCCsGAQUFBwMBMCYGA1UdEQQfMB2GG3NwaWZmZTovL2x5ZnQuY29tL3Rlc3Qt +dGVhbTAdBgNVHQ4EFgQUPOxrSYnflA3Bh65eKtOhHLEONlowHwYDVR0jBBgwFoAU +4rJ//RiB6qHtvqx5nqI/KmysLvgwDQYJKoZIhvcNAQELBQADggEBAFZJ9FAUYdyr +kilXlroA4knAlwjb7Tbieoamfrr1S4bHfx4btdtA5m4mUpqnzsUsfosk1hqFr6RM +XkB8gRGYicUjJJI/gPNiZv45agEDz60Gc1YKk2k8jamGnTpjY7OC5x5gxlj3npKP +VdekecTNnDOSvTWJt6aexh//P1svADs7nUqThiCOSC78lDKMLq+hmleNTsOSicgk +GWvWFHoM2G26AlQPmOUBl7jBXkQcqKSJ178GMrcRaTGUayfc2DtzGr1B+H0dl61d +rZDItx70g4T9jZEiyibLs/hjHFdYafvj7g+yuV4Pm/9Md3UsMwBUVwb5Fwdm7xZY +QnhMJNL9plo= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert_info.h b/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert_info.h index d30a17faecfe..572b7d7cc800 100644 --- a/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_EXPIRED_SAN_URI_CERT_HASH[] = - "01b0d11baa149f0ec36e9bef2d31aca960bb648ab8026e3b4d1f7d014ff18a6d"; -constexpr char TEST_EXPIRED_SAN_URI_CERT_SPKI[] = "RdPaALSmcp989omHpVD3/LCgJRhnPr1T+X4m2zGKPBY="; -constexpr char TEST_EXPIRED_SAN_URI_CERT_SERIAL[] = "b8b5ecc898f21251"; -constexpr char TEST_EXPIRED_SAN_URI_CERT_NOT_BEFORE[] = "Dec 18 01:50:37 2018 GMT"; -constexpr char TEST_EXPIRED_SAN_URI_CERT_NOT_AFTER[] = "Dec 18 01:50:37 2017 GMT"; + "439bc821f40c00375fb9a3caf35bf39bfc4a874ef1d0cbf4b4f213cf20a52023"; +constexpr char TEST_EXPIRED_SAN_URI_CERT_SPKI[] = "x7FwnKzr0ELxvhgDjOceibXjS7ricW5iVhEjFFxjzR0="; +constexpr char TEST_EXPIRED_SAN_URI_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de23e"; +constexpr char TEST_EXPIRED_SAN_URI_CERT_NOT_BEFORE[] = "Dec 21 22:56:08 2020 GMT"; +constexpr char TEST_EXPIRED_SAN_URI_CERT_NOT_AFTER[] = "Dec 22 22:56:08 2019 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/expired_san_uri_key.pem b/test/extensions/transport_sockets/tls/test_data/expired_san_uri_key.pem index 7686296bd83c..206e98ea0f80 100644 --- a/test/extensions/transport_sockets/tls/test_data/expired_san_uri_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/expired_san_uri_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/extensions_cert.pem b/test/extensions/transport_sockets/tls/test_data/extensions_cert.pem index 54fea96c9a1c..968ba2184780 100644 --- a/test/extensions/transport_sockets/tls/test_data/extensions_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/extensions_cert.pem @@ -1,24 +1,25 @@ -----BEGIN CERTIFICATE----- -MIIEGTCCAwGgAwIBAgIJAPSQoXOI3NOpMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTIwMDMwNjAyNDExMFoXDTIyMDMwNjAyNDExMFow -eDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxEjAQBgNVBAMMCVRlc3QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBAKmtD1oHbSrtwYh87yTH8gJt+Mo5RtpgnBnYmg0vNy17j/wkk2no -5F+YYR6anF7antjIisp9jIQTseImoXO2rRM5hLF1KA8c1007CN+omXay6613XVLs -8zA3ZZ7zByDNH9rvyHYTO/Gl4MUeHWLIumASi8PZHxctojUWhSwIRVGtWXXmS7ck -mi5KNW5vvqX1i+vt447JGAeCjyhrc4eW4O0QJrrVXk0ZoYYxss2LM15Xj2hMUosq -DlGjOW3rU44KdUR3GgGqUsbhA8ya/f869LUVUBCbepxzsATEo5tklUwOzLyQux++ -faVsYjNg4YSlNrWXl5XajXvogd4Wxu+lVb0CAwEAAaOBpzCBpDAMBgNVHRMBAf8E -AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw -HQYDVR0OBBYEFMgWtpwYVIOG5pI47Ut7x24X/JPCMB8GA1UdIwQYMBaAFIuCmYCl -O2mt1woWJNRnFSQs1GFlMBYGByoDBAUGBwgECwwJU29tZXRoaW5nMBAGByoDBAUG -BwkEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCwVCwH8HTu0FBcqp1ZxFIKeLQZ -+3QuUXL9Q7go31mJoa3E3Q0CvU/nOnskaqf3MwLahQljj4VAlzol8kPlAYZBGRKH -JQpnwsm3z4CrUh0fXki7ljcoLHy2c/iX7CTK1Rl7ae12hn18SGeY3mwxs8o4mUYl -HHvWNWl3AvWtcL0r2T0RtRy8xDu2XWPCuyNPsiZU3kwKT1OjFtraMkdzbat/U4Xd -BoStoeUu6DelsyTn8yefMIjP86Ga1ZrB6jIGExRXaDSZJMsYEuEkqvfU6AKPJesL -3JJn/LtyK9gLIcYPQGyr2Xxp6H2smqFDBy6JkBsgbNHUbhrwl77aY3m6jBHn +MIIEJDCCAwygAwIBAgIUOcP7P2PASvkuOJb4hbeGgled4j8wDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjI1NjA4WhcNMjIx +MjIxMjI1NjA4WjB4MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzESMBAGA1UEAwwJVGVzdCBDZXJ0MIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqa0PWgdtKu3BiHzvJMfyAm34yjlG2mCcGdia +DS83LXuP/CSTaejkX5hhHpqcXtqe2MiKyn2MhBOx4iahc7atEzmEsXUoDxzXTTsI +36iZdrLrrXddUuzzMDdlnvMHIM0f2u/IdhM78aXgxR4dYsi6YBKLw9kfFy2iNRaF +LAhFUa1ZdeZLtySaLko1bm++pfWL6+3jjskYB4KPKGtzh5bg7RAmutVeTRmhhjGy +zYszXlePaExSiyoOUaM5betTjgp1RHcaAapSxuEDzJr9/zr0tRVQEJt6nHOwBMSj +m2SVTA7MvJC7H759pWxiM2DhhKU2tZeXldqNe+iB3hbG76VVvQIDAQABo4GnMIGk +MAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC +BggrBgEFBQcDATAdBgNVHQ4EFgQUyBa2nBhUg4bmkjjtS3vHbhf8k8IwHwYDVR0j +BBgwFoAU4rJ//RiB6qHtvqx5nqI/KmysLvgwFgYHKgMEBQYHCAQLDAlTb21ldGhp +bmcwEAYHKgMEBQYHCQQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHROXWijy8b9 +rr//r5iBI14ZBGxBfNNVfcFwcAmTBBdXLA+nTcIgGexsgS4crd5+TQKKKX/e4BQY +xeOAGsogcveduXcmHpH1QUZm8QhA87J1cDWhWwWIbD+X645GXI1BRAWxdTr/wvk0 +XTYpCxcuq7M6EGrhYMUQIIsoQ7w5FBLsow7VU6gdvtDV0EuCYJkG5+JK78wtyelt +rE1K4i4S9VgzgvI8qbBq9KoEZe4Q+nmtW1rYl5VzSLWe1ZSL3eju7/1N93P0jPCV +YPeHDPrQIKAYohcAXUBRMNEDyRwQjTG2Rz2syfSFHLESu6qmV+EzLH7vr3LHggqH +qoLgTEMQU+g= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/extensions_cert_info.h b/test/extensions/transport_sockets/tls/test_data/extensions_cert_info.h index c6aee4f26a76..a508ce087e7f 100644 --- a/test/extensions/transport_sockets/tls/test_data/extensions_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/extensions_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_EXTENSIONS_CERT_HASH[] = - "5a24be0c5ca6c89c10f0905f9810d08db06b49b9029db77622b050340de3400b"; + "aaa129760e946796fb91bf380c626435f5540d6f26aa79075efbee531c2a5e3a"; constexpr char TEST_EXTENSIONS_CERT_SPKI[] = "r4AA/+y2tvwjcrBpByHVqkR1Rg0k3Fw3U7YyCYKvjXc="; -constexpr char TEST_EXTENSIONS_CERT_SERIAL[] = "f490a17388dcd3a9"; -constexpr char TEST_EXTENSIONS_CERT_NOT_BEFORE[] = "Mar 6 02:41:10 2020 GMT"; -constexpr char TEST_EXTENSIONS_CERT_NOT_AFTER[] = "Mar 6 02:41:10 2022 GMT"; +constexpr char TEST_EXTENSIONS_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de23f"; +constexpr char TEST_EXTENSIONS_CERT_NOT_BEFORE[] = "Dec 21 22:56:08 2020 GMT"; +constexpr char TEST_EXTENSIONS_CERT_NOT_AFTER[] = "Dec 21 22:56:08 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/fake_ca_cert.pem b/test/extensions/transport_sockets/tls/test_data/fake_ca_cert.pem index d84d441042dc..7c2f7f1d032a 100644 --- a/test/extensions/transport_sockets/tls/test_data/fake_ca_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/fake_ca_cert.pem @@ -1,23 +1,23 @@ -----BEGIN CERTIFICATE----- -MIID0jCCArqgAwIBAgIJALuj6F1BLlksMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdGYWtlIENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow -djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxEDAOBgNVBAMMB0Zha2UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQDHsTXPjNKXh6HecrOQEM+m846BXEXKFNd9qsWQtA92G0M4HRP2PkYZ -pHKr9HiHFmbqUciOGGJv3gEkVBO3YlwOOJH4pAy7Y0q/9yvxlByfsRMuvhxZqrk1 -6gTjvSMuUcilUYmX+t+6emAaoHiDSFBgT64H/B6L75Ed1KUTEzSz1KuX+A7GO7Tp -p/ZfjXIxdtPw0nigKiHtGgX2KQaZbD0mJYmk3YPzM7EjhCjohmRnKcBI0mZ9kr4E -9Nq+SJYo0fU7QIo3kKopdhs/Mv7kFjzTxBmDfpc8YrLuvlCENOUE+oRlA0YXFCnq -IvQZdnKTGq2LpKjl/e/NZx4DphgYjVhXAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB -Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS4iJCg8HwgaK+XwT3d8b4cDxAL -QTAfBgNVHSMEGDAWgBS4iJCg8HwgaK+XwT3d8b4cDxALQTANBgkqhkiG9w0BAQsF -AAOCAQEATI/97ZMR8EZpNmnYATUJ6oeKmigkzZssEcaGuFpA6t0ahkBXuk4/AKLl -cjizHW52G2T8AUxWckVylZuTOLfauOFdgUaJEO+BdtWUm9KTDA2j7cIZazW9LZKM -ezBB4l1pK9sOnzsNm5Hn90pNt6GL4aC33LaSUWY2WqPLKyBQ1VoZJ2/iFs7stX+X -seUlYajUc4q9oP8IcVxEmzjTKla+CuO4Mxwxl/Lq9iwFWdPC2nrSyk4+sR4MF96C -6SeMO7jqVtELYq7X7Wcx5KyVkr9cIEeZGY7tSvdWwPevGsiojqev2fbiMMbI/Xlc -9HZ5soYEzRTdm+WR+E9UJdrkVylBpw== +MIID3TCCAsWgAwIBAgIUM5GO8R7pxn0ea/auJwqJszTa1y0wDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB0Zha2UgQ0EwHhcNMjAxMjIxMjI1NjA1WhcNMjIx +MjIxMjI1NjA1WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHRmFrZSBDQTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAMeuJHOEr/j7298/5GZwNAHnGb2oVhG5sm1ymTA9 +m20t3jJzyqV5+3pa8i3nQXS9pnfCGXtHYicXBx1C8aJ6Kn4hdU6HqhDj+ESHtAq5 +OBL4i/SQapITrKLCAgVVfGQcs8VPZAn4/ToOG3TvDGAxOhADwNboseo2BCSLM1Jr +82kSVnSUo1mwoPBiS9auvxo0GQ5L503RkHKBxj/r7XiNhsfL8bnJAQNvbhHv/LwM +c9c0ztoUAzEKmffZPLdW5//wJypnrTj7qwsI4sdND+gZM0P+oszwMoqOmfyKOhop +Lbd+YrbmCazZhcNVJARPUOl7KLvxoIeqDQlXejY/oyby62kCAwEAAaNjMGEwDwYD +VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFIkaADiRk+B1 +QbT6UXn/g4DN2ueVMB8GA1UdIwQYMBaAFIkaADiRk+B1QbT6UXn/g4DN2ueVMA0G +CSqGSIb3DQEBCwUAA4IBAQCkCJtQGWGLEAsJL/+yg5uQhB6dvT7OCi4qWd4/p1ZM +el12DMXnidg8a9lKwApUMczTZ6SPq/OVEUjVtVcJrG4oEyCTm2uyqkBXA1p2sC2r +gxr4U1Z6nIxaDwNuSG19a18vbw9Yi0bIEF1iJtWh0kJ0jq8wtXgImihcE9guNxo5 +zyI3VnDejm5Df3OrxEherQF4U46i1g/JRW6r5PfwaS26ppgzZsm/AK/o1BxNnc6t +6qRVekwxzhsRh44Md/25IAxc2hyANzVkpRMZ5CTlpPkjxW4v1zvWEirrNXGkvddT +r35flrNS6YApV0b2ef0UmwJlbf+PnRgn4Y9bzffHfFXd -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/fake_ca_key.pem b/test/extensions/transport_sockets/tls/test_data/fake_ca_key.pem index c28e3244d369..573ffe3835e0 100644 --- a/test/extensions/transport_sockets/tls/test_data/fake_ca_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/fake_ca_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/intermediate_ca_cert.pem b/test/extensions/transport_sockets/tls/test_data/intermediate_ca_cert.pem index 8c4d78720a5b..b75db6956b77 100644 --- a/test/extensions/transport_sockets/tls/test_data/intermediate_ca_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/intermediate_ca_cert.pem @@ -1,25 +1,26 @@ -----BEGIN CERTIFICATE----- -MIIESTCCAzGgAwIBAgIJALi17MiY8hJIMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow -gYMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T -YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu -ZWVyaW5nMR0wGwYDVQQDDBRUZXN0IEludGVybWVkaWF0ZSBDQTCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBALLr06bDJaNZQNnyRxtMRNg5VWLf6agBniUK -iTA8pa0CmJ/KW3qAzZk6/oiTu6HDPn6jwfWuhzBMpDLgZu61hMKhpfRsE5NYK+y1 -mqYX6NL0PzS/cmPC/eiN/Asa72gC5S9DvO/cWvw5PU58gcdUR5EJMjnMW8Aih2EI -e0acNsWZ4edfvAX5HbdInloze5NL6pm+fCl59GsdJjYmkuD4he/hW9oJ4uNf1M4M -CFArYg7VMhVGdeJXksJefudf/EeGeKgrZVQa5yhS+WrMzvJVUSy9nkQs9hGFuJG3 -lC8ErM2RhDPCMMAzm4AWb6cbSx+pn3OyRvVkIJXPAvqzHLCmOwcCAwEAAaOByzCB -yDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU -b9PKZh9y1mQWIS4Huytbx6XuRUYwHwYDVR0jBBgwFoAUb9PKZh9y1mQWIS4Huytb -x6XuRUYwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O -BBYEFG/TymYfctZkFiEuB7srW8el7kVGMB8GA1UdIwQYMBaAFIuCmYClO2mt1woW -JNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQAHFgyd+sovoNB/Aq/Bmx74KJh1 -RlfB57+pmCnRbGdKDk9q4c2Z+NR8W7SgLeOUMUzLz6y1Fl5VbLbNKU6+zAZO7LDc -biiV4LNB7e6n5rVozpU3PSV2lE7bLuosVGH9lXQX/+j3M9lMy7XSmldASF91LFh2 -gs0xpMRvntugBrUlt/c25/xaMJGre5oSWja1cpbQF4Hiju9sswbsLAsw5uob0fvi -JMQYLcB+DMBovsIBixxMifigR1TFYY7SR9qvOe5U+b0ib9Almqj/SmCSKs2LTACb -wEK9vH9BqUr3la0VRWfrI/V9ZuJHuMTp2nwHVV7ORUh6YJS8J2fa+H7bl2iC +MIIEVDCCAzygAwIBAgIUOcP7P2PASvkuOJb4hbeGgled4jQwDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjI1NjA0WhcNMjIx +MjIxMjI1NjA0WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx +FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM +EEx5ZnQgRW5naW5lZXJpbmcxHTAbBgNVBAMMFFRlc3QgSW50ZXJtZWRpYXRlIENB +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxtH/l68LgKWVL+p6lfMz +ekVAGrPuiFxELxLD12MIf9YzXKEq32SHQ6H6ndQX5fKaPwk53niKpKAURExtD+b9 +N+ll7Qm5IszsFy+w/5oEXYK/ZIoMTKsHGjWbs7YjXW9MhIfwxduLkxGUUivroN2k +BNJ/SrcPq1DqIAz2UPETa99A2P/sIMozCNwva1PKRZm4UWKCT37M9LuJMaG2M9Wo +WbLhtpuASc242yW0aMRwHPhmAws8ppHXMK6aInjihAOcnd+owWlveANYEic29W7j +DMJd4VGxiViGgGhRRrUinyt1Rv/VWn1dvewFPJjopnaSOFMV+wWxqfI8EOVNRkMH +jQIDAQABo4HLMIHIMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEG +MB0GA1UdDgQWBBRDLX/tjWS+Kfn/CCnNK2s2n3DeUDAfBgNVHSMEGDAWgBRDLX/t +jWS+Kfn/CCnNK2s2n3DeUDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQE +AwIBBjAdBgNVHQ4EFgQUQy1/7Y1kvin5/wgpzStrNp9w3lAwHwYDVR0jBBgwFoAU +4rJ//RiB6qHtvqx5nqI/KmysLvgwDQYJKoZIhvcNAQELBQADggEBALLv/K/3fIpC +Jc2WQhW1efTowmV15CenKiGjzvH78XbKvJ2itzYSZfbGnR/CYLjswr9OaAZn6ii4 +0VwbksNJDjQUFUB7cCQnJvA5EpbB/6F2yNqI5XRNd5ewVluufdZ/z1Ncab892e/z +mueR0u9TSPL12cwOeiGv5WAQToEoaepCaqsYlrvrTqjphdfseNSiSObk6UMA9M0l +fIWNGC3XBOQIRHws7WOJaQBsCy8yuRVYX2qT6pJ9IF5WhQzNlWdrRQFF++bHb+70 +gGlq0ZEtr0id+qrec5Bwx7auobuWEyKcv/lFbBA9haWjGXOQ65LlwKNfLgradi3w +KBwdOlJZfkY= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/intermediate_ca_key.pem b/test/extensions/transport_sockets/tls/test_data/intermediate_ca_key.pem index 993cc3de0bd4..d90cf69fd46a 100644 --- a/test/extensions/transport_sockets/tls/test_data/intermediate_ca_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/intermediate_ca_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/long_validity_cert.pem b/test/extensions/transport_sockets/tls/test_data/long_validity_cert.pem index 68dd88e19e12..ecd620ef323a 100644 --- a/test/extensions/transport_sockets/tls/test_data/long_validity_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/long_validity_cert.pem @@ -1,25 +1,25 @@ -----BEGIN CERTIFICATE----- -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 -360= +BgNVHQ4EFgQUsmQkKNvqPYUnw45/hq18ujb+pAMwHwYDVR0jBBgwFoAU4rJ//RiB +6qHtvqx5nqI/KmysLvgwDQYJKoZIhvcNAQELBQADggEBAGmv58nqqBNxwc/ZBOUj +/eiXczYvNWnmIj63GW2tijiN4dmtrS8pmht61UwKYSk08PnBCvbgTYrqbCrS/gqH +k1+IJlGfY7YkO03F3h8r1bklOIz6PR2p772b8gp3zoFLnNM1j08rGyhIHfAW12hw +9lLdSj3espsmlLe6vAORSTkTd0NaxfukMzEEY6B28dNlXYTWKdOToQ3xiiBuwJv2 ++UGp7N6LnPoGWkwMz8gqGfO6JY7kF7Wa+Mh3GY2Z1enZBB+aPY4dY2Pzri/xXlOm +xFb/ktXE7Obu5GwgtE7Z2q2vfWGFYoEFtRivrWKkTd3fEVELXWhuP4JuihsQ220w +8XI= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/long_validity_cert_info.h b/test/extensions/transport_sockets/tls/test_data/long_validity_cert_info.h index 7c870080e4c2..f2759297877d 100644 --- a/test/extensions/transport_sockets/tls/test_data/long_validity_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/long_validity_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_LONG_VALIDITY_CERT_HASH[] = - "b16402844ccc874a072bca0d23a17ba350aeb90328f086bb102ee55f8c627b3e"; -constexpr char TEST_LONG_VALIDITY_CERT_SPKI[] = "2Nr2dJbHttdmsuOA7/qVCfUpxcjYUWtONoiSPKOUeis="; -constexpr char TEST_LONG_VALIDITY_CERT_SERIAL[] = "1fbc5bbbe57db3038b22dbea827c9de96b531265"; -constexpr char TEST_LONG_VALIDITY_CERT_NOT_BEFORE[] = "Oct 11 05:12:03 2019 GMT"; -constexpr char TEST_LONG_VALIDITY_CERT_NOT_AFTER[] = "Sep 28 05:12:03 2069 GMT"; + "2573bf08123b0091ecfe4c86601eddf9ded53826efc4dc3518ca0a5a7b773534"; +constexpr char TEST_LONG_VALIDITY_CERT_SPKI[] = "0pi3a/oJRnjfOrD4IVe5lfPkC4rVnOEYmoZtXU0eirk="; +constexpr char TEST_LONG_VALIDITY_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de23c"; +constexpr char TEST_LONG_VALIDITY_CERT_NOT_BEFORE[] = "Dec 21 22:56:08 2020 GMT"; +constexpr char TEST_LONG_VALIDITY_CERT_NOT_AFTER[] = "Dec 9 22:56:08 2070 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/long_validity_key.pem b/test/extensions/transport_sockets/tls/test_data/long_validity_key.pem index 3c7d39550a17..101f8acfd8b8 100644 --- a/test/extensions/transport_sockets/tls/test_data/long_validity_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/long_validity_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/no_san_cert.pem b/test/extensions/transport_sockets/tls/test_data/no_san_cert.pem index c5e9288e34da..d1cbed342005 100644 --- a/test/extensions/transport_sockets/tls/test_data/no_san_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/no_san_cert.pem @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -MIID7zCCAtegAwIBAgIJALi17MiY8hJJMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow -ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAmjaiwZ3HXkBest7OydGQvpeRUUJWDs9gb0TglgpZd6Z3xQ51 -gpuh3KLJBKcQU9Tgc7KtFrGkMg14agDX8JA6y+g0WLXZWD78z3Qphy/FIE9mwvyD -yYeBQ617o6a+NlT6GDOkuR50OsN8zVbdML5nnbPVE1Sm3UVBQIcZFcs7LwT9Z62f -BrzQJXwPwJkI/6k6AAskCz8yOtulivyfjto0zrW8zkDAhqmmbQgNNONy+Df5trDi -hYTs2sclUALyAK4uxKBO2B+2yme9KQQZUuHp2bWAMVSzZWdd5a1d+DYHZs0RbCsC -LTxtAtgzcTIK2YxV2pDHIVtvKlX6a5RWoq4x9wIDAQABo3wwejAMBgNVHRMBAf8E -AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw -HQYDVR0OBBYEFFNmiA4RPzGVD8tbsQkw4VT47H8GMB8GA1UdIwQYMBaAFIuCmYCl -O2mt1woWJNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQCBCQxu1RRDgxyW+1Vr -6mvdHRS9TRnakIYr8RlUMJ1SPOnMyzHzL1t7vJGVmyIGUJi9MxF05xAU5y7o7hoi -CP0z45lv7vKSXzZ12Y16U/yqgE/HsSqjn3n9n7vWDK6aQ71PcWA3HySpwT3WOx0D -z0ZMPo25FIbIjVZBMFzqQr1BcPVdwuyZrADms/lcIMfMggBdnhxUxjCrr1S/BFtF -GFGFKm9xRzNBexvbAO54U4uc4NthO+ysDDsKBl3xE2zyQfN/ZiJrqv/S/LLTyku9 -QfNMFpgP0xvzH1znP7lnlNFOED6+Q65V9H358zgMukGlUua6w7v9Zox6xTaH2Xbj -ry5I +MIID+jCCAuKgAwIBAgIUOcP7P2PASvkuOJb4hbeGgled4jUwDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjI1NjA1WhcNMjIx +MjIxMjI1NjA1WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlD+wqIZFBXaJCVFWWz/ig2BL/+RkgQquh +QTdSXRyaXJ389DK1+6K6i5MR0l8RanNKJxi9+yyTNwYQLR90VTOmLzS3UJxLC7rH ++GTh70Q5GkaoeweFsK1w4nRCl7EZiUtT5dx31bmPUf8lZNltPv4DNg5bVO5S8xSM +5QxczDxRxydh1B0a95DaKFPKYvEYV4AeDVu+Tgkbv9D139VlcPyVTkzK8vGo9Rl1 +Q+9+GYWAY9vTTPs6cjXWLvn8XPhGK9Ug7KZCUTeX2gmrES4Q8HVsL+V1mzjCrYF7 +mXYHjyyIRZA2GutMXf2IDh5TBeEXnL5Zue7KDZE6Q6GJDr/S8NfbAgMBAAGjfDB6 +MAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC +BggrBgEFBQcDATAdBgNVHQ4EFgQUFmy7Wr1kvm3v79NC+2mJni0wRTUwHwYDVR0j +BBgwFoAU4rJ//RiB6qHtvqx5nqI/KmysLvgwDQYJKoZIhvcNAQELBQADggEBADxh +sIcsgy8ao9ziaa+ep3gY3G5B9RdMKAcWBSN+Up602DmXzgwcW6fEvGW8AyrpiTQt +bl8RLaqveyMHM2gMDESbRk8EOnK9vLYQrS/30k5fs6JHe/An8Udpn/r/j72M341O +Xh7jFLzP3Lxbl9DWYrjkfTqkVswLNbp0Z83pxS+IthbWr7Ag9GytfWb8Y53G4r9D +CPYaLkeZjo2WFTFcHCIapW8ScUgYk018oEmFtBcbqDftp3i07cmEVnIuDhuX2iLh +G2QJFoztgmqBRaxLcTm26HOVkBb8DJd0DxyyRJkjBdymZcckANgwGPYIM2qdZKnA +xnwU9Pf1uFvobGi5V1o= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/no_san_cert_info.h b/test/extensions/transport_sockets/tls/test_data/no_san_cert_info.h index bb1ec52cbe6a..0bd279e39c55 100644 --- a/test/extensions/transport_sockets/tls/test_data/no_san_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/no_san_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_NO_SAN_CERT_HASH[] = - "0035c2f2cefc21bd5e1e52b945ff26c474dad33343ae00aa8f86f4877aa02eca"; -constexpr char TEST_NO_SAN_CERT_SPKI[] = "xVbSFNk3uh/hr0XoZArX7fc1RrKx0oQ+OkVcGa1HCzY="; -constexpr char TEST_NO_SAN_CERT_SERIAL[] = "b8b5ecc898f21249"; -constexpr char TEST_NO_SAN_CERT_NOT_BEFORE[] = "Dec 18 01:50:34 2018 GMT"; -constexpr char TEST_NO_SAN_CERT_NOT_AFTER[] = "Dec 17 01:50:34 2020 GMT"; + "79f87ccc69cf485217e5d1635f12937e90f670bc86af101344d8d10017329d0a"; +constexpr char TEST_NO_SAN_CERT_SPKI[] = "ev/Eik6ohLjGwA+tbV26Ww+tRvhQmeGoniCpymhqNQ4="; +constexpr char TEST_NO_SAN_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de235"; +constexpr char TEST_NO_SAN_CERT_NOT_BEFORE[] = "Dec 21 22:56:05 2020 GMT"; +constexpr char TEST_NO_SAN_CERT_NOT_AFTER[] = "Dec 21 22:56:05 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/no_san_chain.pem b/test/extensions/transport_sockets/tls/test_data/no_san_chain.pem index f3686ed02b4c..65739a5bcc6d 100644 --- a/test/extensions/transport_sockets/tls/test_data/no_san_chain.pem +++ b/test/extensions/transport_sockets/tls/test_data/no_san_chain.pem @@ -1,49 +1,50 @@ -----BEGIN CERTIFICATE----- -MIID7zCCAtegAwIBAgIJALi17MiY8hJJMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow -ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAmjaiwZ3HXkBest7OydGQvpeRUUJWDs9gb0TglgpZd6Z3xQ51 -gpuh3KLJBKcQU9Tgc7KtFrGkMg14agDX8JA6y+g0WLXZWD78z3Qphy/FIE9mwvyD -yYeBQ617o6a+NlT6GDOkuR50OsN8zVbdML5nnbPVE1Sm3UVBQIcZFcs7LwT9Z62f -BrzQJXwPwJkI/6k6AAskCz8yOtulivyfjto0zrW8zkDAhqmmbQgNNONy+Df5trDi -hYTs2sclUALyAK4uxKBO2B+2yme9KQQZUuHp2bWAMVSzZWdd5a1d+DYHZs0RbCsC -LTxtAtgzcTIK2YxV2pDHIVtvKlX6a5RWoq4x9wIDAQABo3wwejAMBgNVHRMBAf8E -AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw -HQYDVR0OBBYEFFNmiA4RPzGVD8tbsQkw4VT47H8GMB8GA1UdIwQYMBaAFIuCmYCl -O2mt1woWJNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQCBCQxu1RRDgxyW+1Vr -6mvdHRS9TRnakIYr8RlUMJ1SPOnMyzHzL1t7vJGVmyIGUJi9MxF05xAU5y7o7hoi -CP0z45lv7vKSXzZ12Y16U/yqgE/HsSqjn3n9n7vWDK6aQ71PcWA3HySpwT3WOx0D -z0ZMPo25FIbIjVZBMFzqQr1BcPVdwuyZrADms/lcIMfMggBdnhxUxjCrr1S/BFtF -GFGFKm9xRzNBexvbAO54U4uc4NthO+ysDDsKBl3xE2zyQfN/ZiJrqv/S/LLTyku9 -QfNMFpgP0xvzH1znP7lnlNFOED6+Q65V9H358zgMukGlUua6w7v9Zox6xTaH2Xbj -ry5I +MIID+jCCAuKgAwIBAgIUOcP7P2PASvkuOJb4hbeGgled4jUwDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjI1NjA1WhcNMjIx +MjIxMjI1NjA1WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlD+wqIZFBXaJCVFWWz/ig2BL/+RkgQquh +QTdSXRyaXJ389DK1+6K6i5MR0l8RanNKJxi9+yyTNwYQLR90VTOmLzS3UJxLC7rH ++GTh70Q5GkaoeweFsK1w4nRCl7EZiUtT5dx31bmPUf8lZNltPv4DNg5bVO5S8xSM +5QxczDxRxydh1B0a95DaKFPKYvEYV4AeDVu+Tgkbv9D139VlcPyVTkzK8vGo9Rl1 +Q+9+GYWAY9vTTPs6cjXWLvn8XPhGK9Ug7KZCUTeX2gmrES4Q8HVsL+V1mzjCrYF7 +mXYHjyyIRZA2GutMXf2IDh5TBeEXnL5Zue7KDZE6Q6GJDr/S8NfbAgMBAAGjfDB6 +MAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC +BggrBgEFBQcDATAdBgNVHQ4EFgQUFmy7Wr1kvm3v79NC+2mJni0wRTUwHwYDVR0j +BBgwFoAU4rJ//RiB6qHtvqx5nqI/KmysLvgwDQYJKoZIhvcNAQELBQADggEBADxh +sIcsgy8ao9ziaa+ep3gY3G5B9RdMKAcWBSN+Up602DmXzgwcW6fEvGW8AyrpiTQt +bl8RLaqveyMHM2gMDESbRk8EOnK9vLYQrS/30k5fs6JHe/An8Udpn/r/j72M341O +Xh7jFLzP3Lxbl9DWYrjkfTqkVswLNbp0Z83pxS+IthbWr7Ag9GytfWb8Y53G4r9D +CPYaLkeZjo2WFTFcHCIapW8ScUgYk018oEmFtBcbqDftp3i07cmEVnIuDhuX2iLh +G2QJFoztgmqBRaxLcTm26HOVkBb8DJd0DxyyRJkjBdymZcckANgwGPYIM2qdZKnA +xnwU9Pf1uFvobGi5V1o= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -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 +KBwdOlJZfkY= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/no_san_key.pem b/test/extensions/transport_sockets/tls/test_data/no_san_key.pem index 3720deb9fb3b..fcd5580bef75 100644 --- a/test/extensions/transport_sockets/tls/test_data/no_san_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/no_san_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/no_subject_cert.pem b/test/extensions/transport_sockets/tls/test_data/no_subject_cert.pem index 0994a86b71e7..b7a5049bf52e 100644 --- a/test/extensions/transport_sockets/tls/test_data/no_subject_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/no_subject_cert.pem @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/no_subject_cert_info.h b/test/extensions/transport_sockets/tls/test_data/no_subject_cert_info.h index 3889e5a592e9..d767c5e8546e 100644 --- a/test/extensions/transport_sockets/tls/test_data/no_subject_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/no_subject_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_NO_SUBJECT_CERT_HASH[] = - "c57a331beee6e04936ab6a9acd83cb0c56e7ff2ee29ca160451456544d075e24"; -constexpr char TEST_NO_SUBJECT_CERT_SPKI[] = "64bS5+cppoCZdPb1cCwN1Z5vt66MPShH5sOHunIt0oo="; -constexpr char TEST_NO_SUBJECT_CERT_SERIAL[] = "01f7fa35421d5635ac2213fab624f815df1d0573"; -constexpr char TEST_NO_SUBJECT_CERT_NOT_BEFORE[] = "Jan 27 05:02:32 2020 GMT"; -constexpr char TEST_NO_SUBJECT_CERT_NOT_AFTER[] = "Jan 26 05:02:32 2022 GMT"; + "cd9148635c03798012f6d208731b1346458c83defba5f944572ba30ec63bcfd5"; +constexpr char TEST_NO_SUBJECT_CERT_SPKI[] = "f6pj8cEiDtCOeUo6VBpMAYWpiSNf7nKiqKbiddU/Iak="; +constexpr char TEST_NO_SUBJECT_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de240"; +constexpr char TEST_NO_SUBJECT_CERT_NOT_BEFORE[] = "Dec 21 22:56:09 2020 GMT"; +constexpr char TEST_NO_SUBJECT_CERT_NOT_AFTER[] = "Dec 21 22:56:09 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/no_subject_key.pem b/test/extensions/transport_sockets/tls/test_data/no_subject_key.pem index 6601cd57c678..916b629d41db 100644 --- a/test/extensions/transport_sockets/tls/test_data/no_subject_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/no_subject_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/password_protected_cert.pem b/test/extensions/transport_sockets/tls/test_data/password_protected_cert.pem index dbc4f3a37339..c00ca68970c7 100644 --- a/test/extensions/transport_sockets/tls/test_data/password_protected_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/password_protected_cert.pem @@ -1,24 +1,25 @@ -----BEGIN CERTIFICATE----- -MIIEGTCCAwGgAwIBAgIJALi17MiY8hJPMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNVoXDTIwMTIxNzAxNTAzNVow -ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAoF+1fZVsBl4XKIcIxHDRZUzaBgRMptgdUcoU4td2ipsm3o36 -YKWNBM8DLUrm6d+nSjNaZkawDMHw+OOEpg1IwqPrCQpUtQtIJnEspr/RuX4U08o8 -G84Wa/+0dqRhrbrE3kM6UIF+dtTBcu33wTVYNDY/dJMtHsnPOxCzD3GGmGON3AyD -WVU/uBc0jGr3PwWoHAHZxStmnoje20fpB5ZDil75geeWc4z7dAFLAaGwOPr6jkSj -WP3rNUZ6NqgfKC5mKPqpJj3WJvX2+tiwEt5GVJA/fJeGvAUBakUMmEeXD8zSbxy5 -DFLL7oa4/nNzLAHlm2M9g/XtHZoGQFV2d7o7fwIDAQABo4GlMIGiMAwGA1UdEwEB -/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD -ATAmBgNVHREEHzAdhhtzcGlmZmU6Ly9seWZ0LmNvbS90ZXN0LXRlYW0wHQYDVR0O -BBYEFF63X4Jyb8iWArNsVAzfsV9QECK5MB8GA1UdIwQYMBaAFIuCmYClO2mt1woW -JNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQAPzxAJhhHJeetKyAWg+q68/1DJ -CnrChUszC8zmyIdlSw4fZ2gMkDLYRRM+n8vzrA5aQvqALa00ArexrI6xUN7s4Q2G -GS0Ja4wamJqJ4hJcj41+JJPfspssew6r6Xk82j+qko7gzyI5dSnDNguQFeOH7o21 -MyLS7JnZHGxmhXt5ebKgqefX9rVlJi4d3/LP1j5mKjFspBP9N7t4NwTn6ue5yjr7 -xux0Ucvr178kvmBFrOviiACeZwVIeKCVY/nuk/PskPHoU2t2F//USBFaRxqGD+nh -OI00z4s/ch3JgC2I18c04fyKihBJJyjy3dE0JRsKzqbXdIOaZPfk2UKfxU81 +MIIEJDCCAwygAwIBAgIUOcP7P2PASvkuOJb4hbeGgled4jswDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjI1NjA2WhcNMjIx +MjIxMjI1NjA2WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCz0xnEW/OtLYuFIdCCAo32W2kpdX1M0b5 +DY9SbUa7d+/zs0BX/jwIeDfe6qSXL6Pttez6Dxy3EsVwHqHmbQs1FOJkduogKWvv +oC/Pr9ykjOz2EZVuCVLRualGVu7GyWgxOHHtL/wjUZyuW0E1651C75tPJ3NFstWv ++6Bb8ucn4gJI4NT8/T0nch6tCMF5noSDcPEJw1+4M3DgWNGd6CZLquyDJbJHJol2 +t/TIyKFZ348urMYQqOaSdytcgpsSC5Pkx4sotpFAdPttNkTg2quScCYRdrHtRIUU +nTGassPeBmIlcTLpi3C0BE3iyLrrvQat6LWi1BYWNUkPXbLBrcFzAgMBAAGjgaUw +gaIwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH +AwIGCCsGAQUFBwMBMCYGA1UdEQQfMB2GG3NwaWZmZTovL2x5ZnQuY29tL3Rlc3Qt +dGVhbTAdBgNVHQ4EFgQUMjZgGqJ1V8qPoR9r4LiQWNB/ZMowHwYDVR0jBBgwFoAU +4rJ//RiB6qHtvqx5nqI/KmysLvgwDQYJKoZIhvcNAQELBQADggEBAAlUrn6GWDoS +cYX8Rz4izoZLVi3wY4JIq2o11FYUBBywX8MymdZZXnKFJ4GI+2Alg65bHncMCL4g +ptGhwQUcSx7T4tK9q4ul4nxwYEWrVDJjhTkiJ58F40WVUFIFZRarVEHr2SgXOx1x +CNYOyXTzipLjES3RMbqJMTlCRn1zNzVK3HmVsXmmhy1IfHPa4E6jSm19VMebTETe +XN08OxeK18aISE+1SRXP6yp52o+lU2xgGUreMcJ4sxf2YIgENw3rjmjDb7k56Zvv +6q8f9au3DEwgy3Daw3T9/VFMWct9dZZv+D93ubUxK6x6tEttJWDwHzCsSVrmklMf +leVLqJ5HO4U= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/password_protected_cert_info.h b/test/extensions/transport_sockets/tls/test_data/password_protected_cert_info.h index 1683c0366894..8265e73256ab 100644 --- a/test/extensions/transport_sockets/tls/test_data/password_protected_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/password_protected_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_PASSWORD_PROTECTED_CERT_HASH[] = - "93b251a830c5d9fe28d399d8a35917d2909d3f80c1717965b875a50d451f6201"; -constexpr char TEST_PASSWORD_PROTECTED_CERT_SPKI[] = "jrYWvpgM1G+OadfgpmWUpaVCD+4WbNs3R4kAGVWFXJk="; -constexpr char TEST_PASSWORD_PROTECTED_CERT_SERIAL[] = "b8b5ecc898f2124f"; -constexpr char TEST_PASSWORD_PROTECTED_CERT_NOT_BEFORE[] = "Dec 18 01:50:35 2018 GMT"; -constexpr char TEST_PASSWORD_PROTECTED_CERT_NOT_AFTER[] = "Dec 17 01:50:35 2020 GMT"; + "8619ebf1cffce4dfde79a201d133f52cfe68e513e4ea443aa850b41d3fb51817"; +constexpr char TEST_PASSWORD_PROTECTED_CERT_SPKI[] = "4sdPLOALJMpNS3MuW0ReD5BfvYTpvZbTLhOd7ovv/o4="; +constexpr char TEST_PASSWORD_PROTECTED_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de23b"; +constexpr char TEST_PASSWORD_PROTECTED_CERT_NOT_BEFORE[] = "Dec 21 22:56:06 2020 GMT"; +constexpr char TEST_PASSWORD_PROTECTED_CERT_NOT_AFTER[] = "Dec 21 22:56:06 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/password_protected_key.pem b/test/extensions/transport_sockets/tls/test_data/password_protected_key.pem index 76d6e1175f66..2649aa5cccee 100644 --- a/test/extensions/transport_sockets/tls/test_data/password_protected_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/password_protected_key.pem @@ -1,30 +1,30 @@ -----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED -DEK-Info: AES-128-CBC,3F37F60B0ACD2836F2835B7C5F64DC84 +DEK-Info: AES-128-CBC,31AF33342AFF1F08AAE0E0DC2CA296D3 -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns2_cert.pem b/test/extensions/transport_sockets/tls/test_data/san_dns2_cert.pem index 4632eaca7292..102e7eb37186 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_dns2_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_dns2_cert.pem @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns2_cert_info.h b/test/extensions/transport_sockets/tls/test_data/san_dns2_cert_info.h index ffb48c5850f0..431c36272802 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_dns2_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/san_dns2_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_SAN_DNS2_CERT_HASH[] = - "7e8ea45159d415e916fd2b850173f4f1b0f175211482ad611e2333333769fbd1"; -constexpr char TEST_SAN_DNS2_CERT_SPKI[] = "GVpPP0KVIOpFzHQRBvC5/UwYDx5apRo7XHmBb084nJQ="; -constexpr char TEST_SAN_DNS2_CERT_SERIAL[] = "b8b5ecc898f2124b"; -constexpr char TEST_SAN_DNS2_CERT_NOT_BEFORE[] = "Dec 18 01:50:34 2018 GMT"; -constexpr char TEST_SAN_DNS2_CERT_NOT_AFTER[] = "Dec 17 01:50:34 2020 GMT"; + "8c081ea01e22e338a2bc919153e8e49e5ea7b04144551294404f4975cc2ea2f2"; +constexpr char TEST_SAN_DNS2_CERT_SPKI[] = "2cnEJYpkYOESnKY5dC4S9Ut0Hh94aVqV4igcz1aRAuw="; +constexpr char TEST_SAN_DNS2_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de237"; +constexpr char TEST_SAN_DNS2_CERT_NOT_BEFORE[] = "Dec 21 22:56:05 2020 GMT"; +constexpr char TEST_SAN_DNS2_CERT_NOT_AFTER[] = "Dec 21 22:56:05 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns2_key.pem b/test/extensions/transport_sockets/tls/test_data/san_dns2_key.pem index ed853fae3e79..fbace3ddae8e 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_dns2_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_dns2_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns3_cert.pem b/test/extensions/transport_sockets/tls/test_data/san_dns3_cert.pem index 7fc0254042c1..2dd84c071487 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_dns3_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_dns3_cert.pem @@ -1,25 +1,25 @@ -----BEGIN CERTIFICATE----- -MIIEHzCCAwegAwIBAgIJAKi3O5rMMvJCMA0GCSqGSIb3DQEBCwUAMIGDMQswCQYD -VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j -aXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQTHlmdCBFbmdpbmVlcmluZzEd -MBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdGUgQ0EwHhcNMTgxMjE4MDE1MDM0WhcN -MjAxMjE3MDE1MDM0WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5p -YTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UE -CwwQTHlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCysXZdqVqHKZEhCndcgnbRTHIl2au6 -SdT/jtkCO2ZaqhFZv42G+H2WsYi7DrQTuJA+Q7VvJ9oEiziPi4uqdU/1dKWDti7o -8Qu2apd5TPYFsvqWMS0xAkkgNutwqhwnoel2/Yi1DHqCVQxKIfdAYMTdGDoenCGr -ZigZovHnxm4a70Kze4wNCa/TJNTmirizHO0zixVqptkCE8Os1d+3A19OuLr2e1Xd -A79Tj/LZ6lcS5JieKdCEuBRRgd6TpynzO+kCmbHJ/MB4KJYHDn+j1ljHD0akG+Kl -ALLhMo0QUOzBc8eDqc27UNIDY4rUkmGP0VMSFKz+ee/7sq6/OF2smkaxAgMBAAGj -gZ0wgZowDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYB -BQUHAwIGCCsGAQUFBwMBMB4GA1UdEQQXMBWCE3NlcnZlcjEuZXhhbXBsZS5jb20w -HQYDVR0OBBYEFO8wWUDG1XNZtgAed7O0CCXAe939MB8GA1UdIwQYMBaAFG/TymYf -ctZkFiEuB7srW8el7kVGMA0GCSqGSIb3DQEBCwUAA4IBAQAT4FicynBc4N4VQygj -a+8BVL5H0ol0/SbOHU97E+jWoiem9FQ3UbvvegbySWJfvGDEb+ShM6HYqlW+UH5I -zeaAWmAS7QcCYkM9imfDWTPFxEqHcyYAbqmD3vLp/Y+VTIecxuwfy324RnjHss2x -q+ISbuH8CkHXujC0O7ciyFr7nDnkSMpR1sJvpbo14zpyrBsiohDZtk/Atl1ouWcc -G43FRuQOMW3aSFk3hQTZxKmmgdF1Y8HFEg4Mass4gM8XVUyB42iRdt6xsBEdbOPM -nrAjLZHAPr6etK8apfh/olSN0+QY8hHc+OxzGJuJ7IufYiTaU+W3l0u38r8wfllA -SdIU +MIIEKjCCAxKgAwIBAgIULfeissP3vjRb0r3wS419s8fdQAcwDQYJKoZIhvcNAQEL +BQAwgYMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH +DA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVu +Z2luZWVyaW5nMR0wGwYDVQQDDBRUZXN0IEludGVybWVkaWF0ZSBDQTAeFw0yMDEy +MjEyMjU2MDVaFw0yMjEyMjEyMjU2MDVaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +DApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARM +eWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNl +cnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDXruHLpgU0AFzT +nBigU1dgW/GdLaZetY4b1vHBSyULn+iFY5kaOrMk+rNC73NO8B9QbRM7G4nk+3I6 +SjmeUzeAV/IYG4OpPkcHKi5ipkyZek9yXNp+WNuG4Lfb2OF+W2T3BFBqiF3Uxqfp +ILIkNzQ9ycS+uj8HWLeH8EiM9ooOn9CkUrC5BeSMQcu9qO9ZHEeHVvvgGgsx1qal +4LMzTuAoINQ8GJvUXdj2robePnet5O3z0n0XTh2WLXD/HHmOA0L7GuQi03z9ZmGO +gDBAtQX7ZataZAn6k2moMWkyCj/Fz1u5/61uKkMF5pLCF22QFWp6CSNpUMgbolQF +atgYSnkCAwEAAaOBnTCBmjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHgYDVR0RBBcwFYITc2VydmVyMS5l +eGFtcGxlLmNvbTAdBgNVHQ4EFgQUg9YihDg8tECE1ZOKUl0hzKFKU5wwHwYDVR0j +BBgwFoAUQy1/7Y1kvin5/wgpzStrNp9w3lAwDQYJKoZIhvcNAQELBQADggEBAB30 +8Wv7yGOAplOE44Q5rBPiUqt8eP7DinNAGj/NjE4jv0nYjLOLDNx6wSSjqE1G5nCQ +pAmIwFwv/1i+klSMVfidb+V6GFoNB6XJr6X/COBuq0B77CgdT7S67ToEp1k/nOXB +M8qMU8SAUrhefrBGquqNaL5QVgi9r2gXnjiTZN4I/vpSjmaIUk2g7V6yyTep2thW +Q+mIZkVsfmizY2Niir3SXMUoAfo8Sn7PIgCP7ONAqzupv5qlA8RkqLjhcPYF7KGs +jw8OjSsxSFwVXmGGzG4Vz2aIpDcDfAGOuRYLlhqBuJLCl6+uSXRmWZ5Ql9EauLFF +grzoCO8CJyBz8/hJjp0= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns3_cert_info.h b/test/extensions/transport_sockets/tls/test_data/san_dns3_cert_info.h index 56587c693b86..a7a081a52896 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_dns3_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/san_dns3_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_SAN_DNS3_CERT_HASH[] = - "e9cf5232115daae3f05c27e84c16cff35a8413ee79e46e5d6710ac5d3215f8b6"; -constexpr char TEST_SAN_DNS3_CERT_SPKI[] = "HPb90dH6E4le6VYRfixpcKWPobiR0SQ5r+rmEfrYLY8="; -constexpr char TEST_SAN_DNS3_CERT_SERIAL[] = "a8b73b9acc32f242"; -constexpr char TEST_SAN_DNS3_CERT_NOT_BEFORE[] = "Dec 18 01:50:34 2018 GMT"; -constexpr char TEST_SAN_DNS3_CERT_NOT_AFTER[] = "Dec 17 01:50:34 2020 GMT"; + "1c2ed9c1343e98a03ceaf51e2fea458b24ef76d292a7a62b80a2c09807077dc4"; +constexpr char TEST_SAN_DNS3_CERT_SPKI[] = "5OklNJ93FwvFusQbrLf6+VYsXqqrI0z1fi16xXz8NCg="; +constexpr char TEST_SAN_DNS3_CERT_SERIAL[] = "2df7a2b2c3f7be345bd2bdf04b8d7db3c7dd4007"; +constexpr char TEST_SAN_DNS3_CERT_NOT_BEFORE[] = "Dec 21 22:56:05 2020 GMT"; +constexpr char TEST_SAN_DNS3_CERT_NOT_AFTER[] = "Dec 21 22:56:05 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns3_chain.pem b/test/extensions/transport_sockets/tls/test_data/san_dns3_chain.pem index 286e1b8f6359..33d4726da296 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_dns3_chain.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_dns3_chain.pem @@ -1,50 +1,51 @@ -----BEGIN CERTIFICATE----- -MIIEHzCCAwegAwIBAgIJAKi3O5rMMvJCMA0GCSqGSIb3DQEBCwUAMIGDMQswCQYD -VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j -aXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQTHlmdCBFbmdpbmVlcmluZzEd -MBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdGUgQ0EwHhcNMTgxMjE4MDE1MDM0WhcN -MjAxMjE3MDE1MDM0WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5p -YTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UE -CwwQTHlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCysXZdqVqHKZEhCndcgnbRTHIl2au6 -SdT/jtkCO2ZaqhFZv42G+H2WsYi7DrQTuJA+Q7VvJ9oEiziPi4uqdU/1dKWDti7o -8Qu2apd5TPYFsvqWMS0xAkkgNutwqhwnoel2/Yi1DHqCVQxKIfdAYMTdGDoenCGr -ZigZovHnxm4a70Kze4wNCa/TJNTmirizHO0zixVqptkCE8Os1d+3A19OuLr2e1Xd -A79Tj/LZ6lcS5JieKdCEuBRRgd6TpynzO+kCmbHJ/MB4KJYHDn+j1ljHD0akG+Kl -ALLhMo0QUOzBc8eDqc27UNIDY4rUkmGP0VMSFKz+ee/7sq6/OF2smkaxAgMBAAGj -gZ0wgZowDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYB -BQUHAwIGCCsGAQUFBwMBMB4GA1UdEQQXMBWCE3NlcnZlcjEuZXhhbXBsZS5jb20w -HQYDVR0OBBYEFO8wWUDG1XNZtgAed7O0CCXAe939MB8GA1UdIwQYMBaAFG/TymYf -ctZkFiEuB7srW8el7kVGMA0GCSqGSIb3DQEBCwUAA4IBAQAT4FicynBc4N4VQygj -a+8BVL5H0ol0/SbOHU97E+jWoiem9FQ3UbvvegbySWJfvGDEb+ShM6HYqlW+UH5I -zeaAWmAS7QcCYkM9imfDWTPFxEqHcyYAbqmD3vLp/Y+VTIecxuwfy324RnjHss2x -q+ISbuH8CkHXujC0O7ciyFr7nDnkSMpR1sJvpbo14zpyrBsiohDZtk/Atl1ouWcc -G43FRuQOMW3aSFk3hQTZxKmmgdF1Y8HFEg4Mass4gM8XVUyB42iRdt6xsBEdbOPM -nrAjLZHAPr6etK8apfh/olSN0+QY8hHc+OxzGJuJ7IufYiTaU+W3l0u38r8wfllA -SdIU +MIIEKjCCAxKgAwIBAgIULfeissP3vjRb0r3wS419s8fdQAcwDQYJKoZIhvcNAQEL +BQAwgYMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH +DA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVu +Z2luZWVyaW5nMR0wGwYDVQQDDBRUZXN0IEludGVybWVkaWF0ZSBDQTAeFw0yMDEy +MjEyMjU2MDVaFw0yMjEyMjEyMjU2MDVaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +DApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARM +eWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNl +cnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDXruHLpgU0AFzT +nBigU1dgW/GdLaZetY4b1vHBSyULn+iFY5kaOrMk+rNC73NO8B9QbRM7G4nk+3I6 +SjmeUzeAV/IYG4OpPkcHKi5ipkyZek9yXNp+WNuG4Lfb2OF+W2T3BFBqiF3Uxqfp +ILIkNzQ9ycS+uj8HWLeH8EiM9ooOn9CkUrC5BeSMQcu9qO9ZHEeHVvvgGgsx1qal +4LMzTuAoINQ8GJvUXdj2robePnet5O3z0n0XTh2WLXD/HHmOA0L7GuQi03z9ZmGO +gDBAtQX7ZataZAn6k2moMWkyCj/Fz1u5/61uKkMF5pLCF22QFWp6CSNpUMgbolQF +atgYSnkCAwEAAaOBnTCBmjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNV +HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHgYDVR0RBBcwFYITc2VydmVyMS5l +eGFtcGxlLmNvbTAdBgNVHQ4EFgQUg9YihDg8tECE1ZOKUl0hzKFKU5wwHwYDVR0j +BBgwFoAUQy1/7Y1kvin5/wgpzStrNp9w3lAwDQYJKoZIhvcNAQELBQADggEBAB30 +8Wv7yGOAplOE44Q5rBPiUqt8eP7DinNAGj/NjE4jv0nYjLOLDNx6wSSjqE1G5nCQ +pAmIwFwv/1i+klSMVfidb+V6GFoNB6XJr6X/COBuq0B77CgdT7S67ToEp1k/nOXB +M8qMU8SAUrhefrBGquqNaL5QVgi9r2gXnjiTZN4I/vpSjmaIUk2g7V6yyTep2thW +Q+mIZkVsfmizY2Niir3SXMUoAfo8Sn7PIgCP7ONAqzupv5qlA8RkqLjhcPYF7KGs +jw8OjSsxSFwVXmGGzG4Vz2aIpDcDfAGOuRYLlhqBuJLCl6+uSXRmWZ5Ql9EauLFF +grzoCO8CJyBz8/hJjp0= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -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 +KBwdOlJZfkY= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns3_key.pem b/test/extensions/transport_sockets/tls/test_data/san_dns3_key.pem index 31e7ffdda6f4..62dcfee925f0 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_dns3_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_dns3_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns_cert.pem b/test/extensions/transport_sockets/tls/test_data/san_dns_cert.pem index 74c9d9191f5e..eef31c25ec45 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_dns_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_dns_cert.pem @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns_cert_info.h b/test/extensions/transport_sockets/tls/test_data/san_dns_cert_info.h index 8b2fd04ad9dc..dd94cf2217a5 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_dns_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/san_dns_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_SAN_DNS_CERT_HASH[] = - "0f55f8b1afa27f5a252ff861179dba1670bf0c93f3ea5acbed53e6f1246082f4"; -constexpr char TEST_SAN_DNS_CERT_SPKI[] = "MH1QY2vqNI94fwiacyfg1AxscjullSclXq2/eN6H8/Y="; -constexpr char TEST_SAN_DNS_CERT_SERIAL[] = "b8b5ecc898f2124a"; -constexpr char TEST_SAN_DNS_CERT_NOT_BEFORE[] = "Dec 18 01:50:34 2018 GMT"; -constexpr char TEST_SAN_DNS_CERT_NOT_AFTER[] = "Dec 17 01:50:34 2020 GMT"; + "a995907da9279feece2292a547703802555e8662e4bcab45bc8d02b0ca5d2426"; +constexpr char TEST_SAN_DNS_CERT_SPKI[] = "CVFm2VtSJ89I9X+4AIOISpgdGALj9hjCVafNdXNbJvk="; +constexpr char TEST_SAN_DNS_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de236"; +constexpr char TEST_SAN_DNS_CERT_NOT_BEFORE[] = "Dec 21 22:56:05 2020 GMT"; +constexpr char TEST_SAN_DNS_CERT_NOT_AFTER[] = "Dec 21 22:56:05 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns_key.pem b/test/extensions/transport_sockets/tls/test_data/san_dns_key.pem index 3f7995b70db1..a29d9aac4be2 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_dns_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_dns_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert.pem b/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert.pem index 63e36bc6cff8..d2338da4312f 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert.pem @@ -1,25 +1,25 @@ -----BEGIN CERTIFICATE----- -MIIEIDCCAwigAwIBAgIJALi17MiY8hJMMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow -ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAva/6bdcR7bEefLeLsee4o8mLw+KhMuW5N3oH8OlKuHh9q8Tu -hSpk7RSfmERh9Ajx47pirZKuMTlsxNL3xV7bqn0GH/ozCSabgFKdWTNU9y7dSS0r -vSUA/sRwugCfWc7b4G8hR41M1i3XnO1rUtemvbvzQ+Z5UD20Lx1/oVtu5MCe9QAY -5P7G0FqjKXSxg49eFWi3Ew/xx9U+PTWZBjqEkmGVXVj53n10YLvAyp3iv3qJxQoP -B6sAi5HMgSb9e4dOLmmHwHpdDNa01sk+ILhUHqXsnJ1A2VdIasbqrsr2AaKM75P8 -ak2ZqeBc7ytzdx/TcsJMqWrp2+2oyl2ykjqACQIDAQABo4GsMIGpMAwGA1UdEwEB -/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD -ATAtBgNVHREEJjAkgg0qLmV4YW1wbGUuY29tghNzZXJ2ZXIyLmV4YW1wbGUuY29t -MB0GA1UdDgQWBBSnCILo7vBSrb6gD0zRFk2piJ8zSDAfBgNVHSMEGDAWgBSLgpmA -pTtprdcKFiTUZxUkLNRhZTANBgkqhkiG9w0BAQsFAAOCAQEAtILuO3Pin3Cq+1B2 -K4o0ZmTmXdw8VnnklXfRkXVHwY2u+KeOMDiX0yVjGVRpV0A7sRhJlTr+pxwJ6Mgx -XMCzYhRR5BoIHobGKGmueTfuBJGzQWD37u6o0zOUnDdHSwdmBU/s8VHk9fhfbIIe -8GLTOrBLHPQkZ0PXNhoLeOPYFSNlHNoAgMAPqPfiRfeWP83QqhOGVH7N0QDC16dC -v3CmVzLr1K0HDA/EnK6KdiHz9LPfC8NP4qcCRiX0vPGdjrUD2feVIVZjkQCbJBSQ -baNSQNeaCgLXS+tt3EGMDpu5OQDVFDCam6x5XvBUlnkKJeHR7Pds/CZKBHB6So5a -yNB0Dw== +MIIEKzCCAxOgAwIBAgIUOcP7P2PASvkuOJb4hbeGgled4jgwDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjI1NjA1WhcNMjIx +MjIxMjI1NjA1WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCp7cKEjvVLS0YhbLa1iIFXArEftFBQGXFT +ZtxeVm2DR8248FmWtfFpnWbXkGrQgh6OMdcR5iGlpuvpVED5AGhruyiAT2rxAvsZ +7J6/u2yvOHHpxYQ9M5P/+sC24mUm2ShbCEi3Mii4lbaUZLh/ASlcX+GPrqNejg6l +a/1oKZ6JkLHQruFOB7ksIWLNdPpO48Z+dqSYIR62Uip2G4BJYaRtUpP5S83AfqPl +qFqMGKyHUAYD9EIeyLpG6FXFPkRHgrI/Ii6fkfOspJ47Vbc43uO85AIOXoGzsKPp +gNkdY2kYywwaD1zQWoA5h8CDB9C6etkbSpT3qRdXjNDaSzmPZE6VAgMBAAGjgaww +gakwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH +AwIGCCsGAQUFBwMBMC0GA1UdEQQmMCSCDSouZXhhbXBsZS5jb22CE3NlcnZlcjIu +ZXhhbXBsZS5jb20wHQYDVR0OBBYEFGFjr+tsz+P4cByC1sxKCU26MBoBMB8GA1Ud +IwQYMBaAFOKyf/0Ygeqh7b6seZ6iPypsrC74MA0GCSqGSIb3DQEBCwUAA4IBAQC8 +MVuhL5c3g1lnOsglHfe8H3Yy4MLbEvTBMibII9ZBm4k28MQ/XnZW9PgtrWKKV2dD +2ycmN7EsgC70nRwh+8SuariOUapYewE43ahJiAfCGNqOaCfj+kCm7iyf8u6VPy36 +BXPTsr9CrU00LZJ8rkbiFXnwtcTtWf1G/CxleJyk6TIwrIYDkROvfhr5l2JlZEag +Vn8lAFxBPIavZQOEwELm68ZDdlaf+tyxuLAIAdt4R1ZTLutV9Iwu6Pq/noKxvkuW +DcCFpcMDY6e2XRncoTbhUDfNiUVBOt3Qad2Eg+thkQv0AbUJK5hTdLKqKqQkrBYR +zjVIvs122SAau+qCPwQr -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert_info.h b/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert_info.h index b0875c3191d4..199e7a4fdf71 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_SAN_MULTIPLE_DNS_CERT_HASH[] = - "e37a8ced3878866ff394df0e81980c913653d079c568beaea50fb4993b6ba362"; -constexpr char TEST_SAN_MULTIPLE_DNS_CERT_SPKI[] = "aGwdbHvoWTPx52siXA5Y4V2Z6ofdj+lLR4Wm0s7RMWs="; -constexpr char TEST_SAN_MULTIPLE_DNS_CERT_SERIAL[] = "b8b5ecc898f2124c"; -constexpr char TEST_SAN_MULTIPLE_DNS_CERT_NOT_BEFORE[] = "Dec 18 01:50:34 2018 GMT"; -constexpr char TEST_SAN_MULTIPLE_DNS_CERT_NOT_AFTER[] = "Dec 17 01:50:34 2020 GMT"; + "19653d81b28885bf47ec5646164d6c3de4b8081bb8674ae4319332391eee27a3"; +constexpr char TEST_SAN_MULTIPLE_DNS_CERT_SPKI[] = "dmN7iyYnhiYT+ZsFYhFgBXaK0n+es+OX7Oqtnp5XUpk="; +constexpr char TEST_SAN_MULTIPLE_DNS_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de238"; +constexpr char TEST_SAN_MULTIPLE_DNS_CERT_NOT_BEFORE[] = "Dec 21 22:56:05 2020 GMT"; +constexpr char TEST_SAN_MULTIPLE_DNS_CERT_NOT_AFTER[] = "Dec 21 22:56:05 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_key.pem b/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_key.pem index 2d34987924b4..ff22f8c35c47 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert.pem b/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert.pem index c70e5c2adce7..1ca257aaef7f 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert.pem @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -MIID+zCCAuOgAwIBAgIJALi17MiY8hJNMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow -ZDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6bDN9SPumxs8n -wCWywmVN5R87oMwLwoSufsi35Jc/MAQxI4tOcJzDr3ToRkZEqEiZHZdORKTHhmfI -GoQwmT4Z0ABcHyC3P4vb0IUgtSCsci5xzh8zVggm9wZGLzEt2MhcUsISFwrAtQvO -efJNGj9EEicwGC9Esan1DoTosec2eDzokb0DvIQzXm6YJN+g2ccDWGjjA8k9bBLl -EMp2EkwCT9zYx3LQWO6OuLxzQeaIIho3I6ySaYJigxwEG9fpoHe+svr03/0K8LKd -J84JD9X6ztGA35Y7GhIZ0a20ve6M/PUOo/zP1OXowiVhK8HmroHO//UE+8a9kONc -xERDKvCVAgMBAAGjgZ0wgZowDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYD -VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB4GA1UdEQQXMBWCE3NlcnZlcjEu -ZXhhbXBsZS5jb20wHQYDVR0OBBYEFKOTR160qm1NpkDE6dn6d3n0Qwp4MB8GA1Ud -IwQYMBaAFIuCmYClO2mt1woWJNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQC4 -0tAXulJLKJsLj2r3hFvuqE7J9gbQDa3cEoCNwqjXiEQvJ7Qk7uWZ4zkiL2jHiCGV -CfeEEXHdsfmHKFIjH5dtSqyQw0IHzDCNgjuM6AWSDwGROLCd8bQ8hl5tfNVxdRG6 -6BgN5ItWXp5W5aNIl5MjvngZtnO3n6j7qzA7N+CQkCm6mwBQKpdeTtUuduoyaxmg -pBJtBD9qibzZ2GRcDlYr7rE0yo0BucMNSL4Uu1owwTd/3I354YN4ZI2RZj1trtTU -xTny7gkblcAZRFf3xEMDk2g0kHqU6WQ/bNK9I59E0AWs8Tbjy5aPBJox0csJr5Bx -yeXzjha6OvlkxaeYe2Ix +MIIEBjCCAu6gAwIBAgIUOcP7P2PASvkuOJb4hbeGgled4jkwDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjI1NjA1WhcNMjIx +MjIxMjI1NjA1WjBkMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMb1M6k0sd9QaEjvxpgnds+5SS+/V+whgjd9DyoLEv9tBGZKKgQZVvYE4sHWf5F0 +9S7+5TgNDEARsRdeYJuBOgsZqRtXrXfqB3/oavzbsyD9p+YDei6RlCaQ7GEQ9NHx +DIEtoiDvJzPIRH8yU9KtS4F5DJXkq3hg++5ICF1TW4AZYD2bCFJRuyGTA5CJiDkz +kJRx/CrRV5vk4h1LEEnyExL0FlxZhrYtyCP0SI4SLtB0lPLSdQhUu23vUzm7cqEg +K6gnX9Itw8K3X83IPuS+omG/T4ufA9EQd4h1xloG80wrviC3Z8snvfYY1cnTB7ej +//s+eagZK0w4/0Fjut5b478CAwEAAaOBnTCBmjAMBgNVHRMBAf8EAjAAMAsGA1Ud +DwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHgYDVR0RBBcw +FYITc2VydmVyMS5leGFtcGxlLmNvbTAdBgNVHQ4EFgQUFjnnUilubjd9eNL+boJU +xKocf+owHwYDVR0jBBgwFoAU4rJ//RiB6qHtvqx5nqI/KmysLvgwDQYJKoZIhvcN +AQELBQADggEBAHVKpnG0/kZo8WIDUCL0yjwO0afQfryPi+S7ssuFNrXVh9PiJB7I +DLPttX7F2ZBrjx7KGjPqxHXOV8cIBA89NWIY9GlnpjFWtliLl6qHVXKmYGmNqvL+ +X7sPk3EvxWkfmw/vpSyjUiVhwnhtUDm2N1nBUCZpRzBesPLBZsCrCCvU8Muof0ok +tVGezasOMX4rmXBaN1FYvNAUfveO90tPuiV5YGCuBxewpdLrECuFReW10yc8Yq1D +uYZlbMQlNjZg2THNqBsFTXxQAUiv9AFX/ht46j7KnEBpkxbVLcqDnWDKQE0krCIf +4U2P5CBTxP6u8tnh7WKeH2Xej4mTVTCEo6k= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert_info.h b/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert_info.h index 7b4dea9cc927..b554ef01fd99 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_SAN_ONLY_DNS_CERT_HASH[] = - "5c9069ccc9f127c4eaa4678fe230d6d5c0b5e65a22d31ff3d15177590b1f3cd8"; -constexpr char TEST_SAN_ONLY_DNS_CERT_SPKI[] = "D/5TEdqaOeNXddOK9rpecHD/iskyrCfr3uQlLW0fSis="; -constexpr char TEST_SAN_ONLY_DNS_CERT_SERIAL[] = "b8b5ecc898f2124d"; -constexpr char TEST_SAN_ONLY_DNS_CERT_NOT_BEFORE[] = "Dec 18 01:50:34 2018 GMT"; -constexpr char TEST_SAN_ONLY_DNS_CERT_NOT_AFTER[] = "Dec 17 01:50:34 2020 GMT"; + "4ea28e89210ff97fb383e003f31e91596b1a6b7dd6c326d3fd1645672b30bf8a"; +constexpr char TEST_SAN_ONLY_DNS_CERT_SPKI[] = "9hFDRtWymzmZrRDzej31v5xmVp+ZVL3hjilW9xAc12w="; +constexpr char TEST_SAN_ONLY_DNS_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de239"; +constexpr char TEST_SAN_ONLY_DNS_CERT_NOT_BEFORE[] = "Dec 21 22:56:05 2020 GMT"; +constexpr char TEST_SAN_ONLY_DNS_CERT_NOT_AFTER[] = "Dec 21 22:56:05 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/san_only_dns_key.pem b/test/extensions/transport_sockets/tls/test_data/san_only_dns_key.pem index 8a7697eb7470..ced00c34510e 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_only_dns_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_only_dns_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAumwzfUj7psbPJ8AlssJlTeUfO6DMC8KErn7It+SXPzAEMSOL -TnCcw6906EZGRKhImR2XTkSkx4ZnyBqEMJk+GdAAXB8gtz+L29CFILUgrHIucc4f -M1YIJvcGRi8xLdjIXFLCEhcKwLULznnyTRo/RBInMBgvRLGp9Q6E6LHnNng86JG9 -A7yEM15umCTfoNnHA1ho4wPJPWwS5RDKdhJMAk/c2Mdy0Fjujri8c0HmiCIaNyOs -kmmCYoMcBBvX6aB3vrL69N/9CvCynSfOCQ/V+s7RgN+WOxoSGdGttL3ujPz1DqP8 -z9Tl6MIlYSvB5q6Bzv/1BPvGvZDjXMREQyrwlQIDAQABAoIBAE2y2UcHizN4u1CT -CmNWGIj9zSW6IDFqkohz+U6D7PH+HlEowmAgGYaJ84z39UOabB+9MJoDjDZI86p4 -Os5SoIp7ohrDMoyN5MnqQAJg28xkDq2KPoDUA7PR04CfHL1CFEg+ifqmNeoZy2D0 -fKPcI7BIbKLkAZd9ARxNP+IIfBi8EFMgUVVT+fTAO5aHidS/kR+3eL3hB/r5xo89 -gMEnmsLqTr3yfMybND1c/K/LxPbxUAPuxhrfqUKlLm9O0IXzYe5Or1xcNBgVQE+q -JTm+hGSMsNtcqnYdbhhnIurfOgCcMF4atIUi2noSh15DvESUsKtwoRbxvtrFqimG -MpMVHOUCgYEA4tQU+GBsPeS6klOLQoSUO7mC7/neqpQ9RwEtc7YBLxnaGH541YpG -PL/JtzApNoAQwVLzkF6cODPXnlEzVqV4u6z1ou8yZntNV9UiruLy7o6+Zf4wx2Ci -AONon+n6+N7HDd+Qexi2+DTUjUgdXvMxban3XE6FBMCsLmQh8F8wmScCgYEA0mXU -3w1M2eSQfpFKhNMUtQKxmdAiBNcu/P2dLdgVkyksi7IfM/x5PJEhtGHvlWrWkMjV -JzfJiidWNCt6fKqtjRlaeIsHanP/Fd5n4H9FwYB3bOM/m/b4gEYieCM7s7/A35SR -AM/35ADdK4YI0uhiDA4nRD7i5Tjl+Qep49zbpeMCgYBbZKSGZyN11MEv0CWeSZkI -b3jIhF8pT81Y3KqZos3bUolDsUGymKIwO/5kpy0T3onhuzCUDOrY4lqQWZtb4BRD -Wi8m1UXzcN768s+ks6C6ah1hLwgsbU0ZGoe/VyFeQTTm7Btk3dJrM64ottPOvCJA -U2ltcd26yn8VuhbKqTAFpQKBgA1oD7hm0I7R0aM+/tCX4qnmEgsLCB/m1keooWta -aYWHCh+cqgBWBiOl28/yraGHvURch7iIBX+YIhYQ7y0icwyaoPktYruVyJtMILJd -acR6uyFlGZiGlC8YSPn+xL8faNrWTKcQmWsd4vnzAHzv8c9y122x1CNnDMBhjKHI -YPahAoGBAOF6g2inVgL1LBA8Uve38ln3mVIY0qcbIDyEOKzsNnevOTBD93lJI/Di -/XwtOKrIzZSYZU090/81qp0rrgr4wqNSxxz6yTCVi3obZ74Q+y8HsfSRT950hXBB -vmPfatTyGPeiWtUVRw+iQ9WaEHVpSECeLXUXiKHfeOb4giAF59kk +MIIEpAIBAAKCAQEAxvUzqTSx31BoSO/GmCd2z7lJL79X7CGCN30PKgsS/20EZkoq +BBlW9gTiwdZ/kXT1Lv7lOA0MQBGxF15gm4E6CxmpG1etd+oHf+hq/NuzIP2n5gN6 +LpGUJpDsYRD00fEMgS2iIO8nM8hEfzJT0q1LgXkMleSreGD77kgIXVNbgBlgPZsI +UlG7IZMDkImIOTOQlHH8KtFXm+TiHUsQSfITEvQWXFmGti3II/RIjhIu0HSU8tJ1 +CFS7be9TObtyoSArqCdf0i3Dwrdfzcg+5L6iYb9Pi58D0RB3iHXGWgbzTCu+ILdn +yye99hjVydMHt6P/+z55qBkrTDj/QWO63lvjvwIDAQABAoIBAGt3t1gGpq3BeRMs +sVEuv/akVuv7pzpdP0FJxA8pvDFMabv3A4sDRP3O1c1uV6nySx3/gUEtixhwdf/x +cq2MuBWW3sluKr1DJJnqqR+8bJ29ZhvQdQcCi8vpLEWiKxvb4K1GQPUZOUu3OYib +XrvF76sX/7xXsGdtu6eSMTJ3/EzMc/mv6bhry9r+a/l0X4Xd85n0GNO0aby/A0dc +tygP0yhLzUZNPQYKrXgP7bEE3J9tnqS7G0ZVfMA6frACMr+rMpXbF/CGd5FFNUvY +HDMpDRcL0NB7KMd46dJiP/h02vaFu0oeHwYx3Gg/+H4JgOoTg9jIOwIEW9hZw7hi +Dkk0mcECgYEA74PaQYkVwjm9VLvDypO0r1DbU9usTr9bMwmRuXVJMPl8ABiqd8Yj +vqtcoteuHXwnRNZwt0ksTusWYXrWFCdoYhNUuVk6ujMlVBASvaH+kV/i60HeAHs1 +TxWlPKPmDzIh4okZUvdUzrabrISEFyKUnFE5FcddZT0WNRHwwXAsua0CgYEA1Ka/ +xLNxDO54qaAQ07rrZtj3qDHkFYXeUqO4bJtVqsqB0uh9OQfvSJGpXdogKkpzZOvF +xOj67dRPYKHKGayzjD/aefUOSRXe8WkH4y6x8s6ng9hGeJWn5ArSuCXdpBd86h1O +Sy2bB5bB8XT3ArjlomdYRCh51iqEiDefW3fEWJsCgYAp9nXUqYnQX4FWSRdCdKJh +XM8wX/pOSaRWysRnM69BD1S0R54GIga9LxSpyxPMQqY2n0NcOUuz/+gJ6BV9rnHR +TQW4+3MYkEFn+vDtnGYXXi9JfF7CwtNSKb6rYyO5YdUh9VckfAS1urSHgygJTZuv +z2Mq96TbSdqMLbp6iYaseQKBgQCdTWgn+lETLshlObmY1flSUAcLDTTaUvd9jAxd +kp5RQ5G7US1oZZ00wkNV4IfQoNgxfFMEcQ9FpLq/EY8tZNpAUe+sLYFOwPX1ACvM +evs5UHMMDY07oADcqMDtZV1KB/HoQJts8yRt/bAji9E420tK0kWxzXsq2LLHDNY9 +1B+TJwKBgQCbIZpcMmm8nqvcVcHo4E+6KNBX9z8M9RQejGtEacDdQUks+v0pzaBo +CsDvrS1nyhleLLtZw27qBIMRHlbdB+7lHY0tqFc7Bvr3z6l5la3LAy4KlHBkGtb9 +cyPmu7gxdf+OzAUmQ4hGsJKAVMx6+eyW3q2nkWta/kyEgnPjb7gomA== -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_uri_cert.pem b/test/extensions/transport_sockets/tls/test_data/san_uri_cert.pem index dc74b06eedef..272a25e5f34e 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_uri_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_uri_cert.pem @@ -1,24 +1,25 @@ -----BEGIN CERTIFICATE----- -MIIEGTCCAwGgAwIBAgIJALi17MiY8hJOMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw -DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNVoXDTIwMTIxNzAxNTAzNVow -ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh -biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l -ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAxPcwdwZDoifEnOxeDizZd3ItLWA54kX7FgyfUJ71rfQM5SWA -TolMCUg3MIABfMZEKJFVl5eG83VxKjjVzVFMLu3quRXV4ziJjoURMUjGFONwzwzw -ys5ns/GBSvM9hYK8BKMvRG1O/hcA/Ir0BWkdXhZ92up46eEPY/WmIHYmLg9XOnrE -SnuxjaUzg9hrAqJvKVOA7EeyFTOv8uWAj0b5coXUk/vRhWo8VFKrKeVEnzOifevv -xDeRRotSTmuoNqty2NjWTK+jdhKUDWagIMfgfdBQ9ACiD9Mebk5bCvFR69oYsnSw -AYth2kVAgjXu9Dvn6pnD90dAkYzgRQRzPj04gQIDAQABo4GlMIGiMAwGA1UdEwEB -/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD -ATAmBgNVHREEHzAdhhtzcGlmZmU6Ly9seWZ0LmNvbS90ZXN0LXRlYW0wHQYDVR0O -BBYEFPp6C7rKg3dMeOVdB/qSIkGTg237MB8GA1UdIwQYMBaAFIuCmYClO2mt1woW -JNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQAjqIbD4KskjsvJkK0abycCpyAt -6zJs8+dKft8jmyAAzE2k+dHAUkz5ixc7HpKHsgK3r1I9Kd1fZzvONO8jTDWroCcz -Aa87MCR0CNUSSOuMuVP00W9ODdnN9e7LlT8YmSNcpkm+XYSIvp2OrDaGQcuZv8ZP -v8ixpedNGNj7HLWBlVjlMWb/qHS/cT6sKodxpQVgYqBi85bwm49IkhdtTneTiWCm -h5CWS5K6q3TpSEqMAsXAr5XA31hOzw250YoLckgWnOOQC39TvOu90FwcmkKgp35s -+UhS2GmUTwm1wjVvK4XHQjxHalvdD+tlMnxAsJem19y374zT+mo8lIoUA82U +MIIEJDCCAwygAwIBAgIUOcP7P2PASvkuOJb4hbeGgled4jowDQYJKoZIhvcNAQEL +BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjI1NjA2WhcNMjIx +MjIxMjI1NjA2WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW +MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ +THlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc+YZ2JYgz9GIwHuLIP4OvuaWEDL1s/5wk +LQyPhkAtCGcsuRr1rmaGH/SwS66kbbeO8x24QrRBxKyC9Ict4qkcgFxQZXyk4n0Q +ByB0IdYp+vyn+aXn2xWadHStzBExL+uOVuWq4eSNxS280yViNwmhq+BXKOugqBhJ +gun6PoyD9Eg7ZIodALHVXJUeUPsi1cpN0W/50tRCrS2Ifw/RyRRf4Z6sotuWtI+J +rU8lSF0WpB0fsvwEU5qthL7Xs+QIqqiHhGGogAIjvFwPOTNn/AH6yPomgITTyQRg +H860hgvUi334lfqjnWY3jloEMBBw96nPfKM65jxsr9D+BOvaP58jAgMBAAGjgaUw +gaIwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH +AwIGCCsGAQUFBwMBMCYGA1UdEQQfMB2GG3NwaWZmZTovL2x5ZnQuY29tL3Rlc3Qt +dGVhbTAdBgNVHQ4EFgQUfBcLY6/3adVDWyzSQYRjOYKywewwHwYDVR0jBBgwFoAU +4rJ//RiB6qHtvqx5nqI/KmysLvgwDQYJKoZIhvcNAQELBQADggEBAMZXCR8+N2wl +a3bMIyo5PE5kMI+gWN2WPds/KTo/cH6UJojK+PB/wtQ9GXnMEuXu3Y2GUMsj76NB +hHUNk/cDvf0Jjmz5zXr4lg9lHKw2wJcNIndt4JOA+U0of7p8e6QF03V+m5svJF49 +GLonRd+4UBC8jFGwE5Segz099HeJVChcD8KXbJBWTaWmqD1ESZWDgDXwlRooTPfr +FPr1MsQjj4P0SG34ThXdlYmsdiCPQlQY0OqIcDoPudrA/8/xsW/wUni4xG3HUD9/ +wIppQnaVHGwXSNUbGOLtZ22Wbw3JD1juLaMDQ4s9h/QjocmMXsH5wFfs3uqk268T +HT7vh8hFJ20= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/san_uri_cert_info.h b/test/extensions/transport_sockets/tls/test_data/san_uri_cert_info.h index 385217300ecc..fd62aeba0f14 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_uri_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/san_uri_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_SAN_URI_CERT_HASH[] = - "d6d9d488d82f5bc97d30217e0dfede60c30755aba524ad1725a143abb13cb61d"; -constexpr char TEST_SAN_URI_CERT_SPKI[] = "2GHPukh/h5UhhiKCB7wjucRSbb13GEAYXDa+dgc9/Ww="; -constexpr char TEST_SAN_URI_CERT_SERIAL[] = "b8b5ecc898f2124e"; -constexpr char TEST_SAN_URI_CERT_NOT_BEFORE[] = "Dec 18 01:50:35 2018 GMT"; -constexpr char TEST_SAN_URI_CERT_NOT_AFTER[] = "Dec 17 01:50:35 2020 GMT"; + "175975453ef134ca20d8bd70b9aaf1a90a28e9fd25de6876d838174179ac265b"; +constexpr char TEST_SAN_URI_CERT_SPKI[] = "f6W29u9frvxYMGdiNRh4RYxpH4S6lv5Nzxd63pYTfCI="; +constexpr char TEST_SAN_URI_CERT_SERIAL[] = "39c3fb3f63c04af92e3896f885b78682579de23a"; +constexpr char TEST_SAN_URI_CERT_NOT_BEFORE[] = "Dec 21 22:56:06 2020 GMT"; +constexpr char TEST_SAN_URI_CERT_NOT_AFTER[] = "Dec 21 22:56:06 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/san_uri_key.pem b/test/extensions/transport_sockets/tls/test_data/san_uri_key.pem index 7ef1e0f0d20e..ad69cf30b30f 100644 --- a/test/extensions/transport_sockets/tls/test_data/san_uri_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/san_uri_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert.pem index 5e22672221ba..fb74c8ee6df9 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert.pem @@ -1,24 +1,25 @@ -----BEGIN CERTIFICATE----- -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 ++5JCzQ== -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert_info.h index 0c0d5499b17a..66b9a9c40d02 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_SELFSIGNED2_CERT_HASH[] = - "bcee619427eb4b994001ba0a9ce1747c1fd1379bbbc5782e91fa6441f9234796"; -constexpr char TEST_SELFSIGNED2_CERT_SPKI[] = "LyjfHYiUvRaKNfD3JqD+0CrsXFhjafaemvNOldi6XII="; -constexpr char TEST_SELFSIGNED2_CERT_SERIAL[] = "8a4fff0a40245c05"; -constexpr char TEST_SELFSIGNED2_CERT_NOT_BEFORE[] = "Dec 18 01:50:35 2018 GMT"; -constexpr char TEST_SELFSIGNED2_CERT_NOT_AFTER[] = "Dec 17 01:50:35 2020 GMT"; + "5f29db2b1cee0d08b9ad31289e16e29af13bb0ecca05527ee61056eb2ba6e1ea"; +constexpr char TEST_SELFSIGNED2_CERT_SPKI[] = "3tZFZaVo9vivrG3atEscBW2k8eX5+MGFkzNbclow9Eo="; +constexpr char TEST_SELFSIGNED2_CERT_SERIAL[] = "2558108236d8312eebdae8c59c8bd9a5dcdf6897"; +constexpr char TEST_SELFSIGNED2_CERT_NOT_BEFORE[] = "Dec 21 22:56:06 2020 GMT"; +constexpr char TEST_SELFSIGNED2_CERT_NOT_AFTER[] = "Dec 21 22:56:06 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert.pem index 8133c03cff6f..f5627b0d22d5 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert.pem @@ -1,16 +1,16 @@ -----BEGIN CERTIFICATE----- -MIICiDCCAi+gAwIBAgIJAIXg9sOB9Zv4MAoGCCqGSM49BAMCMHoxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2Nv -MQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQwEgYD -VQQDDAtUZXN0IFNlcnZlcjAeFw0xODEyMTgwMTUwMzZaFw0yMDEyMTcwMTUwMzZa -MHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T -YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu -ZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNlcnZlcjBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABKEMoIMnpZUYKQIigecgxm14C/KJeOKTpuNIQNJd+5r6AeiRFfCIxIr/ -XGnOpQwgMAiulq8G06Jrlh0pNXbH+2+jgZ0wgZowDAYDVR0TAQH/BAIwADALBgNV -HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB4GA1UdEQQX -MBWCE3NlcnZlcjEuZXhhbXBsZS5jb20wHQYDVR0OBBYEFNfjrPT7yWDJ9E3l0EAz -WJricVe0MB8GA1UdIwQYMBaAFNfjrPT7yWDJ9E3l0EAzWJricVe0MAoGCCqGSM49 -BAMCA0cAMEQCIAImK7SCofz+8PS19HsM4K4oz5ZQgIVbPrizk+wT+e8FAiBbudFg -Z4DloE7T/kA6iycL0GdXxeyH7FaTdEm37iUSyw== +MIIClTCCAjqgAwIBAgIUPcIhqUsDUUgCC6YINoRY6zNC8NswCgYIKoZIzj0EAwIw +ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh +biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l +ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMB4XDTIwMTIyMTIyNTYwOFoXDTIy +MTIyMTIyNTYwOFowejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx +FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM +EEx5ZnQgRW5naW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMFkwEwYHKoZI +zj0CAQYIKoZIzj0DAQcDQgAEkd6aKgKtnRlsj439cq4DnR3Oq0eCjmkZ/+cEdCEn +LyD4j/UMTfhGNPv2TmjUglbVHooPIfZ3evpvQRjFBDqn9aOBnTCBmjAMBgNVHRMB +Af8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH +AwEwHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxlLmNvbTAdBgNVHQ4EFgQUaH8R +xAHjiPyD9G5lW8qbXvRy0v4wHwYDVR0jBBgwFoAUaH8RxAHjiPyD9G5lW8qbXvRy +0v4wCgYIKoZIzj0EAwIDSQAwRgIhAOTgEkRHJ3wnu00a/JydlkpcTy92oTY1V8bq +1uhB/I8mAiEA0tjvDH+SWqMK2rB0P+lDQ1NBTqESJvVjip03OJKBw4I= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert_info.h index 735d4c17366f..120b89883ae1 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert_info.h @@ -1,8 +1,9 @@ // NOLINT(namespace-envoy) constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_HASH[] = - "07e98ccb2afb26402e8f050348d6b8b0d3a96f7e15c7b82e855b822f93a8b0b7"; + "b72e15e807a4873f744f3e15bd443bde74980c329db14ff52b7227f6c67afd5b"; constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_SPKI[] = - "u9AYA7vPwRIEepCk5VZajz9z2kEUdfNspcuEbUyy8pI="; -constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_SERIAL[] = "85e0f6c381f59bf8"; -constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_NOT_BEFORE[] = "Dec 18 01:50:36 2018 GMT"; -constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_NOT_AFTER[] = "Dec 17 01:50:36 2020 GMT"; + "5G2mBlUg+jOuumHfkYNTkezQiPukl8jY6HZFbll5nNo="; +constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_SERIAL[] = + "3dc221a94b035148020ba608368458eb3342f0db"; +constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_NOT_BEFORE[] = "Dec 21 22:56:08 2020 GMT"; +constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_NOT_AFTER[] = "Dec 21 22:56:08 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_cert.pem index f39fe5f44beb..0ca4f45ff77f 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_cert.pem @@ -1,24 +1,25 @@ -----BEGIN CERTIFICATE----- -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 +YMwtiw== -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned_cert_info.h index e835c01f127f..bb12bd50a456 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_cert_info.h @@ -1,7 +1,7 @@ // NOLINT(namespace-envoy) constexpr char TEST_SELFSIGNED_CERT_HASH[] = - "e0ff0a1a75e557c6e328f9f08df438e8e3587f1258953f1cd5fa54087a5d259c"; -constexpr char TEST_SELFSIGNED_CERT_SPKI[] = "LyjfHYiUvRaKNfD3JqD+0CrsXFhjafaemvNOldi6XII="; -constexpr char TEST_SELFSIGNED_CERT_SERIAL[] = "9cc68cf48fefddee"; -constexpr char TEST_SELFSIGNED_CERT_NOT_BEFORE[] = "Dec 18 01:50:35 2018 GMT"; -constexpr char TEST_SELFSIGNED_CERT_NOT_AFTER[] = "Dec 17 01:50:35 2020 GMT"; + "b3da43e0f8ff7179825b19589067e91f6009739e47965ccaed90e9dfb27b9cd0"; +constexpr char TEST_SELFSIGNED_CERT_SPKI[] = "3tZFZaVo9vivrG3atEscBW2k8eX5+MGFkzNbclow9Eo="; +constexpr char TEST_SELFSIGNED_CERT_SERIAL[] = "249f07afe3b922865cb29988aa6a1744dcb476d3"; +constexpr char TEST_SELFSIGNED_CERT_NOT_BEFORE[] = "Dec 21 22:56:06 2020 GMT"; +constexpr char TEST_SELFSIGNED_CERT_NOT_AFTER[] = "Dec 21 22:56:06 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert.pem index 75a395386877..d0121aa8dd6c 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert.pem @@ -1,16 +1,16 @@ -----BEGIN CERTIFICATE----- -MIICiTCCAi+gAwIBAgIJANeLnxThk82eMAoGCCqGSM49BAMCMHoxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2Nv -MQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQwEgYD -VQQDDAtUZXN0IFNlcnZlcjAeFw0xODEyMTgwMTUwMzZaFw0yMDEyMTcwMTUwMzZa -MHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T -YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu -ZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNlcnZlcjBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABKEMoIMnpZUYKQIigecgxm14C/KJeOKTpuNIQNJd+5r6AeiRFfCIxIr/ -XGnOpQwgMAiulq8G06Jrlh0pNXbH+2+jgZ0wgZowDAYDVR0TAQH/BAIwADALBgNV -HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB4GA1UdEQQX -MBWCE3NlcnZlcjEuZXhhbXBsZS5jb20wHQYDVR0OBBYEFNfjrPT7yWDJ9E3l0EAz -WJricVe0MB8GA1UdIwQYMBaAFNfjrPT7yWDJ9E3l0EAzWJricVe0MAoGCCqGSM49 -BAMCA0gAMEUCIFvKRILBpYfNNgEFyFHROUh/q3d4eN5MCoSEDIgUALkzAiEAiGaL -0+E0bqXdDlR1Zki5alAx79LOFlKmF7gUTPkYb1Q= +MIIClDCCAjqgAwIBAgIULYfmBy9vXASkT1CA5QBTmDNe79swCgYIKoZIzj0EAwIw +ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh +biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l +ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMB4XDTIwMTIyMTIyNTYwOFoXDTIy +MTIyMTIyNTYwOFowejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx +FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM +EEx5ZnQgRW5naW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMFkwEwYHKoZI +zj0CAQYIKoZIzj0DAQcDQgAEkd6aKgKtnRlsj439cq4DnR3Oq0eCjmkZ/+cEdCEn +LyD4j/UMTfhGNPv2TmjUglbVHooPIfZ3evpvQRjFBDqn9aOBnTCBmjAMBgNVHRMB +Af8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH +AwEwHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxlLmNvbTAdBgNVHQ4EFgQUaH8R +xAHjiPyD9G5lW8qbXvRy0v4wHwYDVR0jBBgwFoAUaH8RxAHjiPyD9G5lW8qbXvRy +0v4wCgYIKoZIzj0EAwIDSAAwRQIhAItA9GtYU8rFLUUu4rsH6tMuAESfT8qdk6jp +KMnYJmW+AiBYj2lvTA8tiPR+S3KNJlJCyldpo7KHljzNrUu64o2Gmg== -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert_info.h index 4f377e369456..561f706d09f4 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert_info.h @@ -1,8 +1,9 @@ // NOLINT(namespace-envoy) constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_HASH[] = - "b25a4cd1b5476248ecc7b082551d176ffa190d63deffbd2795ac032ce9be6cd9"; + "39814a7b486cfb22479c52d14a0c95855bb1d0b9b03f45b38c42fe8fadb4891d"; constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_SPKI[] = - "u9AYA7vPwRIEepCk5VZajz9z2kEUdfNspcuEbUyy8pI="; -constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_SERIAL[] = "d78b9f14e193cd9e"; -constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_NOT_BEFORE[] = "Dec 18 01:50:36 2018 GMT"; -constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_NOT_AFTER[] = "Dec 17 01:50:36 2020 GMT"; + "5G2mBlUg+jOuumHfkYNTkezQiPukl8jY6HZFbll5nNo="; +constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_SERIAL[] = + "2d87e6072f6f5c04a44f5080e5005398335eefdb"; +constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_NOT_BEFORE[] = "Dec 21 22:56:08 2020 GMT"; +constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_NOT_AFTER[] = "Dec 21 22:56:08 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_key.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_key.pem index 5383e2d583d3..83c69765e0b1 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_key.pem @@ -2,7 +2,7 @@ BggqhkjOPQMBBw== -----END EC PARAMETERS----- -----BEGIN EC PRIVATE KEY----- -MHcCAQEEIEIpNzP8DDmhXdzmD94FJ0m3Skgri6AFFrTAfozY9slloAoGCCqGSM49 -AwEHoUQDQgAEoQyggyellRgpAiKB5yDGbXgL8ol44pOm40hA0l37mvoB6JEV8IjE -iv9cac6lDCAwCK6WrwbTomuWHSk1dsf7bw== +MHcCAQEEID04jbmRh4MstSiHeq7/XBAcKIMbQMHUMYhiD8++WoieoAoGCCqGSM49 +AwEHoUQDQgAEkd6aKgKtnRlsj439cq4DnR3Oq0eCjmkZ/+cEdCEnLyD4j/UMTfhG +NPv2TmjUglbVHooPIfZ3evpvQRjFBDqn9Q== -----END EC PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert.pem index f14f6939d5b2..ab50b867517b 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert.pem @@ -1,17 +1,18 @@ -----BEGIN CERTIFICATE----- -MIICxjCCAkygAwIBAgIJAIRQJITMHUDvMAoGCCqGSM49BAMCMHoxCzAJBgNVBAYT -AlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2Nv -MQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQwEgYD -VQQDDAtUZXN0IFNlcnZlcjAeFw0xODEyMTgwMTUwMzdaFw0yMDEyMTcwMTUwMzda -MHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T -YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu -ZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNlcnZlcjB2MBAGByqGSM49AgEGBSuBBAAi -A2IABF7JQIdlG6kokxHmDDl4ErPaGJrNtPqsuLjLa6PhyNY0lr7pTUvleKe2Z2ms -ptT4ruvKHwmeT8YfqWChOtoOPGhiln+PGxr470EccUPyQO/5tfvZQM/rjCRgnq0k -h3FbIqOBnTCBmjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU -BggrBgEFBQcDAgYIKwYBBQUHAwEwHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxl -LmNvbTAdBgNVHQ4EFgQUC65i7p82P66KQxdSourZrOZTngswHwYDVR0jBBgwFoAU -C65i7p82P66KQxdSourZrOZTngswCgYIKoZIzj0EAwIDaAAwZQIwShjMqZ8g6ZJ0 -t2x0KuX3wy424jiPYAkUDwmjbuO1gjblH6VQwtkWfmDdlubL7+JuAjEAwWFHYzU2 -RM80NkEPqN/G5CS7b2JB6UM+bqsACYFWimH1XRu7OB9fHdBNn3gCGbdu +MIIC0DCCAlegAwIBAgIURHPnQNiEdA15Q1ZoYDgXVxVImPMwCgYIKoZIzj0EAwIw +ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh +biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l +ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMB4XDTIwMTIyMTIyNTYwOFoXDTIy +MTIyMTIyNTYwOFowejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx +FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM +EEx5ZnQgRW5naW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMHYwEAYHKoZI +zj0CAQYFK4EEACIDYgAEUCZ8bYevR3I+KHgrDcWFKfVveydHPJRTSHg7yuX2iSyA +YS8sv6AakqkazLnR8MJt/OO920X2CzUHuvT8trbmFVd5qJLhX2PkJzTmP7l8ncNN +RtcYGmVOtPlG9PFwTf1Eo4GdMIGaMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg +MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAeBgNVHREEFzAVghNzZXJ2 +ZXIxLmV4YW1wbGUuY29tMB0GA1UdDgQWBBQjO049hmXnek5Zkx3k6+8Aa4ejDDAf +BgNVHSMEGDAWgBQjO049hmXnek5Zkx3k6+8Aa4ejDDAKBggqhkjOPQQDAgNnADBk +AjAdc0WfSucwjD632EVunCn6YLM1JJClH+8sZkQHxJOZjWPQXVDDR/oJO/QeiAnE +CqUCMHk4jv/wCJzM2ZmUQR9wJhqJctN0k7AXFmBwtdSdI1nEWynHVkxoxkyB32gh +qm9p2g== -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert_info.h index c5c21f2851b1..6d42aa096514 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert_info.h @@ -1,8 +1,9 @@ // NOLINT(namespace-envoy) constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_HASH[] = - "a3bd965bd9251877d405c422bf53de1be1201897577d739dbeb6af012b381127"; + "d44ad19c474642c81804a3673c2a3c0fdbb6ddbd99fa051a3451b99af839ca2a"; constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_SPKI[] = - "wAE46OF5e0PaMbCmGhno7LAJJ2vcYKw6pKDjEslHa/A="; -constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_SERIAL[] = "84502484cc1d40ef"; -constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_NOT_BEFORE[] = "Dec 18 01:50:37 2018 GMT"; -constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_NOT_AFTER[] = "Dec 17 01:50:37 2020 GMT"; + "EFIwYecZEGNlo2bvCfS+uB3pBjWNzFmY4KsRlumeP2g="; +constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_SERIAL[] = + "4473e740d884740d7943566860381757154898f3"; +constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_NOT_BEFORE[] = "Dec 21 22:56:08 2020 GMT"; +constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_NOT_AFTER[] = "Dec 21 22:56:08 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_key.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_key.pem index d7919ed4d070..a123ba61c091 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_key.pem @@ -2,8 +2,8 @@ BgUrgQQAIg== -----END EC PARAMETERS----- -----BEGIN EC PRIVATE KEY----- -MIGkAgEBBDDZb76UDDZkUSbYbtzy1M4PNEhJP2E5lSZLejI45LFUtZLEZChGg3L1 -WvpvW9lREs2gBwYFK4EEACKhZANiAAReyUCHZRupKJMR5gw5eBKz2hiazbT6rLi4 -y2uj4cjWNJa+6U1L5XintmdprKbU+K7ryh8Jnk/GH6lgoTraDjxoYpZ/jxsa+O9B -HHFD8kDv+bX72UDP64wkYJ6tJIdxWyI= +MIGkAgEBBDAVnMDFBlFVh5vddV7k93kXqRlkzYDAwxMdvH6pi7PZX/nRxgX2fX1y +cmzfqChO8fygBwYFK4EEACKhZANiAARQJnxth69Hcj4oeCsNxYUp9W97J0c8lFNI +eDvK5faJLIBhLyy/oBqSqRrMudHwwm38473bRfYLNQe69Py2tuYVV3mokuFfY+Qn +NOY/uXydw01G1xgaZU60+Ub08XBN/UQ= -----END EC PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_key.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_key.pem index ed0b4cf65fa7..f3814b45606a 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert.pem index 46ceda473748..a02e6adc718a 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert.pem @@ -1,19 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIDEDCCAnmgAwIBAgIJAPYfXPb9+5WKMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQw -EgYDVQQDDAtUZXN0IFNlcnZlcjAeFw0xODEyMTgwMTUwMzVaFw0yMDEyMTcwMTUw -MzVaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH -DA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVu -Z2luZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNlcnZlcjCBnzANBgkqhkiG9w0BAQEF -AAOBjQAwgYkCgYEA6sA8rHOCLpm4nnUjl9PyLMVNYd4P49dUqyuV3WElTbqp8QC7 -YcjduD+zEOFEfqrCEIhcttqO3uUVbY1Ci2STE+6xQYsjDz7dp3+b4q5KKoduZ0u4 -5L2DkbSu/dNEnD/jkRTzCyNb0fJABZ0HXtxJp8/sXpzyNihOtOikVB65Oa8CAwEA -AaOBnTCBmjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr -BgEFBQcDAgYIKwYBBQUHAwEwHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxlLmNv -bTAdBgNVHQ4EFgQUl3xcLGC06eau1tbBSbb5sV5oncAwHwYDVR0jBBgwFoAUl3xc -LGC06eau1tbBSbb5sV5oncAwDQYJKoZIhvcNAQELBQADgYEAZ8wN/zKWSg6AUYKb -BfySlcsI/sCmarK24maWZmGP/8pH5cr8kT4eSpnpZeh9/WFhGw1H6r6jDsci/Dh+ -UlIjIWgsXP2NLskQOJmcEMLacP3qDClO/XPAbQW8MVr1XtDU1OpK8I7k9Xi900Ab -hYF9sN0Lmm+hDHJNMm8PWH3nD+c= +MIIDGzCCAoSgAwIBAgIUOgaaTwW0s+UrORJFo7GqfWoLuwAwDQYJKoZIhvcNAQEL +BQAwejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMB4XDTIwMTIyMTIyNTYwNloX +DTIyMTIyMTIyNTYwNlowejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3Ju +aWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNV +BAsMEEx5ZnQgRW5naW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIGfMA0G +CSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4FcW/1JGISckfEuPFKTIB0FBvDP9oDvtX +Pi5gXt46oPpUJlLOOrYscErQkDTCf4RnmFaBRF+z5gJEOn1aA7zQ7PU3iKkD9lGq +hyYDrwkJ8dFlrXO3xW85r0QHiZFcHD+gFP9tWLyVtAaE1A5z1jg4oIw76lRzHYS9 +WgwggGRiOwIDAQABo4GdMIGaMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXgMB0G +A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAeBgNVHREEFzAVghNzZXJ2ZXIx +LmV4YW1wbGUuY29tMB0GA1UdDgQWBBQY5tj7egaxWvfl5TB/cnpOmqgD7zAfBgNV +HSMEGDAWgBQY5tj7egaxWvfl5TB/cnpOmqgD7zANBgkqhkiG9w0BAQsFAAOBgQAj +CkNthfkQrUSMr8nVsfJ6+7vNbxZ7DTuyHX+dtlWlVXnn8ZgLocfUBCQYUvyYN85V +Sg3XKtqygFiQuLM9xJKDSbjLeavkLJCr6OuAxDEwgrxhj3wiMc/peUjvzHYEB6Xl +qTfJRrJgGcXArpKfceJopPuQ187IZIcf/Jy4gmYNjg== -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert_info.h index d32aa9ddec76..628880d5765a 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert_info.h @@ -1,8 +1,8 @@ // NOLINT(namespace-envoy) constexpr char TEST_SELFSIGNED_RSA_1024_CERT_HASH[] = - "8e6062d7c3b26ff8918d2e80b68bba4cf1fdc33a07a642c63f689a72c0ae2e1b"; + "ae428f8efa283d575fa07f1173a8035223971f36b40627aefac458c864c3e796"; constexpr char TEST_SELFSIGNED_RSA_1024_CERT_SPKI[] = - "mNhxspYLv1WBrfZjUGoO32jg/FcurL6q9i1RXCzawoU="; -constexpr char TEST_SELFSIGNED_RSA_1024_CERT_SERIAL[] = "f61f5cf6fdfb958a"; -constexpr char TEST_SELFSIGNED_RSA_1024_CERT_NOT_BEFORE[] = "Dec 18 01:50:35 2018 GMT"; -constexpr char TEST_SELFSIGNED_RSA_1024_CERT_NOT_AFTER[] = "Dec 17 01:50:35 2020 GMT"; + "cLz28GdGzYg5WzY6/HZqj8Tk6hlVr4Hv6Zxr/qPRAA0="; +constexpr char TEST_SELFSIGNED_RSA_1024_CERT_SERIAL[] = "3a069a4f05b4b3e52b391245a3b1aa7d6a0bbb00"; +constexpr char TEST_SELFSIGNED_RSA_1024_CERT_NOT_BEFORE[] = "Dec 21 22:56:06 2020 GMT"; +constexpr char TEST_SELFSIGNED_RSA_1024_CERT_NOT_AFTER[] = "Dec 21 22:56:06 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_key.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_key.pem index 7f6af1e238c2..5687faec2a62 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_key.pem @@ -1,15 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDqwDysc4IumbiedSOX0/IsxU1h3g/j11SrK5XdYSVNuqnxALth -yN24P7MQ4UR+qsIQiFy22o7e5RVtjUKLZJMT7rFBiyMPPt2nf5virkoqh25nS7jk -vYORtK7900ScP+ORFPMLI1vR8kAFnQde3Emnz+xenPI2KE606KRUHrk5rwIDAQAB -AoGAYNeFMC9GmSrZOqVgVZYd5dJPJfyR2ZBPYX3NiVI2LWbADKgcpS5UKVo96MzF -kOuou2FFvjlTjyg6OsN3nEGVWm1oxqVqcwwmjPC0gAXfVQtrE7YGV0nnlPm5W3Fi -YICw7vcHxPKugsvF9d2FXqTopCk4uijQh0Ejji3Iu2t/a4ECQQD4zA2PdffwNQaN -ueSAXuio/k8PG40nXWY3DHgeI6RNrfFoBMWUb02l+x0lKyk3H7ED2J2kuxQC8Luz -26GoLnHxAkEA8YwU543NMsRrPprRbRA75XtGsxHL8AAT631Hmo+VtMMNx5tmhksd -mJS75MwSs9QXIAnfyRxa1GaT4HIaPVLFnwJACCWWZBY20jTKTCXEJ7fz4mTBbfs2 -+g0C5daQsFv2a1zAxOkzFxM19bNtVuQ860MsZrXXI6fElfwQCWmtt3Yd4QJBAOH3 -yH6u266IrkONFirPqxkN8KAJIB5QFFKTiu7/MHBAoZ2AtbMghnl9eyGaAE0XNuMU -GbTMv/RAWkr4s692xcUCQQCrIWkSuClKp8g+FQo6RoAAuaHJp4eJhp7dzwJ/sdZe -FRkEwXto4RKMmw3gJFtkP3GflBC18rG8A+cRmgWIoghF +MIICXAIBAAKBgQC4FcW/1JGISckfEuPFKTIB0FBvDP9oDvtXPi5gXt46oPpUJlLO +OrYscErQkDTCf4RnmFaBRF+z5gJEOn1aA7zQ7PU3iKkD9lGqhyYDrwkJ8dFlrXO3 +xW85r0QHiZFcHD+gFP9tWLyVtAaE1A5z1jg4oIw76lRzHYS9WgwggGRiOwIDAQAB +AoGAKIjqzW3iSe9tcQE41G5Yy5tySrHC/8fkwnY3whLBvok59hOmQjEdcjWb08cd +RwLLRgB+c+J5bGSmdR2oAo02Iy+frc0Y1ogqCwdV766DzXoOnbUAMCB56+Wnn/+E +JW+GXvM89aF8uGsE8pogI6IUiBonAwAfToAfWIjWJDV+MQkCQQDZuE3LYKzncOWb +J7CvO66jjQ4qy8whV2pvUY0byO3ejIaqcHLeI6OMpO5DPY5XEB53oCyMTcg7MQfL +jB9KymeFAkEA2HOLHtI8iZKR18Vcsd0S91dhbwCZMX6RgXxWt29lgFCwecxlLLJZ +xn+y7hPeIYGl/SgSAhOJEJg1NR2w7S5uvwJAfRjA2lK6BmGADB5KDuWj+qVZto1S +xPWNWljpU0WoJ29nERd7aNfhaTZ7EHeWCcBhQSrvbc5jdl89s17XvAmAYQJBANJf +0rqdGauYoll2AHb66OEvs4pgqYRagO+6OspE4gFJ64wl5bwAiJMOMImHE+G7Eeqw +lHgiJpjTZvt+JSUReR8CQGPYEdHrCGPRcY/x94lYt6hNgAjl2K7c6+wKI+bKoqGd +4IuR2ERezMrRNKQk+e1IcEgPoNuHAEv81FW6iY1FXcI= -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert.pem index 6026042c40fe..78f51f11e6cb 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert.pem @@ -1,30 +1,30 @@ -----BEGIN CERTIFICATE----- -MIIFFTCCA32gAwIBAgIJAJ3ABwLFAAOqMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp -c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQw -EgYDVQQDDAtUZXN0IFNlcnZlcjAeFw0xODEyMTgwMTUwMzVaFw0yMDEyMTcwMTUw -MzVaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH -DA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVu -Z2luZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNlcnZlcjCCAaIwDQYJKoZIhvcNAQEB -BQADggGPADCCAYoCggGBAJSkbWbJlCMVxNeTC8k0q8J49rPFaiOq6uJqMzCmG8Wi -XfZcCprERsybeOqJvrcCfMqJIFdflkzZctw4A7wefHYdCNSZ5PdZvH2gPQjgf10t -Y5EaQjETBgvKX8SOdY9v6Y68ZLqWWOjVdLzGbs6GHW++OXZWJJTOSTHoyZUS8Qu1 -qz2E6yypRn2qGxLc/Gv9IQyI6+UFxi2riJ2vWS6o41eFLqHXvCmViFzeN9GkgfT1 -+9yLZQn3f2GdNOZUDT9aWnKbFKGGirGEpWd+yG6zzQZd9sRe+NkNRPMvwlxN76fP -6aqcgDcDRFz6w4VUhojgYJnFfZpWNltwatoL1tz6l+T/ZR7FiSx4UIIjj3L1HB4C -gin2frfTSECjOAjSIsBOcuUBvzoaXJDabclxR8jT6hm12Bw6yMqNuoDbol15IuOw -gkc8qMzb8G7aKbz+tYLiybPFXIQ85otOQ26I6p0gi9uxNdrlon5/jD9U4xroiF23 -azzwKotN095RiafQk1BEvwIDAQABo4GdMIGaMAwGA1UdEwEB/wQCMAAwCwYDVR0P -BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAeBgNVHREEFzAV -ghNzZXJ2ZXIxLmV4YW1wbGUuY29tMB0GA1UdDgQWBBQtDdzQQZS+yFQfCa+aedlL -qihYPjAfBgNVHSMEGDAWgBQtDdzQQZS+yFQfCa+aedlLqihYPjANBgkqhkiG9w0B -AQsFAAOCAYEADHXcdfXIgp5CrrQ22TaNJ4xarPVuO0eEJNW/4I6fe3ppjhAztgv6 -X3zdMc39xYwrRz/f17gM5AhFt3fspL2lKHKi42J5Vsc6V07uqQi5ElRgkUSkrm0u -4LEQpc121gefTIOirO0BGtt6niuw+AuhRxH58LDdTai+d8zwjqtgSRYXmwOxMHeg -3rTpKzjbMRwTbRjxJENrCK9cOjNAkHkM2+Y2IANROujQpyDCFbfDBlrtEz98k4/y -tU9v9w+tUYeuE6xSlbdGODhwlbSwHTAUtYetv+FXP+BasNp0E23FmvYxsBVGxcjT -W5BkJYkhV5H1v7hmFUwnHgx/GARk+Yzj/T5p0r4kG0MdtxGTyDDzG1nYuijowyko -JZ0iFc151RD2Co5gISQgkDQ30wf2vuvKuc/MF/JD7OMX2rK7F1oo+lYMxl5j4jCA -rflDdeLg1N6ds2nCcSW2sjHONLsFJc19Zgtsda3pDZe7DjnGsg1mqFuJQ4wj2Bv/ -awGDvfaSWlSk +MIIFIDCCA4igAwIBAgIUH1tpEUr3S+qZPWHBd4WhWZaWD+AwDQYJKoZIhvcNAQEL +BQAwejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM +DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n +aW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMB4XDTIwMTIyMTIyNTYwNloX +DTIyMTIyMTIyNTYwNlowejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3Ju +aWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNV +BAsMEEx5ZnQgRW5naW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBojAN +BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAoxPN3+rEQgh9w5m2E8E5JxEiq2Kd +6Ke63b3pj8SZcInQ6Dd6lGp/L2i9g3IoWeKSDW33zO3XXPrgCIRxTNSSBPlQpYFw +1esqduFL/fBOyG+QOFSUKN4vBo+nr6EFbP2bq6GCyZth4gckiz9IVwA7n8zfanCH +RiHHA6CyJxsqzBZDPIWK5tlcYe67u6FHR5JopzrjPdm2LR/DYHhPmJBFP5TrLy0o +VHHKycKuslznpWP0Qi1zSIthXJnTnCn5D/edSXWh/5R+HGK/X+siGPevR3bECuHp +pa8mHwGj/a+yHEag8AVYqkDpFnR4YkJITZ90DlOdfthq5dli3oUFrDr2l6wUt9I1 +Xwlbsp5+tXx0q9qfa9+pk5Tic/7tCC2za+rl+O7hOH7Dwv8Ppi9twekMkKlv41f3 +frTxZD6GSkOiGTj9Tf8e84I2tRmGKJp3eiu6WgcWWAm565cEDvEUwZB0wLkS1V9i +DD2zcJbZUyXS27ye8ffsDBxjzReNbvCzqV9PAgMBAAGjgZ0wgZowDAYDVR0TAQH/ +BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB +MB4GA1UdEQQXMBWCE3NlcnZlcjEuZXhhbXBsZS5jb20wHQYDVR0OBBYEFJTLK8vk +sH1oRVIjgUqyHGdeoglmMB8GA1UdIwQYMBaAFJTLK8vksH1oRVIjgUqyHGdeoglm +MA0GCSqGSIb3DQEBCwUAA4IBgQBmYQpfyYIcUCgmgt8bAQMI7MFE1Ti18etuuQze +DUyel5FKsiWqyYltRUy2m7yIaYgtCs7IIFu5Mvyt8NqLaEJlLy9DbDN5MyHBZynL +YuOtWNtIbTk/Cgn8IHRs18KU7P8wCn8zfuSKYxJeO0wkY7sWUvQMyHzTKmOI0OXj +nppXnZCmxZ+Qsl+hSnxvtO4ZYwxMIIu6+wbx/9DUTWqNVL2PLzC3+OqgOfA/XhZd +Xi5IwAnNuafJqFYeoAf2QcRFjy6m9fUqCXyQhP8frhMpUFFQHJGBdV99UbHueUpX +pwJObBopanhTao8Rrp1h/hx81xE+vEDU6iocIYSnX1QM0+DfbRAf+ZHm0yDAQBQg +HV1TcQacmr9eixaHlmk+YbkvVZR5gN8iSsQxZHtK3yDHOqDOJkfXaSZ7QZHi2bdb +UME4RpZcTQId0cPBRanbdpCRJPPCwCRKvDuI6wEPB2M1vrb4Ag+owRfl7rEj4T93 +WjhCWr5xMSOCHaJ/drUgOnoAYLQ= -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert_info.h index dbe291d11f93..d05e4aed51f8 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert_info.h @@ -1,8 +1,8 @@ // NOLINT(namespace-envoy) constexpr char TEST_SELFSIGNED_RSA_3072_CERT_HASH[] = - "bfcd3b22aeb62b29eb9297c9ce32d5ebe2f9d1a8c0b99fea1be861591063e44d"; + "9f3d3b8b42ab9e60a4952994c0acc1c33643bc1dda1339d9f30b88d7c0f32622"; constexpr char TEST_SELFSIGNED_RSA_3072_CERT_SPKI[] = - "gvALM/Elunobd6QO9sLrXmgrRzyTDwEQ6t4CkxolWQk="; -constexpr char TEST_SELFSIGNED_RSA_3072_CERT_SERIAL[] = "9dc00702c50003aa"; -constexpr char TEST_SELFSIGNED_RSA_3072_CERT_NOT_BEFORE[] = "Dec 18 01:50:35 2018 GMT"; -constexpr char TEST_SELFSIGNED_RSA_3072_CERT_NOT_AFTER[] = "Dec 17 01:50:35 2020 GMT"; + "vdR3kK5yhGv1slXBF84a29vz6pGopfVN343qrCgyVB8="; +constexpr char TEST_SELFSIGNED_RSA_3072_CERT_SERIAL[] = "1f5b69114af74bea993d61c17785a15996960fe0"; +constexpr char TEST_SELFSIGNED_RSA_3072_CERT_NOT_BEFORE[] = "Dec 21 22:56:06 2020 GMT"; +constexpr char TEST_SELFSIGNED_RSA_3072_CERT_NOT_AFTER[] = "Dec 21 22:56:06 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_key.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_key.pem index 90c23a67e576..b382f6f74c5c 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_key.pem @@ -1,39 +1,39 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert.pem index 75d36011535d..4f35199e27da 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert.pem @@ -1,35 +1,35 @@ -----BEGIN CERTIFICATE----- -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 -YZwiDzQDoFXvMi6Gn93GzKBq1waX7ZcPgA== +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 -----END CERTIFICATE----- diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert_info.h index c2d819fb555d..3fd943974846 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert_info.h +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert_info.h @@ -1,8 +1,8 @@ // NOLINT(namespace-envoy) constexpr char TEST_SELFSIGNED_RSA_4096_CERT_HASH[] = - "3476ca722220f05354124768a1d22e8a25c61cb6bc01762a3b5fe91118216105"; + "687c3cf4c4b758889defb35a34cc89440bd0039aef1a362f32f905ac65b662a6"; constexpr char TEST_SELFSIGNED_RSA_4096_CERT_SPKI[] = - "Qwf0JDO0wcgac+78OUh0qN1sfYkcxA6cNa5sJVPZ/Jw="; -constexpr char TEST_SELFSIGNED_RSA_4096_CERT_SERIAL[] = "c027b7d133d39815"; -constexpr char TEST_SELFSIGNED_RSA_4096_CERT_NOT_BEFORE[] = "Dec 18 01:50:36 2018 GMT"; -constexpr char TEST_SELFSIGNED_RSA_4096_CERT_NOT_AFTER[] = "Dec 17 01:50:36 2020 GMT"; + "ooHqscvFxqHZl65oq7AhqaVVuChDjE5FJUOfqm1zWyY="; +constexpr char TEST_SELFSIGNED_RSA_4096_CERT_SERIAL[] = "7f9c4ec7aa7c116363be94dedf9826676e59f718"; +constexpr char TEST_SELFSIGNED_RSA_4096_CERT_NOT_BEFORE[] = "Dec 21 22:56:08 2020 GMT"; +constexpr char TEST_SELFSIGNED_RSA_4096_CERT_NOT_AFTER[] = "Dec 21 22:56:08 2022 GMT"; diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_key.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_key.pem index 0582ce92be07..c3cb3b1452d2 100644 --- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_key.pem +++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_key.pem @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test/extensions/transport_sockets/tls/test_data/ticket_key_a b/test/extensions/transport_sockets/tls/test_data/ticket_key_a index 86c8213aecff..867e38325719 100644 Binary files a/test/extensions/transport_sockets/tls/test_data/ticket_key_a and b/test/extensions/transport_sockets/tls/test_data/ticket_key_a differ diff --git a/test/extensions/transport_sockets/tls/test_data/ticket_key_b b/test/extensions/transport_sockets/tls/test_data/ticket_key_b index 22182f25d0ec..79ee37857d00 100644 --- a/test/extensions/transport_sockets/tls/test_data/ticket_key_b +++ b/test/extensions/transport_sockets/tls/test_data/ticket_key_b @@ -1,2 +1,2 @@ - -^д UI_LEN{END \ No newline at end of file +*i*T' lϦ L NMk skpFm-m Tx4L^ +X{x#>2mR \ No newline at end of file diff --git a/test/extensions/transport_sockets/tls/test_data/ticket_key_wrong_len b/test/extensions/transport_sockets/tls/test_data/ticket_key_wrong_len index 84d6266d1fd1..72f182a122c2 100644 --- a/test/extensions/transport_sockets/tls/test_data/ticket_key_wrong_len +++ b/test/extensions/transport_sockets/tls/test_data/ticket_key_wrong_len @@ -1,2 +1 @@ - gjS kOh0f&־cr幒 -CJ=hɎyV [݈AO5CS \ No newline at end of file +D1@.-zIA_WcX$(M^u;y83hE ?!av߷t8 r5_DWx9 \ No newline at end of file diff --git a/test/integration/BUILD b/test/integration/BUILD index 1e4176d19a82..f2f2fa9df554 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -216,7 +216,11 @@ envoy_cc_test( data = [ "//test/config/integration/certs", ], - tags = ["fails_on_windows"], + tags = [ + "fails_on_windows", + # https://github.com/envoyproxy/envoy/issues/9784 + "no_tsan", + ], deps = [ ":http_integration_lib", "//source/common/config:protobuf_link_hacks", @@ -329,6 +333,7 @@ envoy_cc_test( "http2_integration_test.cc", "http2_integration_test.h", ], + shard_count = 4, tags = ["fails_on_windows"], deps = [ ":http_integration_lib", @@ -780,6 +785,7 @@ envoy_cc_test( envoy_cc_test( name = "hds_integration_test", srcs = ["hds_integration_test.cc"], + shard_count = 2, tags = ["fails_on_windows"], deps = [ ":http_integration_lib", @@ -834,10 +840,14 @@ envoy_cc_test( ":http_integration_lib", "//source/common/buffer:buffer_lib", "//source/common/http:codec_client_lib", + "//source/extensions/access_loggers/file:config", "//source/extensions/filters/listener/proxy_protocol:config", + "//source/extensions/filters/network/tcp_proxy:config", "//test/test_common:utility_lib", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", + "@envoy_api//envoy/config/filter/network/tcp_proxy/v2:pkg_cc_proto", + "@envoy_api//envoy/extensions/access_loggers/file/v3:pkg_cc_proto", ], ) diff --git a/test/integration/hds_integration_test.cc b/test/integration/hds_integration_test.cc index f5fc80cdd556..1c950e2499b1 100644 --- a/test/integration/hds_integration_test.cc +++ b/test/integration/hds_integration_test.cc @@ -61,8 +61,10 @@ class HdsIntegrationTest : public Grpc::VersionedGrpcClientIntegrationParamTest, // Endpoint connections host_upstream_ = std::make_unique(0, FakeHttpConnection::Type::HTTP1, version_, timeSystem()); + host_upstream_->set_allow_unexpected_disconnects(true); host2_upstream_ = std::make_unique(0, FakeHttpConnection::Type::HTTP1, version_, timeSystem()); + host2_upstream_->set_allow_unexpected_disconnects(true); } // Sets up a connection between Envoy and the management server. @@ -80,7 +82,6 @@ class HdsIntegrationTest : public Grpc::VersionedGrpcClientIntegrationParamTest, ASSERT_TRUE(host_fake_connection_->waitForNewStream(*dispatcher_, host_stream_)); ASSERT_TRUE(host_stream_->waitForEndStream(*dispatcher_)); - host_upstream_->set_allow_unexpected_disconnects(true); EXPECT_EQ(host_stream_->headers().getPathValue(), "/healthcheck"); EXPECT_EQ(host_stream_->headers().getMethodValue(), "GET"); EXPECT_EQ(host_stream_->headers().getHostValue(), "anna"); @@ -90,7 +91,6 @@ class HdsIntegrationTest : public Grpc::VersionedGrpcClientIntegrationParamTest, ASSERT_TRUE(host2_fake_connection_->waitForNewStream(*dispatcher_, host2_stream_)); ASSERT_TRUE(host2_stream_->waitForEndStream(*dispatcher_)); - host2_upstream_->set_allow_unexpected_disconnects(true); EXPECT_EQ(host2_stream_->headers().getPathValue(), "/healthcheck"); EXPECT_EQ(host2_stream_->headers().getMethodValue(), "GET"); EXPECT_EQ(host2_stream_->headers().getHostValue(), cluster2); @@ -314,9 +314,10 @@ TEST_P(HdsIntegrationTest, SingleEndpointTimeoutHttp) { test_server_->waitForCounterGe("hds_delegate.requests", ++hds_requests_); // Envoy sends a health check message to an endpoint - healthcheckEndpoints(); + ASSERT_TRUE(host_upstream_->waitForRawConnection(host_fake_raw_connection_)); // Endpoint doesn't respond to the health check + ASSERT_TRUE(host_fake_raw_connection_->waitForDisconnect(true)); // Receive updates until the one we expect arrives waitForEndpointHealthResponse(envoy::config::core::v3::TIMEOUT); @@ -380,19 +381,17 @@ TEST_P(HdsIntegrationTest, SingleEndpointTimeoutTcp) { server_health_check_specifier_.mutable_cluster_health_checks(0) ->mutable_health_checks(0) ->mutable_timeout() - ->set_nanos(500000000); // 0.5 seconds + ->set_nanos(100000000); // 0.1 seconds hds_stream_->startGrpcStream(); hds_stream_->sendGrpcMessage(server_health_check_specifier_); test_server_->waitForCounterGe("hds_delegate.requests", ++hds_requests_); // Envoys asks the endpoint if it's healthy - host_upstream_->set_allow_unexpected_disconnects(true); ASSERT_TRUE(host_upstream_->waitForRawConnection(host_fake_raw_connection_)); - ASSERT_TRUE( - host_fake_raw_connection_->waitForData(FakeRawConnection::waitForInexactMatch("Ping"))); // No response from the endpoint + ASSERT_TRUE(host_fake_raw_connection_->waitForDisconnect(true)); // Receive updates until the one we expect arrives waitForEndpointHealthResponse(envoy::config::core::v3::TIMEOUT); @@ -418,7 +417,6 @@ TEST_P(HdsIntegrationTest, SingleEndpointHealthyTcp) { test_server_->waitForCounterGe("hds_delegate.requests", ++hds_requests_); // Envoy asks the endpoint if it's healthy - host_upstream_->set_allow_unexpected_disconnects(true); ASSERT_TRUE(host_upstream_->waitForRawConnection(host_fake_raw_connection_)); ASSERT_TRUE( host_fake_raw_connection_->waitForData(FakeRawConnection::waitForInexactMatch("Ping"))); @@ -453,7 +451,6 @@ TEST_P(HdsIntegrationTest, SingleEndpointUnhealthyTcp) { test_server_->waitForCounterGe("hds_delegate.requests", ++hds_requests_); // Envoy asks the endpoint if it's healthy - host_upstream_->set_allow_unexpected_disconnects(true); ASSERT_TRUE(host_upstream_->waitForRawConnection(host_fake_raw_connection_)); ASSERT_TRUE( host_fake_raw_connection_->waitForData(FakeRawConnection::waitForInexactMatch("Ping"))); @@ -691,7 +688,6 @@ TEST_P(HdsIntegrationTest, TestUpdateMessage) { test_server_->waitForCounterGe("hds_delegate.requests", ++hds_requests_); // Envoy sends a health check message to an endpoint - host2_upstream_->set_allow_unexpected_disconnects(true); ASSERT_TRUE(host2_upstream_->waitForHttpConnection(*dispatcher_, host2_fake_connection_)); ASSERT_TRUE(host2_fake_connection_->waitForNewStream(*dispatcher_, host2_stream_)); ASSERT_TRUE(host2_stream_->waitForEndStream(*dispatcher_)); diff --git a/test/integration/http2_integration_test.cc b/test/integration/http2_integration_test.cc index 50ec78b68787..251af7c0eac7 100644 --- a/test/integration/http2_integration_test.cc +++ b/test/integration/http2_integration_test.cc @@ -829,6 +829,7 @@ TEST_P(Http2IntegrationTest, GrpcRetry) { testGrpcRetry(); } // Verify the case where there is an HTTP/2 codec/protocol error with an active stream. TEST_P(Http2IntegrationTest, CodecErrorAfterStreamStart) { initialize(); + fake_upstreams_[0]->set_allow_unexpected_disconnects(true); codec_client_ = makeHttpConnection(lookupPort("http")); // Sends a request. diff --git a/test/integration/integration.h b/test/integration/integration.h index c68efaf0963e..894a052da5c4 100644 --- a/test/integration/integration.h +++ b/test/integration/integration.h @@ -392,6 +392,22 @@ class BaseIntegrationTest : protected Logger::Loggable { *dispatcher_); } + /** + * Helper to create ConnectionDriver. + * + * @param port the port to connect to. + * @param write_request_cb callback used to send data. + * @param data_callback the callback on the received data. + * @param transport_socket transport socket to use for the client connection + **/ + std::unique_ptr createConnectionDriver( + uint32_t port, RawConnectionDriver::DoWriteCallback write_request_cb, + std::function&& data_callback, + Network::TransportSocketPtr transport_socket = nullptr) { + return std::make_unique(port, write_request_cb, data_callback, version_, + *dispatcher_, std::move(transport_socket)); + } + protected: // Create the envoy server in another thread and start it. // Will not return until that server is listening. diff --git a/test/integration/integration_test.cc b/test/integration/integration_test.cc index 3d90d5be067c..02d784476fb7 100644 --- a/test/integration/integration_test.cc +++ b/test/integration/integration_test.cc @@ -777,6 +777,41 @@ TEST_P(IntegrationTest, AbsolutePath) { EXPECT_FALSE(response.find("HTTP/1.1 404 Not Found\r\n") == 0); } +// Make that both IPv4 and IPv6 hosts match when using relative and absolute URLs. +TEST_P(IntegrationTest, TestHostWithAddress) { + useAccessLog("%REQ(Host)%\n"); + std::string address_string; + if (GetParam() == Network::Address::IpVersion::v4) { + address_string = TestUtility::getIpv4Loopback(); + } else { + address_string = "[::1]"; + } + + auto host = config_helper_.createVirtualHost(address_string.c_str(), "/"); + host.set_require_tls(envoy::config::route::v3::VirtualHost::ALL); + config_helper_.addVirtualHost(host); + + initialize(); + std::string response; + + // Test absolute URL with ipv6. + sendRawHttpAndWaitForResponse( + lookupPort("http"), absl::StrCat("GET http://", address_string, " HTTP/1.1\r\n\r\n").c_str(), + &response, true); + EXPECT_FALSE(response.find("HTTP/1.1 404 Not Found\r\n") == 0); + EXPECT_TRUE(response.find("301") != std::string::npos); + EXPECT_THAT(waitForAccessLog(access_log_name_), HasSubstr(address_string)); + + // Test normal IPv6 request as well. + response.clear(); + sendRawHttpAndWaitForResponse( + lookupPort("http"), + absl::StrCat("GET / HTTP/1.1\r\nHost: ", address_string, "\r\n\r\n").c_str(), &response, + true); + EXPECT_FALSE(response.find("HTTP/1.1 404 Not Found\r\n") == 0); + EXPECT_TRUE(response.find("301") != std::string::npos); +} + TEST_P(IntegrationTest, AbsolutePathWithPort) { // Configure www.namewithport.com:1234 to send a redirect, and ensure the redirect is // encountered via absolute URL with a port. @@ -789,6 +824,7 @@ TEST_P(IntegrationTest, AbsolutePathWithPort) { lookupPort("http"), "GET http://www.namewithport.com:1234 HTTP/1.1\r\nHost: host\r\n\r\n", &response, true); EXPECT_FALSE(response.find("HTTP/1.1 404 Not Found\r\n") == 0); + EXPECT_TRUE(response.find("301") != std::string::npos); } TEST_P(IntegrationTest, AbsolutePathWithoutPort) { diff --git a/test/integration/proxy_proto_integration_test.cc b/test/integration/proxy_proto_integration_test.cc index 92c4bc90b39d..287e7542fc1e 100644 --- a/test/integration/proxy_proto_integration_test.cc +++ b/test/integration/proxy_proto_integration_test.cc @@ -2,6 +2,8 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/config/cluster/v3/cluster.pb.h" +#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.h" +#include "envoy/extensions/access_loggers/file/v3/file.pb.h" #include "common/buffer/buffer_impl.h" @@ -14,6 +16,24 @@ namespace Envoy { +static void +insertProxyProtocolFilterConfigModifier(envoy::config::bootstrap::v3::Bootstrap& bootstrap) { + ::envoy::extensions::filters::listener::proxy_protocol::v3::ProxyProtocol proxy_protocol; + auto rule = proxy_protocol.add_rules(); + rule->set_tlv_type(0x02); + rule->mutable_on_tlv_present()->set_key("PP2TypeAuthority"); + + auto* listener = bootstrap.mutable_static_resources()->mutable_listeners(0); + auto* ppv_filter = listener->add_listener_filters(); + ppv_filter->set_name("envoy.listener.proxy_protocol"); + ppv_filter->mutable_typed_config()->PackFrom(proxy_protocol); +} + +ProxyProtoIntegrationTest::ProxyProtoIntegrationTest() + : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam()) { + config_helper_.addConfigModifier(insertProxyProtocolFilterConfigModifier); +} + INSTANTIATE_TEST_SUITE_P(IpVersions, ProxyProtoIntegrationTest, testing::ValuesIn(TestEnvironment::getIpVersionsForTest()), TestUtility::ipTestParamsToString); @@ -201,4 +221,58 @@ TEST_P(ProxyProtoIntegrationTest, ClusterProvided) { testRouterRequestAndResponseWithBody(1024, 512, false, false, &creator); } +ProxyProtoTcpIntegrationTest::ProxyProtoTcpIntegrationTest() + : BaseIntegrationTest(GetParam(), ConfigHelper::tcpProxyConfig()) { + config_helper_.addConfigModifier(insertProxyProtocolFilterConfigModifier); + config_helper_.renameListener("tcp_proxy"); +} + +INSTANTIATE_TEST_SUITE_P(IpVersions, ProxyProtoTcpIntegrationTest, + testing::ValuesIn(TestEnvironment::getIpVersionsForTest()), + TestUtility::ipTestParamsToString); + +// This tests that the StreamInfo contains the correct addresses. +TEST_P(ProxyProtoTcpIntegrationTest, AccessLog) { + std::string access_log_path = TestEnvironment::temporaryPath( + fmt::format("access_log{}.txt", version_ == Network::Address::IpVersion::v4 ? "v4" : "v6")); + config_helper_.addConfigModifier([&](envoy::config::bootstrap::v3::Bootstrap& bootstrap) -> void { + auto* listener = bootstrap.mutable_static_resources()->mutable_listeners(0); + auto* filter_chain = listener->mutable_filter_chains(0); + auto* config_blob = filter_chain->mutable_filters(0)->mutable_typed_config(); + + ASSERT_TRUE( + config_blob->Is()); + auto tcp_proxy_config = MessageUtil::anyConvert(*config_blob); + + auto* access_log = tcp_proxy_config.add_access_log(); + access_log->set_name("accesslog"); + envoy::extensions::access_loggers::file::v3::FileAccessLog access_log_config; + access_log_config.set_path(access_log_path); + access_log_config.mutable_log_format()->set_text_format( + "remote=%DOWNSTREAM_REMOTE_ADDRESS% local=%DOWNSTREAM_LOCAL_ADDRESS%"); + access_log->mutable_typed_config()->PackFrom(access_log_config); + config_blob->PackFrom(tcp_proxy_config); + }); + initialize(); + + IntegrationTcpClientPtr tcp_client = makeTcpConnection(lookupPort("tcp_proxy")); + ASSERT_TRUE(tcp_client->write("PROXY TCP4 1.2.3.4 254.254.254.254 12345 1234\r\nhello", false)); + + FakeRawConnectionPtr fake_upstream_connection; + ASSERT_TRUE(fake_upstreams_[0]->waitForRawConnection(fake_upstream_connection)); + ASSERT_TRUE(fake_upstream_connection->waitForData(5)); + ASSERT_TRUE(fake_upstream_connection->close()); + tcp_client->close(); + ASSERT_TRUE(fake_upstream_connection->waitForDisconnect()); + + std::string log_result; + // Access logs only get flushed to disk periodically, so poll until the log is non-empty + do { + log_result = api_->fileSystem().fileReadToEnd(access_log_path); + } while (log_result.empty()); + + EXPECT_EQ(log_result, "remote=1.2.3.4:12345 local=254.254.254.254:1234"); +} + } // namespace Envoy diff --git a/test/integration/proxy_proto_integration_test.h b/test/integration/proxy_proto_integration_test.h index 140d5b63d3f7..3a719ad44aaf 100644 --- a/test/integration/proxy_proto_integration_test.h +++ b/test/integration/proxy_proto_integration_test.h @@ -16,19 +16,13 @@ namespace Envoy { class ProxyProtoIntegrationTest : public testing::TestWithParam, public HttpIntegrationTest { public: - ProxyProtoIntegrationTest() : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam()) { - config_helper_.addConfigModifier( - [&](envoy::config::bootstrap::v3::Bootstrap& bootstrap) -> void { - ::envoy::extensions::filters::listener::proxy_protocol::v3::ProxyProtocol proxy_protocol; - auto rule = proxy_protocol.add_rules(); - rule->set_tlv_type(0x02); - rule->mutable_on_tlv_present()->set_key("PP2TypeAuthority"); - - auto* listener = bootstrap.mutable_static_resources()->mutable_listeners(0); - auto* ppv_filter = listener->add_listener_filters(); - ppv_filter->set_name("envoy.listener.proxy_protocol"); - ppv_filter->mutable_typed_config()->PackFrom(proxy_protocol); - }); - } + ProxyProtoIntegrationTest(); }; + +class ProxyProtoTcpIntegrationTest : public testing::TestWithParam, + public BaseIntegrationTest { +public: + ProxyProtoTcpIntegrationTest(); +}; + } // namespace Envoy diff --git a/test/integration/utility.cc b/test/integration/utility.cc index c969a5b8a2ef..ea1a810c036d 100644 --- a/test/integration/utility.cc +++ b/test/integration/utility.cc @@ -27,6 +27,21 @@ #include "absl/strings/match.h" namespace Envoy { +namespace { + +RawConnectionDriver::DoWriteCallback writeBufferCallback(Buffer::Instance& data) { + auto shared_data = std::make_shared(); + shared_data->move(data); + return [shared_data](Network::ClientConnection& client) { + if (shared_data->length() > 0) { + client.write(*shared_data, false); + shared_data->drain(shared_data->length()); + } + }; +} + +} // namespace + void BufferingStreamDecoder::decodeHeaders(Http::ResponseHeaderMapPtr&& headers, bool end_stream) { ASSERT(!complete_); complete_ = end_stream; @@ -112,15 +127,24 @@ IntegrationUtil::makeSingleRequest(uint32_t port, const std::string& method, con return makeSingleRequest(addr, method, url, body, type, host, content_type); } -RawConnectionDriver::RawConnectionDriver(uint32_t port, Buffer::Instance& initial_data, - ReadCallback data_callback, +RawConnectionDriver::RawConnectionDriver(uint32_t port, Buffer::Instance& request_data, + ReadCallback response_data_callback, + Network::Address::IpVersion version, + Event::Dispatcher& dispatcher, + Network::TransportSocketPtr transport_socket) + : RawConnectionDriver(port, writeBufferCallback(request_data), response_data_callback, version, + dispatcher, std::move(transport_socket)) {} + +RawConnectionDriver::RawConnectionDriver(uint32_t port, DoWriteCallback write_request_callback, + ReadCallback response_data_callback, Network::Address::IpVersion version, Event::Dispatcher& dispatcher, Network::TransportSocketPtr transport_socket) : dispatcher_(dispatcher) { api_ = Api::createApiForTest(stats_store_); Event::GlobalTimeSystem time_system; - callbacks_ = std::make_unique(); + callbacks_ = std::make_unique( + [this, write_request_callback]() { write_request_callback(*client_); }); if (transport_socket == nullptr) { transport_socket = Network::Test::createRawBufferSocket(); @@ -130,9 +154,13 @@ RawConnectionDriver::RawConnectionDriver(uint32_t port, Buffer::Instance& initia Network::Utility::resolveUrl( fmt::format("tcp://{}:{}", Network::Test::getLoopbackAddressUrlString(version), port)), Network::Address::InstanceConstSharedPtr(), std::move(transport_socket), nullptr); + // ConnectionCallbacks will call write_request_callback from the connect and low-watermark + // callbacks. Set a small buffer limit so high-watermark is triggered after every write and + // low-watermark is triggered every time the buffer is drained. + client_->setBufferLimits(1); client_->addConnectionCallbacks(*callbacks_); - client_->addReadFilter(Network::ReadFilterSharedPtr{new ForwardingFilter(*this, data_callback)}); - client_->write(initial_data, false); + client_->addReadFilter( + Network::ReadFilterSharedPtr{new ForwardingFilter(*this, response_data_callback)}); client_->connect(); } diff --git a/test/integration/utility.h b/test/integration/utility.h index 21235c2e2b42..d22feacd846b 100644 --- a/test/integration/utility.h +++ b/test/integration/utility.h @@ -61,10 +61,17 @@ using BufferingStreamDecoderPtr = std::unique_ptr; */ class RawConnectionDriver { public: + using DoWriteCallback = std::function; using ReadCallback = std::function; - RawConnectionDriver(uint32_t port, Buffer::Instance& initial_data, ReadCallback data_callback, - Network::Address::IpVersion version, Event::Dispatcher& dispatcher, + RawConnectionDriver(uint32_t port, DoWriteCallback write_request_callback, + ReadCallback response_data_callback, Network::Address::IpVersion version, + Event::Dispatcher& dispatcher, + Network::TransportSocketPtr transport_socket = nullptr); + // Similar to the constructor above but accepts the request as a constructor argument. + RawConnectionDriver(uint32_t port, Buffer::Instance& request_data, + ReadCallback response_data_callback, Network::Address::IpVersion version, + Event::Dispatcher& dispatcher, Network::TransportSocketPtr transport_socket = nullptr); ~RawConnectionDriver(); const Network::Connection& connection() { return *client_; } @@ -81,37 +88,44 @@ class RawConnectionDriver { private: struct ForwardingFilter : public Network::ReadFilterBaseImpl { ForwardingFilter(RawConnectionDriver& parent, ReadCallback cb) - : parent_(parent), data_callback_(cb) {} + : parent_(parent), response_data_callback_(cb) {} // Network::ReadFilter Network::FilterStatus onData(Buffer::Instance& data, bool) override { - data_callback_(*parent_.client_, data); + response_data_callback_(*parent_.client_, data); data.drain(data.length()); return Network::FilterStatus::StopIteration; } RawConnectionDriver& parent_; - ReadCallback data_callback_; + ReadCallback response_data_callback_; }; struct ConnectionCallbacks : public Network::ConnectionCallbacks { + using WriteCb = std::function; + ConnectionCallbacks(WriteCb write_cb) : write_cb_(write_cb) {} bool connected() const { return connected_; } bool closed() const { return closed_; } // Network::ConnectionCallbacks void onEvent(Network::ConnectionEvent event) override { + if (!connected_ && event == Network::ConnectionEvent::Connected) { + write_cb_(); + } + last_connection_event_ = event; closed_ |= (event == Network::ConnectionEvent::RemoteClose || event == Network::ConnectionEvent::LocalClose); connected_ |= (event == Network::ConnectionEvent::Connected); } void onAboveWriteBufferHighWatermark() override {} - void onBelowWriteBufferLowWatermark() override {} + void onBelowWriteBufferLowWatermark() override { write_cb_(); } Network::ConnectionEvent last_connection_event_; private: + WriteCb write_cb_; bool connected_{false}; bool closed_{false}; }; diff --git a/test/per_file_coverage.sh b/test/per_file_coverage.sh index fc1c13fa6918..31e48a5bce64 100755 --- a/test/per_file_coverage.sh +++ b/test/per_file_coverage.sh @@ -53,10 +53,10 @@ declare -a KNOWN_LOW_COVERAGE=( "source/extensions/tracers:96.3" "source/extensions/tracers/opencensus:90.1" "source/extensions/tracers/xray:95.3" -"source/extensions/transport_sockets:94.8" +"source/extensions/transport_sockets:94.6" "source/extensions/transport_sockets/raw_buffer:90.9" "source/extensions/transport_sockets/tap:95.6" -"source/extensions/transport_sockets/tls:94.2" +"source/extensions/transport_sockets/tls:93.8" "source/extensions/transport_sockets/tls/private_key:76.9" ) diff --git a/test/server/connection_handler_test.cc b/test/server/connection_handler_test.cc index a7f942f95d42..e8257798b934 100644 --- a/test/server/connection_handler_test.cc +++ b/test/server/connection_handler_test.cc @@ -380,6 +380,22 @@ TEST_F(ConnectionHandlerTest, AddDisabledListener) { handler_->addListener(absl::nullopt, *test_listener); } +TEST_F(ConnectionHandlerTest, DisableListenerAfterStop) { + InSequence s; + + Network::ListenerCallbacks* listener_callbacks; + auto listener = new NiceMock(); + TestListener* test_listener = + addListener(1, false, false, "test_listener", listener, &listener_callbacks); + EXPECT_CALL(*socket_factory_, localAddress()).WillOnce(ReturnRef(local_address_)); + handler_->addListener(absl::nullopt, *test_listener); + + EXPECT_CALL(*listener, onDestroy()); + + handler_->stopListeners(); + handler_->disableListeners(); +} + TEST_F(ConnectionHandlerTest, DestroyCloseConnections) { InSequence s; diff --git a/test/test_common/threadsafe_singleton_injector.h b/test/test_common/threadsafe_singleton_injector.h index 627efa1390e6..b9a0020dc88a 100644 --- a/test/test_common/threadsafe_singleton_injector.h +++ b/test/test_common/threadsafe_singleton_injector.h @@ -12,6 +12,7 @@ template class TestThreadsafeSingletonInjector { ThreadSafeSingleton::instance_ = instance; } ~TestThreadsafeSingletonInjector() { ThreadSafeSingleton::instance_ = latched_instance_; } + T& latched() { return *latched_instance_; } private: T* latched_instance_; diff --git a/tools/api/generate_go_protobuf.py b/tools/api/generate_go_protobuf.py index 620e80bb32c5..126a782b9193 100755 --- a/tools/api/generate_go_protobuf.py +++ b/tools/api/generate_go_protobuf.py @@ -4,17 +4,21 @@ from subprocess import check_call import glob import os +import shlex import shutil import sys import re +# Needed for CI to pass down bazel options. +BAZEL_BUILD_OPTIONS = shlex.split(os.environ.get('BAZEL_BUILD_OPTIONS', '')) + TARGETS = '@envoy_api//...' IMPORT_BASE = 'github.com/envoyproxy/go-control-plane' OUTPUT_BASE = 'build_go' REPO_BASE = 'go-control-plane' BRANCH = 'master' MIRROR_MSG = 'Mirrored from envoyproxy/envoy @ ' -USER_NAME = 'go-control-plane(CircleCI)' +USER_NAME = 'go-control-plane(Azure Pipelines)' USER_EMAIL = 'go-control-plane@users.noreply.github.com' @@ -28,7 +32,7 @@ def generateProtobufs(output): # Each rule has the form @envoy_api//foo/bar:baz_go_proto. # First build all the rules to ensure we have the output files. - check_call(['bazel', 'build', '-c', 'fastbuild'] + go_protos) + check_call(['bazel', 'build', '-c', 'fastbuild'] + BAZEL_BUILD_OPTIONS + go_protos) for rule in go_protos: # Example rule: @@ -63,9 +67,7 @@ def git(repo, *args): def cloneGoProtobufs(repo): # Create a local clone of go-control-plane - git(None, 'clone', 'git@github.com:envoyproxy/go-control-plane', repo) - git(repo, 'fetch') - git(repo, 'checkout', '-B', BRANCH, 'origin/master') + git(None, 'clone', 'git@github.com:envoyproxy/go-control-plane', repo, '-b', BRANCH) def findLastSyncSHA(repo): diff --git a/tools/api_boost/api_boost.py b/tools/api_boost/api_boost.py index 8916e8b82822..8e91de120158 100755 --- a/tools/api_boost/api_boost.py +++ b/tools/api_boost/api_boost.py @@ -133,7 +133,6 @@ def ApiBoostTree(target_paths, sp.run([ 'bazel', 'build', - '--config=libc++', '--strip=always', ] + BAZEL_BUILD_OPTIONS + dep_lib_build_targets, check=True)