Changeset 7784
- Timestamp:
- 16/12/10 17:11:24 (10 years ago)
- Location:
- TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/paster_templates
- Files:
-
- 1 added
- 4 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/paster_templates/Makefile
r7781 r7784 39 39 SERVICE_CA_DEST_DIR = ${SERVICE_PKI_DEST_DIR}ca/ 40 40 SERVICE_SURPLUS_FILES = README __init__.* attributeinterface.* securedapp.* \ 41 securityservicesapp.* request-filter.xml pep_result_handler *.pyc 42 41 securityservicesapp.* request-filter.xml pep_result_handler *.pyc \ 42 openidprovider/associations/ openidprovider/beaker/ \ 43 openidprovider/README openidprovider/nonces/ openidprovider/temp/ \ 44 openidrelyparty/store/ openidrelyparty/__init__.* 45 43 46 service_tmpl: ${SERVICE_SRC_DIR} 44 47 @-echo Preparing Generic Services template ... … … 66 69 -e s/'testConfigDir = .*'// \ 67 70 -e s/testConfigDir/here/g \ 71 -e s/'# Revision:.*'//g \ 68 72 ${SERVICE_INI_FILEPATH_TMP} > ${SERVICE_INI_TMPL_FILEPATH} 69 73 rm -f ${SERVICE_INI_FILEPATH_TMP} … … 99 103 @-echo Preparing Authorisation Service template ... 100 104 @-echo 101 @-echo Copying test ini file ... 105 @-echo Copying test ini file and other configuration files ... 106 mkdir ${AUTHZ_SERVICE_DEST_DIR} 102 107 cp -r ${AUTHZ_SERVICE_SRC_DIR}* ${AUTHZ_SERVICE_DEST_DIR} 103 108 @-echo Making substitutions for template variables ... -
TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/paster_templates/services/openidrelyingparty/store
-
Property
svn:ignore
set to
associations
nonces
temp
-
Property
svn:ignore
set to
-
TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/paster_templates/services/service.ini_tmpl
r7777 r7784 16 16 # license: BSD - see LICENSE file in top-level directory 17 17 # Contact: Philip.Kershaw@stfc.ac.uk 18 # Revision: $Id: securityservices.ini 7709 2010-11-05 16:54:17Z pjkersha $ 18 19 19 20 20 # Settings global to all sections … … 55 55 56 56 # Secret for OpenID Provider cookie 57 beakerSession Secret = ${beakerSessionSecret}57 beakerSessionCookieSecret = ${beakerSessionCookieSecret} 58 58 59 59 … … 100 100 paste.filter_app_factory=beaker.middleware:SessionMiddleware 101 101 beaker.session.key = openid 102 beaker.session.secret = %(beakerSession Secret)s102 beaker.session.secret = %(beakerSessionCookieSecret)s 103 103 104 104 # If you'd like to fine-tune the individual locations of the cache data dirs … … 140 140 # Apply verification against a list of trusted CAs. To skip this step, comment 141 141 # out or remove this item. e.g. set CA verification in the Apache config file. 142 ssl.caCertFilePathList = %(here)s/ ca/d573507a.0142 ssl.caCertFilePathList = %(here)s/pki/ca/d573507a.0 143 143 144 144 # Apply whitelisting of client certificate DNs. This should never be needed in … … 219 219 authkit.openid.store.config=%(here)s/openidrelyingparty/store 220 220 authkit.openid.session.key = authkit_openid 221 authkit.openid.session.secret = random string221 authkit.openid.session.secret = ${openidRelyingPartyCookieSecret} 222 222 223 223 # Key name for dereferencing beaker.session object held in environ … … 580 580 authz.ctx_handler.pip.attributeQuery.sslCertFilePath = %(here)s/pki/localhost.crt 581 581 authz.ctx_handler.pip.attributeQuery.sslPriKeyFilePath = %(here)s/pki/localhost.key 582 authz.ctx_handler.pip.attributeQuery.sslCACertDir = %(here)s/ ca582 authz.ctx_handler.pip.attributeQuery.sslCACertDir = %(here)s/pki/ca 583 583 584 584 #______________________________________________________________________________ … … 588 588 589 589 [handlers] 590 keys = console 590 keys = console, logfile 591 591 592 592 [formatters] … … 612 612 datefmt = %Y-%m-%d %H:%M:%S 613 613 614 [handler_logfile] 615 class = handlers.RotatingFileHandler 616 level=NOTSET 617 formatter=generic 618 args=(os.path.join('%(here)s', 'log', 'service.log'), 'a', 50000, 2) -
TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/paster_templates/template.py
r7781 r7784 26 26 from ndg.saml.saml2.core import Issuer 27 27 28 import re 29 from paste.script.copydir import LaxTemplate 30 28 31 29 32 class ServicesTemplate(Template): … … 40 43 ATTRIBUTE_SERVICE_DEFAULT_ISSUER_FORMAT = Issuer.X509_SUBJECT 41 44 42 AUTHORISATION_SERVICE_DEFAULT_ISSUER_NAME = '/O=Site A/CN=Authorisation Service' 45 AUTHORISATION_SERVICE_DEFAULT_ISSUER_NAME = \ 46 '/O=Site A/CN=Authorisation Service' 43 47 AUTHORISATION_SERVICE_DEFAULT_ISSUER_FORMAT = Issuer.X509_SUBJECT 44 48 AUTHORISATION_SERVICE_DEFAULT_MOUNT_POINT = '/AuthorisationService' … … 97 101 default=base64.b64encode(os.urandom(32))[:32]) 98 102 ] 99 103 104 def __init__(self, *arg, **kw): 105 """Extend to enable custom setting for template substitution. This 106 enables the special variable in service.ini_tmpl "userIdentifier" to 107 be ignored 108 """ 109 self._laxTemplatePatternSave = LaxTemplate.pattern 110 LaxTemplate.pattern = re.compile(r""" 111 \$(?: 112 (?P<escaped>\$) | # Escape sequence of two delimiters 113 (?P<named>[_a-z][_a-z0-9]*) | # delimiter and a Python identifier 114 {(?P<braced>.*?(?!userIdentifier))} | # delimiter and a braced identifier 115 (?P<invalid>) # Other ill-formed delimiter exprs 116 ) 117 """) 118 super(ServicesTemplate, self).__init__(*arg, **kw) 119 120 def __del__(self): 121 """Restore default setting for template pattern to its original value 122 """ 123 LaxTemplate.pattern = self._laxTemplatePatternSave 124 super(ServicesTemplate, self).__del__() 125 100 126 101 127 class SecuredAppTemplate(Template):
Note: See TracChangeset
for help on using the changeset viewer.