-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
enhance: [cherry-pick] Avoid initializing casbin enforcer for each re…
…quest (#29118) Cherry-pick from master pr: #29117 See also #29113 This patch: - Replace plain Enforcer with `casbin.SyncedEnforcer` - Add implementation of persist.Adapter with `MetaCacheCasbinAdapter` - Invoke enforcer.LoadPolicy when policy updated --------- Signed-off-by: Congqi Xia <[email protected]>
- Loading branch information
Showing
4 changed files
with
204 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| // Licensed to the LF AI & Data foundation under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package proxy | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/casbin/casbin/v2/model" | ||
| jsonadapter "github.com/casbin/json-adapter/v2" | ||
| "go.uber.org/zap" | ||
|
|
||
| "github.com/milvus-io/milvus/pkg/log" | ||
| "github.com/milvus-io/milvus/pkg/util/merr" | ||
| ) | ||
|
|
||
| // MetaCacheCasbinAdapter is the implementation of `persist.Adapter` with Cache | ||
| // Since the usage shall be read-only, it implements only `LoadPolicy` for now. | ||
| type MetaCacheCasbinAdapter struct { | ||
| cacheSource func() Cache | ||
| } | ||
|
|
||
| func NewMetaCacheCasbinAdapter(cacheSource func() Cache) *MetaCacheCasbinAdapter { | ||
| return &MetaCacheCasbinAdapter{ | ||
| cacheSource: cacheSource, | ||
| } | ||
| } | ||
|
|
||
| // LoadPolicy loads all policy rules from the storage. | ||
| // Implementing `persist.Adapter`. | ||
| func (a *MetaCacheCasbinAdapter) LoadPolicy(model model.Model) error { | ||
| cache := a.cacheSource() | ||
| if cache == nil { | ||
| return merr.WrapErrServiceInternal("cache source return nil cache") | ||
| } | ||
| policyInfo := strings.Join(cache.GetPrivilegeInfo(context.Background()), ",") | ||
|
|
||
| policy := fmt.Sprintf("[%s]", policyInfo) | ||
| log.Ctx(context.Background()).Info("LoddPolicy update policyinfo", zap.String("policyInfo", policy)) | ||
| byteSource := []byte(policy) | ||
| jAdapter := jsonadapter.NewAdapter(&byteSource) | ||
| return jAdapter.LoadPolicy(model) | ||
| } | ||
|
|
||
| // SavePolicy saves all policy rules to the storage. | ||
| // Implementing `persist.Adapter`. | ||
| // MetaCacheCasbinAdapter is read-only, always returns error | ||
| func (a *MetaCacheCasbinAdapter) SavePolicy(model model.Model) error { | ||
| return merr.WrapErrServiceInternal("MetaCacheCasbinAdapter is read-only, but received SavePolicy call") | ||
| } | ||
|
|
||
| // AddPolicy adds a policy rule to the storage. | ||
| // Implementing `persist.Adapter`. | ||
| // MetaCacheCasbinAdapter is read-only, always returns error | ||
| func (a *MetaCacheCasbinAdapter) AddPolicy(sec string, ptype string, rule []string) error { | ||
| return merr.WrapErrServiceInternal("MetaCacheCasbinAdapter is read-only, but received AddPolicy call") | ||
| } | ||
|
|
||
| // RemovePolicy removes a policy rule from the storage. | ||
| // Implementing `persist.Adapter`. | ||
| // MetaCacheCasbinAdapter is read-only, always returns error | ||
| func (a *MetaCacheCasbinAdapter) RemovePolicy(sec string, ptype string, rule []string) error { | ||
| return merr.WrapErrServiceInternal("MetaCacheCasbinAdapter is read-only, but received RemovePolicy call") | ||
| } | ||
|
|
||
| // RemoveFilteredPolicy removes policy rules that match the filter from the storage. | ||
| // This is part of the Auto-Save feature. | ||
| func (a *MetaCacheCasbinAdapter) RemoveFilteredPolicy(sec string, ptype string, fieldIndex int, fieldValues ...string) error { | ||
| return merr.WrapErrServiceInternal("MetaCacheCasbinAdapter is read-only, but received RemoveFilteredPolicy call") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // Licensed to the LF AI & Data foundation under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package proxy | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/mock" | ||
| "github.com/stretchr/testify/suite" | ||
| ) | ||
|
|
||
| type MetaCacheCasbinAdapterSuite struct { | ||
| suite.Suite | ||
|
|
||
| cache *MockCache | ||
| adapter *MetaCacheCasbinAdapter | ||
| } | ||
|
|
||
| func (s *MetaCacheCasbinAdapterSuite) SetupTest() { | ||
| s.cache = NewMockCache(s.T()) | ||
|
|
||
| s.adapter = NewMetaCacheCasbinAdapter(func() Cache { return s.cache }) | ||
| } | ||
|
|
||
| func (s *MetaCacheCasbinAdapterSuite) TestLoadPolicy() { | ||
| s.Run("normal_load", func() { | ||
| s.cache.EXPECT().GetPrivilegeInfo(mock.Anything).Return([]string{}) | ||
|
|
||
| m := getPolicyModel(ModelStr) | ||
| err := s.adapter.LoadPolicy(m) | ||
| s.NoError(err) | ||
| }) | ||
|
|
||
| s.Run("source_return_nil", func() { | ||
| adapter := NewMetaCacheCasbinAdapter(func() Cache { return nil }) | ||
|
|
||
| m := getPolicyModel(ModelStr) | ||
| err := adapter.LoadPolicy(m) | ||
| s.Error(err) | ||
| }) | ||
| } | ||
|
|
||
| func (s *MetaCacheCasbinAdapterSuite) TestSavePolicy() { | ||
| m := getPolicyModel(ModelStr) | ||
| s.Error(s.adapter.SavePolicy(m)) | ||
| } | ||
|
|
||
| func (s *MetaCacheCasbinAdapterSuite) TestAddPolicy() { | ||
| s.Error(s.adapter.AddPolicy("", "", []string{})) | ||
| } | ||
|
|
||
| func (s *MetaCacheCasbinAdapterSuite) TestRemovePolicy() { | ||
| s.Error(s.adapter.RemovePolicy("", "", []string{})) | ||
| } | ||
|
|
||
| func (s *MetaCacheCasbinAdapterSuite) TestRemoveFiltererPolicy() { | ||
| s.Error(s.adapter.RemoveFilteredPolicy("", "", 0)) | ||
| } | ||
|
|
||
| func TestMetaCacheCasbinAdapter(t *testing.T) { | ||
| suite.Run(t, new(MetaCacheCasbinAdapterSuite)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters