voussoir/else
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add --authorize_by_ip to permit whole IP after one password input.

Browse source
This commit is contained in:
Ethan Dalool 2020-10-12 21:45:18 -07:00
parent 430b721d65
commit 0fcaa64c24
1 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
SimpleServer/simpleserver.py
View file

@ -59,8 +59,9 @@ TOKEN_COOKIE_NAME = 'simpleserver_token'
# SERVER ########################################################################################### # SERVER ###########################################################################################
class RequestHandler(http.server.BaseHTTPRequestHandler): class RequestHandler(http.server.BaseHTTPRequestHandler):
def __init__(self, *args, password=None, accepted_tokens=None, **kwargs): def __init__(self, *args, password=None, accepted_tokens=None, accepted_ips=None, **kwargs):
self.accepted_tokens = accepted_tokens self.accepted_tokens = accepted_tokens
self.accepted_ips = accepted_ips
self.password = password self.password = password
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -91,6 +92,10 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
(username, password) = authorization.split(':', 1) (username, password) = authorization.split(':', 1)
return password return password
@property
def remote_addr(self):
return self.request.getpeername()[0]
def check_password(self, attempt): def check_password(self, attempt):
if self.password is None: if self.password is None:
return True return True
@ -110,6 +115,9 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
if self.accepted_tokens is not None and self.auth_cookie in self.accepted_tokens: if self.accepted_tokens is not None and self.auth_cookie in self.accepted_tokens:
return True return True
if self.accepted_ips is not None and self.remote_addr in self.accepted_ips:
return True
return False return False
def write(self, data): def write(self, data):
@ -248,13 +256,17 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
attempt = form.get(b'password')[0].decode('utf-8') attempt = form.get(b'password')[0].decode('utf-8')
goto = form.get(b'goto')[0].decode('utf-8') goto = form.get(b'goto')[0].decode('utf-8')
if self.check_password(attempt): if self.check_password(attempt):
cookie = http.cookies.SimpleCookie()
token = random_hex(32)
cookie[TOKEN_COOKIE_NAME] = token
self.accepted_tokens.add(token)
self.send_response(302) self.send_response(302)
self.send_header('Set-Cookie', cookie.output(header='', sep=''))
if self.accepted_tokens is not None:
cookie = http.cookies.SimpleCookie()
token = random_hex(32)
cookie[TOKEN_COOKIE_NAME] = token
self.accepted_tokens.add(token)
self.send_header('Set-Cookie', cookie.output(header='', sep=''))
if self.accepted_ips is not None:
self.accepted_ips.add(self.remote_addr)
self.send_header('Location', goto) self.send_header('Location', goto)
else: else:
self.send_response(401) self.send_response(401)
@ -273,15 +285,22 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
return False return False
class SimpleServer: class SimpleServer:
def __init__(self, port, password): def __init__(self, port, password, authorize_by_ip):
self.port = port self.port = port
self.password = password self.password = password
self.accepted_tokens = set() self.authorize_by_ip = authorize_by_ip
if authorize_by_ip:
self.accepted_ips = set()
self.accepted_tokens = None
else:
self.accepted_tokens = set()
self.accepted_ips = None
def make_request_handler(self, *args, **kwargs): def make_request_handler(self, *args, **kwargs):
return RequestHandler( return RequestHandler(
password=self.password, password=self.password,
accepted_tokens=self.accepted_tokens, accepted_tokens=self.accepted_tokens,
accepted_ips=self.accepted_ips,
*args, *args,
**kwargs, **kwargs,
) )
@ -460,7 +479,11 @@ def zip_directory(path):
# COMMAND LINE ################################################################################################### # COMMAND LINE ###################################################################################################
def simpleserver_argparse(args): def simpleserver_argparse(args):
server = SimpleServer(port=args.port, password=args.password) server = SimpleServer(
port=args.port,
password=args.password,
authorize_by_ip=args.authorize_by_ip,
)
server.start() server.start()
def main(argv): def main(argv):
@ -468,6 +491,7 @@ def main(argv):
parser.add_argument('port', nargs='?', type=int, default=40000) parser.add_argument('port', nargs='?', type=int, default=40000)
parser.add_argument('--password', dest='password', default=None) parser.add_argument('--password', dest='password', default=None)
parser.add_argument('--authorize_by_ip', '--authorize-by-ip', dest='authorize_by_ip', action='store_true')
parser.set_defaults(func=simpleserver_argparse) parser.set_defaults(func=simpleserver_argparse)
args = parser.parse_args(argv) args = parser.parse_args(argv)