CLI arguments for servername and port number

This commit is contained in:
kflux 2020-09-18 15:22:26 +02:00
parent 242d44178c
commit 337f765eed

View file

@ -20,6 +20,7 @@
# SOFTWARE.
import os
import sys
import threading
import json
@ -36,24 +37,43 @@ sockets = Sockets(app)
qng_wrapper = QngWrapperWindows() if (os.name == 'nt') else QngWrapperLinux()
# Original API ----------------------------------------------
def main():
# Commandline Arguments (servername, port)
@app.route('/api/randint32')
def randint32():
argNo = len(sys.argv) - 1
if argNo < 2:
print("--------------------------------------------")
print("Please provide arguments: <servername> <port>")
print("--------------------------------------------")
else:
servername = sys.argv[1]
port = int(sys.argv[2])
print("----------------------------------------------------------------------------------------")
print("Serving Entropy as pod \"", servername, "\" on http://localhost:", port, "/api/...", sep='')
print("----------------------------------------------------------------------------------------")
serve(servername, port)
def serve(servername, port):
# Original API ----------------------------------------------
@app.route('/api/randint32')
def randint32():
return Response(str(qng_wrapper.randint32()), content_type='text/plain')
@app.route('/api/randuniform')
def randuniform():
@app.route('/api/randuniform')
def randuniform():
return Response(str(qng_wrapper.randuniform()), content_type='text/plain')
@app.route('/api/randnormal')
def randnormal():
@app.route('/api/randnormal')
def randnormal():
return Response(str(qng_wrapper.randnormal()), content_type='text/plain')
@app.route('/api/randhex')
def randhex():
@app.route('/api/randhex')
def randhex():
try:
length = int(request.args.get('length'))
if length < 1:
@ -62,8 +82,8 @@ def randhex():
except (TypeError, ValueError) as e:
return Response(str(e), status=400, content_type='text/plain')
@app.route('/api/randbytes')
def randbytes():
@app.route('/api/randbytes')
def randbytes():
try:
length = int(request.args.get('length'))
if length < 1:
@ -72,10 +92,10 @@ def randbytes():
except (TypeError, ValueError) as e:
return Response(str(e), status=400, content_type='text/plain')
# JSON API ----------------------------------------------
# JSON API ----------------------------------------------
@app.route('/api/json/randint32')
def randjsonint32():
@app.route('/api/json/randint32')
def randjsonint32():
try:
length = int(request.args.get('length'))
if length < 1:
@ -83,12 +103,12 @@ def randjsonint32():
int32array = []
for x in range(0, length):
int32array.append(qng_wrapper.randint32())
return Response(json.dumps({"type": "string", "format": "int32", "length":length, "data": int32array, "success": "true"}), content_type='text/plain')
return Response(json.dumps({"server" : servername, "type": "string", "format": "int32", "length":length, "data": int32array, "success": "true"}), content_type='text/plain')
except (TypeError, ValueError) as e:
return Response(json.dumps({"error": str(e), "success":"false"}), status=400, content_type='text/plain')
@app.route('/api/json/randuniform')
def randjsonuniform():
@app.route('/api/json/randuniform')
def randjsonuniform():
try:
length = int(request.args.get('length'))
if length < 1:
@ -96,12 +116,12 @@ def randjsonuniform():
uniformarray = []
for x in range(0, length):
uniformarray.append(qng_wrapper.randuniform())
return Response(json.dumps({"type": "string", "format": "uniform", "length":length, "data": uniformarray, "success": "true"}), content_type='text/plain')
return Response(json.dumps({"server" : servername, "type": "string", "format": "uniform", "length":length, "data": uniformarray, "success": "true"}), content_type='text/plain')
except (TypeError, ValueError) as e:
return Response(json.dumps({"error": str(e), "success":"false"}), status=400, content_type='text/plain')
@app.route('/api/json/randnormal')
def randjsonnormal():
@app.route('/api/json/randnormal')
def randjsonnormal():
try:
length = int(request.args.get('length'))
if length < 1:
@ -109,12 +129,12 @@ def randjsonnormal():
normarray = []
for x in range(0, length):
normarray.append(qng_wrapper.randnormal())
return Response(json.dumps({"type": "string", "format": "normal", "length":length, "data": normarray, "success": "true"}), content_type='text/plain')
return Response(json.dumps({"server" : servername, "type": "string", "format": "normal", "length":length, "data": normarray, "success": "true"}), content_type='text/plain')
except (TypeError, ValueError) as e:
return Response(json.dumps({"error": str(e), "success":"false"}), status=400, content_type='text/plain')
@app.route('/api/json/randhex')
def randjsonhex():
@app.route('/api/json/randhex')
def randjsonhex():
try:
length = int(request.args.get('length'))
size = int(request.args.get('size'))
@ -125,24 +145,24 @@ def randjsonhex():
hexarray = []
for x in range(0, length):
hexarray.append(qng_wrapper.randbytes(size).hex())
return Response(json.dumps({"type": "string", "format": "hex", "length":length, "size": size, "data": hexarray, "success": "true"}), content_type='text/plain')
return Response(json.dumps({"server" : servername, "type": "string", "format": "hex", "length":length, "size": size, "data": hexarray, "success": "true"}), content_type='text/plain')
except (TypeError, ValueError) as e:
return Response(json.dumps({"error": str(e), "success":"false"}), status=400, content_type='text/plain')
@app.route('/api/clear')
def clear():
@app.route('/api/clear')
def clear():
qng_wrapper.clear()
return Response(status=204)
# Websockets ----------------------------------------------
# Websockets ----------------------------------------------
@sockets.route('/ws')
def ws(websocket):
@sockets.route('/ws')
def ws(websocket):
subscribed = [False]
while not websocket.closed:
threading.Thread(target=handle_ws_message, args=(websocket.receive(), websocket, subscribed)).start()
def handle_ws_message(message, websocket, subscribed):
def handle_ws_message(message, websocket, subscribed):
try:
split_message = message.strip().upper().split()
if split_message[0] == 'RANDINT32':
@ -197,9 +217,12 @@ def handle_ws_message(message, websocket, subscribed):
except Exception as e:
websocket.close(code=1011, message=str(e))
@app.errorhandler(Exception)
def handle_exception(e):
@app.errorhandler(Exception)
def handle_exception(e):
return Response(e.description, status=e.code, content_type='text/plain')
server = pywsgi.WSGIServer(('0.0.0.0', 62456), application=app, handler_class=WebSocketHandler)
server.serve_forever()
server = pywsgi.WSGIServer(('0.0.0.0', port), application=app, handler_class=WebSocketHandler)
server.serve_forever()
if __name__ == "__main__":
main()