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]>
223 lines
7.3 KiB
Go
223 lines
7.3 KiB
Go
package oidc
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/golang-jwt/jwt/v5"
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
"github.com/hanzoai/deploy/util/cache"
|
|
"github.com/hanzoai/deploy/util/crypto"
|
|
jwtutil "github.com/hanzoai/deploy/util/jwt"
|
|
)
|
|
|
|
const (
|
|
// AzureGroupsOverageResponseCachePrefix is the cache key prefix for Azure AD groups overage responses.
|
|
AzureGroupsOverageResponseCachePrefix = "azure_groups_overage_response"
|
|
|
|
// requiredGraphScope is the OAuth2 scope needed to call the Microsoft Graph API for group membership.
|
|
requiredGraphScope = "User.Read"
|
|
|
|
// memberGroupsEndpoint is the Graph API endpoint that returns group IDs for the signed-in user.
|
|
memberGroupsEndpoint = "/me/getMemberGroups"
|
|
)
|
|
|
|
// GetUserGroupsFromAzureOverageClaim detects the Azure AD groups overage claim and, when present,
|
|
// fetches the user's group memberships from the Microsoft Graph API. Results are encrypted and cached.
|
|
// Returns nil groups (not an error) when no overage is detected.
|
|
func (a *ClientApp) GetUserGroupsFromAzureOverageClaim(ctx context.Context, groupClaims jwt.MapClaims, graphAPIURL string) ([]string, error) {
|
|
sub := jwtutil.StringField(groupClaims, "sub")
|
|
|
|
if !hasAzureGroupsClaimOverflow(groupClaims) {
|
|
log.Debugf("Azure AD groups overage claim not detected for user %s", sub)
|
|
return nil, nil
|
|
}
|
|
|
|
log.Infof("Azure AD groups overage claim detected for user %s, resolving via Graph API", sub)
|
|
|
|
// Check cache first
|
|
clientCacheKey := FormatAzureGroupsOverageResponseCacheKey(sub)
|
|
cachedGroupsBytes, err := a.GetValueFromEncryptedCache(ctx, clientCacheKey)
|
|
if err != nil {
|
|
log.Warnf("failed to read Azure groups overage cache for %s: %v", sub, err)
|
|
}
|
|
if cachedGroupsBytes != nil {
|
|
var groups []string
|
|
if err := json.Unmarshal(cachedGroupsBytes, &groups); err == nil {
|
|
return groups, nil
|
|
}
|
|
log.Errorf("cannot unmarshal cached Azure groups for %s: %v", sub, err)
|
|
}
|
|
|
|
// Get access token from cache
|
|
accessTokenBytes, err := a.GetValueFromEncryptedCache(ctx, FormatAccessTokenCacheKey(sub))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not read access token from cache for %s: %w", sub, err)
|
|
}
|
|
if accessTokenBytes == nil {
|
|
return nil, fmt.Errorf("no access token cached for %s, user must re-authenticate", sub)
|
|
}
|
|
|
|
accessTokenStr := string(accessTokenBytes)
|
|
if !hasUserReadScope(accessTokenStr) {
|
|
return nil, errors.New("access token missing User.Read scope; ensure the User.Read delegated permission is granted on the app registration in Azure AD")
|
|
}
|
|
|
|
graphURL := strings.TrimSuffix(graphAPIURL, "/") + memberGroupsEndpoint
|
|
groups, err := a.fetchGroupsFromGraphAPI(ctx, accessTokenStr, graphURL)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to fetch groups from Graph API for %s: %w", sub, err)
|
|
}
|
|
|
|
log.Infof("Successfully resolved %d groups for user %s via Graph API", len(groups), sub)
|
|
|
|
// Cache the result
|
|
a.cacheAzureGroupsOverageResponse(clientCacheKey, groups, groupClaims)
|
|
|
|
return groups, nil
|
|
}
|
|
|
|
// cacheAzureGroupsOverageResponse encrypts and caches the resolved groups. Errors are logged
|
|
// but not returned because the groups were already fetched successfully; caching is best-effort.
|
|
func (a *ClientApp) cacheAzureGroupsOverageResponse(cacheKey string, groups []string, claims jwt.MapClaims) {
|
|
rawGroups, err := json.Marshal(groups)
|
|
if err != nil {
|
|
log.Errorf("could not marshal groups to json for caching: %v", err)
|
|
return
|
|
}
|
|
encGroups, err := crypto.Encrypt(rawGroups, a.encryptionKey)
|
|
if err != nil {
|
|
log.Errorf("could not encrypt groups for caching: %v", err)
|
|
return
|
|
}
|
|
|
|
var cacheExpiry time.Duration
|
|
tokenExpiry := GetTokenExpiration(claims)
|
|
settingExpiry := a.settings.AzureUserGroupOverageClaimCacheExpiration()
|
|
if settingExpiry > 0 && settingExpiry < tokenExpiry {
|
|
cacheExpiry = settingExpiry
|
|
} else {
|
|
cacheExpiry = tokenExpiry
|
|
}
|
|
|
|
if err := a.clientCache.Set(&cache.Item{
|
|
Key: cacheKey,
|
|
Object: encGroups,
|
|
CacheActionOpts: cache.CacheActionOpts{
|
|
Expiration: cacheExpiry,
|
|
},
|
|
}); err != nil {
|
|
log.Errorf("could not cache Azure groups overage response: %v", err)
|
|
}
|
|
}
|
|
|
|
// fetchGroupsFromGraphAPI calls Microsoft Graph API POST /me/getMemberGroups to retrieve group IDs.
|
|
// securityEnabledOnly is set to true to return only security groups (not distribution lists),
|
|
// which is appropriate for RBAC evaluation.
|
|
func (a *ClientApp) fetchGroupsFromGraphAPI(ctx context.Context, accessToken, graphURL string) ([]string, error) {
|
|
requestBody := map[string]bool{
|
|
"securityEnabledOnly": true,
|
|
}
|
|
bodyBytes, err := json.Marshal(requestBody)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to marshal request body: %w", err)
|
|
}
|
|
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, graphURL, bytes.NewReader(bodyBytes))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to create Graph API request: %w", err)
|
|
}
|
|
req.Header.Set("Authorization", "Bearer "+accessToken)
|
|
req.Header.Set("Content-Type", "application/json")
|
|
|
|
resp, err := a.client.Do(req)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("graph API request failed: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
switch resp.StatusCode {
|
|
case http.StatusOK:
|
|
var response struct {
|
|
Value []string `json:"value"`
|
|
}
|
|
if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
|
|
return nil, fmt.Errorf("failed to decode Graph API response: %w", err)
|
|
}
|
|
return response.Value, nil
|
|
|
|
default:
|
|
body, _ := io.ReadAll(io.LimitReader(resp.Body, 1024))
|
|
return nil, fmt.Errorf("graph API request failed with status %d: %s", resp.StatusCode, string(body))
|
|
}
|
|
}
|
|
|
|
// hasAzureGroupsClaimOverflow checks if the ID token contains Azure AD groups overage indicators.
|
|
// Azure AD sets _claim_names and _claim_sources when the user has more than 200 group memberships.
|
|
func hasAzureGroupsClaimOverflow(claims jwt.MapClaims) bool {
|
|
claimSources, hasClaimSources := claims["_claim_sources"]
|
|
claimNames, hasClaimNames := claims["_claim_names"]
|
|
|
|
if !hasClaimSources || !hasClaimNames || claimSources == nil || claimNames == nil {
|
|
return false
|
|
}
|
|
|
|
claimNamesMap, ok := claimNames.(map[string]any)
|
|
if !ok {
|
|
return false
|
|
}
|
|
|
|
_, hasGroups := claimNamesMap["groups"]
|
|
return hasGroups
|
|
}
|
|
|
|
// hasUserReadScope checks if the access token contains the User.Read scope needed for Graph API calls.
|
|
// The access token is parsed without verification since we only need to inspect the scp claim.
|
|
func hasUserReadScope(accessToken string) bool {
|
|
parser := jwt.NewParser(jwt.WithoutClaimsValidation())
|
|
claims := jwt.MapClaims{}
|
|
|
|
_, _, err := parser.ParseUnverified(accessToken, &claims)
|
|
if err != nil {
|
|
log.Warnf("Failed to parse access token for scope check: %v", err)
|
|
return false
|
|
}
|
|
|
|
scpRaw, exists := claims["scp"]
|
|
if !exists {
|
|
return false
|
|
}
|
|
|
|
switch scp := scpRaw.(type) {
|
|
case string:
|
|
for scope := range strings.FieldsSeq(scp) {
|
|
if strings.EqualFold(scope, requiredGraphScope) {
|
|
return true
|
|
}
|
|
}
|
|
case []any:
|
|
for _, scopeInterface := range scp {
|
|
if scopeStr, ok := scopeInterface.(string); ok {
|
|
if strings.EqualFold(scopeStr, requiredGraphScope) {
|
|
return true
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
// FormatAzureGroupsOverageResponseCacheKey returns the cache key for storing Azure AD groups overage responses.
|
|
func FormatAzureGroupsOverageResponseCacheKey(sub string) string {
|
|
return fmt.Sprintf("%s_%s", AzureGroupsOverageResponseCachePrefix, sub)
|
|
}
|