grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds/bootstrap: escape authority when populating resource name template (#5160)

This commit is contained in:
Menghan Li 2022-01-25 14:55:48 -08:00 committed by GitHub
parent 231ca3b24e
commit e27717498d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xds/internal/xdsclient/bootstrap/bootstrap.go
View File

@ -25,6 +25,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/url"
"strings" "strings"
"github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/jsonpb"
@ -401,7 +402,7 @@ func NewConfigFromContents(data []byte) (*Config, error) {
// - if set, it must start with "xdstp://<authority_name>/" // - if set, it must start with "xdstp://<authority_name>/"
// - if not set, it defaults to "xdstp://<authority_name>/envoy.config.listener.v3.Listener/%s" // - if not set, it defaults to "xdstp://<authority_name>/envoy.config.listener.v3.Listener/%s"
for name, authority := range config.Authorities { for name, authority := range config.Authorities {
prefix := fmt.Sprintf("xdstp://%s", name) prefix := fmt.Sprintf("xdstp://%s", url.PathEscape(name))
if authority.ClientListenerResourceNameTemplate == "" { if authority.ClientListenerResourceNameTemplate == "" {
authority.ClientListenerResourceNameTemplate = prefix + "/envoy.config.listener.v3.Listener/%s" authority.ClientListenerResourceNameTemplate = prefix + "/envoy.config.listener.v3.Listener/%s"
continue continue

6
xds/internal/xdsclient/bootstrap/bootstrap_test.go
View File

@ -862,7 +862,8 @@ func TestNewConfigWithFederation(t *testing.T) {
}], }],
"client_default_listener_resource_name_template": "xdstp://xds.example.com/envoy.config.listener.v3.Listener/%s", "client_default_listener_resource_name_template": "xdstp://xds.example.com/envoy.config.listener.v3.Listener/%s",
"authorities": { "authorities": {
"xds.td.com": { } "xds.td.com": { },
"#.com": { }
} }
}`, }`,
// It's OK for an authority to not have servers. The top-level server // It's OK for an authority to not have servers. The top-level server
@ -956,6 +957,9 @@ func TestNewConfigWithFederation(t *testing.T) {
"xds.td.com": { "xds.td.com": {
ClientListenerResourceNameTemplate: "xdstp://xds.td.com/envoy.config.listener.v3.Listener/%s", ClientListenerResourceNameTemplate: "xdstp://xds.td.com/envoy.config.listener.v3.Listener/%s",
}, },
"#.com": {
ClientListenerResourceNameTemplate: "xdstp://%23.com/envoy.config.listener.v3.Listener/%s",
},
}, },
}, },
}, },