inbuxa/inbuxa-server
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 2 Wiki Activity

Fork/rename upstream identifiers #22

Merged
jcoffey-dev merged 1 commits from fork/rename-upstream-identifiers into main 2026-09-23 04:11:34 +00:00
Conversation 0 Commits 1 Files Changed 129
+20504 -168
jcoffey-dev commented 2026-09-23 02:58:39 +00:00
Owner
Copy Link
Copy Source

Summary

Related issues

Upstream files

Clean room

Testing

<!-- Thanks for contributing to INBUXA. CONTRIBUTING.md has the full guide; this is the short version. Delete any section that does not apply. --> ## Summary <!-- What changes, and why. The why is the part that is hard to recover later. --> ## Related issues <!-- e.g. Closes #123. Leave blank if there are none. --> ## Upstream files <!-- Does this touch files that came from Stalwart? If so: is the change as small as it can be, and is it marked with an `inbuxa:` comment saying which requirement it serves? Every edit to an upstream file is a conflict waiting at the next import, so it should be worth one. --> ## Clean room <!-- Only for changes to the rebuilt features in `crates/features`, or to the hooks that serve them. Confirm one: - [ ] I have not read Stalwart's Enterprise-licensed source, and worked from the specification in `docs/spec/features/`. - [ ] I have read it. (Say so -- the change will be reviewed with that in mind, or declined for the parts it touches. The project's claim of independent creation is a record, and the record has to be true.) --> ## Testing <!-- What you ran. `cargo test -p tests` covers what needs nothing but a store; say so if you ran any of the `#[ignore]`d suites from docs/spec/container-tests.md, and which. -->
jcoffey-dev added 2 commits 2026-09-23 02:58:39 +00:00
Fork tooling: a build check and a rename pass in the strip, a notice check in CI
ci / fork-checks (pull_request) Successful in 18s
Details
ci / build (pull_request) Successful in 7m11s
Details
4799d191a0 
strip.py compiles the stripped tree, so a dual-licensed file that only
serves an Enterprise feature fails the import instead of the merge, as
v0.16.23's tests/src/directory/issuer.rs does. Upstream's tests of the
features the fork rebuilt are expected not to compile there and are listed
in build-check-known.txt; an error anywhere else fails the run. Checked
against both imports: v0.16.22 passes with its 16 expected errors, v0.16.23
fails on issuer.rs alone. Imports the strip leaves unused are reported.

It also renames the upstream name where clients, users or operators meet
it as an identifier, from tools/fork/renames.py: wire-protocol names, the
web interface's client id, store keys, configuration defaults and the
served schema. main is renamed with the same module, so a re-import
arrives purged and those lines don't conflict.

notice-check.py fails CI when an upstream file the fork changed, measured
against the upstream branch, lacks its AGPL 5(a) notice; --fix adds it.
It runs beside the name check in a renamed fork-checks job.

Also commits v0.16.23's strip report under docs/fork/strip-reports/, which
the import in #18 left out.
Rename the identifiers that carried the upstream name
ci / fork-checks (pull_request) Successful in 16s
Details
ci / build (pull_request) Successful in 7m53s
Details
cc6f1eb298 
Everything clients, users and operators meet now carries the fork's name,
with no aliases (SPEC.md §2.4, changed here from "protocol identifiers
stay"):

- JMAP: upstream's registry capability is urn:inbuxa:jmap:registry, beside
  the fork's own urn:inbuxa:jmap.
- WebDAV lock and sync tokens are urn:inbuxa:dav*; clients resync once.
- Sieve: vnd.inbuxa.while and vnd.inbuxa.expressions. sieve-rs spells these
  into its compiler, so it's vendored (vendor/sieve-rs, 0.7.3) and patched in;
  a unit test fails if Cargo.lock ever moves past the vendored copy. The
  trusted runtime now names itself too, rather than answering sieve-rs's
  default.
- The web interface's OAuth client is inbuxa-webui. On every start the old
  stalwart-webui client is removed and any application naming it is moved
  over.
- The spam filter's blobs are INBUXA_SPAM_*; every start moves any left
  under the old keys, so a trained model survives.
- SQL stores and log files default to inbuxa, in the code and in the
  schema served to the admin (checksum regenerated).
- Settings are INBUXA_* only. A STALWART_* variable that's set where its
  INBUXA_* one isn't stops the server at startup, naming it.
- The version-upgrade messages link docs.inbuxa.org's migration page, and
  the OpenAPI description, smtp crate metadata and web-push test fixtures
  lose the name.

Kept on purpose, allowlisted with reasons: the OAuth key-derivation
contexts (renaming them would end every session and invalidate every
sealed client id) and the hashed application prefix.

Also fixes a latent start-up failure: ensure_client updated an existing
first-party client with a revision of 0, which the registry's assertion
never matches, so adding a redirect URI or changing the webmail secret
failed start-up. And the principal session test now expects
legacyProtocols (C-1, added 2026-09-21), which it had missed.

Tested: the server builds without warnings; common's 106 unit tests,
including the vendoring check; a new integration test for the two
start-up migrations; and the webdav, jmap, imap and SMTP Sieve suites.
jcoffey-dev merged commit a404ca89f0 into main 2026-09-23 04:11:34 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
jcoffey-dev (John Coffey)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: inbuxa/inbuxa-server#22