Changeset 3992


Ignore:
Timestamp:
05/06/08 11:31:17 (11 years ago)
Author:
pjkersha
Message:
  • Added dependencies to setup.py
  • ndgDiscovery.config - fixes to security set-up
  • wayf.py - reinstate conditional security import
Location:
TI05-delivery/ows_framework/trunk/ows_server
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/trunk/ows_server/ndgDiscovery.config

    r3943 r3992  
    195195#httpProxyHost: wwwcache.rl.ac.uk:8080 
    196196 
    197 # Web service clients pick up the http_proxy environment variable setting by 
    198 # default.  Set this flag to True to ignore http_proxy for web service  
    199 # connections.  To use the http_proxy setting, set this parameter to False or  
    200 # remove it completely from this file. 
    201 ignoreHttpProxyEnv: True 
     197# Web service clients pick up the no_proxy environment variable setting by 
     198# default.  Set this parameter to override no_proxy for web service  
     199# connections.   
     200#noHttpProxyList: localhost, 127.0.0.1 
    202201 
    203202# WS-Security signature handler - set a config file with 'wssCfgFilePath' 
     
    271270aaURI: http://localhost:5000/AttributeAuthority 
    272271 
    273 # CA certificates used to verify peer certs from Session Manager SSL  
    274 # connections - space delimited list 
    275 sslCACertFilePathList: 
     272# Verify peer cert for SSL connections to Session Manager 
     273sslCACertFilePathList: certs/ndg-test-ca.crt 
    276274 
    277275# Set to file object to dump SOAP message output for debugging 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/wayf.py

    r3919 r3992  
    33log = logging.getLogger(__name__) 
    44 
    5 class WayfController(BaseController): 
    6     def index(self): 
    7         abort(401) 
    8 #try: 
    9 #    from ndg.security.server.sso.sso.controllers.wayf import WayfController as\ 
    10 #        _WayfController 
    11 #         
    12 #    class WayfController(_WayfController): 
    13 #        '''Provides the pylons controller for Where Are You From.  This is a  
    14 #        wrapper class.  - All functionality is provided from  
    15 #        ndg.security.server.sso.sso the NDG Security Single Sign On Service  
    16 #        package''' 
    17 #             
    18 #except ImportError, e: 
    19 #    from warnings import warn 
    20 #    warn("Importing WayfController for Single Sign On Service: %s" % e,  
    21 #         RuntimeWarning) 
    22 #     
    23 #    # Default to base version to avoid an exception if 'wayf' is invoked         
    24 #    class WayfController(BaseController): 
    25 #        ''' Raise a 404 error for case where Single Sign ON Service is disabled 
    26 #        '''         
    27 #        def index(self): 
    28 #            log.info("Single Sign On Service is disabled setting 404 error...") 
    29 #            abort(404) 
     5try: 
     6    from ndg.security.server.sso.sso.controllers.wayf import WayfController as\ 
     7        _WayfController 
     8         
     9    class WayfController(_WayfController): 
     10        '''Provides the pylons controller for Where Are You From.  This is a  
     11        wrapper class.  - All functionality is provided from  
     12        ndg.security.server.sso.sso the NDG Security Single Sign On Service  
     13        package''' 
     14             
     15except ImportError, e: 
     16    from warnings import warn 
     17    warn("Importing WayfController for Single Sign On Service: %s" % e,  
     18         RuntimeWarning) 
     19     
     20    # Default to base version to avoid an exception if 'wayf' is invoked         
     21    class WayfController(BaseController): 
     22        ''' Raise a 404 error for case where Single Sign ON Service is disabled 
     23        '''         
     24        def index(self): 
     25            log.info("Single Sign On Service is disabled setting 404 error...") 
     26            abort(404) 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/base.py

    r3901 r3992  
    9090            except OWS_E.OwsError, e: 
    9191                logger.exception(e) 
    92  
    9392                response.headers['content-type'] = 'text/xml' 
    9493                return render('exception_report', report=e.report, format='xml') 
  • TI05-delivery/ows_framework/trunk/ows_server/setup.py

    r2476 r3992  
    55setup( 
    66    name='ows_server', 
    7     version="", 
    8     #description="", 
     7    version="0.1.0", 
     8    description="NERC DataGrid Discovery and Browse web and OWS Interface", 
    99    #author="", 
    1010    #author_email="", 
    11     #url="", 
    12     install_requires=["Pylons>=0.9.5"], 
     11    url="http://ndg.nerc.ac.uk/", 
     12    install_requires=["Pylons>=0.9.6",  
     13                      "TurboKid",  
     14                      "ows_common",  
     15                      "ndgUtils", 
     16                      "ZSI" # Used for vocab service client 
     17                      ], 
     18    dependency_links = ["http://ndg.nerc.ac.uk/dist"], 
    1319    packages=find_packages(), 
    1420    include_package_data=True, 
Note: See TracChangeset for help on using the changeset viewer.