mirror of
https://github.com/distribution/distribution.git
synced 2025-09-11 03:39:41 +00:00
fix: Add the token's rootcert public key to the list of known keys
- Add Unit tests for `token.newAccessController` + Implemented swappable implementations for `token.getRootCerts` and `getJwks` to unit test their behavior over the accessController struct. - Use RFC7638 [0] mechanics to compute the KeyID of the rootcertbundle provided in the token auth config. - Extends token authentication docs: + Extend `jwt.md` write up on JWT headers & JWT Validation + Updated old reference to a draft that's now RFC7515. + Extended the JWT validation steps with the JWT Header validation. + Reference `jwt.md` in `token.md` [0]: https://datatracker.ietf.org/doc/html/rfc7638#autoid-13 Signed-off-by: Jose D. Gomez R <jose.gomez@suse.com>
This commit is contained in:
committed by
Jose D. Gomez R
parent
b74618692d
commit
b53946ded3
@@ -1,9 +1,16 @@
|
||||
package token
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"crypto/rand"
|
||||
"crypto/rsa"
|
||||
"crypto/x509"
|
||||
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"github.com/go-jose/go-jose/v4"
|
||||
)
|
||||
|
||||
func TestBuildAutoRedirectURL(t *testing.T) {
|
||||
@@ -87,3 +94,86 @@ func TestCheckOptions(t *testing.T) {
|
||||
t.Fatal("autoredirectpath should be /auth/token")
|
||||
}
|
||||
}
|
||||
|
||||
func mockGetRootCerts(path string) ([]*x509.Certificate, error) {
|
||||
caPrivKey, err := rsa.GenerateKey(rand.Reader, 1024) // not to slow down the test that much
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
ca := &x509.Certificate{
|
||||
PublicKey: &caPrivKey.PublicKey,
|
||||
}
|
||||
|
||||
return []*x509.Certificate{ca}, nil
|
||||
}
|
||||
|
||||
func mockGetJwks(path string) (*jose.JSONWebKeySet, error) {
|
||||
return &jose.JSONWebKeySet{
|
||||
Keys: []jose.JSONWebKey{
|
||||
{
|
||||
KeyID: "sample-key-id",
|
||||
},
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
|
||||
func TestRootCertIncludedInTrustedKeys(t *testing.T) {
|
||||
old := rootCertFetcher
|
||||
rootCertFetcher = mockGetRootCerts
|
||||
defer func() { rootCertFetcher = old }()
|
||||
|
||||
realm := "https://auth.example.com/token/"
|
||||
issuer := "test-issuer.example.com"
|
||||
service := "test-service.example.com"
|
||||
|
||||
options := map[string]interface{}{
|
||||
"realm": realm,
|
||||
"issuer": issuer,
|
||||
"service": service,
|
||||
"rootcertbundle": "something-to-trigger-our-mock",
|
||||
"autoredirect": true,
|
||||
"autoredirectpath": "/auth",
|
||||
}
|
||||
|
||||
ac, err := newAccessController(options)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// newAccessController return type is an interface built from
|
||||
// accessController struct. The type check can be safely ignored.
|
||||
ac2, _ := ac.(*accessController)
|
||||
if got := len(ac2.trustedKeys); got != 1 {
|
||||
t.Fatalf("Unexpected number of trusted keys, expected 1 got: %d", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestJWKSIncludedInTrustedKeys(t *testing.T) {
|
||||
old := jwkFetcher
|
||||
jwkFetcher = mockGetJwks
|
||||
defer func() { jwkFetcher = old }()
|
||||
|
||||
realm := "https://auth.example.com/token/"
|
||||
issuer := "test-issuer.example.com"
|
||||
service := "test-service.example.com"
|
||||
|
||||
options := map[string]interface{}{
|
||||
"realm": realm,
|
||||
"issuer": issuer,
|
||||
"service": service,
|
||||
"jwks": "something-to-trigger-our-mock",
|
||||
"autoredirect": true,
|
||||
"autoredirectpath": "/auth",
|
||||
}
|
||||
|
||||
ac, err := newAccessController(options)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// newAccessController return type is an interface built from
|
||||
// accessController struct. The type check can be safely ignored.
|
||||
ac2, _ := ac.(*accessController)
|
||||
if got := len(ac2.trustedKeys); got != 1 {
|
||||
t.Fatalf("Unexpected number of trusted keys, expected 1 got: %d", got)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user