1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/11e14ac45c7e/
Changeset: 11e14ac45c7e
Branch: stable
User: natefoo
Date: 2015-01-21 21:00:24+00:00
Summary: Update tag latest_2015.01.13 for changeset 4039bfd5584a
Affected #: 1 file
diff -r 4039bfd5584aac053f686197a76ac176253e6f3d -r 11e14ac45c7ece4d6484f37be1123d7796cac599 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -22,4 +22,4 @@
2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
9bd6f8b5b8153db752f4e61ed62f2b6c01ae4a11 latest_2014.10.06
2e8dd2949dd3eee0f56f9a3a5ebf1b2baca24aee release_2015.01.13
-507edf82ad1d888faab25e9ba66d29f6eab538f4 latest_2015.01.13
+4039bfd5584aac053f686197a76ac176253e6f3d latest_2015.01.13
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/a09398a62b75/
Changeset: a09398a62b75
User: dannon
Date: 2015-01-21 17:14:13+00:00
Summary: Make error messages slightly more descriptive for ownership/accessibility failures.
Affected #: 1 file
diff -r d53869c279cb7cb3b7dbe8bee427130c96c98d20 -r a09398a62b752f72c076fa98ccd149dc8f3050a7 lib/galaxy/web/base/controller.py
--- a/lib/galaxy/web/base/controller.py
+++ b/lib/galaxy/web/base/controller.py
@@ -272,7 +272,7 @@
# allow current history
if history == trans.history:
return history
- raise ItemOwnershipException( "Must be logged in to manage Galaxy items", type='error' )
+ raise ItemOwnershipException( "You must be logged in to interact with this Galaxy history", type='error' )
def get_user_histories( self, trans, user=None, include_deleted=False, only_deleted=False ):
"""
@@ -591,7 +591,7 @@
# Verify ownership.
user = trans.get_user()
if not user:
- error( "Must be logged in to manage Galaxy items" )
+ error( "You must be logged in to interact with this Galaxy dataset" )
if data.history.user != user:
error( "%s is not owned by current user" % data.__class__.__name__ )
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/4039bfd5584a/
Changeset: 4039bfd5584a
Branch: stable
User: dannon
Date: 2015-01-21 16:46:38+00:00
Summary: Merged in carlfeberhard/carlfeberhard-galaxy-central-stable/stable (pull request #642)
[STABLE] Fix to allow anon users to view pages with histories
Affected #: 2 files
diff -r 8d45e099f1c5b2f36b709c01fdd38803543fc8f1 -r 4039bfd5584aac053f686197a76ac176253e6f3d lib/galaxy/web/base/controller.py
--- a/lib/galaxy/web/base/controller.py
+++ b/lib/galaxy/web/base/controller.py
@@ -255,16 +255,26 @@
"""
Get a History from the database by id, verifying ownership.
"""
- if trans.user is None and trans.history:
- if id == trans.security.encode_id( trans.history.id ):
- return trans.history
- raise ItemOwnershipException( "Must be logged in to manage Galaxy items", type='error' )
+ if not trans.user:
+ return self._anonymous_get_history( trans, id,
+ check_ownership=check_ownership, check_accessible=check_accessible, deleted=deleted )
history = self.get_object( trans, id, 'History',
check_ownership=check_ownership, check_accessible=check_accessible, deleted=deleted )
history = self.security_check( trans, history, check_ownership, check_accessible )
return history
+ def _anonymous_get_history( self, trans, id, check_ownership=True, check_accessible=False, deleted=None ):
+ history = self.get_object( trans, id, 'History',
+ check_ownership=False, check_accessible=False, deleted=deleted )
+ # access public histories
+ if history.importable:
+ return history
+ # allow current history
+ if history == trans.history:
+ return history
+ raise ItemOwnershipException( "Must be logged in to manage Galaxy items", type='error' )
+
def get_user_histories( self, trans, user=None, include_deleted=False, only_deleted=False ):
"""
Get all the histories for a given user (defaulting to `trans.user`)
diff -r 8d45e099f1c5b2f36b709c01fdd38803543fc8f1 -r 4039bfd5584aac053f686197a76ac176253e6f3d lib/galaxy/webapps/galaxy/controllers/page.py
--- a/lib/galaxy/webapps/galaxy/controllers/page.py
+++ b/lib/galaxy/webapps/galaxy/controllers/page.py
@@ -729,7 +729,8 @@
Returns html suitable for embedding in another page.
"""
#TODO: should be moved to history controller and/or called via ajax from the template
- history = self.get_history( trans, id, False, True )
+ # histories embedded in pages are set to importable when embedded, check for access here
+ history = self.get_history( trans, id, check_ownership=False, check_accessible=True )
if not history:
return None
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.
2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/7342edd34eed/
Changeset: 7342edd34eed
Branch: stable
User: carlfeberhard
Date: 2015-01-21 16:33:40+00:00
Summary: Fix to allow anon users to view pages with histories
Affected #: 2 files
diff -r 5e1b2c9da932b46776e56453d1bd2acec5c89760 -r 7342edd34eedbc83df778706197502adc8e93cd3 lib/galaxy/web/base/controller.py
--- a/lib/galaxy/web/base/controller.py
+++ b/lib/galaxy/web/base/controller.py
@@ -255,16 +255,26 @@
"""
Get a History from the database by id, verifying ownership.
"""
- if trans.user is None and trans.history:
- if id == trans.security.encode_id( trans.history.id ):
- return trans.history
- raise ItemOwnershipException( "Must be logged in to manage Galaxy items", type='error' )
+ if not trans.user:
+ return self._anonymous_get_history( trans, id,
+ check_ownership=check_ownership, check_accessible=check_accessible, deleted=deleted )
history = self.get_object( trans, id, 'History',
check_ownership=check_ownership, check_accessible=check_accessible, deleted=deleted )
history = self.security_check( trans, history, check_ownership, check_accessible )
return history
+ def _anonymous_get_history( self, trans, id, check_ownership=True, check_accessible=False, deleted=None ):
+ history = self.get_object( trans, id, 'History',
+ check_ownership=False, check_accessible=False, deleted=deleted )
+ # access public histories
+ if history.importable:
+ return history
+ # allow current history
+ if history == trans.history:
+ return history
+ raise ItemOwnershipException( "Must be logged in to manage Galaxy items", type='error' )
+
def get_user_histories( self, trans, user=None, include_deleted=False, only_deleted=False ):
"""
Get all the histories for a given user (defaulting to `trans.user`)
diff -r 5e1b2c9da932b46776e56453d1bd2acec5c89760 -r 7342edd34eedbc83df778706197502adc8e93cd3 lib/galaxy/webapps/galaxy/controllers/page.py
--- a/lib/galaxy/webapps/galaxy/controllers/page.py
+++ b/lib/galaxy/webapps/galaxy/controllers/page.py
@@ -729,7 +729,8 @@
Returns html suitable for embedding in another page.
"""
#TODO: should be moved to history controller and/or called via ajax from the template
- history = self.get_history( trans, id, False, True )
+ # histories embedded in pages are set to importable when embedded, check for access here
+ history = self.get_history( trans, id, check_ownership=False, check_accessible=True )
if not history:
return None
https://bitbucket.org/galaxy/galaxy-central/commits/4039bfd5584a/
Changeset: 4039bfd5584a
Branch: stable
User: dannon
Date: 2015-01-21 16:46:38+00:00
Summary: Merged in carlfeberhard/carlfeberhard-galaxy-central-stable/stable (pull request #642)
[STABLE] Fix to allow anon users to view pages with histories
Affected #: 2 files
diff -r 8d45e099f1c5b2f36b709c01fdd38803543fc8f1 -r 4039bfd5584aac053f686197a76ac176253e6f3d lib/galaxy/web/base/controller.py
--- a/lib/galaxy/web/base/controller.py
+++ b/lib/galaxy/web/base/controller.py
@@ -255,16 +255,26 @@
"""
Get a History from the database by id, verifying ownership.
"""
- if trans.user is None and trans.history:
- if id == trans.security.encode_id( trans.history.id ):
- return trans.history
- raise ItemOwnershipException( "Must be logged in to manage Galaxy items", type='error' )
+ if not trans.user:
+ return self._anonymous_get_history( trans, id,
+ check_ownership=check_ownership, check_accessible=check_accessible, deleted=deleted )
history = self.get_object( trans, id, 'History',
check_ownership=check_ownership, check_accessible=check_accessible, deleted=deleted )
history = self.security_check( trans, history, check_ownership, check_accessible )
return history
+ def _anonymous_get_history( self, trans, id, check_ownership=True, check_accessible=False, deleted=None ):
+ history = self.get_object( trans, id, 'History',
+ check_ownership=False, check_accessible=False, deleted=deleted )
+ # access public histories
+ if history.importable:
+ return history
+ # allow current history
+ if history == trans.history:
+ return history
+ raise ItemOwnershipException( "Must be logged in to manage Galaxy items", type='error' )
+
def get_user_histories( self, trans, user=None, include_deleted=False, only_deleted=False ):
"""
Get all the histories for a given user (defaulting to `trans.user`)
diff -r 8d45e099f1c5b2f36b709c01fdd38803543fc8f1 -r 4039bfd5584aac053f686197a76ac176253e6f3d lib/galaxy/webapps/galaxy/controllers/page.py
--- a/lib/galaxy/webapps/galaxy/controllers/page.py
+++ b/lib/galaxy/webapps/galaxy/controllers/page.py
@@ -729,7 +729,8 @@
Returns html suitable for embedding in another page.
"""
#TODO: should be moved to history controller and/or called via ajax from the template
- history = self.get_history( trans, id, False, True )
+ # histories embedded in pages are set to importable when embedded, check for access here
+ history = self.get_history( trans, id, check_ownership=False, check_accessible=True )
if not history:
return None
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/bb585bc2243d/
Changeset: bb585bc2243d
User: dannon
Date: 2015-01-21 16:08:07+00:00
Summary: Add (new) repoze.lru dependency of Routes 2.1.
Affected #: 1 file
diff -r 00b83babd1eb6bbce63c28f418d877fa76e87796 -r bb585bc2243d46c8ec1008f0c73538002cf4f58f eggs.ini
--- a/eggs.ini
+++ b/eggs.ini
@@ -60,6 +60,7 @@
python_openid = 2.2.5
python_daemon = 1.5.5
pytz = 2013.9
+repoze.lru = 0.6
requests = 2.2.1
Routes = 2.1
simplejson = 2.1.1
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.