Skip to content

Rebase proxy-protocol-checks on upstream v0.11.0 now that #3 is merged #7

Open

Description

Context

#3 pulls upstream main (v0.11.0 + 11 commits, 73 commits, 133 files, +18,748 / −2,202) into the fork, which was at v0.7.0. The allowlist work on proxy-protocol-checks (#4, #5) was started against v0.7.0 and has not been rebased.

Upstream changes that touch the same code:

  • 0.9.0: event-driven netstack in shuru-proxy (PR perf(proxy): event-driven netstack superhq-ai/shuru#35), per-guest memory bounds and socket buffer verification (PR proxy: bound per-guest memory and verify socket buffers after #35 superhq-ai/shuru#51). proxy.rs changed by ~230 lines, lib.rs by ~60, substitute.rs by 9. The connection-handling path where HostGuard has to be wired in moved from proxy.rs:190 to proxy.rs:228 and gained an upstream_connector.
  • 0.11.0: fixed per-connection windows in the proxy (RFC 0011), so any buffering the host guard adds has to respect those bounds.
  • Upstream still has justfile; the branch deletes it in favour of mise.toml. Decide whether to keep both or drop the mise.toml change from the branch.
  • head_end, classify and Body in substitute.rs are still private, so the plan to make them pub(crate) for HostGuard is unchanged.

Work

  1. Merge pull in changes from upstream #3.
  2. Rebase proxy-protocol-checks on the new main. Expect conflicts in proxy.rs around the connection-handling loop and in lib.rs around the socketpair setup.
  3. Re-run the live port-80 / SNI probes on the rebased build to confirm the gap is unchanged (upstream main still has is_tls = dst.port() == 443).

Do this before HostGuard is wired in, otherwise the conflict is paid twice.

Activity

  1. changed the title [-]Rebase `proxy-protocol-checks` on upstream v0.11.0 once #3 merges[/-] [+]Rebase `proxy-protocol-checks` on upstream v0.11.0 now that #3 is merged[/+] on Oct 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    enhancementNew feature or request

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions