Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: replace ioutils.ReadFile functions by os.ReadFile due to deprecation #114

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions examples/rbac_with_domains_model.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[request_definition]
r = sub, dom, obj, act

[policy_definition]
p = sub, dom, obj, act

[role_definition]
g = _, _, _

[policy_effect]
e = some(where (p.eft == allow))

[matchers]
m = g(r.sub, p.sub, r.dom) && r.dom == p.dom && r.obj == p.obj && r.act == p.act
6 changes: 6 additions & 0 deletions examples/rbac_with_domains_policy.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
p, admin, domain1, data1, read
p, admin, domain1, data1, write
p, admin, domain2, data2, read
p, admin, domain2, data2, write
g, alice, admin, domain1
g, bob, admin, domain2
4 changes: 2 additions & 2 deletions server/enforcer.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package server
import (
"context"
"errors"
"io/ioutil"
"os"
"strings"
"sync"

Expand Down Expand Up @@ -98,7 +98,7 @@ func (s *Server) NewEnforcer(ctx context.Context, in *pb.NewEnforcerRequest) (*p

if in.ModelText == "" {
cfg := LoadConfiguration(getLocalConfigPath())
data, err := ioutil.ReadFile(cfg.Enforcer)
data, err := os.ReadFile(cfg.Enforcer)
if err != nil {
return &pb.NewEnforcerReply{Handler: 0}, err
}
Expand Down
8 changes: 4 additions & 4 deletions server/model_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package server

import (
"context"
"io/ioutil"
"os"
"testing"

pb "github.com/casbin/casbin-server/proto"
Expand Down Expand Up @@ -54,7 +54,7 @@ func TestRBACModel(t *testing.T) {
t.Error(err)
}

modelText, err := ioutil.ReadFile("../examples/rbac_model.conf")
modelText, err := os.ReadFile("../examples/rbac_model.conf")
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -85,7 +85,7 @@ func TestABACModel(t *testing.T) {
s := NewServer()
ctx := context.Background()

modelText, err := ioutil.ReadFile("../examples/abac_model.conf")
modelText, err := os.ReadFile("../examples/abac_model.conf")
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -117,7 +117,7 @@ func TestABACModel(t *testing.T) {
func testModel(t *testing.T, s *Server, enforcerHandler int32, sub string, obj string, act string, res bool) {
t.Helper()

reply, err := s.Enforce(nil, &pb.EnforceRequest{EnforcerHandler: enforcerHandler, Params: []string{sub, obj, act}})
reply, err := s.Enforce(context.TODO(), &pb.EnforceRequest{EnforcerHandler: enforcerHandler, Params: []string{sub, obj, act}})
assert.NoError(t, err)

if reply.Res != res {
Expand Down
19 changes: 19 additions & 0 deletions server/rbac_api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,3 +239,22 @@ func TestPermissionAPI(t *testing.T) {
testEnforceWithoutUsers(t, e, "bob", "read", false)
testEnforceWithoutUsers(t, e, "bob", "write", false)
}

func testGetDomains(t *testing.T, e *testEngine, name string, res []string) {
t.Helper()
reply, err := e.s.GetDomains(e.ctx, &pb.UserRoleRequest{EnforcerHandler: e.h, User: name})
assert.NoError(t, err)

t.Log("Domains for ", name, ": ", reply.Array)

if !util.SetEquals(res, reply.Array) {
t.Error("Domains for ", name, ": ", reply.Array, ", supposed to be ", res)
}
}

func TestRoleDomainAPI(t *testing.T) {
e := newTestEngine(t, "file", "../examples/rbac_with_domains_policy.csv", "../examples/rbac_with_domains_model.conf")

testGetDomains(t, e, "alice", []string{"domain1"})
testGetDomains(t, e, "bob", []string{"domain2"})
}
Loading