From 0a384d51582e2e1134abe3b8887a7c3c37a433d0 Mon Sep 17 00:00:00 2001
From: Lubomir Bucek <lubomir.bucek@eox.at>
Date: Tue, 29 Sep 2020 20:49:09 +0200
Subject: [PATCH] update metadata to testing saml provider, still not working
though
---
shibauth/Dockerfile | 1 -
shibauth/etc-httpd/conf.d/shib.conf | 6 ------
shibauth/etc-httpd/conf.d/sp.conf | 19 +++++++++++++++++++
shibauth/shibboleth-conf/shibboleth2.xml | 2 +-
4 files changed, 20 insertions(+), 8 deletions(-)
delete mode 100644 shibauth/etc-httpd/conf.d/shib.conf
create mode 100644 shibauth/etc-httpd/conf.d/sp.conf
diff --git a/shibauth/Dockerfile b/shibauth/Dockerfile
index 986fbddc..3f278c26 100644
--- a/shibauth/Dockerfile
+++ b/shibauth/Dockerfile
@@ -37,4 +37,3 @@ LABEL name="prism view server cache" \
COPY shibboleth-conf /etc/shibboleth/
COPY etc-httpd/ /etc/httpd/
COPY index.html /var/www/html/
-
diff --git a/shibauth/etc-httpd/conf.d/shib.conf b/shibauth/etc-httpd/conf.d/shib.conf
deleted file mode 100644
index 2c7d35d2..00000000
--- a/shibauth/etc-httpd/conf.d/shib.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ServerName shib.pdas.prism.eox.at
-LoadModule mod_shib /usr/lib64/shibboleth/mod_shib_24.so
-<Location /Shibboleth.sso>
- SetHandler shib
-</Location>
-DocumentRoot "/var/www/html"
\ No newline at end of file
diff --git a/shibauth/etc-httpd/conf.d/sp.conf b/shibauth/etc-httpd/conf.d/sp.conf
new file mode 100644
index 00000000..9de6cc7a
--- /dev/null
+++ b/shibauth/etc-httpd/conf.d/sp.conf
@@ -0,0 +1,19 @@
+ServerName shib.pdas.prism.eox.at
+
+<VirtualHost *:80>
+ ServerName https://shib.pdas.prism.eox.at:443
+ UseCanonicalName On
+
+ DocumentRoot "/var/www/html"
+
+ <Location />
+ AuthType shibboleth
+ ShibRequestSetting requireSession 1
+ require shib-session
+ </Location>
+
+ <Location /Shibboleth.sso>
+ Satisfy Any
+ Allow from all
+ </Location>
+</VirtualHost>
\ No newline at end of file
diff --git a/shibauth/shibboleth-conf/shibboleth2.xml b/shibauth/shibboleth-conf/shibboleth2.xml
index 2769ec5f..8a916cfb 100644
--- a/shibauth/shibboleth-conf/shibboleth2.xml
+++ b/shibauth/shibboleth-conf/shibboleth2.xml
@@ -8,7 +8,7 @@
REMOTE_USER="eppn uid persistent-id targeted-id">
<Sessions lifetime="28800" timeout="3600" relayState="ss:mem"
checkAddress="false" handlerSSL="true" cookieProps="https">
- <SSO entityID="https://idptestbed/idp/shibboleth">
+ <SSO entityID="https://samltest.id/saml/idp">
SAML2 SAML1
</SSO>
<Logout>SAML2 Local</Logout>
--
GitLab