@iobroker/js-controller-adapter 7.2.3 → 7.2.4

package/build/cjs/lib/adapter/adapter.d.ts

@@ -338,6 +338,8 @@ export declare class AdapterClass extends EventEmitter {
     namespace: `${string}.${number}`;
     name: string;
     private _systemSecret?;
+    /** Attributes of `encryptedNative`: their values in `this.config` are decrypted on start */
+    private _decryptedNativeAttributes;
     /** Whether the adapter has already terminated */
     private terminated;
     /** The cache of usernames */
@@ -491,6 +493,15 @@ export declare class AdapterClass extends EventEmitter {
      *
      */
     disable(): ioBroker.SetObjectPromise;
+    /**
+     * Reads a parameter which is stored encrypted and returns its decrypted value.
+     *
+     * An attribute listed in `encryptedNative` is already decrypted in `this.config` when the adapter
+     * starts, and is returned as it is.
+     *
+     * @param attribute the config attribute to decrypt
+     * @param callback return result
+     */
     getEncryptedConfig(attribute: string, callback?: GetEncryptedConfigCallback): Promise<string | string[] | void>;
     private _getEncryptedConfig;
     /**

package/build/cjs/lib/adapter/adapter.js

@@ -110,6 +110,8 @@ class AdapterClass extends import_node_events.EventEmitter {
   namespace;
   name;
   _systemSecret;
+  /** Attributes of `encryptedNative`: their values in `this.config` are decrypted on start */
+  _decryptedNativeAttributes = new Array();
   /** Whether the adapter has already terminated */
   terminated = false;
   /** The cache of usernames */
@@ -479,7 +481,12 @@ class AdapterClass extends import_node_events.EventEmitter {
       this._logger.info(`${this.namespaceLog} getSession not processed because States database not connected`);
       return import_js_controller_common.tools.maybeCallbackWithError(options.callback, import_js_controller_common.tools.ERRORS.ERROR_DB_CLOSED);
     }
-    this.#states.getSession(options.id, options.callback);
+    this.#states.getSession(options.id, (err, session) => {
+      if (err) {
+        this._logger.error(`${this.namespaceLog} Cannot read session "${options.id}": ${err.message}`);
+      }
+      return import_js_controller_common.tools.maybeCallback(options.callback, session || null);
+    });
   }
   // unknown implementation guards
   setSession(id, ttl, data, callback) {
@@ -1389,7 +1396,7 @@ class AdapterClass extends import_node_events.EventEmitter {
     return this.setForeignObjectAsync(configObjId, obj);
   }
   /**
-   * Reads the encrypted parameter from config.
+   * Reads a parameter which is stored encrypted and returns its decrypted value.
    *
    * It returns promise if no callback is provided.
    *
@@ -1404,14 +1411,12 @@ class AdapterClass extends import_node_events.EventEmitter {
   async _getEncryptedConfig(options) {
     const { attribute, callback } = options;
     const value = (0, import_utils.getObjectAttribute)(this.config, attribute);
+    if ((Array.isArray(value) || typeof value === "string") && this._decryptedNativeAttributes.includes(attribute)) {
+      return import_js_controller_common.tools.maybeCallbackWithError(callback, null, value);
+    }
     if (Array.isArray(value)) {
       const secret = await this.getSystemSecret();
-      const result = [];
-      for (let i = 0; i < value.length; i++) {
-        if (typeof value[i] === "string") {
-          result[i] = import_js_controller_common.tools.decrypt(secret, value[i]);
-        }
-      }
+      const result = value.map((item) => typeof item === "string" ? import_js_controller_common.tools.decrypt(secret, item) : item);
       return import_js_controller_common.tools.maybeCallbackWithError(callback, null, result);
     } else if (typeof value === "string") {
       const secret = await this.getSystemSecret();
@@ -5238,6 +5243,9 @@ class AdapterClass extends import_node_events.EventEmitter {
     return options;
   }
   _checkState(obj, options, command) {
+    if (options.groups?.includes(import_constants.SYSTEM_ADMIN_GROUP)) {
+      return true;
+    }
     const limitToOwnerRights = options.limitToOwnerRights === true;
     if (obj?.acl) {
       obj.acl.state = obj.acl.state || obj.acl.object;
@@ -7746,12 +7754,15 @@ class AdapterClass extends import_node_events.EventEmitter {
       this.oObjects = await this.getAdapterObjectsAsync();
       await this.subscribeObjectsAsync("*");
     }
-    await this.getSystemSecret();
-    const promises = [];
+    const secret = await this.getSystemSecret();
     if (Array.isArray(adapterConfig.encryptedNative)) {
+      this._decryptedNativeAttributes = new Array();
       for (const attr of adapterConfig.encryptedNative) {
-        if (typeof this.config[attr] === "string") {
-          promises.push(this.getEncryptedConfig(attr).then((decryptedValue) => (0, import_utils.setObjectAttribute)(this.config, attr, decryptedValue)).catch((e) => this._logger.error(`${this.namespaceLog} Can not decrypt attribute ${attr}: ${e.message}`)));
+        try {
+          (0, import_utils.decryptArray)({ obj: this.config, secret, keys: [attr] });
+          this._decryptedNativeAttributes.push(attr);
+        } catch (e) {
+          this._logger.error(`${this.namespaceLog} Can not decrypt attribute ${attr}: ${e.message}`);
         }
       }
     } else {
@@ -7760,7 +7771,6 @@ class AdapterClass extends import_node_events.EventEmitter {
         this.SUPPORTED_FEATURES.splice(idx, 1);
       }
     }
-    await Promise.all(promises);
     if (!this.#states) {
       return;
     }