diff options
| author | Leif Johansson <leifj@sunet.se> | 2012-04-05 13:31:22 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2012-04-05 13:31:22 +0200 |
| commit | bc55b9397252c7382b6388fceef54a056d3c371e (patch) | |
| tree | f8f7465c36b5679cb77f5033fe33fdf9718026fc | |
| parent | e38220e479ffdf88aa98dc6341cc04b45e04a70e (diff) | |
moved the uris around a bit
| -rw-r--r-- | asgard/settings.d/20-saml.conf | 4 | ||||
| -rw-r--r-- | coip/apps/saml2/urls.py | 7 | ||||
| -rw-r--r-- | coip/apps/saml2/views.py | 4 | ||||
| -rw-r--r-- | coip/urls.py | 3 |
4 files changed, 9 insertions, 9 deletions
diff --git a/asgard/settings.d/20-saml.conf b/asgard/settings.d/20-saml.conf index 4f53e8e..ea999f1 100644 --- a/asgard/settings.d/20-saml.conf +++ b/asgard/settings.d/20-saml.conf @@ -6,13 +6,13 @@ AUTH_PROFILE_MODULE = 'userprofile.UserProfile' #SAML_KEY = "/etc/ssl/private/ssl-cert-snakeoil.key" #SAML_CERT = "/etc/ssl/certs/ssl-cert-snakeoil.pem" -LOGIN_URL = '/saml2/login/' +LOGIN_URL = '/saml2/sp/login/' SESSION_EXPIRE_AT_BROWSER_CLOSE = True def asgard_sp_config(request): return { # your entity id, usually your subdomain plus the url to the metadata view - 'entityid': 'https://coip.app.nordu.net/saml2/metadata', + 'entityid': 'https://coip.app.nordu.net/saml2/sp/metadata', # directory with attribute mapping "attribute_map_dir" : "%s/saml2/attributemaps" % settings.BASE_DIR, # this block states what services we provide diff --git a/coip/apps/saml2/urls.py b/coip/apps/saml2/urls.py index 3965a6d..76c419c 100644 --- a/coip/apps/saml2/urls.py +++ b/coip/apps/saml2/urls.py @@ -3,10 +3,9 @@ Created on Nov 7, 2011 @author: leifj ''' -from django.conf.urls.defaults import patterns, url, include +from django.conf.urls.defaults import patterns, url urlpatterns = patterns('coip.apps.saml2.views', - url(r'^aq$',view='aq'), - url(r'^metadata$',view='metadata'), - url(r'^.+',include('djangosaml2.urls')) + url(r'^aq/?$',view='aq'), + url(r'^metadata/?$',view='metadata') )
\ No newline at end of file diff --git a/coip/apps/saml2/views.py b/coip/apps/saml2/views.py index 1055644..60eae75 100644 --- a/coip/apps/saml2/views.py +++ b/coip/apps/saml2/views.py @@ -20,13 +20,13 @@ from coip.utils import get_full_path def _config(request): host = request.get_host().replace(":","-") c = { - "entityid" : get_full_path(request,"/saml2/entity"), + "entityid" : get_full_path(request,"/saml2/aa/metadata"), "description": "COIP", "service": { "aa": { "name" : "COIP", "endpoints" : { - "attribute_service" : [(get_full_path(request,"/saml2/aq"), BINDING_SOAP)], + "attribute_service" : [(get_full_path(request,"/saml2/aa/aq"), BINDING_SOAP)], }, "policy": { "default": { diff --git a/coip/urls.py b/coip/urls.py index 353427f..36c65ea 100644 --- a/coip/urls.py +++ b/coip/urls.py @@ -73,5 +73,6 @@ urlpatterns = patterns('', (r'^api/opensocial/', include('coip.apps.opensocial.urls')), (r'^api/hello/?', 'coip.apps.name.views.hello'), (r'^oauth2/', include('django_oauth2_lite.urls')), - (r'^saml2/', include('coip.apps.saml2.urls')) + (r'^saml2/aa/', include('coip.apps.saml2.urls')), + (r'^saml2/sp/', include('djangosaml2.urls')) ) |