Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add transaction search logic and update version to 1.5.35 #474

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions controller/v1/search.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,68 @@ func (sc *SearchController) GetTransaction(c echo.Context) error {

}

// swagger:operation POST /call/transaction search searchGetTransaction
//
// Returns transaction data based upon filtered json
// ---
// consumes:
// - application/json
// produces:
// - application/json
// parameters:
// - name: SearchObject
// in: body
// type: object
// description: SearchObject parameters
// schema:
// "$ref": "#/definitions/SearchCallData"
// required: true
// SecurityDefinitions:
// bearer:
// type: apiKey
// name: Authorization
// in: header
// responses:
// '200': body:ListUsers
// '400': body:UserLoginFailureResponse
func (sc *SearchController) GetTransactionV2(c echo.Context) error {
transactionObject := model.SearchObject{}
if err := c.Bind(&transactionObject); err != nil {
logger.Error(err.Error())
return httpresponse.CreateBadResponse(&c, http.StatusBadRequest, webmessages.UserRequestFormatIncorrect)
}

transactionData, _ := json.Marshal(transactionObject)
correlation, _ := sc.SettingService.GetCorrelationMapsV2(&transactionObject)
aliasRowData, _ := sc.AliasService.GetAllActive()

aliasData := make(map[string]string)
for _, row := range aliasRowData {
cidr := row.IP + "/" + strconv.Itoa(*row.Mask)
Port := strconv.Itoa(*row.Port)
CaptureID := row.CaptureID
ip, ipnet, err := net.ParseCIDR(cidr)
if err != nil {
logger.Error("ParseCIDR alias CIDR: ["+cidr+"] error: ", err.Error())
} else {
for ip := ip.Mask(ipnet.Mask); ipnet.Contains(ip); inc(ip) {
aliasData[ip.String()+":"+Port] = row.Alias
if config.Setting.MAIN_SETTINGS.UseCaptureIDInAlias {
aliasData[ip.String()+":"+Port+":"+CaptureID] = row.Alias
}
}
}
}

userGroup := auth.GetUserGroup(c)

reply, _ := sc.SearchService.GetTransactionV2(transactionData,
correlation, aliasData, transactionObject.Param.Location.Node,
sc.SettingService, userGroup, transactionObject.Param.WhiteList)

return httpresponse.CreateSuccessResponse(&c, http.StatusCreated, reply)
}

// swagger:route POST /call/report/qos search searchGetTransactionQos
//
// Returns qos data based upon filtered json
Expand Down
Loading