Fix perm check, skip for own user

Author: skadefro

OpenFlow/src/Messages/Message.ts

@@ -712,21 +712,27 @@ export class Message {
         this.Send(cli);
     }
 
+    private async GetInstanceName(cli: WebSocketClient, name: string): Promise<string> {
+        var username = cli.user.username;
+        username = username.split("@").join("").split(".").join("");
+        if (name !== null && name !== undefined && name !== "" && name != username) {
+            var exists = await User.FindByUsername(name, cli.jwt);
+            if (exists == null) {
+                throw new Error("Unknown name " + name);
+            }
+        }
+        name = name.split("@").join("").split(".").join("");
+        name = name.toLowerCase();
+        return name;
+    }
     private async EnsureNoderedInstance(cli: WebSocketClient): Promise<void> {
         this.Reply();
         var msg: EnsureNoderedInstanceMessage;
         var user: User;
         try {
             cli._logger.debug("[" + cli.user.username + "] EnsureNoderedInstance");
             msg = EnsureNoderedInstanceMessage.assign(this.data);
-            var name = cli.user.username;
-            if (msg.name !== null && msg.name !== undefined && msg.name !== "" && msg.name != cli.user.username) {
-                var exists = await User.FindByUsername(msg.name, cli.jwt);
-                if (exists == null) { throw new Error("Unknown name " + msg.name) }
-                name = msg.name;
-            }
-            name = name.split("@").join("").split(".").join("");
-            name = name.toLowerCase();
+            var name = await this.GetInstanceName(cli, msg.name);
             var namespace = Config.namespace;
             var hostname = Config.nodered_domain_schema.replace("$nodered_id$", name);
             var queue_prefix: string = "";
@@ -881,14 +887,7 @@ export class Message {
         try {
             cli._logger.debug("[" + cli.user.username + "] DeleteNoderedInstance");
             msg = DeleteNoderedInstanceMessage.assign(this.data);
-            var name = cli.user.username;
-            if (msg.name !== null && msg.name !== undefined && msg.name !== "" && msg.name != cli.user.username) {
-                var exists = await User.FindByUsername(msg.name, cli.jwt);
-                if (exists == null) { throw new Error("Unknown name " + msg.name) }
-                name = msg.name;
-            }
-            name = name.split("@").join("").split(".").join("");
-            name = name.toLowerCase();
+            var name = await this.GetInstanceName(cli, msg.name);
             var namespace = Config.namespace;
             var hostname = Config.nodered_domain_schema.replace("$nodered_id$", name);
 
@@ -955,14 +954,7 @@ export class Message {
         try {
             cli._logger.debug("[" + cli.user.username + "] RestartNoderedInstance");
             msg = RestartNoderedInstanceMessage.assign(this.data);
-            var name = cli.user.username;
-            if (msg.name !== null && msg.name !== undefined && msg.name !== "" && msg.name != cli.user.username) {
-                var exists = await User.FindByUsername(msg.name, cli.jwt);
-                if (exists == null) { throw new Error("Unknown name " + msg.name) }
-                name = msg.name;
-            }
-            name = name.split("@").join("").split(".").join("");
-            name = name.toLowerCase();
+            var name = await this.GetInstanceName(cli, msg.name);
             var namespace = Config.namespace;
             // var hostname = Config.nodered_domain_schema.replace("$nodered_id$", name);
 
@@ -994,14 +986,7 @@ export class Message {
         try {
             cli._logger.debug("[" + cli.user.username + "] GetNoderedInstance");
             msg = GetNoderedInstanceMessage.assign(this.data);
-            var name = cli.user.username;
-            if (msg.name !== null && msg.name !== undefined && msg.name !== "" && msg.name != cli.user.username) {
-                var exists = await User.FindByUsername(msg.name, cli.jwt);
-                if (exists == null) { throw new Error("Unknown name " + msg.name) }
-                name = msg.name;
-            }
-            name = name.split("@").join("").split(".").join("");
-            name = name.toLowerCase();
+            var name = await this.GetInstanceName(cli, msg.name);
             var namespace = Config.namespace;
             // var hostname = Config.nodered_domain_schema.replace("$nodered_id$", name);
 
@@ -1044,17 +1029,9 @@ export class Message {
         try {
             cli._logger.debug("[" + cli.user.username + "] GetNoderedInstance");
             msg = GetNoderedInstanceLogMessage.assign(this.data);
-            var name = cli.user.username;
-            if (msg.name !== null && msg.name !== undefined && msg.name !== "" && msg.name != cli.user.username) {
-                var exists = await User.FindByUsername(msg.name, cli.jwt);
-                if (exists == null) { throw new Error("Unknown name " + msg.name) }
-                name = msg.name;
-            }
-            name = name.split("@").join("").split(".").join("");
-            name = name.toLowerCase();
+            var name = await this.GetInstanceName(cli, msg.name);
             var namespace = Config.namespace;
 
-
             var list = await KubeUtil.instance().CoreV1Api.listNamespacedPod(namespace);
 
             if (list.body.items.length > 0) {

VERSION

@@ -1 +1 @@
-0.0.490
+0.0.491