提交: b8ff1dce5a5df630e773db1f7c89251bdbe389ab - allura (git)

allura

Commit MetaInfo

• 修訂: b8ff1dce5a5df630e773db1f7c89251bdbe389ab (tree)
• 時間: 2012-05-10 04:12:59
• 作者: Rick Copeland <rick@arbo...>
• Commiter: Rick Copeland

Log Message

[#3960] Remove /nf/redirect conversions

Signed-off-by: Rick Copeland <[e-mail]>

Change Summary

• modified: Allura/allura/controllers/static.py
• modified: Allura/allura/lib/markdown_extensions.py
• modified: Allura/allura/tests/functional/test_root.py
• modified: Allura/allura/tests/test_globals.py

差異

--- a/Allura/allura/controllers/static.py
+++ b/Allura/allura/controllers/static.py
@@ -20,25 +20,3 @@ class NewForgeController(object):
         h.set_context(project, app, neighborhood=neighborhood)
         html = g.markdown_wiki.convert(markdown)
         return html
-
-    @expose()
-    @with_trailing_slash
-    def redirect(self, path, **kw):
-        """Redirect to external sites."""
-
-        # Make sure the url can be encoded to iso-8859-1 (required for HTTP
-        # headers. If it can't, urlquote it first, then redirect. Allows us to
-        # redirect to external links in markdown, even if the url contains
-        # unquoted unicode chars.
-        try:
-            path.encode('ISO-8859-1')
-        except UnicodeEncodeError:
-            i = path.find('://')
-            if i > -1:
-                scheme = path[:i+3]
-                path = path[i+3:]
-            else:
-                scheme = ''
-            path = scheme + h.urlquote(path)
-        redirect(path)
-

--- a/Allura/allura/lib/markdown_extensions.py
+++ b/Allura/allura/lib/markdown_extensions.py
@@ -228,7 +228,6 @@ class RelativeLinkRewriter(markdown.postprocessors.Postprocessor):
             if 'sf.net' in val or 'sourceforge.net' in val:
                 return
             else:
-                tag[attr] = '/nf/redirect/?path=%s' % h.urlquote(val)
                 tag['rel']='nofollow'
                 return
         if val.startswith('/'): return

--- a/Allura/allura/tests/functional/test_root.py
+++ b/Allura/allura/tests/functional/test_root.py
@@ -92,15 +92,6 @@ class TestRootController(TestController):
         r = self.app.get('/nf/markdown_to_html?markdown=*aaa*bb[wiki:Home]&project=test&app=bugs&neighborhood=%s' % n._id, validate_chunk=True)
         assert '<p><em>aaa</em>bb<a href="/p/test/wiki/Home/">[wiki:Home]</a></p>' in r, r
 
-    def test_redirect_external(self):
-        r = self.app.get('/nf/redirect/?path=%s' % quote('http://en.wikipedia.org/wiki/Aho–Corasick_string_matching_algorithm'))
-        assert r.status_int == 302
-        assert r.location == 'http://en.wikipedia.org/wiki/Aho%E2%80%93Corasick_string_matching_algorithm'
-
-        r = self.app.get('/nf/redirect/?path=%s' % quote('http://google.com'))
-        assert r.status_int == 302
-        assert r.location == 'http://google.com'
-
     def test_slash_redirect(self):
         r = self.app.get('/p',status=301)
         r = self.app.get('/p/',status=200)

--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -123,9 +123,9 @@ def test_markdown():
     assert '<a href=' not in g.markdown.convert('# Foo!\n[Rooted]')
     assert '<a href=' in g.markdown.convert('This is http://sf.net')
     tgt = 'http://everything2.com/?node=nate+oostendorp'
-    url = '/nf/redirect/?path=%s' % quote(tgt)
     s = g.markdown.convert('This is %s' % tgt)
-    assert s == '<div class="markdown_content"><p>This is <a href="%s" rel="nofollow">%s</a></p></div>' % (url, tgt), s
+    assert_equal(
+        s, '<div class="markdown_content"><p>This is <a href="%s" rel="nofollow">%s</a></p></div>' % (tgt, tgt))
     assert '<a href=' in g.markdown.convert('This is http://sf.net')
     # assert '<a href=' in g.markdown_wiki.convert('This is a WikiPage')
     # assert '<a href=' not in g.markdown_wiki.convert('This is a WIKIPAGE')