mirror of
https://github.com/Cian-H/iform-invenio.git
synced 2025-12-22 20:41:56 +00:00
Simplified to attempt oauth fix again
This commit is contained in:
@@ -25,7 +25,6 @@ services:
|
|||||||
- uploaded_data:/opt/invenio/var/instance/data
|
- uploaded_data:/opt/invenio/var/instance/data
|
||||||
- archived_data:/opt/invenio/var/instance/archive
|
- archived_data:/opt/invenio/var/instance/archive
|
||||||
- static_files:/opt/invenio/var/instance/static
|
- static_files:/opt/invenio/var/instance/static
|
||||||
- ./invenio_assets:/opt/invenio/var/instance/static/custom_assets
|
|
||||||
- ./invenio.cfg:/opt/invenio/var/instance/invenio.cfg
|
- ./invenio.cfg:/opt/invenio/var/instance/invenio.cfg
|
||||||
environment:
|
environment:
|
||||||
- INVENIO_THEME_LOGO
|
- INVENIO_THEME_LOGO
|
||||||
@@ -182,45 +181,12 @@ services:
|
|||||||
- development
|
- development
|
||||||
ports:
|
ports:
|
||||||
- "4180:4180"
|
- "4180:4180"
|
||||||
environment:
|
|
||||||
- OAUTH2_PROXY_PROVIDER=oidc
|
|
||||||
- OAUTH2_PROXY_OIDC_ISSUER_URL=http://saml-idp:8080/simplesaml/saml2/idp
|
|
||||||
- OAUTH2_PROXY_CLIENT_ID=test-client
|
|
||||||
- OAUTH2_PROXY_CLIENT_SECRET=test-secret
|
|
||||||
- OAUTH2_PROXY_COOKIE_SECRET
|
|
||||||
- OAUTH2_PROXY_EMAIL_DOMAINS=*
|
|
||||||
- OAUTH2_PROXY_UPSTREAM=http://caddy:80
|
|
||||||
- OAUTH2_PROXY_HTTP_ADDRESS=0.0.0.0:4180
|
|
||||||
- OAUTH2_PROXY_REDIRECT_URL=http://localhost:4180/oauth2/callback
|
|
||||||
- OAUTH2_PROXY_SKIP_PROVIDER_BUTTON=false
|
|
||||||
- OAUTH2_PROXY_INSECURE_OIDC_ALLOW_UNVERIFIED_EMAIL=true
|
|
||||||
- OAUTH2_PROXY_PASS_ACCESS_TOKEN=true
|
|
||||||
- OAUTH2_PROXY_PASS_USER_HEADERS=true
|
|
||||||
- OAUTH2_PROXY_SET_XAUTHREQUEST=true
|
|
||||||
- OAUTH2_PROXY_SKIP_AUTH_REGEX=^/health$
|
|
||||||
depends_on:
|
depends_on:
|
||||||
mock-oauth2:
|
|
||||||
condition: service_healthy
|
|
||||||
caddy:
|
caddy:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
networks:
|
networks:
|
||||||
- invenio-network
|
- invenio-network
|
||||||
|
|
||||||
# Mock OAuth2 server for development
|
|
||||||
saml-idp:
|
|
||||||
image: kristophjunge/test-saml-idp:latest
|
|
||||||
profiles:
|
|
||||||
- development
|
|
||||||
ports:
|
|
||||||
- "8090:8080"
|
|
||||||
environment:
|
|
||||||
- SIMPLESAMLPHP_SP_ENTITY_ID=http://localhost:4180
|
|
||||||
- SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE=http://localhost:4180/oauth2/callback
|
|
||||||
volumes:
|
|
||||||
- ./saml/authsources.php:/var/www/simplesamlphp/config/authsources.php:ro
|
|
||||||
networks:
|
|
||||||
- invenio-network
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
invenio-network:
|
invenio-network:
|
||||||
|
|
||||||
|
|||||||
3
env/development/caddy/Caddyfile
vendored
3
env/development/caddy/Caddyfile
vendored
@@ -8,9 +8,6 @@ localhost {
|
|||||||
file_server
|
file_server
|
||||||
}
|
}
|
||||||
|
|
||||||
handle_path /oauth* {
|
|
||||||
}
|
|
||||||
|
|
||||||
reverse_proxy invenio-rdm:5000 {
|
reverse_proxy invenio-rdm:5000 {
|
||||||
header_down Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0"
|
header_down Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0"
|
||||||
header_down Pragma "no-cache"
|
header_down Pragma "no-cache"
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 77 KiB |
@@ -1,15 +0,0 @@
|
|||||||
<?php
|
|
||||||
$config = [
|
|
||||||
'admin' => [
|
|
||||||
'core:AdminPassword',
|
|
||||||
],
|
|
||||||
|
|
||||||
'example-userpass' => [
|
|
||||||
'exampleauth:UserPass',
|
|
||||||
'test@example.com:password' => [
|
|
||||||
'uid' => ['test'],
|
|
||||||
'email' => ['test@example.com'],
|
|
||||||
'displayName' => ['Test User'],
|
|
||||||
],
|
|
||||||
],
|
|
||||||
];
|
|
||||||
Reference in New Issue
Block a user