Ensure config parsing fails if gitano-bypass is not viable

1 files changed, 16 insertions, 0 deletions

diff --git a/lib/gitano/config.lua b/lib/gitano/config.lua
index a175d01..8d5e53b 100644
--- a/lib/gitano/config.lua
+++ b/lib/gitano/config.lua
@@ -258,6 +258,22 @@ local function parse_admin_config(commit)
       end
    end
 
+   -- Validate that the bypass user (a) exists (b) isn't in any groups
+   -- and (c) has at least one key and/or a password set
+   if users["gitano-bypass"] then
+      for gname, gtab in pairs(groups) do
+	 if gtab.filtered_members["gitano-bypass"] then
+	    return nil, i18n.expand("ERROR_BYPASS_USER_IN_GROUP", {group=gname})
+	 end
+      end
+      local okay = next(users["gitano-bypass"].keys) or users["gitano-bypass"].clod["passwd.hash"]
+      if not okay then
+	 return nil, i18n.expand("ERROR_BYPASS_USER_LACKING")
+      end
+   else
+      return nil, i18n.expand("ERROR_NO_BYPASS_USER_FOUND")
+   end
+
    -- Finally, return an object representing this configuration
 
    local config = {