feat: expose ClearCache method from Enforcer

Author: ankitrgadiya

enforcer.go

@@ -310,6 +310,10 @@ func (e *Enforcer) SetEffector(eft effector.Effector) {
 	e.eft = eft
 }
 
+func (e *Enforcer) ClearCache() {
+	e.invalidateMatcherMap()
+}
+
 // ClearPolicy clears all policy.
 func (e *Enforcer) ClearPolicy() {
 	e.invalidateMatcherMap()
@@ -730,7 +734,6 @@ func (e *Enforcer) enforce(matcher string, explains *[]string, rvals ...interfac
 
 			result, err := expression.Eval(parameters)
 			// log.LogPrint("Result: ", result)
-
 			if err != nil {
 				return false, err
 			}
@@ -787,7 +790,6 @@ func (e *Enforcer) enforce(matcher string, explains *[]string, rvals ...interfac
 		parameters.pVals = make([]string, len(parameters.pTokens))
 
 		result, err := expression.Eval(parameters)
-
 		if err != nil {
 			return false, err
 		}
@@ -830,7 +832,7 @@ func (e *Enforcer) enforce(matcher string, explains *[]string, rvals ...interfac
 func (e *Enforcer) getAndStoreMatcherExpression(hasEval bool, expString string, functions map[string]govaluate.ExpressionFunction) (*govaluate.EvaluableExpression, error) {
 	var expression *govaluate.EvaluableExpression
 	var err error
-	var cachedExpression, isPresent = e.matcherMap.Load(expString)
+	cachedExpression, isPresent := e.matcherMap.Load(expString)
 
 	if !hasEval && isPresent {
 		expression = cachedExpression.(*govaluate.EvaluableExpression)

enforcer_cached.go

@@ -173,6 +173,17 @@ func GetCacheKey(params ...interface{}) (string, bool) {
 	return key.String(), true
 }
 
+func (e *CachedEnforcer) ClearCache() {
+	if atomic.LoadInt32(&e.enableCache) != 0 {
+		if err := e.cache.Clear(); err != nil {
+			e.logger.LogError(err, "clear cache failed")
+			return
+		}
+	}
+
+	e.Enforcer.ClearCache()
+}
+
 // ClearPolicy clears all policy.
 func (e *CachedEnforcer) ClearPolicy() {
 	if atomic.LoadInt32(&e.enableCache) != 0 {

enforcer_interface.go

@@ -22,9 +22,11 @@ import (
 	"github.com/casbin/govaluate"
 )
 
-var _ IEnforcer = &Enforcer{}
-var _ IEnforcer = &SyncedEnforcer{}
-var _ IEnforcer = &CachedEnforcer{}
+var (
+	_ IEnforcer = &Enforcer{}
+	_ IEnforcer = &SyncedEnforcer{}
+	_ IEnforcer = &CachedEnforcer{}
+)
 
 // IEnforcer is the API interface of Enforcer.
 type IEnforcer interface {
@@ -41,6 +43,7 @@ type IEnforcer interface {
 	GetRoleManager() rbac.RoleManager
 	SetRoleManager(rm rbac.RoleManager)
 	SetEffector(eft effector.Effector)
+	ClearCache()
 	ClearPolicy()
 	LoadPolicy() error
 	LoadFilteredPolicy(filter interface{}) error

enforcer_synced.go

@@ -106,6 +106,12 @@ func (e *SyncedEnforcer) LoadModel() error {
 	return e.Enforcer.LoadModel()
 }
 
+func (e *SyncedEnforcer) ClearCache() {
+	e.m.Lock()
+	defer e.m.Unlock()
+	e.Enforcer.ClearCache()
+}
+
 // ClearPolicy clears all policy.
 func (e *SyncedEnforcer) ClearPolicy() {
 	e.m.Lock()