Skip to content

chore: propagate changes from main into development - #1325

Closed
github-actions[bot] wants to merge 21 commits into
developmentfrom
main
Closed

chore: propagate changes from main into development#1325
github-actions[bot] wants to merge 21 commits into
developmentfrom
main

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

⚠️ This propagation touches sensitive paths that need manual review before merging: docs/plans/current_spec.md

Automated PR to propagate changes from main into development.

Triggered by push to main.

Wikid82 and others added 20 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
… branch

The daily schedule / weekly workflow_call runs of toolchain-image.yml
checked out the default branch (main) and computed the toolchain key
from main's recipe, then compared it against main's Dockerfile pin. On
main those always match, so open-bump-pr's 'did the pin move?' check was
never true and no bot PR was opened — even though open-bump-pr targets
'base: development' and development accumulates its own Dockerfile ARG
bumps (x/net, x/crypto, ...) that shift the toolchain key independently
of main.

Result: development-side toolchain-pin drift had no automated detection
or repair path. It only surfaced when a main -> development propagation
PR ran verify-toolchain-pin against the merge recipe (e.g. #1320/#1322),
by which point the pin was already stale on the branch and no bot PR
existed to fix it.

Pin the build-toolchain, trivy-scan and open-bump-pr checkouts to
'development' on every non-pull_request trigger (schedule /
workflow_dispatch / the weekly rebuild's workflow_call). pull_request
runs keep the default merge-ref checkout. sync-pin-on-pr is unchanged
(PR-only, already checks out the PR head; still guarded off for
main/development/nightly/beta head refs).

Claude-Session: https://claude.ai/code/session_01Jz4LgwfkxaF8E7TdAgk94y
@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.

@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-actions

github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown
Contributor Author

✅ 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 commented Sep 9, 2026

Copy link
Copy Markdown
Owner

Superseded by #1322. This auto-generated draft has head: main, so sync-pin-on-pr can't reconcile the toolchain pin on it, and it now conflicts with development after #1326 changed the Dockerfile. #1322 (head on a topic branch, non-draft, verify-toolchain-pin green, carries #1326's recipe fix + matching pin) is the propagation PR to merge.

@Wikid82 Wikid82 closed this Sep 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants