Speedup tests by using insecure key profile.

hpidcock · hpidcock · commit af32e34b313e · 2020-05-22T11:24:49.000+10:00
diff --git a/pki/pki_test.go b/pki/pki_test.go
@@ -7,6 +7,16 @@ import (
 	"testing"
 
 	gc "gopkg.in/check.v1"
+
+	"github.com/juju/juju/pki"
+	pki_test "github.com/juju/juju/pki/test"
 )
 
-func TestSuite(t *testing.T) { gc.TestingT(t) }
+func TestSuite(t *testing.T) {
+	if pki_test.OriginalDefaultKeyProfile == nil {
+		panic("pki_test.OriginalDefaultKeyProfile not set")
+	}
+	// Restore the correct key profile.
+	pki.DefaultKeyProfile = pki_test.OriginalDefaultKeyProfile
+	gc.TestingT(t)
+}
diff --git a/pki/signer.go b/pki/signer.go
@@ -39,12 +39,12 @@ func ECDSAP384() (crypto.Signer, error) {
 	return ecdsa.GenerateKey(elliptic.P384(), rand.Reader)
 }
 
-// ECDSA384 returns a RSA 2048 private key
+// RSA2048 returns a RSA 2048 private key
 func RSA2048() (crypto.Signer, error) {
 	return rsa.GenerateKey(rand.Reader, 2048)
 }
 
-// ECDSA384 returns a RSA 3072 private key
+// RSA3072 returns a RSA 3072 private key
 func RSA3072() (crypto.Signer, error) {
 	return rsa.GenerateKey(rand.Reader, 3072)
 }
diff --git a/pki/test/keyprofile.go b/pki/test/keyprofile.go
@@ -0,0 +1,31 @@
+// Copyright 2020 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package test
+
+import (
+	"crypto"
+	"crypto/rsa"
+	"flag"
+	"math/rand"
+
+	"github.com/juju/juju/pki"
+)
+
+var insecureRand = rand.New(rand.NewSource(0))
+
+// InsecureKeyProfile for tests. Will panic if used outside tests.
+func InsecureKeyProfile() (crypto.Signer, error) {
+	if flag.Lookup("test.v") == nil {
+		panic("InsecureKeyProfile cannot be used outside tests")
+	}
+	return rsa.GenerateKey(insecureRand, 512)
+}
+
+// OriginalDefaultKeyProfile is the pre-patched pki.DefaultKeyProfile
+// value.
+var OriginalDefaultKeyProfile = pki.DefaultKeyProfile
+
+func init() {
+	pki.DefaultKeyProfile = InsecureKeyProfile
+}
diff --git a/testing/pki.go b/testing/pki.go
@@ -0,0 +1,9 @@
+// Copyright 2020 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package testing
+
+import (
+	// Force inclusion of pki/test for fast test keyprofiles.
+	_ "github.com/juju/juju/pki/test"
+)

Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,12 @@ func ECDSAP384() (crypto.Signer, error) {`
`39`	`39`	`return ecdsa.GenerateKey(elliptic.P384(), rand.Reader)`
`40`	`40`	`}`
`41`	`41`
`42`		`-// ECDSA384 returns a RSA 2048 private key`
	`42`	`+// RSA2048 returns a RSA 2048 private key`
`43`	`43`	`func RSA2048() (crypto.Signer, error) {`
`44`	`44`	`return rsa.GenerateKey(rand.Reader, 2048)`
`45`	`45`	`}`
`46`	`46`
`47`		`-// ECDSA384 returns a RSA 3072 private key`
	`47`	`+// RSA3072 returns a RSA 3072 private key`
`48`	`48`	`func RSA3072() (crypto.Signer, error) {`
`49`	`49`	`return rsa.GenerateKey(rand.Reader, 3072)`
`50`	`50`	`}`