Branch: refs/heads/release_18.05
Home: https://github.com/galaxyproject/galaxy
Commit: 55f7280d790fcaf9bc74d543f22541d86521cef0
https://github.com/galaxyproject/galaxy/commit/55f7280d790fcaf9bc74d543f225…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M lib/galaxy/security/passwords.py
A test/unit/test_security_passwords.py
Log Message:
-----------
More password encoding handling fixes.
Fix handling comparison of older hashes in Python 2 and fix the hanlding of both for Python 3.
The previous iteration gave me some errors in Python 3, I brought in and adapted @mvdbeek's Python 3 fixes to fix these:
```
======================================================================
ERROR: test_security_passwords.test_hash_and_check
----------------------------------------------------------------------
Traceback (most recent call last):
File "/Users/john/workspace/galaxy-lib/.tox/py34/lib/python3.4/site-packages/nose/case.py", line 198, in runTest
self.test(*self.arg)
File "/Users/john/workspace/galaxy-lib/tests/test_security_passwords.py", line 12, in test_hash_and_check
simple_pass_hash = passwords.hash_password(simple_pass)
File "/Users/john/workspace/galaxy-lib/galaxy/security/passwords.py", line 21, in hash_password
return hash_password_PBKDF2(password)
File "/Users/john/workspace/galaxy-lib/galaxy/security/passwords.py", line 44, in hash_password_PBKDF2
hashed = pbkdf2_bin(smart_str(password), salt, COST_FACTOR, KEY_LENGTH, getattr(hashlib, HASH_FUNCTION))
File "/Users/john/workspace/galaxy-lib/galaxy/security/passwords.py", line 78, in pbkdf2_bin
rv = u = _pseudorandom(salt + _pack_int(block))
File "/Users/john/workspace/galaxy-lib/galaxy/security/passwords.py", line 75, in _pseudorandom
return [ord(_) for _ in h.digest()]
File "/Users/john/workspace/galaxy-lib/galaxy/security/passwords.py", line 75, in <listcomp>
return [ord(_) for _ in h.digest()]
TypeError: ord() expected string of length 1, but int found
======================================================================
ERROR: test_security_passwords.test_hash_consistent
----------------------------------------------------------------------
Traceback (most recent call last):
File "/Users/john/workspace/galaxy-lib/.tox/py34/lib/python3.4/site-packages/nose/case.py", line 198, in runTest
self.test(*self.arg)
File "/Users/john/workspace/galaxy-lib/tests/test_security_passwords.py", line 38, in test_hash_consistent
assert passwords.check_password(simple_pass, simple_pass_hash)
File "/Users/john/workspace/galaxy-lib/galaxy/security/passwords.py", line 30, in check_password
if check_password_PBKDF2(guess, hashed):
File "/Users/john/workspace/galaxy-lib/galaxy/security/passwords.py", line 53, in check_password_PBKDF2
hashed_guess = pbkdf2_bin(smart_str(guess), salt, int(cost_factor), KEY_LENGTH, getattr(hashlib, hash_function))
File "/Users/john/workspace/galaxy-lib/galaxy/security/passwords.py", line 78, in pbkdf2_bin
rv = u = _pseudorandom(salt + _pack_int(block))
TypeError: Can't convert 'bytes' object to str implicitly
```
Added tests that all now pass in Python 3 - including generating some passwords in Python 3 and verifying they pass when checked in Python 2 and vice versa.
Commit: ec5924dd649ccd4936398c9df82000c1f1ce4a24
https://github.com/galaxyproject/galaxy/commit/ec5924dd649ccd4936398c9df820…
Author: Martin Cech <marten(a)bx.psu.edu>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M lib/galaxy/security/passwords.py
A test/unit/test_security_passwords.py
Log Message:
-----------
Merge pull request #6204 from jmchilton/password_fixes
[18.05] More password encoding handling fixes.
Compare: https://github.com/galaxyproject/galaxy/compare/ab656c7e2d57...ec5924dd649c
**NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 7bf55fc301cb6819b371e25030014cde830c05c9
https://github.com/galaxyproject/galaxy/commit/7bf55fc301cb6819b371e2503001…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-05-22 (Tue, 22 May 2018)
Changed paths:
M client/galaxy/style/scss/history.scss
M static/style/blue/base.css
Log Message:
-----------
Fix history list bottom border
Commit: 029975a9f8abe57b6f4ef9d9a9cc50a07f401113
https://github.com/galaxyproject/galaxy/commit/029975a9f8abe57b6f4ef9d9a9cc…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-05-22 (Tue, 22 May 2018)
Changed paths:
M client/galaxy/style/scss/history.scss
Log Message:
-----------
A more accurate version of what was set before, with the same outcome (though, it could change if we toggle the grey)
Commit: 8d1cff2bba25c70baeebf8fde0878b4e5caa8b2f
https://github.com/galaxyproject/galaxy/commit/8d1cff2bba25c70baeebf8fde087…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-05-22 (Tue, 22 May 2018)
Changed paths:
M client/galaxy/style/scss/list-item.scss
M static/style/blue/base.css
Log Message:
-----------
Fix dataset messagesmall display, was a TODO left from migration
Commit: e06639e9456ba022ce6a12e4eba15a696fb37e51
https://github.com/galaxyproject/galaxy/commit/e06639e9456ba022ce6a12e4eba1…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-05-22 (Tue, 22 May 2018)
Changed paths:
M client/galaxy/style/scss/history.scss
M static/style/blue/base.css
Log Message:
-----------
Fix one more busted fade
Commit: eadfd406d238b5ef7ad97c964a44e39d6a9d46e9
https://github.com/galaxyproject/galaxy/commit/eadfd406d238b5ef7ad97c964a44…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-05-22 (Tue, 22 May 2018)
Changed paths:
M client/galaxy/style/scss/base.scss
M static/style/blue/base.css
Log Message:
-----------
Fix (ancient, should replace this, but might as well make it work until we do) tool-shed-only grid search button
Commit: 74377074ac12fcadb771f5ea212fa1bd7a048df8
https://github.com/galaxyproject/galaxy/commit/74377074ac12fcadb771f5ea212f…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-05-22 (Tue, 22 May 2018)
Changed paths:
M client/galaxy/style/scss/base.scss
M static/style/blue/base.css
M templates/webapps/tool_shed/common/grid_common.mako
Log Message:
-----------
Drop submit-image custom styling, use standard fa; left it as inline style to keep it clean and remove all at once when this grid goes.
Commit: 162fa3a5bbd52ea75db5ec22c32a7a3d86560029
https://github.com/galaxyproject/galaxy/commit/162fa3a5bbd52ea75db5ec22c32a…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M client/galaxy/style/scss/list-item.scss
M static/style/blue/base.css
Log Message:
-----------
Fix list panel control message margins.
Commit: 51b93ebc48b96278342b06583642af14fe48ce3a
https://github.com/galaxyproject/galaxy/commit/51b93ebc48b96278342b06583642…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M client/galaxy/style/scss/upload.scss
Log Message:
-----------
This is correct now
Commit: a57600cadfe4b3f383ce69afaf3dc09c237456f8
https://github.com/galaxyproject/galaxy/commit/a57600cadfe4b3f383ce69afaf3d…
Author: Martin Cech <marten(a)bx.psu.edu>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M client/galaxy/style/scss/base.scss
M client/galaxy/style/scss/history.scss
M client/galaxy/style/scss/list-item.scss
M client/galaxy/style/scss/upload.scss
M static/style/blue/base.css
M templates/webapps/tool_shed/common/grid_common.mako
Log Message:
-----------
Merge pull request #6197 from dannon/1805stylefixes
[18.05] Minor style fixes
Compare: https://github.com/galaxyproject/galaxy/compare/2cf1c0013786...a57600cadfe4
**NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.