Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
C
casbin-pg-adapter
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Abby Cin
casbin-pg-adapter
Commits
7223ed5c
Commit
7223ed5c
authored
Dec 28, 2019
by
khoipham
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SavePolicy now drop all previous data
parent
19ee6270
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
12 deletions
+75
-12
adapter.go
adapter.go
+6
-1
adapter_test.go
adapter_test.go
+69
-11
No files found.
adapter.go
View file @
7223ed5c
...
@@ -190,6 +190,11 @@ func savePolicyLine(ptype string, rule []string) *CasbinRule {
...
@@ -190,6 +190,11 @@ func savePolicyLine(ptype string, rule []string) *CasbinRule {
// SavePolicy saves policy to database.
// SavePolicy saves policy to database.
func
(
a
*
Adapter
)
SavePolicy
(
model
model
.
Model
)
error
{
func
(
a
*
Adapter
)
SavePolicy
(
model
model
.
Model
)
error
{
_
,
err
:=
a
.
db
.
Model
((
*
CasbinRule
)(
nil
))
.
Where
(
"id IS NOT NULL"
)
.
Delete
()
if
err
!=
nil
{
return
err
}
var
lines
[]
*
CasbinRule
var
lines
[]
*
CasbinRule
for
ptype
,
ast
:=
range
model
[
"p"
]
{
for
ptype
,
ast
:=
range
model
[
"p"
]
{
...
@@ -206,7 +211,7 @@ func (a *Adapter) SavePolicy(model model.Model) error {
...
@@ -206,7 +211,7 @@ func (a *Adapter) SavePolicy(model model.Model) error {
}
}
}
}
_
,
err
:
=
a
.
db
.
Model
(
&
lines
)
.
_
,
err
=
a
.
db
.
Model
(
&
lines
)
.
OnConflict
(
"DO NOTHING"
)
.
OnConflict
(
"DO NOTHING"
)
.
Insert
()
Insert
()
return
err
return
err
...
...
adapter_test.go
View file @
7223ed5c
...
@@ -56,7 +56,10 @@ func (s *AdapterTestSuite) TearDownTest() {
...
@@ -56,7 +56,10 @@ func (s *AdapterTestSuite) TearDownTest() {
func
(
s
*
AdapterTestSuite
)
TestSaveLoad
()
{
func
(
s
*
AdapterTestSuite
)
TestSaveLoad
()
{
s
.
Assert
()
.
False
(
s
.
e
.
IsFiltered
())
s
.
Assert
()
.
False
(
s
.
e
.
IsFiltered
())
s
.
assertPolicy
([][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
}},
s
.
e
.
GetPolicy
())
s
.
assertPolicy
(
[][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
}},
s
.
e
.
GetPolicy
(),
)
}
}
func
(
s
*
AdapterTestSuite
)
TestAutoSave
()
{
func
(
s
*
AdapterTestSuite
)
TestAutoSave
()
{
...
@@ -72,7 +75,10 @@ func (s *AdapterTestSuite) TestAutoSave() {
...
@@ -72,7 +75,10 @@ func (s *AdapterTestSuite) TestAutoSave() {
err
=
s
.
e
.
LoadPolicy
()
err
=
s
.
e
.
LoadPolicy
()
s
.
Require
()
.
NoError
(
err
)
s
.
Require
()
.
NoError
(
err
)
// This is still the original policy.
// This is still the original policy.
s
.
assertPolicy
([][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
}},
s
.
e
.
GetPolicy
())
s
.
assertPolicy
(
[][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
}},
s
.
e
.
GetPolicy
(),
)
// Now we enable the AutoSave.
// Now we enable the AutoSave.
s
.
e
.
EnableAutoSave
(
true
)
s
.
e
.
EnableAutoSave
(
true
)
...
@@ -85,14 +91,20 @@ func (s *AdapterTestSuite) TestAutoSave() {
...
@@ -85,14 +91,20 @@ func (s *AdapterTestSuite) TestAutoSave() {
err
=
s
.
e
.
LoadPolicy
()
err
=
s
.
e
.
LoadPolicy
()
s
.
Require
()
.
NoError
(
err
)
s
.
Require
()
.
NoError
(
err
)
// The policy has a new rule: {"alice", "data1", "write"}.
// The policy has a new rule: {"alice", "data1", "write"}.
s
.
assertPolicy
([][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
},
{
"alice"
,
"data1"
,
"write"
}},
s
.
e
.
GetPolicy
())
s
.
assertPolicy
(
[][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
},
{
"alice"
,
"data1"
,
"write"
}},
s
.
e
.
GetPolicy
(),
)
// Aditional AddPolicy have no effect
// Aditional AddPolicy have no effect
_
,
err
=
s
.
e
.
AddPolicy
(
"alice"
,
"data1"
,
"write"
)
_
,
err
=
s
.
e
.
AddPolicy
(
"alice"
,
"data1"
,
"write"
)
s
.
Require
()
.
NoError
(
err
)
s
.
Require
()
.
NoError
(
err
)
err
=
s
.
e
.
LoadPolicy
()
err
=
s
.
e
.
LoadPolicy
()
s
.
Require
()
.
NoError
(
err
)
s
.
Require
()
.
NoError
(
err
)
s
.
assertPolicy
([][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
},
{
"alice"
,
"data1"
,
"write"
}},
s
.
e
.
GetPolicy
())
s
.
assertPolicy
(
[][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
},
{
"alice"
,
"data1"
,
"write"
}},
s
.
e
.
GetPolicy
(),
)
s
.
Require
()
.
NoError
(
err
)
s
.
Require
()
.
NoError
(
err
)
}
}
...
@@ -107,31 +119,46 @@ func (s *AdapterTestSuite) TestConstructorOptions() {
...
@@ -107,31 +119,46 @@ func (s *AdapterTestSuite) TestConstructorOptions() {
s
.
e
,
err
=
casbin
.
NewEnforcer
(
"examples/rbac_model.conf"
,
a
)
s
.
e
,
err
=
casbin
.
NewEnforcer
(
"examples/rbac_model.conf"
,
a
)
s
.
Require
()
.
NoError
(
err
)
s
.
Require
()
.
NoError
(
err
)
s
.
assertPolicy
([][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
}},
s
.
e
.
GetPolicy
())
s
.
assertPolicy
(
[][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
}},
s
.
e
.
GetPolicy
(),
)
}
}
func
(
s
*
AdapterTestSuite
)
TestRemovePolicy
()
{
func
(
s
*
AdapterTestSuite
)
TestRemovePolicy
()
{
_
,
err
:=
s
.
e
.
RemovePolicy
(
"alice"
,
"data1"
,
"read"
)
_
,
err
:=
s
.
e
.
RemovePolicy
(
"alice"
,
"data1"
,
"read"
)
s
.
Require
()
.
NoError
(
err
)
s
.
Require
()
.
NoError
(
err
)
s
.
assertPolicy
([][]
string
{{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
}},
s
.
e
.
GetPolicy
())
s
.
assertPolicy
(
[][]
string
{{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
}},
s
.
e
.
GetPolicy
(),
)
err
=
s
.
e
.
LoadPolicy
()
err
=
s
.
e
.
LoadPolicy
()
s
.
Require
()
.
NoError
(
err
)
s
.
Require
()
.
NoError
(
err
)
s
.
assertPolicy
([][]
string
{{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
}},
s
.
e
.
GetPolicy
())
s
.
assertPolicy
(
[][]
string
{{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
}},
s
.
e
.
GetPolicy
(),
)
}
}
func
(
s
*
AdapterTestSuite
)
TestRemoveFilteredPolicy
()
{
func
(
s
*
AdapterTestSuite
)
TestRemoveFilteredPolicy
()
{
_
,
err
:=
s
.
e
.
RemoveFilteredPolicy
(
0
,
""
,
"data2"
)
_
,
err
:=
s
.
e
.
RemoveFilteredPolicy
(
0
,
""
,
"data2"
)
s
.
Require
()
.
NoError
(
err
)
s
.
Require
()
.
NoError
(
err
)
s
.
assertPolicy
([][]
string
{{
"alice"
,
"data1"
,
"read"
}},
s
.
e
.
GetPolicy
())
s
.
assertPolicy
(
[][]
string
{{
"alice"
,
"data1"
,
"read"
}},
s
.
e
.
GetPolicy
(),
)
err
=
s
.
e
.
LoadPolicy
()
err
=
s
.
e
.
LoadPolicy
()
s
.
Require
()
.
NoError
(
err
)
s
.
Require
()
.
NoError
(
err
)
s
.
assertPolicy
([][]
string
{{
"alice"
,
"data1"
,
"read"
}},
s
.
e
.
GetPolicy
())
s
.
assertPolicy
(
[][]
string
{{
"alice"
,
"data1"
,
"read"
}},
s
.
e
.
GetPolicy
(),
)
}
}
func
(
s
*
AdapterTestSuite
)
TestLoadFilteredPolicy
()
{
func
(
s
*
AdapterTestSuite
)
TestLoadFilteredPolicy
()
{
...
@@ -143,7 +170,10 @@ func (s *AdapterTestSuite) TestLoadFilteredPolicy() {
...
@@ -143,7 +170,10 @@ func (s *AdapterTestSuite) TestLoadFilteredPolicy() {
})
})
s
.
Require
()
.
NoError
(
err
)
s
.
Require
()
.
NoError
(
err
)
s
.
Assert
()
.
True
(
e
.
IsFiltered
())
s
.
Assert
()
.
True
(
e
.
IsFiltered
())
s
.
assertPolicy
([][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"read"
}},
e
.
GetPolicy
())
s
.
assertPolicy
(
[][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"read"
}},
e
.
GetPolicy
(),
)
}
}
func
(
s
*
AdapterTestSuite
)
TestLoadFilteredGroupingPolicy
()
{
func
(
s
*
AdapterTestSuite
)
TestLoadFilteredGroupingPolicy
()
{
...
@@ -176,7 +206,35 @@ func (s *AdapterTestSuite) TestLoadFilteredPolicyNilFilter() {
...
@@ -176,7 +206,35 @@ func (s *AdapterTestSuite) TestLoadFilteredPolicyNilFilter() {
s
.
Require
()
.
NoError
(
err
)
s
.
Require
()
.
NoError
(
err
)
s
.
Assert
()
.
False
(
e
.
IsFiltered
())
s
.
Assert
()
.
False
(
e
.
IsFiltered
())
s
.
assertPolicy
([][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
}},
s
.
e
.
GetPolicy
())
s
.
assertPolicy
(
[][]
string
{{
"alice"
,
"data1"
,
"read"
},
{
"bob"
,
"data2"
,
"write"
},
{
"data2_admin"
,
"data2"
,
"read"
},
{
"data2_admin"
,
"data2"
,
"write"
}},
s
.
e
.
GetPolicy
(),
)
}
func
(
s
*
AdapterTestSuite
)
TestSavePolicyClearPreviousData
()
{
s
.
e
.
EnableAutoSave
(
false
)
policies
:=
s
.
e
.
GetPolicy
()
// clone slice to avoid shufling elements
policies
=
append
(
policies
[
:
0
:
0
],
policies
...
)
for
_
,
p
:=
range
policies
{
_
,
err
:=
s
.
e
.
RemovePolicy
(
p
)
s
.
Require
()
.
NoError
(
err
)
}
s
.
assertPolicy
(
[][]
string
{},
s
.
e
.
GetPolicy
(),
)
err
:=
s
.
e
.
SavePolicy
()
s
.
Require
()
.
NoError
(
err
)
err
=
s
.
e
.
LoadPolicy
()
s
.
Require
()
.
NoError
(
err
)
s
.
assertPolicy
(
[][]
string
{},
s
.
e
.
GetPolicy
(),
)
}
}
func
TestAdapterTestSuite
(
t
*
testing
.
T
)
{
func
TestAdapterTestSuite
(
t
*
testing
.
T
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment