Bump conformance suite version

ory · Nov 2, 2024 · a14294c · a14294c
1 parent 0961164
commit a14294c
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 35 deletions.
diff --git a/test/conformance/Dockerfile b/test/conformance/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3-jdk-11
+FROM maven:3-openjdk-17-slim
 
 WORKDIR /usr/src/mymaven
 RUN apt-get update && apt-get install -y \
@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y \
     redir \
     ca-certificates
 
-ARG CONFORMANCE_SUITE_VERSION=v4.1.45
+ARG CONFORMANCE_SUITE_VERSION=v5.1.24
 RUN wget https://gitlab.com/openid/conformance-suite/-/archive/release-${CONFORMANCE_SUITE_VERSION}/conformance-suite-release-${CONFORMANCE_SUITE_VERSION}.zip && \
   unzip conformance-suite-release-${CONFORMANCE_SUITE_VERSION}.zip -d . && \
   rm conformance-suite-release-${CONFORMANCE_SUITE_VERSION}.zip && \

diff --git a/test/conformance/docker-compose.yml b/test/conformance/docker-compose.yml
@@ -21,7 +21,7 @@ services:
         target: /etc/config/hydra
 
   mongodb:
-    image: mongo:4.2
+    image: mongo:5.0
     networks:
       - intranet
     volumes:
@@ -39,6 +39,7 @@ services:
       dockerfile: httpd/Dockerfile
     ports:
       - "8443:8443"
+      - "8444:8444"
     depends_on:
       - server
     networks:

diff --git a/test/conformance/httpd/Dockerfile b/test/conformance/httpd/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm
+FROM debian:buster
 RUN apt-get update \
 	&& apt-get install -y apache2 ssl-cert ca-certificates \
 	&& apt-get clean

diff --git a/test/conformance/httpd/server.conf b/test/conformance/httpd/server.conf
@@ -1,33 +1,58 @@
+LimitRequestLine 32768
+
 <VirtualHost *:8443>
-	ServerName localhost
-	ErrorLog /dev/stderr
-	CustomLog /dev/stdout combined
-	ProxyPreserveHost on
-	RewriteEngine on
-	SSLEngine on
-	SSLProtocol +TLSv1 +TLSv1.1 +TLSv1.2
-	SSLCertificateFile /etc/ssl/certs/ory-conformity.crt
-  	SSLCertificateKeyFile /etc/ssl/private/ory-conformity.key
-	RequestHeader set X-Ssl-Cipher "%{SSL_CIPHER}s"
-	RequestHeader set X-Ssl-Protocol "%{SSL_PROTOCOL}s"
-	RequestHeader set X-Forwarded-Proto https
-	RequestHeader set X-Forwarded-Port 8443
-	ProxyPass "/" "http://server:8080/"
-	# RewriteRule "^/(.*)$" "http://server:8080/$1" [P]
-	ProxyPassReverse "/" "http://server:8080/"
-	<Location "/">
-		Require all granted
-	</Location>
-	<Location "/test-mtls/">
-		SSLVerifyClient optional_no_ca
-		SSLVerifyDepth 5
-		RequestHeader set X-Ssl-Cert "%{SSL_CLIENT_CERT}s"
-		RequestHeader set X-Ssl-Verify "%{SSL_CLIENT_VERIFY}s"
-		RequestHeader set X-Ssl-Cert-Chain-0 "%{SSL_CLIENT_CERT_CHAIN_0}s"
-		RequestHeader set X-Ssl-Cert-Chain-1 "%{SSL_CLIENT_CERT_CHAIN_1}s"
-		RequestHeader set X-Ssl-Cert-Chain-2 "%{SSL_CLIENT_CERT_CHAIN_2}s"
-		RequestHeader set X-Ssl-Cert-Chain-3 "%{SSL_CLIENT_CERT_CHAIN_3}s"
-		RequestHeader set X-Ssl-Cert-Chain-4 "%{SSL_CLIENT_CERT_CHAIN_4}s"
-		RequestHeader set X-Ssl-Cert-Chain-5 "%{SSL_CLIENT_CERT_CHAIN_5}s"
-	</Location>
+  ServerName localhost
+  ErrorLog /dev/stderr
+  CustomLog /dev/stdout combined
+  ProxyPreserveHost on
+  RewriteEngine on
+  SSLEngine on
+  SSLProtocol +TLSv1 +TLSv1.1 +TLSv1.2
+  SSLCertificateFile /etc/ssl/certs/ory-conformity.crt
+  SSLCertificateKeyFile /etc/ssl/private/ory-conformity.key
+  RequestHeader set X-Ssl-Cipher "%{SSL_CIPHER}s"
+  RequestHeader set X-Ssl-Protocol "%{SSL_PROTOCOL}s"
+  RequestHeader set X-Forwarded-Proto https
+  RequestHeader set X-Forwarded-Port 8443
+  ProxyPass "/" "http://server:8080/"
+  # RewriteRule "^/(.*)$" "http://server:8080/$1" [P]
+  ProxyPassReverse "/" "http://server:8080/"
+  <Location "/">
+    Require all granted
+  </Location>
+  <Location "/test-mtls">
+    RequestHeader set X-Test-Mtls-Called-On-Wrong-Host "true"
+  </Location>
+</VirtualHost>
+<VirtualHost *:8444>
+  ServerName localhost
+  ErrorLog /dev/stderr
+  CustomLog /dev/stdout combined
+  ProxyPreserveHost on
+  RewriteEngine on
+  SSLEngine on
+  SSLProtocol +TLSv1.2 +TLSv1.3
+  Protocols http/1.1
+  SSLCertificateFile /etc/ssl/certs/ory-conformity.crt
+  SSLCertificateKeyFile /etc/ssl/private/ory-conformity.key
+  RequestHeader set X-Ssl-Cipher "%{SSL_CIPHER}s"
+  RequestHeader set X-Ssl-Protocol "%{SSL_PROTOCOL}s"
+  RequestHeader set X-Forwarded-Proto https
+  RequestHeader set X-Forwarded-Port 8444
+  ProxyPass "/" "http://server:8080/"
+  ProxyPassReverse "/" "http://server:8080/"
+  <Location "/">
+    Require all granted
+  </Location>
+
+  SSLVerifyClient optional_no_ca
+  SSLVerifyDepth 5
+  RequestHeader set X-Ssl-Cert "%{SSL_CLIENT_CERT}s"
+  RequestHeader set X-Ssl-Verify "%{SSL_CLIENT_VERIFY}s"
+  RequestHeader set X-Ssl-Cert-Chain-0 "%{SSL_CLIENT_CERT_CHAIN_0}s"
+  RequestHeader set X-Ssl-Cert-Chain-1 "%{SSL_CLIENT_CERT_CHAIN_1}s"
+  RequestHeader set X-Ssl-Cert-Chain-2 "%{SSL_CLIENT_CERT_CHAIN_2}s"
+  RequestHeader set X-Ssl-Cert-Chain-3 "%{SSL_CLIENT_CERT_CHAIN_3}s"
+  RequestHeader set X-Ssl-Cert-Chain-4 "%{SSL_CLIENT_CERT_CHAIN_4}s"
+  RequestHeader set X-Ssl-Cert-Chain-5 "%{SSL_CLIENT_CERT_CHAIN_5}s"
 </VirtualHost>