add ability to turn off ZM auth in mlapi, add params to config

Author: pliablepixels

mlapi.py

@@ -348,11 +348,17 @@ def ret_val(exception):
 api.add_resource(Health, '/health')
 
 secrets_conf = pyzmutils.read_config(g.config['secrets'])
+
 g.config['api_portal'] = g.config['api_portal'] or pyzmutils.get(key='ZM_API_PORTAL', section='secrets', conf=secrets_conf)
 g.config['portal'] = g.config['portal'] or pyzmutils.get(key='ZM_PORTAL', section='secrets', conf=secrets_conf)
 g.config['user'] = g.config['user'] or pyzmutils.get(key='ZM_USER', section='secrets', conf=secrets_conf)
 g.config['password'] = g.config['password'] or pyzmutils.get(key='ZM_PASSWORD', section='secrets', conf=secrets_conf)
 
+if g.config['auth_enabled'] == 'no':
+    g.config['user'] = None 
+    g.config['password'] = None 
+    g.logger.Info('Turning off auth for mlapi')
+
 api_options  = {
     'apiurl': g.config['api_portal'],
     'portalurl':g.config['portal'],

mlapiconfig.ini

@@ -6,6 +6,18 @@
 #secrets=./secrets.ini
 secrets=/etc/zm/secrets.ini
 
+# portal/user/password are needed if you plan on using ZM's legacy
+# auth mechanism to get images
+portal=!ZM_PORTAL
+user=!ZM_USER
+password=!ZM_PASSWORD
+
+# api portal is needed if you plan to use tokens to get images
+# requires ZM 1.33 or above
+api_portal=!ZM_API_PORTAL
+
+# make this no, if you don't plan to use auth. Default is yes.
+auth_enabled=yes
 
 # port that mlapi will listen on. Default 5000
 port=5000

modules/common_params.py

@@ -18,6 +18,11 @@
             'section': 'general',
             'default': None,
             'type': 'string',
+        },
+        'auth_enabled':{
+            'section': 'general',
+            'default': 'yes',
+            'type': 'string',
         },
          'portal':{
             'section': 'general',