Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Attempt to fix use-after-free in tls_proxy CLI test #4148

Closed
wants to merge 21 commits into from
Closed

Attempt to fix use-after-free in tls_proxy CLI test #4148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9f68d9d
FIX: potential use-after-free in tls_proxy
reneme Jun 24, 2024
0c522d2
Re-enable tls_proxy test in Windows
reneme Jun 24, 2024
a758328
always log output of tls_proxy
reneme Jun 24, 2024
6b4c7fc
more logging
reneme Jun 24, 2024
c4cfa52
better handling of https client exceptions
reneme Jul 2, 2024
fb0ce7c
disable most CI jobs
reneme Jul 2, 2024
6baec20
run the cli tests multiple times
reneme Jul 2, 2024
608c96a
disable unit tests in CI
reneme Jul 2, 2024
3453822
more logging
reneme Jul 2, 2024
99a58c6
FIX: the fix
reneme Jul 2, 2024
a1208e7
disable tls_socket_tests
reneme Jul 2, 2024
a68b259
disable bogo
reneme Jul 2, 2024
fb49f08
set a longer timeout
reneme Jul 2, 2024
45a3499
Use asyncio for TLS system test
reneme Jul 3, 2024
2314081
Refactor the asyncio helper classes
reneme Jul 3, 2024
3c5c796
./botan tls_proxy reports readiness on stdout
reneme Jul 3, 2024
d451755
asyncio-based tls_proxy_tests
reneme Jul 3, 2024
2199f3b
production configuration
reneme Jul 3, 2024
0fcd77d
LOG ALL THE THINGS
reneme Jul 3, 2024
6025c31
revert unneccesary error
reneme Jul 3, 2024
65775bd
ensure termination
reneme Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
347 changes: 174 additions & 173 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,69 +58,69 @@ jobs:
- name: Build and Test Botan
run: python3 ./src/scripts/ci_build.py --cc='msvc' --make-tool='ninja' --cpu='${{ matrix.arch }}' --test-results-dir=junit_results ${{ matrix.target }}

linux:
name: "Linux"
strategy:
fail-fast: false

matrix:
include:
- compiler: gcc
target: shared
- compiler: gcc
target: amalgamation
- compiler: gcc
target: static
- compiler: clang
target: shared

runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4

- name: Setup Build Agent
uses: ./.github/actions/setup-build-agent
with:
target: ${{ matrix.target }}
cache-key: linux-${{ matrix.compiler }}-x86_64-${{ matrix.target }}

- name: Build and Test Botan
run: python3 ./src/scripts/ci_build.py --cc='${{ matrix.compiler }}' --test-results-dir=junit_results ${{ matrix.target }}

macos:
name: "macOS"
strategy:
fail-fast: false

matrix:
include:
- target: shared
compiler: xcode
os: macos-13
- target: amalgamation
compiler: xcode
os: macos-13
- target: shared
compiler: xcode
os: macos-14 # uses Apple Silicon
- target: amalgamation
compiler: xcode
os: macos-14 # uses Apple Silicon

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4

- name: Setup Build Agent
uses: ./.github/actions/setup-build-agent
with:
target: ${{ matrix.target }}
cache-key: macos-${{ matrix.compiler }}-${{ matrix.os }}-${{ matrix.target }}

- name: Build and Test Botan
run: python3 ./src/scripts/ci_build.py --cc='${{ matrix.compiler }}' --test-results-dir=junit_results ${{ matrix.target }}
# linux:
# name: "Linux"
# strategy:
# fail-fast: false

# matrix:
# include:
# - compiler: gcc
# target: shared
# - compiler: gcc
# target: amalgamation
# - compiler: gcc
# target: static
# - compiler: clang
# target: shared

# runs-on: ubuntu-22.04

# steps:
# - uses: actions/checkout@v4

# - name: Setup Build Agent
# uses: ./.github/actions/setup-build-agent
# with:
# target: ${{ matrix.target }}
# cache-key: linux-${{ matrix.compiler }}-x86_64-${{ matrix.target }}

# - name: Build and Test Botan
# run: python3 ./src/scripts/ci_build.py --cc='${{ matrix.compiler }}' --test-results-dir=junit_results ${{ matrix.target }}

# macos:
# name: "macOS"
# strategy:
# fail-fast: false

# matrix:
# include:
# - target: shared
# compiler: xcode
# os: macos-13
# - target: amalgamation
# compiler: xcode
# os: macos-13
# - target: shared
# compiler: xcode
# os: macos-14 # uses Apple Silicon
# - target: amalgamation
# compiler: xcode
# os: macos-14 # uses Apple Silicon

# runs-on: ${{ matrix.os }}

# steps:
# - uses: actions/checkout@v4

# - name: Setup Build Agent
# uses: ./.github/actions/setup-build-agent
# with:
# target: ${{ matrix.target }}
# cache-key: macos-${{ matrix.compiler }}-${{ matrix.os }}-${{ matrix.target }}

# - name: Build and Test Botan
# run: python3 ./src/scripts/ci_build.py --cc='${{ matrix.compiler }}' --test-results-dir=junit_results ${{ matrix.target }}

clang-tidy:
name: "Clang Tidy"
Expand Down Expand Up @@ -153,34 +153,34 @@ jobs:

matrix:
include:
- target: coverage
compiler: gcc
host_os: ubuntu-24.04
- target: sanitizer
compiler: msvc
host_os: windows-2022
make_tool: ninja
- target: sanitizer
compiler: clang
host_os: ubuntu-24.04
# - target: coverage
# compiler: gcc
# host_os: ubuntu-24.04
# - target: sanitizer
# compiler: msvc
# host_os: windows-2022
# make_tool: ninja
# - target: sanitizer
# compiler: clang
# host_os: ubuntu-24.04
- target: sanitizer
compiler: gcc
host_os: ubuntu-24.04
- target: valgrind
compiler: clang
host_os: ubuntu-24.04
- target: fuzzers
compiler: gcc
host_os: ubuntu-24.04
- target: lint
compiler: gcc
host_os: ubuntu-24.04
- target: format
compiler: gcc
host_os: ubuntu-24.04
- target: limbo
compiler: gcc
host_os: ubuntu-24.04
# - target: valgrind
# compiler: clang
# host_os: ubuntu-24.04
# - target: fuzzers
# compiler: gcc
# host_os: ubuntu-24.04
# - target: lint
# compiler: gcc
# host_os: ubuntu-24.04
# - target: format
# compiler: gcc
# host_os: ubuntu-24.04
# - target: limbo
# compiler: gcc
# host_os: ubuntu-24.04

runs-on: ${{ matrix.host_os }}

Expand Down Expand Up @@ -209,88 +209,89 @@ jobs:
- name: Build and Test Botan
run: python3 ./source/src/scripts/ci_build.py --root-dir=${{ github.workspace }}/source --build-dir=${{ github.workspace }}/build --boringssl-dir=${{ github.workspace }}/boringssl --cc='${{ matrix.compiler }}' --make-tool='${{ matrix.make_tool }}' --test-results-dir=junit_results ${{ matrix.target }}

specials:
name: "Special"
strategy:
fail-fast: false

matrix:
include:
- target: examples
compiler: gcc
host_os: ubuntu-24.04
- target: minimized
compiler: gcc
host_os: ubuntu-24.04
- target: bsi
compiler: gcc
host_os: ubuntu-24.04
- target: docs
compiler: gcc
host_os: ubuntu-24.04

runs-on: ${{ matrix.host_os }}

steps:
- uses: actions/checkout@v4
with:
path: ./source

- name: Setup Build Agent
uses: ./source/.github/actions/setup-build-agent
with:
target: ${{ matrix.target }}
cache-key: ${{ matrix.host_os }}-${{ matrix.compiler }}-x86_64-${{ matrix.target }}

- name: Build and Test Botan
run: python3 ./source/src/scripts/ci_build.py --root-dir=${{ github.workspace }}/source --build-dir=${{ github.workspace }}/build --boringssl-dir=${{ github.workspace }}/boringssl --cc='${{ matrix.compiler }}' --test-results-dir=junit_results ${{ matrix.target }}

x-compile:
name: "Cross"
strategy:
fail-fast: false

matrix:
include:
- target: cross-i386
compiler: gcc
host_os: ubuntu-22.04
- target: cross-arm32
compiler: gcc
host_os: ubuntu-24.04
- target: cross-arm64
compiler: gcc
host_os: ubuntu-24.04
- target: cross-ppc64
compiler: gcc
host_os: ubuntu-24.04
- target: cross-mips64
compiler: gcc
host_os: ubuntu-24.04
- target: cross-android-arm64
compiler: clang
host_os: ubuntu-24.04
- target: static
compiler: gcc
host_os: windows-2022
make_tool: make
- target: cross-ios-arm64
compiler: xcode
host_os: macos-13

runs-on: ${{ matrix.host_os }}

env:
ANDROID_NDK: android-ndk-r26

steps:
- uses: actions/checkout@v4

- name: Setup Build Agent
uses: ./.github/actions/setup-build-agent
with:
target: ${{ matrix.target }}
cache-key: ${{ matrix.host_os }}-${{ matrix.compiler }}-xcompile-${{ matrix.target }}

- name: Build and Test Botan
run: python3 ./src/scripts/ci_build.py --cc='${{ matrix.compiler }}' --make-tool='${{ matrix.make_tool }}' --test-results-dir=junit_results ${{ matrix.target }}
# specials:
# name: "Special"
# strategy:
# fail-fast: false

# matrix:
# include:
# - target: examples
# compiler: gcc
# host_os: ubuntu-24.04
# - target: minimized
# compiler: gcc
# host_os: ubuntu-24.04
# - target: bsi
# compiler: gcc
# host_os: ubuntu-24.04
# - target: docs
# compiler: gcc
# host_os: ubuntu-24.04

# runs-on: ${{ matrix.host_os }}

# steps:
# - uses: actions/checkout@v4
# with:
# path: ./source

# - name: Setup Build Agent
# uses: ./source/.github/actions/setup-build-agent
# with:
# target: ${{ matrix.target }}
# cache-key: ${{ matrix.host_os }}-${{ matrix.compiler }}-x86_64-${{ matrix.target }}

# - name: Build and Test Botan
# run: python3 ./source/src/scripts/ci_build.py --root-dir=${{ github.workspace }}/source --build-dir=${{ github.workspace }}/build --boringssl-dir=${{ github.workspace }}/boringssl --cc='${{ matrix.compiler }}' --test-results-dir=junit_results ${{ matrix.target }}

# x-compile:
# name: "Cross"
# strategy:
# fail-fast: false

# matrix:
# include:
# - target: cross-i386
# compiler: gcc
# host_os: ubuntu-22.04
# - target: cross-arm32
# compiler: gcc
# host_os: ubuntu-24.04
# - target: cross-arm64
# compiler: gcc
# host_os: ubuntu-24.04
# - target: cross-ppc64
# compiler: gcc
# host_os: ubuntu-24.04
# - target: cross-mips64
# compiler: gcc
# host_os: ubuntu-24.04
# - target: cross-android-arm64
# compiler: clang
# host_os: ubuntu-24.04
# - target: static
# compiler: gcc
# host_os: windows-2022
# make_tool: make
# - target: cross-ios-arm64
# compiler: xcode
# host_os: macos-13


# runs-on: ${{ matrix.host_os }}

# env:
# ANDROID_NDK: android-ndk-r26

# steps:
# - uses: actions/checkout@v4

# - name: Setup Build Agent
# uses: ./.github/actions/setup-build-agent
# with:
# target: ${{ matrix.target }}
# cache-key: ${{ matrix.host_os }}-${{ matrix.compiler }}-xcompile-${{ matrix.target }}

# - name: Build and Test Botan
# run: python3 ./src/scripts/ci_build.py --cc='${{ matrix.compiler }}' --make-tool='${{ matrix.make_tool }}' --test-results-dir=junit_results ${{ matrix.target }}
3 changes: 3 additions & 0 deletions src/cli/tls_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <botan/tls_session_manager_sqlite.h>
#endif

#include <iostream>
#include <memory>
#include <string>

Expand Down Expand Up @@ -125,6 +126,7 @@ class Callbacks : public Botan::TLS::Callbacks {
output() << certs[i].PEM_encode();
}
}
output() << std::flush;
}

void tls_emit_data(std::span<const uint8_t> buf) override {
Expand All @@ -141,6 +143,7 @@ class Callbacks : public Botan::TLS::Callbacks {
for(const auto c : buf) {
output() << c;
}
output() << std::flush;
}

std::vector<uint8_t> tls_sign_message(const Botan::Private_Key& key,
Expand Down
Loading
Loading