reauth feature

fixes billchurch#75 and potentially billchurch#51 thanks to both @vbeskrovny and @vvalchev
hktalent · Jul 30, 2018 · 820ce57 · 820ce57
1 parent 45cbceb
commit 820ce57
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 23 deletions.
diff --git a/client/public/webssh2.bundle.js b/client/public/webssh2.bundle.js
diff --git a/client/public/webssh2.css b/client/public/webssh2.css
diff --git a/client/src/css/style.css b/client/src/css/style.css
@@ -85,12 +85,10 @@ html, body {
 #menu:hover .dropup-content {
     display: block;
 }
-#logBtn {
-    color: #000;
-}
-#credentialsBtn {
+#logBtn, #credentialsBtn, #reauthBtn {
     color: #000;
 }
+
 .dropup {
     position: relative;
     display: inline-block;

diff --git a/client/src/js/index.js b/client/src/js/index.js
@@ -19,10 +19,11 @@ require('../css/style.css')
 
 Terminal.applyAddon(fit)
 
-/* global Blob, logBtn, credentialsBtn, downloadLogBtn */
+/* global Blob, logBtn, credentialsBtn, reauthBtn, downloadLogBtn */
 var sessionLogEnable = false
 var loggedData = false
 var allowreplay = false
+var allowreauth = false
 var sessionLog, sessionFooter, logDate, currentDate, myFile, errorExists
 var socket, termid // eslint-disable-line
 var term = new Terminal()
@@ -128,6 +129,17 @@ socket.on('allowreplay', function (data) {
   }
 })
 
+socket.on('allowreauth', function (data) {
+  if (data === true) {
+    console.log('allowreauth: ' + data)
+    allowreauth = true
+    drawMenu(dropupContent.innerHTML + '<a id="reauthBtn"><i class="fas fa-key fa-fw"></i> Switch User</a>')
+  } else {
+    allowreauth = false
+    console.log('allowreauth: ' + data)
+  }
+})
+
 socket.on('disconnect', function (err) {
   if (!errorExists) {
     status.style.backgroundColor = 'red'
@@ -153,10 +165,18 @@ term.on('title', function (title) {
 function drawMenu (data) {
   dropupContent.innerHTML = data
   logBtn.addEventListener('click', toggleLog)
+  allowreauth && reauthBtn.addEventListener('click', reauthSession)
   allowreplay && credentialsBtn.addEventListener('click', replayCredentials)
   loggedData && downloadLogBtn.addEventListener('click', downloadLog)
 }
 
+// reauthenticate
+function reauthSession () { // eslint-disable-line
+  console.log('re-authenticating')
+  window.location.href = '/reauth'
+  return false
+}
+
 // replay password to server, requires
 function replayCredentials () { // eslint-disable-line
   socket.emit('control', 'replayCredentials')

diff --git a/config.json b/config.json
@@ -30,7 +30,8 @@
     "secret": "mysecret"
   },
   "options": {
-    "challengeButton": true
+    "challengeButton": true,
+    "allowreauth": true
   },
   "algorithms": {
     "kex": [

diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "builddev": "webpack --progress --colors --config scripts/webpack.dev.js",
     "test": "snyk test",
     "watch": "nodemon index.js",
-    "standard": "standard --verbose | snazzy",
+    "standard": "standard --verbose --fix | snazzy",
     "cleanmac": "find . -name '.DS_Store' -type f -delete"
   },
   "devDependencies": {
@@ -78,7 +78,8 @@
       "bigip/*",
       "screenshots/*",
       "bin/*",
-      "build/*"
+      "build/*",
+      "workspace/*"
     ]
   }
 }
diff --git a/server/app.js b/server/app.js
@@ -36,16 +36,8 @@ app.disable('x-powered-by')
 app.use(express.static(publicPath, expressOptions))
 
 app.get('/reauth', function (req, res, next) {
-    var r = req.headers.referer || '/';
-    res.status(401).send(
-        '<html>' +
-        '    <head>' +
-        '        <meta http-equiv="refresh" content="1; url=' + r + '" />' +
-        '    </head>' +
-        '    <body>' +
-        '        <a href="' + r + '">Go Back</a>' +
-        '    </body>' +
-        '</html>');
+  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>');
 })
 
 app.get('/ssh/host/:host?', function (req, res, next) {
@@ -73,7 +65,8 @@ app.get('/ssh/host/:host?', function (req, res, next) {
       tabStopWidth: (validator.isInt(req.query.tabStopWidth + '', {min: 1, max: 100}) && req.query.tabStopWidth) ? req.query.tabStopWidth : config.terminal.tabStopWidth,
       bellStyle: ((req.query.bellStyle) && (['sound', 'none'].indexOf(req.query.bellStyle) > -1)) ? req.query.bellStyle : config.terminal.bellStyle
     },
-    allowreplay: (validator.isBoolean(req.headers.allowreplay + '') ? myutil.parseBool(req.headers.allowreplay) : false),
+    allowreplay: config.options.challengeButton || (validator.isBoolean(req.headers.allowreplay + '') ? myutil.parseBool(req.headers.allowreplay) : false),
+    allowreauth: config.options.allowreauth || false,
     mrhsession: ((validator.isAlphanumeric(req.headers.mrhsession + '') && req.headers.mrhsession) ? req.headers.mrhsession : 'none'),
     serverlog: {
       client: config.serverlog.client || false,

diff --git a/server/socket.js b/server/socket.js
@@ -8,8 +8,7 @@ var SSH = require('ssh2').Client
 // 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>' +
-  '<a style="color:black" href="/reauth"><i class="fas fa-key fa-fw"></i> Switch User</a>';
+  '<a id="downloadLogBtn"><i class="fas fa-download fa-fw"></i> Download Log</a>'
 
 // public
 module.exports = function socket (socket) {
@@ -42,6 +41,7 @@ module.exports = function socket (socket) {
     socket.emit('status', 'SSH CONNECTION ESTABLISHED')
     socket.emit('statusBackground', 'green')
     socket.emit('allowreplay', socket.request.session.ssh.allowreplay)
+    socket.emit('allowreauth', socket.request.session.ssh.allowreauth)
     conn.shell({
       term: socket.request.session.ssh.term,
       cols: termCols,