Skip to content

Commit 39c0db3

Browse files
crosmullercrosmuller
committed
Merge branch 'main' into feature/add_mujinasp
2 parents b0a428f + eba452a commit 39c0db3

31 files changed

Lines changed: 1268 additions & 351 deletions

‎core/docker-compose.yml‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ services:
55
ports:
66
- 80:80
77
- 443:443
8+
volumes:
9+
- ./haproxy/haproxy.pem:/usr/local/etc/haproxy/haproxy.pem
810
networks:
911
coreconextdev:
1012
aliases:
@@ -35,7 +37,7 @@ services:
3537
- ./dbschema:/docker-entrypoint-initdb.d
3638
- openconext_mariadb:/var/lib/mysql
3739
healthcheck:
38-
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
40+
test: ["CMD", "mysqladmin", "-uroot", "-psecret", "ping", "-h", "localhost"]
3941
timeout: 5s
4042
retries: 10
4143
hostname: mariadb.docker
@@ -56,18 +58,19 @@ services:
5658
- ./mongo/:/docker-entrypoint-initdb.d/
5759
- openconext_mongodb:/bitnami/mongodb
5860
healthcheck:
59-
test:
60-
[
61-
"CMD",
62-
"mongosh",
63-
"-u",
64-
"managerw",
65-
"-p",
66-
"secret",
67-
"--eval",
68-
"db.stats().ok",
69-
"mongodb://127.0.0.1/manage",
70-
]
61+
test: ['CMD', 'true']
62+
# test:
63+
# [
64+
# "CMD",
65+
# "mongosh",
66+
# "-u",
67+
# "managerw",
68+
# "-p",
69+
# "secret",
70+
# "--eval",
71+
# "db.stats().ok",
72+
# "mongodb://127.0.0.1/manage",
73+
# ]
7174
interval: 10s
7275
timeout: 10s
7376
retries: 3
@@ -126,7 +129,7 @@ services:
126129
hostname: mujinasp.docker
127130

128131
managegui:
129-
image: ghcr.io/openconext/openconext-manage/manage-gui:7.4.9
132+
image: ghcr.io/openconext/openconext-manage/manage-gui:latest
130133
environment:
131134
HTTPD_CSP: ""
132135
HTTPD_SERVERNAME: "manage.dev.openconext.local"
@@ -148,7 +151,7 @@ services:
148151
condition: service_healthy
149152

150153
manageserver:
151-
image: ghcr.io/openconext/openconext-manage/manage-server:7.4.9
154+
image: ghcr.io/openconext/openconext-manage/manage-server:latest
152155
environment:
153156
USE_SYSTEM_CA_CERTS: true
154157
volumes:
@@ -180,7 +183,7 @@ services:
180183
condition: service_healthy
181184

182185
oidcng:
183-
image: ghcr.io/openconext/openconext-oidcng/oidcng:6.1.14
186+
image: ghcr.io/openconext/openconext-oidcng/oidcng:latest
184187
networks:
185188
coreconextdev:
186189
volumes:
@@ -457,10 +460,6 @@ services:
457460

458461
sbs-server:
459462
image: ghcr.io/surfscz/sram-sbs-server:main
460-
environment:
461-
TESTING: 1
462-
PROFILE: "local"
463-
ALLOW_MOCK_USER_API: 1
464463
volumes:
465464
- ./sbs/config:/opt/sbs/config
466465
networks:

‎core/engine/docker-compose.override.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
---
2+
# This configuration uses a sub-mount for ./engine/parameters.yml
3+
# Make sure to NEVER write to parameters.yml in ${ENGINE_CODE_PATH} after starting
4+
# the container. It will destroy the sub-mount!!
25
services:
36
engine:
47
image: ghcr.io/openconext/openconext-basecontainers/${ENGINE_PHP_IMAGE:-php72-apache2-node14-composer2:latest}
58
volumes:
69
- ${ENGINE_CODE_PATH}:/var/www/html
10+
- ./engine/parameters.yml:/var/www/html/app/config/parameters.yml
711
- ./engine/appconf.conf:/etc/apache2/sites-enabled/appconf.conf
812
environment:
913
- APP_ENV=${APP_ENV:-dev}
10-
# - SYMFONY_ENV=${APP_ENV:-dev}
14+
- SYMFONY_ENV=${APP_ENV:-dev}
1115
- APP_DEBUG=1
16+
healthcheck:
17+
test: ["CMD", "true"]
18+
interval: 10s

‎core/engine/parameters.yml‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
# This file is auto-generated during the composer install
2+
parameters:
3+
secret: secret
4+
domain: dev.openconext.local
5+
hostname: engine.dev.openconext.local
6+
trusted_proxies:
7+
- 192.168.1.1
8+
- 10.0.0.1
9+
enabled_languages:
10+
- nl
11+
- en
12+
attribute_definition_file_path: '%kernel.project_dir%/application/configs/attributes.json'
13+
encryption_keys:
14+
default:
15+
publicFile: /config/engine/engineblock.crt
16+
privateFile: /config/engine/engineblock.pem
17+
forbidden_signature_methods: { }
18+
allowed_acs_location_schemes:
19+
- http
20+
- https
21+
metadata_add_requested_attributes: all
22+
php_settings:
23+
memory_limit: 256M
24+
display_errors: '1'
25+
error_reporting: '6135'
26+
date.timezone: Europe/Amsterdam
27+
sendmail_from: 'OpenConext EngineBlock <openconext-engineblock@openconext.org>'
28+
http_client.timeout: 60
29+
api.users.metadataPush.username: manage
30+
api.users.metadataPush.password: secret
31+
api.users.profile.username: profile
32+
api.users.profile.password: secret
33+
api.users.deprovision.username: lifecycle
34+
api.users.deprovision.password: secret
35+
pdp.host: 'https://pdp.dev.openconext.local'
36+
pdp.username: pdp_admin
37+
pdp.password: secret
38+
pdp.client_id: EngineBlock
39+
pdp.policy_decision_point_path: /pdp/api/decide/policy
40+
attribute_aggregation.base_url: 'https://aa.dev.openconext.local/internal/attribute/aggregation'
41+
attribute_aggregation.username: eb
42+
attribute_aggregation.password: secret
43+
logger.channel: engineblock
44+
logger.fingers_crossed.passthru_level: NOTICE
45+
logger.fingers_crossed.action_level: ERROR
46+
logger.line_format: '[%%datetime%%] %%channel%%.%%level_name%%: %%message%% %%extra%% %%context%%'
47+
database.host: mariadb
48+
database.port: '3306'
49+
database.user: ebrw
50+
database.password: secret
51+
database.dbname: eb
52+
database.test.host: mariadb
53+
database.test.port: '3306'
54+
database.test.user: ebrw
55+
database.test.password: secret
56+
database.test.dbname: eb
57+
engineblock.metadata_push_memory_limit: 256M
58+
minimum_execution_time_on_invalid_received_response: 5000
59+
addgueststatus_guestqualifier: 'urn:collab:org:dev.openconext.local'
60+
cookie.path: /
61+
cookie.secure: true
62+
cookie.locale.domain: .dev.openconext.local
63+
cookie.locale.expiry: 5184000
64+
cookie.locale.http_only: false
65+
cookie.locale.secure: true
66+
view_default_title: OpenConext
67+
view_default_header: OpenConext
68+
view_default_logo: /images/logo.png
69+
view_default_logo_width: 96
70+
view_default_logo_height: 96
71+
env_name: ''
72+
env_ribbon_color: ''
73+
ui_return_to_sp_link: false
74+
email_request_access_address: help@example.org
75+
monitor_database_health_check_query: 'SELECT uuid FROM user LIMIT 1;'
76+
wayf.cutoff_point_for_showing_unfiltered_idps: 50
77+
wayf.remember_choice: false
78+
wayf.display_default_idp_banner_on_wayf: true
79+
wayf.default_idp_entity_id: 'https://default-idp.dev.openconext.local'
80+
global.site_notice.show: false
81+
global.site_notice.allowed.tags: '<a><u><i><br><wbr><strong><em><blink><marquee><p><ul><ol><dl><li><dd><dt><div><span><blockquote><hr><h2></h2><h3><h4><h5><h6>'
82+
time_frame_for_authentication_loop_in_seconds: 60
83+
maximum_authentication_procedures_allowed: 5
84+
maximum_authentications_per_session: 5
85+
consent_store_values: true
86+
email_idp_debugging:
87+
from:
88+
name: 'OpenConext EngineBlock'
89+
address: no-reply@example.org
90+
to:
91+
address: coin-logs-dev@list.surfnet.nl
92+
name: 'OpenConext Admin'
93+
subject: 'IdP debug info from %%1$s'
94+
mailer_transport: smtp
95+
mailer_host: localhost
96+
mailer_port: '25'
97+
mailer_user: ''
98+
mailer_password: ''
99+
feature_eb_encrypted_assertions: true
100+
feature_eb_encrypted_assertions_require_outer_signature: true
101+
feature_api_metadata_push: true
102+
feature_api_consent_listing: true
103+
feature_api_consent_remove: true
104+
feature_api_metadata_api: true
105+
feature_api_deprovision: true
106+
feature_run_all_manipulations_prior_to_consent: false
107+
feature_block_user_on_violation: false
108+
feature_enable_consent: true
109+
feature_stepup_sfo_override_engine_entityid: false
110+
feature_enable_idp_initiated_flow: true
111+
feature_enable_sram_interrupt: true
112+
profile_base_url: 'https://profile.dev.openconext.local'
113+
stepup.authn_context_class_ref_blacklist_regex: '/http:\/\/vm\.openconext\.org\/assurance\/loa[1-3]/'
114+
stepup.loa.mapping:
115+
10:
116+
engineblock: 'http://dev.openconext.local/assurance/loa1'
117+
gateway: 'http://dev.openconext.local/assurance/loa1'
118+
15:
119+
engineblock: 'http://dev.openconext.local/assurance/loa1_5'
120+
gateway: 'http://dev.openconext.local/assurance/loa1_5'
121+
20:
122+
engineblock: 'http://dev.openconext.local/assurance/loa2'
123+
gateway: 'http://dev.openconext.local/assurance/loa2'
124+
30:
125+
engineblock: 'http://dev.openconext.local/assurance/loa3'
126+
gateway: 'http://dev.openconext.local/assurance/loa3'
127+
stepup.loa.loa1: 'http://dev.openconext.local/assurance/loa1'
128+
stepup.gateway.sfo.entity_id: 'https://gateway.dev.openconext.local/second-factor-only/metadata'
129+
stepup.gateway.sfo.sso_location: 'https://gateway.dev.openconext.local/second-factor-only/single-sign-on'
130+
stepup.gateway.sfo.key_file: /config/engine/engineblock.crt
131+
stepup.sfo.override_engine_entityid: ''
132+
theme.name: skeune
133+
feature_enable_sso_notification: false
134+
sso_notification_encryption_algorithm: AES-256-CBC
135+
sso_notification_encryption_key: '<xxx>'
136+
sso_notification_encryption_key_salt: '<xxx>'
137+
feature_enable_sso_session_cookie: false
138+
sso_session_cookie_max_age: 0
139+
auth.log.attributes: { }
140+
141+
sram.api_token: secret
142+
sram.base_url: 'https://sbs.dev.openconext.local/api/users/'
143+
sram.authz_location: authz_eb
144+
sram.attributes_location: attributes_eb
145+
sram.interrupt_location: interrupt
146+
sram.verify_peer: false
147+
sram.allowed_attributes:
148+
- 'urn:mace:dir:attribute-def:eduPersonEntitlement'
149+
- 'urn:mace:dir:attribute-def:uid'
150+
- 'urn:mace:dir:attribute-def:eduPersonPrincipalName'
151+
- 'urn:mace:surf.nl:attribute-def:ssh-key'

0 commit comments

Comments
 (0)