From: Tobias Ulmer <tu@emlix.com>
Date: Mon, 18 Mar 2019 19:51:49 +0000 (+0100)
Subject: e2lib: improve verification of e2.conf some more
X-Git-Tag: e2factory-2.3.18rc1~18
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=ebbb9d929915e48a288a8bec5775ec97aab6788e;p=e2factory.git

e2lib: improve verification of e2.conf some more

Signed-off-by: Tobias Ulmer <tu@emlix.com>
---

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index 91cbf75..d7ab5ad 100644
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -1049,7 +1049,14 @@ local function verify_global_config(config)
             end
             e2lib.globals.logrotate = config.log.logrotate
         end
+
+        rc, re = e2lib.vrfy_dict_exp_keys(config.log, "e2 config.log",
+            { "logrotate", })
+        if not rc then
+            return false, re
+        end
     end
+
     rc, re = assert_type(config.site, "config.site", "table")
     if not rc then
         return false, re
@@ -1075,11 +1082,23 @@ local function verify_global_config(config)
         return false, re
     end
 
+    rc, re = assert_type(config.site.e2_location, "config.site.e2_location", "string")
+    if not rc then
+        return false, re
+    end
+
     rc, re = assert_type(config.site.default_extensions, "config.site.default_extensions", "table")
     if not rc then
         return false, re
     end
 
+    rc, re = e2lib.vrfy_dict_exp_keys(config.site, "e2 config.site",
+        { "e2_branch", "e2_tag", "e2_server", "e2_base", "e2_location",
+          "default_extensions" })
+    if not rc then
+        return false, re
+    end
+
     rc, re = assert_type(config.servers, "config.servers", "table")
     if not rc then
         return false, re
@@ -1090,6 +1109,11 @@ local function verify_global_config(config)
         return false, re
     end
 
+    rc, re = e2lib.vrfy_dict_exp_keys(config.cache, "e2 config.cache", { "path", })
+    if not rc then
+        return false, re
+    end
+
     rc, re = e2lib.vrfy_dict_exp_keys(config, "e2 config",
         { "cache", "log", "servers", "site", "tools", })
     if not rc then