mirror of
https://github.com/shankar0123/certctl.git
synced 2026-06-07 16:21:30 +00:00
shankar0123
8b75e0311b
Mechanical sed across the main go.mod's module declaration, the f5-mock-icontrol
sub-module's go.mod, every Go file's import path (361 files), and a rebuild of
the checked-in f5-mock-icontrol binary so its embedded build-info reflects the
new module path. No behavior change.
Choice B from cowork/transfer-certctl-to-org.md, executed 2026-05-04. Choice A
(keep module path declared as github.com/shankar0123/certctl regardless of
repo URL) shipped on the day of the org transfer (2026-05-03) since we had no
external Go consumers; this commit closes that deferral.
Backward-compat: GitHub HTTP redirects continue to forward
github.com/shankar0123/certctl → github.com/certctl-io/certctl at the URL
level, but Go's module proxy uses the path declared in go.mod as the
canonical name. Pre-fix, anyone trying `go get github.com/certctl-io/certctl/...`
hit a "module path mismatch" error because go.mod said
github.com/shankar0123/certctl and the URL they fetched it from said
certctl-io/certctl. Post-fix, the canonical name and the URL agree, so
go get / go install / external Go consumers / Go-tooling integrations
work cleanly via either the new path (preferred) or the old path (which
redirects and Go follows the redirect for source fetch).
Anyone still importing the old path inside their own code keeps working
provided they update their go.mod's `require` line to match — the module
path declared in their consumer's go.sum / go.mod is the authoritative
import name, so a mass sed across their import statements is the migration
on the consumer side. No external consumers exist today.
Diff shape:
361 *.go files — import path replacement only
2 go.mod — module declaration replacement only
1 binary — deploy/test/f5-mock-icontrol/f5-mock-icontrol rebuilt
so embedded build-info reflects the new path (8618965 vs
8618933 bytes; 32-byte diff is the build-info change)
Total: 364 files, 730 insertions / 730 deletions, net-zero size, pure
mechanical substitution.
Verification:
gofmt: 17 files needed re-alignment after sed (the new path is one char
shorter than the old, so column-aligned import groups drifted). Applied
`gofmt -w` to fix.
go mod tidy: clean exit on both modules.
go vet ./...: clean exit.
go build ./...: clean exit.
go test -short -count=1 on representative packages: all green
(internal/domain, internal/validation, internal/crypto, internal/crypto/signer,
cmd/agent). Test output now reads `ok github.com/certctl-io/certctl/...`
confirming the module path resolves correctly.
binary: f5-mock-icontrol rebuilt; `strings | grep shankar0123` returns
nothing; `strings | grep certctl-io/certctl` shows the new module path
embedded in build-info.
Files intentionally NOT touched in this commit:
README.md / CHANGELOG.md / docs/ / etc. — already swept to certctl-io
URLs in commit 0729ee4 (the post-transfer URL refresh). This commit is
purely the Go-tooling layer.
Scarf pixels (`shankar0123.docker.scarf.sh/...`) — Scarf-account
namespace, not a Go import or GitHub repo URL. Stays.
This is a non-blocking, non-customer-impacting change. Operators pulling
container images, running `make verify`, hitting the API, or installing the
agent see no functional difference. Only Go-tooling consumers (none today)
are affected, and they're enabled — not broken — by this commit.
83 lines
3.6 KiB
Go
83 lines
3.6 KiB
Go
// Copyright (c) certctl
|
|
// SPDX-License-Identifier: BSL-1.1
|
|
|
|
package acme
|
|
|
|
import (
|
|
"github.com/certctl-io/certctl/internal/domain"
|
|
)
|
|
|
|
// AccountResponseJSON is the wire shape RFC 8555 §7.1.2 mandates for
|
|
// account-resource responses (new-account success, account update,
|
|
// per-account GET POST-as-GET).
|
|
//
|
|
// The orders URL is mandatory per RFC 8555 §7.1.2.1; it points at the
|
|
// per-account orders list endpoint that Phase 2 implements. Phase 1b
|
|
// emits it as an empty placeholder ("orders not yet implemented") so
|
|
// the directory + new-account flow round-trips against ACME clients
|
|
// that expect the field present.
|
|
type AccountResponseJSON struct {
|
|
Status string `json:"status"`
|
|
Contact []string `json:"contact,omitempty"`
|
|
Orders string `json:"orders"`
|
|
}
|
|
|
|
// MarshalAccount renders an ACMEAccount in RFC 8555 §7.1.2 wire shape.
|
|
// `ordersURL` is the per-account orders list URL the handler computes
|
|
// from the inbound request (scheme + host + profile path + account
|
|
// id); Phase 1b's handler passes it but Phase 2 wires the actual
|
|
// /acme/profile/<id>/account/<acc-id>/orders endpoint.
|
|
func MarshalAccount(acct *domain.ACMEAccount, ordersURL string) AccountResponseJSON {
|
|
contact := acct.Contact
|
|
if contact == nil {
|
|
// RFC 8555 doesn't require contact be present, but cert-manager
|
|
// + lego both expect a stable shape. Emit [] rather than null.
|
|
contact = []string{}
|
|
}
|
|
return AccountResponseJSON{
|
|
Status: string(acct.Status),
|
|
Contact: contact,
|
|
Orders: ordersURL,
|
|
}
|
|
}
|
|
|
|
// NewAccountRequest is the payload shape RFC 8555 §7.3 mandates for
|
|
// new-account requests. The handler json.Unmarshals VerifiedRequest.Payload
|
|
// into this struct after JWS verify succeeds.
|
|
type NewAccountRequest struct {
|
|
// Contact is a list of mailto: / tel: URIs. Optional per RFC 8555
|
|
// but operators typically supply at least one mailto:.
|
|
Contact []string `json:"contact,omitempty"`
|
|
// TermsOfServiceAgreed signals client consent to the operator's
|
|
// ToS document (advertised via meta.termsOfService). Phase 1b
|
|
// records the value but does NOT enforce — the meta field is
|
|
// informational only at this stage.
|
|
TermsOfServiceAgreed bool `json:"termsOfServiceAgreed,omitempty"`
|
|
// OnlyReturnExisting, when true, asks the server to return the
|
|
// existing account row for this JWK (RFC 8555 §7.3.1). When
|
|
// true and no account exists, the server MUST return 400 +
|
|
// urn:ietf:params:acme:error:accountDoesNotExist.
|
|
OnlyReturnExisting bool `json:"onlyReturnExisting,omitempty"`
|
|
// ExternalAccountBinding (EAB) is RFC 8555 §7.3.4. Phase 1b
|
|
// accepts the field but does NOT validate — EAB enforcement is
|
|
// a deliberate out-of-scope per the master prompt and lands as a
|
|
// follow-up if there's demand. Storing the raw envelope means a
|
|
// future phase can backfill validation against historical accounts.
|
|
ExternalAccountBinding map[string]interface{} `json:"externalAccountBinding,omitempty"`
|
|
}
|
|
|
|
// AccountUpdateRequest is the payload shape for the account-update
|
|
// endpoint POST /acme/profile/<id>/account/<acc-id> (RFC 8555 §7.3.2 +
|
|
// §7.3.6). Only `contact` and `status` are mutable per the spec.
|
|
type AccountUpdateRequest struct {
|
|
// Contact, when non-nil, replaces the account's contact list.
|
|
// nil means "leave unchanged" (distinct from empty []string{}
|
|
// which means "clear contacts" — cert-manager doesn't issue
|
|
// either, but the spec permits both).
|
|
Contact []string `json:"contact,omitempty"`
|
|
// Status, when set to "deactivated", retires the account per
|
|
// RFC 8555 §7.3.6. Other values are rejected — the operator
|
|
// path for revoked is via certctl's API, not via ACME.
|
|
Status string `json:"status,omitempty"`
|
|
}
|