github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-06-25 07:45:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed validation rules when fetching data from db (#378)

Browse Source
This commit is contained in:
RoyUP9 2021-10-20 08:37:20 +03:00 committed by GitHub
parent 47f2e69b7e
commit 3a9c113f77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
agent/pkg/controllers/entries_controller.go
View File

@ -35,7 +35,6 @@ func GetEntries(c *gin.Context) {
database.GetEntriesTable(). database.GetEntriesTable().
Order(fmt.Sprintf("timestamp %s", order)). Order(fmt.Sprintf("timestamp %s", order)).
Where(fmt.Sprintf("timestamp %s %v", operatorSymbol, entriesFilter.Timestamp)). Where(fmt.Sprintf("timestamp %s %v", operatorSymbol, entriesFilter.Timestamp)).
Omit("entry"). // remove the "big" entry field
Limit(entriesFilter.Limit). Limit(entriesFilter.Limit).
Find(&entries) Find(&entries)
@ -45,12 +44,21 @@ func GetEntries(c *gin.Context) {
} }
baseEntries := make([]tapApi.BaseEntryDetails, 0) baseEntries := make([]tapApi.BaseEntryDetails, 0)
for _, data := range entries { for _, entry := range entries {
harEntry := tapApi.BaseEntryDetails{} baseEntryDetails := tapApi.BaseEntryDetails{}
if err := models.GetEntry(&data, &harEntry); err != nil { if err := models.GetEntry(&entry, &baseEntryDetails); err != nil {
continue continue
} }
baseEntries = append(baseEntries, harEntry)
var pair tapApi.RequestResponsePair
json.Unmarshal([]byte(entry.Entry), &pair)
harEntry, err := utils.NewEntry(&pair)
if err == nil {
rules, _, _ := models.RunValidationRulesState(*harEntry, entry.Service)
baseEntryDetails.Rules = rules
}
baseEntries = append(baseEntries, baseEntryDetails)
} }
c.JSON(http.StatusOK, baseEntries) c.JSON(http.StatusOK, baseEntries)