Merge pull request openiap#6 from skadefro/master

skadefro · web-flow · commit f824dc57a652 · 2019-05-17T10:46:35.000+02:00
bug fixes and adding coc
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at team@nodered.org. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/OpenFlow/src/Config.ts b/OpenFlow/src/Config.ts
@@ -10,6 +10,7 @@ export class Config {
     public static db:DatabaseConnection = null;
     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 api_bypass_perm_check:boolean = Config.parseBoolean(Config.getEnv("api_bypass_perm_check", "false"));
     public static websocket_package_size:number = parseInt(Config.getEnv("websocket_package_size", "1024"), 10);
diff --git a/OpenFlow/src/Messages/Message.ts b/OpenFlow/src/Messages/Message.ts
@@ -20,6 +20,7 @@ import { MapReduceMessage } from "./MapReduceMessage";
 import { CloseQueueMessage } from "./CloseQueueMessage";
 import { RegisterQueueMessage } from "./RegisterQueueMessage";
 import { QueueMessage } from "./QueueMessage";
+import { RegisterUserMessage } from "./RegisterUserMessage";
 
 export class Message {
     public id: string;
@@ -95,6 +96,9 @@ export class Message {
                 case "signin":
                     this.Signin(cli);
                     break;
+                case "registeruser":
+                    this.RegisterUser(cli);
+                    break;
                 case "mapreduce":
                     this.MapReduce(cli);
                     break;
@@ -407,6 +411,30 @@ export class Message {
         }
         this.Send(cli);
     }
+    private async RegisterUser(cli: WebSocketClient): Promise<void> {
+        this.Reply();
+        var msg: RegisterUserMessage;
+        var user:User;
+        try {
+            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"); }
+            if(msg.password == null || msg.password == undefined || msg.password == "") { throw new Error("Password cannot be null"); }
+            user = await User.FindByUsername(msg.username);
+            if(user!==null && user !== undefined) { throw new Error("Illegal username"); }
+            user = await User.ensureUser(msg.name, msg.username, msg.password, null);
+            msg.user = new TokenUser(user);
+        } catch (error) {
+            msg.error = error.toString();
+        }
+        try {
+            this.data = JSON.stringify(msg);
+        } catch (error) {
+            this.data = "";
+            msg.error = error.toString();
+        }
+        this.Send(cli);
+    }
 }
 
 export class JSONfn {
diff --git a/OpenFlow/src/Messages/RegisterUserMessage.ts b/OpenFlow/src/Messages/RegisterUserMessage.ts
@@ -0,0 +1,18 @@
+import { Base } from "../base";
+import { TokenUser } from "../TokenUser";
+
+export class RegisterUserMessage implements IReplyMessage {
+    public error: string;
+    public jwt:any;
+
+    public user:TokenUser;
+    public name:string;
+    public username:string;
+    public password:string;
+    static assign(o:any):RegisterUserMessage {
+        if (typeof o === "string" || o instanceof String) {
+            return Object.assign(new RegisterUserMessage(), JSON.parse(o.toString()));
+        }
+        return Object.assign(new RegisterUserMessage(), o);
+    }
+}
diff --git a/OpenFlow/src/User.ts b/OpenFlow/src/User.ts
@@ -112,5 +112,18 @@ export class User extends Base {
             });
         }
     }
+
+    public static async ensureUser(name:string, username:string, password:string, id:string):Promise<User> {
+        var user:User = await User.FindByUsernameOrId(username, id);
+        if(user!==null && (user._id === id || id === null)) { return user; }
+        if(user!==null && id !== null ) { await Config.db.DeleteOne(user._id, "users", TokenUser.rootToken()); }
+        user  = new User(); user._id = id; user.name = name; user.username = username;
+        if(password===null || password===undefined || password === "") { password = Math.random().toString(36).substr(2, 9); }
+        await user.SetPassword(password);
+        user = await Config.db.InsertOne(user, "users", TokenUser.rootToken());
+        user = User.assign(user);
+        return user;
+    }
+    
 }
 
diff --git a/OpenFlow/src/WebSocketClient.ts b/OpenFlow/src/WebSocketClient.ts
@@ -155,17 +155,18 @@ export class WebSocketClient {
             var first: SocketMessage = msgs[0];
             if(first.count === msgs.length) {
                 if(msgs.length === 1) {
+                    this._receiveQueue = this._receiveQueue.filter(function (msg: SocketMessage):boolean { return msg.id!==id;});
                     var singleresult: Message = Message.frommessage(first, first.data);
                     singleresult.Process(this);
                 } else {
                     var buffer: string = "";
                     msgs.forEach(msg => {
                         if(msg.data!==null && msg.data !== undefined) { buffer += msg.data; }
                     });
+                    this._receiveQueue = this._receiveQueue.filter(function (msg: SocketMessage):boolean { return msg.id!==id;});
                     var result: Message = Message.frommessage(first, buffer);
                     result.Process(this);
                 }
-                this._receiveQueue = this._receiveQueue.filter(function (msg: SocketMessage):boolean { return msg.id!==id;});
             }
         });
         this._sendQueue.forEach(msg => {
diff --git a/OpenFlow/src/public/Controllers.ts b/OpenFlow/src/public/Controllers.ts
@@ -442,6 +442,13 @@ module openflow {
                 this.loadData();
             });
         }
+        async DeleteOne(model: any):Promise<any> {
+            this.loading = true;
+            await this.api.Delete(this.collection, model);
+            this.models = this.models.filter(function (m: any):boolean { return m._id!==model._id;});
+            this.loading = false;
+            if (!this.$scope.$$phase) { this.$scope.$apply(); }
+        }
         async DeleteMany():Promise<void> {
             this.loading = true;
             var Promises:Promise<DeleteOneMessage>[] = [];
diff --git a/OpenFlowNodeRED/src/nodered/nodes/api.html b/OpenFlowNodeRED/src/nodered/nodes/api.html
@@ -36,7 +36,7 @@
     </div>
 </script>
 <script type="text/x-red" data-help-name="api get jwt">
-Request a JWT token for talking with API. Leave config blank to impersonate root
+Request a JWT token for talking with API. Leave config blank to impersonate root.
 </script>
 <script type="text/javascript">
     RED.nodes.registerType('api get jwt', {
@@ -430,7 +430,7 @@
     </div>
 </script>
 <script type="text/x-red" data-help-name="grant permission">
-    <p>Delete payload as new entity in collection</p>
+    <p>Grants a role (or user if set by msg.targetid) a specific permission on the entity/entities in payload.</p>
 </script>
 <script type="text/javascript">
     RED.nodes.registerType('grant permission', {
@@ -508,7 +508,7 @@
     </div>
 </script>
 <script type="text/x-red" data-help-name="revoke permission">
-    <p>Delete payload as new entity in collection</p>
+    <p>Revoke a specific permission for a role (or user if set by msg.targetid) on the entity/entities in payload.</p>
 </script>
 <script type="text/javascript">
     RED.nodes.registerType('revoke permission', {
@@ -563,81 +563,6 @@
 
 
 
-<script type="text/x-red" data-template-name="grant permission">
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-    <div class="form-row">
-        <label for="node-input-targetid"><i class="fa fa-tasks"></i> Target</label>
-        <select id="node-input-targetid-select">
-        </select>
-        <input id="node-input-targetid" type="hidden">
-    </div>
-    <div class="form-row">
-        <label for="node-input-typed-entities"><i class="fa fa-list"></i> Entities</label>
-        <input id="node-input-typed-entities" type="text" style="width: 70%">
-        <input id="node-input-entities" type="hidden">
-    </div>
-    <div class="form-row">
-        <label><i class="fa fa-tag"></i> Bitsexplained </label>
-        (F:-1, R:2, U:3, D:4, I:5)
-    </div>
-    <div class="form-row">
-        <label for="node-input-bits"><i class="fa fa-tag"></i> Bits </label>
-        <input type="text" id="node-input-bits" placeholder="Bits seperated by comma,">
-    </div>
-</script>
-<script type="text/x-red" data-help-name="grant permission">
-    <p>Delete payload as new entity in collection</p>
-</script>
-<script type="text/javascript">
-    RED.nodes.registerType('grant permission', {
-        category: 'api',
-        color: "#a6bbcf",
-        defaults: {
-            name: { value: "" },
-            targetid: { value: "result._id", required: true },
-            entities: { value: "payload", required: true },
-            bits: { value: "", required: true }
-        },
-        inputs: 1,
-        outputs: 1,
-        icon: "bridge.png",
-        label: function () {
-            return this.name || "grant permission";
-        },
-        labelStyle: function () {
-            return this.name ? "node_label_italic" : "";
-        },
-
-        oneditprepare: function () {
-            $("#node-input-typed-entities").typedInput({ types: ['msg'] });
-            $("#node-input-typed-entities").typedInput('value', this.entities);
-
-
-            $.getJSON('api_roles',function(data) {
-                $.each(data, function(i, ele) {
-                    $('#node-input-targetid-select').append($('<option>', { 
-                        value: ele._id,
-                        text : ele.name
-                    }));
-                });
-                $('#node-input-targetid-select').val($('#node-input-targetid').val());
-            });
-
-        },
-        oneditsave: function () {
-            $('#node-input-targetid').val($('#node-input-targetid-select').val());
-            $("#node-input-entities").val($("#node-input-typed-entities").typedInput('value'));
-        }
-
-    });
-</script>
-
-
-
-
 
 
 
@@ -699,7 +624,14 @@
 
 </script>
 <script type="text/x-red" data-help-name="map reduce">
-    <p>Delete payload as new entity in collection</p>
+    <p>
+        Run a mapreduce on a collection.
+        If output is set for inline, the result will be returned in payload, for all else, you can get the result in the receiving collection.<br>
+        Finalize is optional, and can be left blank if not needed.<br>
+        Be carefull to keep _acl on all reduced objects, so you have permission to read the result.<br>
+        <a href="https://docs.mongodb.com/manual/tutorial/map-reduce-examples/index.html">map-reduce-examples</a><br>
+<a href="https://docs.mongodb.com/manual/reference/method/db.collection.mapReduce/#db.collection.mapReduce">dokumentation</a>
+    </p>
 </script>
 <script type="text/javascript">
     RED.nodes.registerType('map reduce', {
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.73
+0.0.75

Original file line number	Diff line number	Diff line change
`@@ -112,5 +112,18 @@ export class User extends Base {`
`112`	`112`	`});`
`113`	`113`	`}`
`114`	`114`	`}`
	`115`	`+`
	`116`	`+ public static async ensureUser(name:string, username:string, password:string, id:string):Promise<User> {`
	`117`	`+ var user:User = await User.FindByUsernameOrId(username, id);`
	`118`	`+ if(user!==null && (user._id === id \|\| id === null)) { return user; }`
	`119`	`+ if(user!==null && id !== null ) { await Config.db.DeleteOne(user._id, "users", TokenUser.rootToken()); }`
	`120`	`+ user = new User(); user._id = id; user.name = name; user.username = username;`
	`121`	`+ if(password===null \|\| password===undefined \|\| password === "") { password = Math.random().toString(36).substr(2, 9); }`
	`122`	`+ await user.SetPassword(password);`
	`123`	`+ user = await Config.db.InsertOne(user, "users", TokenUser.rootToken());`
	`124`	`+ user = User.assign(user);`
	`125`	`+ return user;`
	`126`	`+ }`
	`127`	`+`
`115`	`128`	`}`
`116`	`129`