sim1222/fedi-block-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark wildcard blocks as such

Browse Source
This commit is contained in:
Mint 2022-08-08 14:29:44 +03:00
parent ce2c200c49
commit 7f3f0928cf
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api.py
View File

@ -39,7 +39,7 @@ def blocked(domain: str = None, reason: str = None):
if domain != None: if domain != None:
wildchar = "*." + ".".join(domain.split(".")[-domain.count("."):]) wildchar = "*." + ".".join(domain.split(".")[-domain.count("."):])
punycode = domain.encode('idna').decode('utf-8') punycode = domain.encode('idna').decode('utf-8')
c.execute("select blocker, block_level, reason from blocks where blocked = ? or blocked = ? or blocked = ? or blocked = ? or blocked = ? or blocked = ?", c.execute("select blocker, blocked, block_level, reason from blocks where blocked = ? or blocked = ? or blocked = ? or blocked = ? or blocked = ? or blocked = ?",
(domain, "*." + domain, wildchar, get_hash(domain), punycode, "*." + punycode)) (domain, "*." + domain, wildchar, get_hash(domain), punycode, "*." + punycode))
else: else:
c.execute("select * from blocks where reason like ? and reason != ''", ("%"+reason+"%",)) c.execute("select * from blocks where reason like ? and reason != ''", ("%"+reason+"%",))
@ -48,19 +48,21 @@ def blocked(domain: str = None, reason: str = None):
result = {} result = {}
reasons = {} reasons = {}
wildcards = {}
if domain != None: if domain != None:
for domain, block_level, reason in blocks: for domain, blocked, block_level, reason in blocks:
if block_level in result: if block_level in result:
result[block_level].append(domain) result[block_level].append(domain)
else: else:
result[block_level] = [domain] result[block_level] = [domain]
if blocked == "*." + ".".join(blocked.split(".")[-blocked.count("."):]):
wildcards.append(domain)
if reason != "": if reason != "":
if block_level in reasons: if block_level in reasons:
reasons[block_level][domain] = reason reasons[block_level][domain] = reason
else: else:
reasons[block_level] = {domain: reason} reasons[block_level] = {domain: reason}
return {"blocks": result, "reasons": reasons} return {"blocks": result, "reasons": reasons, "wildcards": wildcards}
for blocker, blocked, reason, block_level in blocks: for blocker, blocked, reason, block_level in blocks:
if block_level in result: if block_level in result:
@ -88,7 +90,7 @@ def index(request: Request, domain: str = None, reason: str = None):
if not blocks.ok: if not blocks.ok:
raise HTTPException(status_code=blocks.status_code, detail=blocks.text) raise HTTPException(status_code=blocks.status_code, detail=blocks.text)
blocks = blocks.json() blocks = blocks.json()
return templates.TemplateResponse("index.html", {"request": request, "domain": domain, "blocks": blocks, "reason": reason, "info": info}) return templates.TemplateResponse("index.html", {"request": request, "domain": domain, "blocks": blocks, "wildcards": wildcards, "reason": reason, "info": info})
if __name__ == "__main__": if __name__ == "__main__":
uvicorn.run("api:app", host="127.0.0.1", port=port, log_level="info") uvicorn.run("api:app", host="127.0.0.1", port=port, log_level="info")

10
index.html
View File

@ -44,6 +44,10 @@
input[type="submit"]:hover { input[type="submit"]:hover {
border-color: #f08; border-color: #f08;
} }
span[title] {
text-decoration: underline dotted;
}
</style> </style>
</head> </head>
<body> <body>
@ -71,7 +75,11 @@
{% for block in blocks.blocks[block_level] %} {% for block in blocks.blocks[block_level] %}
<div class="block"> <div class="block">
<img src="https://proxy.duckduckgo.com/ip3/{{block}}.ico" width=16/> <img src="https://proxy.duckduckgo.com/ip3/{{block}}.ico" width=16/>
<b><a href="https://{{block}}">{{block}}</a></b><br/> <b><a href="https://{{block}}">{{block}}</a></b>
{% if block in wildcards %}
(<span title="wildcard block">&lowast;</span>)
{% endif %}
<br/>
{% if block_level in blocks.reasons %} {% if block_level in blocks.reasons %}
{{blocks.reasons[block_level][block]}} {{blocks.reasons[block_level][block]}}
{% endif %} {% endif %}