update dev dependencies
- Update developer dependencies - Font-Awesome deprecated packages update - https://github.com/FortAwesome/Font-Awesome/blob/master/UPGRADING.md#50x-to-510 - silence bogus eslint error
This commit is contained in:
parent
395904d5a2
commit
8ee76ffe44
9 changed files with 18 additions and 18 deletions
File diff suppressed because one or more lines are too long
|
@ -230,8 +230,8 @@ function downloadLog () { // eslint-disable-line
|
|||
myFile = 'WebSSH2-' + logDate.getFullYear() + (logDate.getMonth() + 1) +
|
||||
logDate.getDate() + '_' + logDate.getHours() + logDate.getMinutes() +
|
||||
logDate.getSeconds() + '.log'
|
||||
// regex should eliminate escape sequences from being logged.
|
||||
var blob = new Blob([sessionLog.replace(/[\u001b\u009b][[\]()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><;]/g, '')], {
|
||||
// regex should eliminate escape sequences from being logged.
|
||||
var blob = new Blob([sessionLog.replace(/[\u001b\u009b][[\]()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><;]/g, '')], { // eslint-disable-line no-control-regex
|
||||
type: 'text/plain'
|
||||
})
|
||||
if (window.navigator.msSaveOrOpenBlob) {
|
||||
|
|
|
@ -50,8 +50,8 @@
|
|||
"cleanmac": "find . -name '.DS_Store' -type f -delete"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@fortawesome/fontawesome": "^1.1.8",
|
||||
"@fortawesome/fontawesome-free-solid": "^5.0.13",
|
||||
"@fortawesome/fontawesome-free": "^5.5.0",
|
||||
"@fortawesome/free-solid-svg-icons": "^5.5.0",
|
||||
"ajv": "^6.5.5",
|
||||
"bithound": "^1.7.0",
|
||||
"clean-webpack-plugin": "^0.1.19",
|
||||
|
|
|
@ -32,7 +32,7 @@ module.exports = {
|
|||
{
|
||||
loader: 'css-loader',
|
||||
options: {
|
||||
minimize: {discardComments: {removeAll: true}}
|
||||
minimize: { discardComments: { removeAll: true } }
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
@ -28,7 +28,7 @@ var socket = require('./socket')
|
|||
var expressOptions = require('./expressOptions')
|
||||
|
||||
// express
|
||||
app.use(compression({level: 9}))
|
||||
app.use(compression({ level: 9 }))
|
||||
app.use(session)
|
||||
app.use(myutil.basicAuth)
|
||||
if (config.accesslog) app.use(logger('common'))
|
||||
|
@ -50,7 +50,7 @@ app.get('/ssh/host/:host?', function (req, res, next) {
|
|||
(validator.isFQDN(req.params.host) && req.params.host) ||
|
||||
(/^(([a-z]|[A-Z]|[0-9]|[!^(){}\-_~])+)?\w$/.test(req.params.host) &&
|
||||
req.params.host) || config.ssh.host,
|
||||
port: (validator.isInt(req.query.port + '', {min: 1, max: 65535}) &&
|
||||
port: (validator.isInt(req.query.port + '', { min: 1, max: 65535 }) &&
|
||||
req.query.port) || config.ssh.port,
|
||||
header: {
|
||||
name: req.query.header || config.header.text,
|
||||
|
@ -63,8 +63,8 @@ app.get('/ssh/host/:host?', function (req, res, next) {
|
|||
req.query.sshterm) || config.ssh.term,
|
||||
terminal: {
|
||||
cursorBlink: (validator.isBoolean(req.query.cursorBlink + '') ? myutil.parseBool(req.query.cursorBlink) : config.terminal.cursorBlink),
|
||||
scrollback: (validator.isInt(req.query.scrollback + '', {min: 1, max: 200000}) && req.query.scrollback) ? req.query.scrollback : config.terminal.scrollback,
|
||||
tabStopWidth: (validator.isInt(req.query.tabStopWidth + '', {min: 1, max: 100}) && req.query.tabStopWidth) ? req.query.tabStopWidth : config.terminal.tabStopWidth,
|
||||
scrollback: (validator.isInt(req.query.scrollback + '', { min: 1, max: 200000 }) && req.query.scrollback) ? req.query.scrollback : config.terminal.scrollback,
|
||||
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: config.options.challengeButton || (validator.isBoolean(req.headers.allowreplay + '') ? myutil.parseBool(req.headers.allowreplay) : false),
|
||||
|
@ -74,7 +74,7 @@ app.get('/ssh/host/:host?', function (req, res, next) {
|
|||
client: config.serverlog.client || false,
|
||||
server: config.serverlog.server || false
|
||||
},
|
||||
readyTimeout: (validator.isInt(req.query.readyTimeout + '', {min: 1, max: 300000}) &&
|
||||
readyTimeout: (validator.isInt(req.query.readyTimeout + '', { min: 1, max: 300000 }) &&
|
||||
req.query.readyTimeout) || config.ssh.readyTimeout
|
||||
}
|
||||
if (req.session.ssh.header.name) validator.escape(req.session.ssh.header.name)
|
||||
|
@ -101,4 +101,4 @@ io.use(function (socket, next) {
|
|||
// bring up socket
|
||||
io.on('connection', socket)
|
||||
|
||||
module.exports = {server: server, config: config}
|
||||
module.exports = { server: server, config: config }
|
||||
|
|
|
@ -14,7 +14,7 @@ exports.basicAuth = function basicAuth (req, res, next) {
|
|||
req.session.userpassword = myAuth.pass
|
||||
debug('myAuth.name: ' + myAuth.name.yellow.bold.underline +
|
||||
' and password ' + ((myAuth.pass) ? 'exists'.yellow.bold.underline
|
||||
: 'is blank'.underline.red.bold))
|
||||
: 'is blank'.underline.red.bold))
|
||||
next()
|
||||
} else {
|
||||
res.statusCode = 401
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -230,8 +230,8 @@ function downloadLog () { // eslint-disable-line
|
|||
myFile = 'WebSSH2-' + logDate.getFullYear() + (logDate.getMonth() + 1) +
|
||||
logDate.getDate() + '_' + logDate.getHours() + logDate.getMinutes() +
|
||||
logDate.getSeconds() + '.log'
|
||||
// regex should eliminate escape sequences from being logged.
|
||||
var blob = new Blob([sessionLog.replace(/[\u001b\u009b][[\]()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><;]/g, '')], {
|
||||
// regex should eliminate escape sequences from being logged.
|
||||
var blob = new Blob([sessionLog.replace(/[\u001b\u009b][[\]()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><;]/g, '')], { // eslint-disable-line no-control-regex
|
||||
type: 'text/plain'
|
||||
})
|
||||
if (window.navigator.msSaveOrOpenBlob) {
|
||||
|
|
|
@ -50,8 +50,8 @@
|
|||
"cleanmac": "find . -name '.DS_Store' -type f -delete"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@fortawesome/fontawesome": "^1.1.8",
|
||||
"@fortawesome/fontawesome-free-solid": "^5.0.13",
|
||||
"@fortawesome/fontawesome-free": "^5.5.0",
|
||||
"@fortawesome/free-solid-svg-icons": "^5.5.0",
|
||||
"ajv": "^6.5.5",
|
||||
"bithound": "^1.7.0",
|
||||
"clean-webpack-plugin": "^0.1.19",
|
||||
|
|
Loading…
Reference in a new issue