Support password changing via cli args (#4)

Signed-off-by: Tully Foote <[email protected]>

Author: tfoote

README.md

@@ -10,6 +10,8 @@ Setup virtualenv with this installed or developed
 
 Go to http://localhost:8080/vnc.html
 
+It is highly recommended to change the default username and password!
+
 testing username and password are
 
-    testuser:testpassword
+    novnc_example_user:novnc_example_password_$Insecure_$Changeme!!

novnc_rocker/novnc.py

@@ -23,13 +23,13 @@ def get_preamble(self, cli_args):
         return ''
 
     def get_files(self, cli_args):
-        file_list = ['supervisor.conf', 'self.pem', '.htpasswd', 'nginx.conf']
+        file_list = ['supervisor.conf', 'self.pem', 'nginx.conf']
         files = {}
         for f in file_list:
             files['%s' % f] = pkgutil.get_data(
                 'novnc_rocker',
                 'templates/%s' % f).decode('utf-8')
-        template_list = ['novnc.conf',  'rproxy-nginx-site']
+        template_list = ['novnc.conf',  'rproxy-nginx-site', '.htpasswd']
         for f in template_list:
             files['%s' % f] = em.expand(
                 pkgutil.get_data(
@@ -57,4 +57,14 @@ def register_arguments(parser, defaults={}):
             action='store',
             type=int,
             default=defaults.get('novnc-port', 8080),
-            help="what port to use for novnc")
+            help="what port to use for novnc")
+        parser.add_argument('--novnc-user',
+            action='store',
+            type=str,
+            default=defaults.get('novnc-user', 'novnc_example_user'),
+            help="what username to use for novnc")
+        parser.add_argument('--novnc-password',
+            action='store',
+            type=str,
+            default=defaults.get('novnc-user', 'novnc_example_password_$Insecure_$Changeme!!'),
+            help="what password to use for novnc")

novnc_rocker/templates/.htpasswd

@@ -0,0 +1,2 @@
+@{import bcrypt}@
+@(novnc_user):@(bcrypt.hashpw(novnc_password.encode('utf8'), bcrypt.gensalt(rounds=10)).decode())

novnc_rocker/templates/.htpasswd.em

@@ -21,6 +21,7 @@
     url="https://github.com/tfoote/novnc-rocker",
     license='Apache 2.0',
     install_requires=[
+        'bcrypt',
         'rocker',
     ],
     entry_points={