Fabio/webssh2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed mixed operators from last commit

Browse source
This commit is contained in:
billchurch 2017-05-27 18:22:28 -04:00
parent 4540cc6e0e
commit cdd50f7b22
7 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
index.js
View file

@ -41,17 +41,15 @@ app.disable('x-powered-by')
app.get('/ssh/host/:host?', function (req, res, next) {
res.sendFile(path.join(path.join(__dirname, 'public', (config.useminified) ? 'client-min.htm' : 'client-full.htm')))
// capture and assign variables
myHost = validator.isIP(req.params.host) ? req.params.host : undefined
console.log('req.params.host: ', myHost)
req.session.ssh = {
host: validator.isIP(req.params.host + '') && req.params.host || 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}) && req.query.port || config.ssh.port,
host: (validator.isIP(req.params.host + '') && req.params.host) || (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}) && req.query.port) || config.ssh.port,
header: {
name: req.query.header || config.header.text,
background: req.query.headerBackground || config.header.background
},
algorithms: config.algorithms,
term: /^(([a-z]|[A-Z]|[0-9]|[!^(){}\-_~])+)?\w$/.test(req.query.sshterm) && req.query.sshterm || config.ssh.term,
term: (/^(([a-z]|[A-Z]|[0-9]|[!^(){}\-_~])+)?\w$/.test(req.query.sshterm) && req.query.sshterm) || config.ssh.term,
allowreplay: validator.isBoolean(req.headers.allowreplay + '') || false
}
req.session.ssh.header.name && validator.escape(req.session.ssh.header.name)

2
public/src/js/client.js
View file

@ -99,7 +99,7 @@ socket.on('connect', function () {
}).on('statusBackground', function (data) {
document.getElementById('status').style.backgroundColor = data
}).on('allowreplay', function (data) {
if (data == true) {
if (data === true) {
console.log('allowreplay: ' + data)
document.getElementById('credentials').style.display = 'inline'
} else {

2
public/src/webssh2.concat.map
View file

File diff suppressed because one or more lines are too long

2
public/src/webssh2.min.map
View file

File diff suppressed because one or more lines are too long

2
public/webssh2.js
View file

@ -12605,7 +12605,7 @@ socket.on('connect', function () {
}).on('statusBackground', function (data) {
document.getElementById('status').style.backgroundColor = data
}).on('allowreplay', function (data) {
if (data == true) {
if (data === true) {
console.log('allowreplay: ' + data)
document.getElementById('credentials').style.display = 'inline'
} else {

2
public/webssh2.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
src/js/client.js
View file

@ -99,7 +99,7 @@ socket.on('connect', function () {
}).on('statusBackground', function (data) {
document.getElementById('status').style.backgroundColor = data
}).on('allowreplay', function (data) {
if (data == true) {
if (data === true) {
console.log('allowreplay: ' + data)
document.getElementById('credentials').style.display = 'inline'
} else {