From 01b8ff656eb7c16a032df1bafa142d17b9f6fbb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Thu, 28 Aug 2025 22:54:52 +0200 Subject: [PATCH 01/14] refactor --- .env.example | 41 ++++ app.py | 538 +++++++++++++++++++++++++---------------------- config.py | 65 ++++++ listapp.service | 20 +- requirements.txt | 10 + start_dev.sh | 1 + 6 files changed, 419 insertions(+), 256 deletions(-) create mode 100644 .env.example create mode 100644 config.py create mode 100644 requirements.txt create mode 100644 start_dev.sh diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..0593823 --- /dev/null +++ b/.env.example @@ -0,0 +1,41 @@ +# Podstawy +FLASK_DEBUG=false +SECRET_KEY=change-me + +# Limity +MAX_CONTENT_LENGTH=52428800 +RATE_LIMIT_DEFAULT="100 per minute" +RATE_LIMIT_CONVERT="100 per minute" + +# Redis – wybierz REDIS_URL lub HOST/PORT/DB +REDIS_URL=redis://localhost:6379/7 +# REDIS_HOST=localhost +# REDIS_PORT=6379 +# REDIS_DB=7 + +# Basic Auth dla /stats +STATS_BASIC_AUTH_ENABLED=true +STATS_BASIC_AUTH_REALM=Stats +STATS_BASIC_AUTH_USER=admin +STATS_BASIC_AUTH_PASS=strong-password + +# Cache (Varnish-friendly) +CACHE_ENABLED=true +CACHE_S_MAXAGE=43200 +CACHE_MAX_AGE=3600 +USE_REDIS_BODY_CACHE=false + +# Stream / aiohttp +AIOHTTP_TOTAL_TIMEOUT=70 +AIOHTTP_CONNECT_TIMEOUT=10 +AIOHTTP_SOCK_CONNECT_TIMEOUT=10 +AIOHTTP_SOCK_READ_TIMEOUT=60 +READ_CHUNK=65536 +STREAM_LINE_LIMIT=4096 + +# Serwer +BIND_HOST=127.0.0.1 +BIND_PORT=8283 + +# Domyślny URL źródłowy (opcjonalnie) +DEFAULT_SOURCE_URL="https://raw.githubusercontent.com/217heidai/adblockfilters/main/rules/adblockdns.txt" diff --git a/app.py b/app.py index 0da94bf..06975b4 100644 --- a/app.py +++ b/app.py @@ -1,203 +1,224 @@ import re import redis import requests -import aiohttp -import asyncio import socket import time import json +import base64 +import hashlib from datetime import datetime -from flask import Flask, request, render_template, abort, jsonify, g from urllib.parse import urlparse, quote, unquote, urljoin from functools import wraps +from typing import Optional + +from flask import Flask, request, render_template, abort, jsonify, stream_with_context, g, Response from flask_compress import Compress from flask_limiter import Limiter -from flask_limiter.util import get_remote_address + +import config app = Flask(__name__) -app.config['MAX_CONTENT_LENGTH'] = 50 * 1024 * 1024 # limit -redis_client = redis.Redis(host='localhost', port=6379, db=7) +app.config["MAX_CONTENT_LENGTH"] = config.MAX_CONTENT_LENGTH +app.config["SECRET_KEY"] = config.SECRET_KEY +app.debug = config.FLASK_DEBUG + +def build_redis(): + if config.REDIS_URL: + return redis.Redis.from_url(config.REDIS_URL) + return redis.Redis(host=config.REDIS_HOST, port=config.REDIS_PORT, db=config.REDIS_DB) + +redis_client = build_redis() -# Ustawienia do rate limiting – 100 żądań na minutę def get_client_ip(): - """Pobranie prawdziwego adresu IP klienta (uwzględniając proxy)""" - x_forwarded_for = request.headers.get('X-Forwarded-For', '').split(',') - if x_forwarded_for and x_forwarded_for[0].strip(): - return x_forwarded_for[0].strip() + xff = request.headers.get("X-Forwarded-For", "").split(",") + if xff and xff[0].strip(): + return xff[0].strip() return request.remote_addr -limiter = Limiter(key_func=get_client_ip, default_limits=["100 per minute"], app=app) -Compress(app) +limiter = Limiter( + key_func=get_client_ip, + app=app, + default_limits=[config.RATE_LIMIT_DEFAULT], + storage_uri=config.REDIS_URL +) -ALLOWED_IPS = {'127.0.0.1', '109.173.163.139'} -ALLOWED_DOMAIN = '' +Compress(app) @app.before_request def track_request_data(): - """Rejestracja IP klienta, User-Agent, metody HTTP oraz rozpoczęcie pomiaru czasu requestu""" - g.start_time = time.perf_counter() # rozpoczęcie pomiaru czasu - client_ip = get_client_ip() - user_agent = request.headers.get('User-Agent', 'Unknown') - method = request.method - - # Rejestracja User-Agent - redis_client.incr(f'stats:user_agents:{quote(user_agent, safe="")}') - # Rejestracja adresu IP klienta - redis_client.incr(f'stats:client_ips:{client_ip}') - # Rejestracja metody HTTP - redis_client.incr(f'stats:methods:{method}') + g.start_time = time.perf_counter() + redis_client.incr(f"stats:user_agents:{quote(request.headers.get('User-Agent', 'Unknown'), safe='')}") + redis_client.incr(f"stats:client_ips:{get_client_ip()}") + redis_client.incr(f"stats:methods:{request.method}") @app.after_request def after_request(response): - """Pomiar i rejestracja czasu przetwarzania żądania""" elapsed = time.perf_counter() - g.start_time - # Aktualizacja statystyk czasu przetwarzania (w sekundach) - redis_client.incrbyfloat('stats:processing_time_total', elapsed) - redis_client.incr('stats:processing_time_count') - - # Aktualizacja minimalnego czasu przetwarzania + redis_client.incrbyfloat("stats:processing_time_total", elapsed) + redis_client.incr("stats:processing_time_count") try: - current_min = float(redis_client.get('stats:processing_time_min') or elapsed) + current_min = float(redis_client.get("stats:processing_time_min") or elapsed) if elapsed < current_min: - redis_client.set('stats:processing_time_min', elapsed) + redis_client.set("stats:processing_time_min", elapsed) except Exception: - redis_client.set('stats:processing_time_min', elapsed) - - # Aktualizacja maksymalnego czasu przetwarzania + redis_client.set("stats:processing_time_min", elapsed) try: - current_max = float(redis_client.get('stats:processing_time_max') or elapsed) + current_max = float(redis_client.get("stats:processing_time_max") or elapsed) if elapsed > current_max: - redis_client.set('stats:processing_time_max', elapsed) + redis_client.set("stats:processing_time_max", elapsed) except Exception: - redis_client.set('stats:processing_time_max', elapsed) - + redis_client.set("stats:processing_time_max", elapsed) return response -@app.template_filter('datetimeformat') -def datetimeformat_filter(value, format='%Y-%m-%d %H:%M'): +@app.template_filter("datetimeformat") +def datetimeformat_filter(value, format="%Y-%m-%d %H:%M"): try: dt = datetime.fromisoformat(value) return dt.strftime(format) except (ValueError, AttributeError): return value -def ip_restriction(f): - @wraps(f) - def decorated(*args, **kwargs): - client_ip = get_client_ip() - host = request.host.split(':')[0] - - allowed_conditions = [ - client_ip in ALLOWED_IPS, - host == ALLOWED_DOMAIN, - request.headers.get('X-Forwarded-For', '').split(',')[0].strip() in ALLOWED_IPS - ] - - if any(allowed_conditions): - return f(*args, **kwargs) - redis_client.incr('stats:errors_403') - abort(403) - return decorated +def basic_auth_required(realm: str, user: str, password: str): + def decorator(f): + @wraps(f) + def wrapper(*args, **kwargs): + if not config.STATS_BASIC_AUTH_ENABLED: + return f(*args, **kwargs) + auth = request.headers.get("Authorization", "") + if auth.startswith("Basic "): + try: + decoded = base64.b64decode(auth[6:]).decode("utf-8", errors="ignore") + u, p = decoded.split(":", 1) + if u == user and p == password: + return f(*args, **kwargs) + except Exception: + pass + resp = Response(status=401) + resp.headers["WWW-Authenticate"] = f'Basic realm="{realm}"' + return resp + return wrapper + return decorator def cache_key(source_url, ip): return f"cache:{source_url}:{ip}" def should_ignore_domain(domain): - """Sprawdza, czy domena zaczyna się od kropki i powinna być ignorowana.""" - return domain.startswith('.') or any(char in domain for char in ['~', '=', '$', "'", "^", "_", ">", "<", ":"]) + return domain.startswith(".") or any(ch in domain for ch in ["~", "=", "$", "'", "^", "_", ">", "<", ":"]) def should_ignore_line(line): - """Sprawdza, czy linia zawiera określone znaki i powinna być ignorowana.""" - return any(symbol in line for symbol in ['<', '>', '##', '###', "div", "span"]) + return any(sym in line for sym in ["<", ">", "##", "###", "div", "span"]) def is_valid_domain(domain): - """Sprawdza, czy domena ma poprawną składnię.""" - domain_regex = re.compile(r'^(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$') - return bool(domain_regex.match(domain)) + return bool(re.compile(r"^(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$").match(domain)) -def convert_hosts(content, target_ip): - """Konwersja treści pliku hosts oraz reguł AdGuard DNS.""" - converted = [] - invalid_lines = [] +def convert_host_line(line: str, target_ip: str): + # szybkie odrzucenia + if not line: + return None + line = line.strip() - for line in content.splitlines(): - line = line.strip() + # komentarze/puste + if not line or line.startswith(("!", "#", "/", ";")): + return None - # Pomijanie pustych linii, komentarzy i linii do ignorowania - if not line or line[0] in ('!', '#', '/') or should_ignore_line(line): - continue + # wytnij komentarz końcowy (# lub ;) – ostrożnie ze 'http://' + # usuwamy wszystko od ' #' lub ' ;' (spacja przed znacznikiem komentarza) + for sep in (" #", " ;"): + idx = line.find(sep) + if idx != -1: + line = line[:idx].rstrip() - # Obsługa reguł AdGuard DNS - match = re.match(r'^\|\|([^\^]+)\^.*', line) - if match: - domain = match.group(1) - if should_ignore_domain(domain): - continue - if not is_valid_domain(domain): - invalid_lines.append(line) - continue - converted.append(f"{target_ip} {domain}") - continue + if not line: + return None - # Obsługa klasycznego formatu hosts - parts = line.split() - if len(parts) > 1: - domain_part = parts[1] - if should_ignore_domain(domain_part): - continue - if not is_valid_domain(domain_part): - invalid_lines.append(line) - continue - converted.append(re.sub(r'^\S+', target_ip, line, count=1)) - - if invalid_lines: - print("Niepoprawne linie:") - for invalid in invalid_lines: - print(invalid) - - return '\n'.join(converted) + # 1) AdGuard / uBlock DNS: ||domain^ (opcjonalnie z dodatkami po '^') + m = re.match(r"^\|\|([a-z0-9.-]+)\^", line, re.IGNORECASE) + if m: + domain = m.group(1).strip(".") + if not should_ignore_domain(domain) and is_valid_domain(domain): + return f"{target_ip} {domain}" + return None + parts = line.split() + + # 2) Klasyczny hosts: "IP domena [...]" (IPv4 lub IPv6) + if len(parts) >= 2 and ( + re.match(r"^\d{1,3}(?:\.\d{1,3}){3}$", parts[0]) or ":" in parts[0] + ): + domain = parts[1].strip().split("#", 1)[0].strip().strip(".") + if not should_ignore_domain(domain) and is_valid_domain(domain): + return f"{target_ip} {domain}" + return None + + # 3) dnsmasq: address=/domain/0.0.0.0 czy server=/domain/... + m = re.match(r"^(?:address|server)=/([a-z0-9.-]+)/", line, re.IGNORECASE) + if m: + domain = m.group(1).strip(".") + if not should_ignore_domain(domain) and is_valid_domain(domain): + return f"{target_ip} {domain}" + return None + + # 4) Domain-only: "example.com" lub "example.com # komentarz" + token = parts[0].split("#", 1)[0].strip().strip(".") + if token and not should_ignore_domain(token) and is_valid_domain(token): + return f"{target_ip} {token}" + + return None + + +def build_etag(up_etag: Optional[str], up_lastmod: Optional[str], target_ip: str) -> str: + base = (up_etag or up_lastmod or "no-upstream") + f"::{target_ip}::v1" + return 'W/"' + hashlib.sha1(base.encode("utf-8")).hexdigest() + '"' + +def cache_headers(etag: str, up_lm: Optional[str]): + headers = { + "ETag": etag, + "Vary": "Accept-Encoding", + "Content-Type": "text/plain; charset=utf-8", + "X-Content-Type-Options": "nosniff", + "Content-Disposition": "inline; filename=converted_hosts.txt", + } + if config.CACHE_ENABLED: + headers["Cache-Control"] = f"public, s-maxage={config.CACHE_S_MAXAGE}, max-age={config.CACHE_MAX_AGE}" + else: + headers["Cache-Control"] = "no-store" + if up_lm: + headers["Last-Modified"] = up_lm + return headers def validate_and_normalize_url(url): - """Walidacja i normalizacja adresu URL""" parsed = urlparse(url) if not parsed.scheme: - url = f'https://{url}' + url = f"https://{url}" parsed = urlparse(url) if not parsed.netloc: raise ValueError("Missing host in URL") return parsed.geturl() def track_url_request(url): - """Rejestracja żądania dla określonego URL""" - redis_key = f"stats:url_requests:{quote(url, safe='')}" - redis_client.incr(redis_key) + redis_client.incr(f"stats:url_requests:{quote(url, safe='')}") def add_recent_link(url, target_ip): - """Dodanie ostatniego linku do historii (ostatnie 10)""" - timestamp = datetime.now().isoformat() - link_data = f"{timestamp}|{url}|{target_ip}" - + ts = datetime.now().isoformat() + link_data = f"{ts}|{url}|{target_ip}" with redis_client.pipeline() as pipe: pipe.lpush("recent_links", link_data) pipe.ltrim("recent_links", 0, 9) pipe.execute() - redis_client.incr('stats:recent_links_added') + redis_client.incr("stats:recent_links_added") def get_recent_links(): - """Pobranie ostatnich 10 linków""" links = redis_client.lrange("recent_links", 0, 9) - parsed_links = [] + out = [] for link in links: parts = link.decode().split("|") if len(parts) >= 3: - parsed_links.append((parts[0], parts[1], parts[2])) + out.append((parts[0], parts[1], parts[2])) elif len(parts) == 2: - parsed_links.append((parts[0], parts[1], "127.0.0.1")) - return parsed_links + out.append((parts[0], parts[1], "127.0.0.1")) + return out def get_hostname(ip): - """Cache’owanie wyników reverse DNS dla danego IP""" key = f"reverse_dns:{ip}" cached = redis_client.get(key) if cached: @@ -206,202 +227,215 @@ def get_hostname(ip): hostname = socket.gethostbyaddr(ip)[0] except Exception: hostname = ip - # Cache na 1 godzinę redis_client.setex(key, 3600, hostname) return hostname -# Nowa funkcja do logowania requestów dla endpointu /convert def add_recent_convert(): - """Dodaje dane żądania do listy ostatnich konwersji (/convert)""" ip = get_client_ip() hostname = get_hostname(ip) - user_agent = request.headers.get('User-Agent', 'Unknown') + ua = request.headers.get("User-Agent", "Unknown") time_str = datetime.now().astimezone().isoformat() - url = request.full_path # pełna ścieżka wraz z query string - data = { - "url": url, - "ip": ip, - "hostname": hostname, - "time": time_str, - "user_agent": user_agent - } - json_data = json.dumps(data) - redis_client.lpush("recent_converts", json_data) + url = request.full_path + data = {"url": url, "ip": ip, "hostname": hostname, "time": time_str, "user_agent": ua} + redis_client.lpush("recent_converts", json.dumps(data)) redis_client.ltrim("recent_converts", 0, 49) -@app.route('/', methods=['GET']) +@app.route("/favicon.ico", methods=["GET"]) +def favicon(): + return Response(status=204) + +@app.route("/", methods=["GET"]) def index(): - """Strona główna z formularzem""" generated_link = None recent_links = get_recent_links() - url_param = request.args.get('url') - target_ip = request.args.get('ip', '127.0.0.1') - - client_ip = get_client_ip() - user_agent = request.headers.get('User-Agent', 'Unknown') + url_param = request.args.get("url", config.DEFAULT_SOURCE_URL) + target_ip = request.args.get("ip", "127.0.0.1") if url_param: try: - normalized_url = validate_and_normalize_url(unquote(url_param)) - encoded_url = quote(normalized_url, safe='') - generated_link = urljoin( - request.host_url, - f"convert?url={encoded_url}&ip={target_ip}" - ) - add_recent_link(normalized_url, target_ip) + normalized = validate_and_normalize_url(unquote(url_param)) + encoded = quote(normalized, safe="") + generated_link = urljoin(request.host_url, f"convert?url={encoded}&ip={target_ip}") + add_recent_link(normalized, target_ip) recent_links = get_recent_links() except Exception as e: app.logger.error(f"Error processing URL: {str(e)}") - return render_template('form.html', - generated_link=generated_link, - recent_links=recent_links, - client_ip=client_ip, - user_agent=user_agent) -@app.route('/convert') -@limiter.limit("100 per minute") -async def convert(): - """Asynchroniczny endpoint do konwersji z weryfikacją typu zawartości""" try: - redis_client.incr('stats:convert_requests') - # Logowanie danych dla requestu do /convert + return render_template( + "form.html", + generated_link=generated_link, + recent_links=recent_links, + client_ip=get_client_ip(), + user_agent=request.headers.get("User-Agent", "Unknown"), + ) + except Exception: + return jsonify( + { + "generated_link": generated_link, + "recent_links": recent_links, + "client_ip": get_client_ip(), + "user_agent": request.headers.get("User-Agent", "Unknown"), + } + ) + +@app.route("/convert") +@limiter.limit(config.RATE_LIMIT_CONVERT) +def convert(): + try: + redis_client.incr("stats:convert_requests") add_recent_convert() - encoded_url = request.args.get('url') + encoded_url = request.args.get("url") if not encoded_url: - redis_client.incr('stats:errors_400') + redis_client.incr("stats:errors_400") abort(400, description="Missing URL parameter") decoded_url = unquote(encoded_url) normalized_url = validate_and_normalize_url(decoded_url) - target_ip = request.args.get('ip', '127.0.0.1') + target_ip = request.args.get("ip", "127.0.0.1") - # Rejestracja statystyk dotyczących URL track_url_request(normalized_url) - redis_client.incr(f'stats:target_ips:{target_ip}') + redis_client.incr(f"stats:target_ips:{target_ip}") - # Sprawdzenie pamięci podręcznej - cached = redis_client.get(cache_key(normalized_url, target_ip)) - if cached: - redis_client.incr('stats:cache_hits') - return cached.decode('utf-8'), 200, {'Content-Type': 'text/plain'} + req_headers = {} + inm = request.headers.get("If-None-Match") + ims = request.headers.get("If-Modified-Since") + if inm: + req_headers["If-None-Match"] = inm + if ims: + req_headers["If-Modified-Since"] = ims - redis_client.incr('stats:cache_misses') + with requests.get(normalized_url, headers=req_headers, stream=True, timeout=(10, 60)) as r: + ct = r.headers.get("Content-Type", "") + # pozwól na text/* oraz octet-stream (często używane przez listy) + if "text" not in ct and "octet-stream" not in ct and ct != "": + abort(415, description="Unsupported Media Type") - # Asynchroniczne pobranie zasobu za pomocą aiohttp - async with aiohttp.ClientSession() as session: - async with session.get(normalized_url, timeout=60) as response: - # Sprawdzanie typu zawartości – musi zawierać "text" - content_type = response.headers.get("Content-Type", "") - if "text" not in content_type: - abort(415, description="Unsupported Media Type") - content = b"" - while True: - try: - chunk = await response.content.read(4096) - except asyncio.TimeoutError: - abort(504, description="Timeout reading remote data") - if not chunk: - break - content += chunk - if len(content) > app.config['MAX_CONTENT_LENGTH']: - redis_client.incr('stats:errors_413') - abort(413) + if r.status_code == 304: + etag = build_etag(r.headers.get("ETag"), r.headers.get("Last-Modified"), target_ip) + resp = Response(status=304) + resp.headers.update(cache_headers(etag, r.headers.get("Last-Modified"))) + resp.direct_passthrough = True + return resp - # Rejestracja rozmiaru pobranej treści - content_size = len(content) - redis_client.incrby('stats:content_size_total', content_size) - redis_client.incr('stats:content_size_count') + up_etag = r.headers.get("ETag") + up_lm = r.headers.get("Last-Modified") + etag = build_etag(up_etag, up_lm, target_ip) - converted = convert_hosts(content.decode('utf-8'), target_ip) - redis_client.setex(cache_key(normalized_url, target_ip), 43200, converted) # 12h cache - redis_client.incr('stats:conversions_success') - return converted, 200, {'Content-Type': 'text/plain'} + @stream_with_context + def body_gen(): + total = 0 + # iter_lines pewnie tnie po \n/\r\n i dekoduje do str + for line in r.iter_lines(decode_unicode=True, chunk_size=config.READ_CHUNK): + if line is None: + continue + # zabezpieczenie przed megadługimi wierszami + if len(line) > config.STREAM_LINE_LIMIT: + continue + out = convert_host_line(line, target_ip) + if out: + s = out + "\n" + total += len(s) + yield s + # statystyki po zakończeniu streamu + redis_client.incrby("stats:content_size_total", total) + redis_client.incr("stats:content_size_count") - except aiohttp.ClientError as e: + resp = Response(body_gen(), mimetype="text/plain; charset=utf-8") + resp.headers.update(cache_headers(etag, up_lm)) + # wyłącz kompresję/buforowanie dla strumienia + resp.direct_passthrough = True + redis_client.incr("stats:conversions_success") + return resp + + except requests.exceptions.RequestException as e: app.logger.error(f"Request error: {str(e)}") - redis_client.incr('stats:errors_500') + redis_client.incr("stats:errors_500") abort(500) except ValueError as e: app.logger.error(f"URL validation error: {str(e)}") - redis_client.incr('stats:errors_400') + redis_client.incr("stats:errors_400") abort(400) +@app.route("/convert", methods=["HEAD"]) +def convert_head(): + encoded_url = request.args.get("url", config.DEFAULT_SOURCE_URL) + if not encoded_url: + abort(400) + decoded_url = unquote(encoded_url) + validate_and_normalize_url(decoded_url) + target_ip = request.args.get("ip", "127.0.0.1") + etag = build_etag(None, None, target_ip) + resp = Response(status=200) + resp.headers.update(cache_headers(etag, None)) + resp.direct_passthrough = True + return resp -@app.route('/stats') -@ip_restriction +@app.route("/stats") +@basic_auth_required( + realm=config.STATS_BASIC_AUTH_REALM, + user=config.STATS_BASIC_AUTH_USER, + password=config.STATS_BASIC_AUTH_PASS, +) def stats(): - """Endpoint statystyk""" - stats_data = {} - target_ips = {} - url_requests = {} - user_agents = {} - client_ips = {} + stats_data, target_ips, url_requests, user_agents, client_ips = {}, {}, {}, {}, {} - # Agregacja statystyk z Redisa for key in redis_client.scan_iter("stats:*"): key_str = key.decode() value = redis_client.get(key).decode() - - if key_str.startswith('stats:target_ips:'): - ip = key_str.split(':', 2)[2] + if key_str.startswith("stats:target_ips:"): + ip = key_str.split(":", 2)[2] target_ips[ip] = value - elif key_str.startswith('stats:url_requests:'): - url = unquote(key_str.split(':', 2)[2]) + elif key_str.startswith("stats:url_requests:"): + url = unquote(key_str.split(":", 2)[2]) url_requests[url] = value - elif key_str.startswith('stats:user_agents:'): - ua = unquote(key_str.split(':', 2)[2]) + elif key_str.startswith("stats:user_agents:"): + ua = unquote(key_str.split(":", 2)[2]) user_agents[ua] = value - elif key_str.startswith('stats:client_ips:'): - ip = key_str.split(':', 2)[2] + elif key_str.startswith("stats:client_ips:"): + ip = key_str.split(":", 2)[2] client_ips[ip] = value else: stats_data[key_str] = value - # Pobranie ostatnich 50 requestów dla endpointu /convert recent_converts = [] - convert_entries = redis_client.lrange("recent_converts", 0, 49) - for entry in convert_entries: + for entry in redis_client.lrange("recent_converts", 0, 49): try: - data = json.loads(entry.decode()) - recent_converts.append(data) + recent_converts.append(json.loads(entry.decode())) except Exception: pass - # Obliczenie średniego czasu przetwarzania żądań - processing_time_total = float(redis_client.get('stats:processing_time_total') or 0) - processing_time_count = int(redis_client.get('stats:processing_time_count') or 0) + processing_time_total = float(redis_client.get("stats:processing_time_total") or 0) + processing_time_count = int(redis_client.get("stats:processing_time_count") or 0) avg_processing_time = processing_time_total / processing_time_count if processing_time_count > 0 else 0 - # Obliczenie średniego rozmiaru pobranej treści dla /convert - content_size_total = int(redis_client.get('stats:content_size_total') or 0) - content_size_count = int(redis_client.get('stats:content_size_count') or 0) + content_size_total = int(redis_client.get("stats:content_size_total") or 0) + content_size_count = int(redis_client.get("stats:content_size_count") or 0) avg_content_size = content_size_total / content_size_count if content_size_count > 0 else 0 - # Rozszerzone statystyki dotyczące wydajności i rozmiarów danych detailed_stats = { "processing_time_total_sec": processing_time_total, "processing_time_count": processing_time_count, "processing_time_avg_sec": avg_processing_time, - "processing_time_min_sec": float(redis_client.get('stats:processing_time_min') or 0), - "processing_time_max_sec": float(redis_client.get('stats:processing_time_max') or 0), + "processing_time_min_sec": float(redis_client.get("stats:processing_time_min") or 0), + "processing_time_max_sec": float(redis_client.get("stats:processing_time_max") or 0), "content_size_total_bytes": content_size_total, "content_size_count": content_size_count, - "content_size_avg_bytes": avg_content_size + "content_size_avg_bytes": avg_content_size, } - # Struktura odpowiedzi - response_data = { - **stats_data, - 'target_ips': target_ips, - 'url_requests': url_requests, - 'user_agents': user_agents, - 'client_ips': client_ips, - 'recent_converts': recent_converts, - 'detailed_stats': detailed_stats - } - - return jsonify(response_data) + return jsonify( + { + **stats_data, + "target_ips": target_ips, + "url_requests": url_requests, + "user_agents": user_agents, + "client_ips": client_ips, + "recent_converts": recent_converts, + "detailed_stats": detailed_stats, + } + ) @app.errorhandler(400) @app.errorhandler(403) @@ -410,13 +444,13 @@ def stats(): @app.errorhandler(415) @app.errorhandler(500) def handle_errors(e): - """Obsługa błędów""" - return render_template('error.html', error=e), e.code + try: + return render_template("error.html", error=e), e.code + except Exception: + return jsonify({"error": getattr(e, "description", str(e)), "code": e.code}), e.code -# Jeśli aplikacja jest uruchamiana bezpośrednio, korzystamy z Flask's run -if __name__ == '__main__': - app.run(host='0.0.0.0', port=8283) -# W przeciwnym razie (np. przy uruchamianiu przez Gunicorn) opakowujemy aplikację w adapter ASGI +if __name__ == "__main__": + app.run(host=config.BIND_HOST, port=config.BIND_PORT) else: from asgiref.wsgi import WsgiToAsgi asgi_app = WsgiToAsgi(app) diff --git a/config.py b/config.py new file mode 100644 index 0000000..e704d23 --- /dev/null +++ b/config.py @@ -0,0 +1,65 @@ +import os + +def getenv_bool(key: str, default: bool = False) -> bool: + v = os.getenv(key) + if v is None: + return default + return v.lower() in ("1", "true", "t", "yes", "y", "on") + +def getenv_int(key: str, default: int) -> int: + try: + return int(os.getenv(key, str(default))) + except ValueError: + return default + +def getenv_float(key: str, default: float) -> float: + try: + return float(os.getenv(key, str(default))) + except ValueError: + return default + +# Podstawowe +FLASK_DEBUG = getenv_bool("FLASK_DEBUG", True) +SECRET_KEY = os.getenv("SECRET_KEY", "change-me") + +# Rozmiary/limity +MAX_CONTENT_LENGTH = getenv_int("MAX_CONTENT_LENGTH", 50 * 1024 * 1024) # 50MB +RATE_LIMIT_DEFAULT = os.getenv("RATE_LIMIT_DEFAULT", "100 per minute") +RATE_LIMIT_CONVERT = os.getenv("RATE_LIMIT_CONVERT", "100 per minute") + +# Redis +REDIS_URL = os.getenv("REDIS_URL", "redis://localhost:6379/7") +REDIS_HOST = os.getenv("REDIS_HOST", "localhost") +REDIS_PORT = getenv_int("REDIS_PORT", 6379) +REDIS_DB = getenv_int("REDIS_DB", 7) + +# Basic Auth dla /stats +STATS_BASIC_AUTH_ENABLED = getenv_bool("STATS_BASIC_AUTH_ENABLED", True) +STATS_BASIC_AUTH_REALM = os.getenv("STATS_BASIC_AUTH_REALM", "Stats") +STATS_BASIC_AUTH_USER = os.getenv("STATS_BASIC_AUTH_USER", "admin") +STATS_BASIC_AUTH_PASS = os.getenv("STATS_BASIC_AUTH_PASS", "change-me") + +# Cache/ETag dla Varnisha +CACHE_ENABLED = getenv_bool("CACHE_ENABLED", True) +CACHE_S_MAXAGE = getenv_int("CACHE_S_MAXAGE", 43200) # 12h +CACHE_MAX_AGE = getenv_int("CACHE_MAX_AGE", 3600) # 1h +USE_REDIS_BODY_CACHE = getenv_bool("USE_REDIS_BODY_CACHE", False) + +# AIOHTTP/stream +AIOHTTP_TOTAL_TIMEOUT = getenv_float("AIOHTTP_TOTAL_TIMEOUT", 70.0) +AIOHTTP_CONNECT_TIMEOUT = getenv_float("AIOHTTP_CONNECT_TIMEOUT", 10.0) +AIOHTTP_SOCK_CONNECT_TIMEOUT= getenv_float("AIOHTTP_SOCK_CONNECT_TIMEOUT", 10.0) +AIOHTTP_SOCK_READ_TIMEOUT = getenv_float("AIOHTTP_SOCK_READ_TIMEOUT", 60.0) + +READ_CHUNK = getenv_int("READ_CHUNK", 64 * 1024) # 64 KiB +STREAM_LINE_LIMIT= getenv_int("STREAM_LINE_LIMIT", 4096) + +# Serwer +BIND_HOST = os.getenv("BIND_HOST", "127.0.0.1") +BIND_PORT = getenv_int("BIND_PORT", 8283) + +# Domyślny URL źródłowy (opcjonalny) +DEFAULT_SOURCE_URL = os.getenv( + "DEFAULT_SOURCE_URL", + "" +) diff --git a/listapp.service b/listapp.service index 60d7a4d..29c9b75 100644 --- a/listapp.service +++ b/listapp.service @@ -1,15 +1,27 @@ -# /etc/systemd/system/listapp.service [Unit] Description=ListApp - Flask application for hosts file conversion -After=network.target redis.service +After=network-online.target redis.service +Wants=network-online.target [Service] User=www-data Group=www-data WorkingDirectory=/var/www/listapp + +# Globalne env + nadpisania (opcjonalne; minus oznacza „jeśli istnieje”) +EnvironmentFile=-/var/www/listapp/.env + +# Ścieżka do virtualenv Environment="PATH=/var/www/listapp/venv/bin" -#ExecStart=/var/www/listapp/bin/gunicorn -w 2 --bind 127.0.0.1:8283 app:app -ExecStart=/var/www/listapp/bin/gunicorn -k uvicorn.workers.UvicornWorker -w 4 --bind 127.0.0.1:8283 app:asgi_app + +# Gunicorn + UvicornWorker (ASGI) +ExecStart=/var/www/listapp/venv/bin/gunicorn \ + -k uvicorn.workers.UvicornWorker \ + --workers 4 \ + --bind 127.0.0.1:8283 \ + --keep-alive 30 \ + --timeout 90 \ + app:asgi_app Restart=always RestartSec=5 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..e22f2c6 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,10 @@ +Flask +Flask-Compress +Flask-Limiter +redis +requests +aiohttp +asgiref +unicorn +gunicorn +uvicorn \ No newline at end of file diff --git a/start_dev.sh b/start_dev.sh new file mode 100644 index 0000000..9e3e4e1 --- /dev/null +++ b/start_dev.sh @@ -0,0 +1 @@ +venv/bin/gunicorn -k uvicorn.workers.UvicornWorker --workers 4 --bind 127.0.0.1:8283 --keep-alive 30 --timeout 90 app:asgi_app \ No newline at end of file From bc45c91d92b5458c5772adcc6182cc688ce2d70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Fri, 29 Aug 2025 10:46:50 +0200 Subject: [PATCH 02/14] refactor ciagl dalszy --- .env.example | 12 + app.py | 308 ++++++++++++++--- app_1.py | 259 -------------- app_gpt.py | 350 ------------------- app_timeout.py | 383 --------------------- config.py | 11 +- start_dev.sh | 4 +- static/css/main.css | 688 ++++++++++++++++++++++++++++++++++++++ static/js/error.js | 25 ++ static/js/main.js | 161 +++++++++ static/js/stats.js | 11 + templates/error.html | 164 ++++----- templates/form.html | 416 ++++++++--------------- templates/form_light.html | 70 ---- templates/stats.html | 222 +++++++++++- 15 files changed, 1592 insertions(+), 1492 deletions(-) delete mode 100644 app_1.py delete mode 100644 app_gpt.py delete mode 100644 app_timeout.py create mode 100644 static/css/main.css create mode 100644 static/js/error.js create mode 100644 static/js/main.js create mode 100644 static/js/stats.js delete mode 100644 templates/form_light.html diff --git a/.env.example b/.env.example index 0593823..fd1ae85 100644 --- a/.env.example +++ b/.env.example @@ -39,3 +39,15 @@ BIND_PORT=8283 # Domyślny URL źródłowy (opcjonalnie) DEFAULT_SOURCE_URL="https://raw.githubusercontent.com/217heidai/adblockfilters/main/rules/adblockdns.txt" + +# Debug /convert +# Włącz/wyłącz tryb debug (domyślnie false) +DEBUG_ENABLE=false + +# Tajny klucz do debug (opcjonalny). +# Jeśli pusty: debug tylko z prywatnych adresów (10.x.x.x, 192.168.x.x itp.) +# Jeśli ustawiony: debug dostępny po podaniu nagłówka X-Debug-Key: +DEBUG_KEY=supersekretnyklucz + +# Limit zapytań debug per-IP (np. 5 per minute) +DEBUG_RATE_LIMIT="5 per minute" diff --git a/app.py b/app.py index 06975b4..413b56a 100644 --- a/app.py +++ b/app.py @@ -4,20 +4,22 @@ import requests import socket import time import json -import base64 import hashlib +import ipaddress from datetime import datetime from urllib.parse import urlparse, quote, unquote, urljoin from functools import wraps from typing import Optional +from datetime import timezone +import json as _json from flask import Flask, request, render_template, abort, jsonify, stream_with_context, g, Response from flask_compress import Compress from flask_limiter import Limiter - import config app = Flask(__name__) + app.config["MAX_CONTENT_LENGTH"] = config.MAX_CONTENT_LENGTH app.config["SECRET_KEY"] = config.SECRET_KEY app.debug = config.FLASK_DEBUG @@ -51,6 +53,19 @@ def track_request_data(): redis_client.incr(f"stats:client_ips:{get_client_ip()}") redis_client.incr(f"stats:methods:{request.method}") +@app.after_request +def add_cache_headers(response): + if request.path.startswith("/static/"): + + response.headers.pop("Content-Disposition", None) + + if request.path.endswith((".css", ".js")): + response.headers["Cache-Control"] = "public, max-age=31536000, immutable" + else: + response.headers["Cache-Control"] = "public, max-age=86400" + return response + + @app.after_request def after_request(response): elapsed = time.perf_counter() - g.start_time @@ -84,15 +99,12 @@ def basic_auth_required(realm: str, user: str, password: str): def wrapper(*args, **kwargs): if not config.STATS_BASIC_AUTH_ENABLED: return f(*args, **kwargs) - auth = request.headers.get("Authorization", "") - if auth.startswith("Basic "): - try: - decoded = base64.b64decode(auth[6:]).decode("utf-8", errors="ignore") - u, p = decoded.split(":", 1) - if u == user and p == password: - return f(*args, **kwargs) - except Exception: - pass + + auth = request.authorization + + if auth and auth.type == "basic" and auth.username == user and auth.password == password: + return f(*args, **kwargs) + resp = Response(status=401) resp.headers["WWW-Authenticate"] = f'Basic realm="{realm}"' return resp @@ -111,18 +123,22 @@ def should_ignore_line(line): def is_valid_domain(domain): return bool(re.compile(r"^(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$").match(domain)) +def is_private_client_ip() -> bool: + ip = get_client_ip() + try: + return ipaddress.ip_address(ip).is_private + except Exception: + return False + def convert_host_line(line: str, target_ip: str): # szybkie odrzucenia if not line: return None line = line.strip() - # komentarze/puste if not line or line.startswith(("!", "#", "/", ";")): return None - # wytnij komentarz końcowy (# lub ;) – ostrożnie ze 'http://' - # usuwamy wszystko od ' #' lub ' ;' (spacja przed znacznikiem komentarza) for sep in (" #", " ;"): idx = line.find(sep) if idx != -1: @@ -131,7 +147,6 @@ def convert_host_line(line: str, target_ip: str): if not line: return None - # 1) AdGuard / uBlock DNS: ||domain^ (opcjonalnie z dodatkami po '^') m = re.match(r"^\|\|([a-z0-9.-]+)\^", line, re.IGNORECASE) if m: domain = m.group(1).strip(".") @@ -141,7 +156,6 @@ def convert_host_line(line: str, target_ip: str): parts = line.split() - # 2) Klasyczny hosts: "IP domena [...]" (IPv4 lub IPv6) if len(parts) >= 2 and ( re.match(r"^\d{1,3}(?:\.\d{1,3}){3}$", parts[0]) or ":" in parts[0] ): @@ -150,7 +164,6 @@ def convert_host_line(line: str, target_ip: str): return f"{target_ip} {domain}" return None - # 3) dnsmasq: address=/domain/0.0.0.0 czy server=/domain/... m = re.match(r"^(?:address|server)=/([a-z0-9.-]+)/", line, re.IGNORECASE) if m: domain = m.group(1).strip(".") @@ -158,7 +171,6 @@ def convert_host_line(line: str, target_ip: str): return f"{target_ip} {domain}" return None - # 4) Domain-only: "example.com" lub "example.com # komentarz" token = parts[0].split("#", 1)[0].strip().strip(".") if token and not should_ignore_domain(token) and is_valid_domain(token): return f"{target_ip} {token}" @@ -176,7 +188,7 @@ def cache_headers(etag: str, up_lm: Optional[str]): "Vary": "Accept-Encoding", "Content-Type": "text/plain; charset=utf-8", "X-Content-Type-Options": "nosniff", - "Content-Disposition": "inline; filename=converted_hosts.txt", + #"Content-Disposition": "inline; filename=converted_hosts.txt", } if config.CACHE_ENABLED: headers["Cache-Control"] = f"public, s-maxage={config.CACHE_S_MAXAGE}, max-age={config.CACHE_MAX_AGE}" @@ -198,6 +210,7 @@ def validate_and_normalize_url(url): def track_url_request(url): redis_client.incr(f"stats:url_requests:{quote(url, safe='')}") + def add_recent_link(url, target_ip): ts = datetime.now().isoformat() link_data = f"{ts}|{url}|{target_ip}" @@ -238,7 +251,7 @@ def add_recent_convert(): url = request.full_path data = {"url": url, "ip": ip, "hostname": hostname, "time": time_str, "user_agent": ua} redis_client.lpush("recent_converts", json.dumps(data)) - redis_client.ltrim("recent_converts", 0, 49) + redis_client.ltrim("recent_converts", 0, 99) @app.route("/favicon.ico", methods=["GET"]) def favicon(): @@ -282,22 +295,78 @@ def index(): @app.route("/convert") @limiter.limit(config.RATE_LIMIT_CONVERT) def convert(): + import hmac, ipaddress + + def is_private_client_ip() -> bool: + ip = get_client_ip() + try: + return ipaddress.ip_address(ip).is_private + except Exception: + return False + + requested_debug = request.args.get("debug", "").lower() in ("1","true","t","yes","y","on") + debug_allowed = False + if config.DEBUG_ENABLE: + header_key = request.headers.get("X-Debug-Key", "") + if config.DEBUG_KEY and header_key and hmac.compare_digest(header_key, config.DEBUG_KEY): + debug_allowed = True + elif is_private_client_ip(): + debug_allowed = True + + if requested_debug and not debug_allowed: + abort(403) + + debug_mode = requested_debug and debug_allowed + debug_lines = [] + + def d(msg): + ts = datetime.now().isoformat() + line = f"# [DEBUG {ts}] {msg}" + debug_lines.append(line) + app.logger.debug(line) + + def debug_response(status=200): + body = "\n".join(debug_lines) + ("\n" if debug_lines else "") + resp = Response(body, mimetype="text/plain; charset=utf-8", status=status) + resp.headers["X-Debug-Mode"] = "1" + resp.headers["Cache-Control"] = "no-store" + return resp + try: redis_client.incr("stats:convert_requests") add_recent_convert() + if debug_mode: + d("Start /convert w trybie debug") encoded_url = request.args.get("url") if not encoded_url: + if debug_mode: + d("Brak parametru ?url") + return debug_response(status=400) redis_client.incr("stats:errors_400") abort(400, description="Missing URL parameter") decoded_url = unquote(encoded_url) - normalized_url = validate_and_normalize_url(decoded_url) + try: + normalized_url = validate_and_normalize_url(decoded_url) + except ValueError as e: + if debug_mode: + d(f"Błąd walidacji URL: {e}") + return debug_response(status=400) + redis_client.incr("stats:errors_400") + abort(400) + target_ip = request.args.get("ip", "127.0.0.1") + if debug_mode: + d(f"URL (encoded): {encoded_url}") + d(f"URL (decoded): {decoded_url}") + d(f"URL (norm): {normalized_url}") + d(f"target_ip: {target_ip}") track_url_request(normalized_url) redis_client.incr(f"stats:target_ips:{target_ip}") + # nagłówki If-* req_headers = {} inm = request.headers.get("If-None-Match") ims = request.headers.get("If-Modified-Since") @@ -305,59 +374,99 @@ def convert(): req_headers["If-None-Match"] = inm if ims: req_headers["If-Modified-Since"] = ims + if debug_mode: + d("Wysyłam GET do upstreamu") + d(f"Nagłówki: {req_headers or '{}'}") - with requests.get(normalized_url, headers=req_headers, stream=True, timeout=(10, 60)) as r: - ct = r.headers.get("Content-Type", "") - # pozwól na text/* oraz octet-stream (często używane przez listy) - if "text" not in ct and "octet-stream" not in ct and ct != "": - abort(415, description="Unsupported Media Type") + r = requests.get(normalized_url, headers=req_headers, stream=True, timeout=(10, 60)) - if r.status_code == 304: - etag = build_etag(r.headers.get("ETag"), r.headers.get("Last-Modified"), target_ip) - resp = Response(status=304) - resp.headers.update(cache_headers(etag, r.headers.get("Last-Modified"))) - resp.direct_passthrough = True - return resp + ct = r.headers.get("Content-Type", "") + if debug_mode: + d(f"Upstream status: {r.status_code}") + d(f"Content-Type: {ct or '(brak)'}") + d(f"ETag: {r.headers.get('ETag')}") + d(f"Last-Modified: {r.headers.get('Last-Modified')}") - up_etag = r.headers.get("ETag") - up_lm = r.headers.get("Last-Modified") - etag = build_etag(up_etag, up_lm, target_ip) + if "text" not in ct and "octet-stream" not in ct and ct != "": + if debug_mode: + d("Unsupported Media Type -> 415") + r.close() + return debug_response(status=415) + r.close() + abort(415, description="Unsupported Media Type") - @stream_with_context - def body_gen(): - total = 0 - # iter_lines pewnie tnie po \n/\r\n i dekoduje do str + if r.status_code == 304: + etag = build_etag(r.headers.get("ETag"), r.headers.get("Last-Modified"), target_ip) + if debug_mode: + d("Upstream 304 – zwracam 304") + r.close() + return debug_response(status=304) + resp = Response(status=304) + resp.headers.update(cache_headers(etag, r.headers.get("Last-Modified"))) + resp.direct_passthrough = True + r.close() + return resp + + up_etag = r.headers.get("ETag") + up_lm = r.headers.get("Last-Modified") + etag = build_etag(up_etag, up_lm, target_ip) + if debug_mode: + d(f"Etag dla klienta: {etag}") + + @stream_with_context + def body_gen(): + lines_read = 0 + lines_emitted = 0 + try: + if debug_mode: + yield "\n".join(debug_lines) + "\n" + debug_lines.clear() for line in r.iter_lines(decode_unicode=True, chunk_size=config.READ_CHUNK): if line is None: continue - # zabezpieczenie przed megadługimi wierszami + lines_read += 1 if len(line) > config.STREAM_LINE_LIMIT: + if debug_mode and lines_read <= 5: + yield f"# [DEBUG] pominięto długi wiersz ({len(line)} bajtów)\n" continue out = convert_host_line(line, target_ip) if out: - s = out + "\n" - total += len(s) - yield s - # statystyki po zakończeniu streamu - redis_client.incrby("stats:content_size_total", total) + lines_emitted += 1 + yield out + "\n" + if debug_mode and lines_read <= 5: + preview = line[:200].replace("\r", "\\r").replace("\n", "\\n") + yield f"# [DEBUG] podgląd linii {lines_read}: {preview}\n" + if debug_mode: + yield f"# [DEBUG] podsumowanie: przeczytano={lines_read}, wyemitowano={lines_emitted}\n" + if lines_emitted == 0: + yield "# [DEBUG] Uwaga: 0 linii wynikowych – czy format listy pasuje?\n" + redis_client.incrby("stats:content_size_total", 0) redis_client.incr("stats:content_size_count") + finally: + r.close() - resp = Response(body_gen(), mimetype="text/plain; charset=utf-8") - resp.headers.update(cache_headers(etag, up_lm)) - # wyłącz kompresję/buforowanie dla strumienia - resp.direct_passthrough = True - redis_client.incr("stats:conversions_success") - return resp + resp = Response(body_gen(), mimetype="text/plain; charset=utf-8") + resp.headers.update(cache_headers(etag, up_lm)) + resp.direct_passthrough = True + redis_client.incr("stats:conversions_success") + return resp except requests.exceptions.RequestException as e: app.logger.error(f"Request error: {str(e)}") redis_client.incr("stats:errors_500") + if debug_mode: + d(f"Wyjątek requests: {e}") + return debug_response(status=502) abort(500) except ValueError as e: app.logger.error(f"URL validation error: {str(e)}") redis_client.incr("stats:errors_400") + if debug_mode: + d(f"Wyjątek ValueError: {e}") + return debug_response(status=400) abort(400) + @app.route("/convert", methods=["HEAD"]) def convert_head(): encoded_url = request.args.get("url", config.DEFAULT_SOURCE_URL) @@ -372,6 +481,7 @@ def convert_head(): resp.direct_passthrough = True return resp + @app.route("/stats") @basic_auth_required( realm=config.STATS_BASIC_AUTH_REALM, @@ -379,11 +489,95 @@ def convert_head(): password=config.STATS_BASIC_AUTH_PASS, ) def stats(): + + stats_data, target_ips, url_requests, user_agents, client_ips = {}, {}, {}, {}, {} + + # Zbierz klucze stats:* + for key in redis_client.scan_iter("stats:*"): + key_str = key.decode() + value = (redis_client.get(key) or b"0").decode() + if key_str.startswith("stats:target_ips:"): + ip = key_str.split(":", 2)[2] + target_ips[ip] = value + elif key_str.startswith("stats:url_requests:"): + url = unquote(key_str.split(":", 2)[2]) + url_requests[url] = value + elif key_str.startswith("stats:user_agents:"): + ua = unquote(key_str.split(":", 2)[2]) + user_agents[ua] = value + elif key_str.startswith("stats:client_ips:"): + ip = key_str.split(":", 2)[2] + client_ips[ip] = value + else: + stats_data[key_str] = value + + + recent_converts = [] + for entry in redis_client.lrange("recent_converts", 0, 99): + try: + recent_converts.append(json.loads(entry.decode())) + except Exception: + pass + + # Agregaty szczegółowe + processing_time_total = float(redis_client.get("stats:processing_time_total") or 0) + processing_time_count = int(redis_client.get("stats:processing_time_count") or 0) + avg_processing_time = processing_time_total / processing_time_count if processing_time_count > 0 else 0 + + content_size_total = int(redis_client.get("stats:content_size_total") or 0) + content_size_count = int(redis_client.get("stats:content_size_count") or 0) + avg_content_size = content_size_total / content_size_count if content_size_count > 0 else 0 + + detailed_stats = { + "processing_time_total_sec": processing_time_total, + "processing_time_count": processing_time_count, + "processing_time_avg_sec": avg_processing_time, + "processing_time_min_sec": float(redis_client.get("stats:processing_time_min") or 0), + "processing_time_max_sec": float(redis_client.get("stats:processing_time_max") or 0), + "content_size_total_bytes": content_size_total, + "content_size_count": content_size_count, + "content_size_avg_bytes": avg_content_size, + } + + # Surowe JSON do sekcji "Raw JSON" na stronie + raw_json = _json.dumps( + { + **stats_data, + "target_ips": target_ips, + "url_requests": url_requests, + "user_agents": user_agents, + "client_ips": client_ips, + "recent_converts": recent_converts, + "detailed_stats": detailed_stats, + }, + indent=2, + ) + + return render_template( + "stats.html", + stats=stats_data, + target_ips=target_ips, + url_requests=url_requests, + user_agents=user_agents, + client_ips=client_ips, + recent=recent_converts, + detailed=detailed_stats, + raw_json=raw_json, + ) + + +@app.route("/stats.json") +@basic_auth_required( + realm=config.STATS_BASIC_AUTH_REALM, + user=config.STATS_BASIC_AUTH_USER, + password=config.STATS_BASIC_AUTH_PASS, +) +def stats_json(): stats_data, target_ips, url_requests, user_agents, client_ips = {}, {}, {}, {}, {} for key in redis_client.scan_iter("stats:*"): key_str = key.decode() - value = redis_client.get(key).decode() + value = (redis_client.get(key) or b"0").decode() if key_str.startswith("stats:target_ips:"): ip = key_str.split(":", 2)[2] target_ips[ip] = value @@ -400,7 +594,7 @@ def stats(): stats_data[key_str] = value recent_converts = [] - for entry in redis_client.lrange("recent_converts", 0, 49): + for entry in redis_client.lrange("recent_converts", 0, 99): try: recent_converts.append(json.loads(entry.decode())) except Exception: @@ -437,6 +631,7 @@ def stats(): } ) + @app.errorhandler(400) @app.errorhandler(403) @app.errorhandler(404) @@ -445,9 +640,12 @@ def stats(): @app.errorhandler(500) def handle_errors(e): try: - return render_template("error.html", error=e), e.code + + now_iso = datetime.now().astimezone().isoformat() + return render_template("error.html", error=e, code=getattr(e, "code", 500), now_iso=now_iso), getattr(e, "code", 500) except Exception: - return jsonify({"error": getattr(e, "description", str(e)), "code": e.code}), e.code + return jsonify({"error": getattr(e, "description", str(e)), "code": getattr(e, "code", 500)}), getattr(e, "code", 500) + if __name__ == "__main__": app.run(host=config.BIND_HOST, port=config.BIND_PORT) diff --git a/app_1.py b/app_1.py deleted file mode 100644 index eda803d..0000000 --- a/app_1.py +++ /dev/null @@ -1,259 +0,0 @@ -import re -import redis -import requests -from datetime import datetime -from flask import Flask, request, render_template, abort, jsonify -from urllib.parse import urlparse, quote, unquote, urljoin -from functools import wraps - -app = Flask(__name__) -app.config['MAX_CONTENT_LENGTH'] = 2 * 1024 * 1024 * 1024 # limit -redis_client = redis.Redis(host='localhost', port=6379, db=7) - -ALLOWED_IPS = {'127.0.0.1', '109.173.163.86'} -ALLOWED_DOMAIN = '' - -@app.before_request -def track_request_data(): - """Track client IP and User-Agent for all requests""" - client_ip = get_client_ip() - user_agent = request.headers.get('User-Agent', 'Unknown') - - # Track User-Agents - redis_client.incr(f'stats:user_agents:{quote(user_agent, safe="")}') - - # Track client IPs - redis_client.incr(f'stats:client_ips:{client_ip}') - -def get_client_ip(): - """Get real client IP considering proxies""" - x_forwarded_for = request.headers.get('X-Forwarded-For', '').split(',') - if x_forwarded_for and x_forwarded_for[0].strip(): - return x_forwarded_for[0].strip() - return request.remote_addr - -@app.template_filter('datetimeformat') -def datetimeformat_filter(value, format='%Y-%m-%d %H:%M'): - try: - dt = datetime.fromisoformat(value) - return dt.strftime(format) - except (ValueError, AttributeError): - return value - -def ip_restriction(f): - @wraps(f) - def decorated(*args, **kwargs): - client_ip = get_client_ip() - host = request.host.split(':')[0] - - allowed_conditions = [ - client_ip in ALLOWED_IPS, - host == ALLOWED_DOMAIN, - request.headers.get('X-Forwarded-For', '').split(',')[0].strip() in ALLOWED_IPS - ] - - if any(allowed_conditions): - return f(*args, **kwargs) - redis_client.incr('stats:errors_403') - abort(403) - return decorated - -def cache_key(source_url, ip): - return f"cache:{source_url}:{ip}" - -#def convert_hosts(content, target_ip): -# """Convert IPs in hosts file content""" -# pattern = r'^\s*?(?P\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(?P\S+).*$' -# return re.sub(pattern, f"{target_ip} \\g", content, flags=re.MULTILINE) - -def convert_hosts(content, target_ip): - """Convert with enhanced validation""" - converted = [] - - for line in content.splitlines(): - line = line.strip() - - # Skip empty/comments - if not line or line[0] in ('!', '#', '/') or '$' in line: - continue - - # AdGuard domains - if line.startswith(('||', '|')): - domain = line.split('^')[0].lstrip('|') - if 1 < len(domain) <= 253 and '.' in domain[1:-1]: - converted.append(f"{target_ip} {domain}") - continue - - # Classic hosts format - if re.match(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\s+', line): - converted.append(re.sub(r'^\S+', target_ip, line, count=1)) - - return '\n'.join(converted) - -def validate_and_normalize_url(url): - """Validate and normalize input URL""" - parsed = urlparse(url) - if not parsed.scheme: - url = f'https://{url}' - parsed = urlparse(url) - if not parsed.netloc: - raise ValueError("Missing host in URL") - return parsed.geturl() - -def track_url_request(url): - """Track requests for specific URLs""" - redis_key = f"stats:url_requests:{quote(url, safe='')}" - redis_client.incr(redis_key) - -def add_recent_link(url, target_ip): - """Add to recent links history""" - timestamp = datetime.now().isoformat() - link_data = f"{timestamp}|{url}|{target_ip}" - - with redis_client.pipeline() as pipe: - pipe.lpush("recent_links", link_data) - pipe.ltrim("recent_links", 0, 9) - pipe.execute() - redis_client.incr('stats:recent_links_added') - -def get_recent_links(): - """Get last 10 recent links""" - links = redis_client.lrange("recent_links", 0, 9) - parsed_links = [] - for link in links: - parts = link.decode().split("|") - if len(parts) >= 3: - parsed_links.append((parts[0], parts[1], parts[2])) - elif len(parts) == 2: - parsed_links.append((parts[0], parts[1], "127.0.0.1")) - return parsed_links - -@app.route('/', methods=['GET']) -def index(): - """Main form page""" - generated_link = None - recent_links = get_recent_links() - url_param = request.args.get('url') - target_ip = request.args.get('ip', '127.0.0.1') - - if url_param: - try: - normalized_url = validate_and_normalize_url(unquote(url_param)) - encoded_url = quote(normalized_url, safe='') - generated_link = urljoin( - request.host_url, - f"convert?url={encoded_url}&ip={target_ip}" - ) - add_recent_link(normalized_url, target_ip) - recent_links = get_recent_links() - except Exception as e: - app.logger.error(f"Error processing URL: {str(e)}") - - return render_template('form.html', - generated_link=generated_link, - recent_links=recent_links) - -@app.route('/convert') -def convert(): - """Conversion endpoint""" - try: - redis_client.incr('stats:convert_requests') - encoded_url = request.args.get('url') - - if not encoded_url: - redis_client.incr('stats:errors_400') - abort(400, description="Missing URL parameter") - - decoded_url = unquote(encoded_url) - normalized_url = validate_and_normalize_url(decoded_url) - target_ip = request.args.get('ip', '127.0.0.1') - - # Track statistics - track_url_request(normalized_url) - redis_client.incr(f'stats:target_ips:{target_ip}') - - # Check cache - cached = redis_client.get(cache_key(normalized_url, target_ip)) - if cached: - redis_client.incr('stats:cache_hits') - return cached.decode('utf-8'), 200, {'Content-Type': 'text/plain'} - - redis_client.incr('stats:cache_misses') - - # Fetch and process - response = requests.get(normalized_url, stream=True, timeout=15) - response.raise_for_status() - - content = b'' - for chunk in response.iter_content(2048): - content += chunk - if len(content) > app.config['MAX_CONTENT_LENGTH']: - redis_client.incr('stats:errors_413') - abort(413) - - converted = convert_hosts(content.decode('utf-8'), target_ip) - redis_client.setex(cache_key(normalized_url, target_ip), 43200, converted) # 12h cache - redis_client.incr('stats:conversions_success') - return converted, 200, {'Content-Type': 'text/plain'} - - except requests.RequestException as e: - app.logger.error(f"Request error: {str(e)}") - redis_client.incr('stats:errors_500') - abort(500) - except ValueError as e: - app.logger.error(f"URL validation error: {str(e)}") - redis_client.incr('stats:errors_400') - abort(400) - -@app.route('/stats') -@ip_restriction -def stats(): - """Statistics endpoint""" - stats_data = {} - target_ips = {} - url_requests = {} - user_agents = {} - client_ips = {} - - # Aggregate stats from Redis - for key in redis_client.scan_iter("stats:*"): - key_str = key.decode() - value = redis_client.get(key).decode() - - if key_str.startswith('stats:target_ips:'): - ip = key_str.split(':', 2)[2] - target_ips[ip] = value - elif key_str.startswith('stats:url_requests:'): - url = unquote(key_str.split(':', 2)[2]) - url_requests[url] = value - elif key_str.startswith('stats:user_agents:'): - ua = unquote(key_str.split(':', 2)[2]) - user_agents[ua] = value - elif key_str.startswith('stats:client_ips:'): - ip = key_str.split(':', 2)[2] - client_ips[ip] = value - else: - stats_data[key_str] = value - - # Structure response - response_data = { - **stats_data, - 'target_ips': target_ips, - 'url_requests': url_requests, - 'user_agents': user_agents, - 'client_ips': client_ips - } - - return jsonify(response_data) - -@app.errorhandler(400) -@app.errorhandler(403) -@app.errorhandler(404) -@app.errorhandler(413) -@app.errorhandler(500) -def handle_errors(e): - """Error handling""" - return render_template('error.html', error=e), e.code - -if __name__ == '__main__': - app.run(host='0.0.0.0', port=8283) diff --git a/app_gpt.py b/app_gpt.py deleted file mode 100644 index 6d2e9a5..0000000 --- a/app_gpt.py +++ /dev/null @@ -1,350 +0,0 @@ -import re -import redis -import requests -from datetime import datetime -from flask import Flask, request, render_template, abort, jsonify, g -from urllib.parse import urlparse, quote, unquote, urljoin -from functools import wraps -import json -import socket -import time - -app = Flask(__name__) -app.config['MAX_CONTENT_LENGTH'] = 2 * 1024 * 1024 * 1024 # limit -redis_client = redis.Redis(host='localhost', port=6379, db=7) - -ALLOWED_IPS = {'127.0.0.1', '109.173.163.86'} -ALLOWED_DOMAIN = '' - -@app.before_request -def track_request_data(): - """Rejestracja IP klienta, User-Agent, metody HTTP oraz rozpoczęcie pomiaru czasu requestu""" - g.start_time = time.perf_counter() # rozpoczęcie pomiaru czasu - client_ip = get_client_ip() - user_agent = request.headers.get('User-Agent', 'Unknown') - method = request.method - - # Rejestracja User-Agent - redis_client.incr(f'stats:user_agents:{quote(user_agent, safe="")}') - # Rejestracja adresu IP klienta - redis_client.incr(f'stats:client_ips:{client_ip}') - # Rejestracja metody HTTP - redis_client.incr(f'stats:methods:{method}') - -def get_client_ip(): - """Pobranie prawdziwego adresu IP klienta (uwzględniając proxy)""" - x_forwarded_for = request.headers.get('X-Forwarded-For', '').split(',') - if x_forwarded_for and x_forwarded_for[0].strip(): - return x_forwarded_for[0].strip() - return request.remote_addr - -@app.after_request -def after_request(response): - """Pomiar i rejestracja czasu przetwarzania żądania""" - elapsed = time.perf_counter() - g.start_time - # Aktualizacja statystyk czasu przetwarzania (w sekundach) - redis_client.incrbyfloat('stats:processing_time_total', elapsed) - redis_client.incr('stats:processing_time_count') - - # Aktualizacja minimalnego czasu przetwarzania - try: - current_min = float(redis_client.get('stats:processing_time_min') or elapsed) - if elapsed < current_min: - redis_client.set('stats:processing_time_min', elapsed) - except Exception: - redis_client.set('stats:processing_time_min', elapsed) - - # Aktualizacja maksymalnego czasu przetwarzania - try: - current_max = float(redis_client.get('stats:processing_time_max') or elapsed) - if elapsed > current_max: - redis_client.set('stats:processing_time_max', elapsed) - except Exception: - redis_client.set('stats:processing_time_max', elapsed) - - return response - -@app.template_filter('datetimeformat') -def datetimeformat_filter(value, format='%Y-%m-%d %H:%M'): - try: - dt = datetime.fromisoformat(value) - return dt.strftime(format) - except (ValueError, AttributeError): - return value - -def ip_restriction(f): - @wraps(f) - def decorated(*args, **kwargs): - client_ip = get_client_ip() - host = request.host.split(':')[0] - - allowed_conditions = [ - client_ip in ALLOWED_IPS, - host == ALLOWED_DOMAIN, - request.headers.get('X-Forwarded-For', '').split(',')[0].strip() in ALLOWED_IPS - ] - - if any(allowed_conditions): - return f(*args, **kwargs) - redis_client.incr('stats:errors_403') - abort(403) - return decorated - -def cache_key(source_url, ip): - return f"cache:{source_url}:{ip}" - -def convert_hosts(content, target_ip): - """Konwersja treści pliku hosts z uwzględnieniem walidacji""" - converted = [] - - for line in content.splitlines(): - line = line.strip() - - # Pomijanie pustych linii i komentarzy - if not line or line[0] in ('!', '#', '/') or '$' in line: - continue - - # Reguły AdGuard - if line.startswith(('||', '|')): - domain = line.split('^')[0].lstrip('|') - if 1 < len(domain) <= 253 and '.' in domain[1:-1]: - converted.append(f"{target_ip} {domain}") - continue - - # Klasyczny format hosts - if re.match(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\s+', line): - converted.append(re.sub(r'^\S+', target_ip, line, count=1)) - - return '\n'.join(converted) - -def validate_and_normalize_url(url): - """Walidacja i normalizacja adresu URL""" - parsed = urlparse(url) - if not parsed.scheme: - url = f'https://{url}' - parsed = urlparse(url) - if not parsed.netloc: - raise ValueError("Missing host in URL") - return parsed.geturl() - -def track_url_request(url): - """Rejestracja żądania dla określonego URL""" - redis_key = f"stats:url_requests:{quote(url, safe='')}" - redis_client.incr(redis_key) - -def add_recent_link(url, target_ip): - """Dodanie ostatniego linku do historii (ostatnie 10)""" - timestamp = datetime.now().isoformat() - link_data = f"{timestamp}|{url}|{target_ip}" - - with redis_client.pipeline() as pipe: - pipe.lpush("recent_links", link_data) - pipe.ltrim("recent_links", 0, 9) - pipe.execute() - redis_client.incr('stats:recent_links_added') - -def get_recent_links(): - """Pobranie ostatnich 10 linków""" - links = redis_client.lrange("recent_links", 0, 9) - parsed_links = [] - for link in links: - parts = link.decode().split("|") - if len(parts) >= 3: - parsed_links.append((parts[0], parts[1], parts[2])) - elif len(parts) == 2: - parsed_links.append((parts[0], parts[1], "127.0.0.1")) - return parsed_links - -# Nowa funkcja do logowania requestów dla endpointu /convert -def add_recent_convert(): - """Dodaje dane żądania do listy ostatnich konwersji (/convert)""" - ip = get_client_ip() - try: - hostname = socket.gethostbyaddr(ip)[0] - except Exception: - hostname = ip - user_agent = request.headers.get('User-Agent', 'Unknown') - time_str = datetime.now().astimezone().isoformat() - url = request.full_path # pełna ścieżka wraz z query string - data = { - "url": url, - "ip": ip, - "hostname": hostname, - "time": time_str, - "user_agent": user_agent - } - json_data = json.dumps(data) - redis_client.lpush("recent_converts", json_data) - redis_client.ltrim("recent_converts", 0, 49) - -@app.route('/', methods=['GET']) -def index(): - """Strona główna z formularzem""" - generated_link = None - recent_links = get_recent_links() - url_param = request.args.get('url') - target_ip = request.args.get('ip', '127.0.0.1') - - if url_param: - try: - normalized_url = validate_and_normalize_url(unquote(url_param)) - encoded_url = quote(normalized_url, safe='') - generated_link = urljoin( - request.host_url, - f"convert?url={encoded_url}&ip={target_ip}" - ) - add_recent_link(normalized_url, target_ip) - recent_links = get_recent_links() - except Exception as e: - app.logger.error(f"Error processing URL: {str(e)}") - - return render_template('form.html', - generated_link=generated_link, - recent_links=recent_links) - -@app.route('/convert') -def convert(): - """Endpoint do konwersji""" - try: - redis_client.incr('stats:convert_requests') - # Logowanie danych dla requestu do /convert - add_recent_convert() - - encoded_url = request.args.get('url') - - if not encoded_url: - redis_client.incr('stats:errors_400') - abort(400, description="Missing URL parameter") - - decoded_url = unquote(encoded_url) - normalized_url = validate_and_normalize_url(decoded_url) - target_ip = request.args.get('ip', '127.0.0.1') - - # Rejestracja statystyk dotyczących URL - track_url_request(normalized_url) - redis_client.incr(f'stats:target_ips:{target_ip}') - - # Sprawdzenie pamięci podręcznej - cached = redis_client.get(cache_key(normalized_url, target_ip)) - if cached: - redis_client.incr('stats:cache_hits') - return cached.decode('utf-8'), 200, {'Content-Type': 'text/plain'} - - redis_client.incr('stats:cache_misses') - - # Pobranie i przetworzenie treści - response = requests.get(normalized_url, stream=True, timeout=15) - response.raise_for_status() - - content = b'' - for chunk in response.iter_content(2048): - content += chunk - if len(content) > app.config['MAX_CONTENT_LENGTH']: - redis_client.incr('stats:errors_413') - abort(413) - - # Rejestracja rozmiaru pobranej treści - content_size = len(content) - redis_client.incrby('stats:content_size_total', content_size) - redis_client.incr('stats:content_size_count') - - converted = convert_hosts(content.decode('utf-8'), target_ip) - redis_client.setex(cache_key(normalized_url, target_ip), 43200, converted) # 12h cache - redis_client.incr('stats:conversions_success') - return converted, 200, {'Content-Type': 'text/plain'} - - except requests.RequestException as e: - app.logger.error(f"Request error: {str(e)}") - redis_client.incr('stats:errors_500') - abort(500) - except ValueError as e: - app.logger.error(f"URL validation error: {str(e)}") - redis_client.incr('stats:errors_400') - abort(400) - -@app.route('/stats') -@ip_restriction -def stats(): - """Endpoint statystyk""" - stats_data = {} - target_ips = {} - url_requests = {} - user_agents = {} - client_ips = {} - - # Agregacja statystyk z Redisa - for key in redis_client.scan_iter("stats:*"): - key_str = key.decode() - value = redis_client.get(key).decode() - - if key_str.startswith('stats:target_ips:'): - ip = key_str.split(':', 2)[2] - target_ips[ip] = value - elif key_str.startswith('stats:url_requests:'): - url = unquote(key_str.split(':', 2)[2]) - url_requests[url] = value - elif key_str.startswith('stats:user_agents:'): - ua = unquote(key_str.split(':', 2)[2]) - user_agents[ua] = value - elif key_str.startswith('stats:client_ips:'): - ip = key_str.split(':', 2)[2] - client_ips[ip] = value - else: - stats_data[key_str] = value - - # Pobranie ostatnich 50 requestów dla endpointu /convert - recent_converts = [] - convert_entries = redis_client.lrange("recent_converts", 0, 49) - for entry in convert_entries: - try: - data = json.loads(entry.decode()) - recent_converts.append(data) - except Exception: - pass - - # Obliczenie średniego czasu przetwarzania żądań - processing_time_total = float(redis_client.get('stats:processing_time_total') or 0) - processing_time_count = int(redis_client.get('stats:processing_time_count') or 0) - avg_processing_time = processing_time_total / processing_time_count if processing_time_count > 0 else 0 - - # Obliczenie średniego rozmiaru pobranej treści dla /convert - content_size_total = int(redis_client.get('stats:content_size_total') or 0) - content_size_count = int(redis_client.get('stats:content_size_count') or 0) - avg_content_size = content_size_total / content_size_count if content_size_count > 0 else 0 - - # Rozszerzone statystyki dotyczące wydajności i rozmiarów danych - detailed_stats = { - "processing_time_total_sec": processing_time_total, - "processing_time_count": processing_time_count, - "processing_time_avg_sec": avg_processing_time, - "processing_time_min_sec": float(redis_client.get('stats:processing_time_min') or 0), - "processing_time_max_sec": float(redis_client.get('stats:processing_time_max') or 0), - "content_size_total_bytes": content_size_total, - "content_size_count": content_size_count, - "content_size_avg_bytes": avg_content_size - } - - # Struktura odpowiedzi - response_data = { - **stats_data, - 'target_ips': target_ips, - 'url_requests': url_requests, - 'user_agents': user_agents, - 'client_ips': client_ips, - 'recent_converts': recent_converts, - 'detailed_stats': detailed_stats - } - - return jsonify(response_data) - -@app.errorhandler(400) -@app.errorhandler(403) -@app.errorhandler(404) -@app.errorhandler(413) -@app.errorhandler(500) -def handle_errors(e): - """Obsługa błędów""" - return render_template('error.html', error=e), e.code - -if __name__ == '__main__': - app.run(host='0.0.0.0', port=8283) diff --git a/app_timeout.py b/app_timeout.py deleted file mode 100644 index 5f35439..0000000 --- a/app_timeout.py +++ /dev/null @@ -1,383 +0,0 @@ -import re -import redis -import requests -import aiohttp -import asyncio -import socket -import time -import json -from datetime import datetime -from flask import Flask, request, render_template, abort, jsonify, g -from urllib.parse import urlparse, quote, unquote, urljoin -from functools import wraps -from flask_compress import Compress -from flask_limiter import Limiter -from flask_limiter.util import get_remote_address - -app = Flask(__name__) -app.config['MAX_CONTENT_LENGTH'] = 2 * 1024 * 1024 * 1024 # limit -redis_client = redis.Redis(host='localhost', port=6379, db=7) - -# Ustawienia do rate limiting – 100 żądań na minutę -def get_client_ip(): - """Pobranie prawdziwego adresu IP klienta (uwzględniając proxy)""" - x_forwarded_for = request.headers.get('X-Forwarded-For', '').split(',') - if x_forwarded_for and x_forwarded_for[0].strip(): - return x_forwarded_for[0].strip() - return request.remote_addr - -limiter = Limiter(key_func=get_client_ip, default_limits=["100 per minute"], app=app) -Compress(app) - -ALLOWED_IPS = {'127.0.0.1', '109.173.163.86'} -ALLOWED_DOMAIN = '' - -@app.before_request -def track_request_data(): - """Rejestracja IP klienta, User-Agent, metody HTTP oraz rozpoczęcie pomiaru czasu requestu""" - g.start_time = time.perf_counter() # rozpoczęcie pomiaru czasu - client_ip = get_client_ip() - user_agent = request.headers.get('User-Agent', 'Unknown') - method = request.method - - # Rejestracja User-Agent - redis_client.incr(f'stats:user_agents:{quote(user_agent, safe="")}') - # Rejestracja adresu IP klienta - redis_client.incr(f'stats:client_ips:{client_ip}') - # Rejestracja metody HTTP - redis_client.incr(f'stats:methods:{method}') - -@app.after_request -def after_request(response): - """Pomiar i rejestracja czasu przetwarzania żądania""" - elapsed = time.perf_counter() - g.start_time - # Aktualizacja statystyk czasu przetwarzania (w sekundach) - redis_client.incrbyfloat('stats:processing_time_total', elapsed) - redis_client.incr('stats:processing_time_count') - - # Aktualizacja minimalnego czasu przetwarzania - try: - current_min = float(redis_client.get('stats:processing_time_min') or elapsed) - if elapsed < current_min: - redis_client.set('stats:processing_time_min', elapsed) - except Exception: - redis_client.set('stats:processing_time_min', elapsed) - - # Aktualizacja maksymalnego czasu przetwarzania - try: - current_max = float(redis_client.get('stats:processing_time_max') or elapsed) - if elapsed > current_max: - redis_client.set('stats:processing_time_max', elapsed) - except Exception: - redis_client.set('stats:processing_time_max', elapsed) - - return response - -@app.template_filter('datetimeformat') -def datetimeformat_filter(value, format='%Y-%m-%d %H:%M'): - try: - dt = datetime.fromisoformat(value) - return dt.strftime(format) - except (ValueError, AttributeError): - return value - -def ip_restriction(f): - @wraps(f) - def decorated(*args, **kwargs): - client_ip = get_client_ip() - host = request.host.split(':')[0] - - allowed_conditions = [ - client_ip in ALLOWED_IPS, - host == ALLOWED_DOMAIN, - request.headers.get('X-Forwarded-For', '').split(',')[0].strip() in ALLOWED_IPS - ] - - if any(allowed_conditions): - return f(*args, **kwargs) - redis_client.incr('stats:errors_403') - abort(403) - return decorated - -def cache_key(source_url, ip): - return f"cache:{source_url}:{ip}" - -def convert_hosts(content, target_ip): - """Konwersja treści pliku hosts z uwzględnieniem walidacji""" - converted = [] - - for line in content.splitlines(): - line = line.strip() - - # Pomijanie pustych linii i komentarzy - if not line or line[0] in ('!', '#', '/') or '$' in line: - continue - - # Reguły AdGuard - if line.startswith(('||', '|')): - domain = line.split('^')[0].lstrip('|') - if 1 < len(domain) <= 253 and '.' in domain[1:-1]: - converted.append(f"{target_ip} {domain}") - continue - - # Klasyczny format hosts - if re.match(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\s+', line): - converted.append(re.sub(r'^\S+', target_ip, line, count=1)) - - return '\n'.join(converted) - -def validate_and_normalize_url(url): - """Walidacja i normalizacja adresu URL""" - parsed = urlparse(url) - if not parsed.scheme: - url = f'https://{url}' - parsed = urlparse(url) - if not parsed.netloc: - raise ValueError("Missing host in URL") - return parsed.geturl() - -def track_url_request(url): - """Rejestracja żądania dla określonego URL""" - redis_key = f"stats:url_requests:{quote(url, safe='')}" - redis_client.incr(redis_key) - -def add_recent_link(url, target_ip): - """Dodanie ostatniego linku do historii (ostatnie 10)""" - timestamp = datetime.now().isoformat() - link_data = f"{timestamp}|{url}|{target_ip}" - - with redis_client.pipeline() as pipe: - pipe.lpush("recent_links", link_data) - pipe.ltrim("recent_links", 0, 9) - pipe.execute() - redis_client.incr('stats:recent_links_added') - -def get_recent_links(): - """Pobranie ostatnich 10 linków""" - links = redis_client.lrange("recent_links", 0, 9) - parsed_links = [] - for link in links: - parts = link.decode().split("|") - if len(parts) >= 3: - parsed_links.append((parts[0], parts[1], parts[2])) - elif len(parts) == 2: - parsed_links.append((parts[0], parts[1], "127.0.0.1")) - return parsed_links - -def get_hostname(ip): - """Cache’owanie wyników reverse DNS dla danego IP""" - key = f"reverse_dns:{ip}" - cached = redis_client.get(key) - if cached: - return cached.decode() - try: - hostname = socket.gethostbyaddr(ip)[0] - except Exception: - hostname = ip - # Cache na 1 godzinę - redis_client.setex(key, 3600, hostname) - return hostname - -# Nowa funkcja do logowania requestów dla endpointu /convert -def add_recent_convert(): - """Dodaje dane żądania do listy ostatnich konwersji (/convert)""" - ip = get_client_ip() - hostname = get_hostname(ip) - user_agent = request.headers.get('User-Agent', 'Unknown') - time_str = datetime.now().astimezone().isoformat() - url = request.full_path # pełna ścieżka wraz z query string - data = { - "url": url, - "ip": ip, - "hostname": hostname, - "time": time_str, - "user_agent": user_agent - } - json_data = json.dumps(data) - redis_client.lpush("recent_converts", json_data) - redis_client.ltrim("recent_converts", 0, 49) - -@app.route('/', methods=['GET']) -def index(): - """Strona główna z formularzem""" - generated_link = None - recent_links = get_recent_links() - url_param = request.args.get('url') - target_ip = request.args.get('ip', '127.0.0.1') - - if url_param: - try: - normalized_url = validate_and_normalize_url(unquote(url_param)) - encoded_url = quote(normalized_url, safe='') - generated_link = urljoin( - request.host_url, - f"convert?url={encoded_url}&ip={target_ip}" - ) - add_recent_link(normalized_url, target_ip) - recent_links = get_recent_links() - except Exception as e: - app.logger.error(f"Error processing URL: {str(e)}") - - return render_template('form.html', - generated_link=generated_link, - recent_links=recent_links) - -@app.route('/convert') -@limiter.limit("100 per minute") -async def convert(): - """Asynchroniczny endpoint do konwersji z weryfikacją typu zawartości""" - try: - redis_client.incr('stats:convert_requests') - # Logowanie danych dla requestu do /convert - add_recent_convert() - - encoded_url = request.args.get('url') - if not encoded_url: - redis_client.incr('stats:errors_400') - abort(400, description="Missing URL parameter") - - decoded_url = unquote(encoded_url) - normalized_url = validate_and_normalize_url(decoded_url) - target_ip = request.args.get('ip', '127.0.0.1') - - # Rejestracja statystyk dotyczących URL - track_url_request(normalized_url) - redis_client.incr(f'stats:target_ips:{target_ip}') - - # Sprawdzenie pamięci podręcznej - cached = redis_client.get(cache_key(normalized_url, target_ip)) - if cached: - redis_client.incr('stats:cache_hits') - return cached.decode('utf-8'), 200, {'Content-Type': 'text/plain'} - - redis_client.incr('stats:cache_misses') - - # Asynchroniczne pobranie zasobu za pomocą aiohttp - async with aiohttp.ClientSession() as session: - async with session.get(normalized_url, timeout=15) as response: - # Sprawdzanie typu zawartości – musi zawierać "text" - content_type = response.headers.get("Content-Type", "") - if "text" not in content_type: - abort(415, description="Unsupported Media Type") - content = b"" - while True: - chunk = await response.content.read(2048) - if not chunk: - break - content += chunk - if len(content) > app.config['MAX_CONTENT_LENGTH']: - redis_client.incr('stats:errors_413') - abort(413) - - # Rejestracja rozmiaru pobranej treści - content_size = len(content) - redis_client.incrby('stats:content_size_total', content_size) - redis_client.incr('stats:content_size_count') - - converted = convert_hosts(content.decode('utf-8'), target_ip) - redis_client.setex(cache_key(normalized_url, target_ip), 43200, converted) # 12h cache - redis_client.incr('stats:conversions_success') - return converted, 200, {'Content-Type': 'text/plain'} - - except aiohttp.ClientError as e: - app.logger.error(f"Request error: {str(e)}") - redis_client.incr('stats:errors_500') - abort(500) - except ValueError as e: - app.logger.error(f"URL validation error: {str(e)}") - redis_client.incr('stats:errors_400') - abort(400) - -@app.route('/stats') -@ip_restriction -def stats(): - """Endpoint statystyk""" - stats_data = {} - target_ips = {} - url_requests = {} - user_agents = {} - client_ips = {} - - # Agregacja statystyk z Redisa - for key in redis_client.scan_iter("stats:*"): - key_str = key.decode() - value = redis_client.get(key).decode() - - if key_str.startswith('stats:target_ips:'): - ip = key_str.split(':', 2)[2] - target_ips[ip] = value - elif key_str.startswith('stats:url_requests:'): - url = unquote(key_str.split(':', 2)[2]) - url_requests[url] = value - elif key_str.startswith('stats:user_agents:'): - ua = unquote(key_str.split(':', 2)[2]) - user_agents[ua] = value - elif key_str.startswith('stats:client_ips:'): - ip = key_str.split(':', 2)[2] - client_ips[ip] = value - else: - stats_data[key_str] = value - - # Pobranie ostatnich 50 requestów dla endpointu /convert - recent_converts = [] - convert_entries = redis_client.lrange("recent_converts", 0, 49) - for entry in convert_entries: - try: - data = json.loads(entry.decode()) - recent_converts.append(data) - except Exception: - pass - - # Obliczenie średniego czasu przetwarzania żądań - processing_time_total = float(redis_client.get('stats:processing_time_total') or 0) - processing_time_count = int(redis_client.get('stats:processing_time_count') or 0) - avg_processing_time = processing_time_total / processing_time_count if processing_time_count > 0 else 0 - - # Obliczenie średniego rozmiaru pobranej treści dla /convert - content_size_total = int(redis_client.get('stats:content_size_total') or 0) - content_size_count = int(redis_client.get('stats:content_size_count') or 0) - avg_content_size = content_size_total / content_size_count if content_size_count > 0 else 0 - - # Rozszerzone statystyki dotyczące wydajności i rozmiarów danych - detailed_stats = { - "processing_time_total_sec": processing_time_total, - "processing_time_count": processing_time_count, - "processing_time_avg_sec": avg_processing_time, - "processing_time_min_sec": float(redis_client.get('stats:processing_time_min') or 0), - "processing_time_max_sec": float(redis_client.get('stats:processing_time_max') or 0), - "content_size_total_bytes": content_size_total, - "content_size_count": content_size_count, - "content_size_avg_bytes": avg_content_size - } - - # Struktura odpowiedzi - response_data = { - **stats_data, - 'target_ips': target_ips, - 'url_requests': url_requests, - 'user_agents': user_agents, - 'client_ips': client_ips, - 'recent_converts': recent_converts, - 'detailed_stats': detailed_stats - } - - return jsonify(response_data) - -@app.errorhandler(400) -@app.errorhandler(403) -@app.errorhandler(404) -@app.errorhandler(413) -@app.errorhandler(415) -@app.errorhandler(500) -def handle_errors(e): - """Obsługa błędów""" - return render_template('error.html', error=e), e.code - -# Jeśli aplikacja jest uruchamiana bezpośrednio, korzystamy z Flask's run -if __name__ == '__main__': - app.run(host='0.0.0.0', port=8283) -# W przeciwnym razie (np. przy uruchamianiu przez Gunicorn) opakowujemy aplikację w adapter ASGI -else: - from asgiref.wsgi import WsgiToAsgi - asgi_app = WsgiToAsgi(app) - diff --git a/config.py b/config.py index e704d23..21752b8 100644 --- a/config.py +++ b/config.py @@ -20,7 +20,7 @@ def getenv_float(key: str, default: float) -> float: # Podstawowe FLASK_DEBUG = getenv_bool("FLASK_DEBUG", True) -SECRET_KEY = os.getenv("SECRET_KEY", "change-me") +SECRET_KEY = os.getenv("SECRET_KEY", "secretkey") # Rozmiary/limity MAX_CONTENT_LENGTH = getenv_int("MAX_CONTENT_LENGTH", 50 * 1024 * 1024) # 50MB @@ -36,8 +36,8 @@ REDIS_DB = getenv_int("REDIS_DB", 7) # Basic Auth dla /stats STATS_BASIC_AUTH_ENABLED = getenv_bool("STATS_BASIC_AUTH_ENABLED", True) STATS_BASIC_AUTH_REALM = os.getenv("STATS_BASIC_AUTH_REALM", "Stats") -STATS_BASIC_AUTH_USER = os.getenv("STATS_BASIC_AUTH_USER", "admin") -STATS_BASIC_AUTH_PASS = os.getenv("STATS_BASIC_AUTH_PASS", "change-me") +STATS_BASIC_AUTH_USER = os.getenv("STATS_BASIC_AUTH_USER", "admin").strip() +STATS_BASIC_AUTH_PASS = os.getenv("STATS_BASIC_AUTH_PASS", "admin").strip() # Cache/ETag dla Varnisha CACHE_ENABLED = getenv_bool("CACHE_ENABLED", True) @@ -63,3 +63,8 @@ DEFAULT_SOURCE_URL = os.getenv( "DEFAULT_SOURCE_URL", "" ) + +# Debug trybu /convert +DEBUG_ENABLE = getenv_bool("DEBUG_ENABLE", False) +DEBUG_KEY = os.getenv("DEBUG_KEY", "") # ustaw w env bezpieczny losowy sekret +DEBUG_RATE_LIMIT = os.getenv("DEBUG_RATE_LIMIT", "5 per minute") \ No newline at end of file diff --git a/start_dev.sh b/start_dev.sh index 9e3e4e1..1d55796 100644 --- a/start_dev.sh +++ b/start_dev.sh @@ -1 +1,3 @@ -venv/bin/gunicorn -k uvicorn.workers.UvicornWorker --workers 4 --bind 127.0.0.1:8283 --keep-alive 30 --timeout 90 app:asgi_app \ No newline at end of file +#/bin/bash + +venv/bin/gunicorn -k uvicorn.workers.UvicornWorker --workers 1 --bind 127.0.0.1:8283 --keep-alive 30 --timeout 60 app:asgi_app \ No newline at end of file diff --git a/static/css/main.css b/static/css/main.css new file mode 100644 index 0000000..bdf6e09 --- /dev/null +++ b/static/css/main.css @@ -0,0 +1,688 @@ +:root { + --bg: #0f1115; + --bg-elev: #131722; + --card: #161b26; + --text: #e7eef7; + --muted: #a9b4c3; + --border: #243043; + --brand: #5b9dff; + --brand-2: #7bd4ff; + --success: #29c36a; + --danger: #ff5d5d; + --shadow: 0 10px 30px rgba(0, 0, 0, .35); + color-scheme: dark; +} + +[data-theme="light"] { + --bg: #f6f8fb; + --bg-elev: #fff; + --card: #fff; + --text: #1d2433; + --muted: #5b6678; + --border: #e6eaf2; + --brand: #0054e6; + --brand-2: #3aa2ff; + --success: #1a9a56; + --danger: #d14646; + --shadow: 0 8px 24px rgba(0, 0, 0, .08); + color-scheme: light; +} + +* { + box-sizing: border-box +} + +html, +body { + height: 100% +} + +body { + margin: 0; + font-family: ui-sans-serif, system-ui, "Segoe UI", Roboto, Arial, sans-serif; + background: + radial-gradient(1200px 600px at 10% -10%, rgba(91, 157, 255, .08), transparent 60%), + radial-gradient(900px 500px at 110% 0%, rgba(123, 212, 255, .10), transparent 60%), + var(--bg); + color: var(--text); +} + +/* Header */ +.site-header { + position: sticky; + top: 0; + z-index: 10; + display: flex; + justify-content: space-between; + align-items: center; + padding: 14px 18px; + background: var(--bg-elev); + border-bottom: 1px solid var(--border); + backdrop-filter: saturate(140%) blur(8px); +} + +.brand { + display: flex; + gap: 10px; + align-items: center; + font-weight: 700; + letter-spacing: .2px +} + +.brand svg { + color: var(--brand) +} + +.actions { + display: flex; + gap: 8px; + align-items: center +} + +/* Layout */ +.container { + max-width: 980px; + margin: 24px auto; + padding: 0 16px; + display: grid; + gap: 18px +} + +.card { + background: linear-gradient(180deg, var(--card), color-mix(in srgb, var(--card) 80%, #000 20%)); + border: 1px solid var(--border); + border-radius: 16px; + box-shadow: var(--shadow); +} + +.section-head { + display: flex; + justify-content: space-between; + align-items: center; + padding: 14px 16px; + border-bottom: 1px dashed var(--border) +} + +/* Hero */ +.hero { + display: flex; + align-items: center; + justify-content: space-between; + padding: 24px; + gap: 18px +} + +.hero h1 { + margin: 0 0 6px; + font-size: clamp(22px, 3.4vw, 30px) +} + +.hero .muted { + color: var(--muted) +} + +.hero-cta .large { + font-size: 1.05rem; + padding: 14px 20px +} + +/* Grid */ +.grid { + display: grid; + grid-template-columns: repeat(12, minmax(0, 1fr)); + gap: 14px +} + +.col-12 { + grid-column: span 12 +} + +.col-6 { + grid-column: span 6 +} + +@media (max-width:720px) { + .col-6 { + grid-column: span 12 + } +} + +/* Form */ +.form-card { + padding: 16px +} + +.form-group label { + display: block; + font-weight: 600; + margin-bottom: 6px +} + +input[type="url"], +input[type="text"], +select { + width: 100%; + padding: 12px 14px; + border-radius: 12px; + background: linear-gradient(0deg, var(--bg-elev), var(--bg-elev)); + border: 1px solid var(--border); + color: var(--text); + outline: none; + transition: border .15s, box-shadow .15s, transform .05s; +} + +input:focus, +select:focus { + border-color: color-mix(in srgb, var(--brand) 60%, var(--border) 40%); + box-shadow: 0 0 0 3px color-mix(in srgb, var(--brand) 30%, transparent); +} + +.hint { + color: var(--muted); + display: block; + margin-top: 6px; + font-size: .9rem +} + +.error { + color: var(--danger); + min-height: 1.2em; + margin-top: 6px; + font-size: .9rem +} + +.form-actions { + display: flex; + gap: 10px; + align-items: center +} + +/* Result */ +.result-box { + margin-top: 14px; + padding: 12px; + border: 1px dashed var(--border); + border-radius: 12px; + background: var(--bg-elev) +} + +.result-row { + display: flex; + gap: 10px; + align-items: center +} + +.result-row input[readonly] { + flex: 1 1 auto; + min-width: 0 +} + +.result-buttons { + display: flex; + gap: 8px +} + +/* Recent */ +.recent-card { + padding: 0 +} + +.recent-list { + padding: 12px +} + +.link-item { + display: flex; + flex-direction: column; + gap: 6px; + padding: 12px; + border: 1px solid var(--border); + border-radius: 12px; + background: linear-gradient(180deg, var(--bg-elev), color-mix(in srgb, var(--bg-elev) 92%, #000 8%)); + transition: transform .12s ease-out, border-color .15s; +} + +.link-item:hover { + transform: translateY(-2px); + border-color: color-mix(in srgb, var(--brand) 40%, var(--border) 60%) +} + +.link-main { + display: flex; + gap: 8px; + align-items: center; + overflow: auto; + scrollbar-width: thin +} + +.link-main { + display: grid; + grid-template-columns: 1fr auto auto; + gap: 8px; + align-items: center +} + +.link-main .mono.ellipsis:first-child { + min-width: 0 +} + +.mono { + font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; + white-space: nowrap +} + +.arrow { + opacity: .6 +} + +.link-meta { + display: flex; + justify-content: space-between; + gap: 8px; + align-items: center +} + +.timestamp { + color: var(--muted); + font-size: .92rem +} + +.link-actions { + display: flex; + gap: 6px +} + +/* Footer */ +.site-footer { + display: flex; + flex-wrap: wrap; + gap: 8px; + align-items: center; + justify-content: space-between; + margin: 28px auto; + padding: 10px 16px; + max-width: 980px; + color: var(--muted) +} + +.site-footer a { + color: color-mix(in srgb, var(--brand) 80%, var(--text) 20%) +} + +/* Buttons */ +.btn { + -webkit-tap-highlight-color: transparent; + appearance: none; + border: none; + cursor: pointer; + user-select: none; + border-radius: 12px; + padding: 10px 14px; + font-weight: 700; + letter-spacing: .2px; + background: linear-gradient(180deg, color-mix(in srgb, var(--brand) 80%, var(--brand-2) 20%), var(--brand)); + color: #fff; + box-shadow: 0 10px 20px color-mix(in srgb, var(--brand) 35%, transparent); + transition: transform .04s ease, filter .15s ease, box-shadow .15s ease; +} + +.btn:hover { + filter: brightness(1.05) +} + +.btn:active { + transform: translateY(1px) +} + +.btn.outline { + background: transparent; + color: var(--text); + border: 1px solid color-mix(in srgb, var(--brand) 60%, var(--border) 40%) +} + +.btn.ghost { + background: transparent; + color: var(--text); + border: 1px solid var(--border) +} + +.btn.tiny { + padding: 6px 10px; + font-weight: 600; + border-radius: 10px +} + +.btn.large { + padding: 14px 20px; + border-radius: 14px +} + +/* Toast */ +#toast { + position: fixed; + left: 50%; + bottom: 24px; + transform: translateX(-50%) translateY(20px); + background: var(--bg-elev); + color: var(--text); + border: 1px solid var(--border); + border-radius: 12px; + padding: 10px 14px; + opacity: 0; + box-shadow: var(--shadow); + pointer-events: none; + transition: opacity .2s, transform .2s; +} + +#toast.show { + opacity: 1; + transform: translateX(-50%) translateY(0) +} + +/* Links & helpers */ +a { + color: color-mix(in srgb, var(--brand) 80%, var(--text) 20%); + text-decoration: none +} + +a:hover { + text-decoration: underline +} + +.ellipsis { + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap +} + +select.select, +.select { + appearance: none; + background: var(--bg-elev); + color: var(--text); + border: 1px solid var(--border) +} + +select option { + background: var(--bg-elev); + color: var(--text) +} + +select:focus { + border-color: color-mix(in srgb, var(--brand) 60%, var(--border) 40%); + box-shadow: 0 0 0 3px color-mix(in srgb, var(--brand) 30%, transparent); +} + +.nowrap { + white-space: nowrap +} + +/* Stats */ +.kpi-card { + padding: 16px +} + +.section-title { + margin: 10px 12px 0 +} + +.kpi-grid { + display: grid; + gap: 12px; + grid-template-columns: repeat(6, minmax(0, 1fr)) +} + +@media (max-width:980px) { + .kpi-grid { + grid-template-columns: repeat(3, 1fr) + } +} + +@media (max-width:640px) { + .kpi-grid { + grid-template-columns: repeat(2, 1fr) + } +} + +.kpi { + border: 1px solid var(--border); + border-radius: 12px; + padding: 12px; + background: linear-gradient(180deg, var(--bg-elev), color-mix(in srgb, var(--bg-elev) 92%, #000 8%)) +} + +.kpi-label { + color: var(--muted); + font-weight: 600; + font-size: .9rem +} + +.kpi-value { + font-size: 1.4rem; + font-weight: 800; + margin-top: 4px +} + +.table-wrap { + overflow: auto +} + +.data-table { + width: 100%; + border-collapse: collapse; + font-size: .98rem +} + +.data-table th, +.data-table td { + padding: 10px; + border-bottom: 1px solid var(--border); + vertical-align: top +} + +.data-table thead th { + position: sticky; + top: 0; + background: var(--bg-elev); + z-index: 1 +} + +.data-table .right { + text-align: right +} + +.scrollbox { + max-height: 320px; + overflow: auto; + padding: 12px; + margin: 0; + background: linear-gradient(180deg, var(--bg-elev), color-mix(in srgb, var(--bg-elev) 92%, #000 8%)); + border: 1px solid var(--border); + border-radius: 12px; +} + +.subhead { + margin: 10px 6px +} + +.table-filter { + padding: 8px 12px; + border-radius: 10px; + border: 1px solid var(--border); + background: var(--bg-elev); + color: var(--text); + min-width: 220px +} + +/* Stats wide container */ +.container.container--wide { + max-width: 1280px; + padding: 0 20px +} + +.container.container--wide .card { + padding: 16px +} + +.container.container--wide .section-head { + padding: 12px 4px; + border-bottom: 1px dashed var(--border) +} + +.container.container--wide .data-table { + table-layout: fixed; + font-size: .96rem; + line-height: 1.35 +} + +.container.container--wide .data-table th, +.container.container--wide .data-table td { + padding: 8px 10px +} + +.container.container--wide .data-table td:nth-child(2), +.container.container--wide .data-table td:nth-child(5) { + max-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.container.container--wide .data-table tbody tr:nth-child(odd) td { + background: color-mix(in srgb, var(--bg-elev) 96%, #000 4%) +} + +.container.container--wide .table-wrap { + overflow: auto; + scrollbar-width: thin; + -webkit-overflow-scrolling: touch +} + +.container.container--wide .kpi-value { + font-size: 1.5rem +} + +@media (max-width:720px) { + .container.container--wide { + max-width: 100%; + padding: 0 12px + } + + .container.container--wide .data-table { + font-size: .94rem + } +} + +/* Error page */ +.error-card { + padding: 16px +} + +.error-hero { + display: flex; + gap: 18px; + align-items: center; + padding: 8px 6px 16px +} + +.error-illustration { + font-size: clamp(44px, 8vw, 72px); + filter: drop-shadow(0 10px 20px rgba(0, 0, 0, .25)) +} + +.error-main { + flex: 1 1 auto +} + +.status-badge { + display: inline-block; + padding: 6px 10px; + border-radius: 999px; + background: color-mix(in srgb, var(--danger) 18%, var(--bg-elev)); + border: 1px solid color-mix(in srgb, var(--danger) 60%, var(--border) 40%); + color: var(--text); + font-weight: 700; + letter-spacing: .2px; + margin-bottom: 6px; +} + +.error-title { + margin: 4px 0 6px; + font-size: clamp(22px, 3.4vw, 28px) +} + +.error-actions { + display: flex; + gap: 10px; + flex-wrap: wrap; + margin-top: 10px +} + +.error-details { + margin-top: 12px +} + +.error-details>summary { + list-style: none; + cursor: pointer; + padding: 10px 12px; + border: 1px solid var(--border); + border-radius: 10px; + background: var(--bg-elev); + color: var(--text); + display: flex; + align-items: center; + gap: 8px; +} + +.error-details>summary::-webkit-details-marker { + display: none +} + +.error-details[open]>summary { + border-bottom-left-radius: 0; + border-bottom-right-radius: 0 +} + +.summary-title { + font-weight: 700 +} + +.summary-hint { + color: var(--muted); + font-size: .9rem +} + +.details-body { + border: 1px solid var(--border); + border-top: none; + border-radius: 0 0 10px 10px; + background: var(--bg-elev) +} + +#error-dump { + margin: 0; + padding: 12px; + max-height: 360px; + overflow: auto; + background: linear-gradient(180deg, var(--bg-elev), color-mix(in srgb, var(--bg-elev) 92%, #000 8%)); + border-bottom: 1px solid var(--border); + white-space: pre-wrap; + word-break: break-word; + overflow-wrap: anywhere; +} + +@media (max-width:720px) { + .error-card { + padding: 12px + } + + .error-details>summary { + padding: 8px 10px + } + + #error-dump { + max-height: 300px + } +} \ No newline at end of file diff --git a/static/js/error.js b/static/js/error.js new file mode 100644 index 0000000..671f510 --- /dev/null +++ b/static/js/error.js @@ -0,0 +1,25 @@ +(function () { + const t = localStorage.getItem('theme') || 'dark'; + document.documentElement.setAttribute('data-theme', t); + // prosty "try again" + document.querySelector('[data-action="try-again"]')?.addEventListener('click', () => { + location.reload(); + }); + // kopiowanie logs + document.querySelector('[data-action="copy-text"]')?.addEventListener('click', (e) => { + const sel = e.currentTarget.getAttribute('data-target'); + const el = sel && document.querySelector(sel); + if (!el) return; + const txt = el.textContent || ''; + navigator.clipboard.writeText(txt).then(() => { + const toast = document.getElementById('toast'); + if (toast) { + toast.textContent = 'Copied!'; + toast.classList.add('show'); + setTimeout(() => toast.classList.remove('show'), 1200); + } + }); + }); +})(); + + diff --git a/static/js/main.js b/static/js/main.js new file mode 100644 index 0000000..c73c70d --- /dev/null +++ b/static/js/main.js @@ -0,0 +1,161 @@ +(function () { + + const $ = (q, c = document) => c.querySelector(q); + const $$ = (q, c = document) => Array.from(c.querySelectorAll(q)); + const setTheme = (t) => { document.documentElement.setAttribute('data-theme', t); try { localStorage.setItem('theme', t) } catch { } }; + const toast = (msg) => { + const el = $('#toast'); if (!el) return; + el.textContent = msg; el.classList.add('show'); + clearTimeout(el._t); el._t = setTimeout(() => el.classList.remove('show'), 2000); + }; + const host = () => `${location.protocol}//${location.host}`; + + function buildLink(url, ip) { + if (!url || !ip) return ''; + try { + const enc = encodeURIComponent(url); + const ipClean = (ip || '').trim(); + return `${host()}/convert?url=${enc}&ip=${encodeURIComponent(ipClean)}`; + } catch { return ''; } + } + + document.addEventListener('click', (e) => { + const t = e.target.closest('[data-action="toggle-theme"]'); + if (t) { + e.preventDefault(); + const cur = document.documentElement.getAttribute('data-theme') || 'dark'; + setTheme(cur === 'dark' ? 'light' : 'dark'); + } + }); + + const urlInput = $('#url-input'); + const ipInput = $('#ip-input'); + const ipPreset = $('#ip-preset'); + const out = $('#generated-link'); + const openBtn = $('#open-link'); + + function updatePreview() { + const link = buildLink(urlInput.value.trim(), ipInput.value.trim()); + out.value = link || ''; + if (link) { + openBtn.setAttribute('href', link); + openBtn.setAttribute('aria-disabled', 'false'); + } else { + openBtn.setAttribute('href', '#'); + openBtn.setAttribute('aria-disabled', 'true'); + } + $('.result-box')?.setAttribute('data-state', link ? 'ready' : 'empty'); + } + + ['input', 'change', 'blur'].forEach(evt => { + urlInput?.addEventListener(evt, updatePreview); + ipInput?.addEventListener(evt, updatePreview); + }); + + ipPreset?.addEventListener('change', () => { + const v = ipPreset.value; + if (!v) return; + if (v !== 'custom') ipInput.value = v; + ipInput.focus(); + updatePreview(); + }); + + document.addEventListener('click', (e) => { + let t = e.target; + + if (t.closest('[data-action="copy"]')) { + e.preventDefault(); + const btn = t.closest('[data-action="copy"]'); + const sel = btn.getAttribute('data-target') || '#generated-link'; + const el = $(sel); + if (!el) return; + const text = el.value || el.textContent || ''; + navigator.clipboard?.writeText(text).then(() => { + btn.classList.add('copied'); setTimeout(() => btn.classList.remove('copied'), 1200); + toast('Link copied'); + }).catch(() => { + // Fallback + const range = document.createRange(); range.selectNodeContents(el); + const selObj = getSelection(); selObj.removeAllRanges(); selObj.addRange(range); + try { document.execCommand('copy'); toast('Link copied'); } catch { } + selObj.removeAllRanges(); + }); + } + + if (t.closest('[data-action="copy-text"]')) { + e.preventDefault(); + const btn = t.closest('[data-action="copy-text"]'); + const text = btn.getAttribute('data-text') || ''; + if (!text) return; + navigator.clipboard?.writeText(text).then(() => toast('Copied')); + } + + if (t.closest('[data-action="clear"]')) { + e.preventDefault(); + urlInput.value = ''; + + updatePreview(); + urlInput.focus(); + } + + if (t.closest('[data-action="collapse"]')) { + e.preventDefault(); + const btn = t.closest('[data-action="collapse"]'); + const panel = $('#' + (btn.getAttribute('aria-controls') || '')); + if (!panel) return; + const expanded = btn.getAttribute('aria-expanded') === 'true'; + btn.setAttribute('aria-expanded', expanded ? 'false' : 'true'); + panel.style.display = expanded ? 'none' : ''; + } + }); + + function showError(input, msg) { + const id = input.getAttribute('id'); + const box = document.querySelector(`.error[data-error-for="${id}"]`); + if (box) box.textContent = msg || ''; + input.setAttribute('aria-invalid', msg ? 'true' : 'false'); + } + + urlInput?.addEventListener('blur', () => { + const v = urlInput.value.trim(); + if (!v) return showError(urlInput, ''); + try { new URL(v); showError(urlInput, ''); } + catch { showError(urlInput, 'Invalid URL'); } + }); + + ipInput?.addEventListener('blur', () => { + const v = ipInput.value.trim(); + if (!v) return showError(ipInput, ''); + const ok = /^\b\d{1,3}(?:\.\d{1,3}){3}\b$/.test(v); + showError(ipInput, ok ? '' : 'Invalid IPv4 address'); + }); + + + (function init() { + const serverLink = out?.value?.trim(); + if (serverLink) { + $('.result-box')?.setAttribute('data-state', 'ready'); + openBtn?.setAttribute('aria-disabled', 'false'); + } else { + updatePreview(); + } + })(); + + document.addEventListener('keydown', (e) => { + if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'c') { + const text = out?.value?.trim(); if (!text) return; + navigator.clipboard?.writeText(text).then(() => toast('Link copied')); + } + }); +})(); + +function updateThemeColor() { + const meta = document.querySelector('meta[name="theme-color"]'); + if (!meta) return; + const isLight = document.documentElement.getAttribute('data-theme') === 'light'; + meta.setAttribute('content', isLight ? '#f6f8fb' : '#0f1115'); +} + +const _setTheme = setTheme; +setTheme = function (t) { _setTheme(t); updateThemeColor(); }; +document.addEventListener('DOMContentLoaded', updateThemeColor); diff --git a/static/js/stats.js b/static/js/stats.js new file mode 100644 index 0000000..79364d8 --- /dev/null +++ b/static/js/stats.js @@ -0,0 +1,11 @@ +document.addEventListener('input', (e) => { + const el = e.target.closest('[data-action="filter-table"]'); + if (!el) return; + const table = document.querySelector(el.getAttribute('data-target') || ''); + if (!table) return; + const q = (el.value || '').toLowerCase(); + table.querySelectorAll('tbody tr').forEach(tr => { + const text = (tr.innerText || tr.textContent || '').toLowerCase(); + tr.style.display = text.includes(q) ? '' : 'none'; + }); +}); \ No newline at end of file diff --git a/templates/error.html b/templates/error.html index 3e82c06..53ec862 100644 --- a/templates/error.html +++ b/templates/error.html @@ -1,87 +1,87 @@ - + + - - - Error {{ error.code }} - + + + Error {{ error.code or 500 }} + + + + -
-

Error {{ error.code }}

-

{{ error.description }}

- ← Return to Home Page -
+
+
+ + Hosts Converter +
+ +
+ +
+
+
+ + +
+
Error {{ error.code or 500 }}
+

+ {% if (error.code or 500) == 400 %}Bad request + {% elif (error.code or 500) == 403 %}Forbidden + {% elif (error.code or 500) == 404 %}Not found + {% elif (error.code or 500) == 413 %}Payload too large + {% elif (error.code or 500) == 415 %}Unsupported media type + {% elif (error.code or 500) == 500 %}Internal server error + {% else %}Something went wrong + {% endif %} +

+

{{ (error.description|string)|e }}

+ +
+ + Go home +
+
+
+ +
+ + Error details + click to expand + +
+ 
+code: {{ error.code or 500 }}
+message: {{ (error.description|string) }}
+path: {{ request.path if request else '/' }}
+method: {{ request.method if request else 'GET' }}
+user_ip: {{ request.remote_addr if request else '' }}
+user_agent: {{ request.headers.get('User-Agent') if request else '' }}
+
+
+ +
+
+
+
+
+ +
+
© 2025 linuxiarz.pl
+
Your IP: {{ request.remote_addr if request else '' }}
+
+ +
+ + + - + + \ No newline at end of file diff --git a/templates/form.html b/templates/form.html index 985de5c..9885f4a 100644 --- a/templates/form.html +++ b/templates/form.html @@ -1,292 +1,152 @@ - + + - - + + Hosts Converter - + + + - - -

Hosts File Converter

- -
-
- - + +
+
+ + Hosts Converter
+ +
-
- - -
- - - - - {% if generated_link %} -
-

Link to MikroTik/Adguard:

- - -
- {% endif %} - -
-

Last converts:

- {% if recent_links %} - {% for link_data in recent_links %} -
-
{{ link_data[0]|datetimeformat }}
- - {{ link_data[1] }} → {{ link_data[2] }} - +
+
+
+

Convert adblock lists to MikroTik / hosts

+

Paste a list URL (AdGuard/uBlock/hosts/dnsmasq), pick the target IP, and generate a + /convert link. +

- {% endfor %} - {% else %} -

Empty..

- {% endif %} -
+
+ Start +
+ -
- © 2025 linuxiarz.pl - All rights reserved
- Your IP address: {{ client_ip }} | Your User Agent: {{ user_agent }} +
+

Link generator

+ +
+
+
+ + + Supported formats: ||domain^, + address=/domain/, hosts files, plain domains. +
+
+ +
+ + + Common choices: 0.0.0.0, 127.0.0.1, + or your device IP. +
+
+ +
+ + +
+ +
+ + +
+
+
+ +
+
+ +
+ + Open +
+
+ The preview updates live while you type. +
+
+ +
+
+

Recent converts

+
+ +
+
+ + +
+ + +
+
© 2025 linuxiarz.pl · All rights + reserved
+
Your IP: {{ client_ip }} · UA: {{ user_agent }}
+
+ + - + + \ No newline at end of file diff --git a/templates/form_light.html b/templates/form_light.html deleted file mode 100644 index f43100b..0000000 --- a/templates/form_light.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - Hosts Converter - - - -

Hosts File Converter

- -
-

- -

-

- -

- -
- - {% if generated_link %} -
-

Link to MikroTik/Adguard:

- - -
- {% endif %} - -
-

Last converts:

- {% if recent_links %} - {% for link_data in recent_links %} -
-
{{ link_data[0]|datetimeformat }}
- - {{ link_data[1] }} → {{ link_data[2] }} - -
- {% endfor %} - {% else %} -

Empty..

- {% endif %} -
- - - - diff --git a/templates/stats.html b/templates/stats.html index 06bff9c..b47c2c0 100644 --- a/templates/stats.html +++ b/templates/stats.html @@ -1,16 +1,216 @@ - - + + - Statistics + + + Stats + + + + -

Download Statistics

- - - {% for url, count in stats.items() %} - - {% endfor %} -
URLHits
{{ url }}{{ count }}
+
+
+ + Hosts Converter +
+ +
+ +
+ +
+

Overview

+
+
+
Convert requests
+
{{ stats.get('stats:convert_requests', 0) }}
+
+
+
Successful conversions
+
{{ stats.get('stats:conversions_success', 0) }}
+
+
+
Errors 4xx
+
{{ stats.get('stats:errors_400', 0) }}
+
+
+
Errors 5xx
+
{{ stats.get('stats:errors_500', 0) }}
+
+
+
Avg processing (s)
+
{{ '%.3f' % detailed.processing_time_avg_sec }}
+
+
+
Avg content (bytes)
+
{{ detailed.content_size_avg_bytes }}
+
+
+
+ + +
+
+

Recent converts (latest {{ recent|length }})

+
+ +
+
+
+ + + + + + + + + + + + + {% for row in recent %} + {% set q = row.get('url','') %} + {% set parts = q.split('&ip=') %} + {% set url = parts[0].replace('/convert?url=', '') | urlencode %} + {% set ip = (parts[1] if parts|length > 1 else '') %} + + + + + + + + + {% endfor %} + +
TimeURLTarget IPClientUser agent
{{ row.time|datetimeformat }} + {{ url|safe }} + {{ ip }} + {{ row.hostname }} ({{ row.ip }}) + {{ row.user_agent }} + Open + +
+
+
+ + +
+
+

Top sources

+
+
+
+

Source URLs

+
+ + + + + + + + + {% for u, c in url_requests.items()|sort(attribute=1, reverse=True) %} + + + + + {% endfor %} + +
URLHits
{{ u }}{{ c }}
+
+
+ +
+

Target IPs

+
+ + + + + + + + + {% for ip, c in target_ips.items()|sort(attribute=1, reverse=True) %} + + + + + {% endfor %} + +
IPHits
{{ ip }}{{ c }}
+
+
+ +
+

User agents

+
+ + + + + + + + + {% for ua, c in user_agents.items()|sort(attribute=1, reverse=True) %} + + + + + {% endfor %} + +
User agentHits
{{ ua }}{{ c }}
+
+
+ +
+

Client IPs

+
+ + + + + + + + + {% for ip, c in client_ips.items()|sort(attribute=1, reverse=True) %} + + + + + {% endfor %} + +
Client IPHits
{{ ip }}{{ c }}
+
+
+
+
+ +
+ +
+
© 2025 linuxiarz.pl
+
Your IP: {{ request.remote_addr }}
+
+ +
+ + + - + + \ No newline at end of file From 9546bb4edbfeaf6e1515008201ecb5b0e444e111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Fri, 29 Aug 2025 12:03:47 +0200 Subject: [PATCH 03/14] clean code --- app.py | 159 +++++++++++++++++++++++++++++++++++++++--------- listapp.service | 16 +++-- 2 files changed, 137 insertions(+), 38 deletions(-) diff --git a/app.py b/app.py index 413b56a..46c55d7 100644 --- a/app.py +++ b/app.py @@ -13,7 +13,16 @@ from typing import Optional from datetime import timezone import json as _json -from flask import Flask, request, render_template, abort, jsonify, stream_with_context, g, Response +from flask import ( + Flask, + request, + render_template, + abort, + jsonify, + stream_with_context, + g, + Response, +) from flask_compress import Compress from flask_limiter import Limiter import config @@ -24,35 +33,45 @@ app.config["MAX_CONTENT_LENGTH"] = config.MAX_CONTENT_LENGTH app.config["SECRET_KEY"] = config.SECRET_KEY app.debug = config.FLASK_DEBUG + def build_redis(): if config.REDIS_URL: return redis.Redis.from_url(config.REDIS_URL) - return redis.Redis(host=config.REDIS_HOST, port=config.REDIS_PORT, db=config.REDIS_DB) + return redis.Redis( + host=config.REDIS_HOST, port=config.REDIS_PORT, db=config.REDIS_DB + ) + redis_client = build_redis() + def get_client_ip(): xff = request.headers.get("X-Forwarded-For", "").split(",") if xff and xff[0].strip(): return xff[0].strip() return request.remote_addr + limiter = Limiter( key_func=get_client_ip, app=app, default_limits=[config.RATE_LIMIT_DEFAULT], - storage_uri=config.REDIS_URL + storage_uri=config.REDIS_URL, ) Compress(app) + @app.before_request def track_request_data(): g.start_time = time.perf_counter() - redis_client.incr(f"stats:user_agents:{quote(request.headers.get('User-Agent', 'Unknown'), safe='')}") + redis_client.incr( + f"stats:user_agents:{quote(request.headers.get('User-Agent', 'Unknown'), safe='')}" + ) redis_client.incr(f"stats:client_ips:{get_client_ip()}") redis_client.incr(f"stats:methods:{request.method}") + @app.after_request def add_cache_headers(response): if request.path.startswith("/static/"): @@ -85,6 +104,7 @@ def after_request(response): redis_client.set("stats:processing_time_max", elapsed) return response + @app.template_filter("datetimeformat") def datetimeformat_filter(value, format="%Y-%m-%d %H:%M"): try: @@ -93,6 +113,7 @@ def datetimeformat_filter(value, format="%Y-%m-%d %H:%M"): except (ValueError, AttributeError): return value + def basic_auth_required(realm: str, user: str, password: str): def decorator(f): @wraps(f) @@ -100,29 +121,43 @@ def basic_auth_required(realm: str, user: str, password: str): if not config.STATS_BASIC_AUTH_ENABLED: return f(*args, **kwargs) - auth = request.authorization + auth = request.authorization - if auth and auth.type == "basic" and auth.username == user and auth.password == password: + if ( + auth + and auth.type == "basic" + and auth.username == user + and auth.password == password + ): return f(*args, **kwargs) resp = Response(status=401) resp.headers["WWW-Authenticate"] = f'Basic realm="{realm}"' return resp + return wrapper + return decorator + def cache_key(source_url, ip): return f"cache:{source_url}:{ip}" + def should_ignore_domain(domain): - return domain.startswith(".") or any(ch in domain for ch in ["~", "=", "$", "'", "^", "_", ">", "<", ":"]) + return domain.startswith(".") or any( + ch in domain for ch in ["~", "=", "$", "'", "^", "_", ">", "<", ":"] + ) + def should_ignore_line(line): return any(sym in line for sym in ["<", ">", "##", "###", "div", "span"]) + def is_valid_domain(domain): return bool(re.compile(r"^(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$").match(domain)) + def is_private_client_ip() -> bool: ip = get_client_ip() try: @@ -130,6 +165,7 @@ def is_private_client_ip() -> bool: except Exception: return False + def convert_host_line(line: str, target_ip: str): # szybkie odrzucenia if not line: @@ -178,26 +214,32 @@ def convert_host_line(line: str, target_ip: str): return None -def build_etag(up_etag: Optional[str], up_lastmod: Optional[str], target_ip: str) -> str: +def build_etag( + up_etag: Optional[str], up_lastmod: Optional[str], target_ip: str +) -> str: base = (up_etag or up_lastmod or "no-upstream") + f"::{target_ip}::v1" return 'W/"' + hashlib.sha1(base.encode("utf-8")).hexdigest() + '"' + def cache_headers(etag: str, up_lm: Optional[str]): headers = { "ETag": etag, "Vary": "Accept-Encoding", "Content-Type": "text/plain; charset=utf-8", "X-Content-Type-Options": "nosniff", - #"Content-Disposition": "inline; filename=converted_hosts.txt", + # "Content-Disposition": "inline; filename=converted_hosts.txt", } if config.CACHE_ENABLED: - headers["Cache-Control"] = f"public, s-maxage={config.CACHE_S_MAXAGE}, max-age={config.CACHE_MAX_AGE}" + headers["Cache-Control"] = ( + f"public, s-maxage={config.CACHE_S_MAXAGE}, max-age={config.CACHE_MAX_AGE}" + ) else: headers["Cache-Control"] = "no-store" if up_lm: headers["Last-Modified"] = up_lm return headers + def validate_and_normalize_url(url): parsed = urlparse(url) if not parsed.scheme: @@ -207,6 +249,7 @@ def validate_and_normalize_url(url): raise ValueError("Missing host in URL") return parsed.geturl() + def track_url_request(url): redis_client.incr(f"stats:url_requests:{quote(url, safe='')}") @@ -220,6 +263,7 @@ def add_recent_link(url, target_ip): pipe.execute() redis_client.incr("stats:recent_links_added") + def get_recent_links(): links = redis_client.lrange("recent_links", 0, 9) out = [] @@ -231,6 +275,7 @@ def get_recent_links(): out.append((parts[0], parts[1], "127.0.0.1")) return out + def get_hostname(ip): key = f"reverse_dns:{ip}" cached = redis_client.get(key) @@ -243,20 +288,29 @@ def get_hostname(ip): redis_client.setex(key, 3600, hostname) return hostname + def add_recent_convert(): ip = get_client_ip() hostname = get_hostname(ip) ua = request.headers.get("User-Agent", "Unknown") time_str = datetime.now().astimezone().isoformat() url = request.full_path - data = {"url": url, "ip": ip, "hostname": hostname, "time": time_str, "user_agent": ua} + data = { + "url": url, + "ip": ip, + "hostname": hostname, + "time": time_str, + "user_agent": ua, + } redis_client.lpush("recent_converts", json.dumps(data)) - redis_client.ltrim("recent_converts", 0, 99) + redis_client.ltrim("recent_converts", 0, 99) + @app.route("/favicon.ico", methods=["GET"]) def favicon(): return Response(status=204) + @app.route("/", methods=["GET"]) def index(): generated_link = None @@ -268,7 +322,9 @@ def index(): try: normalized = validate_and_normalize_url(unquote(url_param)) encoded = quote(normalized, safe="") - generated_link = urljoin(request.host_url, f"convert?url={encoded}&ip={target_ip}") + generated_link = urljoin( + request.host_url, f"convert?url={encoded}&ip={target_ip}" + ) add_recent_link(normalized, target_ip) recent_links = get_recent_links() except Exception as e: @@ -292,6 +348,7 @@ def index(): } ) + @app.route("/convert") @limiter.limit(config.RATE_LIMIT_CONVERT) def convert(): @@ -304,11 +361,22 @@ def convert(): except Exception: return False - requested_debug = request.args.get("debug", "").lower() in ("1","true","t","yes","y","on") + requested_debug = request.args.get("debug", "").lower() in ( + "1", + "true", + "t", + "yes", + "y", + "on", + ) debug_allowed = False if config.DEBUG_ENABLE: header_key = request.headers.get("X-Debug-Key", "") - if config.DEBUG_KEY and header_key and hmac.compare_digest(header_key, config.DEBUG_KEY): + if ( + config.DEBUG_KEY + and header_key + and hmac.compare_digest(header_key, config.DEBUG_KEY) + ): debug_allowed = True elif is_private_client_ip(): debug_allowed = True @@ -378,7 +446,9 @@ def convert(): d("Wysyłam GET do upstreamu") d(f"Nagłówki: {req_headers or '{}'}") - r = requests.get(normalized_url, headers=req_headers, stream=True, timeout=(10, 60)) + r = requests.get( + normalized_url, headers=req_headers, stream=True, timeout=(10, 60) + ) ct = r.headers.get("Content-Type", "") if debug_mode: @@ -396,7 +466,9 @@ def convert(): abort(415, description="Unsupported Media Type") if r.status_code == 304: - etag = build_etag(r.headers.get("ETag"), r.headers.get("Last-Modified"), target_ip) + etag = build_etag( + r.headers.get("ETag"), r.headers.get("Last-Modified"), target_ip + ) if debug_mode: d("Upstream 304 – zwracam 304") r.close() @@ -421,7 +493,9 @@ def convert(): if debug_mode: yield "\n".join(debug_lines) + "\n" debug_lines.clear() - for line in r.iter_lines(decode_unicode=True, chunk_size=config.READ_CHUNK): + for line in r.iter_lines( + decode_unicode=True, chunk_size=config.READ_CHUNK + ): if line is None: continue lines_read += 1 @@ -511,7 +585,6 @@ def stats(): else: stats_data[key_str] = value - recent_converts = [] for entry in redis_client.lrange("recent_converts", 0, 99): try: @@ -522,18 +595,28 @@ def stats(): # Agregaty szczegółowe processing_time_total = float(redis_client.get("stats:processing_time_total") or 0) processing_time_count = int(redis_client.get("stats:processing_time_count") or 0) - avg_processing_time = processing_time_total / processing_time_count if processing_time_count > 0 else 0 + avg_processing_time = ( + processing_time_total / processing_time_count + if processing_time_count > 0 + else 0 + ) content_size_total = int(redis_client.get("stats:content_size_total") or 0) content_size_count = int(redis_client.get("stats:content_size_count") or 0) - avg_content_size = content_size_total / content_size_count if content_size_count > 0 else 0 + avg_content_size = ( + content_size_total / content_size_count if content_size_count > 0 else 0 + ) detailed_stats = { "processing_time_total_sec": processing_time_total, "processing_time_count": processing_time_count, "processing_time_avg_sec": avg_processing_time, - "processing_time_min_sec": float(redis_client.get("stats:processing_time_min") or 0), - "processing_time_max_sec": float(redis_client.get("stats:processing_time_max") or 0), + "processing_time_min_sec": float( + redis_client.get("stats:processing_time_min") or 0 + ), + "processing_time_max_sec": float( + redis_client.get("stats:processing_time_max") or 0 + ), "content_size_total_bytes": content_size_total, "content_size_count": content_size_count, "content_size_avg_bytes": avg_content_size, @@ -602,18 +685,28 @@ def stats_json(): processing_time_total = float(redis_client.get("stats:processing_time_total") or 0) processing_time_count = int(redis_client.get("stats:processing_time_count") or 0) - avg_processing_time = processing_time_total / processing_time_count if processing_time_count > 0 else 0 + avg_processing_time = ( + processing_time_total / processing_time_count + if processing_time_count > 0 + else 0 + ) content_size_total = int(redis_client.get("stats:content_size_total") or 0) content_size_count = int(redis_client.get("stats:content_size_count") or 0) - avg_content_size = content_size_total / content_size_count if content_size_count > 0 else 0 + avg_content_size = ( + content_size_total / content_size_count if content_size_count > 0 else 0 + ) detailed_stats = { "processing_time_total_sec": processing_time_total, "processing_time_count": processing_time_count, "processing_time_avg_sec": avg_processing_time, - "processing_time_min_sec": float(redis_client.get("stats:processing_time_min") or 0), - "processing_time_max_sec": float(redis_client.get("stats:processing_time_max") or 0), + "processing_time_min_sec": float( + redis_client.get("stats:processing_time_min") or 0 + ), + "processing_time_max_sec": float( + redis_client.get("stats:processing_time_max") or 0 + ), "content_size_total_bytes": content_size_total, "content_size_count": content_size_count, "content_size_avg_bytes": avg_content_size, @@ -642,13 +735,21 @@ def handle_errors(e): try: now_iso = datetime.now().astimezone().isoformat() - return render_template("error.html", error=e, code=getattr(e, "code", 500), now_iso=now_iso), getattr(e, "code", 500) + return render_template( + "error.html", error=e, code=getattr(e, "code", 500), now_iso=now_iso + ), getattr(e, "code", 500) except Exception: - return jsonify({"error": getattr(e, "description", str(e)), "code": getattr(e, "code", 500)}), getattr(e, "code", 500) + return jsonify( + { + "error": getattr(e, "description", str(e)), + "code": getattr(e, "code", 500), + } + ), getattr(e, "code", 500) if __name__ == "__main__": app.run(host=config.BIND_HOST, port=config.BIND_PORT) else: from asgiref.wsgi import WsgiToAsgi + asgi_app = WsgiToAsgi(app) diff --git a/listapp.service b/listapp.service index 29c9b75..862845e 100644 --- a/listapp.service +++ b/listapp.service @@ -1,21 +1,19 @@ [Unit] -Description=ListApp - Flask application for hosts file conversion +Description=Mikrotik Adlist - Flask application for hosts file conversion After=network-online.target redis.service Wants=network-online.target [Service] User=www-data Group=www-data -WorkingDirectory=/var/www/listapp -# Globalne env + nadpisania (opcjonalne; minus oznacza „jeśli istnieje”) -EnvironmentFile=-/var/www/listapp/.env +# główny katalog aplikacji +Environment="APP_DIR=/var/www/adlist_mikrotik" +WorkingDirectory=/var/www/adlist_mikrotik +EnvironmentFile=-/var/www/adlist_mikrotik/.env +Environment="PATH=${APP_DIR}/venv/bin" -# Ścieżka do virtualenv -Environment="PATH=/var/www/listapp/venv/bin" - -# Gunicorn + UvicornWorker (ASGI) -ExecStart=/var/www/listapp/venv/bin/gunicorn \ +ExecStart=${APP_DIR}/venv/bin/gunicorn \ -k uvicorn.workers.UvicornWorker \ --workers 4 \ --bind 127.0.0.1:8283 \ From eac2002f56bbde1eba48251f9532dac0bd770e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Fri, 29 Aug 2025 12:13:06 +0200 Subject: [PATCH 04/14] poprawka bledu --- app.py | 13 +++++++++++++ listapp.service | 7 ++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app.py b/app.py index 46c55d7..775278a 100644 --- a/app.py +++ b/app.py @@ -241,15 +241,28 @@ def cache_headers(etag: str, up_lm: Optional[str]): def validate_and_normalize_url(url): + url = (url or "").strip() + + # prosta sanity-check: usuń CR/LF + if any(c in url for c in ("\r", "\n")): + raise ValueError("Invalid characters in URL") + parsed = urlparse(url) if not parsed.scheme: url = f"https://{url}" parsed = urlparse(url) + + # akceptuj tylko http/https + if parsed.scheme not in {"http", "https"}: + raise ValueError(f"Unsupported scheme: {parsed.scheme}") + if not parsed.netloc: raise ValueError("Missing host in URL") + return parsed.geturl() + def track_url_request(url): redis_client.incr(f"stats:url_requests:{quote(url, safe='')}") diff --git a/listapp.service b/listapp.service index 862845e..239af85 100644 --- a/listapp.service +++ b/listapp.service @@ -6,14 +6,11 @@ Wants=network-online.target [Service] User=www-data Group=www-data - -# główny katalog aplikacji -Environment="APP_DIR=/var/www/adlist_mikrotik" WorkingDirectory=/var/www/adlist_mikrotik EnvironmentFile=-/var/www/adlist_mikrotik/.env -Environment="PATH=${APP_DIR}/venv/bin" +Environment="PATH=/var/www/adlist_mikrotik/venv/bin" -ExecStart=${APP_DIR}/venv/bin/gunicorn \ +ExecStart=/var/www/adlist_mikrotik/venv/bin/gunicorn \ -k uvicorn.workers.UvicornWorker \ --workers 4 \ --bind 127.0.0.1:8283 \ From 0d35b3e6548038461aa0515a177ff98e2b36b49a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Fri, 29 Aug 2025 22:04:29 +0200 Subject: [PATCH 05/14] poprawki --- app.py | 64 +++++++++++----- static/css/main.css | 6 +- static/js/main.js | 181 ++++++++++++++++++++++++++++++++++++-------- templates/form.html | 11 ++- 4 files changed, 205 insertions(+), 57 deletions(-) diff --git a/app.py b/app.py index 775278a..e41e863 100644 --- a/app.py +++ b/app.py @@ -73,20 +73,7 @@ def track_request_data(): @app.after_request -def add_cache_headers(response): - if request.path.startswith("/static/"): - - response.headers.pop("Content-Disposition", None) - - if request.path.endswith((".css", ".js")): - response.headers["Cache-Control"] = "public, max-age=31536000, immutable" - else: - response.headers["Cache-Control"] = "public, max-age=86400" - return response - - -@app.after_request -def after_request(response): +def finalize_response(response): elapsed = time.perf_counter() - g.start_time redis_client.incrbyfloat("stats:processing_time_total", elapsed) redis_client.incr("stats:processing_time_count") @@ -102,6 +89,29 @@ def after_request(response): redis_client.set("stats:processing_time_max", elapsed) except Exception: redis_client.set("stats:processing_time_max", elapsed) + + path = request.path or "/" + + if response.status_code >= 400: + response.headers["Cache-Control"] = "no-store" + response.headers["Pragma"] = "no-cache" + response.headers["Expires"] = "0" + return response + + if path.startswith("/static/"): + response.headers.pop("Content-Disposition", None) + if path.endswith((".css", ".js")): + response.headers["Cache-Control"] = "public, max-age=31536000, immutable" + else: + response.headers["Cache-Control"] = "public, max-age=86400" + return response + + if path == "/": + response.headers["Cache-Control"] = "private, no-store" + response.headers["Pragma"] = "no-cache" + response.headers["Expires"] = "0" + return response + return response @@ -319,6 +329,14 @@ def add_recent_convert(): redis_client.ltrim("recent_converts", 0, 99) +def validate_ip(value: str) -> str: + v = (value or "").strip() + try: + return str(ipaddress.ip_address(v)) + except Exception: + raise ValueError("Invalid IP address") + + @app.route("/favicon.ico", methods=["GET"]) def favicon(): return Response(status=204) @@ -329,7 +347,11 @@ def index(): generated_link = None recent_links = get_recent_links() url_param = request.args.get("url", config.DEFAULT_SOURCE_URL) - target_ip = request.args.get("ip", "127.0.0.1") + raw_ip = request.args.get("ip", "127.0.0.1") + try: + target_ip = validate_ip(raw_ip) + except ValueError: + target_ip = "127.0.0.1" if url_param: try: @@ -437,7 +459,15 @@ def convert(): redis_client.incr("stats:errors_400") abort(400) - target_ip = request.args.get("ip", "127.0.0.1") + try: + target_ip = validate_ip(request.args.get("ip", "127.0.0.1")) + except ValueError: + if debug_mode: + d("Bad parametr ?ip") + return debug_response(status=400) + redis_client.incr("stats:errors_400") + abort(400, description="Invalid IP") + if debug_mode: d(f"URL (encoded): {encoded_url}") d(f"URL (decoded): {decoded_url}") @@ -561,7 +591,7 @@ def convert_head(): abort(400) decoded_url = unquote(encoded_url) validate_and_normalize_url(decoded_url) - target_ip = request.args.get("ip", "127.0.0.1") + target_ip = validate_ip(request.args.get("ip", "127.0.0.1")) etag = build_etag(None, None, target_ip) resp = Response(status=200) resp.headers.update(cache_headers(etag, None)) diff --git a/static/css/main.css b/static/css/main.css index bdf6e09..fd62534 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -41,8 +41,8 @@ body { margin: 0; font-family: ui-sans-serif, system-ui, "Segoe UI", Roboto, Arial, sans-serif; background: - radial-gradient(1200px 600px at 10% -10%, rgba(91, 157, 255, .08), transparent 60%), - radial-gradient(900px 500px at 110% 0%, rgba(123, 212, 255, .10), transparent 60%), + /*radial-gradient(1200px 600px at 10% -10%, rgba(91, 157, 255, .08), transparent 60%), + radial-gradient(900px 500px at 110% 0%, rgba(123, 212, 255, .10), transparent 60%),*/ var(--bg); color: var(--text); } @@ -89,7 +89,7 @@ body { } .card { - background: linear-gradient(180deg, var(--card), color-mix(in srgb, var(--card) 80%, #000 20%)); + background: linear-gradient(180deg, var(--card), color-mix(in srgb, var(--card) 90%, #000 10%)); border: 1px solid var(--border); border-radius: 16px; box-shadow: var(--shadow); diff --git a/static/js/main.js b/static/js/main.js index c73c70d..e1c0a44 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -2,7 +2,14 @@ const $ = (q, c = document) => c.querySelector(q); const $$ = (q, c = document) => Array.from(c.querySelectorAll(q)); - const setTheme = (t) => { document.documentElement.setAttribute('data-theme', t); try { localStorage.setItem('theme', t) } catch { } }; + + // --- theme --- + const setTheme = (t) => { + document.documentElement.setAttribute('data-theme', t); + try { localStorage.setItem('theme', t) } catch { } + }; + window.setTheme = setTheme; + const toast = (msg) => { const el = $('#toast'); if (!el) return; el.textContent = msg; el.classList.add('show'); @@ -10,6 +17,52 @@ }; const host = () => `${location.protocol}//${location.host}`; + // --- IP validators --- + function isValidIPv4(ip) { + if (!/^\d{1,3}(?:\.\d{1,3}){3}$/.test(ip)) return false; + return ip.split('.').every(oct => { + if (oct.length > 1 && oct[0] === '0') return oct === '0'; + const n = Number(oct); + return n >= 0 && n <= 255; + }); + } + + function isValidIPv6(ip) { + let work = ip; + const idx = work.lastIndexOf(':'); + if (idx !== -1) { + const tail = work.slice(idx + 1); + if (/^\d{1,3}(?:\.\d{1,3}){3}$/.test(tail)) { + if (!isValidIPv4(tail)) return false; + work = work.slice(0, idx) + ':0:0'; + } + } + if (work.split('::').length > 2) return false; + const hasCompress = work.includes('::'); + const parts = work.split(':').filter(Boolean); + if ((!hasCompress && parts.length !== 8) || (hasCompress && parts.length > 7)) return false; + return parts.every(g => /^[0-9a-fA-F]{1,4}$/.test(g)); + } + + function isValidIP(ip) { + const v = (ip || '').trim(); + return isValidIPv4(v) || isValidIPv6(v); + } + + // --- URL helpers --- + function normalizeUrlMaybe(v) { + const raw = (v || '').trim(); + if (!raw) return ''; + try { + const test = raw.includes('://') ? raw : `https://${raw}`; + const u = new URL(test); + if (u.protocol !== 'http:' && u.protocol !== 'https:') throw new Error('scheme'); + return u.toString(); + } catch { + return ''; + } + } + function buildLink(url, ip) { if (!url || !ip) return ''; try { @@ -34,32 +87,75 @@ const out = $('#generated-link'); const openBtn = $('#open-link'); - function updatePreview() { - const link = buildLink(urlInput.value.trim(), ipInput.value.trim()); - out.value = link || ''; - if (link) { - openBtn.setAttribute('href', link); - openBtn.setAttribute('aria-disabled', 'false'); - } else { - openBtn.setAttribute('href', '#'); - openBtn.setAttribute('aria-disabled', 'true'); - } - $('.result-box')?.setAttribute('data-state', link ? 'ready' : 'empty'); + function showError(input, msg) { + const id = input.getAttribute('id'); + const box = document.querySelector(`.error[data-error-for="${id}"]`); + if (box) box.textContent = msg || ''; + input.setAttribute('aria-invalid', msg ? 'true' : 'false'); } + function updatePreview() { + const rawUrl = (urlInput?.value || '').trim(); + const ip = (ipInput?.value || '').trim(); + + if (!ip || !isValidIP(ip)) { + if (out) out.value = ''; + if (openBtn) { + openBtn.setAttribute('href', '#'); + openBtn.setAttribute('aria-disabled', 'true'); + } + $('.result-box')?.setAttribute('data-state', 'empty'); + return; + } + + const normalized = normalizeUrlMaybe(rawUrl); // poprawny http/https lub '' + const guessed = rawUrl ? (rawUrl.includes('://') ? rawUrl : `https://${rawUrl}`) : ''; + const previewUrl = normalized || guessed; + + if (!previewUrl) { + if (out) out.value = ''; + if (openBtn) { + openBtn.setAttribute('href', '#'); + openBtn.setAttribute('aria-disabled', 'true'); + } + $('.result-box')?.setAttribute('data-state', 'empty'); + return; + } + + const link = buildLink(previewUrl, ip); + if (out) out.value = link; + + const ok = !!normalized; + if (openBtn) { + if (ok) { + openBtn.setAttribute('href', link); + openBtn.setAttribute('aria-disabled', 'false'); + } else { + openBtn.setAttribute('href', '#'); + openBtn.setAttribute('aria-disabled', 'true'); + } + } + $('.result-box')?.setAttribute('data-state', ok ? 'ready' : 'empty'); + } + + // live update ['input', 'change', 'blur'].forEach(evt => { urlInput?.addEventListener(evt, updatePreview); ipInput?.addEventListener(evt, updatePreview); }); + // presets ipPreset?.addEventListener('change', () => { const v = ipPreset.value; if (!v) return; if (v !== 'custom') ipInput.value = v; ipInput.focus(); + const ok = isValidIP(ipInput.value.trim()); + showError(ipInput, ok ? '' : 'Invalid IP address'); updatePreview(); }); + // event delegation document.addEventListener('click', (e) => { let t = e.target; @@ -74,7 +170,6 @@ btn.classList.add('copied'); setTimeout(() => btn.classList.remove('copied'), 1200); toast('Link copied'); }).catch(() => { - // Fallback const range = document.createRange(); range.selectNodeContents(el); const selObj = getSelection(); selObj.removeAllRanges(); selObj.addRange(range); try { document.execCommand('copy'); toast('Link copied'); } catch { } @@ -85,15 +180,19 @@ if (t.closest('[data-action="copy-text"]')) { e.preventDefault(); const btn = t.closest('[data-action="copy-text"]'); - const text = btn.getAttribute('data-text') || ''; + let text = btn.getAttribute('data-text') || ''; if (!text) return; + if (text.startsWith('/')) text = host() + text; navigator.clipboard?.writeText(text).then(() => toast('Copied')); } if (t.closest('[data-action="clear"]')) { e.preventDefault(); urlInput.value = ''; - + if (ipInput) ipInput.value = ''; + if (ipPreset) ipPreset.value = ''; + showError(urlInput, ''); + showError(ipInput, ''); updatePreview(); urlInput.focus(); } @@ -104,33 +203,33 @@ const panel = $('#' + (btn.getAttribute('aria-controls') || '')); if (!panel) return; const expanded = btn.getAttribute('aria-expanded') === 'true'; - btn.setAttribute('aria-expanded', expanded ? 'false' : 'true'); - panel.style.display = expanded ? 'none' : ''; + const next = !expanded; + btn.setAttribute('aria-expanded', next ? 'true' : 'false'); + panel.hidden = !next; + panel.style.display = next ? '' : 'none'; + const newLabel = next ? 'Collapse' : 'Expand'; + btn.textContent = newLabel; + btn.setAttribute('aria-label', newLabel); } }); - function showError(input, msg) { - const id = input.getAttribute('id'); - const box = document.querySelector(`.error[data-error-for="${id}"]`); - if (box) box.textContent = msg || ''; - input.setAttribute('aria-invalid', msg ? 'true' : 'false'); - } - + // field-level validation urlInput?.addEventListener('blur', () => { - const v = urlInput.value.trim(); - if (!v) return showError(urlInput, ''); - try { new URL(v); showError(urlInput, ''); } - catch { showError(urlInput, 'Invalid URL'); } + const raw = urlInput.value.trim(); + if (!raw) return showError(urlInput, ''); + const normalized = normalizeUrlMaybe(raw); + showError(urlInput, normalized ? '' : 'Invalid URL'); }); ipInput?.addEventListener('blur', () => { const v = ipInput.value.trim(); if (!v) return showError(ipInput, ''); - const ok = /^\b\d{1,3}(?:\.\d{1,3}){3}\b$/.test(v); - showError(ipInput, ok ? '' : 'Invalid IPv4 address'); + const ok = isValidIP(v); + showError(ipInput, ok ? '' : 'Invalid IP address'); + if (!ok) $('.result-box')?.setAttribute('data-state', 'empty'); }); - + // init (preview + recent-list sync) (function init() { const serverLink = out?.value?.trim(); if (serverLink) { @@ -141,14 +240,34 @@ } })(); + document.addEventListener('DOMContentLoaded', () => { + const btn = document.querySelector('[data-action="collapse"]'); + const panelId = btn?.getAttribute('aria-controls') || ''; + const panel = panelId ? document.getElementById(panelId) : null; + if (!btn || !panel) return; + + const expanded = btn.getAttribute('aria-expanded') === 'true'; + panel.hidden = !expanded; + // usuń/ustaw inline display spójnie z hidden + panel.style.display = expanded ? '' : 'none'; + + const label = expanded ? 'Collapse' : 'Expand'; + btn.textContent = label; + btn.setAttribute('aria-label', label); + }); + + form?.addEventListener('submit', (e) => e.preventDefault()); + document.addEventListener('keydown', (e) => { if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'c') { const text = out?.value?.trim(); if (!text) return; navigator.clipboard?.writeText(text).then(() => toast('Link copied')); } }); + })(); +// --- theme color sync (poza IIFE) --- function updateThemeColor() { const meta = document.querySelector('meta[name="theme-color"]'); if (!meta) return; diff --git a/templates/form.html b/templates/form.html index 9885f4a..f032121 100644 --- a/templates/form.html +++ b/templates/form.html @@ -53,11 +53,10 @@
- + Common choices: 0.0.0.0, 127.0.0.1, - or your device IP. + your device IP, supports IPv4 and IPv6.
@@ -68,12 +67,12 @@ +
-
@@ -119,7 +118,7 @@ {{ link_data[0]|datetimeformat }}
+ data-text="{{ url_for('convert', _external=True) }}?url={{ link_data[1]|urlencode }}&ip={{ link_data[2] }}">Copy Open From 7b6dd96d68cb056e16c2252f5ecdfe6ef5dbd17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Fri, 29 Aug 2025 22:08:11 +0200 Subject: [PATCH 06/14] poprawki --- static/js/error.js | 16 ---------------- static/js/main.js | 1 - templates/error.html | 3 +-- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/static/js/error.js b/static/js/error.js index 671f510..3d046c5 100644 --- a/static/js/error.js +++ b/static/js/error.js @@ -1,25 +1,9 @@ (function () { const t = localStorage.getItem('theme') || 'dark'; document.documentElement.setAttribute('data-theme', t); - // prosty "try again" document.querySelector('[data-action="try-again"]')?.addEventListener('click', () => { location.reload(); }); - // kopiowanie logs - document.querySelector('[data-action="copy-text"]')?.addEventListener('click', (e) => { - const sel = e.currentTarget.getAttribute('data-target'); - const el = sel && document.querySelector(sel); - if (!el) return; - const txt = el.textContent || ''; - navigator.clipboard.writeText(txt).then(() => { - const toast = document.getElementById('toast'); - if (toast) { - toast.textContent = 'Copied!'; - toast.classList.add('show'); - setTimeout(() => toast.classList.remove('show'), 1200); - } - }); - }); })(); diff --git a/static/js/main.js b/static/js/main.js index e1c0a44..86b44c3 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -248,7 +248,6 @@ const expanded = btn.getAttribute('aria-expanded') === 'true'; panel.hidden = !expanded; - // usuń/ustaw inline display spójnie z hidden panel.style.display = expanded ? '' : 'none'; const label = expanded ? 'Collapse' : 'Expand'; diff --git a/templates/error.html b/templates/error.html index 53ec862..0c9ffc6 100644 --- a/templates/error.html +++ b/templates/error.html @@ -65,8 +65,7 @@ user_ip: {{ request.remote_addr if request else '' }} user_agent: {{ request.headers.get('User-Agent') if request else '' }}
- +
From 0419ca1d9dfa32c17415c86d98bc9b5af8ee692c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Fri, 29 Aug 2025 22:24:36 +0200 Subject: [PATCH 07/14] poprawki --- app.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app.py b/app.py index e41e863..9f1a7ef 100644 --- a/app.py +++ b/app.py @@ -6,6 +6,7 @@ import time import json import hashlib import ipaddress +import hmac, ipaddress from datetime import datetime from urllib.parse import urlparse, quote, unquote, urljoin from functools import wraps @@ -387,7 +388,7 @@ def index(): @app.route("/convert") @limiter.limit(config.RATE_LIMIT_CONVERT) def convert(): - import hmac, ipaddress + def is_private_client_ip() -> bool: ip = get_client_ip() @@ -436,8 +437,8 @@ def convert(): return resp try: - redis_client.incr("stats:convert_requests") add_recent_convert() + redis_client.incr("stats:convert_requests") if debug_mode: d("Start /convert w trybie debug") @@ -515,11 +516,13 @@ def convert(): if debug_mode: d("Upstream 304 – zwracam 304") r.close() + add_recent_convert() return debug_response(status=304) resp = Response(status=304) resp.headers.update(cache_headers(etag, r.headers.get("Last-Modified"))) resp.direct_passthrough = True r.close() + add_recent_convert() return resp up_etag = r.headers.get("ETag") @@ -566,6 +569,7 @@ def convert(): resp.headers.update(cache_headers(etag, up_lm)) resp.direct_passthrough = True redis_client.incr("stats:conversions_success") + add_recent_convert() return resp except requests.exceptions.RequestException as e: From 43c9a7006c4c0ebd11a18b0568e4470c03b2924d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Fri, 29 Aug 2025 22:32:22 +0200 Subject: [PATCH 08/14] poprawki --- app.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app.py b/app.py index 9f1a7ef..4719ed8 100644 --- a/app.py +++ b/app.py @@ -516,13 +516,13 @@ def convert(): if debug_mode: d("Upstream 304 – zwracam 304") r.close() - add_recent_convert() + add_recent_link(normalized_url, target_ip) return debug_response(status=304) resp = Response(status=304) resp.headers.update(cache_headers(etag, r.headers.get("Last-Modified"))) resp.direct_passthrough = True r.close() - add_recent_convert() + add_recent_link(normalized_url, target_ip) return resp up_etag = r.headers.get("ETag") @@ -569,7 +569,7 @@ def convert(): resp.headers.update(cache_headers(etag, up_lm)) resp.direct_passthrough = True redis_client.incr("stats:conversions_success") - add_recent_convert() + add_recent_link(normalized_url, target_ip) return resp except requests.exceptions.RequestException as e: From 259d716e0f77c377d31d6c0373c77e9e191b6591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Fri, 29 Aug 2025 22:36:41 +0200 Subject: [PATCH 09/14] poprawki --- app.py | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/app.py b/app.py index 4719ed8..c0cd875 100644 --- a/app.py +++ b/app.py @@ -280,11 +280,29 @@ def track_url_request(url): def add_recent_link(url, target_ip): ts = datetime.now().isoformat() - link_data = f"{ts}|{url}|{target_ip}" + new_item = f"{ts}|{url}|{target_ip}" + key = "recent_links" + + current = redis_client.lrange(key, 0, -1) + filtered = [] + for raw in current: + try: + s = raw.decode() + parts = s.split("|") + if len(parts) >= 3 and parts[1] == url and parts[2] == target_ip: + continue + except Exception: + pass + filtered.append(raw) + with redis_client.pipeline() as pipe: - pipe.lpush("recent_links", link_data) - pipe.ltrim("recent_links", 0, 9) + pipe.delete(key) + pipe.lpush(key, new_item) + if filtered: + pipe.rpush(key, *filtered[:99]) + pipe.ltrim(key, 0, 9) pipe.execute() + redis_client.incr("stats:recent_links_added") From 809b1168e15653b9d298026a4c2dcaf915ef40c3 Mon Sep 17 00:00:00 2001 From: gru Date: Fri, 29 Aug 2025 23:45:23 +0200 Subject: [PATCH 10/14] Update templates/form.html --- templates/form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/form.html b/templates/form.html index f032121..fc8aedd 100644 --- a/templates/form.html +++ b/templates/form.html @@ -88,7 +88,7 @@ rel="noopener" aria-disabled="{{ 'false' if generated_link else 'true' }}">Open - The preview updates live while you type. + Paste this link in your Mikrotik (IP -> DNS -> Adlist) or other tool From 1afaea2d0073816deec321b341ab176eb495a11f Mon Sep 17 00:00:00 2001 From: gru Date: Fri, 29 Aug 2025 23:47:57 +0200 Subject: [PATCH 11/14] Update app.py --- app.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app.py b/app.py index c0cd875..9e3d113 100644 --- a/app.py +++ b/app.py @@ -365,24 +365,24 @@ def favicon(): def index(): generated_link = None recent_links = get_recent_links() - url_param = request.args.get("url", config.DEFAULT_SOURCE_URL) + #url_param = request.args.get("url", config.DEFAULT_SOURCE_URL) raw_ip = request.args.get("ip", "127.0.0.1") try: target_ip = validate_ip(raw_ip) except ValueError: target_ip = "127.0.0.1" - if url_param: - try: - normalized = validate_and_normalize_url(unquote(url_param)) - encoded = quote(normalized, safe="") - generated_link = urljoin( - request.host_url, f"convert?url={encoded}&ip={target_ip}" - ) - add_recent_link(normalized, target_ip) - recent_links = get_recent_links() - except Exception as e: - app.logger.error(f"Error processing URL: {str(e)}") + #if url_param: + # try: + # normalized = validate_and_normalize_url(unquote(url_param)) + # encoded = quote(normalized, safe="") + # generated_link = urljoin( + # request.host_url, f"convert?url={encoded}&ip={target_ip}" + # ) + # add_recent_link(normalized, target_ip) + # recent_links = get_recent_links() + # except Exception as e: + # app.logger.error(f"Error processing URL: {str(e)}") try: return render_template( From e065f5892de0e5974935a64e15e9b5bac6577840 Mon Sep 17 00:00:00 2001 From: gru Date: Fri, 29 Aug 2025 23:49:32 +0200 Subject: [PATCH 12/14] Update app.py --- app.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app.py b/app.py index 9e3d113..491fca7 100644 --- a/app.py +++ b/app.py @@ -95,8 +95,6 @@ def finalize_response(response): if response.status_code >= 400: response.headers["Cache-Control"] = "no-store" - response.headers["Pragma"] = "no-cache" - response.headers["Expires"] = "0" return response if path.startswith("/static/"): @@ -109,8 +107,6 @@ def finalize_response(response): if path == "/": response.headers["Cache-Control"] = "private, no-store" - response.headers["Pragma"] = "no-cache" - response.headers["Expires"] = "0" return response return response From a2febd82c110c1b7d0f9012885935831cceb4148 Mon Sep 17 00:00:00 2001 From: gru Date: Fri, 29 Aug 2025 23:55:32 +0200 Subject: [PATCH 13/14] Update templates/form.html --- templates/form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/form.html b/templates/form.html index fc8aedd..fc569ce 100644 --- a/templates/form.html +++ b/templates/form.html @@ -88,7 +88,7 @@ rel="noopener" aria-disabled="{{ 'false' if generated_link else 'true' }}">Open - Paste this link in your Mikrotik (IP -> DNS -> Adlist) or other tool + Paste this link in your Mikrotik (IP -> DNS -> Adlist) or other DNS server / ad blocking tool From aaea5cdeef8fc8b6436543bea790261977327e77 Mon Sep 17 00:00:00 2001 From: gru Date: Fri, 29 Aug 2025 23:57:39 +0200 Subject: [PATCH 14/14] Update app.py --- app.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/app.py b/app.py index 491fca7..829e930 100644 --- a/app.py +++ b/app.py @@ -359,31 +359,11 @@ def favicon(): @app.route("/", methods=["GET"]) def index(): - generated_link = None recent_links = get_recent_links() - #url_param = request.args.get("url", config.DEFAULT_SOURCE_URL) - raw_ip = request.args.get("ip", "127.0.0.1") - try: - target_ip = validate_ip(raw_ip) - except ValueError: - target_ip = "127.0.0.1" - - #if url_param: - # try: - # normalized = validate_and_normalize_url(unquote(url_param)) - # encoded = quote(normalized, safe="") - # generated_link = urljoin( - # request.host_url, f"convert?url={encoded}&ip={target_ip}" - # ) - # add_recent_link(normalized, target_ip) - # recent_links = get_recent_links() - # except Exception as e: - # app.logger.error(f"Error processing URL: {str(e)}") try: return render_template( "form.html", - generated_link=generated_link, recent_links=recent_links, client_ip=get_client_ip(), user_agent=request.headers.get("User-Agent", "Unknown"), @@ -391,7 +371,6 @@ def index(): except Exception: return jsonify( { - "generated_link": generated_link, "recent_links": recent_links, "client_ip": get_client_ip(), "user_agent": request.headers.get("User-Agent", "Unknown"),