m724/anonsubmit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor limiter a bit

Browse source
This commit is contained in:
Minecon724 2025-04-02 16:47:29 +02:00
commit 4aff3e1634
Signed by untrusted user who does not match committer: m724
GPG key ID: A02E6E67AB961189
2 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fly.toml
View file

@ -16,7 +16,7 @@ primary_region = 'ams'
force_https = true force_https = true
auto_stop_machines = 'stop' auto_stop_machines = 'stop'
auto_start_machines = true auto_start_machines = true
min_machines_running = 0 min_machines_running = 1
processes = ['app'] processes = ['app']
[[vm]] [[vm]]

23
src/anonchat/__init__.py
View file

@ -8,6 +8,7 @@ from flask import render_template, request, jsonify
from flask_wtf.csrf import CSRFProtect from flask_wtf.csrf import CSRFProtect
from flask_session import Session from flask_session import Session
import redis import redis
from werkzeug.middleware.proxy_fix import ProxyFix
from argon2 import PasswordHasher from argon2 import PasswordHasher
# Load environment variables from .env file # Load environment variables from .env file
@ -27,7 +28,7 @@ app.config['ADMIN_USERNAME'] = os.environ.get('ADMIN_USERNAME', 'admin')
app.config['ADMIN_PASSWORD'] = os.environ.get('ADMIN_PASSWORD', None) app.config['ADMIN_PASSWORD'] = os.environ.get('ADMIN_PASSWORD', None)
app.config['ADMIN_FORCE_RESET'] = os.environ.get('ADMIN_FORCE_RESET', 'false').lower() == 'true' app.config['ADMIN_FORCE_RESET'] = os.environ.get('ADMIN_FORCE_RESET', 'false').lower() == 'true'
# Rate limit configurations # Rate limit configurations
app.config['RATELIMIT_STORAGE_URL'] = os.environ.get('RATELIMIT_STORAGE_URL', os.environ.get('REDIS_URL')) app.config['RATELIMIT_STORAGE_URI'] = os.environ.get('RATELIMIT_STORAGE_URI', os.environ.get('REDIS_URL'))
app.config['RATELIMIT_HEADERS_ENABLED'] = True app.config['RATELIMIT_HEADERS_ENABLED'] = True
app.config['RATELIMIT_KEY_PREFIX'] = 'anonchat_rate_limit' app.config['RATELIMIT_KEY_PREFIX'] = 'anonchat_rate_limit'
# Whether app is behind a proxy (get from env, default to False) # Whether app is behind a proxy (get from env, default to False)
@ -45,6 +46,9 @@ elif app.config['SESSION_TYPE'] == 'filesystem':
app.config['SESSION_FILE_MODE'] = os.environ.get('SESSION_FILE_MODE', 384) app.config['SESSION_FILE_MODE'] = os.environ.get('SESSION_FILE_MODE', 384)
app.config['SESSION_KEY_PREFIX'] = 'anonchat_session:' app.config['SESSION_KEY_PREFIX'] = 'anonchat_session:'
if app.config['BEHIND_PROXY']:
app.wsgi_app = ProxyFix(app.wsgi_app)
# Initialize password hasher # Initialize password hasher
# Parameters source: https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html#argon2id # Parameters source: https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html#argon2id
password_hasher = PasswordHasher( password_hasher = PasswordHasher(
@ -59,23 +63,10 @@ Session(app)
# Initialize CSRF protection # Initialize CSRF protection
csrf = CSRFProtect(app) csrf = CSRFProtect(app)
# Function to get client IP address, respecting X-Forwarded-For when behind a proxy
def get_client_ip():
if app.config['BEHIND_PROXY']:
# Get the first IP in X-Forwarded-For, which should be the client
forwarded_for = request.headers.get('X-Forwarded-For')
if forwarded_for:
return forwarded_for.split(',')[0].strip()
# Fall back to remote_addr if not behind proxy or X-Forwarded-For not found
return request.remote_addr
# Initialize limiter with custom key_func # Initialize limiter with custom key_func
limiter = Limiter( limiter = Limiter(get_remote_address, app=app)
get_client_ip, # Use our custom function instead of get_remote_address
app=app,
storage_uri=app.config['RATELIMIT_STORAGE_URL']
)
# Initialize database
db = SQLAlchemy(app) db = SQLAlchemy(app)
# Import models # Import models