Added new header to capture customattributes

server/authorization_test.go

@@ -362,14 +362,15 @@ func TestImmediateAnalytics(t *testing.T) {
 
 	testAuthMan := &testAuthMan{}
 	ac := &auth.Context{
-		ClientID:       "client id",
-		AccessToken:    "token",
-		Application:    "app",
-		APIProducts:    []string{"product1"},
-		Expires:        time.Now(),
-		DeveloperEmail: "email",
-		Scopes:         []string{"scope"},
-		APIKey:         "apikey",
+		ClientID:         "client id",
+		AccessToken:      "token",
+		Application:      "app",
+		APIProducts:      []string{"product1"},
+		Expires:          time.Now(),
+		DeveloperEmail:   "email",
+		Scopes:           []string{"scope"},
+		APIKey:           "apikey",
+		CustomAttributes: "{\"tier\":\"standard\"}",
 	}
 	testAuthMan.sendAuth(ac, auth.ErrBadAuth)
 

server/header_context.go

@@ -38,6 +38,7 @@ func makeMetadataHeaders(api string, ac *auth.Context, authorized bool) []*core.
 		header(headerEnvironment, ac.Environment()),
 		header(headerOrganization, ac.Organization()),
 		header(headerScope, strings.Join(ac.Scopes, " ")),
+		header(headerCustomAttributes, ac.CustomAttributes),
 	}
 
 	if authorized {
@@ -77,12 +78,13 @@ func (h *Handler) decodeMetadataHeaders(headers map[string]string) (string, *aut
 	}
 
 	return api, &auth.Context{
-		Context:        rootContext,
-		AccessToken:    headers[headerAccessToken],
-		APIProducts:    strings.Split(headers[headerAPIProducts], ","),
-		Application:    headers[headerApplication],
-		ClientID:       headers[headerClientID],
-		DeveloperEmail: headers[headerDeveloperEmail],
-		Scopes:         strings.Split(headers[headerScope], " "),
+		Context:          rootContext,
+		AccessToken:      headers[headerAccessToken],
+		APIProducts:      strings.Split(headers[headerAPIProducts], ","),
+		Application:      headers[headerApplication],
+		ClientID:         headers[headerClientID],
+		DeveloperEmail:   headers[headerDeveloperEmail],
+		Scopes:           strings.Split(headers[headerScope], " "),
+		CustomAttributes: headers[headerCustomAttributes],
 	}
 }

server/header_context_test.go

@@ -34,13 +34,14 @@ func TestMetadataHeaders(t *testing.T) {
 		"env",
 	}
 	authContext := &auth.Context{
-		Context:        h,
-		ClientID:       "clientid",
-		AccessToken:    "accesstoken",
-		Application:    "application",
-		APIProducts:    []string{"prod1", "prod2"},
-		DeveloperEmail: "dev@google.com",
-		Scopes:         []string{"scope1", "scope2"},
+		Context:          h,
+		ClientID:         "clientid",
+		AccessToken:      "accesstoken",
+		Application:      "application",
+		APIProducts:      []string{"prod1", "prod2"},
+		DeveloperEmail:   "dev@google.com",
+		Scopes:           []string{"scope1", "scope2"},
+		CustomAttributes: "{\"tier\":\"standard\"}",
 	}
 	api := "api"
 	opts = makeMetadataHeaders(api, authContext, true)
@@ -61,6 +62,7 @@ func TestMetadataHeaders(t *testing.T) {
 	equal(headerApplication, authContext.Application)
 	equal(headerClientID, authContext.ClientID)
 	equal(headerDeveloperEmail, authContext.DeveloperEmail)
+	equal(headerCustomAttributes, authContext.CustomAttributes)
 	equal(headerEnvironment, authContext.Environment())
 	equal(headerOrganization, authContext.Organization())
 	equal(headerScope, strings.Join(authContext.Scopes, " "))

server/metadata_context.go

@@ -26,16 +26,17 @@ import (
 const (
 	extAuthzFilterNamespace = "envoy.filters.http.ext_authz"
 
-	headerAuthorized     = "x-apigee-authorized"
-	headerAccessToken    = "x-apigee-accesstoken"
-	headerAPI            = "x-apigee-api"
-	headerAPIProducts    = "x-apigee-apiproducts"
-	headerApplication    = "x-apigee-application"
-	headerClientID       = "x-apigee-clientid"
-	headerDeveloperEmail = "x-apigee-developeremail"
-	headerEnvironment    = "x-apigee-environment"
-	headerOrganization   = "x-apigee-organization"
-	headerScope          = "x-apigee-scope"
+	headerAuthorized       = "x-apigee-authorized"
+	headerAccessToken      = "x-apigee-accesstoken"
+	headerAPI              = "x-apigee-api"
+	headerAPIProducts      = "x-apigee-apiproducts"
+	headerApplication      = "x-apigee-application"
+	headerClientID         = "x-apigee-clientid"
+	headerDeveloperEmail   = "x-apigee-developeremail"
+	headerEnvironment      = "x-apigee-environment"
+	headerOrganization     = "x-apigee-organization"
+	headerScope            = "x-apigee-scope"
+	headerCustomAttributes = "x-apigee-customattributes"
 )
 
 // encodeExtAuthzMetadata encodes given api and auth context into
@@ -46,15 +47,16 @@ func encodeExtAuthzMetadata(api string, ac *auth.Context, authorized bool) *stru
 	}
 
 	fields := map[string]*structpb.Value{
-		headerAccessToken:    stringValueFrom(ac.AccessToken),
-		headerAPI:            stringValueFrom(api),
-		headerAPIProducts:    stringValueFrom(strings.Join(ac.APIProducts, ",")),
-		headerApplication:    stringValueFrom(ac.Application),
-		headerClientID:       stringValueFrom(ac.ClientID),
-		headerDeveloperEmail: stringValueFrom(ac.DeveloperEmail),
-		headerEnvironment:    stringValueFrom(ac.Environment()),
-		headerOrganization:   stringValueFrom(ac.Organization()),
-		headerScope:          stringValueFrom(strings.Join(ac.Scopes, " ")),
+		headerAccessToken:      stringValueFrom(ac.AccessToken),
+		headerAPI:              stringValueFrom(api),
+		headerAPIProducts:      stringValueFrom(strings.Join(ac.APIProducts, ",")),
+		headerApplication:      stringValueFrom(ac.Application),
+		headerClientID:         stringValueFrom(ac.ClientID),
+		headerDeveloperEmail:   stringValueFrom(ac.DeveloperEmail),
+		headerEnvironment:      stringValueFrom(ac.Environment()),
+		headerOrganization:     stringValueFrom(ac.Organization()),
+		headerScope:            stringValueFrom(strings.Join(ac.Scopes, " ")),
+		headerCustomAttributes: stringValueFrom(ac.CustomAttributes),
 	}
 	if authorized {
 		fields[headerAuthorized] = stringValueFrom("true")
@@ -119,12 +121,13 @@ func (h *Handler) decodeExtAuthzMetadata(fields map[string]*structpb.Value) (str
 	}
 
 	return api, &auth.Context{
-		Context:        rootContext,
-		AccessToken:    fields[headerAccessToken].GetStringValue(),
-		APIProducts:    strings.Split(fields[headerAPIProducts].GetStringValue(), ","),
-		Application:    fields[headerApplication].GetStringValue(),
-		ClientID:       fields[headerClientID].GetStringValue(),
-		DeveloperEmail: fields[headerDeveloperEmail].GetStringValue(),
-		Scopes:         strings.Split(fields[headerScope].GetStringValue(), " "),
+		Context:          rootContext,
+		AccessToken:      fields[headerAccessToken].GetStringValue(),
+		APIProducts:      strings.Split(fields[headerAPIProducts].GetStringValue(), ","),
+		Application:      fields[headerApplication].GetStringValue(),
+		ClientID:         fields[headerClientID].GetStringValue(),
+		DeveloperEmail:   fields[headerDeveloperEmail].GetStringValue(),
+		Scopes:           strings.Split(fields[headerScope].GetStringValue(), " "),
+		CustomAttributes: fields[headerCustomAttributes].GetStringValue(),
 	}
 }

server/metadata_context_test.go

@@ -33,13 +33,14 @@ func TestEncodeMetadata(t *testing.T) {
 		"env",
 	}
 	authContext := &auth.Context{
-		Context:        h,
-		ClientID:       "clientid",
-		AccessToken:    "accesstoken",
-		Application:    "application",
-		APIProducts:    []string{"prod1", "prod2"},
-		DeveloperEmail: "dev@google.com",
-		Scopes:         []string{"scope1", "scope2"},
+		Context:          h,
+		ClientID:         "clientid",
+		AccessToken:      "accesstoken",
+		Application:      "application",
+		APIProducts:      []string{"prod1", "prod2"},
+		DeveloperEmail:   "dev@google.com",
+		Scopes:           []string{"scope1", "scope2"},
+		CustomAttributes: "{\"tier\":\"standard\"}",
 	}
 	api := "api"
 	metadata := encodeExtAuthzMetadata(api, authContext, true)
@@ -63,6 +64,7 @@ func TestEncodeMetadata(t *testing.T) {
 	equal(headerEnvironment, authContext.Environment())
 	equal(headerOrganization, authContext.Organization())
 	equal(headerScope, strings.Join(authContext.Scopes, " "))
+	equal(headerCustomAttributes, authContext.CustomAttributes)
 
 	api2, ac2 := h.decodeExtAuthzMetadata(metadata.GetFields())
 	if api != api2 {
@@ -86,13 +88,14 @@ func TestEncodeMetadataAuthorizedField(t *testing.T) {
 		envName: "env",
 	}
 	authContext := &auth.Context{
-		Context:        h,
-		ClientID:       "clientid",
-		AccessToken:    "accesstoken",
-		Application:    "application",
-		APIProducts:    []string{"prod1", "prod2"},
-		DeveloperEmail: "dev@google.com",
-		Scopes:         []string{"scope1", "scope2"},
+		Context:          h,
+		ClientID:         "clientid",
+		AccessToken:      "accesstoken",
+		Application:      "application",
+		APIProducts:      []string{"prod1", "prod2"},
+		DeveloperEmail:   "dev@google.com",
+		Scopes:           []string{"scope1", "scope2"},
+		CustomAttributes: "",
 	}
 
 	metadata := encodeExtAuthzMetadata("api", authContext, true)