Skip to content

Commit

Permalink
Merge pull request #21 from smallstep/herman/remove-go-kit
Browse files Browse the repository at this point in the history 
Remove `go-kit` from test
  • Loading branch information
@hslatman
hslatman authored Sep 26, 2024
2 parents 18439bc + 4d194ba commit 8cf1ca4
Show file tree
Hide file tree
Showing 3 changed files with 114 additions and 37 deletions.
5 changes: 1 addition & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,4 @@ module github.com/smallstep/scep

go 1.16

require (
github.com/go-kit/log v0.2.1
github.com/smallstep/pkcs7 v0.0.0-20231024181729-3b98ecc1ca81
)
require github.com/smallstep/pkcs7 v0.0.0-20240911091500-b1cae6277023
73 changes: 67 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,67 @@
github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
github.com/smallstep/pkcs7 v0.0.0-20231024181729-3b98ecc1ca81 h1:B6cED3iLJTgxpdh4tuqByDjRRKan2EvtnOfHr2zHJVg=
github.com/smallstep/pkcs7 v0.0.0-20231024181729-3b98ecc1ca81/go.mod h1:SoUAr/4M46rZ3WaLstHxGhLEgoYIDRqxQEXLOmOEB0Y=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/smallstep/pkcs7 v0.0.0-20240911091500-b1cae6277023 h1:klMnoL/Mrw9MJaAZdGUuEAKSskSoy14KIUpRwGOd4Vo=
github.com/smallstep/pkcs7 v0.0.0-20240911091500-b1cae6277023/go.mod h1:CM5KrX7rxWgwDdMj9yef/pJB2OPgy/56z4IEx2UIbpc=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
73 changes: 46 additions & 27 deletions scep_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package scep
package scep_test

import (
"bytes"
Expand All @@ -11,6 +11,7 @@ import (
"errors"
"fmt"
"io"
"log"
"math/big"
"os"
"path"
Expand All @@ -19,23 +20,44 @@ import (
"testing"
"time"

"github.com/go-kit/log"
"github.com/go-kit/log/level"

"github.com/smallstep/scep"
"github.com/smallstep/scep/cryptoutil"
)

type testLogger struct {
l *log.Logger
}

func (l *testLogger) Log(keyValues ...interface{}) error {
if len(keyValues)%2 != 0 {
return fmt.Errorf("uneven number of key-values provided: %d", len(keyValues))
}

line := "level=debug"

for i := 0; i < len(keyValues); i += 2 {
line += " " + fmt.Sprintf("%s=%s", keyValues[i], keyValues[i+1])
}

l.l.Println(line)

return nil
}

func newTestLogger(w io.Writer) *testLogger {
return &testLogger{
l: log.New(w, "", log.LstdFlags),
}
}

var newLines = regexp.MustCompile("\r?\n")

func testParsePKIMessage(t *testing.T, data []byte) *PKIMessage {
func testParsePKIMessage(t *testing.T, data []byte) *scep.PKIMessage {
t.Helper()

buf := bytes.Buffer{}
logger := log.NewLogfmtLogger(&buf)
logger = level.NewFilter(logger, level.AllowDebug())
logger = level.NewInjector(logger, level.DebugValue())

msg, err := ParsePKIMessage(data, WithLogger(logger))
logger := newTestLogger(&buf)
msg, err := scep.ParsePKIMessage(data, scep.WithLogger(logger))
if err != nil {
t.Fatal(err)
}
Expand All @@ -51,7 +73,7 @@ func testParsePKIMessage(t *testing.T, data []byte) *PKIMessage {
return msg
}

func validateParsedPKIMessage(t *testing.T, msg *PKIMessage) {
func validateParsedPKIMessage(t *testing.T, msg *scep.PKIMessage) {
t.Helper()

if msg.TransactionID == "" {
Expand All @@ -61,11 +83,11 @@ func validateParsedPKIMessage(t *testing.T, msg *PKIMessage) {
t.Errorf("expected MessageType attribute")
}
switch msg.MessageType {
case CertRep:
case scep.CertRep:
if len(msg.RecipientNonce) == 0 {
t.Errorf("expected RecipientNonce attribute")
}
case PKCSReq, UpdateReq, RenewalReq:
case scep.PKCSReq, scep.UpdateReq, scep.RenewalReq:
if len(msg.SenderNonce) == 0 {
t.Errorf("expected SenderNonce attribute")
}
Expand Down Expand Up @@ -113,13 +135,13 @@ func TestParsePKIEnvelopeCert_MissingCertificatesForSigners(t *testing.T) {
caPEM := readTestFile(t, "testca2/ca2.pem")

// Try to parse the PKIMessage without providing certificates for signers.
_, err := ParsePKIMessage(certRepMissingCertificates)
_, err := scep.ParsePKIMessage(certRepMissingCertificates)
if err == nil {
t.Fatal("parsed PKIMessage without providing signer certificates")
}

signerCert := decodePEMCert(t, caPEM)
msg, err := ParsePKIMessage(certRepMissingCertificates, WithCACerts([]*x509.Certificate{signerCert}))
msg, err := scep.ParsePKIMessage(certRepMissingCertificates, scep.WithCACerts([]*x509.Certificate{signerCert}))
if err != nil {
t.Fatalf("failed to parse PKIMessage: %v", err)
}
Expand Down Expand Up @@ -231,31 +253,31 @@ func TestNewCSRRequest(t *testing.T) {
for _, test := range []struct {
testName string
keyUsage x509.KeyUsage
certsSelectorFunc CertsSelectorFunc
certsSelectorFunc scep.CertsSelectorFunc
shouldCreateCSR bool
}{
{
"KeyEncipherment not set with NOP certificates selector",
x509.KeyUsageCertSign,
NopCertsSelector(),
scep.NopCertsSelector(),
true,
},
{
"KeyEncipherment is set with NOP certificates selector",
x509.KeyUsageCertSign | x509.KeyUsageKeyEncipherment,
NopCertsSelector(),
scep.NopCertsSelector(),
true,
},
{
"KeyEncipherment not set with Encipherment certificates selector",
x509.KeyUsageCertSign,
EnciphermentCertsSelector(),
scep.EnciphermentCertsSelector(),
false,
},
{
"KeyEncipherment is set with Encipherment certificates selector",
x509.KeyUsageCertSign | x509.KeyUsageKeyEncipherment,
EnciphermentCertsSelector(),
scep.EnciphermentCertsSelector(),
true,
},
} {
Expand All @@ -271,19 +293,16 @@ func TestNewCSRRequest(t *testing.T) {
}
clientcert, clientkey := loadClientCredentials(t)
cacert, cakey := createCaCertWithKeyUsage(t, test.keyUsage)
tmpl := &PKIMessage{
MessageType: PKCSReq,
tmpl := &scep.PKIMessage{
MessageType: scep.PKCSReq,
Recipients: []*x509.Certificate{cacert},
SignerCert: clientcert,
SignerKey: clientkey,
}

buf := bytes.Buffer{}
logger := log.NewLogfmtLogger(&buf)
logger = level.NewFilter(logger, level.AllowDebug())
logger = level.NewInjector(logger, level.DebugValue())

pkcsreq, err := NewCSRRequest(csr, tmpl, WithCertsSelector(test.certsSelectorFunc), WithLogger(logger))
logger := newTestLogger(&buf)
pkcsreq, err := scep.NewCSRRequest(csr, tmpl, scep.WithCertsSelector(test.certsSelectorFunc), scep.WithLogger(logger))
if test.shouldCreateCSR && err != nil {
t.Fatalf("keyUsage: %d, failed creating a CSR request: %v", test.keyUsage, err)
}
Expand Down

0 comments on commit 8cf1ca4

Please sign in to comment.