Stricter auto_create_users check

Author: skadefro

OpenFlow/src/Config.ts

@@ -38,7 +38,6 @@ 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"));
@@ -158,7 +157,6 @@ 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"));

OpenFlow/src/LoginProvider.ts

@@ -405,7 +405,7 @@ export class LoginProvider {
                     wshost: _url,
                     wsurl: _url,
                     domain: Config.domain,
-                    allow_user_registration: Config.allow_user_registration,
+                    auto_create_users: Config.auto_create_users,
                     allow_personal_nodered: Config.allow_personal_nodered,
                     auto_create_personal_nodered_group: Config.auto_create_personal_nodered_group,
                     namespace: Config.namespace,
@@ -988,6 +988,10 @@ export class LoginProvider {
                 if (LoginProvider.login_providers.length === 0) {
                     user = await DBHelper.FindByUsername(username, null, span);
                     if (user == null) {
+                        let createUser: boolean = Config.auto_create_users;
+                        if (!createUser) {
+                            return done(null, false);
+                        }
                         user = new User(); user.name = username; user.username = username;
                         await Crypt.SetPassword(user, password, span);
                         user = await Config.db.InsertOne(user, "users", 0, false, Crypt.rootToken(), span);
@@ -1014,7 +1018,8 @@ export class LoginProvider {
                 }
                 user = await DBHelper.FindByUsername(username, null, span);
                 if (NoderedUtil.IsNullUndefinded(user)) {
-                    if (!Config.allow_user_registration) {
+                    let createUser: boolean = Config.auto_create_users;
+                    if (!createUser) {
                         return done(null, false);
                     }
                     user = await DBHelper.ensureUser(Crypt.rootToken(), username, username, null, password, span);
@@ -1122,7 +1127,7 @@ export class LoginProvider {
 
             if (NoderedUtil.IsNullUndefinded(_user)) {
                 let createUser: boolean = Config.auto_create_users;
-                if (Config.auto_create_domains.map(x => username.endsWith(x)).length == -1) { createUser = false; }
+                if (Config.auto_create_domains.map(x => username.endsWith(x)).length > 0) { createUser = true; }
                 if (createUser) {
                     _user = new User(); _user.name = profile.name;
                     if (!NoderedUtil.IsNullEmpty(profile["http://schemas.microsoft.com/identity/claims/displayname"])) {
@@ -1204,7 +1209,7 @@ export class LoginProvider {
             let _user: User = await DBHelper.FindByUsernameOrFederationid(username, span);
             if (NoderedUtil.IsNullUndefinded(_user)) {
                 let createUser: boolean = Config.auto_create_users;
-                if (Config.auto_create_domains.map(x => username.endsWith(x)).length == -1) { createUser = false; }
+                if (Config.auto_create_domains.map(x => username.endsWith(x)).length > 0) { createUser = true; }
                 if (createUser) {
                     const jwt: string = Crypt.rootToken();
                     _user = new User(); _user.name = profile.name;

OpenFlow/src/Messages/Message.ts

@@ -1104,6 +1104,9 @@ export class Message {
         let msg: RegisterUserMessage;
         let user: User;
         try {
+            if (!Config.auto_create_users) {
+                throw new Error("User registration not enabled for this openflow")
+            }
             msg = RegisterUserMessage.assign(this.data);
             if (msg.name == null || msg.name == undefined || msg.name == "") { throw new Error("Name cannot be null"); }
             if (msg.username == null || msg.username == undefined || msg.username == "") { throw new Error("Username cannot be null"); }
@@ -2161,7 +2164,7 @@ export class Message {
             (msg as any).workflow = msg.workflowid;
 
             if (NoderedUtil.IsNullEmpty(msg.correlationId)) {
-                msg.correlationId = Math.random().toString(36).substr(2, 9);
+                msg.correlationId = NoderedUtil.GetUniqueIdentifier();
             }
 
             const _data = Base.assign<Base>(msg as any);