Fetching cert from env directly

Author: 4gust

apps/tests/integration/integration_test.go

@@ -10,7 +10,6 @@ import (
 	"context"
 	"crypto"
 	"crypto/x509"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -23,7 +22,6 @@ import (
 	"github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
 	"github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors"
 	"github.com/AzureAD/microsoft-authentication-library-for-go/apps/public"
-	"golang.org/x/crypto/pkcs12"
 )
 
 const (
@@ -39,6 +37,7 @@ const (
 	// Default values
 	defaultClientId = "f62c5ae3-bf3a-4af5-afa8-a68b800396e9"
 	pemFile         = "../../../cert.pem"
+	ccaPemFile      = "../../../ccaCert.pem"
 )
 
 var httpClient = http.Client{}
@@ -98,7 +97,7 @@ type secret struct {
 }
 
 func newLabClient() (*labClient, error) {
-	cert, privateKey, err := getCertDataFromFile()
+	cert, privateKey, err := getCertDataFromFile(pemFile)
 	if err != nil {
 		return nil, fmt.Errorf("Could not get cert data: %w", err)
 	}
@@ -116,8 +115,8 @@ func newLabClient() (*labClient, error) {
 	return &labClient{app: app}, nil
 }
 
-func getCertDataFromFile() ([]*x509.Certificate, crypto.PrivateKey, error) {
-	data, err := os.ReadFile(pemFile)
+func getCertDataFromFile(filePath string) ([]*x509.Certificate, crypto.PrivateKey, error) {
+	data, err := os.ReadFile(filePath)
 	if err != nil {
 		fmt.Printf("Error finding certificate: %v\n", err)
 	}
@@ -487,25 +486,13 @@ func TestAdfsToken(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
-	labClient, err := newLabClient()
-	if err != nil {
-		t.Fatalf("TestAccountFromCache: on newLabClient(): got err == %s, want err == nil", errors.Verbose(err))
-	}
-	ctx := context.Background()
-	secret, err := labClient.secret(ctx, url.Values{"Secret": []string{"IDLABS-APP-Confidential-Client-Cert-OnPrem"}})
-	if err != nil {
-		t.Fatalf("TestAccountFromCache: failed to fetch secret, %s", errors.Verbose(err))
-	}
-	pfxData, err := base64.StdEncoding.DecodeString(secret)
-	if err != nil {
-		t.Fatalf("Failed to decode base64 data: %v", err)
-	}
-	privateKey, cert, err := pkcs12.Decode(pfxData, "")
+
+	cert, privateKey, err := getCertDataFromFile(ccaPemFile)
 	if err != nil {
-		t.Fatalf("Failed to decode PFX data: %v", err)
+		t.Fatal("Could not get cert data: %w", err)
 	}
 
-	cred, err := confidential.NewCredFromCert([]*x509.Certificate{cert}, privateKey)
+	cred, err := confidential.NewCredFromCert(cert, privateKey)
 	if err != nil {
 		panic(err)
 	}

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/kylelemons/godebug v1.1.0
 	github.com/montanaflynn/stats v0.7.0
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
-	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
 )
 
 require golang.org/x/sys v0.5.0 // indirect

go.sum

@@ -8,8 +8,6 @@ github.com/montanaflynn/stats v0.7.0 h1:r3y12KyNxj/Sb/iOE46ws+3mS1+MZca1wlHQFPsY
 github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=