Ignore:
Timestamp:
05/03/09 16:39:34 (11 years ago)
Author:
pjkersha
Message:
  • fixed bug in OpenID Provider Yadis XML template for idselect mode requests i.e. user provides their provider URI instead of their full identity URI.
  • added OpenID Provider standalone test to integration tests. TODO: re-test integrated OpenID Provider and Relying Party WSGIs in combined stack.
Location:
TI12-security/trunk/python/ndg.security.common/ndg/security/common/wssecurity
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/wssecurity/__init__.py

    r4840 r5067  
    1 """NDG Security wssecurity package - contains signature handler and config 
    2  
    3 NERC Data Grid Project 
     1"""NDG Security WS-Security package - contains signature handler and config 
     2 
     3NERC DataGrid Project 
    44""" 
    55__author__ = "P J Kershaw" 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/wssecurity/signaturehandler/__init__.py

    r5062 r5067  
    22sharing of common code 
    33 
    4 NERC Data Grid Project 
     4NERC DataGrid Project 
    55""" 
    66__author__ = "C Byrom" 
     
    3737 
    3838import ZSI 
    39 from ZSI.wstools.Namespaces import DSIG, ENCRYPTION, WSU, WSA200403, \ 
    40                                    SOAP, SCHEMA # last included for xsi 
    41  
     39from ZSI.wstools.Namespaces import ENCRYPTION, WSU 
    4240from ZSI.wstools.Namespaces import OASIS as _OASIS 
    4341 
     
    6260    '''Try different utility namespace for use with WebSphere''' 
    6361    #UTILITY = "http://schemas.xmlsoap.org/ws/2003/06/utility" 
    64     UTILITY = \ 
    65 "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 
     62    UTILITY = ("http://docs.oasis-open.org/wss/2004/01/" 
     63               "oasis-200401-wss-wssecurity-utility-1.0.xsd") 
    6664 
    6765class OASIS(_OASIS): 
    6866    # wss4j 1.5.3 
    69     WSSE11 = \ 
    70         "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" 
     67    WSSE11 = ("http://docs.oasis-open.org/wss/" 
     68              "oasis-wss-wssecurity-secext-1.1.xsd") 
    7169    # wss4j 1.5.1 
    72     #WSSE11 = "http://docs.oasis-open.org/wss/2005/xx/oasis-2005xx-wss-wssecurity-secext-1.1.xsd" 
     70#    WSSE11 = ("http://docs.oasis-open.org/wss/2005/xx/" 
     71#              "oasis-2005xx-wss-wssecurity-secext-1.1.xsd") 
    7372 
    7473 
     
    122121    @type b64EncSignatureValue: string/None""" 
    123122 
    124     _binSecTokEncType = \ 
    125 "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary" 
     123    _binSecTokEncType = ("http://docs.oasis-open.org/wss/2004/01/" 
     124                         "oasis-200401-wss-soap-message-security-1.0#" 
     125                         "Base64Binary") 
    126126     
    127127    binSecTokValType = { 
     
    240240        # Filter keywords if a prefix is set removing any that don't start with 
    241241        # the prefix given 
    242 #        if cfgFilePrefix: 
    243 #            pfxWithDot = cfgFilePrefix+'.' 
    244 #            kw = dict([(k.replace(pfxWithDot, ''), v) for k, v in kw.items()  
    245 #                       if k.startswith(pfxWithDot)]) 
    246 #                     
    247242        self.cfg.update(kw, prefix=cfgFilePrefix) 
    248243         
Note: See TracChangeset for help on using the changeset viewer.