Merge pull request #89 from billchurch/package-upgrade-test

approved, update packages to most recent, client files rebuilt

.codeclimate.yml

@@ -2,9 +2,13 @@
 engines:
   csslint:
     enabled: true
+    exclude_paths:
+      - "client/public/*"
   duplication:
     exclude_paths:
+      - "client/public/*"
       - "public/webssh2.bundle.js"
+      - "workspace/*"
     enabled: true
     config:
       languages:
@@ -29,4 +33,6 @@ ratings:
 exclude_paths:
 - node_modules/
 - "public/webssh2.bundle.js"
+- "workspace/*"
+
 

client/public/webssh2.css

@@ -1 +1,287 @@
-.xterm{font-family:courier-new,courier,monospace;font-feature-settings:"liga" 0;position:relative;user-select:none;-ms-user-select:none;-webkit-user-select:none}.xterm.focus,.xterm:focus{outline:none}.xterm .xterm-helpers{position:absolute;top:0;z-index:10}.xterm .xterm-helper-textarea{position:absolute;opacity:0;left:-9999em;top:0;width:0;height:0;z-index:-10;white-space:nowrap;overflow:hidden;resize:none}.xterm .composition-view{background:#000;color:#fff;display:none;position:absolute;white-space:nowrap;z-index:1}.xterm .composition-view.active{display:block}.xterm .xterm-viewport{background-color:#000;overflow-y:scroll;cursor:default;position:absolute;right:0;left:0;top:0;bottom:0}.xterm .xterm-screen{position:relative}.xterm .xterm-screen canvas{position:absolute;left:0;top:0}.xterm .xterm-scroll-area{visibility:hidden}.xterm-char-measure-element{display:inline-block;visibility:hidden;position:absolute;top:0;left:-9999em;line-height:normal}.xterm.enable-mouse-events{cursor:default}.xterm:not(.enable-mouse-events){cursor:text}.xterm .xterm-accessibility,.xterm .xterm-message{position:absolute;left:0;top:0;bottom:0;right:0;z-index:100;color:transparent}.xterm .live-region{position:absolute;left:-9999px;width:1px;height:1px;overflow:hidden}.xterm-cursor-pointer{cursor:pointer}body,html{font-family:helvetica,sans-serif;font-size:1em;color:#111;background-color:#000;color:#f0f0f0;height:100%;margin:0}#header{color:#f0f0f0;background-color:green;width:100%;border-color:#fff;border-style:none none solid;border-width:1px;text-align:center;flex:0 1 auto;z-index:99;height:19px;display:none}.box{display:block;height:100%}#terminal-container{display:block;width:calc(1 - 1 px);margin:0 auto;padding:2px;height:calc(100% - 19px)}#terminal-container .terminal{background-color:#000;color:#fafafa;padding:2px;height:calc(100% - 19px)}#terminal-container .terminal:focus .terminal-cursor{background-color:#fafafa}#bottomdiv{position:fixed;left:0;bottom:0;width:100%;background-color:#323232;border-color:#fff;border-style:solid none none;border-width:1px;z-index:99;height:19px}#footer{padding-left:5px;padding-right:5px;border-style:none none none solid}#footer,#status{display:inline-block;color:#f0f0f0;background-color:#323232;border-color:#fff;border-width:1px;text-align:left}#status{padding-right:10px;border-style:none solid}#menu,#status{padding-left:10px;z-index:100}#menu{display:inline-block;font-size:16px;color:#fff}#menu:hover .dropup-content{display:block}#credentialsBtn,#logBtn,#reauthBtn{color:#000}.dropup{position:relative;display:inline-block;cursor:pointer}.dropup-content{display:none;position:absolute;background-color:#f1f1f1;font-size:16px;min-width:160px;bottom:18px;z-index:101}.dropup-content a{color:#777;padding:12px 16px;text-decoration:none;display:block}.dropup-content a:hover{background-color:#ccc}.dropup:click .dropup-content,.dropup:hover .dropup-content{display:block}.dropup:hover .dropbtn{background-color:#3e8e41}
+/**
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
+ * https://github.com/chjj/term.js
+ * @license MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Originally forked from (with the author's permission):
+ *   Fabrice Bellard's javascript vt100 for jslinux:
+ *   http://bellard.org/jslinux/
+ *   Copyright (c) 2011 Fabrice Bellard
+ *   The original design remains. The terminal itself
+ *   has been extended to include xterm CSI codes, among
+ *   other features.
+ */
+
+/**
+ *  Default styles for xterm.js
+ */
+
+.xterm {
+    font-family: courier-new, courier, monospace;
+    font-feature-settings: "liga" 0;
+    position: relative;
+    user-select: none;
+    -ms-user-select: none;
+    -webkit-user-select: none;
+}
+
+.xterm.focus,
+.xterm:focus {
+    outline: none;
+}
+
+.xterm .xterm-helpers {
+    position: absolute;
+    top: 0;
+    /**
+     * The z-index of the helpers must be higher than the canvases in order for
+     * IMEs to appear on top.
+     */
+    z-index: 10;
+}
+
+.xterm .xterm-helper-textarea {
+    /*
+     * HACK: to fix IE's blinking cursor
+     * Move textarea out of the screen to the far left, so that the cursor is not visible.
+     */
+    position: absolute;
+    opacity: 0;
+    left: -9999em;
+    top: 0;
+    width: 0;
+    height: 0;
+    z-index: -10;
+    /** Prevent wrapping so the IME appears against the textarea at the correct position */
+    white-space: nowrap;
+    overflow: hidden;
+    resize: none;
+}
+
+.xterm .composition-view {
+    /* TODO: Composition position got messed up somewhere */
+    background: #000;
+    color: #FFF;
+    display: none;
+    position: absolute;
+    white-space: nowrap;
+    z-index: 1;
+}
+
+.xterm .composition-view.active {
+    display: block;
+}
+
+.xterm .xterm-viewport {
+    /* On OS X this is required in order for the scroll bar to appear fully opaque */
+    background-color: #000;
+    overflow-y: scroll;
+    cursor: default;
+    position: absolute;
+    right: 0;
+    left: 0;
+    top: 0;
+    bottom: 0;
+}
+
+.xterm .xterm-screen {
+    position: relative;
+}
+
+.xterm .xterm-screen canvas {
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.xterm .xterm-scroll-area {
+    visibility: hidden;
+}
+
+.xterm-char-measure-element {
+    display: inline-block;
+    visibility: hidden;
+    position: absolute;
+    top: 0;
+    left: -9999em;
+    line-height: normal;
+}
+
+.xterm {
+    cursor: text;
+}
+
+.xterm.enable-mouse-events {
+    /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
+    cursor: default;
+}
+
+.xterm.xterm-cursor-pointer {
+    cursor: pointer;
+}
+
+.xterm.xterm-cursor-crosshair {
+    /* Column selection mode */
+    cursor: crosshair;
+}
+
+.xterm .xterm-accessibility,
+.xterm .xterm-message {
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 100;
+    color: transparent;
+}
+
+.xterm .live-region {
+    position: absolute;
+    left: -9999px;
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
+}
+body, html  {
+  font-family: helvetica, sans-serif, arial;
+  font-size: 1em;
+  color: #111;
+  background-color: rgb(0, 0, 0);
+  color: rgb(240, 240, 240);
+  height: 100%;
+  margin: 0;
+}
+#header {
+    color: rgb(240, 240, 240);
+    background-color: rgb(0, 128, 0);
+    width: 100%;
+    border-color: white;
+    border-style: none none solid none;
+    border-width: 1px;
+    text-align: center;
+    flex: 0 1 auto;
+    z-index: 99;
+    height:19px;
+    display: none;
+}
+.box {
+    display: block;
+    height: 100%;
+}
+#terminal-container {
+    display: block;
+    width: calc(100% - 1 px);
+    margin: 0 auto;
+    padding: 2px;
+    height: calc(100% - 19px);
+}
+#terminal-container .terminal {
+    background-color: #000000;
+    color: #fafafa;
+    padding: 2px;
+    height: calc(100% - 19px);
+}
+#terminal-container .terminal:focus .terminal-cursor {
+    background-color: #fafafa;
+}
+#bottomdiv {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    background-color: rgb(50, 50, 50);
+    border-color: white;
+    border-style: solid none none none;
+    border-width: 1px;
+    z-index: 99;
+    height: 19px;
+}
+#footer {
+    display: inline-block;
+    color: rgb(240, 240, 240);
+    background-color: rgb(50, 50, 50);
+    padding-left: 5px;
+    padding-right: 5px;
+    border-color: white;
+    border-style: none none none solid;
+    border-width: 1px;
+    text-align: left;
+}
+#status {
+    display: inline-block;
+    color: rgb(240, 240, 240);
+    background-color: rgb(50, 50, 50);
+    padding-left: 10px;
+    padding-right: 10px;
+    border-color: white;
+    border-style: none solid none solid;
+    border-width: 1px;
+    text-align: left;
+    z-index: 100;
+}
+#menu {
+    display: inline-block;
+    font-size: 16px;
+    color: rgb(255, 255, 255);
+    padding-left: 10px;
+    z-index: 100;
+}
+#menu:hover .dropup-content {
+    display: block;
+}
+#logBtn, #credentialsBtn, #reauthBtn {
+    color: #000;
+}
+
+.dropup {
+    position: relative;
+    display: inline-block;
+    cursor: pointer;
+}
+.dropup-content {
+  display: none;
+  position: absolute;
+  background-color: #f1f1f1;
+  font-size: 16px;
+  min-width: 160px;
+  bottom: 18px;
+  z-index: 101;
+}
+.dropup-content a {
+    color: #777;
+    padding: 12px 16px;
+    text-decoration: none;
+    display: block;
+}
+.dropup-content a:hover {
+    background-color: #ccc
+}
+.dropup:hover .dropup-content {
+    display: block;
+}
+.dropup:click .dropup-content {
+    display: block;
+}
+.dropup:hover .dropbtn {
+    background-color: #3e8e41;
+}

client/src/css/style.css

@@ -1,4 +1,4 @@
-html, body {
+body, html  {
   font-family: helvetica, sans-serif, arial;
   font-size: 1em;
   color: #111;

package.json

@@ -28,49 +28,50 @@
   },
   "dependencies": {
     "basic-auth": "^2.0.0",
-    "colors": "^1.1.2",
+    "colors": "^1.3.1",
-    "compression": "^1.7.1",
+    "compression": "^1.7.3",
     "debug": "^3.1.0",
-    "express": "^4.16.1",
+    "express": "^4.16.3",
     "express-session": "^1.15.6",
     "morgan": "^1.9.0",
     "read-config": "^2.0.0",
-    "socket.io": "^2.0.4",
+    "socket.io": "^2.1.1",
     "ssh2": "^0.6.1",
-    "validator": "^10.1.0"
+    "validator": "^10.5.0"
   },
   "scripts": {
     "start": "node index.js",
     "build": "webpack --progress --colors --config scripts/webpack.prod.js",
     "builddev": "webpack --progress --colors --config scripts/webpack.dev.js",
+    "analyze": "webpack --json --config scripts/webpack.prod.js | webpack-bundle-size-analyzer",
     "test": "snyk test",
     "watch": "nodemon index.js",
     "standard": "standard --verbose --fix | snazzy",
     "cleanmac": "find . -name '.DS_Store' -type f -delete"
   },
   "devDependencies": {
-    "@fortawesome/fontawesome": "^1.1.7",
+    "@fortawesome/fontawesome": "^1.1.8",
-    "@fortawesome/fontawesome-free-solid": "^5.0.11",
+    "@fortawesome/fontawesome-free-solid": "^5.0.13",
-    "ajv": "^6.5.0",
+    "ajv": "^6.5.2",
     "bithound": "^1.7.0",
-    "clean-webpack-plugin": "^0.1.18",
+    "clean-webpack-plugin": "^0.1.19",
-    "copy-webpack-plugin": "^4.3.1",
+    "copy-webpack-plugin": "^4.5.2",
-    "css-loader": "^0.28.9",
+    "css-loader": "^1.0.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "file-loader": "^1.1.6",
+    "file-loader": "^1.1.11",
-    "nodemon": "^1.11.0",
+    "nodemon": "^1.18.3",
-    "postcss-discard-comments": "^2.0.4",
+    "postcss-discard-comments": "^4.0.0",
-    "snazzy": "^7.0.0",
+    "snazzy": "^7.1.1",
-    "snyk": "^1.39.1",
+    "snyk": "^1.90.0",
-    "standard": "^11.0.0",
+    "standard": "^11.0.1",
     "style-loader": "^0.21.0",
-    "uglifyjs-webpack-plugin": "^1.1.8",
+    "uglifyjs-webpack-plugin": "^1.2.7",
     "url-loader": "^1.0.1",
-    "webpack": "^4.8.1",
+    "webpack": "^4.16.5",
-    "webpack-cli": "^2.1.3",
+    "webpack-cli": "^3.1.0",
-    "webpack-merge": "^4.1.1",
+    "webpack-merge": "^4.1.4",
-    "webpack-stream": "^4.0.0",
+    "webpack-stream": "^5.1.0",
-    "xterm": "^3.1.0"
+    "xterm": "^3.5.1"
   },
   "standard": {
     "ignore": [

server/app.js

@@ -37,7 +37,7 @@ app.use(express.static(publicPath, expressOptions))
 
 app.get('/reauth', function (req, res, next) {
   var r = req.headers.referer || '/'
-  res.status(401).send('<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0; url=' + r + '"></head><body bgcolor="#000"></body></html>');
+  res.status(401).send('<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0; url=' + r + '"></head><body bgcolor="#000"></body></html>')
 })
 
 app.get('/ssh/host/:host?', function (req, res, next) {