diff options
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/gitano-auth.in | 142 | ||||
| -rwxr-xr-x | bin/gitano-command.cgi.in | 24 | ||||
| -rw-r--r-- | bin/gitano-post-receive-hook.in | 6 | ||||
| -rw-r--r-- | bin/gitano-pre-receive-hook.in | 6 | ||||
| -rw-r--r-- | bin/gitano-setup.in | 5 | ||||
| -rwxr-xr-x | bin/gitano-smart-http.cgi.in | 3 | ||||
| -rw-r--r-- | bin/gitano-update-hook.in | 6 |
7 files changed, 35 insertions, 157 deletions
diff --git a/bin/gitano-auth.in b/bin/gitano-auth.in index 3901166..2190ae0 100644 --- a/bin/gitano-auth.in +++ b/bin/gitano-auth.in @@ -20,152 +20,28 @@ local sp = require "luxio.subprocess" -- @@GITANO_SHARE_PATH -- @@GITANO_PLUGIN_PATH -local repo_root, username, keytag = ... +local repo_root, user, keytag = ... gitano.config.repo_path(repo_root) local cmdline = luxio.getenv "SSH_ORIGINAL_COMMAND" or "" -local transactionid = gitano.log.syslog.open() - if cmdline:match("^[ \t\n]*$") then gitano.log.fatal("No command provided, cannot continue") end -local parsed_cmdline, warnings = gitano.util.parse_cmdline(cmdline) - -local start_log_level = gitano.log.get_level() --- Clamp level at info until we have checked if the caller --- is an admin or not -gitano.log.cap_level(gitano.log.level.INFO) - -if (#warnings > 0) then - gitano.log.error("Warnings encountered parsing commandline."); - gitano.log.warn("\t" .. cmdline) - gitano.log.warn("") - gitano.log.warn("Parsed as:") - for i = 1, #parsed_cmdline do - gitano.log.warn((" =[%2d]> %s"):format(i, parsed_cmdline[i])) - end - gitano.log.warn("\nWarnings were:") - for i = 1, #warnings do - gitano.log.warn(" * " .. warnings[i]) - end - gitano.log.warn("") - gitano.log.fatal("Game over, sorry\n") -end - --- Now load the administration data - -local admin_repo = gall.repository.new((repo_root or "") .. "/gitano-admin.git") - -if not admin_repo then - gitano.log.fatal("Unable to locate administration repository. Cannot continue"); -end - -local admin_head = admin_repo:get(admin_repo.HEAD) - -if not admin_head then - gitano.log.fatal("Unable to find the HEAD of the administration repository. Cannot continue"); -end - -local config, msg = gitano.config.parse(admin_head) - -if not config then - gitano.log.critical("Unable to parse administration repository.") - gitano.log.critical(" * " .. (msg or "No error?")) - gitano.log.fatal("Cannot continue") -end - --- Now, are we an admin? -if config.groups["gitano-admin"].filtered_members[username] then - -- Yep, so blithely reset logging level - gitano.log.set_level(start_log_level) -end - -if not config.global.silent then - -- Not silent, bump to chatty level automatically - gitano.log.bump_level(gitano.log.level.CHAT) -end - -local repo - --- Find the command +local authorized, cmd, parsed_cmdline, config, env, repo = + gitano.auth.is_authorized(user, "ssh", cmdline, repo_root) +if authorized then + local exit = gitano.util.run_command(cmd, cmdline, parsed_cmdline, + user, config, env, repo) -ip = string.match(luxio.getenv "SSH_CLIENT", "^[^ ]+") or "" - -gitano.log.syslog.info("Client connected from", ip, "as", username, - "(" .. keytag .. ")", "Executing command:", - cmdline) - -local cmd = gitano.command.get(parsed_cmdline[1]) - -if not cmd then - gitano.log.fatal("Unknown command: " .. parsed_cmdline[1]) -end - -if cmd.takes_repo then - repo, parsed_cmdline = cmd.detect_repo(config, parsed_cmdline) - if not repo and not parsed_cmdline then - gitano.log.fatal("Failed to acquire repository object") + if exit ~= 0 then + gitano.log.fatal("Error running command, exiting") end -end - --- Validate the commandline, massaging it as necessary. - -if not cmd.validate(config, repo, parsed_cmdline) then - gitano.log.fatal("Validation of command line failed") -end - --- Construct our context ready for prep -local context = { - source = "ssh", - user = username, - keytag = keytag, -} - -local action, reason = cmd.prep(config, repo, parsed_cmdline, context) - -if not action then - gitano.log.crit(reason) - gitano.log.fatal("Ruleset did not complete cleanly") -end - -if action == "allow" then - gitano.log.info(reason or "Ruleset permitted action") -else - gitano.log.critical(reason) - gitano.log.fatal("Ruleset denied action. Sorry.") -end - -gitano.log.debug("Welcome to " .. config.global.site_name) -gitano.log.debug("Running:") -for i = 1, #parsed_cmdline do - gitano.log.debug(" => " .. parsed_cmdline[i]) -end -gitano.log.debug("") -gitano.log.debug("On behalf of " .. username .. " using key " .. keytag) - --- Set up some useful environment variables - -local env = { - ["GITANO_ROOT"] = repo_root, - ["GITANO_USER"] = username, - ["GITANO_KEYTAG"] = keytag, - ["GITANO_PROJECT"] = (repo or {}).name, - ["GITANO_SOURCE"] = "ssh", - ["GITANO_TRANSACTION_ID"] = transactionid, -} - -local how, why = cmd.run(config, repo, parsed_cmdline, env) - -if how ~= "exit" or why ~= 0 then - gitano.log.critical("Error running sub-process:", - ("%s (%d)"):format(how, why)) - gitano.log.fatal("Unable to continue") else - gitano.log.syslog.info(cmdline, "completed successfully") + gitano.log.fatal("Not authorized") end gitano.log.syslog.close() diff --git a/bin/gitano-command.cgi.in b/bin/gitano-command.cgi.in index 1954635..2fa1db2 100755 --- a/bin/gitano-command.cgi.in +++ b/bin/gitano-command.cgi.in @@ -29,26 +29,6 @@ function url_decode(str) return str end -function run_command(cmd, cmdline, parsed_cmdline, user, config, env, repo) - gitano.log.debug("Welcome to " .. config.global.site_name) - gitano.log.debug("Running:") - for i = 1, #parsed_cmdline do - gitano.log.debug(" => " .. parsed_cmdline[i]) - end - gitano.log.debug("") - gitano.log.debug("On behalf of " .. user .. " using key " .. env["GITANO_KEYTAG"]) - - local how, why = cmd.run(config, repo, parsed_cmdline, env) - - if how ~= "exit" or why ~= 0 then - gitano.log.critical("Error running " .. parsed_cmdline[1] .. ": " .. how) - return why - else - gitano.log.syslog.info(cmdline, "completed successfully") - return 0 - end -end - if os.getenv("QUERY_STRING") then local query_string = url_decode(os.getenv("QUERY_STRING")) local cmdline = query_string @@ -74,10 +54,10 @@ if os.getenv("QUERY_STRING") then gitano.log.buffer_output() local authorized, cmd, parsed_cmdline, config, env, repo = - gitano.auth.is_authorized(user, "http", cmdline) + gitano.auth.is_authorized(user, "http", cmdline, os.getenv("GITANO_ROOT")) if authorized then - local exit = run_command(cmd, cmdline, parsed_cmdline, + local exit = gitano.util.run_command(cmd, cmdline, parsed_cmdline, user, config, env, repo) stdout:write("Status: " .. (exit == 0 and "200 OK" or "400 Bad request") diff --git a/bin/gitano-post-receive-hook.in b/bin/gitano-post-receive-hook.in index 3dccfee..df42ffc 100644 --- a/bin/gitano-post-receive-hook.in +++ b/bin/gitano-post-receive-hook.in @@ -31,6 +31,12 @@ local username = luxio.getenv("GITANO_USER") or "gitano/anonymous" local keytag = luxio.getenv("GITANO_KEYTAG") or "unknown" local project = luxio.getenv("GITANO_PROJECT") or "" local source = luxio.getenv("GITANO_SOURCE") or "ssh" +local running = luxio.getenv("GITANO_RUNNING") + +-- Check whether we are called through gitano-auth +if not running then + return 0 +end -- Now load the administration data gitano.config.repo_path(repo_root) diff --git a/bin/gitano-pre-receive-hook.in b/bin/gitano-pre-receive-hook.in index 182554b..2d9ef7e 100644 --- a/bin/gitano-pre-receive-hook.in +++ b/bin/gitano-pre-receive-hook.in @@ -31,6 +31,12 @@ local username = luxio.getenv("GITANO_USER") or "gitano/anonymous" local keytag = luxio.getenv("GITANO_KEYTAG") or "unknown" local project = luxio.getenv("GITANO_PROJECT") or "" local source = luxio.getenv("GITANO_SOURCE") or "ssh" +local running = luxio.getenv("GITANO_RUNNING") + +-- Check whether we are called through gitano-auth +if not running then + return 0 +end -- Now load the administration data gitano.config.repo_path(repo_root) diff --git a/bin/gitano-setup.in b/bin/gitano-setup.in index f31c8f0..038276c 100644 --- a/bin/gitano-setup.in +++ b/bin/gitano-setup.in @@ -164,6 +164,9 @@ ask_for("site.name", "Site name", "a random Gitano instance") ask_for("log.prefix", "Site log prefix", "gitano") ask_for("use.htpasswd", "Store passwords with htpasswd? (needed for http authentication)", "no") +ask_for("paths.skel", "Path to skeleton gitano-admin content", + gitano.config.share_path() .. "/skel/gitano-admin") + gitano.log.chat("Step 2: Gather required content") gitano.log.info("=> Prepare site config") @@ -176,7 +179,7 @@ completely_flat["site.conf"] = site_conf:serialise() -- Acquire the contents of the skeleton gitano-admin repository gitano.log.info("=> Acquire skeleton gitano-admin") -local skel_path = gitano.config.share_path() .. "/skel/gitano-admin" +local skel_path = get "paths.skel" local skel = assert(sio.opendir(skel_path)) local function acquire(dir, base, path) gitano.log.ddebug("Acquire skeleton in:", path) diff --git a/bin/gitano-smart-http.cgi.in b/bin/gitano-smart-http.cgi.in index 017c4e7..f294b28 100755 --- a/bin/gitano-smart-http.cgi.in +++ b/bin/gitano-smart-http.cgi.in @@ -59,7 +59,8 @@ if request_method == "GET" or request_method == "POST" then local user = os.getenv("REMOTE_USER") or "gitano/anonymous" local cmdline = parse_request(request_method) - if cmdline and gitano.auth.is_authorized(user, "http", cmdline) then + if cmdline and gitano.auth.is_authorized(user, "http", cmdline, + os.getenv("GITANO_ROOT")) then local proc = subprocess.spawn_simple({"git", "http-backend"}) local exit_code diff --git a/bin/gitano-update-hook.in b/bin/gitano-update-hook.in index bb7d8fe..15da2a9 100644 --- a/bin/gitano-update-hook.in +++ b/bin/gitano-update-hook.in @@ -35,6 +35,12 @@ local username = luxio.getenv("GITANO_USER") or "gitano/anonymous" local keytag = luxio.getenv("GITANO_KEYTAG") or "unknown" local project = luxio.getenv("GITANO_PROJECT") or "" local source = luxio.getenv("GITANO_SOURCE") or "ssh" +local running = luxio.getenv("GITANO_RUNNING") + +-- Check whether we are called through gitano-auth +if not running then + return 0 +end -- Now load the administration data gitano.config.repo_path(repo_root) |