From 2bd001620f212a7562f0fcab61ac90d3b551c5b7 Mon Sep 17 00:00:00 2001
From: Maciej Szwed <maciej.szwed@intel.com>
Date: Thu, 30 Apr 2020 11:23:15 +0200
Subject: [PATCH] scripts: Add SSL certificate option in rpc_http_proxy

This is required for SSL verification when running on https.
Added argparse to handle multiple optional arguments.

Signed-off-by: Maciej Szwed <maciej.szwed@intel.com>
Change-Id: Ib8731bafaaf38264ed86ed84ca7eeca5ff4935b3

Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2122
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
---
 scripts/rpc_http_proxy.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/scripts/rpc_http_proxy.py b/scripts/rpc_http_proxy.py
index 00078f7bdf..ea9d17b162 100755
--- a/scripts/rpc_http_proxy.py
+++ b/scripts/rpc_http_proxy.py
@@ -1,9 +1,11 @@
 #!/usr/bin/env python3
 
+import argparse
 import base64
 import errno
 import json
 import socket
+import ssl
 import sys
 try:
     from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
@@ -13,6 +15,14 @@ except ImportError:
 
 rpc_sock = None
 
+parser = argparse.ArgumentParser(description='http(s) proxy for SPDK RPC calls')
+parser.add_argument('host', help='Host name / IP representing proxy server')
+parser.add_argument('port', help='Port number', type=int)
+parser.add_argument('user', help='User name used for authentication')
+parser.add_argument('password', help='Password used for authentication')
+parser.add_argument('-s', dest='sock', help='RPC domain socket path', default='/var/tmp/spdk.sock')
+parser.add_argument('-c', dest='cert', help='SSL certificate')
+
 
 def print_usage_and_exit(status):
     print('Usage: rpc_http_proxy.py <server IP> <server port> <user name>' +
@@ -92,26 +102,17 @@ class ServerHandler(BaseHTTPRequestHandler):
 def main():
     global rpc_sock
 
-    if len(sys.argv) == 1 or sys.argv[1] == '-h':
-        print_usage_and_exit(0)
-    elif len(sys.argv) < 5:
-        print('Not enough arguments')
-        print_usage_and_exit(errno.EINVAL)
-    elif len(sys.argv) > 6:
-        print('Too many arguments')
-        print_usage_and_exit(errno.E2BIG)
-
-    if len(sys.argv) == 6:
-        rpc_sock = sys.argv[5]
-    else:
-        rpc_sock = '/var/tmp/spdk.sock'
+    args = parser.parse_args()
+    rpc_sock = args.sock
 
     # encoding user name and password
-    key = base64.b64encode((sys.argv[3]+':'+sys.argv[4]).encode(encoding='ascii')).decode('ascii')
+    key = base64.b64encode((args.user+':'+args.password).encode(encoding='ascii')).decode('ascii')
 
     try:
         ServerHandler.key = key
-        httpd = HTTPServer((sys.argv[1], int(sys.argv[2])), ServerHandler)
+        httpd = HTTPServer((args.host, args.port), ServerHandler)
+        if args.cert is not None:
+            httpd.socket = ssl.wrap_socket(httpd.socket, certfile=args.cert, server_side=True)
         print('Started RPC http proxy server')
         httpd.serve_forever()
     except KeyboardInterrupt: