[Checkins] SVN: grokproject/trunk/grokproject/ Quote username and password as they go in site.zcml.

Jan-Wijbrand Kolman janwijbrand at gmail.com
Mon Nov 5 05:12:11 EST 2007


Log message for revision 81520:
  Quote username and password as they go in site.zcml.
  
  Fixes https://bugs.launchpad.net/grok/+bug/134139

Changed:
  U   grokproject/trunk/grokproject/__init__.py
  U   grokproject/trunk/grokproject/template/buildout.cfg_tmpl

-=-
Modified: grokproject/trunk/grokproject/__init__.py
===================================================================
--- grokproject/trunk/grokproject/__init__.py	2007-11-05 09:20:19 UTC (rev 81519)
+++ grokproject/trunk/grokproject/__init__.py	2007-11-05 10:12:11 UTC (rev 81520)
@@ -6,6 +6,7 @@
 import pkg_resources
 import urllib
 import urlparse
+import xml.sax.saxutils
 from paste.script import templates, command
 from paste.script.templates import var, NoDefault
 
@@ -40,6 +41,9 @@
                   "package name: %s." % vars['package']
             print "Please choose a different project name."
             sys.exit(1)
+        for var_name in ['user', 'passwd']:
+            # Esacpe values that go in site.zcml.
+            vars[var_name] = xml.sax.saxutils.quoteattr(vars[var_name])
         vars['eggs_dir'] = os.path.expanduser(vars['eggs_dir'])
         return vars
 

Modified: grokproject/trunk/grokproject/template/buildout.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/buildout.cfg_tmpl	2007-11-05 09:20:19 UTC (rev 81519)
+++ grokproject/trunk/grokproject/template/buildout.cfg_tmpl	2007-11-05 10:12:11 UTC (rev 81520)
@@ -27,9 +27,9 @@
                               title="All Users" />
               <principal id="zope.manager"
                          title="Manager"
-                         login="${user}"
+                         login=${user}
                          password_manager="Plain Text"
-                         password="${passwd}"
+                         password=${passwd}
                          />
 
               <!-- Replace the following directive if you don't want



More information about the Checkins mailing list