mirror of
https://github.com/argoproj/argo-cd
synced 2026-04-21 17:07:16 +00:00
* Add initial primitives and tests for GPG related operations * More tests and test documentation * Move gpg primitives to own module * Add initial primitives for running git verify-commit and tests * Improve and better comment test * Implement VerifyCommitSignature() primitive for metrics wrapper * More commentary * Make reposerver verify gpg signatures when generating manifests * Make signature validation optional * Forbid use of local manifests when signature verification is enabled * Introduce new signatureKeys field in project CRD * Initial support for only syncing against signed revisions * Updates to GnuPG primitives and more test cases * Move signature verification to correct place and add tests * Add signature verification result to revision metadata and display it in UI * Add more primitives and move out some stuff to common module * Add more testdata * Add key management primitives to ArgoDB * Move type GnuPGPublicKey to appsv1 package * Add const ArgoCDGPGKeysConfigMapName * Handle key operations with appsv1.GnuPGPublicKey * Add initial API for managing GPG keys * Remove deprecated code * Add primitives for adding public keys to configuration * Change semantics of ValidateGPGKeys to return more key information * Add key import functionality to public key API * Fix code quirks reported by linter * More code quirks fixes * Fix test * Add primitives for deleting keys from configuration * Add delete key operation to API and CLI * Cosmetics * Implement logic to sync configuration to keyring in repo-server * Add IsGPGEnabled() primitive and also update trustdb on ownertrust changes * Use gpg.IsGPGEnabled() instead of custom test * Remove all keyring manipulating methods from DB * Cosmetics/comments * Require grpc methods from argoproj pkg * Enable setting config path via ARGOCD_GPG_DATA_PATH * Allow "no" and any cases in ARGOCD_GPG_ENABLED * Enable GPG feature on start and start-e2e and set required environment * Cosmetics/comments * Cosmetics and commentary * Update API documentation * Fix comment * Only run GPG related operations if GPG is enabled * Allow setting ARGOCD_GPG_ENABLE from the environment * Create GPG ConfigMap resource during installation * Use function instead of constant to get the watcher path * Re-watch source path in case it gets recreated. Also, error on finish * Add End-to-End tests for GPG commit verification * Introduce SignatureKey type for AppProject CRD * Fix merge error from previous commit * Adapt test for additional manifest (argocd-gpg-keys-cm.yaml) * Fix linter issues * Adapt CircleCI configuration to enable running tests * Add wrapper scripts for git and gpg * Sigh. * Display gpg version in CircleCI * Install gnupg2 and link it to gpg in CI * Try to install gnupg2 in CircleCI image * More CircleCI tweaks * # This is a combination of 10 commits. # This is the 1st commit message: Containerize tests - test cycle # This is the commit message #2: adapt working directory # This is the commit message #3: Build before running tests (so we might have a cache) # This is the commit message #4: Test limiting parallelism # This is the commit message #5: Remove unbound variable # This is the commit message #6: Decrease parallelism to find out limit # This is the commit message #7: Use correct flag # This is the commit message #8: Update Docker image # This is the commit message #9: Remove build phase and increase parallelism # This is the commit message #10: Further increase parallelism * Dockerize toolchain * Add new targets to Makefile * Codegen * Properly handle permissions for E2E tests * Remove gnupg2 installation from CircleCI configuration * Limit parallelism of build * Fix Yarn lint * Retrigger CI for possible flaky test * Codegen * Remove duplicate target in Makefile * Pull in pager from dep ensure -v * Adapt to gitops-engine changes and codegen * Use new health package for health status constants * Add GPG methods to ArgoDB mock module * Fix possible nil pointer dereference * Fix linter issue in imports * Introduce RBAC resource type 'gpgkeys' and adapt policies * Use ARGOCD_GNUPGHOME instead of GNUPGHOME for subsystem configuration Also remove some deprecated unit tests. * Also register GPG keys API with gRPC-GW * Update from codegen * Update GPG key API * Add web UI to manage GPG keys * Lint updates * Change wording * Add some plausibility checks for supplied data on key creation * Update from codegen * Re-allow binary keys and move check for ASCII armoured to UI * Make yarn lint happy * Add editing signature keys for projects in UI * Add ability to configure signature keys for project in CLI * Change default value to use for GNUPGHOME * Do not include data section in default gpg keys CM * Adapt Docker image for GnuPG feature * Add required configuration to installation manifests * Add add-signature-key and remove-signature-key commands to project CLI * Fix typo * Add initial user documentation for GnuPG verification * Fix role name - oops * Mention required RBAC roles in docs * Support GPG verification of git annotated tags as well * Ensure CLI can build succesfully * Better support verification on tags * Print key type in upper case * Update user documentation * Correctly disable GnuPG verification if ARGOCD_GPG_ENABLE=false * Clarify that this feature is only available with Git repositories * codegen * Move verification code to own function * Remove deprecated check * Make things more developer friendly when running locally * Enable GPG feature by default, and don't require ARGOCD_GNUPGHOME to be set * Revert changes to manifests to reflect default enable state * Codegen
116 lines
4.6 KiB
Go
116 lines
4.6 KiB
Go
package db
|
|
|
|
import (
|
|
"context"
|
|
|
|
v1 "k8s.io/api/core/v1"
|
|
"k8s.io/client-go/kubernetes"
|
|
|
|
appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
|
|
"github.com/argoproj/argo-cd/util/settings"
|
|
)
|
|
|
|
type ArgoDB interface {
|
|
// ListClusters lists configured clusters
|
|
ListClusters(ctx context.Context) (*appv1.ClusterList, error)
|
|
// CreateCluster creates a cluster
|
|
CreateCluster(ctx context.Context, c *appv1.Cluster) (*appv1.Cluster, error)
|
|
// WatchClusters allow watching for cluster informer
|
|
WatchClusters(ctx context.Context,
|
|
handleAddEvent func(cluster *appv1.Cluster),
|
|
handleModEvent func(oldCluster *appv1.Cluster, newCluster *appv1.Cluster),
|
|
handleDeleteEvent func(clusterServer string)) error
|
|
// Get returns a cluster from a query
|
|
GetCluster(ctx context.Context, server string) (*appv1.Cluster, error)
|
|
// UpdateCluster updates a cluster
|
|
UpdateCluster(ctx context.Context, c *appv1.Cluster) (*appv1.Cluster, error)
|
|
// DeleteCluster deletes a cluster by name
|
|
DeleteCluster(ctx context.Context, server string) error
|
|
|
|
// ListRepositories lists repositories
|
|
ListRepositories(ctx context.Context) ([]*appv1.Repository, error)
|
|
|
|
// CreateRepository creates a repository
|
|
CreateRepository(ctx context.Context, r *appv1.Repository) (*appv1.Repository, error)
|
|
// GetRepository returns a repository by URL
|
|
GetRepository(ctx context.Context, url string) (*appv1.Repository, error)
|
|
// UpdateRepository updates a repository
|
|
UpdateRepository(ctx context.Context, r *appv1.Repository) (*appv1.Repository, error)
|
|
// DeleteRepository deletes a repository from config
|
|
DeleteRepository(ctx context.Context, name string) error
|
|
|
|
// ListRepoCredentials list all repo credential sets URL patterns
|
|
ListRepositoryCredentials(ctx context.Context) ([]string, error)
|
|
// GetRepoCredentials gets repo credentials for given URL
|
|
GetRepositoryCredentials(ctx context.Context, name string) (*appv1.RepoCreds, error)
|
|
// CreateRepoCredentials creates a repository credential set
|
|
CreateRepositoryCredentials(ctx context.Context, r *appv1.RepoCreds) (*appv1.RepoCreds, error)
|
|
// UpdateRepoCredentials updates a repository credential set
|
|
UpdateRepositoryCredentials(ctx context.Context, r *appv1.RepoCreds) (*appv1.RepoCreds, error)
|
|
// DeleteRepoCredentials deletes a repository credential set from config
|
|
DeleteRepositoryCredentials(ctx context.Context, name string) error
|
|
|
|
// ListRepoCertificates lists all configured certificates
|
|
ListRepoCertificates(ctx context.Context, selector *CertificateListSelector) (*appv1.RepositoryCertificateList, error)
|
|
// CreateRepoCertificate creates a new certificate entry
|
|
CreateRepoCertificate(ctx context.Context, certificate *appv1.RepositoryCertificateList, upsert bool) (*appv1.RepositoryCertificateList, error)
|
|
// CreateRepoCertificate creates a new certificate entry
|
|
RemoveRepoCertificates(ctx context.Context, selector *CertificateListSelector) (*appv1.RepositoryCertificateList, error)
|
|
|
|
// ListHelmRepositories lists repositories
|
|
ListHelmRepositories(ctx context.Context) ([]*appv1.Repository, error)
|
|
|
|
// ListConfiguredGPGPublicKeys returns all GPG public key IDs that are configured
|
|
ListConfiguredGPGPublicKeys(ctx context.Context) (map[string]*appv1.GnuPGPublicKey, error)
|
|
// AddGPGPublicKey adds one ore more GPG public keys to the configuration
|
|
AddGPGPublicKey(ctx context.Context, keyData string) (map[string]*appv1.GnuPGPublicKey, []string, error)
|
|
// DeleteGPGPublicKey removes a GPG public key from the configuration
|
|
DeleteGPGPublicKey(ctx context.Context, keyID string) error
|
|
}
|
|
|
|
type db struct {
|
|
ns string
|
|
kubeclientset kubernetes.Interface
|
|
settingsMgr *settings.SettingsManager
|
|
}
|
|
|
|
// NewDB returns a new instance of the argo database
|
|
func NewDB(namespace string, settingsMgr *settings.SettingsManager, kubeclientset kubernetes.Interface) ArgoDB {
|
|
return &db{
|
|
settingsMgr: settingsMgr,
|
|
ns: namespace,
|
|
kubeclientset: kubeclientset,
|
|
}
|
|
}
|
|
|
|
func (db *db) getSecret(name string, cache map[string]*v1.Secret) (*v1.Secret, error) {
|
|
secret, ok := cache[name]
|
|
if !ok {
|
|
secretsLister, err := db.settingsMgr.GetSecretsLister()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
secret, err = secretsLister.Secrets(db.ns).Get(name)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if secret.Data == nil {
|
|
secret.Data = make(map[string][]byte)
|
|
}
|
|
cache[name] = secret
|
|
}
|
|
return secret, nil
|
|
}
|
|
|
|
func (db *db) unmarshalFromSecretsStr(secrets map[*string]*v1.SecretKeySelector, cache map[string]*v1.Secret) error {
|
|
for dst, src := range secrets {
|
|
if src != nil {
|
|
secret, err := db.getSecret(src.Name, cache)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
*dst = string(secret.Data[src.Key])
|
|
}
|
|
}
|
|
return nil
|
|
}
|