2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/5be1bf4605c3/
changeset: 5be1bf4605c3
user: takadonet
date: 2012-06-26 21:16:25
summary: Check for 'run_as' argument in dictionary 'payload' instead
of kwargs
affected #: 1 file
diff -r 40ff9b0e1549c1b083a3822b25b8337808ad8995 -r
5be1bf4605c34a96f19c1a49352ad6769e7fb020 lib/galaxy/web/framework/__init__.py
--- a/lib/galaxy/web/framework/__init__.py
+++ b/lib/galaxy/web/framework/__init__.py
@@ -134,15 +134,15 @@
return error
trans.response.set_content_type( "application/json" )
# Perform api_run_as processing, possibly changing identity
- if 'run_as' in kwargs:
+ if 'payload' in kwargs and 'run_as' in
kwargs['payload']:
if not trans.user_can_do_run_as():
error_message = 'User does not have permissions to run jobs as
another user'
return error
try:
- decoded_user_id = trans.security.decode_id( kwargs['run_as'] )
+ decoded_user_id = trans.security.decode_id(
kwargs['payload']['run_as'] )
except TypeError:
trans.response.status = 400
- return "Malformed user id ( %s ) specified, unable to decode."
% str( kwargs['run_as'] )
+ return "Malformed user id ( %s ) specified, unable to decode."
% str( kwargs['payload']['run_as'] )
try:
user = trans.sa_session.query( trans.app.model.User ).get(
decoded_user_id )
trans.api_inherit_admin = trans.user_is_admin()
https://bitbucket.org/galaxy/galaxy-central/changeset/e3a62476b0cd/
changeset: e3a62476b0cd
user: natefoo
date: 2012-07-27 08:14:52
summary: Merged in takadonet/galaxy-central (pull request #50)
affected #: 1 file
diff -r 594b69416e8ce8bac101cedc662240d46ac90031 -r
e3a62476b0cd6eacdff24311860507311fb03808 lib/galaxy/web/framework/__init__.py
--- a/lib/galaxy/web/framework/__init__.py
+++ b/lib/galaxy/web/framework/__init__.py
@@ -134,15 +134,15 @@
return error
trans.response.set_content_type( "application/json" )
# Perform api_run_as processing, possibly changing identity
- if 'run_as' in kwargs:
+ if 'payload' in kwargs and 'run_as' in
kwargs['payload']:
if not trans.user_can_do_run_as():
error_message = 'User does not have permissions to run jobs as
another user'
return error
try:
- decoded_user_id = trans.security.decode_id( kwargs['run_as'] )
+ decoded_user_id = trans.security.decode_id(
kwargs['payload']['run_as'] )
except TypeError:
trans.response.status = 400
- return "Malformed user id ( %s ) specified, unable to decode."
% str( kwargs['run_as'] )
+ return "Malformed user id ( %s ) specified, unable to decode."
% str( kwargs['payload']['run_as'] )
try:
user = trans.sa_session.query( trans.app.model.User ).get(
decoded_user_id )
trans.api_inherit_admin = trans.user_is_admin()
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.