Skip to content

UPSTREAM: docker/distribution: 3403: add application-credential auth support for swift storage driver #25

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

Merged
openshift-merge-robot merged 1 commit into from
Sep 13, 2021
Merged

UPSTREAM: docker/distribution: 3403: add application-credential auth support for swift storage driver #25

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
3 changes: 3 additions & 0 deletions docs/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ storage:
swift:
username: username
password: password
applicationcredentialid: myid
applicationcredentialname: mycred
applicationcredentialsecret: mysecret
authurl: https://storage.myprovider.com/auth/v1.0 or https://storage.myprovider.com/v2.0 or https://storage.myprovider.com/v3/auth
tenant: tenantname
tenantid: tenantid
Expand Down
90 changes: 50 additions & 40 deletions registry/storage/driver/swift/swift.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,27 +60,30 @@ var readAfterWriteWait = 200 * time.Millisecond

// Parameters A struct that encapsulates all of the driver parameters after all values have been set
type Parameters struct {
Username string
Password string
AuthURL string
Tenant string
TenantID string
Domain string
DomainID string
TenantDomain string
TenantDomainID string
TrustID string
Region string
AuthVersion int
Container string
Prefix string
EndpointType string
InsecureSkipVerify bool
ChunkSize int
SecretKey string
AccessKey string
TempURLContainerKey bool
TempURLMethods []string
Username string
Password string
ApplicationCredentialID string
ApplicationCredentialName string
ApplicationCredentialSecret string
AuthURL string
Tenant string
TenantID string
Domain string
DomainID string
TenantDomain string
TenantDomainID string
TrustID string
Region string
AuthVersion int
Container string
Prefix string
EndpointType string
InsecureSkipVerify bool
ChunkSize int
SecretKey string
AccessKey string
TempURLContainerKey bool
TempURLMethods []string
}

// swiftInfo maps the JSON structure returned by Swift /info endpoint
Expand Down Expand Up @@ -160,11 +163,15 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
}

if params.Username == "" {
return nil, fmt.Errorf("No username parameter provided")
if params.ApplicationCredentialID == "" && params.ApplicationCredentialName == "" {
return nil, fmt.Errorf("no username or application-credential provided")
}
}

if params.Password == "" {
return nil, fmt.Errorf("No password parameter provided")
if params.ApplicationCredentialID == "" {
return nil, fmt.Errorf("no password or application-credential-secret parameter provided")
}
}

if params.AuthURL == "" {
Expand All @@ -191,23 +198,26 @@ func New(params Parameters) (*Driver, error) {
}

ct := &swift.Connection{
UserName: params.Username,
ApiKey: params.Password,
AuthUrl: params.AuthURL,
Region: params.Region,
AuthVersion: params.AuthVersion,
UserAgent: "distribution/" + version.Version,
Tenant: params.Tenant,
TenantId: params.TenantID,
Domain: params.Domain,
DomainId: params.DomainID,
TenantDomain: params.TenantDomain,
TenantDomainId: params.TenantDomainID,
TrustId: params.TrustID,
EndpointType: swift.EndpointType(params.EndpointType),
Transport: transport,
ConnectTimeout: 60 * time.Second,
Timeout: 15 * 60 * time.Second,
UserName: params.Username,
ApiKey: params.Password,
ApplicationCredentialId: params.ApplicationCredentialID,
ApplicationCredentialName: params.ApplicationCredentialName,
ApplicationCredentialSecret: params.ApplicationCredentialSecret,
AuthUrl: params.AuthURL,
Region: params.Region,
AuthVersion: params.AuthVersion,
UserAgent: "distribution/" + version.Version,
Tenant: params.Tenant,
TenantId: params.TenantID,
Domain: params.Domain,
DomainId: params.DomainID,
TenantDomain: params.TenantDomain,
TenantDomainId: params.TenantDomainID,
TrustId: params.TrustID,
EndpointType: swift.EndpointType(params.EndpointType),
Transport: transport,
ConnectTimeout: 60 * time.Second,
Timeout: 15 * 60 * time.Second,
}
err := ct.Authenticate()
if err != nil {
Expand Down
47 changes: 28 additions & 19 deletions registry/storage/driver/swift/swift_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,37 @@ var swiftDriverConstructor func(prefix string) (*Driver, error)

func init() {
var (
username string
password string
authURL string
tenant string
tenantID string
domain string
domainID string
tenantDomain string
tenantDomainID string
trustID string
container string
region string
AuthVersion int
endpointType string
insecureSkipVerify bool
secretKey string
accessKey string
containerKey bool
tempURLMethods []string
username string
password string
applicationCredentialID string
applicationCredentialName string
applicationCredentialSecret string
authURL string
tenant string
tenantID string
domain string
domainID string
tenantDomain string
tenantDomainID string
trustID string
container string
region string
AuthVersion int
endpointType string
insecureSkipVerify bool
secretKey string
accessKey string
containerKey bool
tempURLMethods []string

swiftServer *swifttest.SwiftServer
err error
)
username = os.Getenv("SWIFT_USERNAME")
password = os.Getenv("SWIFT_PASSWORD")
applicationCredentialID = os.Getenv("SWIFT_APPLICATIONCREDENTIALID")
applicationCredentialName = os.Getenv("SWIFT_APPLICATIONCREDENTIALNAME")
applicationCredentialSecret = os.Getenv("SWIFT_APPLICATIONCREDENTIALSECRET")
authURL = os.Getenv("SWIFT_AUTH_URL")
tenant = os.Getenv("SWIFT_TENANT_NAME")
tenantID = os.Getenv("SWIFT_TENANT_ID")
Expand Down Expand Up @@ -87,6 +93,9 @@ func init() {
parameters := Parameters{
username,
password,
applicationCredentialID,
applicationCredentialName,
applicationCredentialSecret,
authURL,
tenant,
tenantID,
Expand Down