From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-10.5 required=3.0 tests=AWL,BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id B464A1F45A for ; Tue, 21 Apr 2020 00:22:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726081AbgDUAWz (ORCPT ); Mon, 20 Apr 2020 20:22:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725550AbgDUAWy (ORCPT ); Mon, 20 Apr 2020 20:22:54 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8099C061A0E for ; Mon, 20 Apr 2020 17:22:54 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id d24so4588546pll.8 for ; Mon, 20 Apr 2020 17:22:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=PMriECFVLfx/+niF5bHmk3w+DZDLP4jlPQFc99u/MX8=; b=ovzZr4R/TyAObIkJD2tjW43dVAxqX2FUYZcCTTKeoN34oChsGxXUXX/hABWcD//mDS DeeRrqz2xVlyfkMmErv3QwmEvudJOCBdyH2zyJdsK+U1r3pim9f3TYFXFGhAhDGY4VS4 bD2oU+/t1706iWw3hvgLYQx6kgpG/YITXJB+Q7WXnK1iqJqFdTbfAUYceGa8nrtx1/6A 8Xpp8ZnoZNqv0sgLhjOzKwT4FvgahuP52nNsY7Sx/V3717KgNAlhnQhZCi2vDRRsCXKC Ts2mTbwXd2sxBCTU2GE9WL76BDy+lljEjPReZ1eFKVFG27Mdm7nasuyMH2A3rhUchmNL lHDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=PMriECFVLfx/+niF5bHmk3w+DZDLP4jlPQFc99u/MX8=; b=k3mJZmofyOsSSJLFiND3IDvlqlKPTs86C1chnWJcuQVvbnaeqmXjFwOrt0uxR3qjGF laoU2OcNQT23SXsN1n01VcjOnTexORytx+NtRKcM4j56eKnxjFaaFUuYsNILK+/1wAp6 TW6S3cPcVSsp2I9OFE44IJGpnIv2027RDhorpqlTBD+5H7cR5eA1RL3MmTA0jjQUHIBG XM3si/vkgZaS+AVuUtdhM/4VF43lKovw2ohrRmdzLbVuG/IUGlf8DBgJIrTELQSsuv2q Ax1VjmWV1SUXebSu0Rcj9lQmVgm2IlXL4bTYmmuB154CgMg0gFKjlAeYY3Y7tpbJ0DYC EegA== X-Gm-Message-State: AGi0PuZ0wE3vuUDRhmPUg6XBQNHQCZOE7UroRFfy5YTD7pMacDQzbBOL QgmQJnyjObZAXOAfUBu6mn6qg0hy+ck= X-Google-Smtp-Source: APiQypJCV2J2n+7ONYJ2a0jjyI31R8tDn+zEV4TA2Ocj8fa1yEPzRI+HTvRdQS/c7/cFz2JrBGgkLw== X-Received: by 2002:a17:902:a5c6:: with SMTP id t6mr17644356plq.319.1587428573467; Mon, 20 Apr 2020 17:22:53 -0700 (PDT) Received: from google.com ([2620:15c:2ce:0:231c:11cc:aa0a:6dc5]) by smtp.gmail.com with ESMTPSA id i8sm661823pfq.126.2020.04.20.17.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 17:22:52 -0700 (PDT) Date: Mon, 20 Apr 2020 17:22:48 -0700 From: Emily Shaffer To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , James Ramsay , Jonathan Nieder , "brian m. carlson" , =?iso-8859-1?Q?=C6var_Arnfj=F6r=F0?= Bjarmason , Phillip Wood , Josh Steadmon Subject: Re: [PATCH] doc: propose hooks managed by the config Message-ID: <20200421002248.GC236872@google.com> References: <20191210023335.49987-1-emilyshaffer@google.com> <20200420235310.94493-1-emilyshaffer@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200420235310.94493-1-emilyshaffer@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Mon, Apr 20, 2020 at 04:53:10PM -0700, Emily Shaffer wrote: > > Begin a design document for config-based hooks, managed via git-hook. > Focus on an overview of the implementation and motivation for design > decisions. Briefly discuss the alternatives considered before this > point. Also, attempt to redefine terms to fit into a multihook world. > > Signed-off-by: Emily Shaffer > --- > Hi all, > > I wasn't sure whether it made more sense to leave the design doc in the > conversation or not, but I figured it fit well into the context. I tried > to also add relevant IDs to the "References" headers to this mail. > > Hopefully this is complete enough that we can discuss it directly until > we feel comfortable getting ready for implementation. I'm planning to > send a reply today with some comments, too. > > - Emily > > Documentation/Makefile | 1 + > .../technical/config-based-hooks.txt | 317 ++++++++++++++++++ > 2 files changed, 318 insertions(+) > create mode 100644 Documentation/technical/config-based-hooks.txt > > diff --git a/Documentation/Makefile b/Documentation/Makefile > index 8fe829cc1b..301111f236 100644 > --- a/Documentation/Makefile > +++ b/Documentation/Makefile > @@ -79,6 +79,7 @@ SP_ARTICLES += $(API_DOCS) > TECH_DOCS += MyFirstContribution > TECH_DOCS += MyFirstObjectWalk > TECH_DOCS += SubmittingPatches > +TECH_DOCS += technical/config-based-hooks > TECH_DOCS += technical/hash-function-transition > TECH_DOCS += technical/http-protocol > TECH_DOCS += technical/index-format > diff --git a/Documentation/technical/config-based-hooks.txt b/Documentation/technical/config-based-hooks.txt > new file mode 100644 > index 0000000000..38893423be > --- /dev/null > +++ b/Documentation/technical/config-based-hooks.txt > @@ -0,0 +1,317 @@ > +Configuration-based hook management > +=================================== > + > +== Motivation > + > +Treat hooks as a first-class citizen by replacing the .git/hook/hookname path as > +the only source of hooks to execute, in a way which is friendly to users with > +multiple repos which have similar needs. > + > +Redefine "hook" as an event rather than a single script, allowing users to > +perform unrelated actions on a single event. > + > +Take a step closer to safety when copying zipped Git repositories from untrusted > +users. > + > +Make it easier for users to discover Git's hook feature and automate their > +workflows. > + > +== User interfaces > + > +=== Config schema > + > +Hooks can be introduced by editing the configuration manually. There are two new > +sections added, `hook` and `hookcmd`. > + > +==== `hook` > + > +Primarily contains subsections for each hook event. These subsections define > +hook command execution order; hook commands can be specified by passing the > +command directly if no additional configuration is needed, or by passing the > +name of a `hookcmd`. If Git does not find a `hookcmd` whose subsection matches > +the value of the given command string, Git will try to execute the string > +directly. Hook event subsections can also contain per-hook-event settings. > + > +Also contains top-level hook execution settings, for example, > +`hook.warnHookDir`, `hook.runHookDir`, or `hook.disableAll`. > + > +---- > +[hook "pre-commit"] > + command = perl-linter > + command = /usr/bin/git-secrets --pre-commit > + > +[hook "pre-applypatch"] > + command = perl-linter > + error = ignore > + > +[hook] > + warnHookDir = true > + runHookDir = prompt whoops, just realized this doesn't match the proposal below. Wrote these on different days :) > +---- > + > +==== `hookcmd` > + > +Defines a hook command and its attributes, which will be used when a hook event > +occurs. Unqualified attributes are assumed to apply to this hook during all hook > +events, but event-specific attributes can also be supplied. The example runs > +`/usr/bin/lint-it --language=perl `, but for repos which > +include this config, the hook command will be skipped for all events to which > +it's normally subscribed _except_ `pre-commit`. > + > +---- > +[hookcmd "perl-linter"] > + command = /usr/bin/lint-it --language=perl > + skip = true > + pre-commit-skip = false > +---- > + > +=== Command-line API > + > +Users should be able to view, reorder, and create hook commands via the command > +line. External tools should be able to view a list of hooks in the correct order > +to run. > + > +*`git hook list `* > + > +*`git hook list (--system|--global|--local|--worktree)`* > + > +*`git hook edit `* > + > +*`git hook add `* > + > +=== Hook editor > + > +The tool which is presented by `git hook edit `. Ideally, this > +tool should be easier to use than manually editing the config, and then produce > +a concise config afterwards. It may take a form similar to `git rebase > +--interactive`. This section is a little thin because I'm hoping to meet with some UX folks on our end and get a better suggestion. Suggestions welcome from upstream too - I'm having trouble coming up with anything that's better than modifying the config directly. > + > +== Implementation > + > +=== Library > + > +`hook.c` and `hook.h` are responsible for interacting with the config files. In > +the case when the code generating a hook event doesn't have special concerns > +about how to run the hooks, the hook library will provide a basic API to call > +all hooks in config order with an `argv_array` provided by the code which > +generates the hook event: > + > +*`int run_hooks(const char *hookname, struct argv_array *args)`* > + > +This call includes the hook command provided by `run-command.h:find_hook()`; > +eventually, this legacy hook will be gated by a config `hook.runHookDir`. The > +config is checked against a number of cases: > + > +- "no": the legacy hook will not be run > +- "interactive": Git will prompt the user before running the legacy hook > +- "warn": Git will print a warning to stderr before running the legacy hook > +- "yes" (default): Git will silently run the legacy hook > + > +If `hook.runHookDir` is provided more than once, Git will use the most > +restrictive setting provided, for security reasons. > + > +If the caller wants to do something more complicated, the hook library can also > +provide a callback API: > + > +*`int for_each_hookcmd(const char *hookname, hookcmd_function *cb)`* Another alternative is to do this by providing a linked-list of structs or even just an ordered string_list; that means the caller becomes responsible for config syntax and parallelization, which I didn't want. I'm open to hearing more argument. (on the rest of the doc too... but also here. :) ) > + > +Finally, to facilitate the builtin, the library will also provide the following > +APIs to interact with the config: > + > +---- > +int set_hook_commands(const char *hookname, struct string_list *commands, > + enum config_scope scope); > +int set_hookcmd(const char *hookcmd, struct hookcmd options); > + > +int list_hook_commands(const char *hookname, struct string_list *commands); > +int list_hooks_in_scope(enum config_scope scope, struct string_list *commands); > +---- > + > +`struct hookcmd` is expected to grow in size over time as more functionality is > +added to hooks; so that other parts of the code don't need to understand the > +config schema, `struct hookcmd` should contain logical values instead of string > +pairs. > + > +---- > +struct hookcmd { > + const char *name; > + const char *command; > + > + /* for illustration only; not planned at present */ > + int parallelizable; > + const char *hookcmd_before; > + const char *hookcmd_after; > + enum recovery_action on_fail; > +} > +---- > + > +=== Builtin > + > +`builtin/hook.c` is responsible for providing the frontend. It's responsible for > +formatting user-provided data and then calling the library API to set the > +configs as appropriate. The builtin frontend is not responsible for calling the > +config directly, so that other areas of Git can rely on the hook library to > +understand the most recent config schema for hooks. > + > +=== Migration path > + > +==== Stage 0 > + > +Hooks are called by running `run-command.h:find_hook()` with the hookname and > +executing the result. The hook library and builtin do not exist. Hooks only > +exist as specially named scripts within `.git/hooks/`. > + > +==== Stage 1 > + > +`git hook list --porcelain ` is implemented. Users can replace their > +`.git/hooks/` scripts with a trampoline based on `git hook list`'s > +output. Modifier commands like `git hook add` and `git hook edit` can be > +implemented around this time as well. > + > +==== Stage 2 > + > +`hook.h:run_hooks()` is taught to include `run-command.h:find_hook()` at the > +end; calls to `find_hook()` are replaced with calls to `run_hooks()`. Users can > +opt-in to config-based hooks simply by creating some in their config; otherwise > +users should remain unaffected by the change. > + > +==== Stage 3 > + > +The call to `find_hook()` inside of `run_hooks()` learns to check for a config, > +`hook.runHookDir`. Users can opt into managing their hooks completely via the > +config this way. > + > +==== Stage 4 > + > +`.git/hooks` is removed from the template and the hook directory is considered > +deprecated. To avoid breaking older repos, the default of `hook.runHookDir` is > +not changed, and `find_hook()` is not removed. > + > +== Caveats > + > +=== Security and repo config > + > +Part of the motivation behind this refactor is to mitigate hooks as an attack > +vector;footnote:[https://lore.kernel.org/git/20171002234517.GV19555@aiede.mtv.corp.google.com/] > +however, as the design stands, users can still provide hooks in the repo-level > +config, which is included when a repo is zipped and sent elsewhere. The > +security of the repo-level config is still under discussion; this design > +generally assumes the repo-level config is secure, which is not true yet. The > +goal is to avoid an overcomplicated design to work around a problem which has > +ceased to exist. > + > +=== Ease of use > + > +The config schema is nontrivial; that's why it's important for the `git hook` > +modifier commands to be usable. Contributors with UX expertise are encouraged to > +share their suggestions. > + > +== Alternative approaches > + > +A previous summary of alternatives exists in the > +archives.footnote:[https://lore.kernel.org/git/20191116011125.GG22855@google.com] > + > +=== Status quo > + > +Today users can implement multihooks themselves by using a "trampoline script" > +as their hook, and pointing that script to a directory or list of other scripts > +they wish to run. > + > +=== Hook directories > + > +Other contributors have suggested Git learn about the existence of a directory > +such as `.git/hooks/.d` and execute those hooks in alphabetical order. > + > +=== Comparison table > + > +.Comparison of alternatives > +|=== > +|Feature |Config-based hooks |Hook directories |Status quo > + > +|Supports multiple hooks > +|Natively > +|Natively > +|With user effort > + > +|Safer for zipped repos > +|A little > +|No > +|No > + > +|Previous hooks just work > +|If configured > +|Yes > +|Yes > + > +|Can install one hook to many repos > +|Yes > +|No > +|No > + > +|Discoverability > +|Better (in `git help git`) > +|Same as before > +|Same as before > + > +|Hard to run unexpected hook > +|If configured > +|No > +|No > +|=== Please share more features that come to your mind; I took most of this list from the RFC I sent last fall: https://lore.kernel.org/git/20191116011125.GG22855@google.com > + > +== Future work > + > +=== Execution ordering > + > +We may find that config order is insufficient for some users; for example, > +config order makes it difficult to add a new hook to the system or global config > +which runs at the end of the hook list. A new ordering schema should be: > + > +1) Specified by a `hook.order` config, so that users will not unexpectedly see > +their order change; > + > +2) Either dependency or numerically based. > + > +Dependency-based ordering is prone to classic linked-list problems, like a > +cycles and handling of missing dependencies. But, it paves the way for enabling > +parallelization if some tasks truly depend on others. > + > +Numerical ordering makes it tricky for Git to generate suggested ordering > +numbers for each command, but is easy to determine a definitive order. > + > +=== Parallelization > + > +Users with many hooks might want to run them simultaneously, if the hooks don't > +modify state; if one hook depends on another's output, then users will want to > +specify those dependencies. If we decide to solve this problem, we may want to > +look to modern build systems for inspiration on how to manage dependencies and > +parallel tasks. > + > +=== Securing hookdir hooks > + > +With the design as written in this doc, it's still possible for a malicious user > +to modify `.git/config` to include `hook.pre-receive.command = rm -rf /`, then > +zip their repo and send it to another user. It may be necessary to teach Git to > +only allow one-line hooks like this if they were configured outside of the local > +scope; or another approach, like a list of safe projects, might be useful. It > +may also be sufficient (or at least useful) to teach a `hook.disableAll` config > +or similar flag to the Git executable. > + > +=== Submodule inheritance > + > +It's possible some submodules may want to run the identical set of hooks that > +their superrepo runs. While a globally-configured hook set is helpful, it's not > +a great solution for users who have multiple repos-with-submodules under the > +same user. It would be useful for submodules to learn how to run hooks from > +their superrepo's config, or inherit that hook setting. > + > +== Glossary > + > +*hook event* > + > +A point during Git's execution where user scripts may be run, for example, > +_prepare-commit-msg_ or _pre-push_. > + > +*hook command* > + > +A user script or executable which will be run on one or more hook events. If other terms in the design doc are surprising to you, let me know and I'll define them here too. > -- > 2.26.1.301.g55bc3eb7cb9-goog >