From a4da1dbfac7d504e94815f6d0b60a2389c33ff88 Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Mon, 30 Oct 2023 15:38:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/table/setting/knowledgeBaseTableForCard.vue | 1 - src/utils/date-util.js | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/components/table/setting/knowledgeBaseTableForCard.vue b/src/components/table/setting/knowledgeBaseTableForCard.vue index ad390dad..5770773a 100644 --- a/src/components/table/setting/knowledgeBaseTableForCard.vue +++ b/src/components/table/setting/knowledgeBaseTableForCard.vue @@ -750,7 +750,6 @@ export default { }, tableData: { handler (n) { - console.info(n) if (this.tableData && this.tableData.length > 0) { this.aiTaggingList = [] this.websketchList = [] diff --git a/src/utils/date-util.js b/src/utils/date-util.js index 30431016..aca75caf 100644 --- a/src/utils/date-util.js +++ b/src/utils/date-util.js @@ -121,8 +121,6 @@ export function xAxisTimeFormatter (value) { ':' + (date.getMinutes() < 10 ? `0${date.getMinutes()}` : date.getMinutes()) // 如果是一天的开始 - console.info(date.getTime(), dayStart.getTime(), hourStart.getTime(), date.getTime() === dayStart.getTime(), date.getTime() === hourStart.getTime()) - console.info(getSecond(date.getTime()), getSecond(dayStart.getTime()), getSecond(hourStart.getTime())) if (getSecond(date.getTime()) === getSecond(dayStart.getTime())) { return '{day|' + dateFormat(date, 'YYYY-MM-DD') + '}' } else if (getSecond(date.getTime()) === getSecond(hourStart.getTime())) { From 815af776aae3657131c819d6381227eb716d6814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Mon, 30 Oct 2023 16:05:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dpolicy=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E7=82=B9=E5=87=BBsave=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detections/detectionPolicies/PolicyForm.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/detections/detectionPolicies/PolicyForm.vue b/src/views/detections/detectionPolicies/PolicyForm.vue index b950a640..0730134d 100644 --- a/src/views/detections/detectionPolicies/PolicyForm.vue +++ b/src/views/detections/detectionPolicies/PolicyForm.vue @@ -169,24 +169,34 @@ export default { const obj = this.handleIntervalByDateType(rule, value, this.triggerObj.intervalVal) if (!obj.flag && obj.msg) { callback(new Error(obj.msg)) + } else { + callback() } } - const intervalValValidator = (rule, value) => { + const intervalValValidator = (rule, value, callback) => { const obj = this.handleIntervalByDateType(rule, this.triggerObj.intervalVal, value) if (!obj.flag && obj.msg) { this.$refs.form3.validateField('interval') + callback() + } else { + callback() } } const resetIntervalValidator = (rule, value, callback) => { const obj = this.handleIntervalByDateType(rule, value, this.triggerObj.resetIntervalVal) if (!obj.flag && obj.msg) { callback(new Error(obj.msg)) + } else { + callback() } } - const resetIntervalValValidator = (rule, value) => { + const resetIntervalValValidator = (rule, value, callback) => { const obj = this.handleIntervalByDateType(rule, this.triggerObj.resetIntervalVal, value) if (!obj.flag && obj.msg) { this.$refs.form3.validateField('resetInterval') + callback() + } else { + callback() } } return { @@ -408,6 +418,7 @@ export default { this.myLoading = false }) } else { + console.log('进来') this.myLoading = true axios.put(api.detection.create.create, formObj).then(response => { if (response.status === 200) { From ed1d994d5e6ea3bfdda9761a39589271e6f2c462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Mon, 30 Oct 2023 16:17:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20eventType=E5=8F=96=E6=B6=88=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detections/detectionPolicies/PolicyFilter.vue | 10 ++-------- .../detections/detectionPolicies/PolicyTable.vue | 13 ------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/views/detections/detectionPolicies/PolicyFilter.vue b/src/views/detections/detectionPolicies/PolicyFilter.vue index c27d8ed8..1c71aee8 100644 --- a/src/views/detections/detectionPolicies/PolicyFilter.vue +++ b/src/views/detections/detectionPolicies/PolicyFilter.vue @@ -31,7 +31,7 @@
- {{ item.label }} + {{ item.name }}
@@ -94,13 +94,7 @@ export default { } if (data.eventTypeList) { - this.eventTypeList = [] - data.eventTypeList.forEach(item => { - const obj = detectionUnitList.eventTypeList.find(d => d.value === item.name) - if (obj) { - this.eventTypeList.push({ ...item, label: this.$t(obj.label) }) - } - }) + this.eventTypeList = data.eventTypeList } else { this.eventTypeList = [] } diff --git a/src/views/detections/detectionPolicies/PolicyTable.vue b/src/views/detections/detectionPolicies/PolicyTable.vue index 1a9b1482..fb7d1474 100644 --- a/src/views/detections/detectionPolicies/PolicyTable.vue +++ b/src/views/detections/detectionPolicies/PolicyTable.vue @@ -56,9 +56,6 @@ - @@ -181,16 +178,6 @@ export default { } return label } - }, - changeEventType (value) { - if (value) { - const obj = detectionUnitList.eventTypeList.find(d => d.value === value) - let label = value - if (obj) { - label = this.$t(obj.label) - } - return label - } } } } From dd4f5e1fbab38090895daad6a7dedeb684b67163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Mon, 30 Oct 2023 16:25:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20eventType=E5=8F=96=E6=B6=88=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table/detection/GeneralSettings.vue | 2 +- src/utils/constants.js | 34 ++++++++++++++----- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/components/table/detection/GeneralSettings.vue b/src/components/table/detection/GeneralSettings.vue index e02c1f63..2d0789ff 100644 --- a/src/components/table/detection/GeneralSettings.vue +++ b/src/components/table/detection/GeneralSettings.vue @@ -59,7 +59,7 @@ diff --git a/src/utils/constants.js b/src/utils/constants.js index 14e4e8cf..a2ac0837 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -2478,14 +2478,14 @@ export const detectionUnitList = { { value: 'performance_event', label: 'Performance Event' } */ ], eventTypeList: [ - { value: 'Initial Access', label: 'eventType.initialAccess' }, - { value: 'Command and Control', label: 'eventType.commandAndControl' }, - { value: 'Credential Access', label: 'eventType.credentialAccess' }, - { value: 'Lateral Movement', label: 'eventType.lateralMovement' }, - { value: 'Collection', label: 'eventType.collection' }, - { value: 'Impact', label: 'eventType.impact' }, - { value: 'Anonymity', label: 'eventType.anonymity' }, - { value: 'Regulatory Risk', label: 'eventType.regulatoryRisk' } + { value: 'Initial Access', label: 'Initial Access' }, + { value: 'Command and Control', label: 'Command and Control' }, + { value: 'Credential Access', label: 'Credential Access' }, + { value: 'Lateral Movement', label: 'Lateral Movement' }, + { value: 'Collection', label: 'Collection' }, + { value: 'Impact', label: 'Impact' }, + { value: 'Anonymity', label: 'Anonymity' }, + { value: 'Regulatory Risk', label: 'Regulatory Risk' } ], sourceList: [ { value: 'session_record', label: 'overall.sessionRecord' } @@ -2559,6 +2559,24 @@ export const sourceList = [ } ] +export const durationTimeMapping = [ + { + value: 'h', + labelEN: 'h', + labelCN: '小时' + }, + { + value: 'm', + labelEN: 'm', + labelCN: '分钟' + }, + { + value: 's', + labelEN: 's', + labelCN: '秒' + } +] + // 赛风3IP的type字段字典 export const tagValueLabelMapping = [{ name: 'Psiphon3 Server', value: 'psiphon3_server' }, { name: 'Psiphon3 Server', value: 0 }, { name: 'Psiphon3 CDN', value: 1 }, { name: 'I2P', value: 'i2p' }, { name: 'MTProxy', value: 'mtproxy' }, { name: 'Obfs4', value: 'obfs4' }, { name: 'Snowflake', value: 'snowflake' }, { name: 'Tor', value: 'tor' }, { name: 'Loki Password Stealer', value: 'Loki Password Stealer (PWS)' }, { name: 'IcedID', value: 'IcedID' }, { name: 'QakBot', value: 'QakBot' }, { name: 'Mirai', value: 'Mirai' }, { name: 'BazarBackdoor', value: 'BazarBackdoor' }, { name: 'NjRAT', value: 'NjRAT' }, { name: 'CryptBot', value: 'CryptBot' }, { name: 'BitRAT', value: 'BitRAT' }, { name: 'RedLine Stealer', value: 'RedLine Stealer' }, { name: 'Nanocore RAT', value: 'Nanocore RAT' }, { name: 'DCRat', value: 'DCRat' }, { name: 'Cobalt Strike', value: 'Cobalt Strike' }, { name: 'AsyncRAT', value: 'AsyncRAT' }, { name: 'ostap', value: 'ostap' }, { name: 'Vidar', value: 'Vidar' }, { name: 'magecart', value: 'magecart' }, { name: 'Hancitor', value: 'Hancitor' }, { name: 'SystemBC', value: 'SystemBC' }, { name: 'SmokeLoader', value: 'SmokeLoader' }, { name: 'Remcos', value: 'Remcos' }, { name: 'Amadey', value: 'Amadey' }, { name: 'Ficker Stealer', value: 'Ficker Stealer' }, { name: 'Get2', value: 'Get2' }, { name: 'ISFB', value: 'ISFB' }, { name: 'Dridex', value: 'Dridex' }, { name: 'Pony', value: 'Pony' }, { name: 'Azorult', value: 'Azorult' }, { name: 'NetWire RC', value: 'NetWire RC' }, { name: 'Mozi', value: 'Mozi' }, { name: 'Raccoon', value: 'Raccoon' }, { name: 'Quasar RAT', value: 'Quasar RAT' }, { name: 'Emotet', value: 'Emotet' }, { name: 'Numando', value: 'Numando' }, { name: 'Oski Stealer', value: 'Oski Stealer' }, { name: 'Ave Maria', value: 'Ave Maria' }, { name: 'NetSupportManager RAT', value: 'NetSupportManager RAT' }, { name: 'STRRAT', value: 'STRRAT' }, { name: 'Orcus RAT', value: 'Orcus RAT' }, { name: 'Vjw0rm', value: 'Vjw0rm' }, { name: 'Ghost RAT', value: 'Ghost RAT' }, { name: 'LimeRAT', value: 'LimeRAT' }, { name: 'Astaroth', value: 'Astaroth' }, { name: 'Unknown malware', value: 'Unknown malware' }, { name: 'TrickBot', value: 'TrickBot' }, { name: 'IcedID Downloader', value: 'IcedID Downloader' }, { name: 'BetaBot', value: 'BetaBot' }, { name: 'Agent Tesla', value: 'Agent Tesla' }, { name: 'Bashlite', value: 'Bashlite' }, { name: 'DanaBot', value: 'DanaBot' }, { name: 'Snake', value: 'Snake' }, { name: 'Gozi', value: 'Gozi' }, { name: 'PoshC2', value: 'PoshC2' }, { name: 'Houdini', value: 'Houdini' }, { name: 'BlackNET RAT', value: 'BlackNET RAT' }, { name: 'Revenge RAT', value: 'Revenge RAT' }, { name: 'ServHelper', value: 'ServHelper' }, { name: 'Alien', value: 'Alien' }, { name: 'N-W0rm', value: 'N-W0rm' }, { name: 'LokiBot', value: 'LokiBot' }, { name: 'Zloader', value: 'Zloader' }, { name: 'Crimson RAT', value: 'Crimson RAT' }, { name: 'Grandoreiro', value: 'Grandoreiro' }, { name: 'Buer', value: 'Buer' }, { name: 'Qealler', value: 'Qealler' }, { name: 'FastCash', value: 'FastCash' }, { name: 'CyberGate', value: 'CyberGate' }, { name: 'Formbook', value: 'Formbook' }, { name: 'Hydra', value: 'Hydra' }, { name: 'Arkei Stealer', value: 'Arkei Stealer' }, { name: 'Tsunami', value: 'Tsunami' }, { name: 'AdWind', value: 'AdWind' }, { name: 'Dofloo', value: 'Dofloo' }, { name: 'MrBlack', value: 'MrBlack' }, { name: 'XLoader', value: 'XLoader' }, { name: 'Anatsa', value: 'Anatsa' }, { name: 'TeamBot', value: 'TeamBot' }, { name: 'DiamondFox', value: 'DiamondFox' }, { name: 'BillGates', value: 'BillGates' }, { name: 'Kinsing', value: 'Kinsing' }, { name: 'CCleaner Backdoor', value: 'CCleaner Backdoor' }, { name: 'JSOutProx', value: 'JSOutProx' }, { name: 'SharkBot', value: 'SharkBot' }, { name: 'Empire Downloader', value: 'Empire Downloader' }, { name: 'solarmarker', value: 'solarmarker' }, { name: 'FireBird RAT', value: 'FireBird RAT' }, { name: 'XpertRAT', value: 'XpertRAT' }, { name: 'RMS', value: 'RMS' }, { name: 'GCleaner', value: 'GCleaner' }, { name: 'Unidentified Linux 001', value: 'Unidentified Linux 001' }, { name: 'Ousaban', value: 'Ousaban' }, { name: 'sLoad', value: 'sLoad' }, { name: 'PerlBot', value: 'PerlBot' }, { name: 'SectopRAT', value: 'SectopRAT' }, { name: 'Loda', value: 'Loda' }, { name: 'Coinminer', value: 'Coinminer' }, { name: 'DarkSide', value: 'DarkSide' }, { name: '404 Keylogger', value: '404 Keylogger' }, { name: 'Cpuminer', value: 'Cpuminer' }, { name: 'MooBot', value: 'MooBot' }, { name: 'Parallax RAT', value: 'Parallax RAT' }, { name: 'XOR DDoS', value: 'XOR DDoS' }, { name: 'Vulturi', value: 'Vulturi' }, { name: 'Taurus Stealer', value: 'Taurus Stealer' }, { name: 'Cutwail', value: 'Cutwail' }, { name: 'Metamorfo', value: 'Metamorfo' }, { name: 'GootLoader', value: 'GootLoader' }, { name: 'Meterpreter', value: 'Meterpreter' }, { name: 'BumbleBee', value: 'BumbleBee' }, { name: 'Tofsee', value: 'Tofsee' }, { name: 'Socelars', value: 'Socelars' }, { name: 'Squirrelwaffle', value: 'Squirrelwaffle' }, { name: 'Roaming Mantis', value: 'Roaming Mantis' }, { name: 'Alfonso Stealer', value: 'Alfonso Stealer' }, { name: 'DarkComet', value: 'DarkComet' }, { name: 'STOP', value: 'STOP' }, { name: 'MoqHao', value: 'MoqHao' }, { name: 'CollectorGoomba', value: 'CollectorGoomba' }, { name: 'Prometei', value: 'Prometei' }, { name: 'Cerberus', value: 'Cerberus' }, { name: 'Spectre Rat', value: 'Spectre Rat' }, { name: 'Unidentified 001', value: 'Unidentified 001' }, { name: 'FluBot', value: 'FluBot' }, { name: 'BlackRock', value: 'BlackRock' }, { name: 'CryptoNight', value: 'CryptoNight' }, { name: 'Kronos', value: 'Kronos' }, { name: 'Winnti', value: 'Winnti' }, { name: 'Korlia', value: 'Korlia' }, { name: 'Monero Miner', value: 'Monero Miner' }, { name: 'Anubis', value: 'Anubis' }, { name: 'MirrorBlast', value: 'MirrorBlast' }, { name: 'Banload', value: 'Banload' }, { name: 'FlawedGrace', value: 'FlawedGrace' }, { name: 'DoppelDridex', value: 'DoppelDridex' }, { name: 'Mispadu', value: 'Mispadu' }, { name: 'Mekotio', value: 'Mekotio' }, { name: 'Ozone RAT', value: 'Ozone RAT' }, { name: 'StealthWorker Go', value: 'StealthWorker Go' }, { name: 'SilverFish', value: 'SilverFish' }, { name: 'NodeJS Ransomware', value: 'NodeJS Ransomware' }, { name: 'Ryuk', value: 'Ryuk' }, { name: 'QNAPCrypt', value: 'QNAPCrypt' }, { name: 'Venom RAT', value: 'Venom RAT' }, { name: 'BlackMatter', value: 'BlackMatter' }, { name: 'Janeleiro', value: 'Janeleiro' }, { name: 'Chrysaor', value: 'Chrysaor' }, { name: 'PurpleFox', value: 'PurpleFox' }, { name: 'Mars Stealer', value: 'Mars Stealer' }, { name: 'Matanbuchus', value: 'Matanbuchus' }, { name: 'FFDroider', value: 'FFDroider' }, { name: 'BlackGuard', value: 'BlackGuard' }, { name: 'SMSspy', value: 'SMSspy' }, { name: 'TitanStealer', value: 'TitanStealer' }, { name: 'BianLian', value: 'BianLian' }, { name: 'Deimos', value: 'Deimos' }, { name: 'Sliver', value: 'Sliver' }, { name: 'Aurora Stealer', value: 'Aurora Stealer' }, { name: 'Stealc', value: 'Stealc' }, { name: 'Gomorrah stealer', value: 'Gomorrah stealer' }, { name: 'RecordBreaker', value: 'RecordBreaker' }, { name: 'Brute Ratel C4', value: 'Brute Ratel C4' }, { name: 'LaplasClipper', value: 'LaplasClipper' }, { name: 'XWorm', value: 'XWorm' }, { name: 'PhotoLoader', value: 'PhotoLoader' }, { name: 'Kimsuky', value: 'Kimsuky' }, { name: 'Rhadamanthys', value: 'Rhadamanthys' }, { name: 'Nighthawk', value: 'Nighthawk' }, { name: 'Fabookie', value: 'Fabookie' }, { name: 'Lumma Stealer', value: 'Lumma Stealer' }, { name: 'Kaiji', value: 'Kaiji' }, { name: 'ClipBanker', value: 'ClipBanker' }, { name: 'PrivateLoader', value: 'PrivateLoader' }, { name: 'ViperSoftX', value: 'ViperSoftX' }, { name: 'Phonk', value: 'Phonk' }, { name: 'PlugX', value: 'PlugX' }, { name: 'HyperBro', value: 'HyperBro' }, { name: 'SideWinder', value: 'SideWinder' }, { name: 'Coper', value: 'Coper' }, { name: 'Specter', value: 'Specter' }, { name: 'Kaiten', value: 'Kaiten' }, { name: 'Bitter RAT', value: 'Bitter RAT' }, { name: 'BATLOADER', value: 'BATLOADER' }, { name: 'ACBackdoor', value: 'ACBackdoor' }, { name: 'BKA Trojaner', value: 'BKA Trojaner' }, { name: 'JSSLoader', value: 'JSSLoader' }, { name: 'PureCrypter', value: 'PureCrypter' }, { name: 'SpyNote', value: 'SpyNote' }, { name: 'S.O.V.A.', value: 'S.O.V.A.' }, { name: 'Ginzo Stealer', value: 'Ginzo Stealer' }, { name: 'PennyWise Stealer', value: 'PennyWise Stealer' }, { name: 'DOUBLEBACK', value: 'DOUBLEBACK' }, { name: 'OPRDNS', value: 'OPRDNS' }, { name: 'TLDNS', value: 'TLDNS' }, { name: 'RTDNS', value: 'RTDNS' }, { name: 'ADNS', value: 'ADNS' }, { name: 'FWDNS', value: 'FWDNS' }] // detection新增页的第一步，选择mode From bd1f7556121ca6f78df4e9367ec9db94a34d6430 Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Mon, 30 Oct 2023 16:28:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?CN-1425=20fix:=20=E4=BF=AE=E5=A4=8Ddashboar?= =?UTF-8?q?d=E4=B8=8B=E9=92=BB=E5=90=8E=E5=88=87=E6=8D=A2=E9=A1=B6?= =?UTF-8?q?=E9=83=A8=E6=9C=80=E5=90=8E=E4=B8=80=E7=BA=A7=E9=9D=A2=E5=8C=85?= =?UTF-8?q?=E5=B1=91=E6=97=B6=E4=BC=9A=E5=9B=9E=E5=88=B0=E4=B8=8B=E9=92=BB?= =?UTF-8?q?=E5=89=8D=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layout/Header.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue index bcaf7268..1eac0a6e 100644 --- a/src/components/layout/Header.vue +++ b/src/components/layout/Header.vue @@ -791,10 +791,10 @@ export default { }) return } - /* if (route === this.route) { + if (route === this.route) { this.refresh() return - } */ + } if (route) { this.$router.push({ path: route,