mirror of
https://github.com/DarrenOfficial/dpaste.git
synced 2024-11-15 08:02:54 +11:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
a1ffb99d34
2 changed files with 6 additions and 62 deletions
|
@ -1,6 +1,12 @@
|
|||
Changelog
|
||||
=========
|
||||
|
||||
2.14 (master)
|
||||
-------------
|
||||
|
||||
* Removed "Suspicious" middleware which was never been used, documented,
|
||||
and also not functional for a while.
|
||||
|
||||
2.13 (2017-01-20)
|
||||
-----------------
|
||||
|
||||
|
|
|
@ -1,62 +0,0 @@
|
|||
import socket
|
||||
|
||||
from django.http import HttpResponseBadRequest
|
||||
|
||||
tor_bl = (
|
||||
'{remote_addr}.{server_port}.{server_ip}'
|
||||
'.ip-port.exitlist.torproject.org')
|
||||
open_proxy_bl = ('{remote_addr}.dnsbl.proxybl.org')
|
||||
|
||||
rev_ip = lambda ip: '.'.join(reversed(ip.split('.'))) # pragma: no cover
|
||||
|
||||
response = """<html><body><h1>Access denied</h1>
|
||||
<p>It appears you're requesting this page from an open proxy or
|
||||
the TOR network. These networks are blocked due to numerous
|
||||
statutory violation related posts in the past.</p>
|
||||
<p>If you think this is wrong, <a href="https://github.com/bartTC/dpaste">file
|
||||
a bug on Github please</a>.</p></body></html>"""
|
||||
|
||||
def in_blacklist(request, bl, ip=None): # pragma: no cover
|
||||
ip = ip or request.META['REMOTE_ADDR']
|
||||
try:
|
||||
server_ip = socket.gethostbyname(request.META['SERVER_NAME'])
|
||||
except socket.gaierror:
|
||||
return
|
||||
bl_name = bl.format(
|
||||
remote_addr=rev_ip(ip),
|
||||
server_port=request.META['SERVER_PORT'],
|
||||
server_ip=rev_ip(server_ip)
|
||||
)
|
||||
try:
|
||||
lookup = socket.gethostbyname(bl_name)
|
||||
except socket.gaierror as s:
|
||||
if s.errno == -5:
|
||||
return False
|
||||
return
|
||||
except Exception:
|
||||
return
|
||||
return lookup == '127.0.0.2'
|
||||
|
||||
|
||||
class SuspiciousIPMiddleware(object): # pragma: no cover
|
||||
|
||||
def process_request(self, request):
|
||||
def check_tor():
|
||||
if not hasattr(request, '_is_tor_exit_node'):
|
||||
request._is_tor_exit_node = in_blacklist(request, tor_bl)
|
||||
return request._is_tor_exit_node
|
||||
request.is_tor_exit_node = check_tor
|
||||
|
||||
def check_open_proxy():
|
||||
if not hasattr(request, '_is_open_proxy'):
|
||||
request._is_open_proxy = in_blacklist(
|
||||
request, open_proxy_bl)
|
||||
return request._is_open_proxy
|
||||
request.is_open_proxy = check_open_proxy
|
||||
|
||||
def check_suspicious():
|
||||
return request.is_tor_exit_node() or request.is_open_proxy()
|
||||
|
||||
request.is_suspicious = check_suspicious
|
||||
if request.method == 'POST' and request.is_suspicious():
|
||||
return HttpResponseBadRequest(response)
|
Loading…
Reference in a new issue