From 34bf538e8ec3329233a8f051433c1741a4f79c9a Mon Sep 17 00:00:00 2001 From: Takayuki SHIMIZUKAWA Date: Thu, 14 Nov 2013 14:11:45 +0900 Subject: [PATCH 1/2] fix: alert mail display invalid url (subpath in the SENTRY_URL_PREFIX was dropped) for example:: >>> settings.SENTRY_URL_PREFIX='http://example.com/sentry' >>> url='/team/project/1/' #generated by django.core.urlresolvers.reverse >>> urljoin(settings.SENTRY_URL_PREFIX, url) 'http://example.com/team/project/1/' --- src/sentry/utils/http.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/utils/http.py b/src/sentry/utils/http.py index 6dbe8f248a24ac..065fa047fea058 100644 --- a/src/sentry/utils/http.py +++ b/src/sentry/utils/http.py @@ -14,7 +14,7 @@ def absolute_uri(url=None): if not url: return settings.SENTRY_URL_PREFIX - return urljoin(settings.SENTRY_URL_PREFIX, url) + return urljoin(settings.SENTRY_URL_PREFIX, url.lstrip('/')) def safe_urlencode(params, doseq=0): From ac50590319a77eeecae38198afb20b45347ae9d6 Mon Sep 17 00:00:00 2001 From: Takayuki SHIMIZUKAWA Date: Thu, 14 Nov 2013 14:46:59 +0900 Subject: [PATCH 2/2] need ends with '/' for the urljoin's first argument. --- src/sentry/utils/http.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/utils/http.py b/src/sentry/utils/http.py index 065fa047fea058..d0efaf786b7d48 100644 --- a/src/sentry/utils/http.py +++ b/src/sentry/utils/http.py @@ -14,7 +14,7 @@ def absolute_uri(url=None): if not url: return settings.SENTRY_URL_PREFIX - return urljoin(settings.SENTRY_URL_PREFIX, url.lstrip('/')) + return urljoin(settings.SENTRY_URL_PREFIX.rstrip('/') + '/', url.lstrip('/')) def safe_urlencode(params, doseq=0):