From 7cb17becaf0aab4fe8c14174ee7b51f13e9689f9 Mon Sep 17 00:00:00 2001 From: Bill Church Date: Tue, 11 Sep 2018 15:32:52 -0400 Subject: [PATCH] update changelog, increment version --- ChangeLog.md | 4 +- bin/startup_script_webssh_commands.sh | 63 ----------------------- build.sh | 2 +- package.json | 2 +- revsync.sh | 12 +++++ sync.sh | 2 +- workspace/extensions/webssh2/ChangeLog.md | 13 ++++- workspace/extensions/webssh2/index.js | 5 +- workspace/extensions/webssh2/package.json | 63 +++++++++++++++++++---- 9 files changed, 85 insertions(+), 81 deletions(-) delete mode 100644 bin/startup_script_webssh_commands.sh create mode 100755 revsync.sh diff --git a/ChangeLog.md b/ChangeLog.md index 255ee36..5fd129b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,11 +1,11 @@ # Change Log -## [0.2.5] TBD +## [0.2.5] 20180911 ### Added - Reauth function thanks to @vbeskrovny and @vvalchev (9bbc116) - Controlled by `config.json` option `options.allowreauth` true presents reauth dialog and false hides dialog ### Changed - `options.challengeButton` enabled - - previously this configuraiton option did nothing, this now enables the Credentials button site-wide regardless of the `allowreplay` header value + - previously this configuration option did nothing, this now enables the Credentials button site-wide regardless of the `allowreplay` header value ## [0.2.4] 2018-07-18 ### Added diff --git a/bin/startup_script_webssh_commands.sh b/bin/startup_script_webssh_commands.sh deleted file mode 100644 index bcb92bf..0000000 --- a/bin/startup_script_webssh_commands.sh +++ /dev/null @@ -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 diff --git a/build.sh b/build.sh index 162364e..2fe4d59 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/bin/bash ## Syncs from BIG-IP and builds a release based on version in extensions/ephemeral_auth/package.json -ilxhost=root@192.168.30.210 +ilxhost=root@192.168.30.216 workspace_name=webssh2 package_name=BIG-IP-13.1.0.8-ILX-WebSSH2 pua_location=/Users/bill/Documents/GitHub/f5-pua/bin diff --git a/package.json b/package.json index acab24d..4cde826 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "webssh2", - "version": "0.2.3", + "version": "0.2.5", "ignore": [ ".gitignore" ], diff --git a/revsync.sh b/revsync.sh new file mode 100755 index 0000000..7257f84 --- /dev/null +++ b/revsync.sh @@ -0,0 +1,12 @@ +#!/bin/bash +ilxhost=root@192.168.30.216 +workspace_name=webssh2 +package_name=BIG-IP-13.1.0.8-ILX-WebSSH2 +pua_location=/Users/bill/Documents/GitHub/f5-pua/bin +echo 'hello' +rsync -e 'ssh -ax' -av --delete --exclude='.DS_Store' --exclude extensions/$workspace_name/node_modules workspace/. $ilxhost:/var/ilx/workspaces/Common/$workspace_name/. + +ssh $ilxhost chown -R root.sdm /var/ilx/workspaces/Common/$workspace_name/ +ssh $ilxhost chmod -R ug+rwX,o-w /var/ilx/workspaces/Common/$workspace_name/ +ssh $ilxhost chmod u+rw,go-w /var/ilx/workspaces/Common/$workspace_name/version +ssh $ilxhost chmod u+rw,go-w /var/ilx/workspaces/Common/$workspace_name/node_version diff --git a/sync.sh b/sync.sh index 0e1809c..7600357 100755 --- a/sync.sh +++ b/sync.sh @@ -1,5 +1,5 @@ #!/bin/bash -ilxhost=root@192.168.30.210 +ilxhost=root@192.168.30.216 workspace_name=webssh2 package_name=BIG-IP-13.1.0.8-ILX-WebSSH2 pua_location=/Users/bill/Documents/GitHub/f5-pua/bin diff --git a/workspace/extensions/webssh2/ChangeLog.md b/workspace/extensions/webssh2/ChangeLog.md index e7bc383..5fd129b 100644 --- a/workspace/extensions/webssh2/ChangeLog.md +++ b/workspace/extensions/webssh2/ChangeLog.md @@ -1,4 +1,12 @@ # Change Log +## [0.2.5] 20180911 +### Added +- Reauth function thanks to @vbeskrovny and @vvalchev (9bbc116) + - Controlled by `config.json` option `options.allowreauth` true presents reauth dialog and false hides dialog +### Changed +- `options.challengeButton` enabled + - previously this configuration option did nothing, this now enables the Credentials button site-wide regardless of the `allowreplay` header value + ## [0.2.4] 2018-07-18 ### Added - Browser title window now changes with xterm escape sequences (see http://tldp.org/HOWTO/Xterm-Title-3.html) @@ -15,6 +23,9 @@ ## [0.2.3] unreleased +### Fixed +- ESC]0; is now removed from log files when using the browser-side logging feature + ## [0.2.0] 2018-02-10 Mostly client (browser) related changes in this release @@ -165,5 +176,3 @@ and events in the application (not including the ssh2 module debug) ## [0.0.1] - 2016-06-28 ### Added - Initial proof of concept and release. For historical purposes only. - - diff --git a/workspace/extensions/webssh2/index.js b/workspace/extensions/webssh2/index.js index 13b1b43..b1faa1b 100644 --- a/workspace/extensions/webssh2/index.js +++ b/workspace/extensions/webssh2/index.js @@ -1,5 +1,8 @@ -// index.js +'use strict' +/* jshint esversion: 6, asi: true, node: true */ /* + * index.js + * * WebSSH2 - Web to SSH2 gateway * Bill Church - https://github.com/billchurch/WebSSH2 - May 2017 * diff --git a/workspace/extensions/webssh2/package.json b/workspace/extensions/webssh2/package.json index bbaf6a0..4cde826 100644 --- a/workspace/extensions/webssh2/package.json +++ b/workspace/extensions/webssh2/package.json @@ -1,6 +1,6 @@ { "name": "webssh2", - "version": "0.2.4", + "version": "0.2.5", "ignore": [ ".gitignore" ], @@ -17,27 +17,70 @@ "contributors": [ { "name": "Bill Church", - "email": "bill@f5.com" + "email": "wmchurch@gmail.com" } ], "engines": { - "node": "6.9.1" + "node": "6" }, "bugs": { "url": "https://github.com/billchurch/WebSSH2/issues" }, "dependencies": { "basic-auth": "^2.0.0", - "colors": "^1.1.2", - "compression": "^1.7.1", + "colors": "^1.3.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", - "ssh2": "^0.5.5", - "validator": "^9.0.0" + "socket.io": "^2.1.1", + "ssh2": "^0.6.1", + "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.8", + "@fortawesome/fontawesome-free-solid": "^5.0.13", + "ajv": "^6.5.2", + "bithound": "^1.7.0", + "clean-webpack-plugin": "^0.1.19", + "copy-webpack-plugin": "^4.5.2", + "css-loader": "^1.0.0", + "extract-text-webpack-plugin": "^4.0.0-beta.0", + "file-loader": "^1.1.11", + "nodemon": "^1.18.3", + "postcss-discard-comments": "^4.0.0", + "snazzy": "^7.1.1", + "snyk": "^1.90.0", + "standard": "^11.0.1", + "style-loader": "^0.21.0", + "uglifyjs-webpack-plugin": "^1.2.7", + "url-loader": "^1.0.1", + "webpack": "^4.16.5", + "webpack-cli": "^3.1.0", + "webpack-merge": "^4.1.4", + "webpack-stream": "^5.1.0", + "xterm": "^3.5.1" + }, + "standard": { + "ignore": [ + "client/public/webssh2.bundle.js", + "bigip/*", + "screenshots/*", + "bin/*", + "build/*", + "workspace/*" + ] } } -