Allow msp resync alarm

BillysCoolJob · Jul 18, 2024 · 0a7212d · 0a7212d
1 parent 7eaa108
commit 0a7212d
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 13 deletions.
diff --git a/alarm/AlarmManager2.js b/alarm/AlarmManager2.js
@@ -190,7 +190,6 @@ module.exports = class {
           }
           case Constants.ST_ACTIVATED:
           case Constants.ST_IGNORE: {
-            // delete immediately
             await rclient.zremAsync(alarmPendingKey, aid);
             break;
           }
@@ -341,7 +340,11 @@ module.exports = class {
     if (options.origin && options.origin.state == Constants.ST_IGNORE){
       return
     }
-    await rclient.hsetAsync(alarmPrefix + alarmID, 'p.msp.decision', 'ignore');
+    let mspDec = 'ignore';
+    if (options.origin && options.origin['p.msp.decision']) {
+      mspDec = options.origin['p.msp.decision'] + ',' + mspDec;
+    }
+    await rclient.hsetAsync(alarmPrefix + alarmID, 'p.msp.decision', mspDec);
     await this.archiveAlarm(alarmID);
     await rclient.zremAsync(alarmPendingKey, alarmID);
   }
@@ -550,7 +553,7 @@ module.exports = class {
     if (alarmConfig.hasOwnProperty(alias)) {
       alarm.apply(alarmConfig[alias]);
     } else if (alarmConfig.default){ // default
-      alarm.apply(alarmConfig.default);
+      alarm.apply(_.omit(alarmConfig.default, ['timeout']));
     }
   }
 
@@ -568,6 +571,12 @@ module.exports = class {
     }
     log.debug('apply alarm attrs', alarm, 'to', orig_alarm);
     let attrs = {state: orig_alarm.state}; // origin attrs
+    if (orig_alarm.hasOwnProperty('p.msp.decision')) {
+      attrs['p.msp.decision'] = orig_alarm['p.msp.decision'];
+    }
+
+    // only allow reapply state: ignore -> ready or active -> ignore
+    let redecision = (orig_alarm.state == Constants.ST_ACTIVATED && alarm.state == Constants.ST_IGNORE) || ( orig_alarm.state == Constants.ST_IGNORE && alarm.state == Constants.ST_READY);
     for (const k in alarm) {
       if (alarm[k] != orig_alarm[k]) {
         attrs[k] = orig_alarm[k];
@@ -577,7 +586,7 @@ module.exports = class {
         delete alarm[k];
         continue;
       }
-      if (k == "state" && alarm[k] != orig_alarm.state && (orig_alarm.state == Constants.ST_ACTIVATED || orig_alarm.state == Constants.ST_IGNORE)) {
+      if (k == "state" && alarm[k] != orig_alarm.state && (orig_alarm.state == Constants.ST_ACTIVATED || orig_alarm.state == Constants.ST_IGNORE) && !redecision) {
         log.warn('alarm already activated or ignored, skip change state', alarm);
         delete alarm[k];
         continue
@@ -597,7 +606,11 @@ module.exports = class {
   async _onState(alarm, options={}) {
     switch (alarm.state) {
       case Constants.ST_READY: {
-        options['p.msp.decision'] = 'active';
+        if (options.origin['p.msp.decision']) {
+          options['p.msp.decision'] = options.origin['p.msp.decision'] + ',active';
+        } else {
+          options['p.msp.decision'] = 'active';
+        }
         await this.activateAlarm(alarm, options);
         break;
       }
@@ -618,7 +631,7 @@ module.exports = class {
     for (const attr in attrs) {
       switch (attr) {
         case 'state': {
-          const opt = Object.assign({}, options, {state: attrs.state});
+          const opt = Object.assign({}, options, {origin:attrs});
           await this._onState(alarm, opt);
           break;
         }
@@ -753,8 +766,11 @@ module.exports = class {
     return alarmID
   }
 
-  async _activateAlarm(alarm) {
+  async _activateAlarm(alarm, unarchive = false) {
     let score = parseFloat(alarm.alarmTimestamp) || new Date() / 1000;
+    if (unarchive) {
+      await rclient.zremAsync(alarmArchiveKey, alarm.aid);
+    }
     return await rclient.multi()
       .zrem(alarmPendingKey, alarm.aid)
       .zadd(alarmActiveKey, 'NX', score, alarm.aid)
@@ -763,6 +779,7 @@ module.exports = class {
 
   async activateAlarm(alarm, options={}) {
     log.info('activate alarm', alarm, options);
+    let unarchive = false;
 
     if (this.isAlarmSyncMspEnabled()) {
       if ((alarm.state && alarm.state == Constants.ST_ACTIVATED) || (options.origin && options.origin.state == Constants.ST_ACTIVATED)) {
@@ -774,6 +791,9 @@ module.exports = class {
         log.debug(`alarm ${alarm.aid} still pending`)
         return;
       }
+      if (alarm.state && alarm.state == Constants.ST_READY && options.origin && options.origin.state == Constants.ST_IGNORE) {
+        unarchive = true
+      }
     }
 
     alarm.state = Constants.ST_ACTIVATED;
@@ -786,7 +806,7 @@ module.exports = class {
 
     const orig_alarm = await rclient.hgetallAsync(alarmKey);
     alarm = Object.assign({}, orig_alarm, alarm);
-    const result  = await this._activateAlarm(alarm);
+    const result  = await this._activateAlarm(alarm, unarchive);
 
     // check alarm state change results
     if (this.isAlarmSyncMspEnabled() && result.length >= 2) {

diff --git a/locales/en.json b/locales/en.json
@@ -33,7 +33,7 @@
   "INFO_ALARM_DEVICE_BACK_ONLINE": "{{{p.device.name}}} is back to your network",
   "NOTIF_TITLE_ALARM_DEVICE_OFFLINE": "Device Offline",
   "NOTIF_ALARM_DEVICE_OFFLINE": "{{{p.device.name}}} has left your network at {{{p.device.lastSeenTimezone}}}",
-  "INFO_ALARM_DEVICE_OFFLINE": "{{{p.device.name}}} is back to your network",
+  "INFO_ALARM_DEVICE_OFFLINE": "{{{p.device.name}}} has left your network at {{{p.device.lastSeenTimezone}}}",
   "NOTIF_TITLE_ALARM_SPOOFING_DEVICE": "Suspicious Spoofing Device Detected",
   "NOTIF_ALARM_SPOOFING_DEVICE": "Suspicious spoofing device found: {{{p.device.name}}} ({{{p.device.ip}}})",
   "INFO_ALARM_SPOOFING_DEVICE": "Found suspicious device {{{p.device.name}}} in your network",

diff --git a/tests/test_alarm_manager2.js b/tests/test_alarm_manager2.js
@@ -31,16 +31,17 @@ const am2 = new AlarmManager2();
 describe('Test alarm event', function(){
   this.timeout(30000);
 
-  beforeEach((done) => {
+  before((done) => {
     (
       async() => {
         await fc.syncDynamicFeatures();
+        await fc.getConfig(true);
       }
     )();
     done();
   });
 
-  afterEach((done) => {
+  after((done) => {
     done();
   });
 
@@ -123,16 +124,24 @@ describe('Test alarm event', function(){
 describe('Test AlarmManager2', function(){
   this.timeout(30000);
 
-  beforeEach((done) => {
+  before((done) => {
     (
       async() => {
         await fc.syncDynamicFeatures();
+        this.extdata = await rclient.getAsync("ext.guardian.data");
+        await rclient.setAsync("ext.guardian.data", "{\"config\":{\"alarms\":{\"apply\":{\"default\":{\"state\":\"ready\",\"timeout\":1800},\"large_upload\":{\"state\":\"pending\"},\"large_upload_2\":{\"state\":\"pending\"}}}}}");
+        log.debug("fc.getConfig", await fc.getConfig(true));
       }
     )();
     done();
   });
 
-  afterEach((done) => {
+  after((done) => {
+    (
+      async() => {
+        await rclient.setAsync("ext.guardian.data", this.extdata);
+      }
+    )();
     done();
   });