5 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/2dc56086d6dc/
Changeset: 2dc56086d6dc
User: dorine
Date: 2013-09-17 19:19:32
Summary: modified registration message
Affected #: 1 file
diff -r 48fad71361b3075c85c7d365dd52c106cabad73a -r 2dc56086d6dcf32fe76c39ee31bca3a8afbdc129 templates/user/register.mako
--- a/templates/user/register.mako
+++ b/templates/user/register.mako
@@ -107,6 +107,9 @@
<input type="submit" name="create_user_button" value="Submit"/></div></form>
+ <div style="color: red; margin: 30px 0 10px 12px;">
+ WARNING: Only one account per user is allowed. Creating multiple accounts will be detected and may result in termination of all related accounts. Please note that any violation of the <a style="color: red;" href="/static/terms.html" target="_blank">Terms and Conditions for use of this service</a> is cause for permanent suspension and data deletion.
+ </div></div></%def>
https://bitbucket.org/galaxy/galaxy-central/commits/2d70646b76d1/
Changeset: 2d70646b76d1
User: dorine
Date: 2013-09-17 20:41:09
Summary: modified registration message
Affected #: 2 files
diff -r 2dc56086d6dcf32fe76c39ee31bca3a8afbdc129 -r 2d70646b76d15e80c7918d79b00e66732f19e870 templates/user/register.mako
--- a/templates/user/register.mako
+++ b/templates/user/register.mako
@@ -107,8 +107,8 @@
<input type="submit" name="create_user_button" value="Submit"/></div></form>
- <div style="color: red; margin: 30px 0 10px 12px;">
- WARNING: Only one account per user is allowed. Creating multiple accounts will be detected and may result in termination of all related accounts. Please note that any violation of the <a style="color: red;" href="/static/terms.html" target="_blank">Terms and Conditions for use of this service</a> is cause for permanent suspension and data deletion.
+ <div class="alert alert-danger" style="margin: 30px 12px 12px 12px;">
+ WARNING: Only one account per user is allowed. Creating multiple accounts will be detected and may result in termination of all related accounts. Please note that any violation of the <a href="${trans.app.config.get('terms_url', None)}">Terms and Conditions for use of this service</a> is cause for permanent suspension and data deletion.
</div></div>
diff -r 2dc56086d6dcf32fe76c39ee31bca3a8afbdc129 -r 2d70646b76d15e80c7918d79b00e66732f19e870 universe_wsgi.ini.sample
--- a/universe_wsgi.ini.sample
+++ b/universe_wsgi.ini.sample
@@ -26,12 +26,13 @@
use = egg:Paste#http
# The port on which to listen.
-#port = 8080
+port = 8080
# The address on which to listen. By default, only listen to localhost (Galaxy
# will not be accessible over the network). Use '0.0.0.0' to listen on all
# available network interfaces.
#host = 127.0.0.1
+host = 0.0.0.0
# Use a threadpool for the web server instead of creating a thread for each
# request.
https://bitbucket.org/galaxy/galaxy-central/commits/7960d6872156/
Changeset: 7960d6872156
User: dorine
Date: 2013-09-17 20:56:13
Summary: modified registration message
Affected #: 1 file
diff -r 2d70646b76d15e80c7918d79b00e66732f19e870 -r 7960d6872156bdea26de50c6701646847194cd80 universe_wsgi.ini.sample
--- a/universe_wsgi.ini.sample
+++ b/universe_wsgi.ini.sample
@@ -26,13 +26,12 @@
use = egg:Paste#http
# The port on which to listen.
-port = 8080
+#port = 8080
# The address on which to listen. By default, only listen to localhost (Galaxy
# will not be accessible over the network). Use '0.0.0.0' to listen on all
# available network interfaces.
#host = 127.0.0.1
-host = 0.0.0.0
# Use a threadpool for the web server instead of creating a thread for each
# request.
https://bitbucket.org/galaxy/galaxy-central/commits/7fe444e0b76e/
Changeset: 7fe444e0b76e
User: dorine
Date: 2013-09-17 23:26:00
Summary: rephrased with 'please register only one account...'
Affected #: 1 file
diff -r 7960d6872156bdea26de50c6701646847194cd80 -r 7fe444e0b76ed05fe5e4855c910519699c3b6863 templates/user/register.mako
--- a/templates/user/register.mako
+++ b/templates/user/register.mako
@@ -108,7 +108,7 @@
</div></form><div class="alert alert-danger" style="margin: 30px 12px 12px 12px;">
- WARNING: Only one account per user is allowed. Creating multiple accounts will be detected and may result in termination of all related accounts. Please note that any violation of the <a href="${trans.app.config.get('terms_url', None)}">Terms and Conditions for use of this service</a> is cause for permanent suspension and data deletion.
+ Please register only one account - we provide this service free of charge and have limited computational resources. Multi-accounts are tracked and will be subjected to account termination and data deletion.
</div></div>
https://bitbucket.org/galaxy/galaxy-central/commits/0c1ecb1f4190/
Changeset: 0c1ecb1f4190
User: martenson
Date: 2013-09-23 20:58:23
Summary: Merged in dorine/galaxy-central_registrationmessage (pull request #221)
modified registration message
Affected #: 2 files
diff -r 315b484fe81b99954c093b248859a16cd65b4164 -r 0c1ecb1f4190800abdb29b3a17fc2b9d8bd21eba templates/user/register.mako
--- a/templates/user/register.mako
+++ b/templates/user/register.mako
@@ -107,6 +107,9 @@
<input type="submit" name="create_user_button" value="Submit"/></div></form>
+ <div class="alert alert-danger" style="margin: 30px 12px 12px 12px;">
+ Please register only one account - we provide this service free of charge and have limited computational resources. Multi-accounts are tracked and will be subjected to account termination and data deletion.
+ </div></div></%def>
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/315b484fe81b/
Changeset: 315b484fe81b
User: carlfeberhard
Date: 2013-09-23 20:32:36
Summary: HDA API: only fetch/return filepaths when user is admin or confing.expose_dataset_path=True (expensive operation)
Affected #: 2 files
diff -r 87d9c0ca5a4f8ba1f73411ac7f9c23f59ce2cac4 -r 315b484fe81b99954c093b248859a16cd65b4164 lib/galaxy/model/__init__.py
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -1681,7 +1681,7 @@
rval += child.get_disk_usage( user )
return rval
- def to_dict( self, view='collection' ):
+ def to_dict( self, view='collection', expose_dataset_path=False ):
"""
Return attributes of this HDA that are exposed using the API.
"""
@@ -1714,6 +1714,9 @@
for name, spec in hda.metadata.spec.items():
val = hda.metadata.get( name )
if isinstance( val, MetadataFile ):
+ # only when explicitly set: fetching filepaths can be expensive
+ if not expose_dataset_path:
+ continue
val = val.file_name
# If no value for metadata, look in datatype for metadata.
elif val == None and hasattr( hda.datatype, name ):
diff -r 87d9c0ca5a4f8ba1f73411ac7f9c23f59ce2cac4 -r 315b484fe81b99954c093b248859a16cd65b4164 lib/galaxy/web/base/controller.py
--- a/lib/galaxy/web/base/controller.py
+++ b/lib/galaxy/web/base/controller.py
@@ -583,7 +583,8 @@
"""
#precondition: the user's access to this hda has already been checked
#TODO:?? postcondition: all ids are encoded (is this really what we want at this level?)
- hda_dict = hda.to_dict( view='element' )
+ expose_dataset_path = trans.user_is_admin() or trans.app.config.expose_dataset_path
+ hda_dict = hda.to_dict( view='element', expose_dataset_path=expose_dataset_path )
hda_dict[ 'api_type' ] = "file"
# Add additional attributes that depend on trans can hence must be added here rather than at the model level.
@@ -599,7 +600,7 @@
#TODO: to_dict should really go AFTER this - only summary data
return trans.security.encode_dict_ids( hda_dict )
- if trans.user_is_admin() or trans.app.config.expose_dataset_path:
+ if expose_dataset_path:
hda_dict[ 'file_name' ] = hda.file_name
hda_dict[ 'download_url' ] = url_for( 'history_contents_display',
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/8045e137464f/
Changeset: 8045e137464f
User: Dave Bouvier
Date: 2013-09-23 17:43:06
Summary: Add paramiko egg, which fabric 1.7 depends on.
Affected #: 1 file
diff -r 45abde58ef552a6838d9cbfbe2b00351bb7dd825 -r 8045e137464ff14bec24ce574649e152b168eff3 eggs.ini
--- a/eggs.ini
+++ b/eggs.ini
@@ -47,6 +47,7 @@
nose = 0.11.1
NoseHTML = 0.4.1
NoseTestDiff = 0.1
+paramiko = 1.11.1
Parsley = 1.1
Paste = 1.7.5.1
PasteDeploy = 1.5.0
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/45abde58ef55/
Changeset: 45abde58ef55
User: Dave Bouvier
Date: 2013-09-23 17:04:52
Summary: Upgrade Fabric egg to 1.7.0.
Affected #: 1 file
diff -r 216c01ce66250f453425175d97094525b90f9108 -r 45abde58ef552a6838d9cbfbe2b00351bb7dd825 eggs.ini
--- a/eggs.ini
+++ b/eggs.ini
@@ -40,7 +40,7 @@
docutils = 0.7
drmaa = 0.4b3
elementtree = 1.2.6_20050316
-Fabric = 1.4.2
+Fabric = 1.7.0
GeneTrack = 2.0.0_beta_1
lrucache = 0.2
Mako = 0.4.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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/c23fb89215ce/
Changeset: c23fb89215ce
User: carlfeberhard
Date: 2013-09-20 22:12:53
Summary: HDA API: re-add accessibility check
Affected #: 1 file
diff -r 3fc486ee887aec89a75097477ba7a4acff0ced1b -r c23fb89215ce1d36f23d4806fd04a8153fe6fbe6 lib/galaxy/web/base/controller.py
--- a/lib/galaxy/web/base/controller.py
+++ b/lib/galaxy/web/base/controller.py
@@ -587,8 +587,10 @@
hda_dict[ 'api_type' ] = "file"
# Add additional attributes that depend on trans can hence must be added here rather than at the model level.
-
- #NOTE: access is an expensive operation - removing it and adding the precondition of access is already checked
+ can_access_hda = trans.app.security_agent.can_access_dataset( trans.get_current_user_roles(), hda.dataset )
+ can_access_hda = ( trans.user_is_admin() or can_access_hda )
+ if not can_access_hda:
+ return self.get_inaccessible_hda_dict( trans, hda )
hda_dict[ 'accessible' ] = True
# ---- return here if deleted AND purged OR can't access
@@ -634,6 +636,18 @@
return trans.security.encode_dict_ids( hda_dict )
+ def get_inaccessible_hda_dict( self, trans, hda ):
+ return trans.security.encode_dict_ids({
+ 'id' : hda.id,
+ 'history_id': hda.history.id,
+ 'hid' : hda.hid,
+ 'name' : hda.name,
+ 'state' : hda.state,
+ 'deleted' : hda.deleted,
+ 'visible' : hda.visible,
+ 'accessible': False
+ })
+
def get_hda_dict_with_error( self, trans, hda, error_msg='' ):
return trans.security.encode_dict_ids({
'id' : hda.id,
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/3fc486ee887a/
Changeset: 3fc486ee887a
User: carlfeberhard
Date: 2013-09-20 20:46:26
Summary: Saved histories: fix new history creation when deleting a current, empty history
Affected #: 2 files
diff -r d4c6a250afd03a942e70f04ee7da8335dfea476b -r 3fc486ee887aec89a75097477ba7a4acff0ced1b lib/galaxy/webapps/galaxy/controllers/history.py
--- a/lib/galaxy/webapps/galaxy/controllers/history.py
+++ b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -309,7 +309,6 @@
# If deleting the current history, make a new current.
if history == trans.get_history():
deleted_current = True
- trans.get_or_create_default_history()
trans.log_event( "History (%s) marked as deleted" % history.name )
n_deleted += 1
if purge and trans.app.config.allow_user_dataset_purge:
@@ -339,6 +338,8 @@
part += " but the datasets were not removed from disk because that feature is not enabled in this Galaxy instance"
message_parts.append( "%s. " % part )
if deleted_current:
+ #note: this needs to come after commits above or will use an empty history that was deleted above
+ trans.get_or_create_default_history()
message_parts.append( "Your active history was deleted, a new empty history is now active. " )
status = INFO
return ( status, " ".join( message_parts ) )
diff -r d4c6a250afd03a942e70f04ee7da8335dfea476b -r 3fc486ee887aec89a75097477ba7a4acff0ced1b test/functional/test_get_data.py
--- a/test/functional/test_get_data.py
+++ b/test/functional/test_get_data.py
@@ -22,7 +22,7 @@
"""
# in order to remove a lot of boiler plate - and not have cascading errors
history = get_latest_history_for_user( user )
- self.delete_current_history()
+ self.delete_history( id=self.security.encode_id( history.id ) )
self.is_history_empty()
return get_latest_history_for_user( user )
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.