Skip to content

Commit fd77127

Browse files
committed
Add AzureMFA for functional tests
This is done for the functional testing setup
1 parent 2712a30 commit fd77127

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

ci/docker/compose.override.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
services:
2+
haproxy:
3+
networks:
4+
openconextdev:
5+
aliases:
6+
- ra.dev.openconext.local
7+
- ssp.dev.openconext.local
8+
- selfservice.dev.openconext.local
9+
- middleware.dev.openconext.local
10+
- gateway.dev.openconext.local
11+
- demogssp.dev.openconext.local
12+
- webauthn.dev.openconext.local
13+
- tiqr.dev.openconext.local
14+
- azuremfa.dev.openconext.local
15+
- mailcatcher.dev.openconext.local
216
gateway:
317
image: ghcr.io/openconext/openconext-basecontainers/php82-apache2-node20-composer2:latest
418
container_name: gateway
@@ -14,3 +28,9 @@ services:
1428
mariadb:
1529
volumes:
1630
- ../../devconf/stepup/dbschema/:/docker-entrypoint-initdb.d/
31+
azuremfa:
32+
image: ghcr.io/openconext/stepup-azuremfa/stepup-azuremfa:test
33+
environment:
34+
APP_ENV: smoketest
35+
volumes:
36+
- ../../devconf/stepup/:/config

ci/docker/init.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env bash
22
cp ../../devconf/stepup/gateway/surfnet_yubikey.yaml.dist ../../devconf/stepup/gateway/surfnet_yubikey.yaml
33
echo "pulling the images"
4-
docker compose pull gateway selenium haproxy ssp mariadb chrome
4+
docker compose pull gateway selenium haproxy ssp mariadb azuremfa chrome
55
echo "starting the images"
6-
docker compose up gateway selenium haproxy ssp mariadb chrome -d
6+
docker compose up gateway selenium haproxy ssp mariadb azuremfa chrome -d
77
echo "intialising the environment"
88
docker compose exec -T gateway bash -c '
99
cp /var/www/html/devconf/stepup/gateway/surfnet_yubikey.yaml.dist /var/www/html/devconf/stepup/gateway/surfnet_yubikey.yaml && \

src/Surfnet/StepupGateway/GatewayBundle/Sso2fa/CookieService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public function maySkipAuthentication(
149149
return false;
150150
}
151151

152-
if (!$this->secondFactorService->findByUuid($ssoCookie->secondFactorId(),)) {
152+
if (!$this->secondFactorService->findByUuid($ssoCookie->secondFactorId())) {
153153
$this->logger->notice(
154154
'The second factor stored in the SSO cookie was revoked or has otherwise became unknown to Gateway',
155155
[

0 commit comments

Comments
 (0)