Commit 740a0b4f authored by vaikas-google's avatar vaikas-google

Allow unauthenticated requests to GCS for public buckets

parent 476e71f5
...@@ -247,10 +247,6 @@ func NewGCSRegistryProvider(cp common.CredentialProvider) GCSRegistryProvider { ...@@ -247,10 +247,6 @@ func NewGCSRegistryProvider(cp common.CredentialProvider) GCSRegistryProvider {
// GetGCSRegistry returns a new Google Cloud Storage . If there's a credential that is specified, will try // GetGCSRegistry returns a new Google Cloud Storage . If there's a credential that is specified, will try
// to fetch it and use it, and if there's no credential found, will fall back to unauthenticated client. // to fetch it and use it, and if there's no credential found, will fall back to unauthenticated client.
func (gcsrp gcsRegistryProvider) GetGCSRegistry(cr common.Registry) (ObjectStorageRegistry, error) { func (gcsrp gcsRegistryProvider) GetGCSRegistry(cr common.Registry) (ObjectStorageRegistry, error) {
// If there's a credential that we need to use, fetch it and create a client for it.
if cr.CredentialName == "" {
return nil, fmt.Errorf("No CredentialName specified for %s", cr.Name)
}
client, err := gcsrp.createGCSClient(cr.CredentialName) client, err := gcsrp.createGCSClient(cr.CredentialName)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -263,10 +259,15 @@ func (gcsrp gcsRegistryProvider) GetGCSRegistry(cr common.Registry) (ObjectStora ...@@ -263,10 +259,15 @@ func (gcsrp gcsRegistryProvider) GetGCSRegistry(cr common.Registry) (ObjectStora
} }
func (gcsrp gcsRegistryProvider) createGCSClient(credentialName string) (*http.Client, error) { func (gcsrp gcsRegistryProvider) createGCSClient(credentialName string) (*http.Client, error) {
if credentialName == "" {
return http.DefaultClient, nil
}
c, err := gcsrp.cp.GetCredential(credentialName) c, err := gcsrp.cp.GetCredential(credentialName)
if err != nil { if err != nil {
log.Printf("Failed to fetch credential %s: %v", credentialName, err) log.Printf("Failed to fetch credential %s: %v", credentialName, err)
return nil, fmt.Errorf("Failed to fetch Credential %s: %s", credentialName, err) log.Print("Trying to use unauthenticated client")
return http.DefaultClient, nil
} }
config, err := google.JWTConfigFromJSON([]byte(c.ServiceAccount), storage.DevstorageReadOnlyScope) config, err := google.JWTConfigFromJSON([]byte(c.ServiceAccount), storage.DevstorageReadOnlyScope)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment