diff --git a/cloud/src/rasp-cloud/es/es.go b/cloud/src/rasp-cloud/es/es.go index f56989e47..c02f603e4 100755 --- a/cloud/src/rasp-cloud/es/es.go +++ b/cloud/src/rasp-cloud/es/es.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/astaxie/beego" "github.com/astaxie/beego/logs" - "github.com/olivere/elastic" + "github.com/olivere/elastic/v7" "rasp-cloud/conf" "rasp-cloud/environment" "rasp-cloud/tools" @@ -34,8 +34,8 @@ var ( ElasticClient *elastic.Client Version string ttlIndexes = make(chan map[string]time.Duration, 1) - minEsVersion = "5.6.0" - maxEsVersion = "7.0.0" + minEsVersion = "7.0.0" + maxEsVersion = "9.0.0" ) func init() { @@ -178,10 +178,10 @@ func CreateEsIndex(index string, alias string, template string) error { return nil } -func Insert(index string, docType string, doc interface{}) (err error) { +func Insert(index string, doc interface{}) (err error) { ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(10*time.Second)) defer cancel() - _, err = ElasticClient.Index().Index(index).Type(docType).BodyJson(doc).Do(ctx) + _, err = ElasticClient.Index().Index(index).BodyJson(doc).Do(ctx) return } @@ -196,7 +196,6 @@ func BulkInsertAlarm(docType string, docs []map[string]interface{}) (err error) docType == "crash-alarm" { bulkService.Add(elastic.NewBulkUpdateRequest(). Index("real-openrasp-" + docType + "-" + appId). - Type(docType). Id(fmt.Sprint(doc["upsert_id"])). DocAsUpsert(true). Doc(doc)) @@ -204,7 +203,6 @@ func BulkInsertAlarm(docType string, docs []map[string]interface{}) (err error) if appId, ok := doc["app_id"].(string); ok { bulkService.Add(elastic.NewBulkIndexRequest(). Index("real-openrasp-" + docType + "-" + appId). - Type(docType). OpType("index"). Doc(doc)) } @@ -233,12 +231,11 @@ func BulkInsertAlarm(docType string, docs []map[string]interface{}) (err error) return err } -func BulkInsert(index string, docType string, docs []map[string]interface{}) (err error) { +func BulkInsert(index string, docs []map[string]interface{}) (err error) { bulkService := ElasticClient.Bulk() for _, doc := range docs { bulkService.Add(elastic.NewBulkUpdateRequest(). Index(index). - Type(docType). Id(fmt.Sprint(doc["upsert_id"])). DocAsUpsert(true). Doc(doc["content"])) @@ -256,10 +253,10 @@ func DeleteIndex(indexName string) error { return err } -func DeleteByQuery(index string, docType string, query elastic.Query) error { +func DeleteByQuery(index string, query elastic.Query) error { ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(15*time.Second)) defer cancel() - _, err := ElasticClient.DeleteByQuery(index).Type(docType).Query(query).ProceedOnVersionConflict().Do(ctx) + _, err := ElasticClient.DeleteByQuery(index).Query(query).ProceedOnVersionConflict().Do(ctx) if err != nil { beego.Error("failed to delete by query", err) return err diff --git a/cloud/src/rasp-cloud/es/template.go b/cloud/src/rasp-cloud/es/template.go index 9e183688d..4018c7c33 100644 --- a/cloud/src/rasp-cloud/es/template.go +++ b/cloud/src/rasp-cloud/es/template.go @@ -21,183 +21,178 @@ import ( var attackAlarmTemplate = ` { - "template":"openrasp-attack-alarm-*", - "aliases" : { - "real-{index}" : {} - }, + "index_patterns": ["openrasp-attack-alarm-*"], + "aliases": { + "real-{index}": {} + }, "settings": { "analysis": { "normalizer": { "lowercase_normalizer": { "type": "custom", - "filter": ["lowercase","asciifolding"] + "filter": ["lowercase", "asciifolding"] } - } + } } }, "mappings": { - "attack-alarm": { - "_all": { - "enabled": false - }, - "properties": { - "@timestamp":{ - "type":"date" - }, - "request_method": { - "type": "keyword", - "ignore_above": 50 - }, - "target": { - "type": "keyword", - "ignore_above": 256 - }, - "server_ip": { - "type": "keyword", - "ignore_above": 256 - }, - "client_ip": { - "type": "keyword", - "ignore_above": 256 - }, - "referer": { - "type": "keyword", - "ignore_above": 256 - }, - "user_agent": { - "type": "keyword", - "ignore_above": 512 - }, - "attack_source": { - "type": "keyword", - "ignore_above": 256 - }, - "path": { - "type": "keyword", - "ignore_above": 256 - }, - "url": { - "type": "keyword", - "ignore_above": 1024, - "normalizer": "lowercase_normalizer" - }, - "event_type": { - "type": "keyword", - "ignore_above": 256 - }, - "server_hostname": { - "type": "keyword", - "ignore_above": 256, - "normalizer": "lowercase_normalizer" - }, - "stack_md5": { - "type": "keyword", - "ignore_above": 64 - }, - "server_type": { - "type": "keyword", - "ignore_above": 256 - }, - "server_version": { - "type": "keyword", - "ignore_above": 256 - }, - "request_id": { - "type": "keyword", - "ignore_above": 256 - }, - "body": { - "type": "keyword", - "index": false - }, - "app_id": { - "type": "keyword", - "ignore_above": 256 - }, - "rasp_id": { - "type": "keyword", - "ignore_above": 256 - }, - "event_time": { - "type": "date" - }, - "stack_trace": { - "type": "keyword" - }, - "intercept_state": { - "type": "keyword", - "ignore_above": 64 - }, - "attack_type": { - "type": "keyword", - "ignore_above": 256 - }, - "attack_location": { - "type": "object", - "properties": { - "location_zh_cn":{ - "type": "keyword", - "ignore_above": 256 - }, - "location_en":{ - "type": "keyword", - "ignore_above": 256 - }, - "longitude":{ - "type": "double" - }, - "latitude":{ - "type": "double" - } + "properties": { + "@timestamp": { + "type": "date" + }, + "request_method": { + "type": "keyword", + "ignore_above": 50 + }, + "target": { + "type": "keyword", + "ignore_above": 256 + }, + "server_ip": { + "type": "keyword", + "ignore_above": 256 + }, + "client_ip": { + "type": "keyword", + "ignore_above": 256 + }, + "referer": { + "type": "keyword", + "ignore_above": 256 + }, + "user_agent": { + "type": "keyword", + "ignore_above": 512 + }, + "attack_source": { + "type": "keyword", + "ignore_above": 256 + }, + "path": { + "type": "keyword", + "ignore_above": 256 + }, + "url": { + "type": "keyword", + "ignore_above": 1024, + "normalizer": "lowercase_normalizer" + }, + "event_type": { + "type": "keyword", + "ignore_above": 256 + }, + "server_hostname": { + "type": "keyword", + "ignore_above": 256, + "normalizer": "lowercase_normalizer" + }, + "stack_md5": { + "type": "keyword", + "ignore_above": 64 + }, + "server_type": { + "type": "keyword", + "ignore_above": 256 + }, + "server_version": { + "type": "keyword", + "ignore_above": 256 + }, + "request_id": { + "type": "keyword", + "ignore_above": 256 + }, + "body": { + "type": "keyword", + "index": false + }, + "app_id": { + "type": "keyword", + "ignore_above": 256 + }, + "rasp_id": { + "type": "keyword", + "ignore_above": 256 + }, + "event_time": { + "type": "date" + }, + "stack_trace": { + "type": "keyword" + }, + "intercept_state": { + "type": "keyword", + "ignore_above": 64 + }, + "attack_type": { + "type": "keyword", + "ignore_above": 256 + }, + "attack_location": { + "type": "object", + "properties": { + "location_zh_cn": { + "type": "keyword", + "ignore_above": 256 + }, + "location_en": { + "type": "keyword", + "ignore_above": 256 + }, + "longitude": { + "type": "double" + }, + "latitude": { + "type": "double" } - }, - "plugin_algorithm":{ - "type": "keyword", - "ignore_above": 256 - }, - "plugin_name": { - "type": "keyword", - "ignore_above": 256 - }, - "plugin_confidence": { - "type": "short" - }, - "attack_params": { - "type": "object", - "enabled":"false" - }, - "plugin_message": { - "type": "keyword", - "normalizer": "lowercase_normalizer" - }, - "parameter": { - "type": "object", - "properties": { - "form":{ - "type": "keyword", - "index":false - }, - "json":{ - "type": "keyword", - "index":false - }, - "multipart":{ - "type": "keyword", - "index":false - } + } + }, + "plugin_algorithm": { + "type": "keyword", + "ignore_above": 256 + }, + "plugin_name": { + "type": "keyword", + "ignore_above": 256 + }, + "plugin_confidence": { + "type": "short" + }, + "attack_params": { + "type": "object", + "enabled": "false" + }, + "plugin_message": { + "type": "keyword", + "normalizer": "lowercase_normalizer" + }, + "parameter": { + "type": "object", + "properties": { + "form": { + "type": "keyword", + "index": false + }, + "json": { + "type": "keyword", + "index": false + }, + "multipart": { + "type": "keyword", + "index": false } - }, - "server_nic": { - "type": "nested", - "properties": { - "name": { - "type": "keyword", - "ignore_above": 256 - }, - "ip": { - "type": "keyword", - "ignore_above": 256 - } + } + }, + "server_nic": { + "type": "nested", + "properties": { + "name": { + "type": "keyword", + "ignore_above": 256 + }, + "ip": { + "type": "keyword", + "ignore_above": 256 } } } @@ -207,189 +202,173 @@ var attackAlarmTemplate = ` ` var policyAlarmTemplate = ` { - "template":"openrasp-policy-alarm-*", - "aliases" : { - "real-{index}" : {} - }, + "index_patterns": ["openrasp-policy-alarm-*"], + "aliases": { + "real-{index}": {} + }, "settings": { "analysis": { "normalizer": { "lowercase_normalizer": { "type": "custom", - "filter": ["lowercase","asciifolding"] + "filter": ["lowercase", "asciifolding"] } } } }, "mappings": { - "policy-alarm": { - "_all": { - "enabled": false - }, - "properties": { - "@timestamp":{ - "type":"date" - }, - "event_type": { - "type": "keyword", - "ignore_above": 256 - }, - "server_hostname": { - "type": "keyword", - "ignore_above": 256, - "normalizer": "lowercase_normalizer" - }, - "server_type": { - "type": "keyword", - "ignore_above": 64 - }, - "server_nic": { - "type": "nested", - "properties": { - "name": { - "type": "keyword", - "ignore_above": 256 - }, - "ip": { - "type": "keyword", - "ignore_above": 256 - } + "properties": { + "@timestamp": { + "type": "date" + }, + "event_type": { + "type": "keyword", + "ignore_above": 256 + }, + "server_hostname": { + "type": "keyword", + "ignore_above": 256, + "normalizer": "lowercase_normalizer" + }, + "server_type": { + "type": "keyword", + "ignore_above": 64 + }, + "server_nic": { + "type": "nested", + "properties": { + "name": { + "type": "keyword", + "ignore_above": 256 + }, + "ip": { + "type": "keyword", + "ignore_above": 256 } - }, - "app_id": { - "type": "keyword", - "ignore_above": 256 - }, - "rasp_id": { - "type": "keyword", - "ignore_above": 256 - }, - "event_time": { - "type": "date" - }, - "stack_trace": { - "type": "keyword" - }, - "policy_id": { - "type": "long" - }, - "message": { - "type": "keyword", - "normalizer": "lowercase_normalizer" - }, - "stack_md5": { - "type": "keyword", - "ignore_above": 64 - }, - "policy_params": { - "type": "object", - "enabled":"false" } + }, + "app_id": { + "type": "keyword", + "ignore_above": 256 + }, + "rasp_id": { + "type": "keyword", + "ignore_above": 256 + }, + "event_time": { + "type": "date" + }, + "stack_trace": { + "type": "keyword" + }, + "policy_id": { + "type": "long" + }, + "message": { + "type": "keyword", + "normalizer": "lowercase_normalizer" + }, + "stack_md5": { + "type": "keyword", + "ignore_above": 64 + }, + "policy_params": { + "type": "object", + "enabled": "false" } } } } ` var errorAlarmTemplate = `{ - "template":"openrasp-error-alarm-*", - "aliases" : { - "real-{index}" : {} - }, + "index_patterns": ["openrasp-error-alarm-*"], + "aliases": { + "real-{index}": {} + }, "settings": { "analysis": { "normalizer": { "lowercase_normalizer": { "type": "custom", - "filter": ["lowercase","asciifolding"] + "filter": ["lowercase", "asciifolding"] } - } + } } }, "mappings": { - "error-alarm": { - "_all": { - "enabled": false - }, - "properties": { - "@timestamp":{ - "type":"date" - }, - "app_id": { - "type": "keyword", - "ignore_above": 256 - }, - "rasp_id": { - "type": "keyword", - "ignore_above": 256 - }, - "message": { - "type": "keyword", - "normalizer": "lowercase_normalizer" - }, - "level": { - "type": "keyword", - "ignore_above": 64 - }, - "err_code":{ - "type": "long" - }, - "stack_trace":{ - "type": "keyword" - }, - "pid":{ - "type": "long" - }, - "event_time": { - "type": "date" - }, - "server_hostname": { - "type": "keyword", - "ignore_above": 256, - "normalizer": "lowercase_normalizer" - }, - "server_nic": { - "type": "nested", - "properties": { - "name": { - "type": "keyword", - "ignore_above": 256 - }, - "ip": { - "type": "keyword", - "ignore_above": 256 - } + "properties": { + "@timestamp": { + "type": "date" + }, + "app_id": { + "type": "keyword", + "ignore_above": 256 + }, + "rasp_id": { + "type": "keyword", + "ignore_above": 256 + }, + "message": { + "type": "keyword", + "normalizer": "lowercase_normalizer" + }, + "level": { + "type": "keyword", + "ignore_above": 64 + }, + "err_code": { + "type": "long" + }, + "stack_trace": { + "type": "keyword" + }, + "pid": { + "type": "long" + }, + "event_time": { + "type": "date" + }, + "server_hostname": { + "type": "keyword", + "ignore_above": 256, + "normalizer": "lowercase_normalizer" + }, + "server_nic": { + "type": "nested", + "properties": { + "name": { + "type": "keyword", + "ignore_above": 256 + }, + "ip": { + "type": "keyword", + "ignore_above": 256 } } } } } - } - ` + }` var reportDataTemplate = ` { - "template":"openrasp-report-data-*", - "aliases" : { - "real-{index}" : {} - }, + "index_patterns": ["openrasp-report-data-*"], + "aliases": { + "real-{index}": {} + }, "mappings": { - "report-data": { - "_all": { - "enabled": false - }, - "properties": { - "@timestamp":{ - "type":"date" - }, - "time": { - "type": "date" - }, - "request_sum": { - "type": "long" - }, - "rasp_id": { - "type": "keyword", - "ignore_above" : 256 - } + "properties": { + "@timestamp": { + "type": "date" + }, + "time": { + "type": "date" + }, + "request_sum": { + "type": "long" + }, + "rasp_id": { + "type": "keyword", + "ignore_above": 256 } } } @@ -398,79 +377,74 @@ var reportDataTemplate = ` var dependencyDataTemplate = ` { - "template":"openrasp-dependency-data-*", - "aliases" : { - "real-{index}" : {} - }, + "index_patterns": ["openrasp-dependency-data-*"], + "aliases": { + "real-{index}": {} + }, "settings": { "analysis": { "normalizer": { "lowercase_normalizer": { "type": "custom", - "filter": ["lowercase","asciifolding"] + "filter": ["lowercase", "asciifolding"] } - } + } } }, "mappings": { - "dependency": { - "_all": { - "enabled": false - }, - "properties": { - "@timestamp":{ - "type":"date" - }, - "app_id": { - "type": "keyword", - "ignore_above" : 256 - }, - "rasp_id": { - "type": "keyword", - "ignore_above" : 256 - }, - "register_ip": { - "type": "keyword", - "ignore_above": 128 - }, - "hostname": { - "type": "keyword", - "ignore_above" : 256, - "normalizer": "lowercase_normalizer" - }, - "path": { - "type": "keyword", - "ignore_above" : 1024 - }, - "vendor": { - "type": "keyword", - "ignore_above" : 256, - "normalizer": "lowercase_normalizer" - }, - "product": { - "type": "keyword", - "ignore_above" : 256, - "normalizer": "lowercase_normalizer" - }, - "version": { - "type": "keyword", - "ignore_above" : 256 - }, - "tag": { - "type": "keyword", - "ignore_above" : 1024, - "normalizer": "lowercase_normalizer" - }, - "search_string": { - "type": "keyword", - "ignore_above" : 1024, - "normalizer": "lowercase_normalizer" - }, - "source": { - "type": "keyword", - "ignore_above" : 1024, - "normalizer": "lowercase_normalizer" - } + "properties": { + "@timestamp": { + "type": "date" + }, + "app_id": { + "type": "keyword", + "ignore_above": 256 + }, + "rasp_id": { + "type": "keyword", + "ignore_above": 256 + }, + "register_ip": { + "type": "keyword", + "ignore_above": 128 + }, + "hostname": { + "type": "keyword", + "ignore_above": 256, + "normalizer": "lowercase_normalizer" + }, + "path": { + "type": "keyword", + "ignore_above": 1024 + }, + "vendor": { + "type": "keyword", + "ignore_above": 256, + "normalizer": "lowercase_normalizer" + }, + "product": { + "type": "keyword", + "ignore_above": 256, + "normalizer": "lowercase_normalizer" + }, + "version": { + "type": "keyword", + "ignore_above": 256 + }, + "tag": { + "type": "keyword", + "ignore_above": 1024, + "normalizer": "lowercase_normalizer" + }, + "search_string": { + "type": "keyword", + "ignore_above": 1024, + "normalizer": "lowercase_normalizer" + }, + "source": { + "type": "keyword", + "ignore_above": 1024, + "normalizer": "lowercase_normalizer" } } } @@ -479,66 +453,61 @@ var dependencyDataTemplate = ` var crashDataTemplate = ` { - "template":"openrasp-crash-alarm-*", - "aliases" : { - "real-{index}" : {} - }, + "index_patterns": ["openrasp-crash-alarm-*"], + "aliases": { + "real-{index}": {} + }, "settings": { "analysis": { "normalizer": { "lowercase_normalizer": { "type": "custom", - "filter": ["lowercase","asciifolding"] + "filter": ["lowercase", "asciifolding"] } - } + } } }, "mappings": { - "crash-alarm": { - "_all": { - "enabled": false - }, - "properties": { - "@timestamp":{ - "type":"date" - }, - "app_id": { - "type": "keyword", - "ignore_above" : 256 - }, - "rasp_id": { - "type": "keyword", - "ignore_above" : 256 - }, - "language": { - "type": "keyword", - "ignore_above" : 64 - }, - "relativity": { - "type": "boolean" - }, - "event_time": { - "type": "date" - }, - "hostname": { - "type": "keyword", - "ignore_above": 256, - "normalizer": "lowercase_normalizer" - }, - "plugin_name": { - "type": "keyword", - "ignore_above": 256 - }, - "register_ip": { - "type": "keyword", - "ignore_above": 128 - }, - "crash_message": { - "type": "keyword" - }, - "crash_log": { - "type": "binary" - } + "properties": { + "@timestamp": { + "type": "date" + }, + "app_id": { + "type": "keyword", + "ignore_above": 256 + }, + "rasp_id": { + "type": "keyword", + "ignore_above": 256 + }, + "language": { + "type": "keyword", + "ignore_above": 64 + }, + "relativity": { + "type": "boolean" + }, + "event_time": { + "type": "date" + }, + "hostname": { + "type": "keyword", + "ignore_above": 256, + "normalizer": "lowercase_normalizer" + }, + "plugin_name": { + "type": "keyword", + "ignore_above": 256 + }, + "register_ip": { + "type": "keyword", + "ignore_above": 128 + }, + "crash_message": { + "type": "keyword" + }, + "crash_log": { + "type": "binary" } } } diff --git a/cloud/src/rasp-cloud/go.mod b/cloud/src/rasp-cloud/go.mod index ea39dfb35..ddea2212d 100644 --- a/cloud/src/rasp-cloud/go.mod +++ b/cloud/src/rasp-cloud/go.mod @@ -18,16 +18,14 @@ require ( github.com/jcmturner/gofork v1.0.0 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect github.com/klauspost/compress v1.8.7-0.20191010133228-30993c63e1b0 // indirect - github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 // indirect - github.com/olivere/elastic v6.2.13+incompatible + github.com/olivere/elastic/v7 v7.0.31 github.com/oschwald/geoip2-golang v1.4.0 github.com/pierrec/lz4 v2.3.1-0.20190907084430-0554902aa74a+incompatible // indirect github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 // indirect github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d - github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect github.com/smartystreets/goconvey v1.6.4-0.20181108003508-044398e4856c - golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 gopkg.in/jcmturner/gokrb5.v7 v7.3.0 // indirect gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 gopkg.in/sourcemap.v1 v1.0.5 // indirect diff --git a/cloud/src/rasp-cloud/go.sum b/cloud/src/rasp-cloud/go.sum index 69fc0028b..62ae1917e 100644 --- a/cloud/src/rasp-cloud/go.sum +++ b/cloud/src/rasp-cloud/go.sum @@ -1,5 +1,6 @@ bou.ke/monkey v1.0.2 h1:kWcnsrCNUatbxncxR/ThdYqbytgOIArtYWqcQLQzKLI= bou.ke/monkey v1.0.2/go.mod h1:OqickVX3tNx6t33n1xvtTtu85YN5s6cKwVug+oHMaIA= +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Shopify/sarama v1.24.0 h1:99vo5VAgQybHwZwiOy/RX/S3i0somjGxur3pLeheqzI= @@ -14,9 +15,9 @@ github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGn github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk= github.com/astaxie/beego v1.12.3 h1:SAQkdD2ePye+v8Gn1r4X6IKZM1wd28EyUOVQ3PDSOOQ= github.com/astaxie/beego v1.12.3/go.mod h1:p3qIm0Ryx7zeBHLljmd7omloyca1s4yu1a8kM1FkpIA= +github.com/aws/aws-sdk-go v1.42.23/go.mod h1:gyRszuZ/icHmHAVE4gc/r+cfCmhA1AD+vqfWbgI+eHs= github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ= github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542/go.mod h1:kSeGC/p1AbBiEp5kat81+DSQrZenVBZXklMLaELspWU= -github.com/belogik/goes v0.0.0-20151229125003-e54d722c3aff/go.mod h1:PhH1ZhyCzHKt4uAasyx+ljRCgoezetRNf59CUtwUkqY= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -25,12 +26,13 @@ github.com/bouk/monkey v1.0.2-0.20180914095644-e8ac0cba3b42 h1:3zpyRwHMLFoPEbgJx github.com/bouk/monkey v1.0.2-0.20180914095644-e8ac0cba3b42/go.mod h1:PG/63f4XEUlVyW1ttIeOJmJhhe1+t9EC/je3eTjvFhE= github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60= github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= -github.com/couchbase/go-couchbase v0.0.0-20181122212707-3e9b6e1258bb/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U= -github.com/couchbase/gomemcached v0.0.0-20181122193126-5125a94a666c/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c= github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c= github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs= github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY= @@ -50,6 +52,10 @@ github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI= github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk= github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/frankban/quicktest v1.4.1 h1:Wv2VwvNn73pAdFIVUQRXYDFp31lXKbqblIXo/Q5GPSg= @@ -61,10 +67,13 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-redis/redis v6.14.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= -github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -73,19 +82,26 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2-0.20190904063534-ff6b7dc882cf h1:gFVkHXmVAhEbxZVDln5V9GKrLaluNoFHDbrZwAWZgws= github.com/golang/snappy v0.0.2-0.20190904063534-ff6b7dc882cf/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= -github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de h1:F7WD09S8QB4LrkEpka0dFPLSotH11HRpCsLIbIcJ7sU= github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= @@ -101,6 +117,10 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1: github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= @@ -118,9 +138,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic= -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -129,12 +148,14 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/olivere/elastic v6.2.13+incompatible h1:CtRJjRENblXPfJ1F9T4D+NTvr/oqvbm/U58HXshhp1M= -github.com/olivere/elastic v6.2.13+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= +github.com/olivere/elastic/v7 v7.0.31 h1:VJu9/zIsbeiulwlRCfGQf6Tzsr++uo+FeUgj5oj+xKk= +github.com/olivere/elastic/v7 v7.0.31/go.mod h1:idEQxe7Es+Wr4XAuNnJdKeMZufkA9vQprOIFck061vg= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/oschwald/geoip2-golang v1.4.0 h1:5RlrjCgRyIGDz/mBmPfnAF4h8k0IAcRv9PvrpOfz+Ug= github.com/oschwald/geoip2-golang v1.4.0/go.mod h1:8QwxJvRImBH+Zl6Aa6MaIcs5YdlZSTKtzmPGzQqi9ng= github.com/oschwald/maxminddb-golang v1.6.0 h1:KAJSjdHQ8Kv45nFIbtoLGrGWqHFajOIm7skTyz/+Dls= @@ -145,7 +166,6 @@ github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHu github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.3.1-0.20190907084430-0554902aa74a+incompatible h1:FWH/b3aMwIvGvmwWIQn6Y7gviJSPtD3waAG3J3paAoc= github.com/pierrec/lz4 v2.3.1-0.20190907084430-0554902aa74a+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -158,6 +178,7 @@ github.com/prometheus/client_golang v1.7.0 h1:wCi7urQOGBsYcQROHqpUUX4ct84xp40t9R github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -175,24 +196,24 @@ github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d/go.mod h1:xvqspo github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 h1:X+yvsM2yrEktyI+b2qND5gpH8YhURn0k8OCaeRnkINo= github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg= github.com/siddontang/go v0.0.0-20170517070808-cb568a3e5cc0/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw= -github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw= github.com/siddontang/goredis v0.0.0-20150324035039-760763f78400/go.mod h1:DDcKzU3qCuvj/tPnimWSsZZzvk9qvkvrIL5naVBPh5s= -github.com/siddontang/ledisdb v0.0.0-20181029004158-becf5f38d373/go.mod h1:mF1DpOSOUiJRMR+FDqaqu3EBqrybQtrDDszLUZ6oxPg= github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY= -github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.1.1 h1:T/YLemO5Yp7KPzS+lVtu+WsHn8yoSwTfItdAd1r3cck= +github.com/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= +github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= github.com/smartystreets/goconvey v1.6.4-0.20181108003508-044398e4856c h1:OJ3W7JDd3Yv+4ewMkqu0wKn6EKZ5MFv3KN55LJp65Rw= github.com/smartystreets/goconvey v1.6.4-0.20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= +github.com/smartystreets/gunit v1.4.2/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak= github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0= github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0= github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= @@ -200,52 +221,87 @@ github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqI github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5 h1:bselrhR0Or1vomJZC8ZIjWtbDmn9OYFLX5Ik9alpJpE= golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e h1:nFYrTHrdrAOpShe27kaFHjsqYSEQ0KWqdWLu3xuZJts= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g= golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 h1:ogLJMz+qpzav7lGMh10LMvAkM/fAoGlaiiHYiFYdm80= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/jcmturner/aescts.v1 v1.0.1 h1:cVVZBK2b1zY26haWB4vbBiZrfFQnfbTVrE3xZq6hrEw= @@ -259,18 +315,18 @@ gopkg.in/jcmturner/gokrb5.v7 v7.3.0 h1:0709Jtq/6QXEuWRfAm260XqlpcwL1vxtO1tUE2qK8 gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= gopkg.in/jcmturner/rpc.v1 v1.1.0 h1:QHIUxTX1ISuAv9dD2wJ9HWQVuWDX/Zc0PfeC2tjc4rU= gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce h1:xcEWjVhvbDy+nHP67nPDDpbYrY+ILlfndk4bRioVHaU= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/sourcemap.v1 v1.0.5 h1:inv58fC9f9J3TK2Y2R1NPntXEn3/wjWHkonhIUODNTI= gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/cloud/src/rasp-cloud/main.go b/cloud/src/rasp-cloud/main.go index 020210656..d1abf682d 100755 --- a/cloud/src/rasp-cloud/main.go +++ b/cloud/src/rasp-cloud/main.go @@ -15,14 +15,14 @@ package main import ( - _ "rasp-cloud/environment" - _ "rasp-cloud/models" - _ "rasp-cloud/filter" - _ "rasp-cloud/controllers" "github.com/astaxie/beego" "rasp-cloud/controllers" - "rasp-cloud/routers" + _ "rasp-cloud/controllers" "rasp-cloud/environment" + _ "rasp-cloud/environment" + _ "rasp-cloud/filter" + _ "rasp-cloud/models" + "rasp-cloud/routers" ) func main() { diff --git a/cloud/src/rasp-cloud/models/app.go b/cloud/src/rasp-cloud/models/app.go index d26da161d..df3aa93cb 100644 --- a/cloud/src/rasp-cloud/models/app.go +++ b/cloud/src/rasp-cloud/models/app.go @@ -751,7 +751,7 @@ func getTestAlarmData(app *App) []map[string]interface{} { result := make([]map[string]interface{}, len(hits)) for index, item := range hits { result[index] = make(map[string]interface{}) - if err := json.Unmarshal(*item.Source, &result[index]); err != nil { + if err := json.Unmarshal(item.Source, &result[index]); err != nil { beego.Error(err) } } diff --git a/cloud/src/rasp-cloud/models/dependency.go b/cloud/src/rasp-cloud/models/dependency.go index ca8571ef0..388341bdc 100644 --- a/cloud/src/rasp-cloud/models/dependency.go +++ b/cloud/src/rasp-cloud/models/dependency.go @@ -6,7 +6,7 @@ import ( "encoding/json" "fmt" "github.com/astaxie/beego" - "github.com/olivere/elastic" + "github.com/olivere/elastic/v7" "rasp-cloud/es" "rasp-cloud/models/logs" "sort" @@ -82,7 +82,7 @@ func AddDependency(rasp *Rasp, dependencies []*Dependency) error { if err != nil { return err } - return es.BulkInsert(es.GetIndex(AliasDependencyIndexName, rasp.AppId), dependencyType, docsMap) + return es.BulkInsert(es.GetIndex(AliasDependencyIndexName, rasp.AppId), docsMap) } func SearchDependency(appId string, param *SearchDependencyParam) (int64, []map[string]interface{}, error) { @@ -108,11 +108,11 @@ func SearchDependency(appId string, param *SearchDependencyParam) (int64, []map[ result := make([]map[string]interface{}, 0, param.Perpage) if queryResult != nil && queryResult.Hits != nil && queryResult.Hits.Hits != nil { hits := queryResult.Hits.Hits - total = queryResult.Hits.TotalHits + total = queryResult.Hits.TotalHits.Value result = make([]map[string]interface{}, len(hits)) for index, item := range hits { result[index] = make(map[string]interface{}) - err := json.Unmarshal(*item.Source, &result[index]) + err := json.Unmarshal(item.Source, &result[index]) if err != nil { return 0, nil, err } @@ -152,7 +152,7 @@ func AggrDependencyByQuery(appId string, param *SearchDependencyParam) (int64, [ if strings.Compare(es.Version[0:1], "5") > 0 { aggr.OrderByKeyAsc() } else { - aggr.OrderByTermAsc() + aggr.OrderByKeyAsc() } queryResult, err := es.ElasticClient.Search(index). Query(query). @@ -181,7 +181,7 @@ func AggrDependencyByQuery(appId string, param *SearchDependencyParam) (int64, [ if topHit, ok := item.TopHits(dependencyTopHitName); ok && topHit.Hits != nil && topHit.Hits.Hits != nil { hits := topHit.Hits.Hits if len(hits) > 0 { - err := json.Unmarshal(*hits[0].Source, &value) + err := json.Unmarshal(hits[0].Source, &value) if err != nil { return 0, nil, err } @@ -230,12 +230,12 @@ func getDependencyQuery(param *SearchDependencyParam) (query *elastic.BoolQuery, func RemoveExpiredDependency(appId string, timestamp int) error { query := elastic.NewRangeQuery("@timestamp").Lte(timestamp) - return es.DeleteByQuery(es.GetIndex(AliasDependencyIndexName, appId), dependencyType, query) + return es.DeleteByQuery(es.GetIndex(AliasDependencyIndexName, appId), query) } func RemoveDependencyByRasp(appId string, raspId string) error { query := elastic.NewBoolQuery().Filter(elastic.NewTermQuery("rasp_id", raspId)) - return es.DeleteByQuery(es.GetIndex(AliasDependencyIndexName, appId), dependencyType, query) + return es.DeleteByQuery(es.GetIndex(AliasDependencyIndexName, appId), query) } func RemoveDependencyByApp(appId string) error { diff --git a/cloud/src/rasp-cloud/models/logs/attack_alarm.go b/cloud/src/rasp-cloud/models/logs/attack_alarm.go index 3a0776a89..9521adc3c 100755 --- a/cloud/src/rasp-cloud/models/logs/attack_alarm.go +++ b/cloud/src/rasp-cloud/models/logs/attack_alarm.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" "github.com/astaxie/beego" - "github.com/olivere/elastic" + "github.com/olivere/elastic/v7" "github.com/oschwald/geoip2-golang" "net" "net/url" @@ -145,7 +145,7 @@ func AggregationAttackWithTime(startTime int64, endTime int64, interval string, timeAggrName := "aggr_time" interceptAggrName := "request_sum" timeAggr := elastic.NewDateHistogramAggregation().Field("event_time").TimeZone(timeZone). - Interval(interval).ExtendedBounds(startTime, endTime) + CalendarInterval(interval).ExtendedBounds(startTime, endTime) interceptAggr := elastic.NewTermsAggregation().Field("intercept_state") timeAggr.SubAggregation(interceptAggrName, interceptAggr) timeQuery := elastic.NewRangeQuery("event_time").Gte(startTime).Lte(endTime) diff --git a/cloud/src/rasp-cloud/models/logs/log_handle.go b/cloud/src/rasp-cloud/models/logs/log_handle.go index 39f41bcfb..b23ec1ccb 100644 --- a/cloud/src/rasp-cloud/models/logs/log_handle.go +++ b/cloud/src/rasp-cloud/models/logs/log_handle.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/astaxie/beego" "github.com/astaxie/beego/logs" - "github.com/olivere/elastic" + "github.com/olivere/elastic/v7" "net/url" "os" "path" @@ -365,12 +365,12 @@ func SearchLogs(startTime int64, endTime int64, isAttachAggr bool, query map[str if !isAttachAggr { if queryResult != nil && queryResult.Hits != nil && queryResult.Hits.Hits != nil { hits := queryResult.Hits.Hits - total = queryResult.Hits.TotalHits + total = queryResult.Hits.TotalHits.Value result = make([]map[string]interface{}, len(hits)) for index, item := range hits { result[index] = make(map[string]interface{}) var filterId string - err := json.Unmarshal(*item.Source, &result[index]) + err := json.Unmarshal(item.Source, &result[index]) if err != nil { return 0, nil, err } @@ -410,7 +410,7 @@ func SearchLogs(startTime int64, endTime int64, isAttachAggr bool, query map[str topHit.Hits != nil && topHit.Hits.Hits != nil { hits := topHit.Hits.Hits if len(hits) > 0 { - err := json.Unmarshal(*hits[0].Source, &value) + err := json.Unmarshal(hits[0].Source, &value) if err != nil { return 0, nil, err } diff --git a/cloud/src/rasp-cloud/models/report.go b/cloud/src/rasp-cloud/models/report.go index fbc90f2c7..e0d0613b4 100644 --- a/cloud/src/rasp-cloud/models/report.go +++ b/cloud/src/rasp-cloud/models/report.go @@ -15,10 +15,10 @@ package models import ( + "context" + "github.com/olivere/elastic/v7" "rasp-cloud/es" "time" - "github.com/olivere/elastic" - "context" ) type ReportData struct { @@ -39,18 +39,18 @@ func init() { } func CreateReportDataEsIndex(appId string) error { - return es.CreateEsIndex(ReportIndexName + "-" + appId, - AliasReportIndexName + "-" + appId, reportType + "-template") + return es.CreateEsIndex(ReportIndexName+"-"+appId, + AliasReportIndexName+"-"+appId, reportType+"-template") } func CreateDependencyEsIndex(appId string) error { - return es.CreateEsIndex(DependencyIndexName + "-" + appId, - AliasDependencyIndexName + "-" + appId,"dependency-data-template") + return es.CreateEsIndex(DependencyIndexName+"-"+appId, + AliasDependencyIndexName+"-"+appId, "dependency-data-template") } func AddReportData(reportData *ReportData, appId string) error { reportData.InsertTime = time.Now().Unix() * 1000 - return es.Insert(AliasReportIndexName+"-"+appId, reportType, reportData) + return es.Insert(AliasReportIndexName+"-"+appId, reportData) } func GetHistoryRequestSum(startTime int64, endTime int64, interval string, timeZone string, @@ -60,11 +60,11 @@ func GetHistoryRequestSum(startTime int64, endTime int64, interval string, timeZ timeAggrName := "aggr_time" sumAggrName := "request_sum" timeAggr := elastic.NewDateHistogramAggregation().Field("time").TimeZone(timeZone). - Interval(interval).ExtendedBounds(startTime, endTime) + CalendarInterval(interval).ExtendedBounds(startTime, endTime) requestSumAggr := elastic.NewSumAggregation().Field("request_sum") timeAggr.SubAggregation(sumAggrName, requestSumAggr) timeQuery := elastic.NewRangeQuery("time").Gte(startTime).Lte(endTime) - aggrResult, err := es.ElasticClient.Search(AliasReportIndexName + "-" + appId). + aggrResult, err := es.ElasticClient.Search(AliasReportIndexName+"-"+appId). Query(timeQuery). Aggregation(timeAggrName, timeAggr). Size(0). diff --git a/cloud/src/rasp-cloud/tests/log_test.go b/cloud/src/rasp-cloud/tests/log_test.go index e04b9e45a..a68652faf 100644 --- a/cloud/src/rasp-cloud/tests/log_test.go +++ b/cloud/src/rasp-cloud/tests/log_test.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" "github.com/bouk/monkey" - "github.com/olivere/elastic" + "github.com/olivere/elastic/v7" . "github.com/smartystreets/goconvey/convey" "rasp-cloud/models/logs" "rasp-cloud/tests/inits"