Skip to content

Commit

Permalink
Issue #59, Revised and Refactored SubjectInfo to drop use of redundan…
Browse files Browse the repository at this point in the history 
…t Members element

Signed-off-by: Phil Hunt <phil.hunt@independentid.com>
  • Loading branch information
@independentid
independentid committed Sep 6, 2024
1 parent 60abf69 commit 710b217
Show file tree
Hide file tree
Showing 45 changed files with 3,292 additions and 3,178 deletions.
2 changes: 1 addition & 1 deletion cmd/hexa/hexa_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ func (suite *testSuite) Test05_SetPolicies() {
testPolicyMods[0].Actions = append(policy.Actions, newAction)

// 3rd policy has a different subject
testPolicyMods[1].Subject.Members = testPolicyMods[1].Subject.Members[1:]
testPolicyMods[1].Subjects = testPolicyMods[1].Subjects[1:]

// 4th policy unchanged.

Expand Down
75 changes: 49 additions & 26 deletions cmd/hexa/test/example_idql.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
{
"policies": [
{
"meta": {"version": "0.6"},
"actions": [{"actionUri": "http:GET:/"}],
"subject": {
"members": [
"allusers", "allauthenticated"
]
"meta": {
"version": "0.6"
},
"actions": [
{
"actionUri": "http:GET:/"
}
],
"subjects": [
"allusers",
"allauthenticated"
],
"condition": {
"rule": "req.ip sw 127 and req.method eq POST",
"action": "allow"
Expand All @@ -17,27 +22,41 @@
}
},
{
"meta": {"version": "0.6"},
"actions": [{"actionUri": "http:GET:/sales"}, {"actionUri": "http:GET:/marketing"}],
"subject": {
"members": [
"allauthenticated",
"sales@hexaindustries.io",
"marketing@hexaindustries.io"
]
"meta": {
"version": "0.6"
},
"actions": [
{
"actionUri": "http:GET:/sales"
},
{
"actionUri": "http:GET:/marketing"
}
],
"subjects": [
"allauthenticated",
"sales@hexaindustries.io",
"marketing@hexaindustries.io"
],
"object": {
"resource_id": "aResourceId2"
}
},
{
"meta": {"version": "0.6"},
"actions": [{"actionUri": "http:GET:/accounting"}, {"actionUri": "http:POST:/accounting"}],
"subject": {
"members": [
"accounting@hexaindustries.io"
]
"meta": {
"version": "0.6"
},
"actions": [
{
"actionUri": "http:GET:/accounting"
},
{
"actionUri": "http:POST:/accounting"
}
],
"subjects": [
"accounting@hexaindustries.io"
],
"condition": {
"rule": "req.ip sw 127 and req.method eq POST",
"action": "allow"
Expand All @@ -47,13 +66,17 @@
}
},
{
"meta": {"version": "0.6"},
"actions": [{"actionUri": "http:GET:/humanresources"}],
"subject": {
"members": [
"humanresources@hexaindustries.io"
]
"meta": {
"version": "0.6"
},
"actions": [
{
"actionUri": "http:GET:/humanresources"
}
],
"subjects": [
"humanresources@hexaindustries.io"
],
"object": {
"resource_id": "aResourceId1"
}
Expand Down
78 changes: 39 additions & 39 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ require (
github.com/alecthomas/kong v0.9.0
github.com/alecthomas/participle/v2 v2.1.1
github.com/alexedwards/scs/v2 v2.8.0
github.com/aws/aws-sdk-go-v2 v1.30.4
github.com/aws/aws-sdk-go-v2/config v1.27.29
github.com/aws/aws-sdk-go-v2/credentials v1.17.29
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.14.11
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.43.2
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.5
github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1
github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.17.4
github.com/aws/aws-sdk-go-v2 v1.30.5
github.com/aws/aws-sdk-go-v2/config v1.27.33
github.com/aws/aws-sdk-go-v2/credentials v1.17.32
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.2
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.43.4
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.8
github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2
github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.17.6
github.com/cedar-policy/cedar-go v0.1.0
github.com/chzyer/readline v1.5.1
github.com/coreos/go-oidc/v3 v3.11.0
Expand All @@ -33,42 +33,42 @@ require (
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.1
github.com/hhsnopek/etag v0.0.0-20171206181245-aea95f647346
github.com/prometheus/client_golang v1.20.1
github.com/prometheus/client_golang v1.20.3
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1
github.com/stretchr/testify v1.9.0
golang.org/x/exp v0.0.0-20240822175202-778ce7bba035
golang.org/x/oauth2 v0.22.0
google.golang.org/api v0.194.0
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e
golang.org/x/oauth2 v0.23.0
google.golang.org/api v0.196.0
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1
)

require (
cloud.google.com/go/auth v0.9.1 // indirect
cloud.google.com/go/auth v0.9.3 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/alecthomas/repr v0.4.0 // indirect
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 // indirect
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.22.5 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 // indirect
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.22.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.17 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.18 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.22.7 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.30.7 // indirect
github.com/aws/smithy-go v1.20.4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cncf/xds/go v0.0.0-20240822171458-6449f94b4d59 // indirect
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/gabriel-vasile/mimetype v1.4.5 // indirect
Expand All @@ -79,7 +79,7 @@ require (
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
github.com/hexops/gotextdiff v1.0.3 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
Expand All @@ -90,23 +90,23 @@ require (
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/common v0.59.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/tj/assert v0.0.3 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.6.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.66.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 710b217

Please sign in to comment.