updates vagrant configs; updates server example, updates copyright year.

wrapper/python/wolfssl/examples/server.py

@@ -4,7 +4,7 @@
 #
 # server.py
 #
-# Copyright (C) 2006-2016 wolfSSL Inc.
+# Copyright (C) 2006-2017 wolfSSL Inc.
 #
 # This file is part of wolfSSL. (formerly known as CyaSSL)
 #
@@ -26,6 +26,7 @@
 
 import sys
 import socket
+import argparse
 
 try:
     import wolfssl
@@ -33,32 +34,121 @@ except ImportError:
     print("You must run 'python setup.py install' to use the examples")
     sys.exit()
 
-bind_socket = socket.socket()
-bind_socket.bind(('', 0))
-bind_socket.listen(5)
+def build_arg_parser():
+    parser = argparse.ArgumentParser(add_help=False)
 
-print("Server listening on port", bind_socket.getsockname()[1])
+    parser.add_argument(
+        "-?", "--help", action="help",
+        help="show this help message and exit"
+    )
 
-while True:
-    try:
-        secure_socket = None
+    parser.add_argument(
+        "-p", metavar="port", type=int, default=11111,
+        help="Port to listen on, not 0, default 11111"
+    )
 
-        new_socket, from_addr = bind_socket.accept()
+    parser.add_argument(
+        "-v", metavar="version", type=int, choices=[0, 1, 2, 3], default=3,
+        help="SSL version [0-3], SSLv3(0) - TLS1.2(3)), default 3"
+    )
 
-        secure_socket = wolfssl.wrap_socket(
-            new_socket,
-            server_side=True,
-            certfile="certs/server-cert.pem",
-            keyfile="certs/server-key.pem")
+    parser.add_argument(
+        "-l", metavar="ciphers", type=str, default="",
+        help="Cipher suite list (: delimited)"
+    )
 
-        print(secure_socket.read())
-        secure_socket.write(b"I hear you fa shizzle!")
+    parser.add_argument(
+        "-c", metavar="certificate", default="./certs/server-cert.pem",
+        help="Certificate file,           default ./certs/server-cert.pem"
+    )
 
-    except KeyboardInterrupt:
-        print()
-        break
+    parser.add_argument(
+        "-k", metavar="key", default="./certs/server-key.pem",
+        help="Key file,                   default ./certs/server-key.pem"
+    )
 
-    finally:
-        if secure_socket:
-            secure_socket.shutdown(socket.SHUT_RDWR)
-            secure_socket.close()
+    parser.add_argument(
+        "-A", metavar="ca_file", default="./certs/client-cert.pem",
+        help="Certificate Authority file, default ./certs/client-cert.pem"
+    )
+
+    parser.add_argument(
+        "-d", action="store_true",
+        help="Disable client cert check"
+    )
+
+    parser.add_argument(
+        "-b", action="store_true",
+        help="Bind to any interface instead of localhost only"
+    )
+
+    parser.add_argument(
+        "-i", action="store_true",
+        help="Loop indefinitely (allow repeated connections)"
+    )
+
+    return parser
+
+
+def get_method(index):
+    return (
+        wolfssl.PROTOCOL_SSLv3,
+        wolfssl.PROTOCOL_TLSv1,
+        wolfssl.PROTOCOL_TLSv1_1,
+        wolfssl.PROTOCOL_TLSv1_2
+    )[index]
+
+
+def main():
+    args = build_arg_parser().parse_args()
+    print(args)
+
+    bind_socket = socket.socket()
+    bind_socket.bind(("" if args.b else "localhost", args.p))
+    bind_socket.listen(5)
+
+    print("Server listening on port", bind_socket.getsockname()[1])
+
+    context = wolfssl.SSLContext(get_method(args.v), server_side=True)
+
+    context.load_cert_chain(args.c, args.k)
+
+    if args.d:
+        context.verify_mode = wolfssl.CERT_NONE
+    else:
+        context.verify_mode = wolfssl.CERT_REQUIRED
+        context.load_verify_locations(args.A)
+
+    if args.l:
+        context.set_ciphers(args.l)
+
+    while True:
+        try:
+            secure_socket = None
+
+            new_socket, from_addr = bind_socket.accept()
+
+            secure_socket = context.wrap_socket(new_socket)
+
+            print("Connection received from", from_addr)
+
+            print("\n", secure_socket.read(), "\n")
+            secure_socket.write(b"I hear you fa shizzle!")
+
+        except KeyboardInterrupt:
+            print()
+            break
+
+        finally:
+            if secure_socket:
+                secure_socket.shutdown(socket.SHUT_RDWR)
+                secure_socket.close()
+
+        if not args.i:
+            break
+
+    bind_socket.close()
+
+
+if __name__ == '__main__':
+    main()