Commit graph

1834 commits

Author SHA1 Message Date
Alexey Kontsevoy 8893ca21a1 Merge branch 'master' of github.com:gravitational/teleport
# Conflicts:
#	web/dist/index.html
2016-11-30 15:34:26 -05:00
Alexey Kontsevoy 543b7eaa83 (web) removing client IP column 2016-11-30 15:32:23 -05:00
Alexander Klizhentas 61c8fed319 Merge pull request #617 from tehsis/oidc
Support for multiple oidc providers
2016-11-30 09:14:04 -08:00
Pablo Terradillos 638de1e251 Support for multiple oidc providers 2016-11-30 14:03:50 -03:00
Ev Kontsevoy d355766e74 Merge pull request #622 from gravitational/sasha/contributing
Add contributing guidelines
2016-11-29 16:07:21 -08:00
Sasha Klizhentas e7921fa912 remove broken link 2016-11-29 15:58:36 -08:00
Sasha Klizhentas 29b976c1ed Add contributing guidelines 2016-11-29 15:56:30 -08:00
Ev Kontsevoy fc5c36df21 Documentation edit.
Closes #610
2016-11-17 20:54:33 -08:00
Ev Kontsevoy be8068b3b8 Updated README to reflect recent code changes. 2016-11-17 20:41:05 -08:00
Ev Kontsevoy 9b9b55cbcc Merge branch 'master' of github.com:gravitational/teleport 2016-11-17 20:40:57 -08:00
Ev Kontsevoy 3037f8dfe4 Merge pull request #585 from gravitational/ev/timeouts
Aggressive connection bookeeping for reverse tunnels
2016-11-17 20:40:52 -08:00
Ev Kontsevoy 08c53e4923 Merge branch 'master' of github.com:gravitational/teleport 2016-11-17 20:35:31 -08:00
Ev Kontsevoy 67f20e93de Merge branch 'master' into ev/timeouts 2016-11-17 20:35:24 -08:00
Ev Kontsevoy 2332192e58 Merge pull request #609 from damz/pr/formatting
Fix minor formatting issues in lib/auth/auth_with_roles.go
2016-11-17 20:35:16 -08:00
Ev Kontsevoy f42db5c3cf Merge branch 'master' into ev/timeouts 2016-11-17 20:35:03 -08:00
Ev Kontsevoy 70113622ba Updated documentation to reflect packaging changes.
Teleport binaries now include the Web UI, therefore there is no need to
have a separate "web assets" directory.
2016-11-17 20:34:08 -08:00
Ev Kontsevoy 8611ee4cb0 Merge pull request #601 from gravitational/ev/512
Web assets are packed into the executable
2016-11-17 20:31:51 -08:00
Ev Kontsevoy db1366d090 Merge branch 'master' into ev/timeouts 2016-11-17 20:29:34 -08:00
Ev Kontsevoy b481739b80 Merge branch 'master' into ev/512 2016-11-17 20:29:24 -08:00
Ev Kontsevoy c9aaf4ea5c Merge branch 'master' into pr/formatting 2016-11-17 20:29:11 -08:00
Ev Kontsevoy 36859a0bc8 Merge pull request #612 from carbin-gun/master
make under cgo enabled
2016-11-17 20:28:37 -08:00
zhengchao.deng 1bde3e1732 make under cgo enabled 2016-11-17 12:52:56 +08:00
Damien Tournoud 9cb44a55c3 Fix formatting 2016-11-11 16:33:42 +01:00
Alexander Klizhentas 0a6b04ba4a Merge pull request #608 from gravitational/dmitri/fix-expiration-dir
Set valid expiration time in the future in CreateSessionResponse.
2016-11-07 09:41:27 -08:00
dmitri 977b610777 Set valid expiration time in the future in CreateSessionResponse. 2016-11-07 15:36:54 +01:00
Ev Kontsevoy 7fe96513e2 Merge branch 'master' into ev/512 2016-11-03 23:12:14 -07:00
Ev Kontsevoy ce4739138b Merge branch 'master' into ev/timeouts 2016-11-03 23:12:02 -07:00
Ev Kontsevoy 002b640a16 Merge pull request #607 from gravitational/ev/scp
Ev/scp
2016-11-03 23:11:53 -07:00
Ev Kontsevoy e02630cbd1 Merge branch 'master' into ev/scp 2016-11-03 23:09:25 -07:00
Ev Kontsevoy eae9d16999 Merge pull request #605 from gravitational/ev/604
Fixes #604
2016-11-03 23:09:07 -07:00
Ev Kontsevoy c6c77a183c SCP improvements
- Removed strange handling of the ending / symbol, causing directories
  not being created. Fixes #606

- Added per-file progress indicator (reports "XXX uploaded").
2016-11-03 20:06:43 -07:00
Ev Kontsevoy 380d2f366b Preliminary SCP work
1) -r flag handling

   Proper handling of `-r` flag on the tsh side (recursive).
   Prior to this commit it was all uploads were _always_ recursive.

2) less verbose logging.

   Replaced a bunch of log.Info() with log.Debug()
2016-11-03 18:07:39 -07:00
Ev Kontsevoy 888e53aa03 Fixes #604 2016-11-03 14:54:52 -07:00
Ev Kontsevoy 1d202aeefa Moved zip building from default target into 'make release' 2016-11-01 17:09:47 -07:00
Ev Kontsevoy e6cb7cc962 Merge branch 'master' into ev/timeouts 2016-11-01 11:28:48 -07:00
Ev Kontsevoy d29a88f524 Web assets are packed into teleport binary
Functionality:

`teleport` binary now serves web assets from its own binary file.
Unless `DEBUG` environment variable is set to "1" or "true", in
this case it will look for ../web/dist (as located in github repo)
which can be used for development.

Design:

To avoid accumulating 3rd party dependencies with a ton of extra
features and licenses, this implementation uses minimalistic
implementation of http.FileSystem interface on top of the embedded ZIP
archive.

1. The assets are zipped into assets.zip during build process
2. assets.zip gets appended to the end of `teleport` binary
3. The resulting file is converted into a self-extracting ZIP
4. Teleport opens itself using the built-in zip unarchiver, and loads
   the assets on demand.

Notes:

1. LOC is tiny (dozens)
2. RAM consumption is CONSTANT regardless of the ZIP size, about 500Kb
   increase vs load-from-file, and most of it is linking zip archive
   code from the standard library. Tested with a 20MB ZIP archive.
2016-10-30 20:40:46 -07:00
Ev Kontsevoy c1b14333c8 Intermediate implementation
1. Everything works.
2. No tests.
2016-10-30 19:35:57 -07:00
Ev Kontsevoy bff4e2351a Removed debug info from release builds. 2016-10-28 10:57:51 -07:00
Ev Kontsevoy 9cd84ffcf3 Merge pull request #596 from gravitational/lib/update
Lib/update
2016-10-27 15:44:00 -07:00
Ev Kontsevoy 6b40ec9424 Merge branch 'master' into lib/update 2016-10-27 15:31:54 -07:00
Ev Kontsevoy 7ac63f9e9c Merge pull request #587 from gravitational/ev/dynamo
DynamoDB backend
2016-10-27 15:31:38 -07:00
Ev Kontsevoy 7debfc790f Merge branch 'master' into ev/dynamo 2016-10-27 15:01:28 -07:00
Ev Kontsevoy 485787cf44 Merge pull request #597 from nmaki/config_auth_servers_fix
Update configuration.go to use all auth_servers
2016-10-27 14:43:46 -07:00
Ev Kontsevoy c10268af4d Merge branch 'master' into ev/dynamo 2016-10-27 14:40:41 -07:00
Ev Kontsevoy d1ca86d695 Merge branch 'master' into config_auth_servers_fix 2016-10-27 14:39:03 -07:00
Ev Kontsevoy f356408c68 Merge branch 'master' into lib/update 2016-10-27 14:38:36 -07:00
Ev Kontsevoy 14dd7ff42b Merge pull request #598 from gravitational/sasha/user
Add method to customize web session output
2016-10-27 14:38:26 -07:00
Sasha Klizhentas ebde5b51fe fix interface 2016-10-26 15:57:21 -07:00
Sasha Klizhentas bbd40bbe75 fix test 2016-10-26 15:54:26 -07:00
Sasha Klizhentas f10cdbeb90 Add method to customize web session output 2016-10-26 15:39:02 -07:00