mirror of
https://github.com/hanzoai/deploy.git
synced 2026-10-07 08:44:50 +00:00
* feat(api): hard-fork CRD API group argoproj.io -> deploy.hanzo.ai
Hanzo CD hard-fork, phase 1.1. Single source of truth is
pkg/apis/application/register.go's Group constant (Application/AppProject/
ApplicationSet all derive their FullName from it); every other Go call-site
that hardcoded the literal group string is updated to match: the 3 generated
informer GVRs, the app-of-apps nested-Application detector in types.go, the
resource-tree Application-kind cache populator, the 3 NotFound error
constructors in server/application, and the applicationset-controller's
leader-election Lease name/ID (kept in lockstep across Go source + RBAC
resourceNames, or leader election would get RBAC-denied on startup).
CRD YAMLs (application/appproject/applicationset) and every RBAC apiGroups
rule that actually governs our 3 CRDs are repointed to deploy.hanzo.ai, across
both manifests/base/* (namespaced Roles) and manifests/cluster-rbac/* (cluster
scope). Two adjacent things that share the "argoproj.io" string but are NOT
ours are deliberately left untouched: gitops-engine's health-check dispatch
for Argo Workflows' `Workflow` kind, and argocd-server-clusterrole's second
apiGroups block granting read on Argo Workflows' `workflows` resource — both
belong to a separate, unrelated Argoproj-family project we are not forking.
Also untouched, per explicit scope: annotation/label keys (argocd.argoproj.io/*)
and finalizers (*.argoproj.io) that track already-applied live resources, and
argocd-cm.yaml's resource.customizations.ignoreResourceUpdates keys (a narrow
app-of-apps diffing nicety, not build- or RBAC-relevant).
CGO_ENABLED=0 go build ./... verified green.
* ci: wire canonical hanzo.yml + cicd.yml (Hanzo CD image build)
Phase 1.3. Follows the same one-way pattern every hanzo/lux/zoo repo uses:
hanzo.yml declares the image (root Dockerfile -> ghcr.io/hanzoai/deploy) and a
fast go-build sanity test (the multi-stage Dockerfile build is the slow, real
gate); cicd.yml is the ~10-line trigger shim importing hanzoai/ci's reusable
build workflow on the arc pool, secrets from KMS only.
No `deploy:` block yet, matching the hanzoai/cms build-only-first-cutover
pattern: this repo's own live hanzo-cd namespace runs the whole Hanzo fleet's
GitOps, so the prod image/CRD swap is a deliberate separate action (see the
[HELD] universe PR), never an automatic rollout on merge. Every PR/push still
builds and pushes an immutable ghcr.io/hanzoai/deploy:sha-<7>-amd64 image.
* feat(ui): rebrand Argo CD -> Hanzo CD (title, favicon, logo, sidebar)
Phase 1.2. User-facing "Argo CD"/"ArgoCD" text replaced with "Hanzo CD"
across the login page, help modal, settings screens, version-info panel,
sync-options warning, fullscreen-logs title, app.tsx page titles, and
index.html's <title>/noscript text (dropped the now-wrong upstream CLI
doc link rather than invent a hanzo.ai URL that doesn't exist).
Logo/favicon assets replaced with the canonical Hanzo mark (never
hand-drawn, copied from ~/work/hanzo/logo/dist): the two real usages of
Argo's logo collapse onto one Hanzo glyph (mono + white variants) at the
same 5 call sites (login icon + footer, login.scss $logoPath/
$logoNegativePath, sidebar text-logo), preserving the existing CSS
invert() filters so both the light login panel and dark sidebar still
render correctly. Old argologo.svg/argo_o.svg/argo.png deleted (no
longer referenced). favicon-{16x16,32x32}.png added at
ui/src/assets/favicon/ (index.html's links to that path were previously
dead - the directory didn't exist in this checkout). package.json name
argo-cd-ui -> hanzo-cd-ui.
Left alone, deliberately: the two Kubernetes resource-kind icon sets
under ui/src/assets/images/resources/ (unrelated to branding), and
upstream doc/project links (argoproj.io, argo-cd.readthedocs.io) since
we have no equivalent hanzo.ai docs to point to yet - except the login
footer logo's outbound link, which now points to hanzo.ai instead of
argoproj.io (a Hanzo-branded mark linking to the upstream project it
was forked from read as an obvious leftover).
* feat(module): rename Go module github.com/argoproj/argo-cd/v3 -> github.com/hanzoai/deploy
Phase 2. No version suffix on the new path (org policy: never publish our
own Go modules above v1.x.x / with a v2+ suffix) — this fork starts a fresh
v0/v1 module identity rather than carrying the v3 the upstream fork point
had reached.
Mechanical, symmetric rewrite: 704 .go files (import statements only; two
disjoint substitutions applied specific-first so the nested gitops-engine
module path never double-matches), plus go.mod (module line, the
gitops-engine require+replace pair, version reset to v0.0.0-... since a
suffix-less path can't carry a v3 semver), gitops-engine/go.mod, Makefile
(ldflags PACKAGE + 2 TEST_MODULE filters), .golangci.yaml, .goreleaser.yaml,
.mockery.yaml (+ gitops-engine's), Procfile, the codegen/proto generation
scripts (hack/generate-proto.sh, update-codegen.sh, update-openapi.sh), and
20 .proto files' go_package options. Also one OpenTelemetry tracer name
string in gitops-engine/pkg/sync/sync_context.go (a cosmestic label, not an
import, but worth keeping consistent).
CGO_ENABLED=0 go build ./... verified green for both the root module and
the nested gitops-engine module; go vet clean on both; go mod tidy run
(network available) to reconcile go.sum, dependency set unchanged.
Left alone, deliberately: doc-only mentions (docs/snyk/*.html scan reports,
gitops-engine/README.md), a comment-only reference in
.github/workflows/release.yaml, and one Renovate bot config line — none are
build- or codegen-load-bearing. Also left alone: comments citing upstream
GitHub issue URLs (github.com/argoproj/argo-cd/issues/NNNNN) and a handful
of test fixtures using "https://github.com/argoproj/argo-cd.git" as a
representative example repo URL — both are accurate historical/test-data
references, not stale self-references.
---------
Co-authored-by: Hanzo Dev <[email protected]>
247 lines
8.4 KiB
Go
247 lines
8.4 KiB
Go
package sourceintegrity
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/util/git"
|
|
"github.com/hanzoai/deploy/util/glob"
|
|
)
|
|
|
|
type gitFunc func(ctx context.Context, gitClient git.Client, verifiedRevision string) (result *v1alpha1.SourceIntegrityCheckResult, legacyDescription string, err error)
|
|
|
|
var _gpgDisabledLoggedAlready bool
|
|
|
|
// HasCriteria determines if any of the sources have some criteria declared
|
|
func HasCriteria(si *v1alpha1.SourceIntegrity, sources ...v1alpha1.ApplicationSource) bool {
|
|
if si == nil || si.Git == nil {
|
|
return false
|
|
}
|
|
|
|
for _, source := range sources {
|
|
if !source.IsZero() && !source.IsOCI() && !source.IsHelm() {
|
|
if lookupGit(si, source.RepoURL) != nil {
|
|
return true
|
|
}
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
// VerifyGit makes sure the git repository satisfies the criteria declared.
|
|
// It returns nil in case there were no relevant criteria, a check result if there were.
|
|
// The verifiedRevision is expected to be either an annotated tag to a resolved commit sha - the revision, its signature is being verified.
|
|
func VerifyGit(ctx context.Context, si *v1alpha1.SourceIntegrity, gitClient git.Client, verifiedRevision string) (*v1alpha1.SourceIntegrityCheckResult, string, error) {
|
|
if si == nil || si.Git == nil {
|
|
return nil, "", nil
|
|
}
|
|
|
|
check := lookupGit(si, gitClient.RepoURL())
|
|
if check != nil {
|
|
return check(ctx, gitClient, verifiedRevision)
|
|
}
|
|
return nil, "", nil
|
|
}
|
|
|
|
func lookupGit(si *v1alpha1.SourceIntegrity, repoURL string) gitFunc {
|
|
policies := findMatchingGitPolicies(si.Git, repoURL)
|
|
nPolicies := len(policies)
|
|
if nPolicies == 0 {
|
|
log.Infof("No git source integrity policies found for repo URL: %s", repoURL)
|
|
return nil
|
|
}
|
|
if nPolicies > 1 {
|
|
// Multiple matching policies is an error. BUT, it has to return a check that fails for every repo.
|
|
// This is to make sure that a mistake in argo cd configuration does not disable verification until fixed.
|
|
msg := fmt.Sprintf("multiple (%d) git source integrity policies found for repo URL: %s", nPolicies, repoURL)
|
|
log.Warn(msg)
|
|
return func(_ context.Context, _ git.Client, _ string) (*v1alpha1.SourceIntegrityCheckResult, string, error) {
|
|
return nil, "", errors.New(msg)
|
|
}
|
|
}
|
|
|
|
policy := policies[0]
|
|
if policy.GPG != nil {
|
|
if policy.GPG.Mode == v1alpha1.SourceIntegrityGitPolicyGPGModeNone {
|
|
// Declare missing check because there is no verification performed
|
|
return nil
|
|
}
|
|
|
|
if !_gpgDisabledLoggedAlready && !IsGPGEnabled() {
|
|
log.Warnf("SourceIntegrity criteria for git+gpg declared, but it is turned off by ARGOCD_GPG_ENABLED")
|
|
_gpgDisabledLoggedAlready = true
|
|
return nil
|
|
}
|
|
|
|
return func(ctx context.Context, gitClient git.Client, verifiedRevision string) (*v1alpha1.SourceIntegrityCheckResult, string, error) {
|
|
return verify(ctx, policy.GPG, gitClient, verifiedRevision)
|
|
}
|
|
}
|
|
|
|
log.Warnf("No verification configured for SourceIntegrity policy for %+v", policy.Repos)
|
|
return nil
|
|
}
|
|
|
|
func findMatchingGitPolicies(si *v1alpha1.SourceIntegrityGit, repoURL string) (policies []*v1alpha1.SourceIntegrityGitPolicy) {
|
|
for _, p := range si.Policies {
|
|
include := false
|
|
for _, r := range p.Repos {
|
|
m := repoMatches(r.URL, repoURL)
|
|
if m == -1 {
|
|
include = false
|
|
break
|
|
} else if m == 1 {
|
|
include = true
|
|
}
|
|
}
|
|
if include {
|
|
policies = append(policies, p)
|
|
}
|
|
}
|
|
return policies
|
|
}
|
|
|
|
func repoMatches(urlGlob string, repoURL string) int {
|
|
if strings.HasPrefix(urlGlob, "!") {
|
|
if glob.Match(urlGlob[1:], repoURL) {
|
|
return -1
|
|
}
|
|
} else {
|
|
if glob.Match(urlGlob, repoURL) {
|
|
return 1
|
|
}
|
|
}
|
|
|
|
return 0
|
|
}
|
|
|
|
func verify(ctx context.Context, g *v1alpha1.SourceIntegrityGitPolicyGPG, gitClient git.Client, verifiedRevision string) (*v1alpha1.SourceIntegrityCheckResult, string, error) {
|
|
const checkName = "GIT/GPG"
|
|
|
|
var deep bool
|
|
switch g.Mode {
|
|
// verify tag if on tag, latest revision otherwise
|
|
case v1alpha1.SourceIntegrityGitPolicyGPGModeHead:
|
|
deep = false
|
|
// verify history from the current commit
|
|
case v1alpha1.SourceIntegrityGitPolicyGPGModeStrict:
|
|
deep = true
|
|
default:
|
|
return nil, "", fmt.Errorf("unknown GPG mode %q configured for GIT source integrity", g.Mode)
|
|
}
|
|
|
|
// TODO: Remove deprecated https://github.com/argoproj/argo-cd/issues/27695
|
|
signatures, legacyVerification, err := gitClient.LsSignatures(ctx, verifiedRevision, deep)
|
|
if err != nil {
|
|
return nil, "", err
|
|
}
|
|
legacyDescriptionCondition := VerifyGnuPGSignature(verifiedRevision, g.Keys, legacyVerification)
|
|
legacyDescription := ""
|
|
if legacyDescriptionCondition != nil {
|
|
legacyDescription = legacyDescriptionCondition.Message
|
|
}
|
|
|
|
if len(signatures) == 0 {
|
|
// Checked for defensiveness, there should be 1+ signatures always
|
|
return nil, "", errors.New("git LsSignatures found no signatures for " + verifiedRevision)
|
|
}
|
|
|
|
problems, legacyGood := describeProblems(g, signatures)
|
|
result := &v1alpha1.SourceIntegrityCheckResult{Checks: []v1alpha1.SourceIntegrityCheckResultItem{{
|
|
Name: checkName,
|
|
Problems: problems,
|
|
}}}
|
|
if legacyDescription == "" {
|
|
legacyDescription = legacyGood
|
|
}
|
|
return result, legacyDescription, nil
|
|
}
|
|
|
|
// describeProblems reports 10 most recent problematic signatures or unsigned commits.
|
|
// The number is limited not to flood the UI and logs with too many problems. Problems related to the same signing key are squashed.
|
|
func describeProblems(g *v1alpha1.SourceIntegrityGitPolicyGPG, signatureInfos []git.RevisionSignatureInfo) (problems []string, legacyDescription string) {
|
|
reportedKeys := make(map[string]any)
|
|
for _, signatureInfo := range signatureInfos {
|
|
// TODO: Remove deprecated https://github.com/argoproj/argo-cd/issues/27695
|
|
if legacyDescription == "" {
|
|
if signatureInfo.VerificationResult == git.GPGVerificationResultUnsigned {
|
|
legacyDescription = "Revision is not signed."
|
|
} else {
|
|
legacyResult := map[git.GPGVerificationResult]string{
|
|
git.GPGVerificationResultGood: "Good",
|
|
git.GPGVerificationResultBad: "Bad",
|
|
git.GPGVerificationResultUntrusted: "Invalid",
|
|
git.GPGVerificationResultExpiredSignature: "Invalid",
|
|
git.GPGVerificationResultExpiredKey: "Invalid",
|
|
git.GPGVerificationResultRevokedKey: "Invalid",
|
|
git.GPGVerificationResultMissingKey: "Invalid",
|
|
}[signatureInfo.VerificationResult]
|
|
legacyDescription = fmt.Sprintf("%s signature from %s key %s", legacyResult, signatureInfo.AuthorIdentity, signatureInfo.SignatureKeyID)
|
|
}
|
|
}
|
|
|
|
problem := gpgProblemMessage(g, signatureInfo)
|
|
if problem != "" {
|
|
// Do not report the same key twice unless:
|
|
// - the revision is unsigned (unsigned commits can have different authors, so they are all worth reporting)
|
|
// - the revision is a tag (tags are signed separately from commits)
|
|
if signatureInfo.SignatureKeyID != "" && git.IsCommitSHA(signatureInfo.Revision) {
|
|
if _, exists := reportedKeys[signatureInfo.SignatureKeyID]; exists {
|
|
continue
|
|
}
|
|
reportedKeys[signatureInfo.SignatureKeyID] = nil
|
|
}
|
|
|
|
problems = append(problems, problem)
|
|
|
|
// Report at most 10 problems
|
|
if len(problems) >= 10 {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
return problems, legacyDescription
|
|
}
|
|
|
|
// gpgProblemMessage generates a message describing GPG verification issues for a specific revision signature and the configured policy.
|
|
// When an empty string is returned, it means there is no problem - the validation has passed.
|
|
func gpgProblemMessage(g *v1alpha1.SourceIntegrityGitPolicyGPG, signatureInfo git.RevisionSignatureInfo) string {
|
|
if signatureInfo.VerificationResult != git.GPGVerificationResultGood {
|
|
return fmt.Sprintf(
|
|
"Failed verifying revision %s by '%s': %s (key_id=%s)",
|
|
signatureInfo.Revision, signatureInfo.AuthorIdentity, signatureInfo.VerificationResult, signatureInfo.SignatureKeyID,
|
|
)
|
|
}
|
|
|
|
for _, allowedKey := range g.Keys {
|
|
allowedKey, err := KeyID(allowedKey)
|
|
if err != nil {
|
|
log.Error(err.Error())
|
|
continue
|
|
}
|
|
if allowedKey == signatureInfo.SignatureKeyID {
|
|
return ""
|
|
}
|
|
}
|
|
|
|
return fmt.Sprintf(
|
|
"Failed verifying revision %s by '%s': signed with unallowed key (key_id=%s)",
|
|
signatureInfo.Revision, signatureInfo.AuthorIdentity, signatureInfo.SignatureKeyID,
|
|
)
|
|
}
|
|
|
|
// IsGPGEnabled returns true if the GPG feature is enabled
|
|
func IsGPGEnabled() bool {
|
|
if en := os.Getenv("ARGOCD_GPG_ENABLED"); strings.EqualFold(en, "false") || strings.EqualFold(en, "no") {
|
|
return false
|
|
}
|
|
return true
|
|
}
|