Commit graph

311 commits

Author SHA1 Message Date
Nils Lundquist
7b5b9a9110 add config.js 2020-01-17 12:11:55 -07:00
Nils Lundquist
f1e5d4a13c Allow websocket server to take ssh host as query parameter. This allows sockets to be opened without loading the client page first to set up the session. This simplifies use when using WebSSH2 with an alternative client.
Cleaned up the derivation of configuration from defaults, static config file, request params & session
2020-01-13 12:47:24 -07:00
Bill Church
2289036605 chore: update validator to 12.1 for better IPv6 support 2019-11-23 09:21:36 -05:00
Bill Church
d79e050b87 Update ChangeLog.md 2019-11-23 09:03:01 -05:00
Bill Church
e796f9fb58 fix: subnet unauthorized now emits "ssherror" which persists across websocket termination 2019-11-23 09:00:28 -05:00
Bill Church
16a27ce62a
Pr/163 (#164)
* Add configuration option to restrict connections to specified subnets

Signed-off-by: Matt Oswalt <matt@keepingitclassless.net>

* Remove accidentally included message

Signed-off-by: Matt Oswalt <matt@keepingitclassless.net>

* Move to cidr-matcher

Signed-off-by: Matt Oswalt <matt@keepingitclassless.net>

* feat: Add configuration option to restrict connections to specified subnets
2019-11-23 08:45:59 -05:00
Bill Church
9a96637cb4
Username get (#162)
* feat(auth): ssh private key auth implemented via config.json

If config.json is present and user.privatekey has an ssh-rsa private key defined as well as a user.name, the SSH server will staticlly authenticate to whatever host is specified on the URL with those credentials.

The ssh-rsa private key must have is line returns replaced with the litaral \n

Example: "-----BEGIN RSA PRIVATE KEY-----\nblahblahblah\n"

* docs:update README.com
2019-11-15 17:34:13 -05:00
Bill Church
342df8eb9c
feat(auth): ssh private key auth implemented via config.json (#161)
If config.json is present and user.privatekey has an ssh-rsa private key defined as well as a user.name, the SSH server will staticlly authenticate to whatever host is specified on the URL with those credentials.

The ssh-rsa private key must have is line returns replaced with the litaral \n

Example: "-----BEGIN RSA PRIVATE KEY-----\nblahblahblah\n"
2019-11-15 17:22:53 -05:00
Bill Church
65d6ec6845
feat(config): specify local source address and port for client connections fixes #152 (#158) 2019-11-15 15:55:54 -05:00
Bill Church
ca20321625
update build environment (#157)
* Accept default username/password overrides from config. Clarified supplying custom config. (#146)

* feat(auth): username and password may now be sourced from config.json fixes #104

* style:remove test changelog

* build:remove uglify from build process and reaplce with terser

* style:format changelog
2019-11-15 13:01:51 -05:00
Bill Church
212df80fb6
User pass (#156)
* Accept default username/password overrides from config. Clarified supplying custom config. (#146)

* feat(auth): username and password may now be sourced from config.json fixes #104
2019-11-15 12:58:50 -05:00
Bill Church
eebc32b2c9 Merge branch 'package-updates'
build: fix stuff
2019-11-15 11:21:03 -05:00
Bill Church
b8318d2238 build: Add standard-version to build process 2019-11-15 11:20:12 -05:00
Bill Church
9f3c661bdc chore(release): 0.2.10-0 2019-11-15 11:06:09 -05:00
Bill Church
9355ad7b5c
Updated packages: (#153)
Updated packages:

    "colors": "~1.4.0",
    "compression": "~1.7.4",
    "debug": "^4.1.1",
    "express": "~4.17.1",
    "express-session": "~1.17.0",
    "socket.io": "2.2.0",
    "ssh2": "~0.8.6",
    "terser-webpack-plugin": "^2.2.1",
    "validator": "~12.0.0",
    "xterm-addon-fit": "^0.3.0",
    "xterm-addon-search": "^0.3.0",
    "xterm-addon-web-links": "^0.2.1"
    "@fortawesome/fontawesome-svg-core": "^1.2.25",
    "@fortawesome/free-solid-svg-icons": "^5.11.2",
    "clean-webpack-plugin": "^3.0.0",
    "copy-webpack-plugin": "^5.0.5",
    "cross-env": "^6.0.3",
    "css-loader": "^3.2.0",
    "file-loader": "^4.2.0",
    "postcss-discard-comments": "^4.0.2",
    "standard": "^14.3.1",
    "style-loader": "^1.0.0",
    "url-loader": "^2.2.0",
    "webpack": "^4.41.2",
    "webpack-cli": "^3.3.10",
    "webpack-merge": "^4.2.2",
    "xterm": "^4.2.0"
2019-11-15 10:50:40 -05:00
Bill Church
93303ad132 Updated packages:
Updated packages:

    "colors": "~1.4.0",
    "compression": "~1.7.4",
    "debug": "^4.1.1",
    "express": "~4.17.1",
    "express-session": "~1.17.0",
    "socket.io": "2.2.0",
    "ssh2": "~0.8.6",
    "terser-webpack-plugin": "^2.2.1",
    "validator": "~12.0.0",
    "xterm-addon-fit": "^0.3.0",
    "xterm-addon-search": "^0.3.0",
    "xterm-addon-web-links": "^0.2.1"
    "@fortawesome/fontawesome-svg-core": "^1.2.25",
    "@fortawesome/free-solid-svg-icons": "^5.11.2",
    "clean-webpack-plugin": "^3.0.0",
    "copy-webpack-plugin": "^5.0.5",
    "cross-env": "^6.0.3",
    "css-loader": "^3.2.0",
    "file-loader": "^4.2.0",
    "postcss-discard-comments": "^4.0.2",
    "standard": "^14.3.1",
    "style-loader": "^1.0.0",
    "url-loader": "^2.2.0",
    "webpack": "^4.41.2",
    "webpack-cli": "^3.3.10",
    "webpack-merge": "^4.2.2",
    "xterm": "^4.2.0"
2019-11-15 10:50:15 -05:00
Bill Church
1cbb195739 remove big-iip ILX code 2019-10-18 17:55:14 -04:00
Bill Church
4ad7e7ed3f lock package versions 2019-10-18 17:24:22 -04:00
Bill Church
341e61eb01 Merge branch 'master' of github.com:billchurch/WebSSH2 2019-10-01 09:29:55 -04:00
Bill Church
1be03d79f5 rebuild 2019-10-01 09:29:52 -04:00
bara666
c4315a2f91 Update README.md (#144)
Change exmple URL, param color change to headerBackground
2019-09-30 13:30:15 -04:00
Jared Henderson
c2c3aee311 make it clear that you install in the app dir (#150)
I got confused from the instructions, I think similarly to #147.
2019-09-30 13:29:43 -04:00
Bill Church
dbcf973773 remove module provisioning 2019-09-18 08:57:33 -07:00
Bill Church
56086b01dd Missing require('fs') in server/app.js See issue [#135](../../issues/135)
- Missing require('fs') in `server/app.js` See issue [#135](../../issues/135)
- Patched read-config to mitigate vulnerability in js-yaml
  - issue not exploitable on webssh2 implementation
  - patched anyway
  - sending my patch upstream to read-config, webssh2 package.json points to patched version in my repository https://github.com/billchurch/nodejs-read-config
  - See https://github.com/nodeca/js-yaml/issues/475 for more detail
2019-06-13 14:39:47 -04:00
Bill Church
7cdcbec5f1 add missing fs
that was embarassing... fixes #135
2019-06-13 13:43:46 -04:00
Bill Church
95eb700a21
0.2.8 ready for pr (#133)
* make config.json optional

* update package for 14.1

* push.sh - reset permissions after module load

* build script updates

* update build scripts
2019-05-25 22:54:32 -04:00
Bill Church
63f368dee2 Update .gitignore 2019-05-16 11:52:38 -04:00
Bill Church
1b40a37d83 update build scripts, removed BIG-IP version prefix 2019-05-16 07:35:52 -04:00
Bill Church
b7d3ec3152 scripts update 2019-05-13 20:29:19 -04:00
Bill Church
28283ecd9f Update README.md 2019-02-12 08:53:50 -05:00
Bill Church
f1e08810a3 Update README.md 2019-02-12 08:49:29 -05:00
Bill Church
12d6b9a0c7 added details for options.allowreauth 2019-02-12 08:48:53 -05:00
Bill Church
d996045a19
Update README.md 2019-01-30 16:49:29 -05:00
Bill Church
9e84a410bd
Update README.md 2019-01-30 16:49:10 -05:00
Bill Church
49fc526c08 resolve issues with webpack 2019-01-18 13:51:17 -05:00
Bill Church
09394933ac Update ChangeLog.md 2019-01-10 10:33:57 -05:00
Bill Church
ccee67b7e8
Issue 125 (#126)
* fix `npm run build`

fixes #125
- update font-awesome fonts to 5.6.3
- update webpack and dependancies
- update xterm to 3.8.0
2019-01-10 09:29:48 -06:00
Bill Church
3d244054c4
Merge pull request #119 from billchurch/isuse118
Isuse118
2018-11-21 12:04:07 -05:00
Bill Church
29fabbb631 Update package.json 2018-11-21 11:55:52 -05:00
Bill Church
04c2846828 Update ChangeLog.md 2018-11-21 11:55:32 -05:00
Bill Church
e452dc0fb1 Update util.js
fixes 118, thanks @smilesm2
2018-11-21 11:53:00 -05:00
Bill Church
e512fca4d0
Update ISSUE_TEMPLATE.md 2018-11-21 11:29:19 -05:00
Bill Church
8ee76ffe44 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
2018-11-11 11:20:39 -05:00
Bill Church
395904d5a2 fix reauth option, move files into /app, update dockerfile, update packages
- `config.reauth` was not respected if initial auth presented was incorrect, regardless of `reauth` setting in `config.json` reauth would always be attempted. fixes #117
- **BREAKING** moved app files to /app, this may be a breaking change
- Updated dockerfile for new app path
- Updated app dependancies
  - xterm v3.8.0
    - https://github.com/xtermjs/xterm.js/releases/tag/3.8.0
  - basic-auth v2.0.1
    - https://github.com/jshttp/basic-auth/releases/tag/v2.0.1
  - express v4.16.4
    - https://github.com/expressjs/express/releases/tag/4.16.4
  - validator v10.9.0
    - https://github.com/chriso/validator.js/releases/tag/10.9.0
- Updated dev dependancies
  - snazzy v8.0.0
  - standard v12.0.1
  - uglifyjs-webpack-plugin v2.0.1
  - ajv v6.5.5
  - copy-webpack-plugin v4.6.0
  - css-loader v1.0.1
  - nodemon v1.18.6
  - postcss-discard-comments v4.0.1
  - snyk v1.108.2
  - url-loader v1.1.2
  - webpack v4.25.1
  - webpack-cli v3.1.2
2018-11-11 10:07:37 -05:00
Bill Church
1d09fa22ef update ilx workspace 2018-11-07 07:57:37 -05:00
Bill Church
d33db26c4b update bundle 2018-11-07 07:47:18 -05:00
Bill Church
6a4eb1e985 version bump 2018-11-07 07:26:16 -05:00
Bill Church
9f551774f6
Merge pull request #113 from vvalchev/re-request-auth-on-login-failure
Fixes #112 - Re-auth doesn't work if incorrect auth was provided initially
2018-11-07 07:24:41 -05:00
Bill Church
e7db491c8d
Merge pull request #108 from billchurch/greenkeeper/file-loader-2.0.0
Update file-loader to the latest version 🚀
2018-11-07 07:24:09 -05:00
Bill Church
14755fdd7a
Merge pull request #109 from billchurch/greenkeeper/style-loader-0.23.1
Update style-loader to the latest version 🚀
2018-11-07 07:23:28 -05:00