diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index 07d4a21..407e3aa 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -247,6 +247,10 @@ defmodule Dispatcher do forward conn, path, "http://privacy/person-information-requests" end + get "/uri-info/*path", %{ layer: :api_services, accept: %{ json: true } } do + forward conn, path, "http://uri-info/" + end + ############################################################### # frontend layer diff --git a/config/frontend/add-x-frame-options-header.conf b/config/frontend/add-x-frame-options-header.conf new file mode 100644 index 0000000..a7509f6 --- /dev/null +++ b/config/frontend/add-x-frame-options-header.conf @@ -0,0 +1,3 @@ +location / { + add_header X-Frame-Options "DENY" always; +} \ No newline at end of file diff --git a/config/proxy-https/proxy_ssl.conf b/config/proxy-https/proxy_ssl.conf deleted file mode 100644 index 777f360..0000000 --- a/config/proxy-https/proxy_ssl.conf +++ /dev/null @@ -1,22 +0,0 @@ - -server { - listen *:443; - server_name organisaties.abb.lblod.info; - ssl on; - ssl_certificate /etc/nginx/conf.d/cert.pem; - ssl_certificate_key /etc/nginx/conf.d/key.pem; - - location / { - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_pass http://identifier; - client_max_body_size 3072m; - } - - location ~ /authorization/callback(.*) { - rewrite ^ /torii/redirect.html permanent; - } -} \ No newline at end of file diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 6a71303..173bfbe 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -35,3 +35,5 @@ services: restart: "no" frontend: restart: "no" + uri-info: + restart: "no" diff --git a/docker-compose.yml b/docker-compose.yml index a64ef34..14440df 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,9 +9,10 @@ x-logging: services: identifier: - image: semtech/mu-identifier:1.8.1 + image: semtech/mu-identifier:1.9.1 environment: DEFAULT_MU_AUTH_ALLOWED_GROUPS_HEADER: "[{\"variables\":[],\"name\":\"public\"}]" + SESSION_COOKIE_SECURE: "on" labels: - "logging=true" restart: always @@ -32,8 +33,6 @@ services: volumes: - ./data/db:/data - ./config/db/virtuoso.ini:/data/virtuoso.ini - labels: - - "logging=true" restart: always logging: *default-logging db: @@ -47,6 +46,10 @@ services: ERROR_ON_UNWRITTEN_DATA: "true" volumes: - ./config/authorization:/config + labels: + - "logging=true" + restart: always + logging: *default-logging migrations: image: semtech/mu-migrations-service:0.7.0 links: @@ -84,11 +87,18 @@ services: SERVER_PORT: "80" LOGGING_LEVEL: "INFO" SPARQL_ENDPOINT: "http://db:8890/sparql" + labels: + - "logging=true" restart: always + logging: *default-logging deltanotifier: image: semtech/mu-delta-notifier:0.1.0 volumes: - ./config/delta:/config + labels: + - "logging=true" + restart: always + logging: *default-logging sink: image: nginx:1.15.2 volumes: @@ -106,7 +116,9 @@ services: MU_APPLICATION_AUTH_DISCOVERY_URL: "https://authenticatie-ti.vlaanderen.be/op" MU_APPLICATION_AUTH_CLIENT_ID: "677af572-2e2f-4e61-ad38-036723bb314c" MU_APPLICATION_AUTH_REDIRECT_URI: "https://organisaties.abb.lblod.info/authorization/callback" - MU_APPLICATION_AUTH_CLIENT_SECRET: "secret" + MU_APPLICATION_AUTH_CLIENT_SECRET: "" + links: + - db:database labels: - "logging=true" restart: always @@ -131,8 +143,16 @@ services: LOGGING_LEVEL: "INFO" DEFAULT_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" SESSION_GRAPH: "http://mu.semte.ch/graphs/sessions" + labels: + - "logging=true" + restart: always + logging: *default-logging adressenregister: image: lblod/adressenregister-fuzzy-search-service:0.5.0 + labels: + - "logging=true" + restart: always + logging: *default-logging web: image: nginx:1.21.3 volumes: @@ -146,12 +166,23 @@ services: logging: *default-logging frontend: image: lblod/frontend-contact-hub:1.1.0 - labels: - - "logging=true" + volumes: + - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: EMBER_OAUTH_API_REDIRECT_URL: "https://organisaties.abb.lblod.info/authorization/callback" EMBER_OAUTH_API_KEY: "677af572-2e2f-4e61-ad38-036723bb314c" EMBER_OAUTH_API_BASE_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/auth" EMBER_OAUTH_API_LOGOUT_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/logout" EMBER_OAUTH_API_SCOPE: "openid vo profile abb_organisatieportaal" + labels: + - "logging=true" restart: always + logging: *default-logging + uri-info: + image: redpencil/mu-uri-info-service:0.2.1 + links: + - db:database + labels: + - "logging=true" + restart: always + logging: *default-logging