From 078c4fa23a3f033022256f1e0feb00d98c414e2d Mon Sep 17 00:00:00 2001 From: Thomas Dalichow Date: Tue, 14 Aug 2018 10:58:31 +0200 Subject: [PATCH] fbb-api - Deactivating general HTTP-Auth, activate specific HTTP-Auth for TST + PRD - FBBPSCDM-95 --- .../fbb-api/prd-api01-fbb.pixelpark.net.yaml | 40 ++++++++++++------- .../fbb-api/tst-api01-fbb.pixelpark.net.yaml | 14 +++++-- .../fbb-api/tst-api02-fbb.pixelpark.net.yaml | 14 +++++-- 3 files changed, 46 insertions(+), 22 deletions(-) diff --git a/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml index adcf6f9b..383d3156 100644 --- a/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml +++ b/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml @@ -40,17 +40,29 @@ infra::profile::apache::pp_vhosts: directoryindex: index.php index.html - location1: provider: location - path: '/' - auth_type: Digest - auth_name: server - auth_digest_provider: file - auth_digest_algorithm: MD5 - auth_user_file: '/etc/httpd/htdigest' - auth_require: 'valid-user' -# rewrites: -# - alias: -# comment: 'Alles auf https umleiten' -# rewrite_cond: -# - '%%{ich-trickse}{HTTPS} !=on' -# rewrite_rule: -# - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]' + path: '/api/v1/cdm-ham/system-status-handler' + auth_type: Basic + auth_name: "Restricted Content" + auth_user_file: '/etc/httpd/conf/basic-auth-hh' + require: + requires: + - 'user hh-push' + # IP Hamburg + - 'ip 10.5.13.144' + # Pixelpark Admin-Netz + - '217.66.51.' + enforce: all + - location2: + provider: location + path: '/api/v1/cdm-ham/notification-handler' + auth_type: Basic + auth_name: "Restricted Content" + auth_user_file: '/etc/httpd/conf/basic-auth-hh' + require: + requires: + - 'user hh-push' + # IP Hamburg + - 'ip 10.5.13.144' + # Pixelpark Admin-Netz + - '217.66.51.' + enforce: all diff --git a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml index 27f96f11..0ce65634 100644 --- a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml +++ b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml @@ -55,23 +55,29 @@ infra::profile::apache::pp_vhosts: directoryindex: index.php index.html - location1: provider: location - path: '/my-test1' + path: '/api/v1/cdm-ham/system-status-handler' auth_type: Basic auth_name: "Restricted Content" auth_user_file: '/etc/httpd/conf/basic-auth-hh' require: requires: - 'user hh-push' - - 'ip 10.5.13.142 10.5.13.144' + # IP Hamburg + - 'ip 10.5.13.142' + # Pixelpark Admin-Netz + - '217.66.51.' enforce: all - location2: provider: location - path: '/my-test2' + path: '/api/v1/cdm-ham/notification-handler' auth_type: Basic auth_name: "Restricted Content" auth_user_file: '/etc/httpd/conf/basic-auth-hh' require: requires: - 'user hh-push' - - 'ip 10.5.13.142 217.66.51.248 192.168.66.253 192.168.66.254 10.99.1.10' + # IP Hamburg + - 'ip 10.5.13.142' + # Pixelpark Admin-Netz + - '217.66.51.' enforce: all diff --git a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml index f436a29c..6ac0513c 100644 --- a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml +++ b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml @@ -48,23 +48,29 @@ infra::profile::apache::pp_vhosts: directoryindex: index.php index.html - location1: provider: location - path: '/my-test1' + path: '/api/v1/cdm-ham/system-status-handler' auth_type: Basic auth_name: "Restricted Content" auth_user_file: '/etc/httpd/conf/basic-auth-hh' require: requires: - 'user hh-push' - - 'ip 10.5.13.142 10.5.13.144' + # IP Hamburg + - 'ip 10.5.13.142' + # Pixelpark Admin-Netz + - '217.66.51.' enforce: all - location2: provider: location - path: '/my-test2' + path: '/api/v1/cdm-ham/notification-handler' auth_type: Basic auth_name: "Restricted Content" auth_user_file: '/etc/httpd/conf/basic-auth-hh' require: requires: - 'user hh-push' - - 'ip 10.5.13.142 217.66.51.248 192.168.66.253 192.168.66.254 10.99.1.10' + # IP Hamburg + - 'ip 10.5.13.142' + # Pixelpark Admin-Netz + - '217.66.51.' enforce: all -- 2.39.5