models: Ensure we're only looking for actual indexed values

Issue #613
tchx84 · Apr 18, 2024 · f8a723a · f8a723a
1 parent fe4b38c
commit f8a723a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/models/permissions.js b/src/models/permissions.js
@@ -176,7 +176,7 @@ var FlatpakPermissionsModel = GObject.registerClass({
                 const value = keyFile.get_value(group, key);
 
                 /* First for models that process the value as a whole */
-                let model = INDEX[`${group}`] || null;
+                let model = this.constructor._find(`${group}`);
 
                 if (model !== null) {
                     model.loadFromKeyFile(group, key, value, overrides, global);
@@ -189,10 +189,10 @@ var FlatpakPermissionsModel = GObject.registerClass({
                     .split(';');
 
                 values.forEach(option => {
-                    model = INDEX[`${group}_${key}_${option.replace('!', '')}`] || null;
+                    model = this.constructor._find(`${group}_${key}_${option.replace('!', '')}`);
 
                     if (model === null)
-                        model = INDEX[`${group}_${key}`] || null;
+                        model = this.constructor._find(`${group}_${key}`);
 
                     if (model === null && overrides && !global)
                         model = MODELS.unsupported;
@@ -443,6 +443,10 @@ var FlatpakPermissionsModel = GObject.registerClass({
         return this._appId;
     }
 
+    static _find(key) {
+        return Object.hasOwn(INDEX, key) ? INDEX[key] : null;
+    }
+
     /* testing */
 
     static getGroupForProperty(property) {