entrouvert
/
authentic2-supann
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Make supann.conf parsable by Python and Shell at the same time" 

This reverts commit 3290295aa4.
This commit is contained in:
Benjamin Dauvergne 2015-02-05 15:03:48 +01:00
parent 3290295aa4
commit fe0c8b88fd
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config.py
View File

@ -1,7 +1,5 @@
import os
execfile('/etc/authentic2/supann.conf')
A2_PROFILE_CAN_CHANGE_EMAIL = False
A2_PROFILE_CAN_EDIT_PROFILE = False
A2_CAN_RESET_PASSWORD = False
@ -14,13 +12,13 @@ SAML_SIGNATURE_PRIVATE_KEY = file('/etc/authentic2/key.pem').read()
LDAP_AUTH_SETTINGS = [
{
'url': SUPANN_LDAP_URL,
'url': os.environ['SUPANN_LDAP_URL'],
'user_filter': '(&(|(mail=%s)(supannAutreMail=%s)(supannAliasLogin=%s)(uid=%s))(objectClass=supannPerson))',
'basedn': SUPANN_LDAP_BASE_DN,
'binddn': globals().get('SUPANN_LDAP_BINDDN'),
'bindpw': globals().get('SUPANN_LDAP_BINDPW'),
'groupsu': 'cn=admin,ou=groups,%s' % SUPANN_LDAP_BASE_DN,
'groupstaff': 'cn=admin,ou=groups,%s' % SUPANN_LDAP_BASE_DN,
'basedn': os.environ['SUPANN_LDAP_BASE_DN'],
'binddn': os.environ.get('SUPANN_LDAP_BINDDN'),
'bindpw': os.environ.get('SUPANN_LDAP_BINDPW'),
'groupsu': 'cn=admin,ou=groups,%s' % os.environ['SUPANN_LDAP_BASE_DN'],
'groupstaff': 'cn=admin,ou=groups,%s' % os.environ['SUPANN_LDAP_BASE_DN'],
'transient': False,
'username_template': '{uid[0]}',
'external_id_tuples': (('uid',), ('dn:noquote',), ),
@ -124,8 +122,8 @@ LDAP_AUTH_SETTINGS = [
'attribute_mappings': (('mail', 'email'),),
'mandatory_attributes_values': {
# edugain support
'schacHomeOrganization': [EDUGAIN_SCHAC_HOME_ORGANIZATION.decode('utf-8')],
'schacHomeOrganizationtype': [EDUGAIN_SCHAC_HOME_ORGANIZATION_TYPE.decode('utf-8')],
'schacHomeOrganization': [os.environ['EDUGAIN_SCHAC_HOME_ORGANIZATION']],
'schacHomeOrganizationtype': [os.environ['EDUGAIN_SCHAC_HOME_ORGANIZATION_TYPE']],
},
}
]

17
supann.conf
View File

@ -1,15 +1,14 @@
# -*- coding: utf-8 -*-
# Fichier /etc/default/authentic2
#
# Configuration du LDAP
#
# URL de l'annuaire LDAP
#
SUPANN_LDAP_URL="ldap://127.0.0.1/"
export SUPANN_LDAP_URL=ldap://127.0.0.1/
#
# Base DN de l'annuaire LDAP
#
SUPANN_LDAP_BASE_DN="dc=univ-test,dc=fr"
export SUPANN_LDAP_BASE_DN=dc=univ-test,dc=fr
#
# Bind DN pour connexion à l'annuaire LDAP (optionnel)
#
@ -24,15 +23,15 @@ SUPANN_LDAP_BASE_DN="dc=univ-test,dc=fr"
#
# URL des métadonnées
#
RENATER_METADATA="https://federation.renater.fr/renater/renater-metadata.xml"
export RENATER_METADATA=https://federation.renater.fr/renater/renater-metadata.xml
#
# URL des règles de filtrage des attributs
#
RENATER_ATTRIBUTE_FILTERS="https://federation.renater.fr/renater/filtres/renater-attribute-filters-all.xml"
export RENATER_ATTRIBUTE_FILTERS=https://federation.renater.fr/renater/filtres/renater-attribute-filters-all.xml
#
# URL du certificat de signature des métadonnées
#
RENATER_CERTIFICATE="https://federation.renater.fr/renater/metadata-federation-renater.crt"
export RENATER_CERTIFICATE=https://federation.renater.fr/renater/metadata-federation-renater.crt
# Test
# export RENATER_METADATA=https://federation.renater.fr/test/renater-test-metadata.xml # test
@ -43,11 +42,11 @@ RENATER_CERTIFICATE="https://federation.renater.fr/renater/metadata-federation-r
#
# Nom de l'organisation
#
EDUGAIN_SCHAC_HOME_ORGANIZATION="Université Test Authentic2"
export EDUGAIN_SCHAC_HOME_ORGANIZATION="Université Test Authentic2"
#
# Type de l'organisation
#
EDUGAIN_SCHAC_HOME_ORGANIZATION_TYPE="urn:schac:homeOrganizationType:int:university"
export EDUGAIN_SCHAC_HOME_ORGANIZATION_TYPE="urn:schac:homeOrganizationType:int:university"
#
# Une valeur parmi:
# urn:schac:homeOrganizationType:int:university
@ -61,4 +60,4 @@ EDUGAIN_SCHAC_HOME_ORGANIZATION_TYPE="urn:schac:homeOrganizationType:int:univers
# urn:schac:homeOrganizationType:int:nren
# Local port for listening
BIND="127.0.0.1:8080"
export BIND=127.0.0.1:8080

6
update-renater-meta.sh
View File

@ -15,7 +15,11 @@ function cleanup {
trap "cleanup" EXIT
. /etc/authentic2/supann.conf
if [ -f ]; then
. /etc/default/authentic2
else
. $BASEDIR/`basename $DEFAULT`
fi
if ! wget --quiet $RENATER_METADATA -O$METADATA_TMP; then
echo ERROR: unable to retrieve metadata from $RENATER_METADATA