iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10134 from borancar/feat/azure_pfx_support 

Add Azure PFX certificate support
This commit is contained in:
Megan Marsh 2020-12-18 12:09:17 -08:00 committed by GitHub
parent d1d5706048 9b89439ec2
commit 28245ec143
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builder/azure/common/client/tokenprovider_cert.go
View File

@ -15,6 +15,7 @@ import (
"github.com/Azure/go-autorest/autorest/azure"
"github.com/dgrijalva/jwt-go"
"github.com/hashicorp/packer/builder/azure/pkcs12"
)
func NewCertOAuthTokenProvider(env azure.Environment, clientID, clientCertPath, tenantID string) (oAuthTokenProvider, error) {
@ -124,7 +125,16 @@ func readCert(file string) (cert *x509.Certificate, key interface{}, err error)
}
if key == nil {
return nil, nil, fmt.Errorf("Did not find private key in pem file")
key, cert, err = pkcs12.Decode(d, "")
if err != nil {
return nil, nil, fmt.Errorf(
"Did not find private key in file, tried to read as PKCS#12 and failed: %v", err)
}
certs = append(certs, cert)
}
if key == nil {
return nil, nil, fmt.Errorf("Did not find private key in file")
}
// find the certificate that belongs to the private key by comparing the public keys
@ -148,7 +158,7 @@ func readCert(file string) (cert *x509.Certificate, key interface{}, err error)
}
if cert == nil {
return nil, nil, fmt.Errorf("Did not find certificate belonging to private key in pem file")
return nil, nil, fmt.Errorf("Did not find certificate belonging to private key in file")
}
return cert, key, nil