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]>
156 lines
4.4 KiB
Go
156 lines
4.4 KiB
Go
package session
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/redis/go-redis/v9"
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
utilio "github.com/hanzoai/deploy/util/io"
|
|
)
|
|
|
|
const (
|
|
revokedTokenPrefix = "revoked-token|"
|
|
newRevokedTokenKey = "new-revoked-token"
|
|
)
|
|
|
|
type userStateStorage struct {
|
|
attempts map[string]LoginAttempts
|
|
redis *redis.Client
|
|
revokedTokens map[string]bool
|
|
recentRevokedTokens map[string]bool
|
|
lock sync.RWMutex
|
|
resyncDuration time.Duration
|
|
}
|
|
|
|
var _ UserStateStorage = &userStateStorage{}
|
|
|
|
func NewUserStateStorage(redis *redis.Client) *userStateStorage {
|
|
return &userStateStorage{
|
|
attempts: map[string]LoginAttempts{},
|
|
revokedTokens: map[string]bool{},
|
|
recentRevokedTokens: map[string]bool{},
|
|
resyncDuration: time.Second * 15,
|
|
redis: redis,
|
|
}
|
|
}
|
|
|
|
// Init sets up watches on the revoked tokens and starts a ticker to periodically resync the revoked tokens from Redis.
|
|
// Don't call this until after setting up all hooks on the Redis client, or you might encounter race conditions.
|
|
func (storage *userStateStorage) Init(ctx context.Context) {
|
|
go storage.watchRevokedTokens(ctx)
|
|
ticker := time.NewTicker(storage.resyncDuration)
|
|
go func() {
|
|
storage.loadRevokedTokensSafe()
|
|
for range ticker.C {
|
|
storage.loadRevokedTokensSafe()
|
|
}
|
|
}()
|
|
go func() {
|
|
<-ctx.Done()
|
|
ticker.Stop()
|
|
}()
|
|
}
|
|
|
|
func (storage *userStateStorage) watchRevokedTokens(ctx context.Context) {
|
|
pubsub := storage.redis.Subscribe(ctx, newRevokedTokenKey)
|
|
defer utilio.Close(pubsub)
|
|
|
|
ch := pubsub.Channel()
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
return
|
|
case val := <-ch:
|
|
storage.lock.Lock()
|
|
storage.revokedTokens[val.Payload] = true
|
|
storage.recentRevokedTokens[val.Payload] = true
|
|
storage.lock.Unlock()
|
|
}
|
|
}
|
|
}
|
|
|
|
func (storage *userStateStorage) loadRevokedTokensSafe() {
|
|
err := storage.loadRevokedTokens()
|
|
for err != nil {
|
|
log.Warnf("Failed to resync revoked tokens. retrying again in 1 minute: %v", err)
|
|
time.Sleep(time.Minute)
|
|
err = storage.loadRevokedTokens()
|
|
}
|
|
}
|
|
|
|
func (storage *userStateStorage) loadRevokedTokens() error {
|
|
redisRevokedTokens := map[string]bool{}
|
|
iterator := storage.redis.Scan(context.Background(), 0, revokedTokenPrefix+"*", 10000).Iterator()
|
|
for iterator.Next(context.Background()) {
|
|
parts := strings.Split(iterator.Val(), "|")
|
|
if len(parts) != 2 {
|
|
log.Warnf("Unexpected redis key prefixed with '%s'. Must have token id after the prefix but got: '%s'.",
|
|
revokedTokenPrefix,
|
|
iterator.Val())
|
|
continue
|
|
}
|
|
redisRevokedTokens[parts[1]] = true
|
|
}
|
|
if iterator.Err() != nil {
|
|
return iterator.Err()
|
|
}
|
|
|
|
storage.lock.Lock()
|
|
defer storage.lock.Unlock()
|
|
storage.revokedTokens = redisRevokedTokens
|
|
for recentRevokedToken := range storage.recentRevokedTokens {
|
|
storage.revokedTokens[recentRevokedToken] = true
|
|
}
|
|
storage.recentRevokedTokens = map[string]bool{}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (storage *userStateStorage) GetLoginAttempts() map[string]LoginAttempts {
|
|
return storage.attempts
|
|
}
|
|
|
|
func (storage *userStateStorage) SetLoginAttempts(attempts map[string]LoginAttempts) error {
|
|
storage.attempts = attempts
|
|
return nil
|
|
}
|
|
|
|
func (storage *userStateStorage) RevokeToken(ctx context.Context, id string, expiringAt time.Duration) error {
|
|
storage.lock.Lock()
|
|
storage.revokedTokens[id] = true
|
|
storage.recentRevokedTokens[id] = true
|
|
storage.lock.Unlock()
|
|
if err := storage.redis.Set(ctx, revokedTokenPrefix+id, "", expiringAt).Err(); err != nil {
|
|
return err
|
|
}
|
|
return storage.redis.Publish(ctx, newRevokedTokenKey, id).Err()
|
|
}
|
|
|
|
func (storage *userStateStorage) IsTokenRevoked(id string) bool {
|
|
storage.lock.RLock()
|
|
defer storage.lock.RUnlock()
|
|
return storage.revokedTokens[id]
|
|
}
|
|
|
|
func (storage *userStateStorage) GetLockObject() *sync.RWMutex {
|
|
return &storage.lock
|
|
}
|
|
|
|
type UserStateStorage interface {
|
|
Init(ctx context.Context)
|
|
// GetLoginAttempts return number of concurrent login attempts
|
|
GetLoginAttempts() map[string]LoginAttempts
|
|
// SetLoginAttempts sets number of concurrent login attempts
|
|
SetLoginAttempts(attempts map[string]LoginAttempts) error
|
|
// RevokeToken revokes token with given id (information about revocation expires after specified timeout)
|
|
RevokeToken(ctx context.Context, id string, expiringAt time.Duration) error
|
|
// IsTokenRevoked checks if given token is revoked
|
|
IsTokenRevoked(id string) bool
|
|
// GetLockObject returns a lock used by the storage
|
|
GetLockObject() *sync.RWMutex
|
|
}
|