Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions server/mdm/microsoft/wstep.go
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,9 @@ func (m *manager) GetSTSAuthTokenUPNClaim(tokenStr string) (string, error) {

// Since we used the private key to sign the tokens, we use the public counterpart to verify the signature
token, err := jwt.ParseWithClaims(tokenStr, &STSClaims{}, func(token *jwt.Token) (any, error) {
if _, ok := token.Method.(*jwt.SigningMethodRSA); !ok {
Comment thread
ksykulev marked this conversation as resolved.
return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
}
Comment thread
ksykulev marked this conversation as resolved.
return m.identityCert.PublicKey, nil
})
if err != nil {
Expand Down
74 changes: 74 additions & 0 deletions server/mdm/microsoft/wstep_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import (
"math/big"
"strings"
"testing"
"time"

"github.com/fleetdm/fleet/v4/server"
"github.com/fleetdm/fleet/v4/server/mdm/nanomdm/cryptoutil"
"github.com/golang-jwt/jwt/v4"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -137,6 +139,78 @@ func TestSTSTokenWithDeviceID(t *testing.T) {
require.Error(t, err)
}

func TestTokenRejectsNonRSAAlgorithms(t *testing.T) {
var store CertStore
cm, err := NewCertManager(store, testCert, testKey)
require.NoError(t, err)

m := cm.(*manager)
// Marshal the RSA public key to use as the HS256 "secret" — this mirrors
// the classic RSA-to-HMAC algorithm confusion attack shape.
pubKeyBytes, err := x509.MarshalPKIXPublicKey(m.identityCert.PublicKey)
require.NoError(t, err)

stsClaims := func() STSClaims {
return STSClaims{
UPN: "attacker@example.com",
RegisteredClaims: jwt.RegisteredClaims{
ExpiresAt: jwt.NewNumericDate(time.Now().Add(10 * time.Minute)),
IssuedAt: jwt.NewNumericDate(time.Now()),
NotBefore: jwt.NewNumericDate(time.Now()),
Subject: "STSAuthToken",
},
}
}
euaClaims := func() euaJWTClaims {
return euaJWTClaims{
UPN: "attacker@example.com",
DeviceID: "device-123",
RegisteredClaims: jwt.RegisteredClaims{
ExpiresAt: jwt.NewNumericDate(time.Now().Add(1 * time.Hour)),
IssuedAt: jwt.NewNumericDate(time.Now()),
NotBefore: jwt.NewNumericDate(time.Now()),
Subject: "EUAToken",
},
}
}

t.Run("STS rejects HS256", func(t *testing.T) {
signed, err := jwt.NewWithClaims(jwt.SigningMethodHS256, stsClaims()).SignedString(pubKeyBytes)
require.NoError(t, err)

_, err = cm.GetSTSAuthTokenUPNClaim(signed)
require.Error(t, err)
require.ErrorContains(t, err, "unexpected signing method")
})

t.Run("STS rejects none", func(t *testing.T) {
signed, err := jwt.NewWithClaims(jwt.SigningMethodNone, stsClaims()).SignedString(jwt.UnsafeAllowNoneSignatureType)
require.NoError(t, err)

_, err = cm.GetSTSAuthTokenUPNClaim(signed)
require.Error(t, err)
require.ErrorContains(t, err, "unexpected signing method")
})

t.Run("EUA rejects HS256", func(t *testing.T) {
signed, err := jwt.NewWithClaims(jwt.SigningMethodHS256, euaClaims()).SignedString(pubKeyBytes)
require.NoError(t, err)

_, err = cm.GetEUATokenClaims(signed)
require.Error(t, err)
require.ErrorContains(t, err, "unexpected signing method")
})

t.Run("EUA rejects none", func(t *testing.T) {
signed, err := jwt.NewWithClaims(jwt.SigningMethodNone, euaClaims()).SignedString(jwt.UnsafeAllowNoneSignatureType)
require.NoError(t, err)

_, err = cm.GetEUATokenClaims(signed)
require.Error(t, err)
require.ErrorContains(t, err, "unexpected signing method")
})
}

func TestCertFingerprintHexStr(t *testing.T) {
cases := []struct {
name string
Expand Down
Loading