Browse Source

Ajout de la possibilité de changer le nom de domaine de l'IDP et l'entityID

master
Teddy Cornaut 4 months ago
parent
commit
2c0154dee9
3 changed files with 9 additions and 12 deletions
  1. 7
    11
      dicos/70_shibboleth_idp.xml
  2. 1
    1
      pretemplate/20-init-shib-IDP
  3. 1
    0
      tmpl/idp-default-ssl.conf

+ 7
- 11
dicos/70_shibboleth_idp.xml View File

@@ -84,8 +84,9 @@
84 84
                 <value>oui</value>
85 85
             </variable>
86 86
 
87
-            <variable name='entityID' type='string' description="Entity ID SAMLv2" mode='expert'/>
88
-            <variable name='samlScope' type='string' description="Scope SAMLv2" mode='expert'/>
87
+            <variable name='idpDomain' type='string' description="Nom de domaine d'accès à l'IDP" mandatory="True"/>
88
+            <variable name='entityID' type='string' description="Entity ID SAML2" mandatory="True"/>
89
+            <variable name='samlScope' type='string' description="Scope SAML2" mandatory="True"/>
89 90
             <variable name='idpAuthnDefaultLifetime' type='string' description="Durée de vie de la session IDP en minutes (PTXXM)" mode='expert'>
90 91
                 <value>PT60M</value>
91 92
             </variable>
@@ -127,16 +128,16 @@
127 128
                 <value>https://mselocal.cadoles.com/envole/page/faq</value>
128 129
             </variable>
129 130
             <variable name='idpUrlLogout' type='string' description='URL de logout'>
130
-                <value>https://mselocal.cadoles.com/saml/log-out</value>
131
+                <value>https://mselocal.cadoles.com/envole/saml/log-out</value>
131 132
             </variable>
132 133
             <variable name='idpUrlConnexion' type='string' description='URL de connexion'>
133
-                <value>https://mselocal.cadoles.com/saml/log-out</value>
134
+                <value>https://mselocal.cadoles.com/envole/saml/login</value>
134 135
             </variable>
135 136
             <variable name='idpUrlLiens' type='string' description='URL des liens utiles'>
136
-                <value>https://mselocal.cadoles.com/saml/log-out</value>
137
+                <value>https://mselocal.cadoles.com/envole/page/?t=liens_utiles</value>
137 138
             </variable>
138 139
             <variable name='idpUrlMentions' type='string' description='URL des mentions légales'>
139
-                <value>https://mselocal.cadoles.com/saml/log-out</value>
140
+                <value>https://mselocal.cadoles.com/envole/page/?t=mentions_legales</value>
140 141
             </variable>
141 142
             <variable name='idpUserprefsTitle' type='string' description='Balise title HTML par défaut'>
142 143
                 <value>messervices.etudiant.gouv.fr</value>
@@ -279,11 +280,6 @@
279 280
         <check name="valid_enum" target="ldapProto">
280 281
             <param>['ldaps', 'ldap']</param>
281 282
         </check>
282
-        <fill name='concat' target='entityID'>
283
-            <param>https://</param>
284
-            <param type='eole'>nom_domaine_machine</param>
285
-            <param>/idp/shibboleth</param>
286
-        </fill>
287 283
         <fill name='calc_val' target='samlScope'>
288 284
             <param type='eole' name='valeur'>nom_domaine_local</param>
289 285
         </fill>

+ 1
- 1
pretemplate/20-init-shib-IDP View File

@@ -13,7 +13,7 @@ tomUser="tomcat8"
13 13
 tomGroup="adm"
14 14
 srcdir=${IDP_SRC}
15 15
 target="/opt/shibboleth-idp"
16
-hostname=$(CreoleGet nom_domaine_machine)
16
+hostname=$(CreoleGet idpDomain)
17 17
 mergepropfile=${SRCDIR}/merge.properties
18 18
 entityid="$(CreoleGet entityID)"
19 19
 scope="$(CreoleGet samlScope)"

+ 1
- 0
tmpl/idp-default-ssl.conf View File

@@ -1,6 +1,7 @@
1 1
 <IfModule mod_ssl.c>
2 2
   <VirtualHost _default_:443>
3 3
     ServerName %%nom_domaine_machine:443
4
+    ServerAlias %%idpDomain
4 5
     ServerAdmin %%system_mail_to
5 6
 
6 7
     DocumentRoot /var/www/html

Loading…
Cancel
Save