Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

consolidate sia agent code for providers #2846

Merged
merged 1 commit into from
Jan 8, 2025
Merged

consolidate sia agent code for providers #2846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/go/sia/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ifneq ($(patsubst %$(SIA_DIR),,$(lastword $(ATHENZ_DIR))),)
ATHENZ_DIR = $(PWD)/$(SIA_DIR)
endif

SUBDIRS = access/config access/tokens agent aws/agent aws/attestation aws/doc aws/lambda aws/meta \
SUBDIRS = access/config access/tokens agent aws/attestation aws/doc aws/lambda aws/meta \
aws/options aws/stssession file futil gcp/attestation gcp/meta gcp/functions \
host/hostdoc host/ip host/provider host/signature host/utils logutil options pki/cert \
sds ssh/hostcert ssh/hostkey util verify
Expand Down
24 changes: 18 additions & 6 deletions libs/go/sia/agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
"github.com/AthenZ/athenz/libs/go/sia/access/config"
"github.com/AthenZ/athenz/libs/go/sia/access/tokens"
sc "github.com/AthenZ/athenz/libs/go/sia/config"
"github.com/AthenZ/athenz/libs/go/sia/host/provider"
"github.com/AthenZ/athenz/libs/go/sia/options"
"github.com/AthenZ/athenz/libs/go/sia/sds"
"github.com/AthenZ/athenz/libs/go/sia/ssh/hostkey"
Expand Down Expand Up @@ -278,7 +279,7 @@ func registerSvc(svc sc.Service, ztsUrl string, opts *sc.Options) error {
if err != nil {
return err
}
attestData, err := opts.Provider.CloudAttestationData(opts.MetaEndPoint, svc.Name, ztsUrl)
attestData, err := opts.Provider.CloudAttestationData(setUpAttestationRequest(opts, svc.Name, ztsUrl))
if err != nil {
log.Printf("Failed to get attestation data to prove the identity, err:%v\n", err)
return err
Expand Down Expand Up @@ -350,6 +351,21 @@ func registerSvc(svc sc.Service, ztsUrl string, opts *sc.Options) error {
return nil
}

func setUpAttestationRequest(opts *sc.Options, service, ztsUrl string) *provider.AttestationRequest {
return &provider.AttestationRequest{
MetaEndPoint: opts.MetaEndPoint,
Domain: opts.Domain,
Service: service,
ZTSUrl: ztsUrl,
Account: opts.Account,
Region: opts.Region,
OmitDomain: opts.OmitDomain,
UseRegionalSTS: opts.UseRegionalSTS,
EC2Document: opts.EC2Document,
EC2Signature: opts.EC2Signature,
}
}

func refreshSvc(svc sc.Service, ztsUrl string, opts *sc.Options) error {

keyFile := util.GetSvcKeyFileName(opts.KeyDir, svc.KeyFilename, opts.Domain, svc.Name)
Expand Down Expand Up @@ -399,7 +415,7 @@ func refreshSvc(svc sc.Service, ztsUrl string, opts *sc.Options) error {
return err
}

attestData, err := opts.Provider.CloudAttestationData(opts.MetaEndPoint, svc.Name, ztsUrl)
attestData, err := opts.Provider.CloudAttestationData(setUpAttestationRequest(opts, svc.Name, ztsUrl))
if err != nil {
log.Printf("Failed to get attestation data to prove the identity, err:%v\n", err)
return err
Expand Down Expand Up @@ -637,10 +653,6 @@ func runAgentCommand(siaCmd, ztsUrl string, opts *sc.Options) {
//server and role certs are valid for 30 days by default
rotationInterval := time.Duration(opts.RefreshInterval) * time.Minute

//data, err := opts.Provider.CloudAttestationData(opts)
//if err != nil {
// log.Fatalf("Cannot determine identity to run as, err:%v\n", err)
//}
svcs := options.GetSvcNames(opts.Services)

tokenOpts, err := tokenOptions(opts, ztsUrl)
Expand Down
20 changes: 11 additions & 9 deletions libs/go/sia/agent/agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ import (
"testing"
"time"

"k8s.io/utils/strings/slices"

"github.com/AthenZ/athenz/libs/go/sia/access/config"
"github.com/AthenZ/athenz/libs/go/sia/agent/devel/ztsmock"
sc "github.com/AthenZ/athenz/libs/go/sia/config"
"github.com/AthenZ/athenz/libs/go/sia/host/ip"
"github.com/AthenZ/athenz/libs/go/sia/host/provider"
"github.com/AthenZ/athenz/libs/go/sia/host/signature"
"github.com/AthenZ/athenz/libs/go/sia/ssh/hostkey"
"github.com/AthenZ/athenz/libs/go/sia/util"
"github.com/stretchr/testify/assert"
"k8s.io/utils/strings/slices"
)

func setup() {
Expand Down Expand Up @@ -105,7 +105,7 @@ func (tp TestProvider) GetSuffixes() []string {
return []string{}
}

func (tp TestProvider) CloudAttestationData(string, string, string) (string, error) {
func (tp TestProvider) CloudAttestationData(*provider.AttestationRequest) (string, error) {
return "abc", nil
}

Expand Down Expand Up @@ -211,7 +211,7 @@ func TestRegisterInstance(test *testing.T) {
KeyDir: siaDir,
CertDir: siaDir,
AthenzCACertFile: caCertFile,
ZTSAWSDomains: []string{"zts-aws-cloud"},
ZTSCloudDomains: []string{"zts-aws-cloud"},
Region: "us-west-2",
InstanceId: "pod-1234",
Provider: tp,
Expand Down Expand Up @@ -288,7 +288,7 @@ func refreshServiceCertSetup(test *testing.T) (*sc.Options, string) {
CertDir: siaDir,
AthenzCACertFile: caCertFile,
Provider: tp,
ZTSAWSDomains: []string{"zts-aws-cloud"},
ZTSCloudDomains: []string{"zts-aws-cloud"},
Region: "us-west-2",
InstanceId: "pod-1234",
}
Expand Down Expand Up @@ -366,7 +366,7 @@ func TestRoleCertificateRequest(test *testing.T) {
KeyDir: siaDir,
CertDir: siaDir,
AthenzCACertFile: caCertFile,
ZTSAWSDomains: []string{"zts-aws-cloud"},
ZTSCloudDomains: []string{"zts-aws-cloud"},
Provider: tp,
}

Expand Down Expand Up @@ -621,7 +621,7 @@ func TestGenerateSshRequest(test *testing.T) {
// ssh enabled with primary service and key type is rsa - null cert request but valid csr
opts.SshPubKeyFile = "devel/data/cert.pem"
opts.Domain = "athenz"
opts.ZTSAWSDomains = []string{"athenz.io"}
opts.ZTSCloudDomains = []string{"athenz.io"}
opts.SshHostKeyType = hostkey.Rsa
sshReq, sshCsr, err = generateSshRequest(&opts, "api", "hostname.athenz.io")
assert.Nil(test, sshReq)
Expand All @@ -631,21 +631,23 @@ func TestGenerateSshRequest(test *testing.T) {
opts.SshHostKeyType = hostkey.Ecdsa
sshReq, sshCsr, err = generateSshRequest(&opts, "api", "hostname.athenz.io")
assert.NotNil(test, sshReq)
assert.Equal(test, 3, len(sshReq.CertRequestData.Principals))
assert.Equal(test, 4, len(sshReq.CertRequestData.Principals))
assert.True(test, slices.Contains(sshReq.CertRequestData.Principals, "my-vm"))
assert.True(test, slices.Contains(sshReq.CertRequestData.Principals, "my-instance-id"))
assert.True(test, slices.Contains(sshReq.CertRequestData.Principals, "api.athenz.athenz.io"))
assert.Empty(test, sshCsr)
assert.Nil(test, err)
// ssh enabled with primary service and key type is ecdsa - empty csr but not-nil cert request, opts defines sshPrincipals
opts.SshHostKeyType = hostkey.Ecdsa
opts.SshPrincipals = "cname.athenz.io"
sshReq, sshCsr, err = generateSshRequest(&opts, "api", "hostname.athenz.io")
assert.NotNil(test, sshReq)
assert.Equal(test, 4, len(sshReq.CertRequestData.Principals))
assert.Equal(test, 5, len(sshReq.CertRequestData.Principals))
assert.True(test, slices.Contains(sshReq.CertRequestData.Principals, "hostname.athenz.io"))
assert.True(test, slices.Contains(sshReq.CertRequestData.Principals, "cname.athenz.io"))
assert.True(test, slices.Contains(sshReq.CertRequestData.Principals, "my-vm"))
assert.True(test, slices.Contains(sshReq.CertRequestData.Principals, "my-instance-id"))
assert.True(test, slices.Contains(sshReq.CertRequestData.Principals, "api.athenz.athenz.io"))
assert.Empty(test, sshCsr)
assert.Nil(test, err)
}
Expand Down
Loading
Loading