-
Notifications
You must be signed in to change notification settings - Fork 118
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refact: use protoreflect to convert check request
Signed-off-by: Anthony Regeda <regedaster@gmail.com>
- Loading branch information
Showing
6 changed files
with
202 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| package envoyauth | ||
|
|
||
| import ( | ||
| "google.golang.org/protobuf/reflect/protoreflect" | ||
| ) | ||
|
|
||
| // protomap converts protobuf message into map[string]any type using json names. | ||
| func protomap(msg protoreflect.Message) map[string]any { | ||
| v := msg.Interface() | ||
| // handle structpb.Struct | ||
| if mapper, ok := v.(interface{ AsMap() map[string]any }); ok { | ||
| return mapper.AsMap() | ||
| } | ||
|
|
||
| result := make(map[string]any, msg.Descriptor().Fields().Len()) | ||
|
|
||
| msg.Range(func(fd protoreflect.FieldDescriptor, value protoreflect.Value) bool { | ||
| name := fd.JSONName() | ||
|
|
||
| switch { | ||
| case fd.IsMap(): | ||
| mapValue := value.Map() | ||
| mapResult := make(map[string]any, mapValue.Len()) | ||
| if fd.MapValue().Kind() == protoreflect.MessageKind { | ||
| mapValue.Range(func(key protoreflect.MapKey, val protoreflect.Value) bool { | ||
| mapResult[key.String()] = protomap(val.Message()) | ||
| return true | ||
| }) | ||
| } else { | ||
| mapValue.Range(func(key protoreflect.MapKey, val protoreflect.Value) bool { | ||
| mapResult[key.String()] = val.Interface() | ||
| return true | ||
| }) | ||
| } | ||
| result[name] = mapResult | ||
|
|
||
| case fd.IsList(): | ||
| list := value.List() | ||
| listResult := make([]any, list.Len()) | ||
| for i := 0; i < list.Len(); i++ { | ||
| elem := list.Get(i) | ||
| if fd.Kind() == protoreflect.MessageKind { | ||
| listResult[i] = protomap(elem.Message()) | ||
| } else { | ||
| listResult[i] = elem.Interface() | ||
| } | ||
| } | ||
| result[name] = listResult | ||
|
|
||
| case fd.Kind() == protoreflect.MessageKind: | ||
| result[name] = protomap(value.Message()) | ||
| default: | ||
| result[name] = value.Interface() | ||
| } | ||
|
|
||
| return true | ||
| }) | ||
|
|
||
| return result | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| package envoyauth | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "google.golang.org/protobuf/encoding/protojson" | ||
|
|
||
| ext_authz "github.com/envoyproxy/go-control-plane/envoy/service/auth/v3" | ||
| ) | ||
|
|
||
| const extAuthzRequest = `{ | ||
| "attributes": { | ||
| "source": { | ||
| "address": { | ||
| "socketAddress": { | ||
| "address": "127.0.0.1" | ||
| } | ||
| }, | ||
| "service": "dummy", | ||
| "labels": { | ||
| "foo": "bar" | ||
| } | ||
| }, | ||
| "metadataContext": { | ||
| "filterMetadata": { | ||
| "dummy": { | ||
| "hello": "world", | ||
| "count": 1 | ||
| } | ||
| } | ||
| }, | ||
| "contextExtensions": { | ||
| "hello": "world" | ||
| }, | ||
| "request": { | ||
| "http": { | ||
| "id": "13359530607844510314", | ||
| "method": "GET", | ||
| "headers": { | ||
| ":authority": "192.168.99.100:31380", | ||
| ":method": "GET", | ||
| ":path": "/api/v1/products", | ||
| "accept": "*/*" | ||
| }, | ||
| "path": "/api/v1/products", | ||
| "host": "192.168.99.100:31380", | ||
| "protocol": "HTTP/1.1", | ||
| "body": "{\"firstname\": \"foo\", \"lastname\": \"bar\"}" | ||
| } | ||
| } | ||
| } | ||
| }` | ||
|
|
||
| func Test_protomap(t *testing.T) { | ||
| var req ext_authz.CheckRequest | ||
|
|
||
| if err := protojson.Unmarshal([]byte(extAuthzRequest), &req); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| result := protomap(req.ProtoReflect()) | ||
|
|
||
| if result == nil { | ||
| t.Fatal("not nil expected") | ||
| } | ||
|
|
||
| assertMap(t, result, map[string]any{ | ||
| "attributes": map[string]any{ | ||
| "source": map[string]any{ | ||
| "service": "dummy", | ||
| "labels": map[string]any{ | ||
| "foo": "bar", | ||
| }, | ||
| "address": map[string]any{ | ||
| "socketAddress": map[string]any{ | ||
| "address": "127.0.0.1", | ||
| }, | ||
| }, | ||
| }, | ||
| "metadataContext": map[string]any{ | ||
| "filterMetadata": map[string]any{ | ||
| "dummy": map[string]any{ | ||
| "hello": "world", | ||
| "count": float64(1), | ||
| }, | ||
| }, | ||
| }, | ||
| "contextExtensions": map[string]any{ | ||
| "hello": "world", | ||
| }, | ||
| "request": map[string]any{ | ||
| "http": map[string]any{ | ||
| "id": "13359530607844510314", | ||
| "method": "GET", | ||
| "path": "/api/v1/products", | ||
| "host": "192.168.99.100:31380", | ||
| "protocol": "HTTP/1.1", | ||
| "body": "{\"firstname\": \"foo\", \"lastname\": \"bar\"}", | ||
| "headers": map[string]any{ | ||
| ":authority": "192.168.99.100:31380", | ||
| ":method": "GET", | ||
| ":path": "/api/v1/products", | ||
| "accept": "*/*", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func assertMap(t *testing.T, actual map[string]any, expected map[string]any) { | ||
| t.Helper() | ||
| if len(actual) != len(expected) { | ||
| t.Fatalf("different len of maps, actual %v, expected %v", actual, expected) | ||
| } | ||
| for k, ev := range expected { | ||
| av, ok := actual[k] | ||
| if !ok { | ||
| t.Fatalf("expected key %s not found", k) | ||
| } | ||
| if em, ok := ev.(map[string]any); ok { | ||
| am, ok := av.(map[string]any) | ||
| if !ok { | ||
| t.Fatalf("both values must be map[string]any, actual %T", av) | ||
| } | ||
| assertMap(t, em, am) | ||
| } else if ev != av { | ||
| t.Fatalf("values of key %s are different, actual %v (%[2]T), expected %v (%[3]T)", k, av, ev) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| module github.com/open-policy-agent/opa-envoy-plugin | ||
|
|
||
| go 1.22.0 | ||
|
|
||
| toolchain go1.23.1 | ||
|
|
||
| require ( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters