Commit graph

12 commits

Author SHA1 Message Date
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
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
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
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
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
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
e452dc0fb1 Update util.js
fixes 118, thanks @smilesm2
2018-11-21 11:53:00 -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