diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2008-07-22 12:07:18 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2008-07-22 12:07:18 +0000 |
| commit | 29e87584e99a3382491fb4cb9216eb372cff1891 (patch) | |
| tree | d03a3e16673270d851b3e3116a3df099912a7131 | |
| parent | f2a1ee398f631d35a9f3fd9137fdb02c40279c36 (diff) | |
fixed ..._must_authenticate to look for any assertion, not just one from the
requester provider.
| -rw-r--r-- | lasso/id-ff/login.c | 10 | ||||
| -rw-r--r-- | lasso/saml-2.0/login.c | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c index e429f126..acae8af5 100644 --- a/lasso/id-ff/login.c +++ b/lasso/id-ff/login.c @@ -1684,14 +1684,10 @@ lasso_login_must_authenticate(LassoLogin *login) } else { /* if nothing specific was asked; don't look for any - * assertions, a session is enough + * particular assertions, one is enough */ - matched = (profile->session != NULL); - if (matched) { - matched = profile->remote_providerID - && lasso_session_get_assertion(profile->session, - profile->remote_providerID) != NULL; - } + matched = (profile->session != NULL && \ + g_hash_table_size(profile->session->assertions) > 0); } g_list_free(assertions); diff --git a/lasso/saml-2.0/login.c b/lasso/saml-2.0/login.c index 1a8dae56..e91c3c6d 100644 --- a/lasso/saml-2.0/login.c +++ b/lasso/saml-2.0/login.c @@ -387,14 +387,10 @@ lasso_saml20_login_must_authenticate(LassoLogin *login) } else { /* if nothing specific was asked; don't look for any - * assertions, a session is enough + * particular assertions, one is enough */ - matched = (profile->session != NULL); - if (matched) { - matched = profile->remote_providerID - && lasso_session_get_assertion(profile->session, - profile->remote_providerID) != NULL; - } + matched = (profile->session != NULL && \ + g_hash_table_size(profile->session->assertions) > 0); } g_list_free(assertions); |