@jsreport/jsreport-cli 3.1.1 → 3.2.1

package/README.md

@@ -7,6 +7,19 @@ See http://jsreport.net/learn/cli for documentation
 
 ## Changelog
 
+### 3.2.0
+
+- change the configure command questions to fit better with new `trustUserCode` option
+- changes to enable new `trustUserCode` option
+
+### 3.1.2
+
+- update deps to fix npm audit
+
+### 3.1.1
+
+- update deps to fix npm audit
+
 ### 3.1.0
 
 internal refactor (use latest version of yargs)

package/example.config.json

@@ -22,7 +22,7 @@
       "filename": "logs/error.log"
     }
   },
-  "allowLocalFilesAccess": false,
+  "trustUserCode": false,
   "reportTimeout": 60000,
   "workers": {
     "numberOfWorkers": 2

package/lib/commander/startProcessing.js

@@ -1,5 +1,5 @@
 const yargs = require('yargs')
-const prompt = require('prompt-tmp')
+const prompt = require('prompt')
 const startCommand = require('./startCommand')
 const jsreportInstance = require('./jsreportInstance')
 const cliPackageJson = require('../../package.json')

package/lib/commands/configure.js

@@ -45,63 +45,10 @@ exports.handler = async (argv) => {
     logger.debug('starting with questions..')
 
     const questions = [
-      {
-        type: 'confirm',
-        name: 'serverEnabled',
-        message: 'Do you want to enable web server?',
-        default: true
-      },
-      {
-        type: 'list',
-        name: 'serverProtocol',
-        message: 'Which protocol should web server use?',
-        choices: [{
-          name: 'http',
-          value: 'http'
-        }, {
-          name: 'https',
-          value: 'https'
-        }, {
-          name: 'http and https (http will redirect to https)',
-          value: 'http-and-https'
-        }],
-        default: 0,
-        when: (answers) => {
-          return answers.serverEnabled
-        }
-      },
-      {
-        type: 'input',
-        name: 'serverHttpsKey',
-        message: 'To use https you need a key file, specify the path to this file:',
-        default: 'certificates/server.key',
-        when: (answers) => {
-          return answers.serverProtocol === 'https' || answers.serverProtocol === 'http-and-https'
-        }
-      },
-      {
-        type: 'input',
-        name: 'serverHttpsCert',
-        message: 'To use https you need a cert file, specify the path to this file:',
-        default: 'certificates/server.cert',
-        when: (answers) => {
-          return answers.serverProtocol === 'https' || answers.serverProtocol === 'http-and-https'
-        }
-      },
       {
         type: 'input',
         name: 'serverPort',
-        message: (answers) => {
-          let msg
-
-          if (answers.serverProtocol === 'http-and-https') {
-            msg = 'Specify the http port for web server:'
-          } else {
-            msg = 'Specify the ' + answers.serverProtocol + ' port for web server:'
-          }
-
-          return msg
-        },
+        message: 'Specify the http port for web server:',
         default: 5488,
         validate: (input) => {
           const valid = !isNaN(parseInt(input, 10))
@@ -114,42 +61,13 @@ exports.handler = async (argv) => {
         },
         filter: (input) => {
           return parseInt(input, 10)
-        },
-        when: (answers) => {
-          return answers.serverEnabled
-        }
-      },
-      {
-        type: 'input',
-        name: 'serverHttpsPort',
-        message: (answers) => {
-          return 'Specify the https port for web server:'
-        },
-        default: 5489,
-        validate: (input) => {
-          const valid = !isNaN(parseInt(input, 10))
-
-          if (valid) {
-            return true
-          }
-
-          return 'port must be a valid number'
-        },
-        filter: (input) => {
-          return parseInt(input, 10)
-        },
-        when: (answers) => {
-          return answers.serverEnabled && answers.serverProtocol === 'http-and-https'
         }
       },
       {
         type: 'confirm',
         name: 'serverAuthEnabled',
         message: 'Do you want to enable authentication in web server?',
-        default: false,
-        when: (answers) => {
-          return answers.serverEnabled
-        }
+        default: false
       },
       {
         type: 'input',
@@ -195,30 +113,11 @@ exports.handler = async (argv) => {
           return answers.serverAuthEnabled
         }
       },
-      {
-        type: 'list',
-        name: 'store',
-        message: 'Do you want to persist jsreport objects and logs on disk?',
-        choices: [{
-          name: 'Yes templates and logs will be saved on disk',
-          value: 'fs',
-          short: 'Yes everything saved on disk'
-        }, {
-          name: 'Yes, but without log files.',
-          value: 'fs-without-log',
-          short: 'Yes, but logs won\'t be written on disk'
-        }, {
-          name: 'No, objects will live in memory until process is finished',
-          value: 'memory',
-          short: 'No, only memory will be used'
-        }],
-        default: 0
-      },
       {
         type: 'confirm',
-        name: 'allowLocalFilesAccess',
-        message: 'Can jsreport trust the rendering requests and allow access to local files and modules?',
-        default: true
+        name: 'trustUserCode',
+        message: 'Do you trust the user code and want to disable sandboxing? (sandboxing slightly degrades performance but adds security when running external code)',
+        default: false
       },
       {
         type: 'input',
@@ -244,10 +143,7 @@ exports.handler = async (argv) => {
         type: 'confirm',
         name: 'createExamples',
         message: 'Would you like that we create some default examples for you?',
-        default: true,
-        when: (answers) => {
-          return answers.store === 'fs' || answers.store.indexOf('fs') === 0
-        }
+        default: true
       }
     ]
 
@@ -261,96 +157,45 @@ exports.handler = async (argv) => {
   logger.debug('answers:')
   logger.debug(JSON.stringify(answers, null, 2))
 
-  if (!answers.serverEnabled) {
-    extensionsConf.express = {
-      enabled: false
-    }
-  }
-
-  if (answers.serverEnabled) {
-    if (answers.serverProtocol === 'http-and-https') {
-      config.httpPort = answers.serverPort
-      config.httpsPort = answers.serverHttpsPort
-
-      config.certificate = {
-        key: answers.serverHttpsKey,
-        cert: answers.serverHttpsCert
-      }
-    } else {
-      config[answers.serverProtocol === 'http' ? 'httpPort' : 'httpsPort'] = answers.serverPort
+  config.httpPort = answers.serverPort
 
-      if (answers.serverProtocol === 'https') {
-        config.certificate = {
-          key: answers.serverHttpsKey,
-          cert: answers.serverHttpsCert
-        }
-      }
+  if (answers.serverAuthEnabled) {
+    extensionsConf.authentication = {
+      cookieSession: {
+        secret: answers.serverAuthCookieSecret
+      },
+      admin: {
+        username: answers.serverAuthUsername,
+        password: answers.serverAuthPassword
+      },
+      enabled: true
     }
-
-    if (answers.serverAuthEnabled) {
-      extensionsConf.authentication = {
-        cookieSession: {
-          secret: answers.serverAuthCookieSecret
-        },
-        admin: {
-          username: answers.serverAuthUsername,
-          password: answers.serverAuthPassword
-        },
-        enabled: true
-      }
-    } else {
-      extensionsConf.authentication = {
-        cookieSession: {},
-        admin: {
-          username: 'admin',
-          password: 'password'
-        },
-        enabled: false
-      }
+  } else {
+    extensionsConf.authentication = {
+      cookieSession: {},
+      admin: {
+        username: 'admin',
+        password: 'password'
+      },
+      enabled: false
     }
   }
 
-  if (answers.store === 'fs') {
-    config.store = {
-      provider: 'fs'
-    }
-
-    config.blobStorage = {
-      provider: 'fs'
-    }
-
-    config.logger = {
-      console: { transport: 'console', level: 'debug' },
-      file: { transport: 'file', level: 'info', filename: 'logs/reporter.log' },
-      error: { transport: 'file', level: 'error', filename: 'logs/error.log' }
-    }
-  } else if (answers.store === 'fs-without-log') {
-    config.store = {
-      provider: 'fs'
-    }
-
-    config.blobStorage = {
-      provider: 'fs'
-    }
-
-    config.logger = {
-      console: { transport: 'console', level: 'debug' }
-    }
-  } else {
-    config.store = {
-      provider: 'memory'
-    }
+  config.store = {
+    provider: 'fs'
+  }
 
-    config.blobStorage = {
-      provider: 'memory'
-    }
+  config.blobStorage = {
+    provider: 'fs'
+  }
 
-    config.logger = {
-      console: { transport: 'console', level: 'debug' }
-    }
+  config.logger = {
+    console: { transport: 'console', level: 'debug' },
+    file: { transport: 'file', level: 'info', filename: 'logs/reporter.log' },
+    error: { transport: 'file', level: 'error', filename: 'logs/error.log' }
   }
 
-  config.allowLocalFilesAccess = answers.allowLocalFilesAccess === true
+  config.trustUserCode = answers.trustUserCode === true
 
   if (answers.createExamples) {
     extensionsConf['sample-template'] = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsreport/jsreport-cli",
-  "version": "3.1.1",
+  "version": "3.2.1",
   "description": "Command line interface for jsreport",
   "keywords": [
     "jsreport",
@@ -64,16 +64,16 @@
     "npm-install-package": "2.1.0",
     "nssocket": "0.6.0",
     "once": "1.4.0",
-    "prompt-tmp": "1.0.0",
+    "prompt": "1.3.0",
     "semver": "5.6.0",
     "silent-spawn": "0.4.0",
     "yargs": "17.3.1"
   },
   "devDependencies": {
-    "@jsreport/jsreport-authentication": "3.3.0",
-    "@jsreport/jsreport-core": "3.5.0",
-    "@jsreport/jsreport-express": "3.4.0",
-    "@jsreport/jsreport-fs-store": "3.2.0",
+    "@jsreport/jsreport-authentication": "3.3.1",
+    "@jsreport/jsreport-core": "3.6.1",
+    "@jsreport/jsreport-express": "3.4.1",
+    "@jsreport/jsreport-fs-store": "3.2.1",
     "@jsreport/jsreport-handlebars": "3.1.0",
     "cross-env": "5.2.1",
     "execa": "1.0.0",