[servicecomb-kie] branch dev updated: 修复label值为空时，跳过验证 (#272)

[littlecui]

This is an automated email from the ASF dual-hosted git repository.

littlecui pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/servicecomb-kie.git


The following commit(s) were added to refs/heads/dev by this push:
     new 8c84923  修复label值为空时，跳过验证 (#272)
8c84923 is described below

commit 8c849230e68fc98c9cea6e4a762abe2c426885a9
Author: 123yangxiong <117716942+123yangxi...@users.noreply.github.com>
AuthorDate: Mon Dec 5 22:03:00 2022 +0800

    修复label值为空时，跳过验证 (#272)
---
 server/datasource/auth/decision.go          |  2 +-
 server/datasource/auth/filter_kvdoc.go      |  2 +-
 server/datasource/auth/filter_kvdoc_test.go | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/server/datasource/auth/decision.go 
b/server/datasource/auth/decision.go
index f17fc88..56cadda 100644
--- a/server/datasource/auth/decision.go
+++ b/server/datasource/auth/decision.go
@@ -76,7 +76,7 @@ func FilterLabel(targetResourceLabel []map[string]string, 
permLabelList []map[st
 
 func LabelMatched(targetResourceLabel map[string]string, permLabel 
map[string]string) bool {
        for k, v := range permLabel {
-               if vv := targetResourceLabel[k]; vv != v {
+               if vv, ok := targetResourceLabel[k]; !ok || vv != v {
                        return false
                }
        }
diff --git a/server/datasource/auth/filter_kvdoc.go 
b/server/datasource/auth/filter_kvdoc.go
index 87a410c..582ff1f 100644
--- a/server/datasource/auth/filter_kvdoc.go
+++ b/server/datasource/auth/filter_kvdoc.go
@@ -35,7 +35,7 @@ func FilterKVs(kvs []*model.KVDoc, labelsList 
[]map[string]string) []*model.KVDo
 
 func matchOne(kv *model.KVDoc, labels map[string]string) bool {
        for lk, lv := range labels {
-               if v := kv.Labels[lk]; v != lv {
+               if v, ok := kv.Labels[lk]; !ok || v != lv {
                        return false
                }
        }
diff --git a/server/datasource/auth/filter_kvdoc_test.go 
b/server/datasource/auth/filter_kvdoc_test.go
index 1dcdaf2..e87edcc 100644
--- a/server/datasource/auth/filter_kvdoc_test.go
+++ b/server/datasource/auth/filter_kvdoc_test.go
@@ -53,3 +53,32 @@ func TestFilterKVs(t *testing.T) {
        r := FilterKVs(kvs, permResourceLabel)
        assert.Equal(t, 1, len(r))
 }
+
+func TestFilterKVsNull(t *testing.T) {
+       permResourceLabel := []map[string]string{
+               {"environment": ""},
+       }
+
+       var kvs []*model.KVDoc
+
+       kv1 := new(model.KVDoc)
+       kv1.Key = "k1"
+       kv1.Value = "v1"
+       kv1.Labels = map[string]string{"environment": "production", "appId": 
"default", "service": "s1"}
+       kvs = append(kvs, kv1)
+
+       kv2 := new(model.KVDoc)
+       kv2.Key = "k2"
+       kv2.Value = "v2"
+       kv2.Labels = map[string]string{"environment": "", "appId": "default"}
+       kvs = append(kvs, kv2)
+
+       kv3 := new(model.KVDoc)
+       kv3.Key = "k3"
+       kv3.Value = "v3"
+       kv3.Labels = map[string]string{"version": "xxx"}
+       kvs = append(kvs, kv3)
+
+       r := FilterKVs(kvs, permResourceLabel)
+       assert.Equal(t, 1, len(r))
+}