Changeset 7794 for TI12-security


Ignore:
Timestamp:
24/12/10 11:14:45 (8 years ago)
Author:
pjkersha
Message:

Incomplete - task 16: NDG Security 2.x.x - incl. updated Paster templates

  • Revising openidprovider integration test. - Provider now runs with all static content loaded correctly using a cascade in the ini file.
Location:
TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test
Files:
9 added
7 edited
2 moved

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/full_system/securityservices.ini

    r7781 r7794  
    7575#[composit:cascade] 
    7676#use = egg:Paste#cascade 
    77 #app1 = OpenIDProviderStaticContent 
     77#app1 = OpenIDProviderApp 
     78#app2 = OpenIDProviderStaticContent 
    7879#catch = 404 
    7980# 
  • TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/openid_ssl/README

    r7077 r7794  
    1 Integration Tests for OpenID Relying Party and Provider Middleware 
    2 ================================================================== 
     1Integration Tests for OpenID Relying Party and Provider (SSL based) 
     2=================================================================== 
    33A simple example application securedapp.py is secured with an Authentication 
    4 handler which redirects HTTP 401 Responses to an OpenID middleware application  
    5 running in securityservicesapp.py.   
    6  
    7 An OpenID account with an external OpenID Provider is required in order to run 
    8 this test.  The NDG OpenID Provider is deliberately omitted from this test for 
    9 simplicity.  See openid/ integration test in the parent directory for a test 
    10 deployment with OpenID Provider and Relying Party combined. 
     4handler which redirects unauthenticated requests to an OpenID Relying Party 
     5application running in securityservicesapp.py over HTTPS.   
    116 
    127To run: 
     
    2217http://localhost:9080 
    2318 
    24 You will be redirected to a page to enter your OpenID.   On return to the test site it will display a  
    25 message with an option to logout.  Click on the link to logout. 
     19Follow the instructions given on the web page in order to test the app out. 
    2620 
    27 P J Kershaw 26/02/09 
     21P J Kershaw 24/12/10 
  • TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/openidprovider/README

    r7791 r7794  
    1 Integration Tests for OpenID Relying Party and Provider Middleware 
    2 ================================================================== 
    3 A simple example application securedapp.py is secured with an Authentication 
    4 handler which redirects unauthenticated requests to an OpenID middleware  
    5 application running in securityservicesapp.py.   
     1Integration Tests for OpenID Provider Service 
     2============================================= 
     3Test harness for OpenID Provider.  It contains the configuration for an OpenID 
     4Provider service and a simple web application which includes an OpenID Relying 
     5Party.  This app can be used to test the Provider service. 
    66 
    7 An OpenID account with an external OpenID Provider is required in order to run 
    8 this test.  The NDG OpenID Provider is deliberately omitted from this test for 
    9 simplicity.  See openid/ integration test in the parent directory for a test 
    10 deployment with OpenID Provider and Relying Party combined. 
     7Start the OpenID Provider service: 
    118 
    12 To run: 
     9$ ./openidprovider.py 
    1310 
    14 $ ./securityservicesapp.py 
     11and in a separate window the web application: 
    1512 
    16 and in a separate window: 
     13$ ./openidrelyingparty.py 
    1714 
    18 $ ./securedapp.py 
    19  
    20 Start a browser and enter the address: 
     15Start a browser and enter the address to load the web application: 
    2116 
    2217http://localhost:9080 
    2318 
    24 You will be redirected to a page to enter your OpenID.   On return to the test  
    25 site it will display a message with an option to logout.  Click on the link to  
    26 logout. 
     19Follow the instructions on the web page to test the service. 
    2720 
    28 P J Kershaw 26/02/09 
     21P J Kershaw 24/12/10 
  • TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/openidprovider/openidprovider.ini

    r7793 r7794  
    22# NERC DataGrid Security 
    33# 
    4 # Description: Paste configuration for OpenID Relying Party and Provider services  
     4# Description: Paste configuration for OpenID Provider standalone service 
    55# 
    66# The %(here)s variable will be replaced with the parent directory of this file 
    77# 
    8 # Author: P J Kershaw 
    9 # date: 01/07/09 
     8# Author:       P J Kershaw 
     9# 
     10# Date:         01/07/09 
    1011# 
    1112# Copyright: (C) 2010 Science and Technology Facilities Council 
     
    3233 
    3334# Uncomment and replace OpenIDProviderApp with OpenIDProviderFilterApp in the 
    34 # pipeline below if the RelyingParty filter is removed.  The RelyingParty 
    35 # provides static content to both it and the Provider in this configuration. 
    36 # See the staticContentDir setting in the OpenIDRelyingPartyFilter section 
    37 #[filter-app:OpenIDProviderFilterApp] 
    38 #use = egg:Paste#httpexceptions 
    39 #next = cascade 
    40 # 
    41 ## Composite for OpenID Provider to enable settings for picking up static  
    42 ## content 
    43 #[composit:cascade] 
    44 #use = egg:Paste#cascade 
    45 #app1 = OpenIDProviderStaticContent 
    46 #catch = 404 
    47 # 
    48 #[app:OpenIDProviderStaticContent] 
    49 #use = egg:Paste#static 
    50 #document_root = %(here)s/openidprovider 
     35# pipeline below if the RelyingParty filter is removed.   
     36[filter-app:OpenIDProviderFilterApp] 
     37use = egg:Paste#httpexceptions 
     38next = cascade 
     39 
     40# Composite for OpenID Provider to enable settings for picking up static  
     41# content 
     42[composit:cascade] 
     43use = egg:Paste#cascade 
     44app1 = OpenIDProviderApp 
     45app2 = OpenIDProviderStaticContent 
     46catch = 404 
     47 
     48[app:OpenIDProviderStaticContent] 
     49use = egg:Paste#static 
     50document_root = %(here)s/public 
    5151 
    5252# Ordering of filters and app is critical 
    5353[pipeline:main] 
    54 pipeline = SessionMiddlewareFilter 
    55                    OpenIDRelyingPartyFilter 
    56                    OpenIDProviderApp 
     54pipeline = SessionMiddlewareFilter OpenIDProviderFilterApp 
    5755 
    5856#______________________________________________________________________________ 
     
    6159paste.filter_app_factory=beaker.middleware:SessionMiddleware 
    6260beaker.session.key = openid 
    63 beaker.session.secret = qKEdQdCr33NE087dRUWX3qUv5r7AsuQU 
     61beaker.session.secret = BIRbpRp7gkoXCEfZtZcNsPj+X0wO+Sxd 
    6462 
    6563# If you'd like to fine-tune the individual locations of the cache data dirs 
    6664# for the Cache data, or the Session saves, un-comment the desired settings 
    6765# here: 
    68 beaker.cache.data_dir = %(here)s/openidprovider/beaker/cache 
    69 beaker.session.data_dir = %(here)s/openidprovider/beaker/sessions 
     66beaker.cache.data_dir = %(here)s/beaker/cache 
     67beaker.session.data_dir = %(here)s/beaker/sessions 
    7068beaker.session.cookie_expires = True 
    7169 
     
    7472# Key name for keying into environ dictionary 
    7573environ_key = %(beakerSessionKeyName)s 
    76  
    77 [filter:SSLCientAuthKitFilter] 
    78 paste.filter_app_factory = authkit.authenticate:middleware 
    79  
    80 # AuthKit Set-up 
    81 setup.method=cookie 
    82  
    83 # This cookie name and secret MUST agree with the name used by the  
    84 # Authentication Filter used to secure a given app 
    85 cookie.name=ndg.security.auth 
    86  
    87 cookie.secret=9wvZObs9anUEhSIAnJNoY2iJq59FfYZr 
    88 cookie.signoutpath = /logout 
    89  
    90 # Disable inclusion of client IP address from cookie signature due to  
    91 # suspected problem with AuthKit setting it when a HTTP Proxy is in place 
    92 cookie.includeip = False 
    93  
    94 #cookie.params.domain = .localhost 
    95  
    96 [filter:OpenIDRelyingPartyFilter] 
    97 paste.filter_app_factory =  
    98         ndg.security.server.wsgi.openid.relyingparty:OpenIDRelyingPartyMiddleware.filter_app_factory 
    99  
    100 openid.relyingparty.baseURL = %(authkit.openid.baseurl)s 
    101  
    102 # Uncomment to restrict sign in to a whitelist of trusted OpenID Providers. 
    103 #openid.relyingparty.idpWhitelistConfigFilePath = %(here)s/openidrelyingparty/ssl-idp-validator.xml 
    104  
    105 openid.relyingparty.signinInterfaceMiddlewareClass = ndg.security.server.wsgi.openid.relyingparty.signin_interface.genshi.GenshiSigninTemplate 
    106  
    107 # Nb. in this configuration, this directory is provider static content for both  
    108 # this filter and the OpenID Provider app downstream in the WSGI stack. 
    109 openid.relyingparty.signinInterface.staticContentRootDir = %(here)s/public 
    110  
    111 openid.relyingparty.signinInterface.baseURL = %(openid.relyingparty.baseURL)s 
    112 openid.relyingparty.signinInterface.initialOpenID = %(openIDProviderIDSelectURI)s 
    113 openid.relyingparty.signinInterface.heading = OpenID Sign-in 
    114  
    115 # This setting will accept HTML mark-up 
    116 openid.relyingparty.signinInterface.footerText = This site is for test purposes only.   <a class="FooterLink" href="http://openid.net/what/" target="_blank"><small>What is OpenID?</small></a> 
    117 openid.relyingparty.signinInterface.rightLink = http://ceda.ac.uk/ 
    118 openid.relyingparty.signinInterface.rightImage = %(openid.relyingparty.signinInterface.baseURL)s/layout/CEDA_RightButton60.png 
    119 openid.relyingparty.signinInterface.rightAlt = Centre for Environmental Data Archival 
    120 openid.relyingparty.signinInterface.helpIcon = %(openid.relyingparty.signinInterface.baseURL)s/layout/icons/help.png 
    121  
    122 cache_dir = %(here)s/data 
    123  
    124 # AuthKit Set-up 
    125 authkit.setup.method=openid, cookie 
    126  
    127 # This cookie name and secret MUST agree with the name used by the  
    128 # Authentication Filter used to secure a given app 
    129 authkit.cookie.name=ndg.security.auth 
    130  
    131 authkit.cookie.secret=9wvZObs9anUEhSIAnJNoY2iJq59FfYZr 
    132 authkit.cookie.signoutpath = /logout 
    133 #authkit.cookie.params.domain = .localhost 
    134  
    135 # Disable inclusion of client IP address from cookie signature due to  
    136 # suspected problem with AuthKit setting it when a HTTP Proxy is in place 
    137 authkit.cookie.includeip = False 
    138  
    139 authkit.openid.path.signedin=/ 
    140 authkit.openid.store.type=file 
    141 authkit.openid.store.config=%(here)s/openidrelyingparty/store 
    142 authkit.openid.session.key = authkit_openid 
    143 authkit.openid.session.secret = random string 
    144  
    145 # Key name for dereferencing beaker.session object held in environ 
    146 authkit.openid.session.middleware = %(beakerSessionKeyName)s 
    147  
    148 authkit.openid.baseurl = %(baseURI)s 
    149  
    150 # Template for signin 
    151 #authkit.openid.template.obj =  
    152  
    153 # Handler for parsing OpenID and creating a session from it 
    154 #authkit.openid.urltouser =  
    155  
    156 # Attribute Exchange - all are optional unless the relevant ax.required.<name>  
    157 # is set to True.  The alias defers to the parameter name given unless explicity 
    158 # specified - see commented out entry for firstName below.  The number of 
    159 # attributes for each attribute name defaults to 1 unless otherwise set 
    160 #authkit.openid.ax.typeuri.firstName=http://openid.net/schema/namePerson/first 
    161 #authkit.openid.ax.alias.firstName=firstName 
    162 ##authkit.openid.ax.count.firstName=1 
    163 #authkit.openid.ax.required.firstName=True 
    164 #authkit.openid.ax.typeuri.lastName=http://openid.net/schema/namePerson/last 
    165 #authkit.openid.ax.alias.lastName=lastName 
    166 #authkit.openid.ax.required.lastName=True 
    167 #authkit.openid.ax.typeuri.emailAddress=http://openid.net/schema/contact/internet/email 
    168 #authkit.openid.ax.alias.emailAddress=emailAddress 
    169 #authkit.openid.ax.required.emailAddress=True 
    170  
    171 # ESG Gateway requested parameters 
    172 authkit.openid.ax.typeuri.uuid:http://openid.net/schema/person/guid 
    173 authkit.openid.ax.alias.uuid=uuid 
    174 authkit.openid.ax.typeuri.username:http://openid.net/schema/namePerson/friendly 
    175 authkit.openid.ax.alias.username=username 
    176 authkit.openid.ax.typeuri.firstname:http://openid.net/schema/namePerson/first 
    177 authkit.openid.ax.alias.firstname=firstname 
    178 authkit.openid.ax.required.firstname:True 
    179 authkit.openid.ax.typeuri.middlename:http://openid.net/schema/namePerson/middle 
    180 authkit.openid.ax.alias.middlename=middlename 
    181 authkit.openid.ax.typeuri.lastname:http://openid.net/schema/namePerson/last 
    182 authkit.openid.ax.required.lastname:True 
    183 authkit.openid.ax.alias.lastname=lastname 
    184 authkit.openid.ax.typeuri.email:http://openid.net/schema/contact/internet/email 
    185 authkit.openid.ax.required.email:True 
    186 authkit.openid.ax.alias.email=email 
    187 authkit.openid.ax.typeuri.gateway:http://www.earthsystemgrid.org/gateway 
    188 authkit.openid.ax.alias.gateway=gateway 
    189 authkit.openid.ax.typeuri.organization:http://openid.net/schema/company/name 
    190 authkit.openid.ax.alias.organization=organization 
    191 authkit.openid.ax.typeuri.city:http://openid.net/schema/contact/city/home 
    192 authkit.openid.ax.alias.city=city 
    193 authkit.openid.ax.typeuri.state:http://openid.net/schema/contact/state/home 
    194 authkit.openid.ax.alias.state=state 
    195 authkit.openid.ax.typeuri.country:http://openid.net/schema/contact/country/home 
    196 authkit.openid.ax.alias.country=country 
    19774 
    19875#______________________________________________________________________________ 
     
    232109 
    233110openid.provider.trace=False 
    234 openid.provider.consumer_store_dirpath=%(here)s/openidprovider 
     111openid.provider.consumer_store_dirpath=%(here)s 
    235112openid.provider.renderingClass=ndg.security.server.wsgi.openid.provider.renderinginterface.genshi.GenshiRendering 
    236113#openid.provider.renderingClass=ndg.security.server.wsgi.openid.provider.DemoRenderingInterface 
    237114 
    238115# Templates 
    239 openid.provider.rendering.templateRootDir = %(here)s/openidprovider/templates 
     116openid.provider.rendering.templateRootDir = %(here)s/templates 
    240117 
    241118# Layout 
     
    270147# Attribute Exchange interface 
    271148#openid.provider.axResponse.class=ndg.security.server.wsgi.openid.provider.axinterface.csv.CSVFileAXInterface 
    272 #openid.provider.axResponse.csvFilePath=%(here)s/openidprovider/attributeexchange.csv 
     149#openid.provider.axResponse.csvFilePath=%(here)s/attributeexchange.csv 
    273150openid.provider.axResponse.class=ndg.security.server.wsgi.openid.provider.axinterface.sqlalchemy_ax.SQLAlchemyAXInterface 
    274151openid.provider.axResponse.connectionString=%(dbConnectionString)s 
  • TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/openidprovider/openidprovider.py

    r7793 r7794  
    11#!/usr/bin/env python 
    2 """NDG Security test harness for security web services middleware stack 
     2"""NDG Security test harness for OpenID Provider service 
    33 
    44NERC DataGrid Project 
     
    1818from ndg.security.test.unit.wsgi import PasteDeployAppServer 
    1919 
    20 INI_FILEPATH = 'securityservices.ini' 
     20INI_FILEPATH = 'openidprovider.ini' 
    2121 
    2222os.environ['NDGSEC_INTEGRATION_TEST_DIR'] = os.path.dirname(os.path.dirname( 
  • TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/integration/openidprovider/openidrelyingparty.ini

    r7793 r7794  
    5555interceptUriPat = \S+/test_securedURI\S* 
    5656 
    57 [filter:AuthenticationRedirectFilter] 
    58 paste.filter_app_factory = ndg.security.server.wsgi.authn:AuthenticationMiddleware 
    59 prefix = authN. 
    60  
    61 # Set redirect for OpenID Relying Party in the Security Services app instance 
    62 authN.redirectURI = https://localhost:7443/verify 
    63  
    64 # Default URI to return to if middleware wasn't able to set via HTTP_REFERER or 
    65 # passed return to query argument 
    66 authN.sessionHandler.defaultLogoutReturnToURI = https://localhost:7443/ 
     57 
     58 
     59#                                                                                              
     60# Paste ini file configuration for CMIP5 Questionnaire                                         
     61#                                                                                              
     62# METAFOR                                                                                      
     63#                                                                                              
     64# Author: P J Kershaw                                                                          
     65#                                                                                              
     66# Date: 02/02/2010                                                                             
     67#                                                                                              
     68# Copyright: STFC 2010                                                                         
     69#                                                                                              
     70# Licence: BSD                                                                                 
     71#                                                                                              
     72# The %(here)s variable will be replaced with the parent directory of this file                
     73#                                                                                              
     74[DEFAULT]                                                                                      
     75# Reference security configuration settings                                                    
     76securityConfigDir=%(here)s                                                                     
     77#securityConfigDir=/usr/local/ndg-security/etc                                                 
     78beakerSessionKeyName = beaker.session.ndg.security                                             
     79                                                                                               
     80hostname = q.cmip5.ceda.ac.uk                                                                  
     81scheme = http                                                                                  
     82baseURI = %(scheme)s://%(hostname)s                                                            
     83openIDProviderIDBase = /openid                                                                 
     84 
     85# Initial OpenID set in the Relying Party's OpenID text box 
     86openIDProviderIDSelectURI = https://ceda.ac.uk/openid/      
     87 
     88# Logout URI used by AuthKit and SessionHandlerMiddleware 
     89globalSignoutPath = /logout                               
     90 
     91[server:main] 
     92use = egg:Paste#http 
     93host = 0.0.0.0       
     94port = 6080          
     95                     
     96[app:CMIP5qApp]      
     97paste.app_factory = cmip5q.wsgi:app_factory 
     98 
     99# Pipeline with security filters to protect the application 
     100[pipeline:main]                                             
     101pipeline = BeakerSessionFilter                              
     102           OpenIDRelyingPartyFilter                         
     103           SessionHandlerFilter                             
     104           AuthorizationFilter                              
     105           CMIP5qApp                                        
     106 
     107 
     108[filter:BeakerSessionFilter] 
     109paste.filter_app_factory = beaker.middleware:SessionMiddleware 
     110 
     111# Cookie name 
     112beaker.session.key = ndg.security.session 
     113 
     114# WSGI environ key name 
     115environ_key = %(beakerSessionKeyName)s 
     116beaker.session.secret = iPCb3xS4XvekARyrkbJxB+wy4cAcXm5zQXRQTGMhV+Q 
     117beaker.cache.data_dir = %(here)s/authn/beaker/cache                 
     118beaker.session.data_dir = %(here)s/authn/beaker/sessions            
     119 
     120 
     121# Handle setting of session cookie following sign-in 
     122[filter:SessionHandlerFilter]                        
     123paste.filter_app_factory = ndg.security.server.wsgi.authn:SessionHandlerMiddleware.filter_app_factory                                                                                        
     124prefix = sessionhandler.                                                                       
     125sessionhandler.signoutPath = %(globalSignoutPath)s                                             
     126sessionhandler.sessionKey = %(beakerSessionKeyName)s                                           
     127 
     128 
     129 
     130[filter:OpenIDRelyingPartyFilter] 
     131paste.filter_app_factory =  
     132        ndg.security.server.wsgi.openid.relyingparty:OpenIDRelyingPartyMiddleware.filter_app_factory 
     133 
     134openid.relyingparty.baseURL = %(authkit.openid.baseurl)s 
     135 
     136# Uncomment to restrict sign in to a whitelist of trusted OpenID Providers. 
     137#openid.relyingparty.idpWhitelistConfigFilePath = %(here)s/openidrelyingparty/ssl-idp-validator.xml 
     138 
     139openid.relyingparty.signinInterfaceMiddlewareClass = ndg.security.server.wsgi.openid.relyingparty.signin_interface.genshi.GenshiSigninTemplate 
     140 
     141# Nb. in this configuration, this directory is provider static content for both  
     142# this filter and the OpenID Provider app downstream in the WSGI stack. 
     143openid.relyingparty.signinInterface.staticContentRootDir = %(here)s/public 
     144 
     145openid.relyingparty.signinInterface.baseURL = %(openid.relyingparty.baseURL)s 
     146openid.relyingparty.signinInterface.initialOpenID = %(openIDProviderIDSelectURI)s 
     147openid.relyingparty.signinInterface.heading = OpenID Sign-in 
     148 
     149# This setting will accept HTML mark-up 
     150openid.relyingparty.signinInterface.footerText = This site is for test purposes only.   <a class="FooterLink" href="http://openid.net/what/" target="_blank"><small>What is OpenID?</small></a> 
     151openid.relyingparty.signinInterface.rightLink = http://ceda.ac.uk/ 
     152openid.relyingparty.signinInterface.rightImage = %(openid.relyingparty.signinInterface.baseURL)s/layout/CEDA_RightButton60.png 
     153openid.relyingparty.signinInterface.rightAlt = Centre for Environmental Data Archival 
     154openid.relyingparty.signinInterface.helpIcon = %(openid.relyingparty.signinInterface.baseURL)s/layout/icons/help.png 
     155 
     156cache_dir = %(here)s/data 
    67157 
    68158# AuthKit Set-up 
    69 authkit.setup.method=cookie 
    70  
    71 # This cookie name and secret MUST agree with the name used by the security web 
    72 # services app 
     159authkit.setup.method=openid, cookie 
     160 
     161# This cookie name and secret MUST agree with the name used by the  
     162# Authentication Filter used to secure a given app 
    73163authkit.cookie.name=ndg.security.auth 
     164 
    74165authkit.cookie.secret=9wvZObs9anUEhSIAnJNoY2iJq59FfYZr 
    75166authkit.cookie.signoutpath = /logout 
     167#authkit.cookie.params.domain = .localhost 
    76168 
    77169# Disable inclusion of client IP address from cookie signature due to  
     
    79171authkit.cookie.includeip = False 
    80172 
    81 #authkit.cookie.params.expires = 2 
    82 #authkit.cookie.params.domain = .localhost 
    83  
    84 # environ key name for beaker session 
    85 authkit.session.middleware = %(beakerSessionKeyName)s 
     173authkit.openid.path.signedin=/ 
     174authkit.openid.store.type=file 
     175authkit.openid.store.config=%(here)s/openidrelyingparty/store 
     176authkit.openid.session.key = authkit_openid 
     177authkit.openid.session.secret = random string 
     178 
     179# Key name for dereferencing beaker.session object held in environ 
     180authkit.openid.session.middleware = %(beakerSessionKeyName)s 
     181 
     182authkit.openid.baseurl = %(baseURI)s 
     183 
     184# Attribute Exchange - all are optional unless the relevant ax.required.<name>  
     185# is set to True.  The alias defers to the parameter name given unless explicity 
     186# specified - see commented out entry for firstName below.  The number of 
     187# attributes for each attribute name defaults to 1 unless otherwise set 
     188 
     189# ESG Gateway requested parameters 
     190authkit.openid.ax.typeuri.uuid:http://openid.net/schema/person/guid 
     191authkit.openid.ax.alias.uuid=uuid 
     192authkit.openid.ax.typeuri.username:http://openid.net/schema/namePerson/friendly 
     193authkit.openid.ax.alias.username=username 
     194authkit.openid.ax.typeuri.firstname:http://openid.net/schema/namePerson/first 
     195authkit.openid.ax.alias.firstname=firstname 
     196authkit.openid.ax.required.firstname:True 
     197authkit.openid.ax.typeuri.middlename:http://openid.net/schema/namePerson/middle 
     198authkit.openid.ax.alias.middlename=middlename 
     199authkit.openid.ax.typeuri.lastname:http://openid.net/schema/namePerson/last 
     200authkit.openid.ax.required.lastname:True 
     201authkit.openid.ax.alias.lastname=lastname 
     202authkit.openid.ax.typeuri.email:http://openid.net/schema/contact/internet/email 
     203authkit.openid.ax.required.email:True 
     204authkit.openid.ax.alias.email=email 
     205authkit.openid.ax.typeuri.gateway:http://www.earthsystemgrid.org/gateway 
     206authkit.openid.ax.alias.gateway=gateway 
     207authkit.openid.ax.typeuri.organization:http://openid.net/schema/company/name 
     208authkit.openid.ax.alias.organization=organization 
     209authkit.openid.ax.typeuri.city:http://openid.net/schema/contact/city/home 
     210authkit.openid.ax.alias.city=city 
     211authkit.openid.ax.typeuri.state:http://openid.net/schema/contact/state/home 
     212authkit.openid.ax.alias.state=state 
     213authkit.openid.ax.typeuri.country:http://openid.net/schema/contact/country/home 
     214authkit.openid.ax.alias.country=country 
    86215 
    87216 
    88217# Logging configuration 
    89 [loggers] 
    90 keys = root, ndg 
     218[loggers]               
     219keys = root, ndg, authkit 
    91220 
    92221[handlers] 
    93 keys = console 
     222keys = console,logfile 
    94223 
    95224[formatters] 
    96 keys = generic 
     225keys = generic, console 
    97226 
    98227[logger_root] 
    99 level = INFO 
    100 handlers = console 
     228level = DEBUG 
     229handlers = console, logfile 
    101230 
    102231[logger_ndg] 
    103232level = DEBUG 
     233handlers = logfile 
     234qualname = ndg 
     235 
     236[logger_authkit] 
     237level = ERROR 
    104238handlers = 
    105 qualname = ndg 
     239qualname = authkit 
    106240 
    107241[handler_console] 
     
    109243args = (sys.stderr,) 
    110244level = NOTSET 
    111 formatter = generic 
     245formatter = console 
     246 
     247[handler_logfile] 
     248class = handlers.RotatingFileHandler 
     249level=NOTSET 
     250formatter=generic 
     251args=(os.path.join('%(here)s', 'log', 'server.log'), 'a', 100000, 10) 
    112252 
    113253[formatter_generic] 
    114 format = %(asctime)s.%(msecs)03d %(levelname)-7.7s [%(name)s:%(lineno)s] %(message)s 
    115 datefmt = %Y-%m-%d-%H:%M:%S 
    116  
     254format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s:%(lineno)s] %(message)s 
     255datefmt = %Y/%m/%d %H:%M:%S 
     256 
     257# Skip date / time for this output as system logs picks up stderr and timestamps 
     258# it anyway 
     259[formatter_console] 
     260format = %(levelname)-5.5s [%(name)s:%(lineno)s] %(message)s 
  • TI12-security/trunk/NDGSecurity/python/ndg_security_test/ndg/security/test/unit/paster_templates/test_paster_templates.py

    r7790 r7794  
    7979    """ 
    8080    HERE_DIR = path.dirname(path.abspath(__file__)) 
    81     TMPL_CONFIG_FILEPATH = path.join(HERE_DIR, 'template.cfg') 
    8281    AUTHORISATION_SERVICE_TMPL_NAME = 'ndgsecurity_authorisation_service' 
    8382    AUTHORISATION_SERVICE_CONF_DIR = 'authorisation-service' 
Note: See TracChangeset for help on using the changeset viewer.