Fix redirectors from old URLs

Older versions of tornado don't allow to use arguments

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/web/__init__.py b/src/web/__init__.py
index a41ee5d794719872fb6998d41c794e2c118c253e..75021c9f8f8231a71ba9b5c649cd0c113359314a 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -124,7 +124,7 @@ class Application(tornado.web.Application):
                        (r"/news.rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }),
 
                        # Redirect news articles to blog
-                       (r"/news/(.*)", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/posts/{1}" }),
+                       (r"/news/(.*)", handlers.NewsHandler),
 
                        # Static Pages
                        (r"/chat", StaticHandler, { "template" : "chat.html" }),
@@ -176,12 +176,12 @@ class Application(tornado.web.Application):
                # planet.ipfire.org
                self.add_handlers(r"planet(\.dev)?\.ipfire\.org", [
                        (r"/", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/" }),
-                       (r"/post/([A-Za-z0-9_-]+)", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/posts/{1}" }),
-                       (r"/user/([a-z0-9_-]+)", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/authors/{1}" }),
+                       (r"/post/([A-Za-z0-9_-]+)", handlers.PlanetPostHandler),
+                       (r"/user/([a-z0-9_-]+)", handlers.PlanetUserHandler),
 
                        # RSS
                        (r"/rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }),
-                       (r"/user/([a-z0-9_-]+)/rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/authors/{1}.rss" }),
+                       (r"/user/([a-z0-9_-]+)/rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }),
                        (r"/news.rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }),
                ])
 

diff --git a/src/web/handlers.py b/src/web/handlers.py
index ea6718b9d671ef5c9109c4de795106681462772c..4aa204c5f64c7a6bfdd99798049060fc89cdf121 100644 (file)
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -2,6 +2,7 @@
 
 import iso3166
 import tornado.gen
+import tornado.httputil
 import tornado.web
 
 from . import base
@@ -34,6 +35,21 @@ class IndexHandler(base.BaseHandler):
                        latest_release=latest_release)
 
 
+class NewsHandler(base.BaseHandler):
+       def get(self, post):
+               self.redirect("https://blog.ipfire.org/post/%s" % post, permanent=True)
+
+
+class PlanetPostHandler(base.BaseHandler):
+       def get(self, post):
+               self.redirect("https://blog.ipfire.org/post/%s" % post, permanent=True)
+
+
+class PlanetUserHandler(base.BaseHandler):
+       def get(self, user):
+               self.redirect("https://blog.ipfire.org/authors/%s" % user, permanent=True)
+
+
 class DonateHandler(base.BaseHandler):
        def get(self):
                location = self.get_remote_location()