Projet

Général

Profil

0001-Do-not-traceback-when-request-is-too-old-during-SAML.patch

Benjamin Dauvergne, 16 janvier 2015 10:50

Télécharger (2,23 ko)

Voir les différences: 

Subject: [PATCH] Do not traceback when request is too old during SAML login
 or logout request handling (fixes #6306)


 authentic2/idp/saml/saml2_endpoints.py |    9 ++++++---
 authentic2/saml/models.py              |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
authentic2/idp/saml/saml2_endpoints.py
570 570 
    try:
571 571 
        login_dump, consent_obtained, save, nid_format = \
572 572 
                get_and_delete_key_values(nonce)
573 
    except ValueError:
573 
    except KeyError:
574 574 
        return error_redirect(request, N_('request has expired'))
575 575 
    server = create_server(request)
576 576 
    # Work Around for lasso < 2.3.6
......
1058 1058 
    if not id:
1059 1059 
        logger.error('missing id argument')
1060 1060 
        return HttpResponseBadRequest('finish_slo: missing id argument')
1061 
    logout_dump, session_key = get_and_delete_key_values(id)
1061 
    try:
1062 
        logout_dump, session_key = get_and_delete_key_values(id)
1063 
    except KeyError:
1064 
        return error_redirect(request, N_('request has expired'))
1062 1065 
    server = create_server(request)
1063 1066 
    logout = lasso.Logout.newFromDump(server, logout_dump)
1064 1067 
    load_provider(request, logout.remoteProviderId, server=logout.server)
......
1564 1567 
    try:
1565 1568 
        logout_dump, provider_id, next = \
1566 1569 
            get_and_delete_key_values(relay_state)
1567 
    except ValueError:
1570 
    except KeyError:
1568 1571 
        return error_redirect(request,
1569 1572 
                N_('unknown relay state %r'),
1570 1573 
                relay_state,
authentic2/saml/models.py
834 834 
        kv = KeyValue.objects.get(key=key)
835 835 
        return kv.value
836 836 
    except ObjectDoesNotExist:
837 
        return None
837 
        raise KeyError
838 
-