Sanitize input

benchmarks/000.microbenchmarks/010.sleep/python/function.py

@@ -1,9 +1,13 @@
-
 from time import sleep
 
 def handler(event):
 
     # start timing
-    sleep_time = event.get('sleep')
+    sleep_time = event.get('sleep', None)
+    if sleep_time is None:
+        return { "status": "failure", "result": "Error: Key 'sleep' not found on input data." }
+    elif not isinstance(sleep_time, (int, float)):
+        return { "status": "failure", "result": "Error: Unexpected type for 'sleep' (expected int or float)"}
+
     sleep(sleep_time)
-    return { 'result': sleep_time }
+    return { "status": "success", "result": "Returned with no error", "measurement": sleep_time }

benchmarks/000.microbenchmarks/020.network-benchmark/python/function.py

@@ -1,28 +1,44 @@
 import csv
-import json
 import socket
 from datetime import datetime
-from time import sleep
+from jsonschema import validate
 
 from . import storage
 
 def handler(event):
 
+    schema = {
+        "type": "object",
+        "required": [ "request_id", "server-address", "server-port", "repetitions", "output-bucket" ],
+        "properties": {
+            "request-id": {"type": "integer"},
+            "server-address": {"type": "integer"},
+            "server-port": {"type": "integer"},
+            "repetitions": {"type": "integer"},
+            "output-bucket": {"type": "object"}
+        }
+    }
+    try:
+        validate(event, schema=schema)
+    except:
+        return { 'status': 'failure', 'result': 'Some value(s) is/are not found in JSON data or of incorrect type' }
+
     request_id = event['request-id']
     address = event['server-address']
     port = event['server-port']
     repetitions = event['repetitions']
-    output_bucket = event.get('output-bucket')
-    times = []
+    output_bucket = event['output-bucket']
+
     i = 0
+    times = []
     socket.setdefaulttimeout(3)
     server_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     server_socket.bind(('', 0))
     message = request_id.encode('utf-8')
     adr = (address, port)
     consecutive_failures = 0
-    while i < repetitions + 1:
+    while i <= repetitions:
         try:
             send_begin = datetime.now().timestamp()
             server_socket.sendto(message, adr)
@@ -32,8 +48,8 @@ def handler(event):
             i += 1
             consecutive_failures += 1
             if consecutive_failures == 5:
-                print("Can't setup the connection")
-                break
+                server_socket.close()
+                return { 'status': 'failure', 'result': 'Unable to setup connection' }
             continue
         if i > 0:
             times.append([i, send_begin, recv_end])
@@ -42,14 +58,12 @@ def handler(event):
         server_socket.settimeout(2)
     server_socket.close()
 
-    if consecutive_failures != 5:
-        with open('/tmp/data.csv', 'w', newline='') as csvfile:
-            writer = csv.writer(csvfile, delimiter=',')
-            writer.writerow(["id", "client_send", "client_rcv"]) 
-            for row in times:
-                writer.writerow(row)
-
-        client = storage.storage.get_instance()
-        key = client.upload(output_bucket, 'results-{}.csv'.format(request_id), '/tmp/data.csv')
-
-    return { 'result': key }
+    with open('/tmp/data.csv', 'w', newline='') as csvfile:
+        writer = csv.writer(csvfile, delimiter=',')
+        writer.writerow(["id", "client_send", "client_rcv"]) 
+        for row in times:
+            writer.writerow(row)
+
+    client = storage.storage.get_instance()
+    key = client.upload(output_bucket, f'results-{request_id}.csv', '/tmp/data.csv') 
+    return { 'status': 'success', 'result': 'Returned with no error', 'measurement': key }

benchmarks/000.microbenchmarks/020.network-benchmark/python/requirements.txt

@@ -0,0 +1 @@
+jsonschema>=4.17.0

benchmarks/000.microbenchmarks/030.clock-synchronization/python/function.py

@@ -3,19 +3,39 @@
 import socket
 from datetime import datetime
 from time import sleep
+from jsonschema import validate
 
 from . import storage
 
 def handler(event):
 
+    schema = {
+        "type": "object",
+        "required": [ "request_id", "server-address", "server-port", "repetitions", "output-bucket", "income-timestamp" ],
+        "properties": {
+            "request-id": {"type": "integer"},
+            "server-address": {"type": "integer"},
+            "server-port": {"type": "integer"},
+            "repetitions": {"type": "integer"},
+            "output-bucket": {"type": "object"},
+            "income-timestamp": {"type": "number"}
+        }
+    }
+    try:
+        validate(event, schema=schema)
+    except:
+        # !? To return 'measurement': {'bucket-key': None, 'timestamp': event['income-timestamp']}
+        return { 'status': 'failure', 'result': 'Some value(s) is/are not found in JSON data or of incorrect type' }
+
     request_id = event['request-id']
     address = event['server-address']
     port = event['server-port']
     repetitions = event['repetitions']
-    output_bucket = event.get('output-bucket')
-    times = []
-    print("Starting communication with {}:{}".format(address, port))
+    output_bucket = event['output-bucket']
+
     i = 0
+    times = []
+    print(f"Starting communication with {address}:{port}")
     socket.setdefaulttimeout(4)
     server_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
@@ -35,14 +55,15 @@ def handler(event):
             i += 1
             consecutive_failures += 1
             if consecutive_failures == 7:
-                print("Can't setup the connection")
-                break
+                server_socket.close()
+                # !? To return 'measurement': {'bucket-key': None, 'timestamp': event['income-timestamp']}
+                return { 'status': 'failure', 'result': 'Unable to setup connection' }
             continue
         if i > 0:
             times.append([i, send_begin, recv_end])
         cur_time = recv_end - send_begin
-        print("Time {} Min Time {} NotSmaller {}".format(cur_time, cur_min, measurements_not_smaller))
-        if cur_time > cur_min and cur_min > 0:
+        print(f"Time {cur_time} Min Time {cur_min} NotSmaller {measurements_not_smaller}")
+        if cur_time > cur_min > 0:
             measurements_not_smaller += 1
             if measurements_not_smaller == repetitions:
                 message = "stop".encode('utf-8')
@@ -56,16 +77,13 @@ def handler(event):
         server_socket.settimeout(4)
     server_socket.close()
 
-    if consecutive_failures != 5:
-        with open('/tmp/data.csv', 'w', newline='') as csvfile:
-            writer = csv.writer(csvfile, delimiter=',')
-            writer.writerow(["id", "client_send", "client_rcv"]) 
-            for row in times:
-                writer.writerow(row)
-
-        client = storage.storage.get_instance()
-        key = client.upload(output_bucket, 'results-{}.csv'.format(request_id), '/tmp/data.csv')
-    else:
-        key = None
+    with open('/tmp/data.csv', 'w', newline='') as csvfile:
+        writer = csv.writer(csvfile, delimiter=',')
+        writer.writerow(["id", "client_send", "client_rcv"]) 
+        for row in times:
+            writer.writerow(row)
+
+    client = storage.storage.get_instance()
+    key = client.upload(output_bucket, f'results-{request_id}.csv', '/tmp/data.csv')
 
-    return { 'result': {'bucket-key': key, 'timestamp':  event['income-timestamp']} }
+    return { 'status': 'success', 'result': 'Returned with no error', 'measurement': {'bucket-key': key, 'timestamp': event['income-timestamp']} }

benchmarks/000.microbenchmarks/030.clock-synchronization/python/requirements.txt

@@ -0,0 +1 @@
+jsonschema>=4.17.0

benchmarks/000.microbenchmarks/040.server-reply/python/function.py

@@ -1,13 +1,27 @@
-
 import socket
 from time import sleep
+from jsonschema import validate
 
 def handler(event):
 
+    schema = {
+        "type": "object",
+        "required": ["ip-address", "port"],
+        "properties": {
+            "ip-address": {"type": "number"},
+            "port": {"type": "integer"}
+        }
+    }
+    try:
+        validate(event, schema=schema)
+    except:
+        return { 'status': 'failure', 'result': 'Some value(s) is/are not found in JSON data or of incorrect type' }
+
     # start timing
-    addr = (event.get('ip-address'), event.get('port'))
+    addr = (event['ip-address'], event['port'])
+
     socket.setdefaulttimeout(20)
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     s.connect(addr)
     msg = s.recv(1024).decode()
-    return {"result": msg}
+    return { 'status': 'success', 'result': 'Returned with no error', "measurement": msg }

benchmarks/000.microbenchmarks/040.server-reply/python/requirements.txt

@@ -0,0 +1 @@
+jsonschema>=4.17.0

benchmarks/100.webapps/110.dynamic-html/python/function.py

@@ -1,7 +1,9 @@
 from datetime import datetime                                                   
 from random import sample  
 from os import path
-from time import time                                                           
+from time import time_ns
+from jsonschema import validate
+
 import os
 
 from jinja2 import Template
@@ -10,13 +12,26 @@
 
 def handler(event):
 
+    schema = {
+        "type": "object",
+        "required": ["username", "random_len"],
+        "properties": {
+            "username": {"type": "string"},
+            "random_len": {"type": "integer"}
+        }
+    }
+    try:
+        validate(event, schema=schema)
+    except:
+        return { 'status': 'failure', 'result': 'Some value(s) is/are not found in JSON data or of incorrect type' }
     # start timing
-    name = event.get('username')
-    size = event.get('random_len')
+    name = event['username']
+    size = event['random_len']
+
     cur_time = datetime.now()
     random_numbers = sample(range(0, 1000000), size)
-    template = Template( open(path.join(SCRIPT_DIR, 'templates', 'template.html'), 'r').read())
+    template = Template(open(path.join(SCRIPT_DIR, 'templates', 'template.html'), 'r').read())
     html = template.render(username = name, cur_time = cur_time, random_numbers = random_numbers)
     # end timing
     # dump stats 
-    return {'result': html}
+    return { 'status': 'success', 'result': 'Returned with no error', 'measurement': html }

benchmarks/100.webapps/110.dynamic-html/python/requirements.txt

@@ -1 +1,2 @@
 jinja2>=2.10.3
+jsonschema>=4.17.0

benchmarks/100.webapps/120.uploader/python/function.py

@@ -1,20 +1,38 @@
-
 import datetime
 import os
 import uuid
-
 import urllib.request
+from jsonschema import validate
 
 from . import storage
 client = storage.storage.get_instance()
 
-
 def handler(event):
 
-    output_bucket = event.get('bucket').get('output')
-    url = event.get('object').get('url')
+    schema = {
+        "type": "object",
+        "required": ["bucket", "object"],
+        "properties": {
+            "bucket": {
+                "type": "object",
+                "required": ["output"]
+            },
+            "object": {
+                "type": "object",
+                "required": ["url"]
+            }
+        }
+    }
+
+    try:
+        validate(event, schema=schema)
+    except:
+        return { 'status': 'failure', 'result': 'Some value(s) is/are not found in JSON data or of incorrect type' }
+
+    output_bucket = event['bucket']['output']
+    url = event['object']['url']
     name = os.path.basename(url)
-    download_path = '/tmp/{}'.format(name)
+    download_path = f'/tmp/{name}'
 
     process_begin = datetime.datetime.now()
     urllib.request.urlretrieve(url, filename=download_path)
@@ -28,12 +46,12 @@ def handler(event):
     process_time = (process_end - process_begin) / datetime.timedelta(microseconds=1)
     upload_time = (upload_end - upload_begin) / datetime.timedelta(microseconds=1)
     return {
-            'result': {
+            'status': 'success',
+            'result': 'Returned with no error',
+            'measurement': {
                 'bucket': output_bucket,
                 'url': url,
-                'key': key_name
-            },
-            'measurement': {
+                'key': key_name,
                 'download_time': 0,
                 'download_size': 0,
                 'upload_time': upload_time,

benchmarks/100.webapps/120.uploader/python/requirements.txt

@@ -0,0 +1 @@
+jsonschema>=4.17.0