From c0ddd3a32cdfb5fbcb132c439589f5b50358bcf4 Mon Sep 17 00:00:00 2001 From: Sistason <c3infra@sistason.de> Date: Sun, 20 Mar 2022 14:52:04 +0100 Subject: [PATCH] Remove ProxyFix from this MR and remove autogenerated, unfitting fuzzy options from translations --- uffd/ratelimit.py | 7 +++---- uffd/translations/de/LC_MESSAGES/messages.po | 10 ---------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/uffd/ratelimit.py b/uffd/ratelimit.py index 6f6216ea..5604299d 100644 --- a/uffd/ratelimit.py +++ b/uffd/ratelimit.py @@ -2,11 +2,10 @@ import datetime import ipaddress import math -from flask import request, current_app +from flask import request from flask_babel import gettext as _ from sqlalchemy import Column, Integer, String, DateTime from sqlalchemy.ext.hybrid import hybrid_property -from werkzeug.contrib.fixers import ProxyFix from uffd.database import db from uffd.tasks import cleanup_task @@ -52,11 +51,11 @@ class Ratelimit: def get_addrkey(addr=None): if addr is None: - addr = ProxyFix(current_app).get_remote_addr([request.headers.get("X-FORWARDED-FOR")]) + addr = request.remote_addr try: addr = ipaddress.ip_address(addr) except ValueError: - return '"{}"'.format(addr) + return '"'+addr+'"' if isinstance(addr, ipaddress.IPv4Address): net = ipaddress.IPv4Network((addr, '24'), strict=False) elif isinstance(addr, ipaddress.IPv6Address): diff --git a/uffd/translations/de/LC_MESSAGES/messages.po b/uffd/translations/de/LC_MESSAGES/messages.po index d592fd08..05f53879 100644 --- a/uffd/translations/de/LC_MESSAGES/messages.po +++ b/uffd/translations/de/LC_MESSAGES/messages.po @@ -45,22 +45,18 @@ msgid "%(hours)d hours" msgstr "%(hours)d Stunden" #: uffd/invite/models.py:81 uffd/invite/models.py:104 uffd/invite/models.py:109 -#, fuzzy msgid "Invite link is invalid" msgstr "Einladungslink ist nicht valide" #: uffd/invite/models.py:83 -#, fuzzy msgid "Invite link does not grant any roles" msgstr "Einladungslink weist keine Rollen zu" #: uffd/invite/models.py:85 -#, fuzzy msgid "Invite link does not grant any new roles" msgstr "Einladungslink weist keine neuen Rollen zu" #: uffd/invite/models.py:90 uffd/signup/models.py:115 -#, fuzzy msgid "Success" msgstr "Erfolgreich" @@ -1440,32 +1436,26 @@ msgid "Forgot Password?" msgstr "Passwort vergessen?" #: uffd/signup/models.py:77 uffd/signup/models.py:102 -#, fuzzy msgid "Invalid signup request" msgstr "Ungültiger Account-Registrierungs-Link" #: uffd/signup/models.py:79 -#, fuzzy msgid "Login name is invalid" msgstr "Name ungültig" #: uffd/signup/models.py:81 -#, fuzzy msgid "Display name is invalid" msgstr "Anzeigename ist nicht valide." #: uffd/signup/models.py:83 -#, fuzzy msgid "Mail address is invalid" msgstr "E-Mail-Adresse nicht valide" #: uffd/signup/models.py:87 uffd/signup/models.py:106 -#, fuzzy msgid "A user with this login name already exists" msgstr "Ein Account mit diesem Namen existiert bereits" #: uffd/signup/models.py:88 -#, fuzzy msgid "Valid" msgstr "Gültig" -- GitLab