Archives
/
smallstep-certificates
mirror of https://github.com/smallstep/certificates
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into herman/scep-provisioner-decrypter

Browse Source
pull/1414/head
Herman Slatman 8 months ago
parent 0d66158bf1 e766ca7a38
commit ffe079f31b
No known key found for this signature in database
GPG Key ID: F4D8A44EA0A75A4F
25 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
acme/api/account.go
Unescape Escape View File

@ -6,7 +6,7 @@ import (
"errors" "errors"
"net/http" "net/http"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/smallstep/certificates/acme" "github.com/smallstep/certificates/acme"
"github.com/smallstep/certificates/api/render" "github.com/smallstep/certificates/api/render"

2
acme/api/account_test.go
Unescape Escape View File

@ -13,7 +13,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/pkg/errors" "github.com/pkg/errors"
"go.step.sm/crypto/jose" "go.step.sm/crypto/jose"

2
acme/api/handler.go
Unescape Escape View File

@ -9,7 +9,7 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/smallstep/certificates/acme" "github.com/smallstep/certificates/acme"
"github.com/smallstep/certificates/api" "github.com/smallstep/certificates/api"

2
acme/api/handler_test.go
Unescape Escape View File

@ -15,7 +15,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/pkg/errors" "github.com/pkg/errors"

2
acme/api/order.go
Unescape Escape View File

@ -10,7 +10,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"go.step.sm/crypto/randutil" "go.step.sm/crypto/randutil"
"go.step.sm/crypto/x509util" "go.step.sm/crypto/x509util"

2
acme/api/order_test.go
Unescape Escape View File

@ -15,7 +15,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/pkg/errors" "github.com/pkg/errors"
"go.step.sm/crypto/pemutil" "go.step.sm/crypto/pemutil"

2
acme/api/revoke_test.go
Unescape Escape View File

@ -21,7 +21,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/crypto/ocsp" "golang.org/x/crypto/ocsp"

2
acme/linker.go
Unescape Escape View File

@ -8,7 +8,7 @@ import (
"net/url" "net/url"
"strings" "strings"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/smallstep/certificates/api/render" "github.com/smallstep/certificates/api/render"
"github.com/smallstep/certificates/authority" "github.com/smallstep/certificates/authority"
"github.com/smallstep/certificates/authority/provisioner" "github.com/smallstep/certificates/authority/provisioner"

2
api/api.go
Unescape Escape View File

@ -19,7 +19,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/pkg/errors" "github.com/pkg/errors"
"go.step.sm/crypto/sshutil" "go.step.sm/crypto/sshutil"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"

2
api/api_test.go
Unescape Escape View File

@ -26,7 +26,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/pkg/errors" "github.com/pkg/errors"
sassert "github.com/stretchr/testify/assert" sassert "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
authority/admin/api/acme_test.go
Unescape Escape View File

@ -12,7 +12,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"

2
authority/admin/api/admin.go
Unescape Escape View File

@ -4,7 +4,7 @@ import (
"context" "context"
"net/http" "net/http"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"go.step.sm/linkedca" "go.step.sm/linkedca"

2
authority/admin/api/admin_test.go
Unescape Escape View File

@ -11,7 +11,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"

2
authority/admin/api/middleware.go
Unescape Escape View File

@ -4,7 +4,7 @@ import (
"errors" "errors"
"net/http" "net/http"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"go.step.sm/linkedca" "go.step.sm/linkedca"

2
authority/admin/api/middleware_test.go
Unescape Escape View File

@ -11,7 +11,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"

2
authority/admin/api/provisioner.go
Unescape Escape View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"go.step.sm/crypto/sshutil" "go.step.sm/crypto/sshutil"
"go.step.sm/crypto/x509util" "go.step.sm/crypto/x509util"

2
authority/admin/api/provisioner_test.go
Unescape Escape View File

@ -12,7 +12,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"
"google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/encoding/protojson"

2
authority/admin/api/webhook.go
Unescape Escape View File

@ -6,7 +6,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/smallstep/certificates/api/read" "github.com/smallstep/certificates/api/read"
"github.com/smallstep/certificates/api/render" "github.com/smallstep/certificates/api/render"
"github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/authority/admin"

2
authority/admin/api/webhook_test.go
Unescape Escape View File

@ -11,7 +11,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/smallstep/certificates/authority" "github.com/smallstep/certificates/authority"
"github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/authority/admin"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

4
authority/provisioner/webhook.go
Unescape Escape View File

@ -173,7 +173,9 @@ retry:
if err != nil { if err != nil {
return nil, err return nil, err
} }
sig := hmac.New(sha256.New, secret).Sum(reqBytes) h := hmac.New(sha256.New, secret)
h.Write(reqBytes)
sig := h.Sum(nil)
req.Header.Set("X-Smallstep-Signature", hex.EncodeToString(sig)) req.Header.Set("X-Smallstep-Signature", hex.EncodeToString(sig))
req.Header.Set("X-Smallstep-Webhook-ID", w.ID) req.Header.Set("X-Smallstep-Webhook-ID", w.ID)

4
authority/provisioner/webhook_test.go
Unescape Escape View File

@ -482,7 +482,9 @@ func TestWebhook_Do(t *testing.T) {
secret, err := base64.StdEncoding.DecodeString(tc.webhook.Secret) secret, err := base64.StdEncoding.DecodeString(tc.webhook.Secret)
assert.FatalError(t, err) assert.FatalError(t, err)
mac := hmac.New(sha256.New, secret).Sum(body) h := hmac.New(sha256.New, secret)
h.Write(body)
mac := h.Sum(nil)
assert.True(t, hmac.Equal(sig, mac)) assert.True(t, hmac.Equal(sig, mac))
switch { switch {

4
ca/ca.go
Unescape Escape View File

@ -15,8 +15,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
"github.com/go-chi/chi/middleware" "github.com/go-chi/chi/v5/middleware"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/smallstep/certificates/acme" "github.com/smallstep/certificates/acme"
acmeAPI "github.com/smallstep/certificates/acme/api" acmeAPI "github.com/smallstep/certificates/acme/api"

2
go.mod
Unescape Escape View File

@ -9,7 +9,7 @@ require (
github.com/dgraph-io/badger v1.6.2 github.com/dgraph-io/badger v1.6.2
github.com/dgraph-io/badger/v2 v2.2007.4 github.com/dgraph-io/badger/v2 v2.2007.4
github.com/fxamacker/cbor/v2 v2.5.0 github.com/fxamacker/cbor/v2 v2.5.0
github.com/go-chi/chi v4.1.2+incompatible github.com/go-chi/chi/v5 v5.0.10
github.com/golang/mock v1.6.0 github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.9 github.com/google/go-cmp v0.5.9
github.com/google/go-tpm v0.9.0 github.com/google/go-tpm v0.9.0

4
go.sum
Unescape Escape View File

@ -144,8 +144,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
github.com/fxamacker/cbor/v2 v2.5.0 h1:oHsG0V/Q6E/wqTS2O1Cozzsy69nqCiguo5Q1a1ADivE= github.com/fxamacker/cbor/v2 v2.5.0 h1:oHsG0V/Q6E/wqTS2O1Cozzsy69nqCiguo5Q1a1ADivE=
github.com/fxamacker/cbor/v2 v2.5.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= github.com/fxamacker/cbor/v2 v2.5.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec= github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo= github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
github.com/go-kit/kit v0.4.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.4.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=

2
scep/api/api.go
Unescape Escape View File

@ -12,7 +12,7 @@ import (
"net/url" "net/url"
"strings" "strings"
"github.com/go-chi/chi" "github.com/go-chi/chi/v5"
microscep "github.com/micromdm/scep/v2/scep" microscep "github.com/micromdm/scep/v2/scep"
"go.mozilla.org/pkcs7" "go.mozilla.org/pkcs7"

Write Preview
Loading…
Cancel
Save