Merge pull request #87 from ansibleguy76/release/v4.0.11

v4.0.11 into main

CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.0.11] - 2023-06-08
+
+### Added
+
+-   Allow users in roles
+
+### Fixed
+
+-   app crash on bad rest body
+-   errors were not shown in output
+
 ## [4.0.10] - 2023-05-23
 
 ### Fixed
@@ -41,7 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 -   new function fn.fnCidr // core implementation of ip.subnet() <https://www.npmjs.com/package/ip>
--   new function fn.fnTime // core implementation of dayjs() <https://day.js.org> 
+-   new function fn.fnTime // core implementation of dayjs() <https://day.js.org>
 -   background image on login screen (that you can overwrite)
 
 ## [4.0.7] - 2023-05-01
@@ -62,7 +73,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 -   Allow awx connection with username and password
--   Added about me for 
+-   Added about me for
 -   Added new env var with regex to filter job output
 
 ### Changed
@@ -92,7 +103,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Add server fn.fnSsh function
 -   Showing env.variables in the settings
 -   Showing known_hosts and allow removal
--   Added limit property for ansible playbooks 
+-   Added limit property for ansible playbooks
 
 ### Changed
 
@@ -341,10 +352,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     -   insertMarker and deleteMarker (to mark deleted or new records)
     -   allowDelete and allowInsert (to allow insert/delete)
     -   readonlyField
-        With this table feature you can now load existing data and use table to modify it.  
-        The allowInsert set to false will focus on modification only.  
-        The deleteMarker set to value of choice, will allow you to use ansible `absent` for deleted records.  
-        Read the wiki for more details.
+            With this table feature you can now load existing data and use table to modify it.  
+            The allowInsert set to false will focus on modification only.  
+            The deleteMarker set to value of choice, will allow you to use ansible `absent` for deleted records.  
+            Read the wiki for more details.
 
 ### Fixed
 
@@ -513,7 +524,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Allow change password for current local user
 -   Start tracking versions
 
-[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.10...HEAD
+[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.11...HEAD
+
+[4.0.11]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.10...4.0.11
 
 [4.0.10]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.9...4.0.10
 
@@ -567,6 +580,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [2.1.6]: https://github.com/ansibleguy76/ansibleforms/compare/2.1.5...2.1.6
 
-[2.1.6]: https://github.com/ansibleguy76/ansibleforms/compare/2.1.5...2.1.6
-
 [2.1.5]: https://github.com/ansibleguy76/ansibleforms/compare/2.1.4...2.1.5

LICENSE.md

@@ -1,4 +1,5 @@
 GNU GENERAL PUBLIC LICENSE
+
    Version 3, 29 June 2007
 
 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>

app_versions.gradle

@@ -1,2 +1,2 @@
-ext.version_code = 40010
-ext.version_name = "4.0.10"
+ext.version_code = 40011
+ext.version_name = "4.0.11"

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ansible_forms_vue",
-  "version": "4.0.10",
+  "version": "4.0.11",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ansible_forms",
-  "version": "4.0.10",
+  "version": "4.0.11",
   "repository": {
     "type": "git",
     "url": "git://github.com/ansibleguy76/ansibleforms.git"

server/schema/forms_schema.json

@@ -51,9 +51,19 @@
       "items": {
         "type": "object",
         "required": [
-          "name",
-          "groups"
+          "name"
         ],
+        "anyOf": [
+          {
+            "required": [
+              "groups"
+            ]
+          },{
+            "required": [
+              "users"
+            ]
+          }
+        ],        
         "properties": {
           "name": {
             "$id": "/role",
@@ -66,9 +76,17 @@
               "default": "",
               "pattern": "(\\blocal\\b|\\bldap\\b|\\bazuread\\b)\\/.+"
             }
-          }
+          },
+          "users": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "default": "",
+              "pattern": "(\\blocal\\b|\\bldap\\b|\\bazuread\\b)\\/.+"
+            }            
+          }                    
         },
-        "additionalProperties": false
+        "additionalProperties": true
       }
     },
     "constants":{

server/schema/help.yaml

@@ -393,7 +393,8 @@
     objectLink: forms/role
     short: Roles
     description: | 
-      The roles provide RBAC.  Each role has a name and 1 or more groups (local, ldap or azuread).  The `admin` and `public` rol is mandatory.
+      The roles provide RBAC.  Each role has a name and 1 or more groups (local, ldap or azuread).  The `admin` and `public` rol is mandatory.  
+      Since version 4.0.11 you can also add users (local, ldap or azuread)
     examples:
     - name: Roles
       code: |
@@ -409,6 +410,9 @@
         - name: demo
           groups:
           - local/demo
+        - name: usersonly
+          users:
+          - local/myuser
         - name: public        # is mandatory
           groups: []  
   - name: constants

server/src/controllers/job.controller.js

@@ -63,7 +63,7 @@ exports.getJob = function(req, res) {
 
 };
 exports.findAllJobs = function(req, res) {
-    var user = req.user.user
+    var user = req?.user?.user || {}
     var records = req.query.records || 500
     Job.findAll(user,records)
     .then((jobs)=>{res.json(new RestResult("success","jobs found",jobs,""))})
@@ -94,19 +94,23 @@ exports.launch = async function(req, res) {
         res.json(new RestResult("error","no data was sent","",""));
     }else{
         // get the form data
-        var form = req.body.formName;
+        var form = req.body.formName || "";
         var extravars = req.body.extravars || {}
         var creds = req.body.credentials || {}
         var awxCreds = req.body.awxCredentials || {}
         for (const [key, value] of Object.entries(awxCreds)) {
           creds["awx___"+key]=value
         }
-        var user = req.user.user
+        var user = req?.user?.user || {}
         extravars.ansibleforms_user = user
-        Job.launch(form,null,user,creds,extravars,null,function(job){
-          res.json(new RestResult("success","succesfully launched form",job,""))
-        })
-        .catch((err)=>{res.json(new RestResult("success","failed to launch form",null,err.toString))})
+        try{
+          await Job.launch(form,null,user,creds,extravars,null,function(job){
+            res.json(new RestResult("success","succesfully launched form",job,""))
+          })
+        }catch(err){
+          logger.error(err.toString())
+          res.json(new RestResult("success","failed to launch form",null,err.toString()))
+        }
     }
 };
 exports.relaunchJob = async function(req, res) {
@@ -117,11 +121,15 @@ exports.relaunchJob = async function(req, res) {
       res.json(new RestResult("error","You must provide a jobid","",""));
       return false
     }
-    var user = req.user.user
-    Job.relaunch(user,jobid,(job)=>{
-      res.json(new RestResult("success",`Job has been relaunched with job id ${job.id}`,"",""))
-    })
-    .catch((err)=>{ res.json(new RestResult("error",`Failed to relaunch : ${err.toString()}`,"","")) })
+    var user = req?.user?.user || {}
+    try{
+      await Job.relaunch(user,jobid,(job)=>{
+        res.json(new RestResult("success",`Job has been relaunched with job id ${job.id}`,"",""))
+      })
+    }catch(err){
+      logger.error(err.toString())
+      res.json(new RestResult("error",`Failed to relaunch : ${err.toString()}`,"",""))
+    }
 };
 exports.approveJob = async function(req, res) {
 
@@ -131,11 +139,15 @@ exports.approveJob = async function(req, res) {
       res.json(new RestResult("error","You must provide a jobid","",""));
       return false
     }
-    var user = req.user.user
-    Job.approve(user,jobid,(job)=>{
-      res.json(new RestResult("success",`Job ${jobid} has been approved`,"",""))
-    })
-    .catch((err)=>{res.json(new RestResult("error",`Failed to approve : ${err.toString()}`,"",""))})
+    var user = req?.user?.user || {}
+    try{
+      await Job.approve(user,jobid,(job)=>{
+        res.json(new RestResult("success",`Job ${jobid} has been approved`,"",""))
+      })
+    }catch(err){
+      logger.error(err.toString())
+      res.json(new RestResult("error",`Failed to approve : ${err.toString()}`,"",""))
+    }    
 };
 exports.rejectJob = async function(req, res) {
 
@@ -145,8 +157,13 @@ exports.rejectJob = async function(req, res) {
       res.json(new RestResult("error","You must provide a jobid","",""));
       return false
     }
-    var user = req.user.user
-    Job.reject(user,jobid)
-    .then(()=>{res.json(new RestResult("success",`Job ${jobid} has been rejected`,"",""))})
-    .catch((err)=>{res.json(new RestResult("error",`Failed to reject : ${err.toString()}`,"",""))})
+    var user = req?.user?.user || {}
+    try{
+      await Job.reject(user,jobid)
+      res.json(new RestResult("success",`Job ${jobid} has been rejected`,"",""))
+    }catch(err){
+      logger.error(err.toString())
+      res.json(new RestResult("error",`Failed to reject : ${err.toString()}`,"",""))
+    }    
+
 };

server/src/lib/common.js

@@ -230,8 +230,8 @@ Helpers.formatOutput = (records,asText)=>{
         if(filterOutput){
           line=line.replace(/class='/g,"class='low ")
         }
-        lineoutput.push(line)
       }
+      lineoutput.push(line)
     }) // end line loop
     // we add a timestamp to the record
     // we push it in the intermediate output array

server/src/models/user.model.js

@@ -115,6 +115,7 @@ User.checkToken = function (username,username_type,refresh_token) {
 User.getRoles = function(groups,user){
   var roles = ["public"]
   var forms=undefined
+  var full_username = `${user.type}/${user.username}`
   try{
     forms = Form.load()
   }catch(e){
@@ -124,11 +125,19 @@ User.getRoles = function(groups,user){
   groups.forEach(function(group){
       // add all the roles that match the group
       forms.roles.forEach(function(role){
-        if(role.groups.includes(group)){
+        if(role.groups && role.groups.includes(group)){
           roles.push(role.name)
         }
       })
   })
+
+  // add all the roles that match the user
+  forms.roles.forEach(function(role){
+    if(role.users && role.users.includes(full_username)){
+      roles.push(role.name)
+    }
+  })
+
   return roles
 }
 User.getGroups = function(user,groupObj){

server/src/swagger.json

@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "description": "This is the swagger interface for AnsibleForms.\r\nUse the `/auth/login` api with basic authentication to obtain a JWT token.\r\nThen use the access token, prefixed with the word '**Bearer**' to use all other api's.\r\nNote that the access token is limited in time.  You can then either login again and get a new set of tokens or use the `/token` api and the refresh token to obtain a new set (preferred).",
-    "version": "4.0.10",
+    "version": "4.0.11",
     "title": "AnsibleForms",
     "contact": {
       "email": "[email protected]"