2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2f551163787b/ Changeset: 2f551163787b User: jmchilton Date: 2014-01-22 18:06:26 Summary: Allow adjusting the reset password length in unvierse_wsgi.ini. Purposely not annotated in universe_wsgi.ini.sample - though could be persuaded to add it. Affected #: 2 files diff -r aae0e414a2fa595ee83cf576e36dc5bd25772a9f -r 2f551163787b54983b62d3ea052e7d1039844e52 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -151,6 +151,7 @@ h, m, s = [ int( v ) for v in self.job_walltime.split( ':' ) ] self.job_walltime_delta = timedelta( 0, s, 0, 0, m, h ) self.admin_users = kwargs.get( "admin_users", "" ) + self.reset_password_length = int( kwargs.get('reset_password_length', '15') ) self.mailing_join_addr = kwargs.get('mailing_join_addr',"galaxy-announce-join@bx.psu.edu") self.error_email_to = kwargs.get( 'error_email_to', None ) self.activation_email = kwargs.get( 'activation_email', None ) diff -r aae0e414a2fa595ee83cf576e36dc5bd25772a9f -r 2f551163787b54983b62d3ea052e7d1039844e52 lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -1083,7 +1083,8 @@ else: chars = string.letters + string.digits new_pass = "" - for i in range(15): + reset_password_length = getattr( trans.app.config, "reset_password_length", 15 ) + for i in range(reset_password_length): new_pass = new_pass + random.choice(chars) host = trans.request.host.split(':')[0] if host == 'localhost': https://bitbucket.org/galaxy/galaxy-central/commits/8c1cc5febdaf/ Changeset: 8c1cc5febdaf User: jmchilton Date: 2014-01-22 18:17:26 Summary: Merged in jmchilton/galaxy-central-fork-1 (pull request #307) Allow adjusting the reset password length in unvierse_wsgi.ini. Affected #: 2 files diff -r 2703795990b091a98398b19e042f88584533704d -r 8c1cc5febdaf099ed9175bcfd5b00183ecc0f1fb lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -151,6 +151,7 @@ h, m, s = [ int( v ) for v in self.job_walltime.split( ':' ) ] self.job_walltime_delta = timedelta( 0, s, 0, 0, m, h ) self.admin_users = kwargs.get( "admin_users", "" ) + self.reset_password_length = int( kwargs.get('reset_password_length', '15') ) self.mailing_join_addr = kwargs.get('mailing_join_addr',"galaxy-announce-join@bx.psu.edu") self.error_email_to = kwargs.get( 'error_email_to', None ) self.activation_email = kwargs.get( 'activation_email', None ) diff -r 2703795990b091a98398b19e042f88584533704d -r 8c1cc5febdaf099ed9175bcfd5b00183ecc0f1fb lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -1083,7 +1083,8 @@ else: chars = string.letters + string.digits new_pass = "" - for i in range(15): + reset_password_length = getattr( trans.app.config, "reset_password_length", 15 ) + for i in range(reset_password_length): new_pass = new_pass + random.choice(chars) host = trans.request.host.split(':')[0] if host == 'localhost': Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.