Changeset 6864

Timestamp:

12/05/10 14:54:48 (11 years ago)

Author:

pjkersha

Message:

Added unit test but calls fail with 404 error

Location:

TI12-security/trunk/EsgPyDapClient

Files:

• LICENSE (added)
• esg/pydap/client.py (modified) (1 diff)
• esg/pydap/test (added)
• esg/pydap/test/__init__.py (added)
• esg/pydap/test/test_client.ini (added)
• esg/pydap/test/test_client.py (added)
• ez_setup.py (added)
• setup.cfg (added)
• setup.py (added)

TI12-security/trunk/EsgPyDapClient/esg/pydap/client.py

@@ -1 @@
-'''
-Created on 11 May 2010
+"""PyDAP client extension to support SSL based authentication with redirects
+devised for the Earth System Grid project
+"""
+__author__ = "P J Kershaw"
+__date__ = "11/05/10"
+__copyright__ = ""
+__license__ = "BSD - see LICENSE file in top-level directory"
+__contact__ = "Philip.Kershaw@stfc.ac.uk"
+__revision__ = '$Id:$'
+import re
+import urllib2
+import logging
+log = logging.getLogger(__name__)
 
-@author: pjkersha
-'''
-import urllib2
 from M2Crypto import SSL, m2urllib2
-from myproxy.client import MyProxyClient
-
-import logging
-import re
-import os
-import getpass
-from urlparse import urlparse
-import pydap.lib
 from pydap.exceptions import ClientError
 
-url = 'http://ndg3beta.badc.rl.ac.uk/'
-cert_file = os.path.expanduser('~/.globus/badc_cert.pem')
 
-testfile = 'dap/rapid/chime/co2_1pc/1day/chime_co2_1pc_daily_0060_197.oc.nc'
+class DapClient(object):
+    """PyDAP client extended to support SSL based authentication with redirects
+    devised for the Earth System Grid project
+    """
+    def __init__(self, certfile, keyfile=None):
+        """Set up an SSL Context based on the certificate and key file passed
+        """
+        ctx = self.secure_init(certfile, keyfile)
+        opener = m2urllib2.build_opener(ctx, urllib2.HTTPCookieProcessor())
+        urllib2.install_opener(opener)
+        
+        self.install_ndg_client(certfile, keyfile)
+        
+    def secure_init(self, certfile, keyfile=None):
+        # keyfile assumed to be the same as certfile if it's omitted
+        if keyfile is None:
+            keyfile = certfile
+            
+        ctx = SSL.Context('sslv3')
+        ctx.load_cert(certfile=certfile, keyfile=keyfile)
+        return ctx
 
-def make_cert():
-
-    # Get a proxy certificate from the CEDA MyProxy instance
-    mp = MyProxyClient(hostname='<CEDA MyProxy Service>', serverCNPrefix='')
-    username = getpass.getuser()
-    password = getpass.getpass()
-    cert, key = mp.logon(username, password)
-
-    # Save the certificate
-    cert_fh = open(cert_file, 'w')
-    cert_fh.write(key)
-    cert_fh.write(cert)
-    cert_fh.close()
-
-def init():
-    install_ndg_client(cert_file)
-    import pydap.client
+    def install_ndg_client(self, certfile, keyfile=None):
+        '''Override PyDAP default HTTP request function'''
+        
+        def _request(url):
+            log.info('Opening [%s] ...' % url)
+                       
+            response = urllib2.urlopen(url)
+            responseDict = response.headers.dict
+            data = response.read()
+    
+            # When an error is returned, we parse the error message from the
+            # server and return it in a ``ClientError`` exception.
+            if responseDict.get("content-description") == "dods_error":
+                m = re.search('code = (?P<code>\d+);\s*message = "(?P<msg>.*)"',
+                        data, re.DOTALL | re.MULTILINE)
+                msg = 'Server error %(code)s: "%(msg)s"' % m.groupdict()
+                raise ClientError(msg)
+            
+            responseDict['status'] = str(response.code)
+    
+            return responseDict, data
+    
+        from pydap.util import http
+        http.request = _request
+        self._request = _request
+        
+    def open_url(self, url):
+        '''Wrap PyDAP open_url function as a method to this class ensuring that
+        it is called with the altered version of pydap.util.http.request set in
+        __init__
+        '''
+        import pydap.client
+        pydap.client.request = self._request
+        return pydap.client.open_url(url)
 
 
-def secure_init(certfile, keyfile=None):
-    # keyfile assumed to be the same as certfile if it's omitted
-    if keyfile is None:
-        keyfile = certfile
-        
-    ctx = SSL.Context('sslv3')
-    ctx.load_cert(certfile=certfile, keyfile=keyfile)
-
-    #!TODO: persistant cookiejar
-    opener = m2urllib2.build_opener(ctx, urllib2.HTTPCookieProcessor())
-    urllib2.install_opener(opener)
-
-
-def install_ndg_client(certfile, keyfile=None):
-    # Create special opener with support for Cookies.
-    secure_init(certfile, keyfile)
-
-    def new_request(url):
-        log = logging.getLogger('pydap')
-        log.info('Opening %s' % url)
-        r = urllib2.urlopen(url)
-
-        resp = r.headers.dict
-        resp['status'] = str(r.code)
-        data = r.read()
-
-        # When an error is returned, we parse the error message from the
-        # server and return it in a ``ClientError`` exception.
-        if resp.get("content-description") == "dods_error":
-            m = re.search('code = (?P<code>\d+);\s*message = "(?P<msg>.*)"',
-                    data, re.DOTALL | re.MULTILINE)
-            msg = 'Server error %(code)s: "%(msg)s"' % m.groupdict()
-            raise ClientError(msg)
-
-        return resp, data
-
-    from pydap.util import http
-    http.request = new_request
-
-def get():
-    return pydap.client.open_url(url + testfile)
-