thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-11-04 02:59:20 +00:00
Code Issues Releases Wiki Activity
1,098 Commits 3 Branches 6 Tags
2ed32974e0cf086340d016b227dfb60214c1768a
Commit Graph

221 Commits

Author SHA1 Message Date
polarathene
1d2f308cdf feat: Bring back ability to skip default DH params 
Adds back the ability to avoid using DH params, provided no file was explicitly supplied.

This used to be `DHPARAM_GENERATION=false`, the equivalent is now `DHPARAM_SKIP=1` (default 0). Previous name was no longer appropriate.

Ensures that if a user has explicitly provided their own dhparam file to still output a warning instead of the skip message, since `DHPARAM_SKIP=1` doesn't disable the support in nginx.
 2021-09-28 21:59:53 +13:00
polarathene
fd35a09240 tests: Revise dhparams tests 
- `dhparam_generation` tests are no longer necessary, dropped.

Modified the remaining `dhparam` test to use multiple `nginx-proxy` images to verify correct behavior for different configs.

Tests now cover:

- Default (ffdhe4096) is used.
- Alternative via ENV (ffdhe2048) works correctly.
- Invalid group via ENV (1024-bit) fails.
- Custom DH params provided via file mount works with warning emitted.

---

- `assert_log_contains`: added a `container_name` arg with `nginxproxy` as the default value. This allows multiple nginx-proxy containers to utilize this method instead.

- Extracted out the `openssl` test (_to `negotiate_cipher()`_) and modified it to be a bit more flexible. It now takes a container with optional extra args to pass to `openssl` command called, as well as the `grep` string to match. This made the original test redundant, so I've dropped it.

- Added two methods to use `negotiate_cipher()`, one verifies a DHE cipher suite was negotiated and checks that a DH emphermal key was also mentioned in the output. The other method verifies the expectation of failing to negotiate a valid cipher if DH params have not been set, while verifying that non-DHE cipher suites can be successfully negotiated.

- Added a `get_env()` method for extracting attached environments on a container. This is useful for verifying invalid `DHPARAM_BITS` values (eg `1024`-bit).

- The original `Server Temp Key` assertion was incorrect, it was expecting a value that is unrelated to DHE cipher suite support (_`X25519` is related to ECDHE_). This is due to TLS 1.3 being negotiated where you cannot use custom DH params, nor influence the negotiated cipher due to this mechanism changing from TLS 1.3. TLS 1.3 does support DH params, but it internally negotiates RFC 7919 group between server and client instead. Thus to verify expectations, the connection via `openssl` is made explicitly with TLS 1.2 instead.
 2021-09-28 21:59:53 +13:00
polarathene
9299a2801e tests: Remove dhparam volume 
No longer necessary for the majority of tests.
 2021-09-28 21:50:11 +13:00
dependabot[bot]
083d86a79d chore(deps): bump docker from 5.0.0 to 5.0.2 in /test/requirements 
Bumps [docker](https://github.com/docker/docker-py) from 5.0.0 to 5.0.2.
- [Release notes](https://github.com/docker/docker-py/releases)
- [Commits](https://github.com/docker/docker-py/compare/5.0.0...5.0.2)

---
updated-dependencies:
- dependency-name: docker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-02 04:18:54 +00:00
Nicolas Duchon
481c5a2318 Merge pull request #1760 from nginx-proxy/python-docker-mod-check 
Ease version check on python docker module for tests
 2021-09-01 14:48:35 +02:00
Nicolas Duchon
a1ff28cec8 CI: ease version check on python docker module 2021-09-01 09:31:02 +02:00
dependabot[bot]
308df38b14 chore(deps): bump pytest from 6.2.4 to 6.2.5 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.4 to 6.2.5.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.4...6.2.5)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-31 04:22:47 +00:00
Nicolas Duchon
d10531e925 tests: predictable upstream names 2021-08-17 21:50:18 +02:00
Nicolas Duchon
ba86bc04f6 tests: check for raw IPv4/6 used as VIRTUAL_HOST 2021-08-04 22:25:55 +02:00
Nicolas Duchon
df638c3fe6 ci: cleanup left over volumes after tests 2021-08-02 19:31:36 +02:00
Nicolas Duchon
10a4db5067 ci: remove xfail from tests that were fixed 2021-08-02 19:08:06 +02:00
Nicolas Duchon
d3fc5c506a ci: enable Docker IPv6 on tests that require it 2021-08-02 18:37:33 +02:00
Nicolas Duchon
795e0acda7 ci: remove InsecureRequestWarning from urllib3 2021-08-02 18:09:34 +02:00
Nicolas Duchon
90a7218622 ci: update contest.py 2021-08-02 14:48:40 +02:00
Nicolas Duchon
ce4ce0676a ci: update docker and docker-compose pip packages 2021-08-02 14:44:21 +02:00
dependabot[bot]
1ba594cc4d chore(deps): bump pytest from 6.2.2 to 6.2.4 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.2 to 6.2.4.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.2...6.2.4)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-02 11:05:37 +00:00
dependabot[bot]
9855571616 chore(deps): bump backoff from 1.10.0 to 1.11.1 in /test/requirements 
Bumps [backoff](https://github.com/litl/backoff) from 1.10.0 to 1.11.1.
- [Release notes](https://github.com/litl/backoff/releases)
- [Changelog](https://github.com/litl/backoff/blob/master/CHANGELOG.md)
- [Commits](https://github.com/litl/backoff/compare/v1.10.0...v1.11.1)

---
updated-dependencies:
- dependency-name: backoff
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-02 10:55:56 +00:00
dependabot[bot]
eefea9daec chore(deps): bump requests from 2.25.1 to 2.26.0 in /test/requirements 
Bumps [requests](https://github.com/psf/requests) from 2.25.1 to 2.26.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/master/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.25.1...v2.26.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-02 10:47:08 +00:00
Gilles Filippini
a637b399b8 test: add test_server-down/test_load-balancing 
Check that when multiple containers have the same WIRTUAL_HOST and one of
them is unreachable, the resulting `upstream` block has no
`server 127.0.0.1 down;` entry.
 2021-06-21 00:48:21 +02:00
Nicolas Duchon
2006968c05 Merge pull request #1667 from pini-gh/pini-1609 
Use `server 127.0.0.1 down` entry only when required
 2021-06-20 18:04:19 +02:00
Gilles Filippini
7c0a4cb0b3 fix: escape backslash in test 2021-06-15 23:55:31 +02:00
Gilles Filippini
fca248a965 fix: server 127.0.0.1 down entry only when required 2021-06-15 23:54:24 +02:00
John Stucklen
790785f1ab test: custom HTTPS port and redirection 2021-06-15 00:38:32 +02:00
John Stucklen
6bb7c37605 test: custom HTTP port 2021-06-15 00:13:06 +02:00
Gilles Filippini
2bb53bd303 test: add tests for the DEBUG flag 2021-05-28 01:52:01 +02:00
Gilles Filippini
3785649eb6 test: VIRTUAL_PORT != single exposed port 2021-05-28 00:04:59 +02:00
Laurynas Alekna
fb7a11212f Make server_tokens configurable per virtual-host 2021-05-13 21:52:06 +01:00
Laurynas Alekna
70b95b1708 Fix create_server_certificate.sh 
Docker image nginx:1.14.1 has no openssl installed. Therefore upgrading to nginx:1.19.10
 2021-05-11 10:29:22 +01:00
Nicolas Duchon
a9cfdc843e docs: fix broken link 2021-05-01 22:30:57 +02:00
Nicolas Duchon
1f937dd6a5 docs: don't mention Docker container based tests 
Those aren't working yet and are being worked on
close #1605
 2021-04-28 09:58:03 +02:00
Kevin Marilleau
1518c39e1b docs: update "how to install/test" parts 2021-04-27 00:35:21 +02:00
Kevin Marilleau
39f822dd8b refactor(ci): ♻️ refactor makefile and modify its usage on CI 2021-04-27 00:35:21 +02:00
Kevin Marilleau
1591fd7968 chore(ci): 💚 use standard python for nginx-proxy-tester 2021-04-27 00:35:21 +02:00
Kevin Marilleau
3b1163291b fix(test): test_dockergen_v3 version comparison 2021-04-27 00:35:21 +02:00
Kevin Marilleau
dd7f7e8427 fix(ci): wrong nginx-proxy image used on default_host test 2021-04-27 00:35:20 +02:00
Kevin Marilleau
0c60d57031 fix(ci): fix test_dhparam_is_generated_if_missing 2021-04-27 00:35:20 +02:00
Kevin Marilleau
6fd3cfb38f fix(ci): 🔧 add markers on pytest.ini to fix warnings 2021-04-27 00:35:20 +02:00
Kevin Marilleau
37e85e6e8d chore(ci): ♻️ convert Python old % string to f-strings 2021-04-27 00:35:20 +02:00
Kevin Marilleau
eba9ac4261 chore(ci): ⬆️ update python dependencies to latests release 2021-04-27 00:35:19 +02:00
Kevin Marilleau
950a28f5ea chore(ci): ⬆️ porting python 2.7 code to python 3.9 2021-04-27 00:35:19 +02:00
Nicolas Duchon
ad7c02570b chore: use nginxproxy's DockerHub registry 
Transitioning away from jwilder/nginx-proxy
Please see #1304 for more details
 2021-04-01 16:06:09 +02:00
Jiazhen Xie
23823c4b21 Fix the test 2019-08-07 17:33:02 +01:00
Steve Kamerman
ad41178036 Fixed tests that are now failing due to the dhparam clearing command beating the nginx startup. This is fixed permanently in #1213, but this PR fixes the test so as not to rely on the dhparam autogen, which is tested elsewhere. 2019-02-04 15:15:04 -05:00
Jason Wilder
7dd97d4bc3 Merge pull request #1111 from kamermans/bugfix/cant-disable-hsts-noredirect 
Fixed #1080, can't disable HSTS with noredirect
 2019-01-29 16:21:30 -07:00
Gpkfr
58c1fe3606 Upgrade to nginx 1.14.1 stable version 2018-11-09 15:26:01 +01:00
Steve Kamerman
936e57a6de Fixed #1080, can't disable HSTS with noredirect 2018-08-01 11:30:06 -04:00
Matthias Döring
cb2b0e2bd3 Upgrade to nginx 1.14 stable 2018-06-06 00:56:47 +02:00
Steve Kamerman
9be2624d09 Increased dependency versions to get around pip internal problem 2018-04-22 16:11:32 -04:00
Steve Kamerman
c417813df9 Fixed out-of-scope variable 2018-04-22 16:03:43 -04:00
Jason Wilder
ccbbbeb928 Merge pull request #1073 from b1f6c1c4/b1f6c1c4-patch-1 
Add HSTS header regardless of status code
 2018-03-30 17:34:02 -04:00