entrouvert
/
authentic-adeline
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

merge

This commit is contained in:
root 2008-11-13 11:01:55 +01:00
parent 58cb4ba37b 2ac105076f
commit 574c90de0c
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extra/modules/liberty.py
View File

@ -28,8 +28,6 @@ import misc
import authentic.liberty.root
from authentic.liberty.root import SOAPError
import collectivity
ED_MIGRATION_DISABLED = False
ED_DOCUMENTS_MIGRATION_DISABLED = True
@ -101,13 +99,6 @@ class AlternateLibertyDirectory(authentic.liberty.root.RootDirectory):
server = authentic.misc.get_lasso_server(lasso.PROVIDER_ROLE_SP)
if get_field('tsId'):
for coll in collectivity.Collectivity.select():
if coll.msp_tsid == get_field('tsId'):
resp = get_response()
resp.set_header('X-Gdd-Account-Number', coll.id)
break
if session.msp_login_dump:
login = lasso.Login.newFromDump(server, session.msp_login_dump)
session.msp_login_dump = None

16
extra/modules/root.ptl
View File

@ -1,7 +1,7 @@
import lasso
import Cookie
from quixote import redirect, get_session, get_session_manager
from quixote import redirect, get_session, get_session_manager, get_response
from qommon import get_cfg, get_logger
from qommon.form import *
from qommon import template
@ -242,6 +242,13 @@ class AlternateRootDirectory(OldRootDirectory):
def federate_msp(self):
if get_field('tsId'):
for coll in collectivity.Collectivity.select():
if coll.msp_tsid == get_field('tsId'):
resp = get_response()
resp.set_header('X-Gdd-Account-Number', coll.id)
break
session = get_session()
if not session.user:
session.msp_init_federate = True
@ -250,6 +257,13 @@ class AlternateRootDirectory(OldRootDirectory):
return self.sso_to_msp(nameIdPolicy = 'federated')
def login_msp(self):
if get_field('tsId'):
for coll in collectivity.Collectivity.select():
if coll.msp_tsid == get_field('tsId'):
resp = get_response()
resp.set_header('X-Gdd-Account-Number', coll.id)
break
get_session().peer_cancelled = False
return self.sso_to_msp()