db4b2cb577
## Backport This PR is auto-generated from #18062 to be assessed for backporting due to the inclusion of the label backport/1.16. The below text is copied from the body of the original PR. --- ### Description <!-- Please describe why you're making this change, in plain English. --> - Currently the jwt-auth filter doesn't take into account the service identity when validating jwt-auth, it only takes into account the path and jwt provider during validation. This causes issues when multiple source intentions restrict access to an endpoint with different JWT providers. - To fix these issues, rather than use the JWT auth filter for validation, we use it in metadata mode and allow it to forward the successful validated JWT token payload to the RBAC filter which will make the decisions. This PR ensures requests with and without JWT tokens successfully go through the jwt-authn filter. The filter however only forwards the data for successful/valid tokens. On the RBAC filter level, we check the payload for claims and token issuer + existing rbac rules. ### Testing & Reproduction steps <!-- * In the case of bugs, describe how to replicate * If any manual tests were done, document the steps and the conditions to replicate * Call out any important/ relevant unit tests, e2e tests or integration tests you have added or are adding --> - This test covers a multi level jwt requirements (requirements at top level and permissions level). It also assumes you have envoy running, you have a redis and a sidecar proxy service registered, and have a way to generate jwks with jwt. I mostly use: https://www.scottbrady91.com/tools/jwt for this. - first write your proxy defaults ``` Kind = "proxy-defaults" name = "global" config { protocol = "http" } ``` - Create two providers ``` Kind = "jwt-provider" Name = "auth0" Issuer = "https://ronald.local" JSONWebKeySet = { Local = { JWKS = "eyJrZXlzIjog....." } } ``` ``` Kind = "jwt-provider" Name = "okta" Issuer = "https://ronald.local" JSONWebKeySet = { Local = { JWKS = "eyJrZXlzIjogW3...." } } ``` - add a service intention ``` Kind = "service-intentions" Name = "redis" JWT = { Providers = [ { Name = "okta" }, ] } Sources = [ { Name = "*" Permissions = [{ Action = "allow" HTTP = { PathPrefix = "/workspace" } JWT = { Providers = [ { Name = "okta" VerifyClaims = [ { Path = ["aud"] Value = "my_client_app" }, { Path = ["sub"] Value = "5be86359073c434bad2da3932222dabe" } ] }, ] } }, { Action = "allow" HTTP = { PathPrefix = "/" } JWT = { Providers = [ { Name = "auth0" }, ] } }] } ] ``` - generate 3 jwt tokens: 1 from auth0 jwks, 1 from okta jwks with different claims than `/workspace` expects and 1 with correct claims - connect to your envoy (change service and address as needed) to view logs and potential errors. You can add: `-- --log-level debug` to see what data is being forwarded ``` consul connect envoy -sidecar-for redis1 -grpc-addr 127.0.0.1:8502 ``` - Make the following requests: ``` curl -s -H "Authorization: Bearer $Auth0_TOKEN" --insecure --cert leaf.cert --key leaf.key --cacert connect-ca.pem https://localhost:20000/workspace -v RBAC filter denied curl -s -H "Authorization: Bearer $Okta_TOKEN_with_wrong_claims" --insecure --cert leaf.cert --key leaf.key --cacert connect-ca.pem https://localhost:20000/workspace -v RBAC filter denied curl -s -H "Authorization: Bearer $Okta_TOKEN_with_correct_claims" --insecure --cert leaf.cert --key leaf.key --cacert connect-ca.pem https://localhost:20000/workspace -v Successful request ``` ### TODO * [x] Update test coverage * [ ] update integration tests (follow-up PR) * [x] appropriate backport labels added --- <details> <summary> Overview of commits </summary> - 70536f5a38507d7468f62d00dd93a6968a3d9cf3 </details> Co-authored-by: Ronald Ekambi <ronekambi@gmail.com>
294 lines
9.4 KiB
Go
294 lines
9.4 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: MPL-2.0
|
|
|
|
package xds
|
|
|
|
import (
|
|
"encoding/base64"
|
|
"fmt"
|
|
|
|
envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
|
|
envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
|
|
envoy_http_jwt_authn_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/jwt_authn/v3"
|
|
envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
"google.golang.org/protobuf/types/known/durationpb"
|
|
"google.golang.org/protobuf/types/known/emptypb"
|
|
"google.golang.org/protobuf/types/known/wrapperspb"
|
|
)
|
|
|
|
const (
|
|
jwtEnvoyFilter = "envoy.filters.http.jwt_authn"
|
|
jwtMetadataKeyPrefix = "jwt_payload"
|
|
jwksClusterPrefix = "jwks_cluster"
|
|
)
|
|
|
|
// makeJWTAuthFilter builds jwt filter for envoy. It limits its use to referenced provider rather than every provider.
|
|
//
|
|
// Eg. If you have three providers: okta, auth0 and fusionAuth and only okta is referenced in your intentions, then this
|
|
// will create a jwt-auth filter containing just okta in the list of providers.
|
|
func makeJWTAuthFilter(providerMap map[string]*structs.JWTProviderConfigEntry, intentions structs.SimplifiedIntentions) (*envoy_http_v3.HttpFilter, error) {
|
|
providers := map[string]*envoy_http_jwt_authn_v3.JwtProvider{}
|
|
var jwtRequirements []*envoy_http_jwt_authn_v3.JwtRequirement
|
|
|
|
for _, intention := range intentions {
|
|
if intention.JWT == nil && !hasJWTconfig(intention.Permissions) {
|
|
continue
|
|
}
|
|
for _, p := range collectJWTProviders(intention) {
|
|
providerName := p.Name
|
|
if _, ok := providers[providerName]; ok {
|
|
continue
|
|
}
|
|
|
|
providerCE, ok := providerMap[providerName]
|
|
if !ok {
|
|
return nil, fmt.Errorf("provider specified in intention does not exist. Provider name: %s", providerName)
|
|
}
|
|
|
|
envoyCfg, err := buildJWTProviderConfig(providerCE)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
providers[providerName] = envoyCfg
|
|
reqs := providerToJWTRequirement(providerCE)
|
|
jwtRequirements = append(jwtRequirements, reqs)
|
|
}
|
|
}
|
|
|
|
if len(jwtRequirements) == 0 {
|
|
//do not add jwt_authn filter when intentions don't have JWTs
|
|
return nil, nil
|
|
}
|
|
|
|
cfg := &envoy_http_jwt_authn_v3.JwtAuthentication{
|
|
Providers: providers,
|
|
Rules: []*envoy_http_jwt_authn_v3.RequirementRule{
|
|
{
|
|
Match: &envoy_route_v3.RouteMatch{
|
|
PathSpecifier: &envoy_route_v3.RouteMatch_Prefix{Prefix: "/"},
|
|
},
|
|
RequirementType: makeJWTRequirementRule(andJWTRequirements(jwtRequirements)),
|
|
},
|
|
},
|
|
}
|
|
return makeEnvoyHTTPFilter(jwtEnvoyFilter, cfg)
|
|
}
|
|
|
|
func makeJWTRequirementRule(r *envoy_http_jwt_authn_v3.JwtRequirement) *envoy_http_jwt_authn_v3.RequirementRule_Requires {
|
|
return &envoy_http_jwt_authn_v3.RequirementRule_Requires{
|
|
Requires: r,
|
|
}
|
|
}
|
|
|
|
// andJWTRequirements combines list of jwt requirements into a single jwt requirement.
|
|
func andJWTRequirements(reqs []*envoy_http_jwt_authn_v3.JwtRequirement) *envoy_http_jwt_authn_v3.JwtRequirement {
|
|
switch len(reqs) {
|
|
case 0:
|
|
return nil
|
|
case 1:
|
|
return reqs[0]
|
|
default:
|
|
return &envoy_http_jwt_authn_v3.JwtRequirement{
|
|
RequiresType: &envoy_http_jwt_authn_v3.JwtRequirement_RequiresAll{
|
|
RequiresAll: &envoy_http_jwt_authn_v3.JwtRequirementAndList{
|
|
Requirements: reqs,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
}
|
|
|
|
// providerToJWTRequirement builds the envoy jwtRequirement.
|
|
//
|
|
// Note: since the rbac filter is in charge of making decisions of allow/denied, this
|
|
// requirement uses `allow_missing_or_failed` to ensure it is always satisfied.
|
|
func providerToJWTRequirement(provider *structs.JWTProviderConfigEntry) *envoy_http_jwt_authn_v3.JwtRequirement {
|
|
return &envoy_http_jwt_authn_v3.JwtRequirement{
|
|
RequiresType: &envoy_http_jwt_authn_v3.JwtRequirement_RequiresAny{
|
|
RequiresAny: &envoy_http_jwt_authn_v3.JwtRequirementOrList{
|
|
Requirements: []*envoy_http_jwt_authn_v3.JwtRequirement{
|
|
{
|
|
RequiresType: &envoy_http_jwt_authn_v3.JwtRequirement_ProviderName{
|
|
ProviderName: provider.Name,
|
|
},
|
|
},
|
|
// We use allowMissingOrFailed to allow rbac filter to do the validation
|
|
{
|
|
RequiresType: &envoy_http_jwt_authn_v3.JwtRequirement_AllowMissingOrFailed{
|
|
AllowMissingOrFailed: &emptypb.Empty{},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
// collectJWTProviders returns a list of all top level and permission level referenced providers.
|
|
func collectJWTProviders(i *structs.Intention) []*structs.IntentionJWTProvider {
|
|
// get permission level providers
|
|
reqs := getPermissionsProviders(i.Permissions)
|
|
|
|
if i.JWT != nil {
|
|
// get top level providers
|
|
reqs = append(reqs, i.JWT.Providers...)
|
|
}
|
|
|
|
return reqs
|
|
}
|
|
|
|
func getPermissionsProviders(perms []*structs.IntentionPermission) []*structs.IntentionJWTProvider {
|
|
var reqs []*structs.IntentionJWTProvider
|
|
for _, p := range perms {
|
|
if p.JWT == nil {
|
|
continue
|
|
}
|
|
|
|
reqs = append(reqs, p.JWT.Providers...)
|
|
}
|
|
|
|
return reqs
|
|
}
|
|
|
|
// buildPayloadInMetadataKey is used to create a unique payload key per provider.
|
|
// This is to ensure claims are validated/forwarded specifically under the right provider.
|
|
// The forwarded payload is used with other data (eg. service identity) by the RBAC filter
|
|
// to validate access to resource.
|
|
//
|
|
// eg. With a provider named okta will have a payload key of: jwt_payload_okta
|
|
func buildPayloadInMetadataKey(providerName string) string {
|
|
return jwtMetadataKeyPrefix + "_" + providerName
|
|
}
|
|
|
|
func buildJWTProviderConfig(p *structs.JWTProviderConfigEntry) (*envoy_http_jwt_authn_v3.JwtProvider, error) {
|
|
envoyCfg := envoy_http_jwt_authn_v3.JwtProvider{
|
|
Issuer: p.Issuer,
|
|
Audiences: p.Audiences,
|
|
PayloadInMetadata: buildPayloadInMetadataKey(p.Name),
|
|
}
|
|
|
|
if p.Forwarding != nil {
|
|
envoyCfg.ForwardPayloadHeader = p.Forwarding.HeaderName
|
|
envoyCfg.PadForwardPayloadHeader = p.Forwarding.PadForwardPayloadHeader
|
|
}
|
|
|
|
if local := p.JSONWebKeySet.Local; local != nil {
|
|
specifier, err := makeLocalJWKS(local, p.Name)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
envoyCfg.JwksSourceSpecifier = specifier
|
|
} else if remote := p.JSONWebKeySet.Remote; remote != nil && remote.URI != "" {
|
|
envoyCfg.JwksSourceSpecifier = makeRemoteJWKS(remote, p.Name)
|
|
} else {
|
|
return nil, fmt.Errorf("invalid jwt provider config; missing JSONWebKeySet for provider: %s", p.Name)
|
|
}
|
|
|
|
for _, location := range p.Locations {
|
|
if location.Header != nil {
|
|
//only setting forward here because it is only useful for headers not the other options
|
|
envoyCfg.Forward = location.Header.Forward
|
|
envoyCfg.FromHeaders = append(envoyCfg.FromHeaders, &envoy_http_jwt_authn_v3.JwtHeader{
|
|
Name: location.Header.Name,
|
|
ValuePrefix: location.Header.ValuePrefix,
|
|
})
|
|
} else if location.QueryParam != nil {
|
|
envoyCfg.FromParams = append(envoyCfg.FromParams, location.QueryParam.Name)
|
|
} else if location.Cookie != nil {
|
|
envoyCfg.FromCookies = append(envoyCfg.FromCookies, location.Cookie.Name)
|
|
}
|
|
}
|
|
|
|
return &envoyCfg, nil
|
|
}
|
|
|
|
func makeLocalJWKS(l *structs.LocalJWKS, pName string) (*envoy_http_jwt_authn_v3.JwtProvider_LocalJwks, error) {
|
|
var specifier *envoy_http_jwt_authn_v3.JwtProvider_LocalJwks
|
|
if l.JWKS != "" {
|
|
decodedJWKS, err := base64.StdEncoding.DecodeString(l.JWKS)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
specifier = &envoy_http_jwt_authn_v3.JwtProvider_LocalJwks{
|
|
LocalJwks: &envoy_core_v3.DataSource{
|
|
Specifier: &envoy_core_v3.DataSource_InlineString{
|
|
InlineString: string(decodedJWKS),
|
|
},
|
|
},
|
|
}
|
|
} else if l.Filename != "" {
|
|
specifier = &envoy_http_jwt_authn_v3.JwtProvider_LocalJwks{
|
|
LocalJwks: &envoy_core_v3.DataSource{
|
|
Specifier: &envoy_core_v3.DataSource_Filename{
|
|
Filename: l.Filename,
|
|
},
|
|
},
|
|
}
|
|
} else {
|
|
return nil, fmt.Errorf("invalid jwt provider config; missing JWKS/Filename for local provider: %s", pName)
|
|
}
|
|
|
|
return specifier, nil
|
|
}
|
|
|
|
func makeRemoteJWKS(r *structs.RemoteJWKS, providerName string) *envoy_http_jwt_authn_v3.JwtProvider_RemoteJwks {
|
|
remote_specifier := envoy_http_jwt_authn_v3.JwtProvider_RemoteJwks{
|
|
RemoteJwks: &envoy_http_jwt_authn_v3.RemoteJwks{
|
|
HttpUri: &envoy_core_v3.HttpUri{
|
|
Uri: r.URI,
|
|
HttpUpstreamType: &envoy_core_v3.HttpUri_Cluster{Cluster: makeJWKSClusterName(providerName)},
|
|
},
|
|
AsyncFetch: &envoy_http_jwt_authn_v3.JwksAsyncFetch{
|
|
FastListener: r.FetchAsynchronously,
|
|
},
|
|
},
|
|
}
|
|
timeOutSecond := int64(r.RequestTimeoutMs) / 1000
|
|
remote_specifier.RemoteJwks.HttpUri.Timeout = &durationpb.Duration{Seconds: timeOutSecond}
|
|
cacheDuration := int64(r.CacheDuration)
|
|
if cacheDuration > 0 {
|
|
remote_specifier.RemoteJwks.CacheDuration = &durationpb.Duration{Seconds: cacheDuration}
|
|
}
|
|
|
|
p := buildJWTRetryPolicy(r.RetryPolicy)
|
|
if p != nil {
|
|
remote_specifier.RemoteJwks.RetryPolicy = p
|
|
}
|
|
|
|
return &remote_specifier
|
|
}
|
|
|
|
func makeJWKSClusterName(providerName string) string {
|
|
return fmt.Sprintf("%s_%s", jwksClusterPrefix, providerName)
|
|
}
|
|
|
|
func buildJWTRetryPolicy(r *structs.JWKSRetryPolicy) *envoy_core_v3.RetryPolicy {
|
|
var pol envoy_core_v3.RetryPolicy
|
|
if r == nil {
|
|
return nil
|
|
}
|
|
|
|
if r.RetryPolicyBackOff != nil {
|
|
pol.RetryBackOff = &envoy_core_v3.BackoffStrategy{
|
|
BaseInterval: structs.DurationToProto(r.RetryPolicyBackOff.BaseInterval),
|
|
MaxInterval: structs.DurationToProto(r.RetryPolicyBackOff.MaxInterval),
|
|
}
|
|
}
|
|
|
|
pol.NumRetries = &wrapperspb.UInt32Value{
|
|
Value: uint32(r.NumRetries),
|
|
}
|
|
|
|
return &pol
|
|
}
|
|
|
|
func hasJWTconfig(p []*structs.IntentionPermission) bool {
|
|
for _, perm := range p {
|
|
if perm.JWT != nil {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|