commit/galaxy-central: 22 new changesets
22 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/6b0bd93038a8/ Changeset: 6b0bd93038a8 Branch: stable User: natefoo Date: 2014-07-30 16:40:05 Summary: Fix a critical security vulnerability with handling pickled data. Thanks to Inge Alexander Raknes for reporting the isssue. Affected #: 2 files diff -r 6f9d36b726b01606433808fc781df710f755c71b -r 6b0bd93038a843b1585155f0d63f0eea2459c70b lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -400,10 +400,10 @@ return default def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) def get_ucsc_by_build(build): sites = [] diff -r 6f9d36b726b01606433808fc781df710f755c71b -r 6b0bd93038a843b1585155f0d63f0eea2459c70b lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): https://bitbucket.org/galaxy/galaxy-central/commits/1cec38142daf/ Changeset: 1cec38142daf Branch: stable User: natefoo Date: 2014-07-30 16:40:27 Summary: Added tag latest_2013.01.13 for changeset 6b0bd93038a8 Affected #: 1 file diff -r 6b0bd93038a843b1585155f0d63f0eea2459c70b -r 1cec38142dafab0174ed42f92d75f3f2606692d1 .hgtags --- /dev/null +++ b/.hgtags @@ -0,0 +1,1 @@ +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 https://bitbucket.org/galaxy/galaxy-central/commits/3e62060b14b9/ Changeset: 3e62060b14b9 Branch: stable User: natefoo Date: 2014-07-30 16:44:41 Summary: Apply 2014.07.30 security fix to release_2013.02.08 Affected #: 3 files diff -r c78e28a5f748e16b0a168d36ba55e5625f322548 -r 3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 .hgtags --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ a4113cc1cb5eaa68091c9a73375f00555b66dd11 release_2013.01.13 1c717491139269651bb59687563da9410b84c65d release_2013.02.08 +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 diff -r c78e28a5f748e16b0a168d36ba55e5625f322548 -r 3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -400,10 +400,10 @@ return default def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) def get_ucsc_by_build(build): sites = [] diff -r c78e28a5f748e16b0a168d36ba55e5625f322548 -r 3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): https://bitbucket.org/galaxy/galaxy-central/commits/58aa61c6c59f/ Changeset: 58aa61c6c59f Branch: stable User: natefoo Date: 2014-07-30 16:44:55 Summary: Added tag latest_2013.02.08 for changeset 3e62060b14b9 Affected #: 1 file diff -r 3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 -r 58aa61c6c59fe116e75426c80a74a5bad824d8fb .hgtags --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ a4113cc1cb5eaa68091c9a73375f00555b66dd11 release_2013.01.13 1c717491139269651bb59687563da9410b84c65d release_2013.02.08 6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 +3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 https://bitbucket.org/galaxy/galaxy-central/commits/425009b3ff4d/ Changeset: 425009b3ff4d Branch: stable User: natefoo Date: 2014-07-30 16:53:01 Summary: Apply 2014.07.30 security fix to release_2013.04.01 Affected #: 3 files diff -r 03ebba1d1de6f14ccb00e08795ef2f1896135bae -r 425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 .hgtags --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,5 @@ 1c717491139269651bb59687563da9410b84c65d release_2013.02.08 75f09617abaadbc8cc732bb8ee519decaeb56ea7 release_2013.04.01 2cc8d10988e03257dc7b97f8bb332c7df745d1dd security_2013.04.08 +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 +3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 diff -r 03ebba1d1de6f14ccb00e08795ef2f1896135bae -r 425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -426,10 +426,10 @@ return default def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) def get_ucsc_by_build(build): sites = [] diff -r 03ebba1d1de6f14ccb00e08795ef2f1896135bae -r 425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): https://bitbucket.org/galaxy/galaxy-central/commits/21454fd8bba7/ Changeset: 21454fd8bba7 Branch: stable User: natefoo Date: 2014-07-30 16:53:14 Summary: Added tag latest_2013.04.01 for changeset 425009b3ff4d Affected #: 1 file diff -r 425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 -r 21454fd8bba7b69942b450c761d179bdd50bb36e .hgtags --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ 2cc8d10988e03257dc7b97f8bb332c7df745d1dd security_2013.04.08 6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 +425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 https://bitbucket.org/galaxy/galaxy-central/commits/9713d86392ef/ Changeset: 9713d86392ef Branch: stable User: natefoo Date: 2014-07-30 16:55:57 Summary: Apply 2014.07.30 security fix to release_2013.06.03 Affected #: 3 files diff -r cd6fec2f5cba878de9943dd00abe816a65dc96db -r 9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 .hgtags --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,6 @@ 75f09617abaadbc8cc732bb8ee519decaeb56ea7 release_2013.04.01 2cc8d10988e03257dc7b97f8bb332c7df745d1dd security_2013.04.08 524f246ca85395082719ae7a6ff72260d7ad5612 release_2013.06.03 +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 +3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 +425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 diff -r cd6fec2f5cba878de9943dd00abe816a65dc96db -r 9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -489,10 +489,10 @@ return default def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) def get_ucsc_by_build(build): sites = [] diff -r cd6fec2f5cba878de9943dd00abe816a65dc96db -r 9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): https://bitbucket.org/galaxy/galaxy-central/commits/5593110e78c2/ Changeset: 5593110e78c2 Branch: stable User: natefoo Date: 2014-07-30 16:56:05 Summary: Added tag latest_2013.06.03 for changeset 9713d86392ef Affected #: 1 file diff -r 9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 -r 5593110e78c2f1cc7330737b9cddc1bbb102ce86 .hgtags --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ 6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 +9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 https://bitbucket.org/galaxy/galaxy-central/commits/9ed84cd208e0/ Changeset: 9ed84cd208e0 Branch: stable User: natefoo Date: 2014-07-30 16:57:52 Summary: Apply 2014.07.30 security fix to release_2013.08.12 Affected #: 3 files diff -r e094c73fed4dc66b589932edb83412cb8b827cd3 -r 9ed84cd208e07e8985ec917cb025fcbbb09edcfb .hgtags --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,7 @@ 2cc8d10988e03257dc7b97f8bb332c7df745d1dd security_2013.04.08 524f246ca85395082719ae7a6ff72260d7ad5612 release_2013.06.03 1ae95b3aa98d1ccf15b243ac3ce6a895eb7efc53 release_2013.08.12 +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 +3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 +425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 +9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 diff -r e094c73fed4dc66b589932edb83412cb8b827cd3 -r 9ed84cd208e07e8985ec917cb025fcbbb09edcfb lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -540,10 +540,10 @@ return default def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) def get_ucsc_by_build(build): sites = [] diff -r e094c73fed4dc66b589932edb83412cb8b827cd3 -r 9ed84cd208e07e8985ec917cb025fcbbb09edcfb lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): https://bitbucket.org/galaxy/galaxy-central/commits/3fa70507c3bf/ Changeset: 3fa70507c3bf Branch: stable User: natefoo Date: 2014-07-30 16:57:58 Summary: Added tag latest_2013.08.12 for changeset 9ed84cd208e0 Affected #: 1 file diff -r 9ed84cd208e07e8985ec917cb025fcbbb09edcfb -r 3fa70507c3bf43195d691b309fa2617ae6d08ea0 .hgtags --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ 3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 +9ed84cd208e07e8985ec917cb025fcbbb09edcfb latest_2013.08.12 https://bitbucket.org/galaxy/galaxy-central/commits/81fbe25bd02e/ Changeset: 81fbe25bd02e Branch: stable User: natefoo Date: 2014-07-30 17:02:23 Summary: Apply 2014.07.30 security fix to release_2013.11.04 Affected #: 3 files diff -r 6c5913a4b701813e823638125fff8bf9fda7354b -r 81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 .hgtags --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,8 @@ 524f246ca85395082719ae7a6ff72260d7ad5612 release_2013.06.03 1ae95b3aa98d1ccf15b243ac3ce6a895eb7efc53 release_2013.08.12 26f58e05aa1068761660681583821e21e6cbf7ab release_2013.11.04 +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 +3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 +425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 +9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 +9ed84cd208e07e8985ec917cb025fcbbb09edcfb latest_2013.08.12 diff -r 6c5913a4b701813e823638125fff8bf9fda7354b -r 81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -575,10 +575,10 @@ def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) def get_ucsc_by_build(build): sites = [] diff -r 6c5913a4b701813e823638125fff8bf9fda7354b -r 81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): https://bitbucket.org/galaxy/galaxy-central/commits/22027bfbb8f5/ Changeset: 22027bfbb8f5 Branch: stable User: natefoo Date: 2014-07-30 17:02:24 Summary: Added tag latest_2013.11.04 for changeset 81fbe25bd02e Affected #: 1 file diff -r 81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 -r 22027bfbb8f57a536e240208808d0e9ddc468a6a .hgtags --- a/.hgtags +++ b/.hgtags @@ -10,3 +10,4 @@ 425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 9ed84cd208e07e8985ec917cb025fcbbb09edcfb latest_2013.08.12 +81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 latest_2013.11.04 https://bitbucket.org/galaxy/galaxy-central/commits/2a756ca2cb18/ Changeset: 2a756ca2cb18 Branch: stable User: natefoo Date: 2014-07-30 17:04:40 Summary: Apply 2014.07.30 security fix to release_2014.02.10 Affected #: 3 files diff -r 9e53251b0b7e93b9563008a2b112f2e815a04bbc -r 2a756ca2cb1826db7796018e77d12e2dd7b67603 .hgtags --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,9 @@ 1ae95b3aa98d1ccf15b243ac3ce6a895eb7efc53 release_2013.08.12 26f58e05aa1068761660681583821e21e6cbf7ab release_2013.11.04 5e605ed6069fe4c5ca9875e95e91b2713499e8ca release_2014.02.10 +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 +3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 +425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 +9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 +9ed84cd208e07e8985ec917cb025fcbbb09edcfb latest_2013.08.12 +81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 latest_2013.11.04 diff -r 9e53251b0b7e93b9563008a2b112f2e815a04bbc -r 2a756ca2cb1826db7796018e77d12e2dd7b67603 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -686,10 +686,10 @@ def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) def get_ucsc_by_build(build): sites = [] diff -r 9e53251b0b7e93b9563008a2b112f2e815a04bbc -r 2a756ca2cb1826db7796018e77d12e2dd7b67603 lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): https://bitbucket.org/galaxy/galaxy-central/commits/50753c5eac3f/ Changeset: 50753c5eac3f Branch: stable User: natefoo Date: 2014-07-30 17:04:48 Summary: Added tag latest_2014.02.10 for changeset 2a756ca2cb18 Affected #: 1 file diff -r 2a756ca2cb1826db7796018e77d12e2dd7b67603 -r 50753c5eac3fa637e442ae1d08ffd7c2e157a63b .hgtags --- a/.hgtags +++ b/.hgtags @@ -12,3 +12,4 @@ 9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 9ed84cd208e07e8985ec917cb025fcbbb09edcfb latest_2013.08.12 81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 latest_2013.11.04 +2a756ca2cb1826db7796018e77d12e2dd7b67603 latest_2014.02.10 https://bitbucket.org/galaxy/galaxy-central/commits/9661b9d5d5b3/ Changeset: 9661b9d5d5b3 Branch: stable User: natefoo Date: 2014-07-30 17:07:29 Summary: Apply 2014.07.30 security fix to release_2014.04.14 Affected #: 3 files diff -r ca297d98ab45f650b817acc613050530247c429c -r 9661b9d5d5b330483ae3ad2236410e0efaa7c500 .hgtags --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,10 @@ 5e605ed6069fe4c5ca9875e95e91b2713499e8ca release_2014.02.10 9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14 68a8b0397947c732b28207d465d3f3c4e2a7a8a0 latest_2014.04.14 +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 +3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 +425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 +9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 +9ed84cd208e07e8985ec917cb025fcbbb09edcfb latest_2013.08.12 +81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 latest_2013.11.04 +2a756ca2cb1826db7796018e77d12e2dd7b67603 latest_2014.02.10 diff -r ca297d98ab45f650b817acc613050530247c429c -r 9661b9d5d5b330483ae3ad2236410e0efaa7c500 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -688,10 +688,10 @@ def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) def compare_urls( url1, url2, compare_scheme=True, compare_hostname=True, compare_path=True ): url1 = urlparse( url1 ) diff -r ca297d98ab45f650b817acc613050530247c429c -r 9661b9d5d5b330483ae3ad2236410e0efaa7c500 lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): https://bitbucket.org/galaxy/galaxy-central/commits/96e2b84fd947/ Changeset: 96e2b84fd947 Branch: stable User: natefoo Date: 2014-07-30 17:10:33 Summary: Updated tag latest_2014.04.14 for changeset 9661b9d5d5b3 Affected #: 1 file diff -r 9661b9d5d5b330483ae3ad2236410e0efaa7c500 -r 96e2b84fd947912fa742cf366ff89ad3387c4c3e .hgtags --- a/.hgtags +++ b/.hgtags @@ -7,7 +7,7 @@ 26f58e05aa1068761660681583821e21e6cbf7ab release_2013.11.04 5e605ed6069fe4c5ca9875e95e91b2713499e8ca release_2014.02.10 9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14 -68a8b0397947c732b28207d465d3f3c4e2a7a8a0 latest_2014.04.14 +9661b9d5d5b330483ae3ad2236410e0efaa7c500 latest_2014.04.14 6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 https://bitbucket.org/galaxy/galaxy-central/commits/8c30e91bc9ae/ Changeset: 8c30e91bc9ae Branch: stable User: natefoo Date: 2014-07-30 17:12:05 Summary: Apply 2014.07.30 security fix to release_2014.06.02 Affected #: 3 files diff -r d3b1f484c4b6bbb3daa50fa167eef97a384890b3 -r 8c30e91bc9ae19ee4dc7ec2c22fa825979497108 .hgtags --- a/.hgtags +++ b/.hgtags @@ -7,6 +7,13 @@ 26f58e05aa1068761660681583821e21e6cbf7ab release_2013.11.04 5e605ed6069fe4c5ca9875e95e91b2713499e8ca release_2014.02.10 9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14 -68a8b0397947c732b28207d465d3f3c4e2a7a8a0 latest_2014.04.14 7e257c7b10badb65772b1528cb61d58175a42e47 release_2014.06.02 8a863a311a6c9f14b302799bffcf94df9186fef7 latest_2014.06.02 +9661b9d5d5b330483ae3ad2236410e0efaa7c500 latest_2014.04.14 +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 +3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 +425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 +9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 +9ed84cd208e07e8985ec917cb025fcbbb09edcfb latest_2013.08.12 +81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 latest_2013.11.04 +2a756ca2cb1826db7796018e77d12e2dd7b67603 latest_2014.02.10 diff -r d3b1f484c4b6bbb3daa50fa167eef97a384890b3 -r 8c30e91bc9ae19ee4dc7ec2c22fa825979497108 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -688,10 +688,10 @@ def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) def compare_urls( url1, url2, compare_scheme=True, compare_hostname=True, compare_path=True ): url1 = urlparse( url1 ) diff -r d3b1f484c4b6bbb3daa50fa167eef97a384890b3 -r 8c30e91bc9ae19ee4dc7ec2c22fa825979497108 lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): https://bitbucket.org/galaxy/galaxy-central/commits/7a4d321c0e38/ Changeset: 7a4d321c0e38 Branch: stable User: natefoo Date: 2014-07-30 17:13:20 Summary: Updated tag latest_2014.06.02 for changeset 8c30e91bc9ae Affected #: 1 file diff -r 8c30e91bc9ae19ee4dc7ec2c22fa825979497108 -r 7a4d321c0e38fa263ea83d29a35a608c3181fcba .hgtags --- a/.hgtags +++ b/.hgtags @@ -8,7 +8,7 @@ 5e605ed6069fe4c5ca9875e95e91b2713499e8ca release_2014.02.10 9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14 7e257c7b10badb65772b1528cb61d58175a42e47 release_2014.06.02 -8a863a311a6c9f14b302799bffcf94df9186fef7 latest_2014.06.02 +8c30e91bc9ae19ee4dc7ec2c22fa825979497108 latest_2014.06.02 9661b9d5d5b330483ae3ad2236410e0efaa7c500 latest_2014.04.14 6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 https://bitbucket.org/galaxy/galaxy-central/commits/adf7bdac8b35/ Changeset: adf7bdac8b35 Branch: next-stable User: natefoo Date: 2014-07-30 17:25:13 Summary: Apply 2014.07.30 security fix to next-stable Affected #: 3 files diff -r 9860d1c6998d38f633a11aae45bd3f667e236cc0 -r adf7bdac8b3502c9f24b899190cdab4f16d2b1fa .hgtags --- a/.hgtags +++ b/.hgtags @@ -7,6 +7,13 @@ 26f58e05aa1068761660681583821e21e6cbf7ab release_2013.11.04 5e605ed6069fe4c5ca9875e95e91b2713499e8ca release_2014.02.10 9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14 -68a8b0397947c732b28207d465d3f3c4e2a7a8a0 latest_2014.04.14 7e257c7b10badb65772b1528cb61d58175a42e47 release_2014.06.02 -8a863a311a6c9f14b302799bffcf94df9186fef7 latest_2014.06.02 +8c30e91bc9ae19ee4dc7ec2c22fa825979497108 latest_2014.06.02 +9661b9d5d5b330483ae3ad2236410e0efaa7c500 latest_2014.04.14 +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 +3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 +425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 +9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 +9ed84cd208e07e8985ec917cb025fcbbb09edcfb latest_2013.08.12 +81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 latest_2013.11.04 +2a756ca2cb1826db7796018e77d12e2dd7b67603 latest_2014.02.10 diff -r 9860d1c6998d38f633a11aae45bd3f667e236cc0 -r adf7bdac8b3502c9f24b899190cdab4f16d2b1fa lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -714,11 +714,11 @@ def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) class ParamsWithSpecs( collections.defaultdict ): diff -r 9860d1c6998d38f633a11aae45bd3f667e236cc0 -r adf7bdac8b3502c9f24b899190cdab4f16d2b1fa lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): https://bitbucket.org/galaxy/galaxy-central/commits/459ec6b67b35/ Changeset: 459ec6b67b35 User: natefoo Date: 2014-07-30 17:25:34 Summary: Apply 2014.07.30 security fix to default Affected #: 3 files diff -r 157adaf92f9c5f06a2ae50a1e7103d0b29543a07 -r 459ec6b67b3593113ee202b7b9418ee7087c1447 .hgtags --- a/.hgtags +++ b/.hgtags @@ -7,6 +7,13 @@ 26f58e05aa1068761660681583821e21e6cbf7ab release_2013.11.04 5e605ed6069fe4c5ca9875e95e91b2713499e8ca release_2014.02.10 9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14 -68a8b0397947c732b28207d465d3f3c4e2a7a8a0 latest_2014.04.14 7e257c7b10badb65772b1528cb61d58175a42e47 release_2014.06.02 -8a863a311a6c9f14b302799bffcf94df9186fef7 latest_2014.06.02 +8c30e91bc9ae19ee4dc7ec2c22fa825979497108 latest_2014.06.02 +9661b9d5d5b330483ae3ad2236410e0efaa7c500 latest_2014.04.14 +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 +3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 +425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 +9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 +9ed84cd208e07e8985ec917cb025fcbbb09edcfb latest_2013.08.12 +81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 latest_2013.11.04 +2a756ca2cb1826db7796018e77d12e2dd7b67603 latest_2014.02.10 diff -r 157adaf92f9c5f06a2ae50a1e7103d0b29543a07 -r 459ec6b67b3593113ee202b7b9418ee7087c1447 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -714,11 +714,11 @@ def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) class ParamsWithSpecs( collections.defaultdict ): diff -r 157adaf92f9c5f06a2ae50a1e7103d0b29543a07 -r 459ec6b67b3593113ee202b7b9418ee7087c1447 lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): https://bitbucket.org/galaxy/galaxy-central/commits/2559a58e62f2/ Changeset: 2559a58e62f2 Branch: next-stable User: natefoo Date: 2014-07-31 20:27:54 Summary: Merge next-stable Affected #: 3 files diff -r 6db9ce7e0415b85ebb833f783458ba6d6e69c242 -r 2559a58e62f292ae537974f8a3fc86ea32ccf8ad .hgtags --- a/.hgtags +++ b/.hgtags @@ -7,6 +7,13 @@ 26f58e05aa1068761660681583821e21e6cbf7ab release_2013.11.04 5e605ed6069fe4c5ca9875e95e91b2713499e8ca release_2014.02.10 9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14 -68a8b0397947c732b28207d465d3f3c4e2a7a8a0 latest_2014.04.14 7e257c7b10badb65772b1528cb61d58175a42e47 release_2014.06.02 -8a863a311a6c9f14b302799bffcf94df9186fef7 latest_2014.06.02 +8c30e91bc9ae19ee4dc7ec2c22fa825979497108 latest_2014.06.02 +9661b9d5d5b330483ae3ad2236410e0efaa7c500 latest_2014.04.14 +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 +3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 +425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 +9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 +9ed84cd208e07e8985ec917cb025fcbbb09edcfb latest_2013.08.12 +81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 latest_2013.11.04 +2a756ca2cb1826db7796018e77d12e2dd7b67603 latest_2014.02.10 diff -r 6db9ce7e0415b85ebb833f783458ba6d6e69c242 -r 2559a58e62f292ae537974f8a3fc86ea32ccf8ad lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -714,11 +714,11 @@ def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) class ParamsWithSpecs( collections.defaultdict ): diff -r 6db9ce7e0415b85ebb833f783458ba6d6e69c242 -r 2559a58e62f292ae537974f8a3fc86ea32ccf8ad lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): https://bitbucket.org/galaxy/galaxy-central/commits/4aba2116bc2d/ Changeset: 4aba2116bc2d User: natefoo Date: 2014-07-31 20:28:18 Summary: Merge default Affected #: 3 files diff -r 5c58466a1bacfe265f8dd92b1533f7b9aa9687b9 -r 4aba2116bc2de405166d46f034c81eb522cfe4e7 .hgtags --- a/.hgtags +++ b/.hgtags @@ -7,6 +7,13 @@ 26f58e05aa1068761660681583821e21e6cbf7ab release_2013.11.04 5e605ed6069fe4c5ca9875e95e91b2713499e8ca release_2014.02.10 9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14 -68a8b0397947c732b28207d465d3f3c4e2a7a8a0 latest_2014.04.14 7e257c7b10badb65772b1528cb61d58175a42e47 release_2014.06.02 -8a863a311a6c9f14b302799bffcf94df9186fef7 latest_2014.06.02 +8c30e91bc9ae19ee4dc7ec2c22fa825979497108 latest_2014.06.02 +9661b9d5d5b330483ae3ad2236410e0efaa7c500 latest_2014.04.14 +6b0bd93038a843b1585155f0d63f0eea2459c70b latest_2013.01.13 +3e62060b14b9afc46f8e0ec02e1a4500d77db9e1 latest_2013.02.08 +425009b3ff4d8b67d2812253b221f3c4f4a8d1e3 latest_2013.04.01 +9713d86392ef985ffcdc39ff0c8ddf51a1f9ce47 latest_2013.06.03 +9ed84cd208e07e8985ec917cb025fcbbb09edcfb latest_2013.08.12 +81fbe25bd02edcd53065e8e4476dd1dfb5a72cf2 latest_2013.11.04 +2a756ca2cb1826db7796018e77d12e2dd7b67603 latest_2014.02.10 diff -r 5c58466a1bacfe265f8dd92b1533f7b9aa9687b9 -r 4aba2116bc2de405166d46f034c81eb522cfe4e7 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -714,11 +714,11 @@ def object_to_string( obj ): - return binascii.hexlify( pickle.dumps( obj, 2 ) ) + return binascii.hexlify( obj ) def string_to_object( s ): - return pickle.loads( binascii.unhexlify( s ) ) + return binascii.unhexlify( s ) class ParamsWithSpecs( collections.defaultdict ): diff -r 5c58466a1bacfe265f8dd92b1533f7b9aa9687b9 -r 4aba2116bc2de405166d46f034c81eb522cfe4e7 lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py --- a/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py +++ b/lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py @@ -5,6 +5,7 @@ from galaxy.web.base.controller import * import sys +import json from galaxy import web, util import re, urllib, logging @@ -33,7 +34,7 @@ try: store = params.get("__GALAXY__", None) if store: - store = util.string_to_object(store) + store = json.loads(util.string_to_object(store)) else: store = {} UCSC_URL = 'UCSC_URL' @@ -86,7 +87,7 @@ # Serialize store into a form element store_text = "<INPUT TYPE=\"HIDDEN\" NAME=\"__GALAXY__\" ID=\"__GALAXY__\" VALUE=\"" \ - + util.object_to_string(store) + "\" \>" + + json.dumps(util.object_to_string(store)) + "\" \>" # Remove text regions that should not be exposed for key,value in altered_regions.items(): 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.
participants (1)
-
commits-noreply@bitbucket.org