This commit is contained in:
Mateusz Gruszczyński
2026-03-05 08:19:37 +01:00
parent ab06cbc0b7
commit 45fc1c6d55
3 changed files with 11 additions and 9 deletions

3
app.py
View File

@@ -4,6 +4,7 @@ GeoIP Ban Generator - Web Application
from flask import Flask, render_template, request, Response, jsonify
from geoip_handler import GeoIPHandler
from flask import jsonify, render_template, request
from pathlib import Path
from functools import wraps
from datetime import datetime
@@ -116,7 +117,7 @@ def inject_globals():
'redis_connected': redis_cache.health_check()['connected'] if redis_cache else False,
}
from flask import jsonify, render_template, request
def _wants_json():
if request.path.startswith("/api/"):

View File

@@ -189,6 +189,8 @@ COMMON_COUNTRIES = [
{'code': 'EC', 'name': 'Ecuador'},
{'code': 'BO', 'name': 'Bolivia'},
{'code': 'PY', 'name': 'Paraguay'},
{'code': 'NI', 'name': 'Nicaragua'},
# Caribbean
{'code': 'CU', 'name': 'Cuba'},
@@ -306,4 +308,4 @@ MAXMIND_CHUNK_MIN = int(os.getenv('MAXMIND_CHUNK_MIN', '200'))
MAXMIND_CHUNK_MAX = int(os.getenv('MAXMIND_CHUNK_MAX', '4000'))
MAXMIND_WORKERS_MIN = int(os.getenv('MAXMIND_WORKERS_MIN', '6'))
MAXMIND_WORKERS_MAX = int(os.getenv('MAXMIND_WORKERS_MAX', '48'))
MAXMIND_WORKERS_MAX = int(os.getenv('MAXMIND_WORKERS_MAX', '48'))

View File

@@ -4,17 +4,18 @@ import re
import requests
BASE_URL = "http://geo-block.krk.itg.demo-ht.iadm"
ENDPOINT = "/api/generate"
ENDPOINT = "/api/generate/raw"
payload = {
payload_json = """{
"countries": [
"PL"
],
"aggregate": true,
"use_cache": true,
"app_type": "haproxy",
"app_variant": "map"
}
"app_type": "raw-cidr_json",
"as_js": false
}"""
payload = json.loads(payload_json)
resp = requests.post(BASE_URL + ENDPOINT, json=payload, timeout=120)
@@ -26,7 +27,6 @@ print("X-Generated-At:", resp.headers.get("X-Generated-At"))
ct = (resp.headers.get("Content-Type") or "").lower()
if resp.status_code >= 400:
# try show JSON error, else text
try:
print(json.dumps(resp.json(), indent=2))
except Exception:
@@ -42,7 +42,6 @@ else:
if m:
filename = m.group(1)
else:
# fallback extension
if "text/csv" in ct:
filename += ".csv"
elif "javascript" in ct: