admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug auditing can't search anything using keyword with '-' for fuzzy

Browse Source 
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
This commit is contained in:
wanjunlei
2020-07-30 22:36:09 +08:00
parent 67c6a8c510
commit e71697f864
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/simple/client/auditing/elasticsearch/elasticsearch.go
View File

@@ -367,7 +367,7 @@ func parseToQueryPart(f *auditing.Filter) interface{} {
}
}
if len(f.ObjectRefNamespaceFuzzy) > 0 {
if bi := shouldBoolbody("wildcard", "ObjectRef.Namespace",
if bi := shouldBoolbody("wildcard", "ObjectRef.Namespace.keyword",
f.ObjectRefNamespaceFuzzy, func(s string) string {
return fmt.Sprintf("*" + s + "*")
}); bi != nil {
@@ -382,7 +382,7 @@ func parseToQueryPart(f *auditing.Filter) interface{} {
}
}
if len(f.WorkspaceFuzzy) > 0 {
if bi := shouldBoolbody("wildcard", "Workspace",
if bi := shouldBoolbody("wildcard", "Workspace.keyword",
f.WorkspaceFuzzy, func(s string) string {
return fmt.Sprintf("*" + s + "*")
}); bi != nil {
@@ -391,13 +391,13 @@ func parseToQueryPart(f *auditing.Filter) interface{} {
}
if len(f.ObjectRefNames) > 0 {
if bi := shouldBoolbody("match_phrase_prefix", "ObjectRef.Name.keyword",
if bi := shouldBoolbody("match_phrase", "ObjectRef.Name.keyword",
f.ObjectRefNames, nil); bi != nil {
b.Filter = append(b.Filter, map[string]interface{}{"bool": bi})
}
}
if len(f.ObjectRefNameFuzzy) > 0 {
if bi := shouldBoolbody("wildcard", "ObjectRef.Name",
if bi := shouldBoolbody("wildcard", "ObjectRef.Name.keyword",
f.ObjectRefNameFuzzy, func(s string) string {
return fmt.Sprintf("*" + s + "*")
}); bi != nil {
@@ -406,20 +406,20 @@ func parseToQueryPart(f *auditing.Filter) interface{} {
}
if len(f.Verbs) > 0 {
if bi := shouldBoolbody("match_phrase", "Verb",
if bi := shouldBoolbody("match_phrase", "Verb.keyword",
f.Verbs, nil); bi != nil {
b.Filter = append(b.Filter, map[string]interface{}{"bool": bi})
}
}
if len(f.Levels) > 0 {
if bi := shouldBoolbody("match_phrase", "Level",
if bi := shouldBoolbody("match_phrase", "Level.keyword",
f.Levels, nil); bi != nil {
b.Filter = append(b.Filter, map[string]interface{}{"bool": bi})
}
}
if len(f.SourceIpFuzzy) > 0 {
if bi := shouldBoolbody("wildcard", "SourceIPs",
if bi := shouldBoolbody("wildcard", "SourceIPs.keyword",
f.SourceIpFuzzy, func(s string) string {
return fmt.Sprintf("*" + s + "*")
}); bi != nil {
@@ -434,7 +434,7 @@ func parseToQueryPart(f *auditing.Filter) interface{} {
}
}
if len(f.UserFuzzy) > 0 {
if bi := shouldBoolbody("wildcard", "User.Username",
if bi := shouldBoolbody("wildcard", "User.Username.keyword",
f.UserFuzzy, func(s string) string {
return fmt.Sprintf("*" + s + "*")
}); bi != nil {
@@ -443,7 +443,7 @@ func parseToQueryPart(f *auditing.Filter) interface{} {
}
if len(f.GroupFuzzy) > 0 {
if bi := shouldBoolbody("wildcard", "User.Groups",
if bi := shouldBoolbody("wildcard", "User.Groups.keyword",
f.GroupFuzzy, func(s string) string {
return fmt.Sprintf("*" + s + "*")
}); bi != nil {

14
pkg/simple/client/auditing/elasticsearch/elasticsearch_test.go
View File

@@ -175,7 +175,7 @@ func TestParseToQueryPart(t *testing.T) {
"bool": {
"should": [
{
"match_phrase_prefix": {
"match_phrase": {
"ObjectRef.Name.keyword": "istio"
}
}
@@ -188,7 +188,7 @@ func TestParseToQueryPart(t *testing.T) {
"should": [
{
"wildcard": {
"ObjectRef.Name": "*istio*"
"ObjectRef.Name.keyword": "*istio*"
}
}
],
@@ -200,7 +200,7 @@ func TestParseToQueryPart(t *testing.T) {
"should": [
{
"match_phrase": {
"Verb": "create"
"Verb.keyword": "create"
}
}
],
@@ -212,7 +212,7 @@ func TestParseToQueryPart(t *testing.T) {
"should": [
{
"match_phrase": {
"Level": "Metadata"
"Level.keyword": "Metadata"
}
}
],
@@ -224,7 +224,7 @@ func TestParseToQueryPart(t *testing.T) {
"should": [
{
"wildcard": {
"SourceIPs": "*192.168*"
"SourceIPs.keyword": "*192.168*"
}
}
],
@@ -248,7 +248,7 @@ func TestParseToQueryPart(t *testing.T) {
"should": [
{
"wildcard": {
"User.Username": "*system:serviceaccount*"
"User.Username.keyword": "*system:serviceaccount*"
}
}
],
@@ -260,7 +260,7 @@ func TestParseToQueryPart(t *testing.T) {
"should": [
{
"wildcard": {
"User.Groups": "*system:serviceaccounts*"
"User.Groups.keyword": "*system:serviceaccounts*"
}
}
],