git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 6/8] promisor-remote: trust known remotes matching acceptFromServerUrl

From
Christian Couder <christian.couder@gmail.com>
Date
May 19, 2026, 15:24 UTC
Message-ID
<CAP8UFD0Mbt8JtGW4fyyf4mzZB5t4Bk2LE2y45OJ08mUw-O6EYA@mail.gmail.com>
In-Reply-To
<875x4yoys5.fsf@toon--20250203-5JQV3.mail-host-address-is-not-set>
On Fri, May 8, 2026 at 3:45 PM Toon Claes <toon@iotcl.com> wrote:
>
> Christian Couder <christian.couder@gmail.com> writes:
Show 33 quoted lines
> > +static bool match_one_url(const struct url_info *pi, const struct url_info *ui)
> > +{
> > +     const char *pat = pi->url;
> > +     const char *url = ui->url;
> > +     char *p_str, *u_str;
> > +     bool res;
> > +
> > +     /*
> > +      * Schemes must match exactly. They are case-folded by
> > +      * url_normalize(), so strncmp() suffices.
> > +      */
> > +     if (pi->scheme_len != ui->scheme_len || strncmp(pat, url, pi->scheme_len))
> > +             return false;
> > +
> > +     /*
> > +      * Ports must match exactly. url_normalize() strips default
> > +      * ports (like 443 for https), so length and content
> > +      * comparisons are sufficient.
> > +      */
> > +     if (pi->port_len != ui->port_len ||
> > +         strncmp(pat + pi->port_off, url + ui->port_off, pi->port_len))
> > +             return false;
> > +
> > +     /*
> > +      * Match host and path separately to prevent a '*' in the host
> > +      * portion of the pattern from matching across the '/'
> > +      * boundary into the path. Use WM_PATHNAME for the host so '*'
> > +      * cannot cross '/' there, and 0 for the path so '*' can still
> > +      * match multi-level paths.
> > +      */
>
> Do we actually need WM_PATHNAME, because we only xstrndup() the host
> part anyway?
Yeah, it's not really needed.

On one hand it doesn't hurt either, and it conveys the intent, which is that no / boundary should be crossed.

But on the other hand I agree it could be confusing and it's simpler to just remove it, so I have removed it in the v3 I will send very soon.

Show 19 quoted lines
> > +
> > +     p_str = xstrndup(pat + pi->host_off, pi->host_len);
> > +     u_str = xstrndup(url + ui->host_off, ui->host_len);
> > +     res = !wildmatch(p_str, u_str, WM_PATHNAME);
> > +     free(p_str);
> > +     free(u_str);
> > +
> > +     if (!res)
> > +             return false;
> > +
> > +     p_str = xstrndup(pat + pi->path_off, pi->path_len);
> > +     u_str = xstrndup(url + ui->path_off, ui->path_len);
> > +     res = !wildmatch(p_str, u_str, 0);
> > +     free(p_str);
> > +     free(u_str);
>
> Is it correct we intentionally do not compare the user and pass (at
> `user_off` and `passwd_off`)? I assume so, because this allows the
> server to update those?

Yes, we ignore them intentionally. Using the existing `token` field should be prefered, but maybe some need a user and password part of the URL.

Anyway I have documented that in v3.
Show 38 quoted lines
> >  static int should_accept_remote(enum accept_promisor accept,
> >                               struct promisor_info *advertised,
> > +                             struct string_list *accept_urls,
> >                               struct string_list *config_info)
> >  {
> >       struct promisor_info *p;
> > @@ -771,9 +846,6 @@ static int should_accept_remote(enum accept_promisor accept,
> >       if (accept == ACCEPT_KNOWN_NAME)
> >               return all_fields_match(advertised, config_info, p);
> >
> > -     if (accept != ACCEPT_KNOWN_URL)
> > -             BUG("Unhandled 'enum accept_promisor' value '%d'", accept);
> > -
> >       if (strcmp(p->url, remote_url)) {
> >               warning(_("known remote named '%s' but with URL '%s' instead of '%s', "
> >                         "ignoring this remote"),
> > @@ -781,7 +853,21 @@ static int should_accept_remote(enum accept_promisor accept,
> >               return 0;
> >       }
> >
> > -     return all_fields_match(advertised, config_info, p);
> > +     if (accept == ACCEPT_KNOWN_URL)
> > +             return all_fields_match(advertised, config_info, p);
> > +
> > +     if (accept != ACCEPT_NONE)
> > +             BUG("Unhandled 'enum accept_promisor' value '%d'", accept);
> > +
> > +     /*
> > +      * Even if accept == ACCEPT_NONE, we MUST trust this known
> > +      * remote to update its token or other such fields if its URL
> > +      * matches the acceptFromServerUrl allowlist!
> > +      */
> > +     if (url_matches_accept_list(accept_urls, remote_url))
> > +             return all_fields_match(advertised, config_info, p);
>
> I should verify in the following patches, but it seems to me only when
> promisor.AcceptFromServer is set to None it will store the advertised
> servers to the local .git/config, or not?

Right, it's better to check if the URL is in the allowlist as soon as we can. So in the v3 I have moved as much as possible the `promisor.acceptFromServerUrl` related checks before the other checks.

The idea is that `promisor.acceptFromServerUrl` takes precedence over `promisor.acceptFromServer`, so having the `promisor.acceptFromServerUrl` checks first makes sense.

Note that we should still not accept an advertised remote with an URL that matches a pattern in `promisor.acceptFromServerUrl` if a remote with the same name but a different URL exist on the client, unless the user has explicitly set `promisor.AcceptFromServer` to either 'All' or 'knownName'.

In the v3 I have also added some documentation to be explicit about this.
Show 17 quoted lines
> > +test_expect_success "clone with 'None' but URL allowlisted" '
> > +     git -C server config promisor.advertise true &&
> > +     test_when_finished "rm -rf client" &&
> > +
> > +     GIT_NO_LAZY_FETCH=0 git clone -c remote.lop.promisor=true \
> > +             -c remote.lop.fetch="+refs/heads/*:refs/remotes/lop/*" \
> > +             -c remote.lop.url="$TRASH_DIRECTORY_URL/lop" \
> > +             -c promisor.acceptfromserver=None \
> > +             -c promisor.acceptFromServerUrl="$ENCODED_TRASH_DIRECTORY_URL/*" \
> > +             --no-local --filter="blob:limit=5k" server client &&
> > +
> > +     # Check that the largest object is still missing on the server
> > +     check_missing_objects server 1 "$oid"
> > +'
>
> Why do some tests end with `initialize_server 1 "$oid"` and this one
> not? Isn't it weird tests prepare for the next test?
It's more cleaning up after themselves than preparing for the next test.

Initializing the server with `initialize_server 1 "$oid"` is only needed when some large objects end up on the server where they should not be.

If we wanted to be sure that the state of the server is always clean for the next test, then we should initialize the server at the end of every test, using something like:

  test_when_finished "initialize_server 1 \"$oid\""

just in case something went wrong and a large file was transferred to the server. But I think that's quite expensive for not much gain.

It's also clearer for readers to have `initialize_server 1 "$oid"` only where we think it's really needed.

So in the end I prefer to leave this as-is for now. We can still address this later in a separate series for all the tests in "t5710-promisor-remote-capability.sh" if we really think it's worth addressing.

Thanks.
Previous: Toon ClaesNext: Toon Claes
Message 76 of 111 in “Implement `promisor.storeFields` and `--filter=auto`”
  1. 0/9 Implement `promisor.storeFields` and `--filter=auto`Christian Couder, Dec 23, 2025
  2. 1/9 promisor-remote: refactor initialising field listsChristian Couder, Dec 23, 2025
  3. 2/9 promisor-remote: allow a client to store fieldsChristian Couder, Dec 23, 2025
  4. Patrick SteinhardtJan 7, 2026
  5. Christian CouderFeb 4, 2026
  6. 3/9 clone: make filter_options local to cmd_clone()Christian Couder, Dec 23, 2025
  7. 4/9 fetch: make filter_options local to cmd_fetch()Christian Couder, Dec 23, 2025
  8. Patrick SteinhardtJan 7, 2026
  9. 5/9 doc: fetch: document `--filter=<filter-spec>` optionChristian Couder, Dec 23, 2025
  10. Jean-Noël AVILADec 26, 2025
  11. Christian CouderFeb 4, 2026
  12. 6/9 list-objects-filter-options: support 'auto' mode for --filterChristian Couder, Dec 23, 2025
  13. Patrick SteinhardtJan 7, 2026
  14. Christian CouderFeb 4, 2026
  15. 7/9 list-objects-filter-options: implement auto filter resolutionChristian Couder, Dec 23, 2025
  16. Patrick SteinhardtJan 7, 2026
  17. Christian CouderFeb 4, 2026
  18. Patrick SteinhardtFeb 11, 2026
  19. Christian CouderFeb 12, 2026
  20. 8/9 promisor-remote: keep advertised filter in memoryChristian Couder, Dec 23, 2025
  21. Patrick SteinhardtJan 7, 2026
  22. Christian CouderFeb 4, 2026
  23. Patrick SteinhardtFeb 11, 2026
  24. Junio C HamanoFeb 11, 2026
  25. Christian CouderFeb 12, 2026
  26. 9/9 fetch-pack: wire up and enable auto filter logicChristian Couder, Dec 23, 2025
  27. Patrick SteinhardtJan 7, 2026
  28. Christian CouderFeb 4, 2026
  29. 0/8 Implement `promisor.storeFields` and `--filter=auto`Christian Couder, Feb 4, 2026
  30. 1/8 promisor-remote: refactor initialising field listsChristian Couder, Feb 4, 2026
  31. 2/8 promisor-remote: allow a client to store fieldsChristian Couder, Feb 4, 2026
  32. 3/8 clone: make filter_options local to cmd_clone()Christian Couder, Feb 4, 2026
  33. 4/8 fetch: make filter_options local to cmd_fetch()Christian Couder, Feb 4, 2026
  34. 5/8 doc: fetch: document `--filter=<filter-spec>` optionChristian Couder, Feb 4, 2026
  35. Patrick SteinhardtFeb 11, 2026
  36. Christian CouderFeb 12, 2026
  37. 6/8 list-objects-filter-options: support 'auto' mode for --filterChristian Couder, Feb 4, 2026
  38. 7/8 promisor-remote: keep advertised filters in memoryChristian Couder, Feb 4, 2026
  39. 8/8 fetch-pack: wire up and enable auto filter logicChristian Couder, Feb 4, 2026
  40. Patrick SteinhardtFeb 11, 2026
  41. Christian CouderFeb 12, 2026
  42. 0/9 Implement `promisor.storeFields` and `--filter=auto`Christian Couder, Feb 12, 2026
  43. 1/9 promisor-remote: refactor initialising field listsChristian Couder, Feb 12, 2026
  44. 2/9 promisor-remote: allow a client to store fieldsChristian Couder, Feb 12, 2026
  45. 3/9 clone: make filter_options local to cmd_clone()Christian Couder, Feb 12, 2026
  46. 4/9 fetch: make filter_options local to cmd_fetch()Christian Couder, Feb 12, 2026
  47. 5/9 doc: fetch: document `--filter=<filter-spec>` optionChristian Couder, Feb 12, 2026
  48. 6/9 list-objects-filter-options: support 'auto' mode for --filterChristian Couder, Feb 12, 2026
  49. Jeff KingFeb 14, 2026
  50. Christian CouderFeb 16, 2026
  51. 7/9 promisor-remote: keep advertised filters in memoryChristian Couder, Feb 12, 2026
  52. 8/9 promisor-remote: change promisor_remote_reply()'s signatureChristian Couder, Feb 12, 2026
  53. Patrick SteinhardtFeb 13, 2026
  54. 9/9 fetch-pack: wire up and enable auto filter logicChristian Couder, Feb 12, 2026
  55. Patrick SteinhardtFeb 13, 2026
  56. Patrick SteinhardtFeb 13, 2026
  57. 0/9 Implement `promisor.storeFields` and `--filter=auto`Christian Couder, Feb 16, 2026
  58. 1/9 promisor-remote: refactor initialising field listsChristian Couder, Feb 16, 2026
  59. 2/9 promisor-remote: allow a client to store fieldsChristian Couder, Feb 16, 2026
  60. 3/9 clone: make filter_options local to cmd_clone()Christian Couder, Feb 16, 2026
  61. 4/9 fetch: make filter_options local to cmd_fetch()Christian Couder, Feb 16, 2026
  62. 5/9 doc: fetch: document `--filter=<filter-spec>` optionChristian Couder, Feb 16, 2026
  63. 6/9 list-objects-filter-options: support 'auto' mode for --filterChristian Couder, Feb 16, 2026
  64. 7/9 promisor-remote: keep advertised filters in memoryChristian Couder, Feb 16, 2026
  65. 8/9 promisor-remote: change promisor_remote_reply()'s signatureChristian Couder, Feb 16, 2026
  66. 9/9 fetch-pack: wire up and enable auto filter logicChristian Couder, Feb 16, 2026
  67. 0/8 Auto-configure advertised remotes via URL allowlistChristian Couder, Apr 27, 2026
  68. 1/8 t5710: simplify 'mkdir X' followed by 'git -C X init'Christian Couder, Apr 27, 2026
  69. 2/8 urlmatch: change 'allow_globs' arg to boolChristian Couder, Apr 27, 2026
  70. 3/8 urlmatch: add url_normalize_pattern() helperChristian Couder, Apr 27, 2026
  71. 4/8 promisor-remote: add 'local_name' to 'struct promisor_info'Christian Couder, Apr 27, 2026
  72. Toon ClaesMay 4, 2026
  73. 5/8 promisor-remote: introduce promisor.acceptFromServerUrlChristian Couder, Apr 27, 2026
  74. 6/8 promisor-remote: trust known remotes matching acceptFromServerUrlChristian Couder, Apr 27, 2026
  75. Toon ClaesMay 8, 2026
  76. Christian CouderMay 19, 2026
  77. Toon ClaesMay 11, 2026
  78. Christian CouderMay 19, 2026
  79. 7/8 promisor-remote: auto-configure unknown remotesChristian Couder, Apr 27, 2026
  80. Toon ClaesMay 11, 2026
  81. Christian CouderMay 19, 2026
  82. 8/8 doc: promisor: improve acceptFromServer entryChristian Couder, Apr 27, 2026
  83. Christian CouderApr 27, 2026
  84. 0/8 Auto-configure advertised remotes via URL allowlistChristian Couder, May 19, 2026
  85. 1/8 t5710: simplify 'mkdir X' followed by 'git -C X init'Christian Couder, May 19, 2026
  86. 2/8 urlmatch: change 'allow_globs' arg to boolChristian Couder, May 19, 2026
  87. 3/8 urlmatch: add url_normalize_pattern() helperChristian Couder, May 19, 2026
  88. 4/8 promisor-remote: add 'local_name' to 'struct promisor_info'Christian Couder, May 19, 2026
  89. Junio C HamanoMay 20, 2026
  90. Christian CouderMay 27, 2026
  91. 5/8 promisor-remote: introduce promisor.acceptFromServerUrlChristian Couder, May 19, 2026
  92. 6/8 promisor-remote: trust known remotes matching acceptFromServerUrlChristian Couder, May 19, 2026
  93. Kristoffer HaugsbakkMay 23, 2026
  94. Christian CouderMay 27, 2026
  95. 7/8 promisor-remote: auto-configure unknown remotesChristian Couder, May 19, 2026
  96. 8/8 doc: promisor: improve acceptFromServer entryChristian Couder, May 19, 2026
  97. 0/8 Auto-configure advertised remotes via URL allowlistChristian Couder, May 27, 2026
  98. 1/8 t5710: simplify 'mkdir X' followed by 'git -C X init'Christian Couder, May 27, 2026
  99. 2/8 urlmatch: change 'allow_globs' arg to boolChristian Couder, May 27, 2026
  100. 3/8 urlmatch: add url_normalize_pattern() helperChristian Couder, May 27, 2026
  101. 4/8 promisor-remote: add 'local_name' to 'struct promisor_info'Christian Couder, May 27, 2026
  102. 5/8 promisor-remote: introduce promisor.acceptFromServerUrlChristian Couder, May 27, 2026
  103. 6/8 promisor-remote: trust known remotes matching acceptFromServerUrlChristian Couder, May 27, 2026
  104. 7/8 promisor-remote: auto-configure unknown remotesChristian Couder, May 27, 2026
  105. 8/8 doc: promisor: improve acceptFromServer entryChristian Couder, May 27, 2026
  106. Kristoffer HaugsbakkJul 4, 2026
  107. Toon ClaesJun 9, 2026
  108. Christian CouderJun 9, 2026
  109. Toon ClaesJun 9, 2026
  110. Junio C HamanoJun 10, 2026
  111. Christian CouderJun 11, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.