Skip to content

Commit ca15b75

Browse files
icingbagder
icing
authored and
bagder
committed
tests: add HTTP/3 test case, custom location for proper nghttpx
- adding support for HTTP/3 test cases via a nghttpx server that is build with ngtcp2 and nghttp3. - test2500 is the first test case, performing a simple GET. - nghttpx is checked for support and the 'feature' nghttpx-h3 is set accordingly. test2500 will only run, when supported. - a specific nghttpx location can be given in the environment variable NGHTTPX or via the configure option --with-test-nghttpx=<path> Extend NGHTTPX config to H2 tests as well * use $ENV{NGHTTPX} and the configured default also in http2 server starts * always provide the empty test/nghttpx.conf to nghttpx. as it defaults to reading /etc/nghttpx/nghttpx.conf otherwise. Added nghttpx to CI ngtcp2 jobs to run h3 tests. Closes #9031
1 parent 0186ec4 commit ca15b75

16 files changed

+582
-24
lines changed

‎.github/workflows/ngtcp2-gnutls.yml

+34-7
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,21 @@ jobs:
2828
matrix:
2929
build:
3030
- name: gnutls
31-
install: nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools texinfo texlive texlive-extra-utils autopoint libev-dev
32-
configure: LDFLAGS="-Wl,-rpath,$HOME/all/lib" --with-gnutls=$HOME/all --enable-debug
33-
gnutls-configure: --with-included-libtasn1 --with-included-unistring --disable-guile --disable-doc --disable-tests
31+
install: >-
32+
libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev
33+
nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin
34+
libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools
35+
texinfo texlive texlive-extra-utils autopoint libev-dev
36+
configure: >-
37+
PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib"
38+
--with-ngtcp2=$HOME/all --enable-warnings --enable-werror --enable-debug
39+
--with-test-nghttpx="$HOME/all/bin/nghttpx"
40+
ngtcp2-configure: >-
41+
--prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
42+
gnutls-configure: >-
43+
PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib -L$HOME/all/lib"
44+
--with-included-libtasn1 --with-included-unistring
45+
--disable-guile --disable-doc --disable-tests --disable-tools
3446
3547
steps:
3648
- run: |
@@ -39,6 +51,13 @@ jobs:
3951
sudo python3 -m pip install impacket
4052
name: 'install prereqs and impacket'
4153
54+
- run: |
55+
git clone --depth=1 -b openssl-3.0.7+quic https://github.com/quictls/openssl
56+
cd openssl
57+
./config --prefix=$HOME/all --libdir=$HOME/all/lib
58+
make install_sw
59+
name: 'install quictls'
60+
4261
- run: |
4362
git clone --depth=1 https://gitlab.com/gnutls/nettle.git
4463
cd nettle
@@ -51,32 +70,40 @@ jobs:
5170
git clone --depth=1 -b 3.7.7 https://github.com/gnutls/gnutls.git
5271
cd gnutls
5372
./bootstrap
54-
./configure PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib -L$HOME/all/lib" --prefix=$HOME/all ${{ matrix.build.gnutls-configure }} --disable-tools
73+
./configure ${{ matrix.build.gnutls-configure }} --prefix=$HOME/all
5574
make install
5675
name: 'install gnutls'
5776
5877
- run: |
5978
git clone --depth=1 https://github.com/ngtcp2/nghttp3
6079
cd nghttp3
6180
autoreconf -fi
62-
./configure --prefix=$HOME/all --enable-lib-only
81+
./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
6382
make install
6483
name: 'install nghttp3'
6584
6685
- run: |
6786
git clone --depth=1 https://github.com/ngtcp2/ngtcp2
6887
cd ngtcp2
6988
autoreconf -fi
70-
./configure PKG_CONFIG_PATH=$HOME/all/lib/pkgconfig LDFLAGS="-Wl,-rpath,$HOME/all/lib" --prefix=$HOME/all --enable-lib-only --with-gnutls=$HOME/all
89+
./configure ${{ matrix.build.ngtcp2-configure }} --with-openssl --with-gnutls
7190
make install
7291
name: 'install ngtcp2'
7392
93+
- run: |
94+
git clone --depth=1 https://github.com/nghttp2/nghttp2
95+
cd nghttp2
96+
autoreconf -fi
97+
./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-http3
98+
make install
99+
name: 'install nghttp2'
100+
74101
- uses: actions/checkout@v3
75102

76103
- run: autoreconf -fi
77104
name: 'autoreconf'
78105

79-
- run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
106+
- run: ./configure --with-gnutls=$HOME/all ${{ matrix.build.configure }}
80107
name: 'configure'
81108

82109
- run: make V=1

‎.github/workflows/ngtcp2-quictls.yml

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# Copyright (C) 2000 - 2022 Daniel Stenberg, <[email protected]>, et al.
2+
#
3+
# SPDX-License-Identifier: curl
4+
5+
name: ngtcp2
6+
7+
on:
8+
push:
9+
branches:
10+
- master
11+
- '*/ci'
12+
pull_request:
13+
branches:
14+
- master
15+
16+
concurrency:
17+
# Hardcoded workflow filename as workflow name above is just Linux again
18+
group: ngtcp2-openssl-${{ github.event.pull_request.number || github.sha }}
19+
cancel-in-progress: true
20+
21+
jobs:
22+
autotools:
23+
name: ${{ matrix.build.name }}
24+
runs-on: 'ubuntu-latest'
25+
timeout-minutes: 60
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
build:
30+
- name: quictls
31+
install: >-
32+
libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev
33+
configure: >-
34+
PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib"
35+
--with-ngtcp2=$HOME/all --enable-warnings --enable-werror --enable-debug
36+
--with-test-nghttpx="$HOME/all/bin/nghttpx"
37+
ngtcp2-configure: >-
38+
--prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
39+
40+
steps:
41+
- run: |
42+
sudo apt-get update
43+
sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }}
44+
sudo python3 -m pip install impacket
45+
name: 'install prereqs and impacket'
46+
47+
- run: |
48+
git clone --depth=1 -b openssl-3.0.7+quic https://github.com/quictls/openssl
49+
cd openssl
50+
./config --prefix=$HOME/all --libdir=$HOME/all/lib
51+
make install_sw
52+
name: 'install quictls'
53+
54+
- run: |
55+
git clone --depth=1 https://github.com/ngtcp2/nghttp3
56+
cd nghttp3
57+
autoreconf -fi
58+
./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
59+
make install
60+
name: 'install nghttp3'
61+
62+
- run: |
63+
git clone --depth=1 https://github.com/ngtcp2/ngtcp2
64+
cd ngtcp2
65+
autoreconf -fi
66+
./configure ${{ matrix.build.ngtcp2-configure }} --with-openssl
67+
make install
68+
name: 'install ngtcp2'
69+
70+
- run: |
71+
git clone --depth=1 https://github.com/nghttp2/nghttp2
72+
cd nghttp2
73+
autoreconf -fi
74+
./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-http3
75+
make install
76+
name: 'install nghttp2'
77+
78+
- uses: actions/checkout@v3
79+
80+
- run: autoreconf -fi
81+
name: 'autoreconf'
82+
83+
- run: ./configure --with-openssl=$HOME/all ${{ matrix.build.configure }}
84+
name: 'configure'
85+
86+
- run: make V=1
87+
name: 'make'
88+
89+
- run: make V=1 examples
90+
name: 'make examples'
91+
92+
- run: make V=1 -C tests
93+
name: 'make tests'
94+
95+
- run: make V=1 test-ci
96+
name: 'run tests'
97+
env:
98+
TFLAGS: "${{ matrix.build.tflags }}"

‎.github/workflows/ngtcp2-wolfssl.yml

+31-8
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,17 @@ jobs:
2828
matrix:
2929
build:
3030
- name: wolfssl
31-
install:
32-
configure: LDFLAGS="-Wl,-rpath,$HOME/all/lib" --with-wolfssl=$HOME/all --enable-debug
33-
wolfssl-configure: --enable-quic --enable-session-ticket --enable-earlydata --enable-psk --enable-harden --enable-altcertchains
31+
install: >-
32+
libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev
33+
configure: >-
34+
PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib"
35+
--with-ngtcp2=$HOME/all --enable-warnings --enable-werror --enable-debug
36+
--with-test-nghttpx="$HOME/all/bin/nghttpx"
37+
ngtcp2-configure: >-
38+
--prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
39+
wolfssl-configure: >-
40+
--enable-quic --enable-session-ticket --enable-earlydata --enable-psk
41+
--enable-harden --enable-altcertchains
3442
3543
steps:
3644
- run: |
@@ -48,27 +56,42 @@ jobs:
4856
name: 'install wolfssl'
4957
5058
- run: |
51-
git clone https://github.com/ngtcp2/nghttp3
59+
git clone --depth=1 -b openssl-3.0.7+quic https://github.com/quictls/openssl
60+
cd openssl
61+
./config --prefix=$HOME/all --libdir=$HOME/all/lib
62+
make install_sw
63+
name: 'install quictls'
64+
65+
- run: |
66+
git clone --depth=1 https://github.com/ngtcp2/nghttp3
5267
cd nghttp3
5368
autoreconf -fi
54-
./configure --prefix=$HOME/all --enable-lib-only
69+
./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
5570
make install
5671
name: 'install nghttp3'
5772
5873
- run: |
59-
git clone https://github.com/ngtcp2/ngtcp2
74+
git clone --depth=1 https://github.com/ngtcp2/ngtcp2
6075
cd ngtcp2
6176
autoreconf -fi
62-
./configure PKG_CONFIG_PATH=$HOME/all/lib/pkgconfig LDFLAGS="-Wl,-rpath,$HOME/all/lib" --prefix=$HOME/all --enable-lib-only --with-wolfssl=$HOME/all
77+
./configure ${{ matrix.build.ngtcp2-configure }} --with-openssl --with-wolfssl
6378
make install
6479
name: 'install ngtcp2'
6580
81+
- run: |
82+
git clone --depth=1 https://github.com/nghttp2/nghttp2
83+
cd nghttp2
84+
autoreconf -fi
85+
./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-http3
86+
make install
87+
name: 'install nghttp2'
88+
6689
- uses: actions/checkout@v3
6790

6891
- run: autoreconf -fi
6992
name: 'autoreconf'
7093

71-
- run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
94+
- run: ./configure --with-wolfssl=$HOME/all ${{ matrix.build.configure }}
7295
name: 'configure'
7396

7497
- run: make V=1

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,5 @@ curl_fuzzer
6464
curl_fuzzer_seed_corpus.zip
6565
libstandaloneengine.a
6666
tests/string
67+
tests/config
68+

‎configure.ac

+11
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,16 @@ AS_HELP_STRING([--with-nss=PATH],[where to look for NSS, PATH points to the inst
301301
fi
302302
)
303303

304+
TEST_NGHTTPX=nghttpx
305+
AC_ARG_WITH(test-nghttpx,dnl
306+
AS_HELP_STRING([--with-test-nghttpx=PATH],[where to find nghttpx for testing]),
307+
TEST_NGHTTPX=$withval
308+
if test X"$OPT_TEST_NGHTTPX" = "Xno" ; then
309+
TEST_NGHTTPX=""
310+
fi
311+
)
312+
AC_SUBST(TEST_NGHTTPX)
313+
304314
dnl If no TLS choice has been made, check if it was explicitly disabled or
305315
dnl error out to force the user to decide.
306316
if test -z "$TLSCHOICE"; then
@@ -4568,6 +4578,7 @@ AC_CONFIG_FILES([Makefile \
45684578
lib/libcurl.vers \
45694579
lib/libcurl.plist \
45704580
tests/Makefile \
4581+
tests/config \
45714582
tests/certs/Makefile \
45724583
tests/certs/scripts/Makefile \
45734584
tests/data/Makefile \

‎tests/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ runtests.pdf
2424
testcurl.html
2525
testcurl.pdf
2626
*.port
27+
config

‎tests/README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SPDX-License-Identifier: curl
1616
- diff (when a test fails, a diff is shown)
1717
- stunnel (for HTTPS and FTPS tests)
1818
- OpenSSH or SunSSH (for SCP, SFTP and SOCKS4/5 tests)
19-
- nghttpx (for HTTP/2 tests)
19+
- nghttpx (for HTTP/2 and HTTP/3 tests)
2020
- nroff (for --manual tests)
2121
- An available `en_US.UTF-8` locale
2222

@@ -69,6 +69,11 @@ SPDX-License-Identifier: curl
6969

7070
The HTTP server supports listening on a Unix domain socket, the default
7171
location is 'http.sock'.
72+
73+
For HTTP/2 and HTTP/3 testing an installed `nghttpx` is used. HTTP/3
74+
tests check if nghttpx supports the protocol. To override the nghttpx
75+
used, set the environment variable `NGHTTPX`. The default can also be
76+
changed by specifying `--with-test-nghttpx=<path>` as argument to `configure`.
7277

7378
### Run
7479

‎tests/config.in

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#***************************************************************************
2+
# _ _ ____ _
3+
# Project ___| | | | _ \| |
4+
# / __| | | | |_) | |
5+
# | (__| |_| | _ <| |___
6+
# \___|\___/|_| \_\_____|
7+
#
8+
# Copyright (C) 1998 - 2022, Daniel Stenberg, <[email protected]>, et al.
9+
#
10+
# This software is licensed as described in the file COPYING, which
11+
# you should have received as part of this distribution. The terms
12+
# are also available at https://curl.se/docs/copyright.html.
13+
#
14+
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
15+
# copies of the Software, and permit persons to whom the Software is
16+
# furnished to do so, under the terms of the COPYING file.
17+
#
18+
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
19+
# KIND, either express or implied.
20+
#
21+
# SPDX-License-Identifier: curl
22+
#
23+
###########################################################################
24+
NGHTTPX: @TEST_NGHTTPX@

‎tests/data/Makefile.inc

+2
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ test2200 test2201 test2202 test2203 test2204 test2205 \
243243
\
244244
test2300 test2301 test2302 test2303 \
245245
\
246+
test2500 \
247+
\
246248
test3000 test3001 test3002 test3003 test3004 test3005 test3006 test3007 \
247249
test3008 test3009 test3010 test3011 test3012 test3013 test3014 test3015 \
248250
test3016 test3017 test3018 test3019 test3020 test3021 test3022 test3023 \

0 commit comments

Comments
 (0)