Skip to content

Commit e12d797

Browse files
authored
fix: handle the returned error of LoadPolicyArray (#53)
1 parent e114641 commit e12d797

File tree

4 files changed

+11
-21
lines changed

4 files changed

+11
-21
lines changed

adapter.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func (a *adapter) dropTable() error {
223223
return nil
224224
}
225225

226-
func loadPolicyLine(line CasbinRule, model model.Model) {
226+
func loadPolicyLine(line CasbinRule, model model.Model) error {
227227
var p = []string{line.PType,
228228
line.V0, line.V1, line.V2, line.V3, line.V4, line.V5}
229229
var lineText string
@@ -241,7 +241,7 @@ func loadPolicyLine(line CasbinRule, model model.Model) {
241241
lineText = strings.Join(p[:2], ", ")
242242
}
243243

244-
persist.LoadPolicyLine(lineText, model)
244+
return persist.LoadPolicyLine(lineText, model)
245245
}
246246

247247
// LoadPolicy loads policy from database.
@@ -273,7 +273,10 @@ func (a *adapter) LoadFilteredPolicy(model model.Model, filter interface{}) erro
273273
if err != nil {
274274
return err
275275
}
276-
loadPolicyLine(line, model)
276+
err = loadPolicyLine(line, model)
277+
if err != nil {
278+
return err
279+
}
277280
}
278281

279282
return cursor.Close(ctx)

adapter_test.go

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ func TestAddPolicies(t *testing.T) {
310310
}
311311

312312
func TestDeleteFilteredAdapter(t *testing.T) {
313-
a, err := NewFilteredAdapter(getDbURL())
313+
a, err := NewFilteredAdapter(getDbURL() + "/casbin_test_new")
314314
if err != nil {
315315
panic(err)
316316
}
@@ -329,10 +329,6 @@ func TestDeleteFilteredAdapter(t *testing.T) {
329329
}
330330
// The policy has a new rule: {"alice", "data1", "write"}.
331331
testGetPolicy(t, e, [][]string{
332-
{"alice", "data1", "read"},
333-
{"bob", "data2", "write"},
334-
{"data2_admin", "data2", "read"},
335-
{"data2_admin", "data2", "write"},
336332
{"domain1", "alice", "data3", "read", "accept", "service1"},
337333
{"domain1", "alice", "data3", "write", "accept", "service2"},
338334
},
@@ -343,10 +339,6 @@ func TestDeleteFilteredAdapter(t *testing.T) {
343339
t.Errorf("Expected LoadPolicy() to be successful; got %v", err)
344340
}
345341
testGetPolicy(t, e, [][]string{
346-
{"alice", "data1", "read"},
347-
{"bob", "data2", "write"},
348-
{"data2_admin", "data2", "read"},
349-
{"data2_admin", "data2", "write"},
350342
{"domain1", "alice", "data3", "write", "accept", "service2"},
351343
},
352344
)
@@ -355,12 +347,7 @@ func TestDeleteFilteredAdapter(t *testing.T) {
355347
if err := e.LoadPolicy(); err != nil {
356348
t.Errorf("Expected LoadPolicy() to be successful; got %v", err)
357349
}
358-
testGetPolicy(t, e, [][]string{
359-
{"alice", "data1", "read"},
360-
{"bob", "data2", "write"},
361-
{"data2_admin", "data2", "read"},
362-
{"data2_admin", "data2", "write"},
363-
},
350+
testGetPolicy(t, e, [][]string{},
364351
)
365352
}
366353

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module github.com/casbin/mongodb-adapter/v3
33
go 1.13
44

55
require (
6-
github.com/casbin/casbin/v2 v2.31.2
6+
github.com/casbin/casbin/v2 v2.55.0
77
go.mongodb.org/mongo-driver v1.5.3
88
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1
33
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
44
github.com/aws/aws-sdk-go v1.34.28 h1:sscPpn/Ns3i0F4HPEWAVcwdIRaZZCuL7llJ2/60yPIk=
55
github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
6-
github.com/casbin/casbin/v2 v2.31.2 h1:L2RDbKhkspfUPkY12PvJ2oN2QtBQhJ5oV6bq9QfKGHo=
7-
github.com/casbin/casbin/v2 v2.31.2/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
6+
github.com/casbin/casbin/v2 v2.55.0 h1:RyU+OacnVzjxof1U3bmxHM7oCRdx9+gNnkclrvof/zI=
7+
github.com/casbin/casbin/v2 v2.55.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
88
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
99
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1010
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

0 commit comments

Comments
 (0)