#/usr/bin/python
import logging
-import itertools
import os.path
import phonenumbers
import phonenumbers.geocoder
import ipfire
import ipfire.countries
+from .. import util
from .handlers import *
from . import blog
from . import boot
from . import donate
-from . import download
+from . import downloads
from . import fireinfo
from . import iuse
from . import location
-from . import mirrors
-from . import newsletter
from . import nopaste
from . import people
from . import ui_modules
+from . import users
from . import wiki
class Application(tornado.web.Application):
"format_phone_number" : self.format_phone_number,
"format_phone_number_to_e164" : self.format_phone_number_to_e164,
"format_phone_number_location" : self.format_phone_number_location,
- "grouper" : grouper,
},
# UI Modules
"BlogHistoryNavigation": blog.HistoryNavigationModule,
"BlogList" : blog.ListModule,
"BlogPost" : blog.PostModule,
- "BlogPosts" : blog.PostsModule,
# Boot
"BootMenuConfig" : boot.MenuConfigModule,
"BootMenuSeparator" : boot.MenuSeparatorModule,
# People
- "AccountsList" : people.AccountsListModule,
+ "Agent" : people.AgentModule,
"CDR" : people.CDRModule,
"Channels" : people.ChannelsModule,
"MOS" : people.MOSModule,
"Password" : people.PasswordModule,
"Registrations" : people.RegistrationsModule,
- "SIPStatus" : people.SIPStatusModule,
# Nopaste
"Code" : nopaste.CodeModule,
"FireinfoDeviceAndGroupsTable"
: fireinfo.DeviceAndGroupsTableModule,
+ # Users
+ "UsersList" : users.ListModule,
+
# Wiki
"WikiDiff" : wiki.WikiDiffModule,
"WikiNavbar" : wiki.WikiNavbarModule,
"WikiList" : wiki.WikiListModule,
# Misc
+ "ChristmasBanner" : ui_modules.ChristmasBannerModule,
+ "Markdown" : ui_modules.MarkdownModule,
"Map" : ui_modules.MapModule,
"ProgressBar" : ui_modules.ProgressBarModule,
},
(r"/logout", auth.LogoutHandler),
]
- self.add_handlers(r"(dev|www)\.ipfire\.org", [
+ self.add_handlers(r"(www\.)?([a-z]+\.dev\.)?ipfire\.org", [
# Entry site that lead the user to index
(r"/", IndexHandler),
- # Download sites
- (r"/downloads", tornado.web.RedirectHandler, { "url" : "/download" }),
- (r"/download", download.IndexHandler),
- (r"/download/([0-9a-z\-\.]+)", download.ReleaseHandler),
+ # Authentication
+ (r"/login", auth.LoginHandler),
+ (r"/logout", auth.LogoutHandler),
+ (r"/register", auth.RegisterHandler),
+
+ # Blog
+ (r"/blog", blog.IndexHandler),
+ (r"/blog/authors/(\w+)", blog.AuthorHandler),
+ (r"/blog/compose", blog.ComposeHandler),
+ (r"/blog/drafts", blog.DraftsHandler),
+ (r"/blog/feed.xml", blog.FeedHandler),
+ (r"/blog/search", blog.SearchHandler),
+ (r"/blog/tags/([0-9a-z\-\.]+)", blog.TagHandler),
+ (r"/blog/years/([0-9]{4})", blog.YearHandler),
+ (r"/blog/([0-9a-z\-\._]+)", blog.PostHandler),
+ (r"/blog/([0-9a-z\-\._]+)/delete", blog.DeleteHandler),
+ (r"/blog/([0-9a-z\-\._]+)/edit", blog.EditHandler),
+ (r"/blog/([0-9a-z\-\._]+)/publish", blog.PublishHandler),
+
+ # Downloads
+ (r"/downloads", downloads.IndexHandler),
+ (r"/downloads/mirrors", downloads.MirrorsHandler),
+ (r"/downloads/thank-you", downloads.ThankYouHandler),
+ (r"/downloads/([0-9a-z\-\.]+)", downloads.ReleaseHandler),
+
+ # Download legacy redirection
+ (r"/download", tornado.web.RedirectHandler, { "url" : "/downloads" }),
+ (r"/download/([0-9a-z\-\.]+)", tornado.web.RedirectHandler, { "url" : "/downloads/{0}" }),
# Donate
(r"/donate", donate.DonateHandler),
(r"/donate/error", donate.ErrorHandler),
(r"/donation", tornado.web.RedirectHandler, { "url" : "/donate" }),
- # Newsletter
- (r"/newsletter/subscribe", newsletter.SubscribeHandler),
+ # Password Reset
+ (r"/password\-reset", auth.PasswordResetInitiationHandler),
+ (r"/password\-reset/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.PasswordResetHandler),
+
+ # Single-Sign-On for Discourse
+ (r"/sso/discourse", auth.SSODiscourse),
+
+ # User Groups
+ (r"/users/groups", users.GroupIndexHandler),
+ (r"/users/groups/([a-z_][a-z0-9_-]{0,31})", users.GroupShowHandler),
+
+ # Users
+ (r"/users", users.IndexHandler),
+ (r"/users/([a-z_][a-z0-9_-]{0,31})", users.ShowHandler),
+ (r"/users/([a-z_][a-z0-9_-]{0,31})\.jpg", users.AvatarHandler),
# RSS feed
(r"/news.rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }),
(r"/news/(.*)", handlers.NewsHandler),
# Static Pages
- (r"/chat", StaticHandler, { "template" : "chat.html" }),
- (r"/features", StaticHandler, { "template" : "features.html" }),
+ (r"/about", StaticHandler, { "template" : "about.html" }),
(r"/legal", StaticHandler, { "template" : "legal.html" }),
- (r"/support", StaticHandler, { "template" : "support.html" }),
+ (r"/help", StaticHandler, { "template" : "help.html" }),
# Handle old pages that have moved elsewhere
+ (r"/features", tornado.web.RedirectHandler, { "url" : "/about" }),
(r"/imprint", tornado.web.RedirectHandler, { "url" : "/legal" }),
(r"/(de|en)/(.*)", LangCompatHandler),
+ (r"/support", tornado.web.RedirectHandler, { "url" : "/help"}),
# Export arbitrary error pages
(r"/error/([45][0-9]{2})", base.ErrorHandler),
- # Block page
- (r"/blocked", base.BlockedHandler),
+ # Serve any static files
+ (r"/static/(.*)", tornado.web.StaticFileHandler, { "path" : self.settings.get("static_path") }),
])
- # blog.ipfire.org
- self.add_handlers(r"blog(\.dev)?\.ipfire\.org", [
- (r"/", blog.IndexHandler),
- (r"/authors/(\w+)", blog.AuthorHandler),
- (r"/compose", blog.ComposeHandler),
- (r"/drafts", blog.DraftsHandler),
- (r"/post/([0-9a-z\-\._]+)", blog.PostHandler),
- (r"/post/([0-9a-z\-\._]+)/delete", blog.DeleteHandler),
- (r"/post/([0-9a-z\-\._]+)/edit", blog.EditHandler),
- (r"/post/([0-9a-z\-\._]+)/publish", blog.PublishHandler),
- (r"/search", blog.SearchHandler),
- (r"/tags/([0-9a-z\-\.]+)", blog.TagHandler),
- (r"/years/([0-9]+)", blog.YearHandler),
+ # blog.ipfire.org - LEGACY REDIRECTION
+ self.add_handlers(r"blog\.([a-z]+\.dev\.)?ipfire\.org", [
+ (r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog" }),
+ (r"/authors/(\w+)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog/authors/{0}" }),
+ (r"/post/([0-9a-z\-\._]+)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog/{0}" }),
+ (r"/tags/([0-9a-z\-\.]+)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog/tags/{0}" }),
# RSS Feed
- (r"/feed.xml", blog.FeedHandler),
- ] + authentication_handlers)
+ (r"/feed.xml", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog/feed.xml" }),
+ ])
# downloads.ipfire.org
- self.add_handlers(r"downloads?(\.dev)?\.ipfire\.org", [
- (r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/" }),
- (r"/release/(.*)", download.ReleaseRedirectHandler),
- (r"/(.*)", download.FileHandler),
+ self.add_handlers(r"downloads\.([a-z]+\.dev\.)?ipfire\.org", [
+ (r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/download" }),
+ (r"/release/(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/download/{0}" }),
+ (r"/(.*)", downloads.FileHandler),
])
# mirrors.ipfire.org
- self.add_handlers(r"mirrors(\.dev)?\.ipfire\.org", [
- (r"/", mirrors.IndexHandler),
- (r"/mirrors/(.*)", mirrors.MirrorHandler),
+ self.add_handlers(r"mirrors\.([a-z]+\.dev\.)?ipfire\.org", [
+ (r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/download/mirrors" }),
+ (r"/mirrors/(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/download/mirrors/{0}" }),
])
# planet.ipfire.org
- self.add_handlers(r"planet(\.dev)?\.ipfire\.org", [
+ self.add_handlers(r"planet\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/" }),
(r"/post/([A-Za-z0-9_-]+)", handlers.PlanetPostHandler),
(r"/user/([a-z0-9_-]+)", handlers.PlanetUserHandler),
])
# fireinfo.ipfire.org
- self.add_handlers(r"fireinfo(\.dev)?\.ipfire\.org", [
+ self.add_handlers(r"fireinfo\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", fireinfo.IndexHandler),
+ # Admin
+ (r"/admin", fireinfo.AdminIndexHandler),
+
# Vendors
(r"/vendors", fireinfo.VendorsHandler),
(r"/vendors/(pci|usb)/([0-9a-f]{4})", fireinfo.VendorHandler),
# Send profiles
(r"/send/([a-z0-9]+)", fireinfo.ProfileSendHandler),
- ])
+
+ # Serve any static files
+ (r"/static/(.*)", tornado.web.StaticFileHandler, { "path" : self.settings.get("static_path") }),
+ ] + authentication_handlers)
# i-use.ipfire.org
- self.add_handlers(r"i-use(\.dev)?\.ipfire\.org", [
+ self.add_handlers(r"i-use\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/" }),
(r"/profile/([a-f0-9]{40})/([0-9]+).png", iuse.ImageHandler),
])
# boot.ipfire.org
BOOT_STATIC_PATH = os.path.join(self.settings["static_path"], "netboot")
- self.add_handlers(r"boot(\.dev)?\.ipfire\.org", [
+ self.add_handlers(r"boot\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", tornado.web.RedirectHandler, { "url" : "https://wiki.ipfire.org/installation/pxe" }),
# Configurations
])
# nopaste.ipfire.org
- self.add_handlers(r"nopaste(\.dev)?\.ipfire\.org", [
+ self.add_handlers(r"nopaste\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", nopaste.CreateHandler),
(r"/raw/(.*)", nopaste.RawHandler),
(r"/view/(.*)", nopaste.ViewHandler),
+
+ # Serve any static files
+ (r"/static/(.*)", tornado.web.StaticFileHandler, { "path" : self.settings.get("static_path") }),
] + authentication_handlers)
# location.ipfire.org
- self.add_handlers(r"location(\.dev)?\.ipfire\.org", [
+ self.add_handlers(r"location\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", location.IndexHandler),
+ (r"/download", StaticHandler, { "template" : "../location/download.html" }),
+ (r"/how\-to\-use", StaticHandler, { "template" : "../location/how-to-use.html" }),
(r"/lookup/(.+)/blacklists", location.BlacklistsHandler),
(r"/lookup/(.+)", location.LookupHandler),
+
+ # Serve any static files
+ (r"/static/(.*)", tornado.web.StaticFileHandler, { "path" : self.settings.get("static_path") }),
])
# geoip.ipfire.org
- self.add_handlers(r"geoip(\.dev)?\.ipfire\.org", [
+ self.add_handlers(r"geoip\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", tornado.web.RedirectHandler, { "url" : "https://location.ipfire.org/" }),
])
# talk.ipfire.org
- self.add_handlers(r"talk(\.dev)?\.ipfire\.org", [
+ self.add_handlers(r"talk\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", tornado.web.RedirectHandler, { "url" : "https://people.ipfire.org/" }),
])
# people.ipfire.org
- self.add_handlers(r"people(\.dev)?\.ipfire\.org", [
+ self.add_handlers(r"people\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", people.IndexHandler),
- (r"/activate/(\w+)/(\w+)", auth.ActivateHandler),
+ (r"/activate/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.ActivateHandler),
(r"/conferences", people.ConferencesHandler),
(r"/register", auth.RegisterHandler),
- (r"/search", people.SearchHandler),
- (r"/users", people.UsersHandler),
- (r"/users/(\w+)", people.UserHandler),
- (r"/users/(\w+)\.jpg", people.AvatarHandler),
- (r"/users/(\w+)/calls/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})", people.CallHandler),
- (r"/users/(\w+)/calls(?:/(\d{4}-\d{2}-\d{2}))?", people.CallsHandler),
- (r"/users/(\w+)/edit", people.UserEditHandler),
- (r"/users/(\w+)/passwd", people.UserPasswdHandler),
- (r"/users/(\w+)/ssh-keys", people.SSHKeysIndexHandler),
- (r"/users/(\w+)/ssh-keys/(SHA256\:.*)/delete", people.SSHKeysDeleteHandler),
- (r"/users/(\w+)/ssh-keys/(SHA256\:.*)", people.SSHKeysDownloadHandler),
- (r"/users/(\w+)/ssh-keys/upload", people.SSHKeysUploadHandler),
- (r"/users/(\w+)/sip", people.SIPHandler),
+ (r"/users/([a-z_][a-z0-9_-]{0,31})/calls/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})", people.CallHandler),
+ (r"/users/([a-z_][a-z0-9_-]{0,31})/calls(?:/(\d{4}-\d{2}-\d{2}))?", people.CallsHandler),
+ (r"/users/([a-z_][a-z0-9_-]{0,31})/edit", people.UserEditHandler),
+ (r"/users/([a-z_][a-z0-9_-]{0,31})/passwd", people.UserPasswdHandler),
+ (r"/users/([a-z_][a-z0-9_-]{0,31})/sip", people.SIPHandler),
+
+ # Promotional Consent Stuff
+ (r"/subscribe", people.SubscribeHandler),
+ (r"/unsubscribe", people.UnsubscribeHandler),
+
+ # Serve any static files
+ (r"/static/(.*)", tornado.web.StaticFileHandler, { "path" : self.settings.get("static_path") }),
+
+ # API
+ (r"/api/check/email", auth.APICheckEmail),
+ (r"/api/check/uid", auth.APICheckUID),
] + authentication_handlers)
# wiki.ipfire.org
- self.add_handlers(r"wiki(\.dev)?\.ipfire\.org",
+ self.add_handlers(r"wiki\.([a-z]+\.dev\.)?ipfire\.org",
authentication_handlers + [
# Actions
+ (r"((?:[A-Za-z0-9\-_\/]+)?(?:.*)\.(?:\w+))/_delete", wiki.ActionDeleteHandler),
(r"([A-Za-z0-9\-_\/]+)?/_edit", wiki.ActionEditHandler),
+ (r"([A-Za-z0-9\-_\/]+)?/_render", wiki.ActionRenderHandler),
(r"([A-Za-z0-9\-_\/]+)?/_(watch|unwatch)", wiki.ActionWatchHandler),
+ (r"/actions/restore", wiki.ActionRestoreHandler),
(r"/actions/upload", wiki.ActionUploadHandler),
# Handlers
(r"/recent\-changes", wiki.RecentChangesHandler),
(r"/search", wiki.SearchHandler),
+ (r"/tree", wiki.TreeHandler),
(r"/watchlist", wiki.WatchlistHandler),
# Media
(r"([A-Za-z0-9\-_\/]+)?/_files", wiki.FilesHandler),
(r"((?!/static)(?:[A-Za-z0-9\-_\/]+)?(?:.*)\.(?:\w+))$", wiki.FileHandler),
+ # Serve any static files
+ (r"/static/(.*)", tornado.web.StaticFileHandler, { "path" : self.settings.get("static_path") }),
+
# Render pages
(r"([A-Za-z0-9\-_\/]+)?", wiki.PageHandler),
])
# ipfire.org
- self.add_handlers(r"ipfire\.org", [
+ self.add_handlers(r"(.*)ipfire\.org", [
(r".*", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org" })
])
logging.info("Successfully initialied application")
def format_country_name(self, handler, country_code):
- return ipfire.countries.get_name(country_code)
+ return self.backend.get_country_name(country_code)
def format_language_name(self, handler, language):
_ = handler.locale.translate
]
return ", ".join((e for e in s if e))
-
-
-def grouper(handler, iterator, n):
- """
- Returns groups of n from the iterator
- """
- i = iter(iterator)
-
- while True:
- ret = list(itertools.islice(i, 0, n))
- if not ret:
- break
-
- yield ret
projects / ipfire.org.git / blobdiff