From b8bce69ca2d989b54addd89bf067ba0a54b2da02 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 23 十一月 2020 19:14:34 +0800
Subject: [PATCH] add security
---
EsClient.go | 179 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 95 insertions(+), 84 deletions(-)
diff --git a/EsClient.go b/EsClient.go
index 3e6fd24..f63abff 100644
--- a/EsClient.go
+++ b/EsClient.go
@@ -3,60 +3,18 @@
import (
"basic.com/pubsub/protomsg.git"
"bytes"
+ "encoding/base64"
"encoding/json"
"errors"
"fmt"
- "io"
+ "github.com/spf13/viper"
"io/ioutil"
+ "log"
"math"
"net/http"
- "strings"
"time"
)
-func GetEsDataReq(url string, parama string, isSource bool) map[string]interface{} {
- //fmt.Println("es 鏌ヨ璇锋眰璺緞" + url) // 閰嶇疆淇℃伅 鑾峰彇
- var dat map[string]interface{}
- req, err := http.NewRequest("POST", url, strings.NewReader(parama))
- req.Header.Add("Content-Type", "application/json")
- timeout := time.Duration(10 * time.Second) //瓒呮椂鏃堕棿50ms
- client := &http.Client{Timeout: timeout}
- resp, err := client.Do(req)
- if err != nil {
- fmt.Println(err)
- return dat
- }
- defer resp.Body.Close()
- dec := json.NewDecoder(resp.Body)
- if err := dec.Decode(&dat); err == io.EOF {
- fmt.Println(err.Error())
- return dat
- } else if err != nil {
- fmt.Println(err.Error())
- return dat
- }
- // 鏄惁闇�瑕� 瑙ｆ瀽 es 杩斿洖鐨� source
- if isSource {
- dat = dat["hits"].(map[string]interface{})
- var data = make(map[string]interface{}, 2)
- data["total"] = dat["total"]
- sources := []interface{}{}
- for _, value := range dat["hits"].([]interface{}) {
- source := value.(map[string]interface{})["_source"].(map[string]interface{})
- //source["id"] = source["id"]
- /*sdkType := source["sdkType"]
- if sdkType != nil {
- sdk, _ := strconv.Atoi(sdkType.(string))
- source["sdkType"] = sdkTypeToValue(sdk)
- }*/
- sources = append(sources, source)
- }
- data["datalist"] = sources
- return data
- } else {
- return dat
- }
-}
func Parsesources(sources []map[string]interface{}) (multiInfos []*protomsg.MultiFeaCache) {
var ok bool
@@ -476,8 +434,7 @@
return tmpinfos
}
-
-func FaceSourceAggregations(buf []byte, thresholdTime int,thresholdStayTime int) (sources []map[string]interface{}, err error) {
+func FaceSourceAggregations(buf []byte, thresholdTime int, thresholdStayTime int) (sources []map[string]interface{}, err error) {
loc, err := time.LoadLocation("Asia/Shanghai")
if err != nil {
return nil, errors.New("鏃跺尯璁剧疆閿欒")
@@ -507,7 +464,7 @@
indexLength := len(finalHits)
point := 0
for _, in := range finalHits {
- point = point+1
+ point = point + 1
tmpHitSource := make(map[string]interface{})
tmpBuf, ok := in.(map[string]interface{})
if !ok {
@@ -522,28 +479,33 @@
baseInfo := source["baseInfo"].([]interface{})[0].(map[string]interface{})
targetInfo := source["targetInfo"].([]interface{})[0].(map[string]interface{})
tmpTime := source["picDate"].(string)
+ if len(tmpTime) > 19 {
+ tmpTime = tmpTime[:19]
+ }
mTime, err := time.ParseInLocation("2006-01-02 15:04:05", tmpTime, loc)
if err != nil {
return nil, errors.New("鏃堕棿瑙ｆ瀽閿欒")
}
sTime := tmpTime
- eTime := mTime.Add(time.Second*1).Format("2006-01-02 15:04:05")
+ eTime := mTime.Add(time.Second * 1).Format("2006-01-02 15:04:05")
stayTime := 1.0
- if startTime != "" && point < indexLength{
+ if startTime != "" && point <= indexLength {
sinTime, _ := time.ParseInLocation("2006-01-02 15:04:05", startTime, loc)
passTime := math.Abs(mTime.Sub(sinTime).Seconds())
hitsSources[len(hitsSources)-1]["stayTime"] = stayTime
//fmt.Println("passTime: ", passTime)
- if int(passTime) <= thresholdTime || point == indexLength{
- startTime = tmpTime
- hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
- if point == indexLength{
+ if int(passTime) <= thresholdTime {
+ if point == indexLength {
hitStartTime := hitsSources[len(hitsSources)-1]["startTime"].(string)
realStartTime, _ := time.ParseInLocation("2006-01-02 15:04:05", hitStartTime, loc)
stayTime = math.Abs(mTime.Sub(realStartTime).Seconds())
hitsSources[len(hitsSources)-1]["stayTime"] = stayTime
+ hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
startTime = ""
+ } else {
+ startTime = tmpTime
+ hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
}
continue
} else {
@@ -556,12 +518,16 @@
sinTime.Add(time.Second * 1)
sinTime.Format("2006-01-02 15:04:05")
hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
- stayTime = 1
+ stayTime = 1
+ } else if stayTime == 0 {
+ stayTime = 1
+ hitsSources[len(hitsSources)-1]["endTime"] = realEndTime.Add(time.Second * 1).Format("2006-01-02 15:04:05")
}
hitsSources[len(hitsSources)-1]["stayTime"] = stayTime
+ if point == indexLength {
+ stayTime = 1
+ }
startTime = ""
- continue
- //fmt.Println(hitsSources[len(hitsSources)-1])
}
}
//fmt.Println("========================================================")
@@ -582,7 +548,7 @@
return allSource, nil
}
-func SourceDeduplication(buf [] byte) ([]map[string]interface{},error) {
+func SourceDeduplication(buf [] byte) ([]map[string]interface{}, error) {
var info interface{}
json.Unmarshal(buf, &info)
out, ok := info.(map[string]interface{})
@@ -598,7 +564,7 @@
if len(buckets) == 0 {
return nil, nil
}
- faceId := make([]map[string]interface{},0)
+ faceId := make([]map[string]interface{}, 0)
for _, in := range buckets {
tmpInfo := make(map[string]interface{})
topAttentionHits := in.(map[string]interface{})["top_attention_hits"].(map[string]interface{})
@@ -608,11 +574,11 @@
tmpInfo["lastTime"] = finalHits[0].(map[string]interface{})["_source"].(map[string]interface{})["picDate"].(string)
faceId = append(faceId, tmpInfo)
}
- return faceId,nil
+ return faceId, nil
}
//瑙ｆ瀽鑱氬悎璁℃暟缁撴瀯
-func SourceStatistics(buf [] byte) ([]map[string]interface{},error) {
+func SourceStatistics(buf [] byte) ([]map[string]interface{}, error) {
var info interface{}
json.Unmarshal(buf, &info)
out, ok := info.(map[string]interface{})
@@ -628,14 +594,14 @@
if len(buckets) == 0 {
return nil, nil
}
- resultData := make([]map[string]interface{},0)
+ resultData := make([]map[string]interface{}, 0)
for _, pick := range buckets {
- data := make(map[string]interface{},0)
+ data := make(map[string]interface{}, 0)
data["areaId"] = pick.(map[string]interface{})["key"].(map[string]interface{})["areaId"].(string)
data["peopleNum"] = int(pick.(map[string]interface{})["doc_count"].(float64))
resultData = append(resultData, data)
}
- return resultData,nil
+ return resultData, nil
}
func SourceAggregations(buf [] byte, thresholdTime float64, queryUseTime float64) (sources map[string]interface{}, err error) {
@@ -672,7 +638,7 @@
indexLength := len(finalHits)
point := 0
for _, in := range finalHits {
- point = point+1
+ point = point + 1
tmpHitSource := make(map[string]interface{})
tmpbuf, ok := in.(map[string]interface{})
if !ok {
@@ -687,27 +653,33 @@
baseInfo := source["baseInfo"].([]interface{})[0].(map[string]interface{})
targetInfo := source["targetInfo"].([]interface{})[0].(map[string]interface{})
tmpTime := source["picDate"].(string)
+ if len(tmpTime) > 19 {
+ tmpTime = tmpTime[:19]
+ }
mTime, err := time.ParseInLocation("2006-01-02 15:04:05", tmpTime, loc)
if err != nil {
return nil, errors.New("鏃堕棿瑙ｆ瀽閿欒")
}
sTime := tmpTime
- eTime := mTime.Add(time.Second*1).Format("2006-01-02 15:04:05")
+ eTime := mTime.Add(time.Second * 1).Format("2006-01-02 15:04:05")
stayTime := 1.0
- if startTime != "" && point < indexLength{
+ if startTime != "" && point <= indexLength {
sinTime, _ := time.ParseInLocation("2006-01-02 15:04:05", startTime, loc)
passTime := math.Abs(mTime.Sub(sinTime).Seconds())
hitsSources[len(hitsSources)-1]["stayTime"] = stayTime
//fmt.Println("passTime: ", passTime)
- if passTime <= thresholdTime || point == indexLength{
- startTime = tmpTime
- hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
- if point == indexLength{
+ if passTime <= thresholdTime {
+ if point == indexLength {
hitStartTime := hitsSources[len(hitsSources)-1]["startTime"].(string)
realStartTime, _ := time.ParseInLocation("2006-01-02 15:04:05", hitStartTime, loc)
stayTime = math.Abs(mTime.Sub(realStartTime).Seconds())
hitsSources[len(hitsSources)-1]["stayTime"] = stayTime
+ hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
+ startTime = ""
+ } else {
+ startTime = tmpTime
+ hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
}
continue
} else {
@@ -720,12 +692,16 @@
sinTime.Add(time.Second * 1)
sinTime.Format("2006-01-02 15:04:05")
hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
- stayTime = 1
+ stayTime = 1
+ } else if stayTime == 0 {
+ stayTime = 1
+ hitsSources[len(hitsSources)-1]["endTime"] = realEndTime.Add(time.Second * 1).Format("2006-01-02 15:04:05")
}
hitsSources[len(hitsSources)-1]["stayTime"] = stayTime
+ if point == indexLength {
+ stayTime = 1
+ }
startTime = ""
- continue
- //fmt.Println(hitsSources[len(hitsSources)-1])
}
}
//fmt.Println("========================================================")
@@ -795,7 +771,7 @@
startTime := ""
//fmt.Println("finalHits: ",finalHits)
for _, in := range finalHits {
- point = point+1
+ point = point + 1
tmpHitSource := make(map[string]interface{})
tmpbuf, ok := in.(map[string]interface{})
if !ok {
@@ -810,27 +786,33 @@
baseInfo := source["baseInfo"].([]interface{})[0].(map[string]interface{})
targetInfo := source["targetInfo"].([]interface{})[0].(map[string]interface{})
tmpTime := source["picDate"].(string)
+ if len(tmpTime) > 19 {
+ tmpTime = tmpTime[:19]
+ }
mTime, err := time.ParseInLocation("2006-01-02 15:04:05", tmpTime, loc)
if err != nil {
return nil, errors.New("鏃堕棿瑙ｆ瀽閿欒")
}
sTime := tmpTime
- eTime := mTime.Add(time.Second*1).Format("2006-01-02 15:04:05")
+ eTime := mTime.Add(time.Second * 1).Format("2006-01-02 15:04:05")
stayTime := 1.0
- if startTime != "" && point < indexLength{
+ if startTime != "" && point <= indexLength {
sinTime, _ := time.ParseInLocation("2006-01-02 15:04:05", startTime, loc)
passTime := math.Abs(mTime.Sub(sinTime).Seconds())
hitsSources[len(hitsSources)-1]["stayTime"] = stayTime
//fmt.Println("passTime: ", passTime)
- if passTime <= thresholdTime || point == indexLength{
- startTime = tmpTime
- hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
- if point == indexLength{
+ if passTime <= thresholdTime {
+ if point == indexLength {
hitStartTime := hitsSources[len(hitsSources)-1]["startTime"].(string)
realStartTime, _ := time.ParseInLocation("2006-01-02 15:04:05", hitStartTime, loc)
stayTime = math.Abs(mTime.Sub(realStartTime).Seconds())
hitsSources[len(hitsSources)-1]["stayTime"] = stayTime
+ hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
+ startTime = ""
+ } else {
+ startTime = tmpTime
+ hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
}
continue
} else {
@@ -843,12 +825,16 @@
sinTime.Add(time.Second * 1)
sinTime.Format("2006-01-02 15:04:05")
hitsSources[len(hitsSources)-1]["endTime"] = tmpTime
- stayTime = 1
+ stayTime = 1
+ } else if stayTime == 0 {
+ stayTime = 1
+ hitsSources[len(hitsSources)-1]["endTime"] = realEndTime.Add(time.Second * 1).Format("2006-01-02 15:04:05")
}
hitsSources[len(hitsSources)-1]["stayTime"] = stayTime
+ if point == indexLength {
+ stayTime = 1
+ }
startTime = ""
- continue
- //fmt.Println(hitsSources[len(hitsSources)-1])
}
}
startTime = tmpTime
@@ -1060,6 +1046,7 @@
}
request, err := http.NewRequest(method, url, bytes.NewBuffer(parama))
request.Header.Set("Content-type", "application/json")
+ request.Header.Set("Authorization",Token)
if err != nil {
fmt.Println("build request fail !")
@@ -1095,3 +1082,27 @@
// fmt.Println(key, "is nil can not asign")
// }
//}
+
+type account struct {
+ Username string `mapstructure: "username"`
+ Userpassword string `mapstructure: "userpassword"`
+}
+
+
+var Account = &account{}
+
+var Token string
+
+func init() {
+ v := viper.New()
+ v.SetConfigType("yaml")
+ v.SetConfigName("pro")
+ v.AddConfigPath("/opt/vasystem/config/")
+ err := v.ReadInConfig()
+ if err != nil {
+ log.Fatal("err on parsing configuration file!",err)
+ }
+ v.UnmarshalKey("es.account",Account)
+
+ Token = "Basic "+base64.StdEncoding.EncodeToString([]byte(Account.Username+":"+Account.Userpassword))
+}
--
Gitblit v1.8.0