usage-time-limit: ignore case of the Action parameter

Author: HashidaTKS

BrowserGuard/UsageTimeLimit/UsageTimeLimitConfig.cs

@@ -18,7 +18,7 @@ internal class TimeRangeConfig
 
     internal class UsageTimeExceededConfig
     {
-        // "WarnOnly" or "Terminate". Anything else is read as "WarnOnly", so a
+        // "WarnOnly" or "Terminate" (ignore case). Anything else is read as "WarnOnly", so a
         // misspelling cannot silently start closing the browser.
         public string Action { get; set; } = "WarnOnly";
         public int GraceSeconds { get; set; } = 60;

webextensions/edge/usage-time-limit.js

@@ -19,6 +19,14 @@ const EMPTY_STATE = {
   terminateAt: 0,
 };
 
+// What OnExceeded.Action may say, however it is spelled. A word that is not
+// one of these leaves the setting as it was, so that a misspelling cannot
+// quietly start closing the browser.
+const ACTIONS = {
+  warnonly: 'WarnOnly',
+  terminate: 'Terminate',
+};
+
 const REASONS = {
   continuous: '連続して使用できる時間の上限に達しました。',
   schedule: '使用が許可された時間帯を過ぎています。',
@@ -81,8 +89,10 @@ export const UsageTimeLimit = {
     }
     const onExceeded = usageTimeLimit.OnExceeded;
     if (!onExceeded) return;
-    if (onExceeded.Action === 'Terminate' || onExceeded.Action === 'WarnOnly') {
-      this.action = onExceeded.Action;
+    // Kept in the one spelling, so the rest of the module compares it plainly.
+    const action = ACTIONS[String(onExceeded.Action ?? '').trim().toLowerCase()];
+    if (action) {
+      this.action = action;
     }
     this.graceSeconds = readNumber(onExceeded, 'GraceSeconds', this.graceSeconds);
     this.reWarnIntervalMinutes =

webextensions/test/usage-time-limit.test.js

@@ -102,6 +102,40 @@ describe('parseTimeOfDay', () => {
   });
 });
 
+describe('applyConfig', () => {
+  // The action is the one setting whose value is a word rather than a number
+  // or a switch, so it is the one that can be spelled a different way.
+  it('reads the action however it is spelled', () => {
+    for (const spelling of ['Terminate', 'terminate', 'TERMINATE', ' Terminate ']) {
+      configure({ OnExceeded: { Action: 'WarnOnly' } });
+      configure({ OnExceeded: { Action: spelling } });
+
+      assert.equal(UsageTimeLimit.action, 'Terminate', `${spelling} should be read`);
+    }
+  });
+
+  it('reads warning only however it is spelled', () => {
+    configure({ OnExceeded: { Action: 'Terminate' } });
+    configure({ OnExceeded: { Action: 'warnonly' } });
+
+    assert.equal(UsageTimeLimit.action, 'WarnOnly');
+  });
+
+  // A misspelling must not be able to start closing the browser, nor to stop
+  // it closing when that was asked for.
+  it('keeps what it had for a word it does not know', () => {
+    configure({ OnExceeded: { Action: 'Terminate' } });
+    configure({ OnExceeded: { Action: 'Close' } });
+
+    assert.equal(UsageTimeLimit.action, 'Terminate');
+
+    configure({ OnExceeded: { Action: 'WarnOnly' } });
+    configure({ OnExceeded: { Action: 42 } });
+
+    assert.equal(UsageTimeLimit.action, 'WarnOnly');
+  });
+});
+
 describe('isWithinAllowedRanges', () => {
   it('allows any hour when no range is configured', () => {
     assert.equal(UsageTimeLimit.isWithinAllowedRanges(at(3)), true);