ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make HTTP Event Trigger and DropIn Trigger act for pass off to object detector

pushover
Moe 2020-01-17 23:20:16 -08:00
parent 9efa2e3c16
commit e6144ef1c1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/dropInEvents.js
View File

@ -109,7 +109,8 @@ module.exports = function(s,config,lang,app,io){
name: filename,
plug: "dropInEvent",
reason: reason
}
},
doObjectDetection: (s.isAtleatOneDetectorPluginConnected && s.group[ke].rawMonitorConfigurations[mid].details.detector_use_detect_object === '1')
},config.dropInEventForceSaveEvent)
}
if(search(filename,'.txt')){
@ -229,6 +230,7 @@ module.exports = function(s,config,lang,app,io){
if(session.monitorId){
var ke = session.user
var monitorId = session.monitorId
var details = s.group[ke].rawMonitorConfigurations[monitorId].details
var reasonTag = 'smtpServer'
var text = ''
stream.on('data',function(data){
@ -266,7 +268,8 @@ module.exports = function(s,config,lang,app,io){
name: 'smtpServer',
plug: "dropInEvent",
reason: reasonTag
}
},
doObjectDetection: (s.isAtleatOneDetectorPluginConnected && details.detector_use_detect_object === '1')
},config.dropInEventForceSaveEvent)
callback()
})

1
libs/webServerPaths.js
View File

@ -1757,6 +1757,7 @@ module.exports = function(s,config,lang,app,io){
}
break;
}
d.doObjectDetection = (!d.details.matrices || d.details.matrices.length === 0) && (s.isAtleatOneDetectorPluginConnected && details.detector_use_detect_object === '1')
s.triggerEvent(d)
s.closeJsonResponse(res,{
ok: true,