Changeset 1701


Ignore:
Timestamp:
16/11/06 15:44:57 (13 years ago)
Author:
pjkersha
Message:

Major re-working to allow separate client, server and common eggs.

Location:
TI12-security/trunk/python
Files:
21 added
3 deleted
4 edited
6 copied
3 moved

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/README

    r1337 r1701  
    44To install: 
    55 
    6 $ <path to NDG python> setup.py install 
     61) Get Egg setup tools installed if not already present.   
     7$ python ez_setup.py 
     8 
     92) Install NDG Security egg 
     10$ easy_install dist/<filename>.egg 
     11 
     12Nb. as precursor to the above you may need to set http_proxy if your site uses one: 
     13$ export http_proxy=http://your-site-proxy.somewhere 
  • TI12-security/trunk/python/ndg.security.common/setup.cfg

    r1654 r1701  
    1212[EasyInstall] 
    1313 
    14 [build] 
     14[build_ext] 
     15include_dirs: /usr/local/NDG/include 
     16library_dirs: /usr/local/NDG/lib 
    1517 
    16 [m2crypto] 
    17 #library_dirs=$NDG_DIR/lib 
    18 #include_dirs=$NDG_DIR/include 
    19 openssl=$NDG_DIR 
     18[install] 
    2019 
    2120[egg_info] 
  • TI12-security/trunk/python/ndg.security.common/setup.py

    r1654 r1701  
    3535    'ElementTree', 
    3636    'cElementTree', 
    37 #    'M2Crypto', build fails - find way to make it link with /usr/local/NDG openssl installation 
     37#    'm2crypto', # build fails - find way to make it link with /usr/local/NDG openssl installation 
    3838    'ZSI', 
    3939#    '4Suite', don't need to include it as ZSI egg will get this instead 
     
    5757] 
    5858 
     59#_pkgs = ['ndg',  
     60#         'ndg.security',  
     61#         'ndg.security.server',  
     62#         'ndg.security.client'] 
     63# 
     64#_namespacePkgs = ['ndg',  
     65#                 'ndg.security',  
     66#                 'ndg.security.server',  
     67#                 'ndg.security.client'] 
     68import pdb;pdb.set_trace() 
     69_serverPkgs = ['ndg.security.server.%s' % \ 
     70         pkg for pkg in find_packages('ndg/security/server')] 
     71_clientPkgs = ['ndg.security.client.%s' % \ 
     72         pkg for pkg in find_packages('ndg/security/client')] 
     73_pkg = ['ndg.security.server'] 
     74_namespacePkgs = _pkgs 
    5975 
    6076_entryPoints = \ 
     
    7793    'dependency_links':         _pkgDependencyLinks, 
    7894#    'packages':                find_packages('ndg'), 
    79     'packages':                     ['ndg', 'ndg.security', 'ndg.security.server', 'ndg.security.client'], 
    80     'namespace_packages':       ['ndg', 'ndg.security', 'ndg.security.server', 'ndg.security.client'], 
     95    'packages':                     _pkgs, 
     96    'namespace_packages':       _namespacePkgs, 
    8197    # This flag will include all files under SVN control or included in 
    8298    # MANIFEST.in. 
     
    87103    #'exclude_package_data':    {} 
    88104    'entry_points':        _entryPoints, 
    89     'test_suite':                  'ndg.utils.test.suite', 
     105    #'tSest_suite':                'ndg.utils.test.suite', 
    90106} 
    91107setup(**setupKw) 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/attAuthority/__init__.py

    r1699 r1701  
    1 """Security server package 
    2  
    3 NERC Data Grid Project 
    4  
    5 P J Kershaw 27/10/06 
    6  
    7 Copyright (C) 2006 CCLRC & NERC 
    8  
    9 This software may be distributed under the terms of the Q Public License, 
    10 version 1.0 or later. 
    11 """ 
    12 __import__('pkg_resources').declare_namespace(__name__) 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/sessionMgr/__init__.py

    r1699 r1701  
    1 """Security server package 
    2  
    3 NERC Data Grid Project 
    4  
    5 P J Kershaw 27/10/06 
    6  
    7 Copyright (C) 2006 CCLRC & NERC 
    8  
    9 This software may be distributed under the terms of the Q Public License, 
    10 version 1.0 or later. 
    11 """ 
    12 __import__('pkg_resources').declare_namespace(__name__) 
  • TI12-security/trunk/python/www/html/attAuthority.wsdl

    r1176 r1701  
    11<?xml version="1.0" encoding="utf-8"?> 
     2<wsdl:definitions name="AttAuthority" 
     3 xmlns="http://schemas.xmlsoap.org/wsdl/" 
     4 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     5 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
     6 xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
     7 xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
     8 xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     9 xmlns:tns="urn:ndg:security" 
     10 xmlns:wsu="http://schemas.xmlsoap.org/ws/2002/07/utility" 
     11 targetNamespace="urn:ndg:security"> 
    212 
     13  <wsdl:types> 
     14    <xsd:schema> 
     15      <xsd:element name="getAttCert"> 
     16        <xsd:complexType> 
     17          <xsd:sequence> 
     18            <xsd:element name="userCert" type="xsd:string"/> 
     19          </xsd:sequence> 
     20        </xsd:complexType> 
     21      </xsd:element> 
     22      <xsd:element name="getAttCertResponse"> 
     23        <xsd:complexType> 
     24          <xsd:sequence> 
     25            <xsd:element name="attCert" type="xsd:string"/> 
     26          </xsd:sequence> 
     27        </xsd:complexType> 
     28      </xsd:element> 
    329 
    4 <definitions name="attAuthority" 
    5   targetNamespace="http://wsdl2py.client.pycon.org/" 
    6   xmlns="http://schemas.xmlsoap.org/wsdl/" 
    7   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
    8   xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
    9   xmlns:tns="http://wsdl2py.client.pycon.org/" 
    10   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
    11   xmlns:xsd="http://www.w3.org/2001/XMLSchema"> 
     30      <xsd:element name="getHostInfo"> 
     31        <xsd:complexType/> 
     32      </xsd:element> 
    1233 
    13   <message name="authorisationRequest"> 
    14     <part name="authorisationReq" type="xsd:string"/> 
     34      <xsd:element name="getHostInfoResponse"> 
     35        <xsd:complexType/> 
     36      </xsd:element> 
     37 
     38      <xsd:element name="getTrustedHostInfo"> 
     39        <xsd:complexType> 
     40          <xsd:sequence> 
     41            <xsd:element name="role" type="xsd:string"/> 
     42          </xsd:sequence> 
     43        </xsd:complexType> 
     44      </xsd:element> 
     45      <xsd:element name="getTrustedHostInfoResponse"> 
     46        <xsd:complexType> 
     47          <xsd:sequence> 
     48            <xsd:element name="trustedHosts" type="xsd:string"/> 
     49          </xsd:sequence> 
     50        </xsd:complexType> 
     51      </xsd:element> 
     52 
     53      <xsd:element name="getPubKey"> 
     54        <xsd:complexType/> 
     55      </xsd:element> 
     56      <xsd:element name="getPubKeyResponse"> 
     57        <xsd:complexType> 
     58          <xsd:sequence> 
     59            <xsd:element name="x509Cert" type="xsd:string"/> 
     60          </xsd:sequence> 
     61        </xsd:complexType> 
     62      </xsd:element> 
     63 
     64    </xsd:schema> 
     65  </wsdl:types> 
     66  
     67  <message name="getAttCertInputMsg"> 
     68    <part name="parameters" element="tns:getAttCert"/> 
    1569  </message> 
    1670 
    17   <message name="authorisationResponse"> 
    18     <part name="authorisationResp" type="xsd:string"/> 
     71  <message name="getAttCertOutputMsg"> 
     72    <part name="parameters" element="tns:getAttCertResponse"/> 
     73  </message> 
     74   
     75  <message name="getHostInfoInputMsg"> 
     76    <part name="parameters" element="tns:getHostInfo"/> 
    1977  </message> 
    2078 
    21   <message name="hostInfoRequest"> 
    22     <part name="hostInfoReq" type="xsd:string"/> 
     79  <message name="getHostInfoOutputMsg"> 
     80    <part name="parameters" element="tns:getHostInfoResponse"/> 
    2381  </message> 
    2482 
    25   <message name="hostInfoResponse"> 
    26     <part name="hostInfoResp" type="xsd:string"/> 
     83  <message name="getTrustedHostInfoInputMsg"> 
     84    <part name="parameters" element="tns:getTrustedHostInfo"/> 
    2785  </message> 
    2886 
    29   <message name="trustedHostInfoRequest"> 
    30     <part name="trustedHostInfoReq" type="xsd:string"/> 
     87  <message name="getTrustedHostInfoOutputMsg"> 
     88    <part name="parameters" element="tns:getTrustedHostInfoResponse"/> 
    3189  </message> 
    3290 
    33   <message name="trustedHostInfoResponse"> 
    34     <part name="trustedHostInfoResp" type="xsd:string"/> 
     91  <message name="getPubKeyInputMsg"> 
     92    <part name="parameters" element="tns:getPubKey"/> 
    3593  </message> 
    3694 
    37   <message name="pubKeyRequest"> 
    38     <part name="pubKeyReq" type="xsd:string"/> 
     95  <message name="getPubKeyOutputMsg"> 
     96    <part name="parameters" element="tns:getPubKeyResponse"/> 
    3997  </message> 
    4098 
    41   <message name="pubKeyResponse"> 
    42     <part name="pubKeyResp" type="xsd:string"/> 
    43   </message> 
    44  
    45    
    46   <portType name="attAuthority"> 
    47     <operation name="reqAuthorisation"> 
    48       <input message="tns:authorisationRequest"/> 
    49       <output message="tns:authorisationResponse"/> 
    50     </operation> 
     99  <wsdl:portType name="AttAuthority"> 
     100    <wsdl:operation name="getAttCert"> 
     101      <wsdl:input message="tns:getAttCertInputMsg"/> 
     102      <wsdl:output message="tns:getAttCertOutputMsg"/> 
     103    </wsdl:operation> 
    51104 
    52105    <operation name="getHostInfo"> 
    53       <input message="tns:hostInfoRequest"/> 
    54       <output message="tns:hostInfoResponse"/> 
     106      <wsdl:input message="tns:getHostInfoInputMsg"/> 
     107      <output message="tns:getHostInfoOutputMsg"/> 
    55108    </operation> 
    56109 
    57110    <operation name="getTrustedHostInfo"> 
    58       <input message="tns:trustedHostInfoRequest"/> 
    59       <output message="tns:trustedHostInfoResponse"/> 
     111      <wsdl:input message="tns:getTrustedHostInfoInputMsg"/> 
     112      <output message="tns:getTrustedHostInfoOutputMsg"/> 
    60113    </operation> 
    61114 
    62115    <operation name="getPubKey"> 
    63       <input message="tns:pubKeyRequest"/> 
    64       <output message="tns:pubKeyResponse"/> 
     116      <wsdl:input message="tns:getPubKeyInputMsg"/> 
     117      <output message="tns:getPubKeyOutputMsg"/> 
    65118    </operation> 
    66   </portType> 
     119  </wsdl:portType> 
    67120 
    68   <binding name="attAuthorityBinding" type="tns:attAuthority"> 
    69     <soap:binding style="rpc"  
    70                       transport="http://schemas.xmlsoap.org/soap/http"/> 
    71     <operation name="reqAuthorisation"> 
    72       <soap:operation soapAction="urn:attAuthority#reqAuthorisation"/> 
    73       <input> 
    74         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    75                     namespace="urn:attAuthority" use="encoded"/> 
    76       </input> 
    77       <output> 
    78         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    79                     namespace="urn:attAuthority" use="encoded"/> 
    80       </output>  
    81     </operation> 
     121  <wsdl:binding name="AttAuthorityBinding" type="tns:AttAuthority"> 
     122    <soap:binding 
     123     style="document" 
     124     transport="http://schemas.xmlsoap.org/soap/http"/> 
     125      
     126    <wsdl:operation name="getAttCert"> 
     127      <soap:operation soapAction="getAttCert"/> 
     128      <wsdl:input> 
     129        <soap:body use="literal"/> 
     130      </wsdl:input> 
     131      <wsdl:output> 
     132        <soap:body use="literal"/> 
     133      </wsdl:output> 
     134    </wsdl:operation> 
    82135 
    83136    <operation name="getHostInfo"> 
    84       <soap:operation soapAction="urn:attAuthority#getHostInfo"/> 
    85       <input> 
    86         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    87                     namespace="urn:attAuthority" use="encoded"/> 
    88       </input> 
    89       <output> 
    90         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    91                     namespace="urn:attAuthority" use="encoded"/> 
    92       </output>  
     137      <soap:operation soapAction="getHostInfo"/> 
     138      <wsdl:input> 
     139        <soap:body use="literal"/> 
     140      </wsdl:input> 
     141      <wsdl:output> 
     142        <soap:body use="literal"/> 
     143      </wsdl:output>  
    93144    </operation> 
    94145 
    95146    <operation name="getTrustedHostInfo"> 
    96       <soap:operation soapAction="urn:attAuthority#getTrustedHostInfo"/> 
    97       <input> 
    98         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    99                     namespace="urn:attAuthority" use="encoded"/> 
    100       </input> 
    101       <output> 
    102         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    103                     namespace="urn:attAuthority" use="encoded"/> 
    104       </output>  
     147      <soap:operation soapAction="getTrustedHostInfo"/> 
     148      <wsdl:input> 
     149        <soap:body use="literal"/> 
     150      </wsdl:input> 
     151      <wsdl:output> 
     152        <soap:body use="literal"/> 
     153      </wsdl:output>  
    105154    </operation> 
    106155 
    107156    <operation name="getPubKey"> 
    108       <soap:operation soapAction="urn:attAuthority#getPubKey"/> 
    109       <input> 
    110         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    111                     namespace="urn:attAuthority" use="encoded"/> 
    112       </input> 
    113       <output> 
    114         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    115                     namespace="urn:attAuthority" use="encoded"/> 
    116       </output>  
     157      <soap:operation soapAction="getPubKey"/> 
     158      <wsdl:input> 
     159        <soap:body use="literal"/> 
     160      </wsdl:input> 
     161      <wsdl:output> 
     162        <soap:body use="literal"/> 
     163      </wsdl:output>  
    117164    </operation>     
    118   </binding> 
     165   
     166  </wsdl:binding> 
    119167 
    120   <service name="attAuthorityService"> 
    121     <documentation>NDG Attribute Authority Web Service</documentation> 
    122     <port name="attAuthority" binding="tns:attAuthorityBinding"> 
    123       <soap:address location=""/> 
    124     </port> 
    125   </service> 
    126 </definitions> 
     168  <wsdl:service name="AttAuthorityService"> 
     169    <wsdl:documentation>NERC Data Grid Attribute Authority web service</wsdl:documentation> 
     170    <wsdl:port name="SimpleCA" binding="tns:AttAuthorityBinding"> 
     171      <soap:address location="http://localhost:5700"/> 
     172    </wsdl:port> 
     173  </wsdl:service> 
     174</wsdl:definitions> 
Note: See TracChangeset for help on using the changeset viewer.