Merge branch 'master' into stable

Author: bugy

.gitignore

@@ -66,16 +66,17 @@ conf/runners
 conf/theme
 conf/conf.json
 conf/.htpasswd
+conf/deleted
 logs
 .idea
 temp
 /web
 web-src/node_modules
-web-src/package-lock.json
 web-src/tests/e2e/reports/
 web-src/selenium-debug.log
 web-src/chromedriver.log
 web-src/geckodriver.log
 
 venv/
 /venv2/
+e2e_venv/

.travis.yml

@@ -1,6 +1,6 @@
 if: tag IS blank
 sudo: required
-dist: bionic
+dist: focal
 language: node_js
 node_js:
   - '15'
@@ -9,6 +9,10 @@ cache:
     - web-src/node_modules
 addons:
   chrome: stable
+  apt:
+    update: true
+    packages:
+      - libu2f-udev
 env:
   global:
     - OWNER=${TRAVIS_REPO_SLUG%/*}
@@ -25,13 +29,13 @@ env:
     - PATH=$HOME/.local/bin:$PATH
 before_install:
   - sudo apt-get -y install python3-pip python3-setuptools apache2-utils python3-venv
-    chromium-chromedriver
+    chromium-browser chromium-chromedriver
 install:
-  - sudo pip3 install -r requirements.txt
-  - sudo pip3 install pyasn1 --upgrade
-  - sudo pip3 install ldap3 parameterized bcrypt
-  - sudo pip3 install requests --upgrade
-  - sudo pip3 install awscli
+  - pip3 install -r requirements.txt
+  - pip3 install pyasn1 --upgrade
+  - pip3 install ldap3 parameterized bcrypt
+  - pip3 install requests --upgrade
+  - pip3 install awscli
   - cd web-src
   - npm install
   - npm install allure-commandline --save-dev
@@ -40,7 +44,7 @@ install:
   - e2e_venv/bin/pip install -r src/e2e_tests/requirements.txt
 before_script:
   - cd src
-  #  - python3 -m unittest discover -s tests -p "*.py" -t .
+  - python3 -m unittest discover -s tests -p "*.py" -t .
   - cd ../web-src
   - npm run test:unit-ci
   - cd ..

README.md

@@ -32,7 +32,7 @@ or [how to configure the server](https://github.com/bugy/script-server/wiki/Serv
 
 ### Server-side
 
-Python 3.6 or higher with the following modules:
+Python 3.7 or higher with the following modules:
 
 * Tornado 5 / 6
 
@@ -69,6 +69,9 @@ For the usage please check [this ticket](https://github.com/bugy/script-server/i
 
 If you are making changes to web files, use `npm run build` or `npm run serve`
 
+### A issue running on OpenBSD and maybe other UNIX systems
+See [A issue running on OpenBSD and maybe other UNIX systems](https://github.com/bugy/script-server/wiki/OpenBSD-process-termination-issues).
+
 
 ## Setup and run
 1. Create configurations for your scripts in *conf/runners/* folder (see [script config page](https://github.com/bugy/script-server/wiki/Script-config) for details)

conf/logging.json

@@ -16,8 +16,7 @@
     "file": {
       "class": "logging.FileHandler",
       "level": "INFO",
-      "formatter": "simple",
-      "filename": "logs/server.log"
+      "formatter": "simple"
     }
   },
   "loggers": {

samples/configs/ploty_html_output.json …ples/configs/HTML/ploty_html_output.jsonsamples/configs/ploty_html_output.json renamed to samples/configs/HTML/ploty_html_output.json samples/configs/ploty_html_output.json renamed to samples/configs/HTML/ploty_html_output.json

@@ -3,5 +3,9 @@
   "script_path": "/usr/bin/python3 ./samples/scripts/destroy_world.py",
   "description": "This is a very dangerous script, please be careful when running. Don't forget your protective helmet.",
   "requires_terminal": false,
-  "output_format": "terminal"
+  "output_format": "terminal",
+  "preload_script": {
+    "script": "echo 'This is a <b>preload</b> script showing some info.</br>'",
+    "output_format": "html"
+  }
 }

samples/configs/simple_html_output.json …les/configs/HTML/simple_html_output.jsonsamples/configs/simple_html_output.json renamed to samples/configs/HTML/simple_html_output.json samples/configs/simple_html_output.json renamed to samples/configs/HTML/simple_html_output.json

@@ -0,0 +1,11 @@
+{
+  "hidden": true,
+  "parameters": [
+    {
+      "name": "include2_p1"
+    },
+    {
+      "name": "include2_p2"
+    }
+  ]
+}

samples/configs/destroy_world.json

@@ -0,0 +1,11 @@
+{
+  "hidden": true,
+  "parameters": [
+    {
+      "name": "include3_p1"
+    },
+    {
+      "name": "include3_p2"
+    }
+  ]
+}

samples/configs/included2.json

@@ -0,0 +1,16 @@
+{
+  "name": "Multiple Include",
+  "script_path": "/bin/bash conf/scripts/echo.sh",
+  "description": "This script does nothing except accepting parameter from mulitple include and printing them",
+  "parameters": [
+    {
+      "name": "self_param",
+      "default": "A"
+    }
+  ],
+  "include": [
+    "included.json",
+    "included2.json",
+    "included3.json"
+  ]
+}