Skip to content

chore: propagate changes from main into development - #1322

Merged
Wikid82 merged 19 commits into
developmentfrom
chore/propagate-main-into-development-20260909
Sep 9, 2026
Merged

Wikid82 merged 19 commits into
developmentfrom
chore/propagate-main-into-development-20260909

Conversation

@Wikid82

@Wikid82 Wikid82 commented Sep 9, 2026

Copy link
Copy Markdown
Owner

Supersedes #1320 (whose head was main, so the toolchain-pin reconciliation commit couldn't be added without breaking main's own freshness check).

Brings into development:

Follow-up commit needed on this branch

The main+development merge recipe produces a new toolchain key (both sides carry Dockerfile ARG bumps the other lacks: main = gRPC 1.83.2, development = x/net 0.59.0 + x/crypto 0.57.0). Once the Toolchain Image — Build & Publish job on this PR computes and publishes the image for the merge recipe, a chore(docker): sync toolchain pin commit will bump CHARON_TOOLCHAIN_TAG / CHARON_TOOLCHAIN_DIGEST to match, clearing verify-toolchain-pin.

Merge with Create a merge commit per the promotion-PR rule — never squash/rebase.

Close #1320 in favor of this.

Wikid82 and others added 18 commits September 8, 2026 21:33
The planning spec that commits 3055a913..ccc9cdbc were implemented from.
Replaces the prior (already-delivered) toolchain-image spec in current_spec.md.

Claude-Session: https://claude.ai/code/session_01JyYXjnztSGFqTELR8KTUXT
The shell integration-test scripts under scripts/ bootstrapped their
initial admin user by POSTing to the removed public account-creation
endpoint, then logging in. With that endpoint gone the login step now
returns HTTP 401 and the scripts abort ("Login failed (HTTP 401)"),
breaking the Rate Limiting, Cerberus, WAF, CrowdSec and Coraza
integration jobs.

Switch the bootstrap call in all eight scripts to POST /api/v1/setup,
which creates the first user (admin) with an identical request body
({name,email,password}). debug_rate_limit.sh additionally used a
7-character password that fails /setup's min=8 rule, so its setup and
matching login body are bumped to an 8-character password. Human-readable
"Registering ..." log/comment lines are reworded to "Setting up ...".
Existing "|| true" / redirect idempotency handling is preserved so a
403 "Setup already completed" on re-run stays harmless.

Claude-Session: https://claude.ai/code/session_01JyYXjnztSGFqTELR8KTUXT
`development` carries c32e611 (gRPC 1.83.2), a toolchain-key input that
`main` does not have yet, so the toolchain pin propagated into
`development` by #1307 (caddy-crowdsec-1efe7f19fa52a512 @ sha256:6575f4c6…,
computed for main's gRPC 1.83.1 recipe) is stale here: the recipe on this
branch recomputes to caddy-crowdsec-9eb9862f44b9e769, failing
verify-toolchain-pin.

Bumps the two ARG lines to the key/digest that match development's recipe.
This is the manual equivalent of the daily open-bump-pr bot (now using the
chore(docker): convention).

Verified on this branch:
  - scripts/toolchain-key.sh                -> caddy-crowdsec-9eb9862f44b9e769
  - imagetools inspect <that tag>           -> sha256:b41e571d5951bbfc3daa3dccdca033ad9dee535a8e720ac7e3b0bce338f223b2

Claude-Session: https://claude.ai/code/session_01KXA4x9LrA2AsnLrvdHMZbS
…p split

The management-API authorization hardening changed
RemoteServerHandler.RegisterRoutes to a (read, admin *gin.RouterGroup)
split, adding lines above Update() and shifting the suppressed
logger.Log()...Warn() sink in remote_server_handler.go from line 142 to
~148. The exact-line suppression entry no longer matched, so the
findings-gate counted the (unchanged, still-false-positive) go/log-injection
result as blocking on the full-tree scan run by the main->development
propagation PR.

Widen the entry to a line_range (146-150), mirroring the existing
uptime_service.go sibling entry that hit the same drift, so the multi-line
log chain stays covered regardless of which line CodeQL anchors to.

No code or behavior change.

Claude-Session: https://claude.ai/code/session_01Jz4LgwfkxaF8E7TdAgk94y
@codecov

codecov Bot commented Sep 9, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 99.01961% with 1 line in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...end/internal/api/handlers/remote_server_handler.go 87.50% 1 Missing ⚠️

📢 Thoughts on this report? Let us know!

@github-advanced-security

Copy link
Copy Markdown
Contributor

You are seeing this message because GitHub Code Scanning has recently been set up for this repository, or this pull request contains the workflow file for the Code Scanning tool.

What Enabling Code Scanning Means:

  • The 'Security' tab will display more code scanning analysis results (e.g., for the default branch).
  • Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results.
  • You will be able to see the analysis results for the pull request's branch on this overview once the scans have completed and the checks have passed.

For more information about GitHub Code Scanning, check out the documentation.

@github-actions

github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

✅ Supply Chain Verification Results

PASSED

📦 SBOM Summary

  • Components: 1769

🔍 Vulnerability Scan

Severity Count
🔴 Critical 0
🟠 High 0
🟡 Medium 0
🟢 Low 0
Total 0

📎 Artifacts

  • SBOM (CycloneDX JSON) and Grype results available in workflow artifacts

Generated by Supply Chain Verification workflow • View Details

@Wikid82
Wikid82 merged commit d86cc6d into development Sep 9, 2026
51 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants