monitor: allow to view and modify empty monitor config parameter

slapos/monitor/monitor.py

@@ -136,29 +136,35 @@ class Monitoring(object):
             title=config_list[1],
             value=' '.join(config_list[2:])
           ))
-        elif (config_list[0] == 'file' or config_list[0] == 'htpasswd')  and \
-            os.path.exists(config_list[2]) and os.path.isfile(config_list[2]):
-          try:
-            with open(config_list[2]) as cfile:
-              parameter = dict(
-                key=config_list[1],
-                title=config_list[1],
-                value=cfile.read(),
-                description={
-                  "type": config_list[0],
-                  "file": config_list[2]
-                }
-              )
-              if config_list[0] == 'htpasswd':
-                if len(config_list) != 5 or not os.path.exists(config_list[4]):
-                  print 'htpasswd file is not specified: %s' % str(config_list)
-                  continue
-                parameter['description']['user'] = config_list[3]
-                parameter['description']['htpasswd'] = config_list[4]
-              configuration_list.append(parameter)
-          except OSError, e:
-            print 'Cannot read file %s, Error is: %s' % (config_list[2], str(e))
-            pass
+        elif (config_list[0] == 'file' or config_list[0] == 'htpasswd'):
+          directory = os.path.dirname(config_list[2])
+          if not os.path.exists(directory) or not os.access(directory, os.W_OK):
+            raise OSError("Directory does not exists or does not have write acess")
+          if os.path.exists(config_list[2]) and os.path.isfile(config_list[2]):
+            try:
+              with open(config_list[2]) as cfile:
+                param_value = cfile.read()
+            except OSError, e:
+              print 'Cannot read file %s, Error is: %s' % (config_list[2], str(e))
+              pass
+          else:
+            param_value = ""
+          parameter = dict(
+            key=config_list[1],
+            title=config_list[1],
+            value=param_value,
+            description={
+              "type": config_list[0],
+              "file": config_list[2]
+            }
+          )
+          if config_list[0] == 'htpasswd':
+            if len(config_list) != 5 or not os.path.exists(config_list[4]):
+              print 'htpasswd file is not specified: %s' % str(config_list)
+              continue
+            parameter['description']['user'] = config_list[3]
+            parameter['description']['htpasswd'] = config_list[4]
+          configuration_list.append(parameter)
         elif config_list[0] == 'httpdcors' and os.path.exists(config_list[2]) and \
             os.path.exists(config_list[3]):
           old_cors_file = os.path.join(

slapos/monitor/monitor_config_write.py

@@ -36,18 +36,16 @@ class MonitorConfigWrite(object):
     self.monitor_https_cors = monitor_https_cors
 
   def _fileWrite(self, file_path, content):
-    if os.path.exists(file_path):
-      try:
-        with open(file_path, 'w') as wf:
-          wf.write(content)
-          return True
-      except OSError, e:
-        print "ERROR while writing changes to %s.\n %s" % (file_path, str(e))
-    return False
+    try:
+      with open(file_path, 'w') as wf:
+        print file_path, content
+        wf.write(content.strip())
+        return True
+    except OSError, e:
+      print "ERROR while writing changes to %s.\n %s" % (file_path, str(e))
+      return False
 
   def _htpasswdWrite(self, htpasswd_bin,  parameter_dict, value):
-    if not os.path.exists(parameter_dict['file']):
-      return False
     command = [htpasswd_bin, '-cb', parameter_dict['htpasswd'], parameter_dict['user'], value]
     process = subprocess.Popen(
       command,