fix: reload policy from database

Signed-off-by: Zixuan Liu <[email protected]>
casbin · Apr 12, 2021 · 9df953d · 9df953d
1 parent 5cf5dff
commit 9df953d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/store/engine.go b/store/engine.go
@@ -46,6 +46,11 @@ func NewPolicyOperator(path string, e casbin.IDistributedEnforcer) (*PolicyOpera
 		return nil, errors.Wrapf(err, "failed to open bolt file")
 	}
 
+	err := p.LoadPolicy()
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to load policy from bolt")
+	}
+
 	return p, nil
 }
 
@@ -173,7 +178,7 @@ func (p *PolicyOperator) LoadPolicy() error {
 		return err
 	})
 	if err != nil {
-		p.logger.Error("failed to persist to database", zap.Error(err))
+		p.logger.Error("failed to load policy from database", zap.Error(err))
 	}
 
 	return err

diff --git a/store/engine_test.go b/store/engine_test.go
@@ -24,6 +24,7 @@ func TestPolicyOperator_AddPolicies(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(dir)
 
+	e.EXPECT().ClearPolicySelf(nil)
 	p, err := NewPolicyOperator(dir, e)
 	assert.NoError(t, err)
 
@@ -42,6 +43,7 @@ func TestPolicyOperator_RemovePolicies(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(dir)
 
+	e.EXPECT().ClearPolicySelf(nil)
 	p, err := NewPolicyOperator(dir, e)
 	assert.NoError(t, err)
 
@@ -60,6 +62,7 @@ func TestPolicyOperator_RemoveFilteredPolicy(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(dir)
 
+	e.EXPECT().ClearPolicySelf(nil)
 	p, err := NewPolicyOperator(dir, e)
 	assert.NoError(t, err)
 
@@ -78,6 +81,7 @@ func TestPolicyOperator_UpdatePolicy(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(dir)
 
+	e.EXPECT().ClearPolicySelf(nil)
 	p, err := NewPolicyOperator(dir, e)
 	assert.NoError(t, err)
 
@@ -96,6 +100,7 @@ func TestPolicyOperator_LoadPolicy(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(dir)
 
+	e.EXPECT().ClearPolicySelf(nil)
 	p, err := NewPolicyOperator(dir, e)
 	assert.NoError(t, err)
 
@@ -120,6 +125,7 @@ func TestPolicyOperator_Backup_Restore(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(dir)
 
+	e.EXPECT().ClearPolicySelf(nil)
 	p, err := NewPolicyOperator(dir, e)
 	assert.NoError(t, err)
 

diff --git a/store/store_test.go b/store/store_test.go
@@ -130,6 +130,7 @@ func TestStore_SingleNode(t *testing.T) {
 
 	enforcer := mocks.NewMockIDistributedEnforcer(ctl)
 	raftID := "node-leader"
+	enforcer.EXPECT().ClearPolicySelf(nil)
 
 	raftAddress := GetLocalIP() + ":6790"
 
@@ -253,11 +254,13 @@ func TestStore_MultipleNode(t *testing.T) {
 	leaderCtl := gomock.NewController(t)
 	defer leaderCtl.Finish()
 	leaderEnforcer := mocks.NewMockIDistributedEnforcer(leaderCtl)
+	leaderEnforcer.EXPECT().ClearPolicySelf(nil)
 
 	// mock follower
 	followerCtl := gomock.NewController(t)
 	defer followerCtl.Finish()
 	followerEnforcer := mocks.NewMockIDistributedEnforcer(followerCtl)
+	followerEnforcer.EXPECT().ClearPolicySelf(nil)
 
 	localIP := GetLocalIP()
 	leaderAddress := localIP + ":6790"