From da24ac0a2b2266fac2f102700dc168e0b280e2eb Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 26 Jun 2023 10:14:24 +0000 Subject: [PATCH] web: Drop unused CacheMixin Signed-off-by: Michael Tremer --- src/web/auth.py | 11 ++++------- src/web/blog.py | 23 +++++++++++------------ src/web/donate.py | 3 +-- src/web/fireinfo.py | 3 +-- src/web/location.py | 3 +-- src/web/nopaste.py | 5 ++--- src/web/people.py | 19 +++++++++---------- src/web/users.py | 9 ++++----- src/web/wiki.py | 25 ++++++++++++------------- 9 files changed, 45 insertions(+), 56 deletions(-) diff --git a/src/web/auth.py b/src/web/auth.py index e06211fb..8de3d20a 100644 --- a/src/web/auth.py +++ b/src/web/auth.py @@ -6,10 +6,7 @@ import urllib.parse from . import base -class CacheMixin(object): - pass - -class AuthenticationMixin(CacheMixin): +class AuthenticationMixin(object): def login(self, account): # User has logged in, create a session session_id, session_expires = self.backend.accounts.create_session( @@ -76,7 +73,7 @@ class LogoutHandler(AuthenticationMixin, base.BaseHandler): self.redirect("/") -class RegisterHandler(CacheMixin, base.BaseHandler): +class RegisterHandler(base.BaseHandler): def get(self): # Redirect logged in users away if self.current_user: @@ -139,7 +136,7 @@ class ActivateHandler(AuthenticationMixin, base.BaseHandler): self.render("auth/activated.html", account=account) -class PasswordResetInitiationHandler(CacheMixin, base.BaseHandler): +class PasswordResetInitiationHandler(base.BaseHandler): def get(self): username = self.get_argument("username", None) @@ -188,7 +185,7 @@ class PasswordResetHandler(AuthenticationMixin, base.BaseHandler): self.redirect("/") -class SSODiscourse(CacheMixin, base.BaseHandler): +class SSODiscourse(base.BaseHandler): @base.ratelimit(minutes=24*60, requests=100) @tornado.web.authenticated def get(self): diff --git a/src/web/blog.py b/src/web/blog.py index 8ccab47e..b4374dc8 100644 --- a/src/web/blog.py +++ b/src/web/blog.py @@ -5,11 +5,10 @@ import dateutil import email.utils import tornado.web -from . import auth from . import base from . import ui_modules -class IndexHandler(auth.CacheMixin, base.BaseHandler): +class IndexHandler(base.BaseHandler): def get(self): posts = self.backend.blog.get_newest(limit=10) @@ -23,7 +22,7 @@ class IndexHandler(auth.CacheMixin, base.BaseHandler): self.render("blog/index.html", posts=posts, latest_post=latest_post) -class AuthorHandler(auth.CacheMixin, base.BaseHandler): +class AuthorHandler(base.BaseHandler): def get(self, uid): author = self.accounts.get_by_uid(uid) if not author: @@ -58,7 +57,7 @@ class FeedHandler(base.BaseHandler): now=datetime.datetime.now()) -class PostHandler(auth.CacheMixin, base.BaseHandler): +class PostHandler(base.BaseHandler): def get(self, slug): post = self.backend.blog.get_by_slug(slug, published=not self.current_user) if not post: @@ -71,7 +70,7 @@ class PostHandler(auth.CacheMixin, base.BaseHandler): self.render("blog/post.html", post=post) -class PublishHandler(auth.CacheMixin, base.BaseHandler): +class PublishHandler(base.BaseHandler): @tornado.web.authenticated def get(self, slug): post = self.backend.blog.get_by_slug(slug, published=False) @@ -113,7 +112,7 @@ class PublishHandler(auth.CacheMixin, base.BaseHandler): self.redirect("/post/%s" % post.slug) -class DraftsHandler(auth.CacheMixin, base.BaseHandler): +class DraftsHandler(base.BaseHandler): @tornado.web.authenticated def get(self): drafts = self.backend.blog.get_drafts(author=self.current_user) @@ -121,7 +120,7 @@ class DraftsHandler(auth.CacheMixin, base.BaseHandler): self.render("blog/drafts.html", drafts=drafts) -class SearchHandler(auth.CacheMixin, base.BaseHandler): +class SearchHandler(base.BaseHandler): @base.ratelimit(minutes=5, requests=25) def get(self): q = self.get_argument("q") @@ -133,7 +132,7 @@ class SearchHandler(auth.CacheMixin, base.BaseHandler): self.render("blog/search-results.html", q=q, posts=posts) -class TagHandler(auth.CacheMixin, base.BaseHandler): +class TagHandler(base.BaseHandler): def get(self, tag): posts = self.backend.blog.get_by_tag(tag) if not posts: @@ -145,7 +144,7 @@ class TagHandler(auth.CacheMixin, base.BaseHandler): self.render("blog/tag.html", posts=list(posts), tag=tag) -class YearHandler(auth.CacheMixin, base.BaseHandler): +class YearHandler(base.BaseHandler): def get(self, year): posts = self.backend.blog.get_by_year(year) if not posts: @@ -157,7 +156,7 @@ class YearHandler(auth.CacheMixin, base.BaseHandler): self.render("blog/year.html", posts=posts, year=year) -class ComposeHandler(auth.CacheMixin, base.BaseHandler): +class ComposeHandler(base.BaseHandler): @tornado.web.authenticated def get(self): self.render("blog/compose.html", post=None) @@ -175,7 +174,7 @@ class ComposeHandler(auth.CacheMixin, base.BaseHandler): self.redirect("/drafts") -class EditHandler(auth.CacheMixin, base.BaseHandler): +class EditHandler(base.BaseHandler): @tornado.web.authenticated def get(self, slug): post = self.backend.blog.get_by_slug(slug, published=False) @@ -215,7 +214,7 @@ class EditHandler(auth.CacheMixin, base.BaseHandler): self.redirect("/drafts") -class DeleteHandler(auth.CacheMixin, base.BaseHandler): +class DeleteHandler(base.BaseHandler): @tornado.web.authenticated def get(self, slug): post = self.backend.blog.get_by_slug(slug, published=False) diff --git a/src/web/donate.py b/src/web/donate.py index bda1ee5b..26b0ad6b 100644 --- a/src/web/donate.py +++ b/src/web/donate.py @@ -3,10 +3,9 @@ import iso3166 import tornado.web -from . import auth from . import base -class DonateHandler(auth.CacheMixin, base.BaseHandler): +class DonateHandler(base.BaseHandler): def get(self): country = self.current_country_code diff --git a/src/web/fireinfo.py b/src/web/fireinfo.py index 1323e785..bb4bd8d0 100644 --- a/src/web/fireinfo.py +++ b/src/web/fireinfo.py @@ -8,11 +8,10 @@ import tornado.web from .. import fireinfo -from . import auth from . import base from . import ui_modules -class BaseHandler(auth.CacheMixin, base.BaseHandler): +class BaseHandler(base.BaseHandler): @property def when(self): return self.get_argument_date("when", None) diff --git a/src/web/location.py b/src/web/location.py index 30b632c9..98cb30a7 100644 --- a/src/web/location.py +++ b/src/web/location.py @@ -4,10 +4,9 @@ import tornado.web from .. import util -from . import auth from . import base -class IndexHandler(auth.CacheMixin, base.BaseHandler): +class IndexHandler(base.BaseHandler): def get(self): self.render("location/index.html", address=self.current_address, diff --git a/src/web/nopaste.py b/src/web/nopaste.py index 759a5beb..8795e330 100644 --- a/src/web/nopaste.py +++ b/src/web/nopaste.py @@ -2,11 +2,10 @@ import tornado.web -from . import auth from . import base from . import ui_modules -class CreateHandler(auth.CacheMixin, base.BaseHandler): +class CreateHandler(base.BaseHandler): MODES = ("paste", "upload") def get(self): @@ -85,7 +84,7 @@ class RawHandler(base.BaseHandler): self.finish(content) -class ViewHandler(auth.CacheMixin, base.BaseHandler): +class ViewHandler(base.BaseHandler): def get(self, uid): entry = self.backend.nopaste.get(uid) if not entry: diff --git a/src/web/people.py b/src/web/people.py index 5cc0c8c7..3502704f 100644 --- a/src/web/people.py +++ b/src/web/people.py @@ -6,17 +6,16 @@ import tornado.web from .. import countries -from . import auth from . import base from . import ui_modules -class IndexHandler(auth.CacheMixin, base.BaseHandler): +class IndexHandler(base.BaseHandler): @tornado.web.authenticated def get(self): self.render("people/index.html") -class CallsHandler(auth.CacheMixin, base.BaseHandler): +class CallsHandler(base.BaseHandler): @tornado.web.authenticated def get(self, uid, date=None): account = self.backend.accounts.get_by_uid(uid) @@ -38,7 +37,7 @@ class CallsHandler(auth.CacheMixin, base.BaseHandler): self.render("people/calls.html", account=account, date=date) -class CallHandler(auth.CacheMixin, base.BaseHandler): +class CallHandler(base.BaseHandler): @tornado.web.authenticated def get(self, uid, uuid): account = self.backend.accounts.get_by_uid(uid) @@ -58,13 +57,13 @@ class CallHandler(auth.CacheMixin, base.BaseHandler): self.render("people/call.html", account=account, call=call) -class ConferencesHandler(auth.CacheMixin, base.BaseHandler): +class ConferencesHandler(base.BaseHandler): @tornado.web.authenticated def get(self): self.render("people/conferences.html", conferences=self.backend.talk.conferences) -class SubscribeHandler(auth.CacheMixin, base.BaseHandler): +class SubscribeHandler(base.BaseHandler): @tornado.web.authenticated def post(self): # Give consent @@ -73,7 +72,7 @@ class SubscribeHandler(auth.CacheMixin, base.BaseHandler): self.render("people/subscribed.html") -class UnsubscribeHandler(auth.CacheMixin, base.BaseHandler): +class UnsubscribeHandler(base.BaseHandler): @tornado.web.authenticated def get(self): if self.current_user.consents_to_promotional_emails: @@ -89,7 +88,7 @@ class UnsubscribeHandler(auth.CacheMixin, base.BaseHandler): self.render("people/unsubscribed.html") -class SIPHandler(auth.CacheMixin, base.BaseHandler): +class SIPHandler(base.BaseHandler): @tornado.web.authenticated def get(self, uid): account = self.backend.accounts.get_by_uid(uid) @@ -103,7 +102,7 @@ class SIPHandler(auth.CacheMixin, base.BaseHandler): self.render("people/sip.html", account=account) -class UserEditHandler(auth.CacheMixin, base.BaseHandler): +class UserEditHandler(base.BaseHandler): @tornado.web.authenticated def get(self, uid): account = self.backend.accounts.get_by_uid(uid) @@ -161,7 +160,7 @@ class UserEditHandler(auth.CacheMixin, base.BaseHandler): self.redirect("/users/%s" % account.uid) -class UserPasswdHandler(auth.CacheMixin, base.BaseHandler): +class UserPasswdHandler(base.BaseHandler): @tornado.web.authenticated def get(self, uid): account = self.backend.accounts.get_by_uid(uid) diff --git a/src/web/users.py b/src/web/users.py index 1453c6d4..af34078b 100644 --- a/src/web/users.py +++ b/src/web/users.py @@ -7,14 +7,13 @@ import logging import os.path import tornado.web -from . import auth from . import base from . import ui_modules COLOUR_LIGHT = (237,232,232) COLOUR_DARK = (49,53,60) -class IndexHandler(auth.CacheMixin, base.BaseHandler): +class IndexHandler(base.BaseHandler): @tornado.web.authenticated def get(self): results = None @@ -29,7 +28,7 @@ class IndexHandler(auth.CacheMixin, base.BaseHandler): self.render("users/index.html", q=q, results=results) -class ShowHandler(auth.CacheMixin, base.BaseHandler): +class ShowHandler(base.BaseHandler): @tornado.web.authenticated def get(self, uid): account = self.backend.accounts.get_by_uid(uid) @@ -143,7 +142,7 @@ class AvatarHandler(base.BaseHandler): return f.getvalue() -class GroupIndexHandler(auth.CacheMixin, base.BaseHandler): +class GroupIndexHandler(base.BaseHandler): @tornado.web.authenticated def get(self): # Only staff can see other groups @@ -153,7 +152,7 @@ class GroupIndexHandler(auth.CacheMixin, base.BaseHandler): self.render("users/groups/index.html") -class GroupShowHandler(auth.CacheMixin, base.BaseHandler): +class GroupShowHandler(base.BaseHandler): @tornado.web.authenticated def get(self, gid): # Only staff can see other groups diff --git a/src/web/wiki.py b/src/web/wiki.py index c2bdd43f..42876fc2 100644 --- a/src/web/wiki.py +++ b/src/web/wiki.py @@ -3,11 +3,10 @@ import difflib import tornado.web -from . import auth from . import base from . import ui_modules -class ActionEditHandler(auth.CacheMixin, base.BaseHandler): +class ActionEditHandler(base.BaseHandler): @tornado.web.authenticated def get(self, path): if path is None: @@ -65,7 +64,7 @@ class ActionEditHandler(auth.CacheMixin, base.BaseHandler): self.backend.wiki.refresh() -class ActionUploadHandler(auth.CacheMixin, base.BaseHandler): +class ActionUploadHandler(base.BaseHandler): @tornado.web.authenticated @base.ratelimit(minutes=60, requests=24) def post(self): @@ -94,7 +93,7 @@ class ActionUploadHandler(auth.CacheMixin, base.BaseHandler): self.redirect("%s/_files" % path) -class ActionDeleteHandler(auth.CacheMixin, base.BaseHandler): +class ActionDeleteHandler(base.BaseHandler): @tornado.web.authenticated def get(self, path): # Check permissions @@ -126,7 +125,7 @@ class ActionDeleteHandler(auth.CacheMixin, base.BaseHandler): self.redirect("%s/_files" % file.path) -class ActionRestoreHandler(auth.CacheMixin, base.BaseHandler): +class ActionRestoreHandler(base.BaseHandler): @tornado.web.authenticated @base.ratelimit(minutes=60, requests=24) def post(self): @@ -154,7 +153,7 @@ class ActionRestoreHandler(auth.CacheMixin, base.BaseHandler): self.redirect(page.page) -class ActionWatchHandler(auth.CacheMixin, base.BaseHandler): +class ActionWatchHandler(base.BaseHandler): @tornado.web.authenticated @base.ratelimit(minutes=60, requests=180) def get(self, path, action): @@ -179,7 +178,7 @@ class ActionWatchHandler(auth.CacheMixin, base.BaseHandler): self.redirect(page.url) -class ActionRenderHandler(auth.CacheMixin, base.BaseHandler): +class ActionRenderHandler(base.BaseHandler): def check_xsrf_cookie(self): pass # disabled @@ -197,7 +196,7 @@ class ActionRenderHandler(auth.CacheMixin, base.BaseHandler): self.finish(html) -class FilesHandler(auth.CacheMixin, base.BaseHandler): +class FilesHandler(base.BaseHandler): @tornado.web.authenticated def get(self, path): if path is None: @@ -261,7 +260,7 @@ class FileHandler(base.BaseHandler): self.finish(blob) -class PageHandler(auth.CacheMixin, base.BaseHandler): +class PageHandler(base.BaseHandler): @property def action(self): return self.get_argument("action", None) @@ -344,7 +343,7 @@ class PageHandler(auth.CacheMixin, base.BaseHandler): self.render("wiki/page.html", page=page, latest_revision=latest_revision) -class SearchHandler(auth.CacheMixin, base.BaseHandler): +class SearchHandler(base.BaseHandler): @base.ratelimit(minutes=5, requests=25) def get(self): q = self.get_argument("q") @@ -354,19 +353,19 @@ class SearchHandler(auth.CacheMixin, base.BaseHandler): self.render("wiki/search-results.html", q=q, pages=pages) -class RecentChangesHandler(auth.CacheMixin, base.BaseHandler): +class RecentChangesHandler(base.BaseHandler): def get(self): recent_changes = self.backend.wiki.get_recent_changes(self.current_user, limit=50) self.render("wiki/recent-changes.html", recent_changes=recent_changes) -class TreeHandler(auth.CacheMixin, base.BaseHandler): +class TreeHandler(base.BaseHandler): def get(self): self.render("wiki/tree.html", pages=self.backend.wiki) -class WatchlistHandler(auth.CacheMixin, base.BaseHandler): +class WatchlistHandler(base.BaseHandler): @tornado.web.authenticated def get(self): pages = self.backend.wiki.get_watchlist(self.current_user) -- 2.47.3