Changeset 473


Ignore:
Timestamp:
14/09/05 18:29:18 (15 years ago)
Author:
pjkersha
Message:

Renamed AttrCert? -> AttCert? + AttrAuthority? -> AttAuthority?
mapConfig has a new tag <wsdl> to store trusted host AA WSDL URI.

Location:
security/trunk/python
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • security/trunk/python/attAuthority.wsdl

    r459 r473  
    22 
    33 
    4 <definitions name="attrAuthority" 
     4<definitions name="attAuthority" 
    55  targetNamespace="http://wsdl2py.client.pycon.org/" 
    66  xmlns="http://schemas.xmlsoap.org/wsdl/" 
     
    1313  <message name="reqAuthorisationRequest"> 
    1414    <part name="usrProxyCert" type="xsd:string"/> 
    15     <part name="usrAttrCert" type="xsd:string"/> 
     15    <part name="usrAttCert" type="xsd:string"/> 
    1616  </message> 
    1717 
    1818  <message name="reqAuthorisationResponse"> 
    19     <part name="attrCert" type="xsd:string"/> 
     19    <part name="attCert" type="xsd:string"/> 
    2020    <part name="statCode" type="xsd:string"/> 
    2121    <part name="errMsg" type="xsd:string"/> 
    2222  </message> 
    2323 
    24   <message name="getTrustedHostsRequest"> 
     24  <message name="getTrustedHostInfoRequest"> 
    2525    <part name="usrRole" type="xsd:string"/> 
    2626  </message> 
    2727 
    28   <message name="getTrustedHostsResponse"> 
    29     <part name="trustedHosts" type="xsd:ArrayOf_xsd_string"/> 
     28  <message name="getTrustedHostInfoResponse"> 
     29    <part name="trustedHostInfo" type="xsd:ArrayOf_xsd_string"/> 
    3030    <part name="errMsg" type="xsd:string"/> 
    3131  </message> 
    3232 
    3333   
    34   <portType name="attrAuthority"> 
     34  <portType name="attAuthority"> 
    3535    <operation name="reqAuthorisation"> 
    3636      <input message="tns:reqAuthorisationRequest"/> 
     
    3838    </operation> 
    3939 
    40     <operation name="getTrustedHosts"> 
    41       <input message="tns:getTrustedHostsRequest"/> 
    42       <output message="tns:getTrustedHostsResponse"/> 
     40    <operation name="getTrustedHostInfo"> 
     41      <input message="tns:getTrustedHostInfoRequest"/> 
     42      <output message="tns:getTrustedHostInfoResponse"/> 
    4343    </operation> 
    4444  </portType> 
    4545 
    46   <binding name="attrAuthorityBinding" type="tns:attrAuthority"> 
     46  <binding name="attAuthorityBinding" type="tns:attAuthority"> 
    4747    <soap:binding style="rpc"  
    4848                      transport="http://schemas.xmlsoap.org/soap/http"/> 
    4949    <operation name="reqAuthorisation"> 
    50       <soap:operation soapAction="urn:attrAuthority#reqAuthorisation"/> 
     50      <soap:operation soapAction="urn:attAuthority#reqAuthorisation"/> 
    5151      <input> 
    5252        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    53                     namespace="urn:attrAuthority" use="encoded"/> 
     53                    namespace="urn:attAuthority" use="encoded"/> 
    5454      </input> 
    5555      <output> 
    5656        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    57                     namespace="urn:attrAuthority" use="encoded"/> 
     57                    namespace="urn:attAuthority" use="encoded"/> 
    5858      </output>  
    5959    </operation> 
    6060 
    61     <operation name="getTrustedHosts"> 
    62       <soap:operation soapAction="urn:attrAuthority#getTrustedHosts"/> 
     61    <operation name="getTrustedHostInfo"> 
     62      <soap:operation soapAction="urn:attAuthority#getTrustedHostInfo"/> 
    6363      <input> 
    6464        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    65                     namespace="urn:attrAuthority" use="encoded"/> 
     65                    namespace="urn:attAuthority" use="encoded"/> 
    6666      </input> 
    6767      <output> 
    6868        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    69                     namespace="urn:attrAuthority" use="encoded"/> 
     69                    namespace="urn:attAuthority" use="encoded"/> 
    7070      </output>  
    7171    </operation> 
     
    7373  </binding> 
    7474 
    75   <service name="attrAuthorityService"> 
     75  <service name="attAuthorityService"> 
    7676    <documentation>NDG Attribute Authority Web Service</documentation> 
    77     <port name="attrAuthority" binding="tns:attrAuthorityBinding"> 
    78       <soap:address location="http://127.0.0.1:5000/attrAuthority.wsdl"/> 
     77    <port name="attAuthority" binding="tns:attAuthorityBinding"> 
     78      <soap:address location="http://127.0.0.1:5000/attAuthority.wsdl"/> 
    7979    </port> 
    8080  </service> 
  • security/trunk/python/attAuthorityProperties.xml

    r448 r473  
    1313    <caCertFile>./certs/cacert.pem</caCertFile> 
    1414    <!-- Time is in seconds --> 
    15     <attrCertLifeTime>172800</attrCertLifeTime> 
    16     <attrCertFilePfx>ac-</attrCertFilePfx> 
    17     <attrCertFileSfx>.xml</attrCertFileSfx> 
     15    <attCertLifeTime>172800</attCertLifeTime> 
     16    <attCertFilePfx>ac-</attCertFilePfx> 
     17    <attCertFileSfx>.xml</attCertFileSfx> 
    1818    <mapConfigFile>./mapConfig.xml</mapConfigFile> 
    19     <attrCertDir>./attrCert</attrCertDir> 
     19    <attCertDir>./attCert</attCertDir> 
    2020    <dnSeparator>/</dnSeparator> 
    2121    <usrRolesModFilePath> 
  • security/trunk/python/mapConfig.xml

    r471 r473  
    99    </trusted>--> 
    1010    <trusted name="bodc"> 
     11        <wsdl>/home/users/pjkersha/BODC/config/attAuthority.wsdl</wsdl> 
    1112        <role remote="nerc" local="nerc"/> 
    1213        <role remote="ashoe" local="ashoe"/> 
     
    1516    </trusted> 
    1617    <trusted name="escience"> 
     18        <wsdl>/home/users/pjkersha/E-Sci/config/attAuthority.wsdl</wsdl> 
    1719        <role remote="bodc" local="nerc"/> 
    1820    </trusted> 
  • security/trunk/python/reqAuthorisation.py

    r438 r473  
    2626 
    2727    # Attribute Authority WSDL 
    28     aaWSDL = './attrAuthority.wsdl' 
     28    aaWSDL = './attAuthority.wsdl' 
    2929     
    3030    # User's proxy certificate 
     
    3434    # available for use with trusted data centres to make new mapped Attribute 
    3535    # Certificates 
    36     usrAttrCertFilePath = "./attrCert/attrCert-pjk-BADC.xml" 
     36    usrAttCertFilePath = "./attCert/attCert-pjk-BADC.xml" 
    3737 
    3838    # Make Attribute Authority raise an exception 
    39     #usrAttrCertFilePath = "attrCert-tampered.xml" 
     39    #usrAttCertFilePath = "attCert-tampered.xml" 
    4040 
    4141 
     
    5454 
    5555    # Simlarly for Attribute Certificate if present ... 
    56     if usrAttrCertFilePath is not None: 
     56    if usrAttCertFilePath is not None: 
    5757         
    5858        try: 
    59             usrAttrCertFileTxt = open(usrAttrCertFilePath, 'r').read() 
     59            usrAttCertFileTxt = open(usrAttCertFilePath, 'r').read() 
    6060             
    6161        except IOError, ioErr: 
     
    6363                                    (ioErr.filename, ioErr.strerror) 
    6464    else: 
    65         usrAttrCertFileTxt = None 
     65        usrAttCertFileTxt = None 
    6666 
    6767 
     
    7373    try:    
    7474        resp = aaSrv.reqAuthorisation(usrProxyCert=usrProxyCertFileTxt, 
    75                                       usrAttrCert=usrAttrCertFileTxt) 
     75                                      usrAttCert=usrAttCertFileTxt) 
    7676        if resp['errMsg']: 
    7777            raise Exception(resp['errMsg']) 
    7878         
    79         return resp['attrCert'] 
     79        return resp['attCert'] 
    8080         
    8181    except Exception, excep: 
  • security/trunk/python/sessionMgr.wsdl

    r469 r473  
    3535    <part name="reqRole" type="xsd:string"/> 
    3636    <part name="mapFromTrustedHosts" type="xsd:boolean"/> 
    37     <part name="extAttrCertList" type="xsd:ArrayOf_xsd_string"/> 
     37    <part name="extAttCertList" type="xsd:ArrayOf_xsd_string"/> 
    3838  </message> 
    3939 
    4040  <message name="reqAuthorisationResponse"> 
    41     <part name="attrCert" type="xsd:string"/> 
    42     <part name="extAttrCertList" type="xsd:ArrayOf_xsd_string"/> 
     41    <part name="attCert" type="xsd:string"/> 
     42    <part name="extAttCertList" type="xsd:ArrayOf_xsd_string"/> 
    4343    <part name="statCode" type="xsd:string"/> 
    4444    <part name="errMsg" type="xsd:string"/> 
Note: See TracChangeset for help on using the changeset viewer.