From b2b891d52d718841480fbbd66ec5a2bae8f556c5 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Mon, 3 Jan 2011 11:11:52 -0500 Subject: [PATCH] Do away with the https->http rewrite hack for display at UCSC since the browser supports https now. --- lib/galaxy/datatypes/interval.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/galaxy/datatypes/interval.py b/lib/galaxy/datatypes/interval.py index 778de245fff..853cda5f08b 100644 --- a/lib/galaxy/datatypes/interval.py +++ b/lib/galaxy/datatypes/interval.py @@ -284,12 +284,6 @@ class Interval( Tabular ): for site_name, site_url in valid_sites: internal_url = url_for( controller='/dataset', dataset_id=dataset.id, action='display_at', filename='ucsc_' + site_name ) - # HACK: UCSC doesn't support https, so force http even if our URL - # scheme is https. Making this work requires additional - # hackery in your upstream proxy. If UCSC ever supports - # https, remove this hack. - if base_url.startswith( 'https://' ): - base_url = base_url.replace( 'https', 'http', 1 ) display_url = urllib.quote_plus( "%s%s/display_as?id=%i&display_app=%s&authz_method=display_at" % (base_url, url_for( controller='root' ), dataset.id, type) ) redirect_url = urllib.quote_plus( "%sdb=%s&position=%s:%s-%s&hgt.customText=%%s" @@ -606,8 +600,6 @@ class _RemoteCallMixin: """ internal_url = "%s" % url_for( controller='dataset', dataset_id=dataset.id, action='display_at', filename='%s_%s' % ( type, site_name ) ) base_url = app.config.get( "display_at_callback", base_url ) - if base_url.startswith( 'https://' ): - base_url = base_url.replace( 'https', 'http', 1 ) display_url = urllib.quote_plus( "%s%s/display_as?id=%i&display_app=%s&authz_method=display_at" % \ ( base_url, url_for( controller='root' ), dataset.id, type ) ) link = '%s?redirect_url=%s&display_url=%s' % ( internal_url, redirect_url, display_url ) @@ -1246,8 +1238,6 @@ class CustomTrack ( Tabular ): for site_name, site_url in util.get_ucsc_by_build(dataset.dbkey): if site_name in app.config.ucsc_display_sites: internal_url = "%s" % url_for( controller='dataset', dataset_id=dataset.id, action='display_at', filename='ucsc_' + site_name ) - if base_url.startswith( 'https://' ): - base_url = base_url.replace( 'https', 'http', 1 ) display_url = urllib.quote_plus( "%s%s/display_as?id=%i&display_app=%s&authz_method=display_at" % (base_url, url_for( controller='root' ), dataset.id, type) ) redirect_url = urllib.quote_plus( "%sdb=%s&position=%s:%s-%s&hgt.customText=%%s" % (site_url, dataset.dbkey, chrom, start, stop ) ) link = '%s?redirect_url=%s&display_url=%s' % ( internal_url, redirect_url, display_url )