Revert "housekeeping"

This reverts commit bc19432dfa.

app.js

@@ -3,7 +3,6 @@
 var path = require('path')
 // configPath = path.join(__dirname, 'config.json')
 var configPath = path.join(path.dirname(require.main.filename), 'config.json')
-var publicPath = path.join(path.dirname(require.main.filename), 'client', 'public')
 console.log('Reading config from: ' + configPath)
 var config = require('read-config')(configPath)
 var express = require('express')
@@ -32,10 +31,10 @@ if (config.accesslog) app.use(logger('common'))
 app.disable('x-powered-by')
 
 // static files
-app.use(express.static(publicPath, expressOptions))
+app.use(express.static(path.join(__dirname, 'public'), expressOptions))
 
 app.get('/ssh/host/:host?', function (req, res, next) {
-  res.sendFile(path.join(path.join(publicPath, 'client.htm')))
+  res.sendFile(path.join(path.join(__dirname, 'public', 'client.htm')))
   // capture, assign, and validated variables
   req.session.ssh = {
     host: (validator.isIP(req.params.host + '') && req.params.host) ||

bin/startup_script_webssh_commands.sh

@@ -1,63 +0,0 @@
-#!/bin/bash
-# Filename: /config/startup_script_webssh_commands.sh
-# Initializes WebSSH2 tmm-to-node listener
-# WebSSHVSIP should be the IP on an existing BIGIP virtual server assigned to
-# the WebSSH2 service.
-#
-# bill@f5.com February 2018
-
-export myFileName=$0
-export REMOTEUSER=root
-export WEBSSHVSIP=
-
-# check to see if we're in /config/startup, if not add ourselves
-IN_STARTUP=`grep startup_script_webssh_commands.sh /config/startup | wc -l`
-if [ $IN_STARTUP -eq 0 ]; then
-  echo Adding script to /config/startup and ensuring correct permissions...
-  logger -p local0.notice -t $myFileName Adding $0 to /config/startup and ensuring correct permissions...
-  chmod 755 /config/startup
-  chmod 755 /config/startup_script_webssh_commands.sh
-  echo /config/startup_script_webssh_commands.sh \& >> /config/startup
-  echo >> /config/startup
-fi
-
-# Limit to 13 times in while-loop, ie. 12 x 10 secs sleep = 2 mins.
-MAX_LOOP=13
-
-while true
-do
-# check to see if tmm interface is up
-IPLINKLIST=$(ip link list tmm 2>&1)
-if [ $? -eq 0 ]; then
-  if [ ! -z $WEBSSHVSIP ]; then
-    IPADDRADD=$(/sbin/ip addr add $WEBSSHVSIP/32 dev tmm 2>&1)
-    if [ $? -eq 0 ]; then
-      # success
-      echo SUCCESS $IPADDRADD
-      logger -p local0.notice -t $myFileName IPADDRADD: SUCCESS: $IPADDRADD
-    else
-      # failure
-      echo FAILURE $IPADDRADD
-      logger -p local0.notice -t $myFileName IPADDRADD: FAILURE: $IPADDRADD
-    fi
-  else
-    echo FAILURE: WEBSSHVSIP not specified.
-    echo Open $0 and set the WEBSSHVSIP and try again
-    echo
-    logger -p local0.notice -t $myFileName IPADDRADD: FAILURE: NO WEBSSHVSIP SPECIFIED
-  fi
-  exit
-fi
-# If tmm interface is not up yet, script sleep 10 seconds and check again.
-sleep 10
-
-# Safety check not to run this script in background beyond 2 mins (ie. 12 times in while-loop).
-if [ "$MAX_LOOP" -eq 1 ]; then
-  logger -p local0.notice -t $myFileName tmm interface not up within 2 minutes. Exiting script.
-  logger -p local0.notice -t $myFileName IPLINKLIST: $IPLINKLIST
-  exit
-fi
-((MAX_LOOP--))
-done
-
-# End of file /config/startup_script_webssh_commands.sh

index.js

@@ -6,8 +6,8 @@
  */
 'use strict'
 
-var config = require('./server/app').config
+var config = require('./app').config
-var server = require('./server/app').server
+var server = require('./app').server
 
 server.listen({ host: config.listen.ip, port: config.listen.port
 })

package.json

@@ -34,17 +34,17 @@
     "express": "^4.16.1",
     "express-session": "^1.15.6",
     "morgan": "^1.9.0",
-    "read-config": "^1.6.0",
+    "read-config": "^2.0.0",
     "socket.io": "^2.0.4",
     "ssh2": "^0.5.5",
     "validator": "^9.0.0"
   },
   "scripts": {
     "start": "node index.js",
-    "build": "webpack --progress --colors --config scripts/webpack.prod.js",
+    "builddev": "webpack --config webpack.dev.js",
-    "builddev": "webpack --progress --colors --config scripts/webpack.dev.js",
     "test": "snyk test",
     "watch": "nodemon index.js",
+    "build": "webpack --config webpack.prod.js",
     "standard": "standard --verbose | snazzy",
     "cleanmac": "find . -name '.DS_Store' -type f -delete"
   },
@@ -72,10 +72,8 @@
   },
   "standard": {
     "ignore": [
-      "client/public/webssh2.bundle.js",
+      "public/webssh2.bundle.js",
-      "bigip/*",
+      "bigip/*"
-      "screenshots/*",
-      "bin/*"
     ]
   }
 }

public/client.htm

@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html>
 <head>
   <title>WebSSH2</title>

public/webssh2.css

@@ -1 +1 @@
-.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}.xterm canvas{position:absolute;left:0;top:0}.xterm .xterm-scroll-area{visibility:hidden}.xterm .xterm-char-measure-element{display:inline-block;visibility:hidden;position:absolute;left:-9999em}.xterm.enable-mouse-events{cursor:default}.xterm:not(.enable-mouse-events){cursor:text}body{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{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}
+.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}.xterm canvas{position:absolute;left:0;top:0}.xterm .xterm-scroll-area{visibility:hidden}.xterm .xterm-char-measure-element{display:inline-block;visibility:hidden;position:absolute;left:-9999em}.xterm.enable-mouse-events{cursor:default}.xterm:not(.enable-mouse-events){cursor:text}body{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}.dropup{position:relative;display:inline-block}.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}

socket.js

@@ -7,7 +7,7 @@ var SSH = require('ssh2').Client
 // var fs = require('fs')
 // var hostkeys = JSON.parse(fs.readFileSync('./hostkeyhashes.json', 'utf8'))
 var termCols, termRows
-var menuData = '<a id="logBtn"><i class="fas fa-clipboard fa-fw"></i> Start Log</a><a id="downloadLogBtn"><i class="fas fa-download fa-fw"></i> Download Log</a>'
+var menuData = '<a id="logBtn" href="javascript:void(0);"><i class="fas fa-clipboard fa-fw"></i> Start Log</a><a id="downloadLogBtn" href="javascript:void(0);"><i class="fas fa-download fa-fw"></i> Download Log</a>'
 
 // public
 module.exports = function socket (socket) {

src/client.htm

@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html>
 <head>
   <title>WebSSH2</title>

src/css/style.css

@@ -85,16 +85,9 @@ body {
 #menu:hover .dropup-content {
     display: block;
 }
-#logBtn {
-    color: #000;
-}
-#credentialsBtn {
-    color: #000;
-}
 .dropup {
     position: relative;
     display: inline-block;
-    cursor: pointer;
 }
 .dropup-content {
   display: none;

src/js/index.js

@@ -1,10 +1,8 @@
 'use strict'
 
-import * as io from 'socket.io-client/dist/socket.io.js'
+import * as io from '../../node_modules/socket.io-client/dist/socket.io.js'
-import * as Terminal from 'xterm/dist/xterm'
+import * as Terminal from '../../node_modules/xterm/dist/xterm'
-import * as fit from 'xterm/dist/addons/fit/fit'
+import * as fit from '../../node_modules/xterm/dist/addons/fit/fit'
-// fontawesome, individual icon imports reduces file size dramatically but it's
-// a little messy. this should be fixed by some updates with the fa library at some point
 import fontawesome from '@fortawesome/fontawesome'
 import faBars from '@fortawesome/fontawesome-free-solid/faBars'
 // import faQuestion from '@fortawesome/fontawesome-free-solid/faQuestion'
@@ -12,29 +10,31 @@ import faClipboard from '@fortawesome/fontawesome-free-solid/faClipboard'
 import faDownload from '@fortawesome/fontawesome-free-solid/faDownload'
 import faKey from '@fortawesome/fontawesome-free-solid/faKey'
 import faCog from '@fortawesome/fontawesome-free-solid/faCog'
+
 fontawesome.library.add(faBars, faClipboard, faDownload, faKey, faCog)
+
 fontawesome.config.searchPseudoElements = true
+
 fontawesome.dom.i2svg()
 
-require('xterm/dist/xterm.css')
+require('../../node_modules/xterm/dist/xterm.css')
 require('../css/style.css')
 
 Terminal.applyAddon(fit)
 
-/* global Blob, logBtn, credentialsBtn, downloadLogBtn */
+/* global Blob */
 
 var sessionLogEnable = false
 var loggedData = false
-var allowreplay = false
 var sessionLog, sessionFooter, logDate, currentDate, myFile, errorExists
+
+var statusID = document.getElementById('status')
+var headerID = document.getElementById('header')
+var menuID = document.getElementById('dropupContent')
+
+var terminalContainer = document.getElementById('terminal-container')
 var socket, termid // eslint-disable-line
 var term = new Terminal()
-// DOM properties
-var status = document.getElementById('status')
-var header = document.getElementById('header')
-var dropupContent = document.getElementById('dropupContent')
-var footer = document.getElementById('footer')
-var terminalContainer = document.getElementById('terminal-container')
 term.open(terminalContainer)
 term.focus()
 term.fit()
@@ -57,104 +57,76 @@ if (document.location.pathname) {
   socket = io.connect()
 }
 
-term.on('data', function (data) {
-  socket.emit('data', data)
-})
-
-socket.on('data', function (data) {
-  term.write(data)
-  if (sessionLogEnable) {
-    sessionLog = sessionLog + data
-  }
-})
-
 socket.on('connect', function () {
   socket.emit('geometry', term.cols, term.rows)
 })
-
 socket.on('setTerminalOpts', function (data) {
   term.setOption('cursorBlink', data.cursorBlink)
   term.setOption('scrollback', data.scrollback)
   term.setOption('tabStopWidth', data.tabStopWidth)
 })
-
+term.on('data', function (data) {
+  socket.emit('data', data)
+})
 socket.on('title', function (data) {
   document.title = data
-})
+}).on('menu', function (data) {
-
+  menuID.innerHTML = data
-socket.on('menu', function (data) {
+  var downloadLogBtn = document.getElementById('downloadLogBtn')
-  drawMenu(data)
+  var credentialsBtn = document.getElementById('credentialsBtn')
-})
+  var logBtn = document.getElementById('logBtn')
-
+  logBtn.addEventListener('click', toggleLog)
-socket.on('status', function (data) {
+  logBtn.style.color = '#000'
-  status.innerHTML = data
+}).on('status', function (data) {
-})
+  statusID.innerHTML = data
-
+}).on('ssherror', function (data) {
-socket.on('ssherror', function (data) {
+  statusID.innerHTML = data
-  status.innerHTML = data
+  statusID.style.backgroundColor = 'red'
-  status.style.backgroundColor = 'red'
   errorExists = true
-})
+}).on('headerBackground', function (data) {
-
+  headerID.style.backgroundColor = data
-socket.on('headerBackground', function (data) {
+}).on('header', function (data) {
-  header.style.backgroundColor = data
-})
-
-socket.on('header', function (data) {
   if (data) {
-    header.innerHTML = data
+    headerID.innerHTML = data
-    header.style.display = 'block'
+    headerID.style.display = 'block'
     // header is 19px and footer is 19px, recaculate new terminal-container and resize
     terminalContainer.style.height = 'calc(100% - 38px)'
     resizeScreen()
   }
-})
+}).on('footer', function (data) {
-
-socket.on('footer', function (data) {
   sessionFooter = data
-  footer.innerHTML = data
+  document.getElementById('footer').innerHTML = data
-})
+}).on('statusBackground', function (data) {
-
+  statusID.style.backgroundColor = data
-socket.on('statusBackground', function (data) {
+}).on('allowreplay', function (data) {
-  status.style.backgroundColor = data
-})
-
-socket.on('allowreplay', function (data) {
   if (data === true) {
     console.log('allowreplay: ' + data)
-    allowreplay = true
+    menuID.innerHTML = menuID.innerHTML + '<a id="credentialsBtn" href="javascript:void(0);"><i class="fas fa-key fa-fw"></i> Credentials</a>'
-    drawMenu(dropupContent.innerHTML + '<a id="credentialsBtn"><i class="fas fa-key fa-fw"></i> Credentials</a>')
+    credentialsBtn.style.color = '#000'
+    credentialsBtn.addEventListener('click', replayCredentials)
   } else {
-    allowreplay = false
     console.log('allowreplay: ' + data)
+    credentialsBtn.style.color = '#666'
   }
-})
+}).on('data', function (data) {
-
+  term.write(data)
-socket.on('disconnect', function (err) {
+  if (sessionLogEnable) {
+    sessionLog = sessionLog + data
+  }
+}).on('disconnect', function (err) {
   if (!errorExists) {
-    status.style.backgroundColor = 'red'
+    statusID.style.backgroundColor = 'red'
-    status.innerHTML =
+    statusID.innerHTML =
       'WEBSOCKET SERVER DISCONNECTED: ' + err
   }
   socket.io.reconnection(false)
-})
+}).on('error', function (err) {
-
-socket.on('error', function (err) {
   if (!errorExists) {
-    status.style.backgroundColor = 'red'
+    statusID.style.backgroundColor = 'red'
-    status.innerHTML = 'ERROR: ' + err
+    statusID.innerHTML = 'ERROR: ' + err
   }
 })
 
-// draw/re-draw menu and reattach listeners
-// when dom is changed, listeners are abandonded
-function drawMenu (data) {
-  dropupContent.innerHTML = data
-  logBtn.addEventListener('click', toggleLog)
-  allowreplay && credentialsBtn.addEventListener('click', replayCredentials)
-  loggedData && downloadLogBtn.addEventListener('click', downloadLog)
-}
-
 // replay password to server, requires
 function replayCredentials () { // eslint-disable-line
   socket.emit('control', 'replayCredentials')

webpack.common.js

@@ -2,25 +2,22 @@ const path = require('path')
 const CleanWebpackPlugin = require('clean-webpack-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
+
 module.exports = {
-  context: path.resolve('__dirname', '../'),
   entry: {
-    webssh2: './client/src/js/index.js'
+    webssh2: './src/js/index.js'
   },
   plugins: [
-    new CleanWebpackPlugin(['client/public'], {
+    new CleanWebpackPlugin(['./public']),
-      root: path.resolve('__dirname', '../'),
-      verbose: true
-    }),
     new CopyWebpackPlugin([
-      './client/src/client.htm',
+      './src/client.htm',
-      './client/src/favicon.ico'
+      './src/favicon.ico'
     ]),
     new ExtractTextPlugin('[name].css')
   ],
   output: {
     filename: '[name].bundle.js',
-    path: path.resolve(__dirname, '../client/public')
+    path: path.resolve(__dirname, './public')
   },
   module: {
     rules: [

webpack.dev.js

@@ -4,6 +4,6 @@ const common = require('./webpack.common.js')
 module.exports = merge(common, {
   devtool: 'inline-source-map',
   devServer: {
-    contentBase: '../client/public'
+    contentBase: './public'
   }
 })