add persist_user_impersonation

Author: skadefro

OpenFlow/src/Config.ts

@@ -37,6 +37,7 @@ export class Config {
         Config.auto_create_users = Config.parseBoolean(Config.getEnv("auto_create_users", "false"));
         Config.auto_create_domains = Config.parseArray(Config.getEnv("auto_create_domains", ""));
         Config.allow_user_registration = Config.parseBoolean(Config.getEnv("allow_user_registration", "false"));
+        Config.persist_user_impersonation = Config.parseBoolean(Config.getEnv("persist_user_impersonation", "true"));
         Config.allow_personal_nodered = Config.parseBoolean(Config.getEnv("allow_personal_nodered", "false"));
         Config.auto_create_personal_nodered_group = Config.parseBoolean(Config.getEnv("auto_create_personal_nodered_group", "false"));
         Config.force_add_admins = Config.parseBoolean(Config.getEnv("force_add_admins", "true"));
@@ -140,6 +141,7 @@ export class Config {
     public static auto_create_users: boolean = Config.parseBoolean(Config.getEnv("auto_create_users", "false"));
     public static auto_create_domains: string[] = Config.parseArray(Config.getEnv("auto_create_domains", ""));
     public static allow_user_registration: boolean = Config.parseBoolean(Config.getEnv("allow_user_registration", "false"));
+    public static persist_user_impersonation: boolean = Config.parseBoolean(Config.getEnv("persist_user_impersonation", "true"));
     public static allow_personal_nodered: boolean = Config.parseBoolean(Config.getEnv("allow_personal_nodered", "false"));
     public static use_ingress_beta1_syntax: boolean = Config.parseBoolean(Config.getEnv("use_ingress_beta1_syntax", "true"));
     public static auto_create_personal_nodered_group: boolean = Config.parseBoolean(Config.getEnv("auto_create_personal_nodered_group", "false"));

OpenFlow/src/DatabaseConnection.ts

@@ -53,7 +53,7 @@ export class DatabaseConnection {
         name: 'openflow_mongodb_query_seconds',
         help: 'Duration for mongodb queries microseconds',
         labelNames: ['collection'],
-        buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10]
+        buckets: [0.01, 0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 50]
     })
     public static mongodb_query_count = new client.Counter({
         name: 'openflow_mongodb_query_count',
@@ -64,7 +64,7 @@ export class DatabaseConnection {
         name: 'openflow_mongodb_aggregate_seconds',
         help: 'Duration for mongodb queries microseconds',
         labelNames: ['collection'],
-        buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10]
+        buckets: [0.01, 0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 50]
     })
     public static mongodb_aggregate_count = new client.Counter({
         name: 'openflow_mongodb_aggregate_count',
@@ -75,7 +75,7 @@ export class DatabaseConnection {
         name: 'openflow_mongodb_insert_seconds',
         help: 'Duration for mongodb inserts microseconds',
         labelNames: ['collection'],
-        buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10]
+        buckets: [0.01, 0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 50]
     })
     public static mongodb_insert_count = new client.Counter({
         name: 'openflow_mongodb_insert_count',
@@ -86,7 +86,7 @@ export class DatabaseConnection {
         name: 'openflow_mongodb_update_seconds',
         help: 'Duration for mongodb updates microseconds',
         labelNames: ['collection'],
-        buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10]
+        buckets: [0.01, 0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 50]
     })
     public static mongodb_update_count = new client.Counter({
         name: 'openflow_mongodb_update_count',
@@ -97,7 +97,7 @@ export class DatabaseConnection {
         name: 'openflow_mongodb_replace_seconds',
         help: 'Duration for mongodb replaces microseconds',
         labelNames: ['collection'],
-        buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10]
+        buckets: [0.01, 0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 50]
     })
     public static mongodb_replace_count = new client.Counter({
         name: 'openflow_mongodb_replace_count',
@@ -108,7 +108,7 @@ export class DatabaseConnection {
         name: 'openflow_mongodb_delete_seconds',
         help: 'Duration for mongodb deletes microseconds',
         labelNames: ['collection'],
-        buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10]
+        buckets: [0.01, 0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 50]
     })
     public static mongodb_delete_count = new client.Counter({
         name: 'openflow_mongodb_delete_count',
@@ -119,7 +119,7 @@ export class DatabaseConnection {
         name: 'openflow_mongodb_deletemany_seconds',
         help: 'Duration for mongodb deletemanys microseconds',
         labelNames: ['collection'],
-        buckets: [0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10]
+        buckets: [0.01, 0.1, 0.3, 0.5, 0.7, 1, 3, 5, 7, 10, 50]
     })
     public static mongodb_deletemany_count = new client.Counter({
         name: 'openflow_mongodb_deletemany_count',

OpenFlow/src/Messages/Message.ts

@@ -839,7 +839,7 @@ export class Message {
             } else {
                 if (msg.impersonate == "-1" || msg.impersonate == "false") {
                     user = await DBHelper.FindById(impostor, Crypt.rootToken());
-                    UpdateDoc.$unset = { "impersonating": "" };
+                    if(Config.persist_user_impersonation) UpdateDoc.$unset = { "impersonating": "" };
                     user.impersonating = undefined;
                     if (!NoderedUtil.IsNullEmpty(tuser.impostor)) {
                         tuser = TokenUser.From(user);
@@ -884,7 +884,9 @@ export class Message {
                     // Check we have update rights
                     try {
                         await DBHelper.Save(user, msg.jwt);
-                        await Config.db._UpdateOne({ _id: tuserimpostor._id }, { "$set": { "impersonating": user._id } } as any, "users", 1, false, msg.jwt);
+                        if(Config.persist_user_impersonation) {
+                            await Config.db._UpdateOne({ _id: tuserimpostor._id }, { "$set": { "impersonating": user._id } } as any, "users", 1, false, msg.jwt);
+                        }
                     } catch (error) {
                         const impostors = await Config.db.query<User>({ _id: msg.impersonate }, null, 1, 0, null, "users", Crypt.rootToken());
                         const impb: User = new User(); impb.name = "unknown"; impb._id = msg.impersonate;

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.1.186",
+  "version": "1.1.188",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

VERSION

@@ -1 +1 @@
-1.1.186
+1.1.188

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.1.186",
+  "version": "1.1.188",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {