Commit Graph

2070 Commits

Author SHA1 Message Date
Carol Willing
9fa9859495 Move tech overview to config reference 2017-07-25 07:49:06 -07:00
Carol Willing
de85fefa7d Merge pull request #1262 from willingc/config-doc
Streamline configuration docs
2017-07-25 07:44:50 -07:00
Carol Willing
dee55df94a Edits per @minrk review 2017-07-25 07:43:48 -07:00
Carol Willing
62b9450ce1 Merge pull request #1266 from willingc/fix-link
Fix link to direct to docs not source
2017-07-25 07:07:32 -07:00
Carol Willing
bcdcf4351d Fix link to direct to docs not source 2017-07-25 07:04:47 -07:00
Min RK
0d941e9c96 move redirect loop fallback to /user/name handler
- add user_redirect_limit to settings, default 5 (that's still a whole minute before failing)
- limit sleep to ten seconds
2017-07-24 17:32:57 -07:00
yuvipanda
9d837b2e4b Add more docs & tweak max redirect wait time 2017-07-24 17:32:57 -07:00
yuvipanda
8544010eb6 Apply exponential backoff when we're redirecting to ourselves
Lots of custom proxy implementations that are distributed are
eventually consistent, and it might take upto a few seconds for
all the components to start redirecting properly. If we do
exponential backoff when doing these redirects, it gives the
proxies a lot of time to catch up. We also explicitly raise an
error if it's going on too long, instead of giving the user
juts a 'redirected too many times' error.
2017-07-24 17:32:57 -07:00
Carol Willing
f37243169a Update links 2017-07-24 14:30:05 -07:00
Yuvi Panda
7caa1e1f0e Merge pull request #1258 from minrk/salt-hash-uuid
don't salt & re-hash generated UUID tokens
2017-07-24 14:07:52 -07:00
Yuvi Panda
e019a394b0 Merge pull request #1259 from willingc/fix-docstring
Reformat docstring causing Sphinx error
2017-07-24 14:06:25 -07:00
Carol Willing
c0b482e68c Fix typos 2017-07-24 08:57:25 -07:00
Carol Willing
2da115f5c4 Reformat docstring causing Sphinx error 2017-07-24 08:32:12 -07:00
Min RK
639ccf5582 index prefix column 2017-07-24 17:27:19 +02:00
Min RK
2654794968 don't salt & extra hash uuids
They have enough entropy on their own,
so use just the hash and no salt.

ref: https://security.stackexchange.com/a/151262/155114
2017-07-24 17:03:04 +02:00
Min RK
2cec124b4f support named servers in REST API
and exercise them in tests
2017-07-24 16:55:17 +02:00
Carol Willing
e21737399b Edit config basics doc and examples 2017-07-24 07:53:20 -07:00
Min RK
9a555d8a6e move user.proxy_pending to Spawner._proxy_pending 2017-07-24 15:22:36 +02:00
Min RK
f7bf2b0ba6 Merge branch 'master' into named_servers 2017-07-24 15:21:42 +02:00
Min RK
710ed0a5c8 Merge pull request #1245 from willingc/deduplicate
Review and edit security documentation
2017-07-24 14:35:33 +02:00
Min RK
7539523ef2 Merge pull request #1251 from yuvipanda/another-race-maybe
Don't add route if there's already a route addition pending
2017-07-24 14:34:34 +02:00
Yuvi Panda
c97444e438 Merge pull request #1257 from minrk/dirty
Dirty database fixes
2017-07-24 05:19:19 -07:00
Min RK
4c86d10037 comment about sqlachemy dirty flag 2017-07-24 14:12:50 +02:00
Min RK
69a6c79558 use admin user in test_admin
rather than relying on multi db sessions talking to each other
2017-07-24 13:37:11 +02:00
yuvipanda
a0466dc322 Count ourselves as a good route if we've a proxy pending 2017-07-24 04:35:13 -07:00
Min RK
546e35e9a3 Merge pull request #1249 from Carreau/fix-pam-500
Do not 500 if cannot authenticate.
2017-07-24 12:54:56 +02:00
Min RK
ce53b11cf7 Make rollback conditional on db.dirty
avoids calling rollback when there are no changes

includes warning about what objects are actually dirty
2017-07-24 12:53:58 +02:00
Min RK
1229fd100f only set attributes on orm_server if they changed
Setting things on orm_server set the dirty flag,
even if they haven't changed.
2017-07-24 12:52:46 +02:00
Matthias Bussonnier
e4541591ea Do not 500 if cannot authenticate.
self.authenticate can return None, in which case you can't subscript.
So move extracting data into the branch checking whether authenticate is
not `None`.

Now that extracting the username is inside the if branch, it can't be
used in the else one, so extract username from the request itself.

This can be easily reproduce with the default PAM login with a wrong
non existing/ wrong username.
2017-07-21 15:40:28 -07:00
Carol Willing
be62b1b9df Reword based on @minrk's review 2017-07-21 11:47:24 -07:00
Carol Willing
9c21cf4c62 Add @minrk review comments 2017-07-21 11:32:48 -07:00
Carol Willing
51af6a98cc Be clearer about the config file name 2017-07-21 11:23:43 -07:00
Carol Willing
520d6160f0 Make use of config file and environment variable consistent 2017-07-21 11:23:43 -07:00
Carol Willing
e8ebedb2da Move security audits to overview doc 2017-07-21 11:23:43 -07:00
Carol Willing
fd7700d577 Update title 2017-07-21 11:23:43 -07:00
Carol Willing
6ee88a5424 Edit content for clarity 2017-07-21 11:23:43 -07:00
Carol Willing
c89711d0d5 Edit and deduplicate security docs 2017-07-21 11:23:43 -07:00
Carol Willing
daee0f8df8 Merge pull request #1248 from Carreau/cleanup
Remove unused import and add version to deprecations.
2017-07-21 11:21:20 -07:00
Matthias Bussonnier
e1444f4aca remove trailing comma 2017-07-21 11:13:18 -07:00
Matthias Bussonnier
97b9c4899a typo 2017-07-21 11:12:24 -07:00
Matthias Bussonnier
b8aa6ecd70 Remove unused import and add version to deprecations. 2017-07-21 10:23:54 -07:00
Min RK
e28f3947bd Merge branch 'master' into named_servers 2017-07-21 15:43:09 +02:00
Min RK
bc9cc98789 Merge pull request #1246 from yuvipanda/no-unconditional-add
Don't unconditionally add hub route to proxy
2017-07-21 10:23:25 +02:00
yuvipanda
72132e7946 Don't unconditionally add hub route to proxy
This is done contidtionally in check_routes instead
2017-07-21 01:01:21 -07:00
Carol Willing
b0307dd98e Merge pull request #1242 from minrk/headers-fixes
various singleuser header fixes
2017-07-20 11:49:13 -07:00
Carol Willing
fd1ac55a70 Merge pull request #1240 from minrk/drop-33
Require Python 3.4
2017-07-20 11:25:30 -07:00
Yuvi Panda
39d8800389 Merge pull request #1241 from minrk/progress-spin
add spinner to slow-spawn page
2017-07-20 09:59:32 -07:00
Min RK
382a7121e1 further clear up named servers
- use spawner.server instead of user.server
- user.running, proxy_spec are methods that take spawner names
2017-07-20 16:54:17 +02:00
Min RK
4c0ac6d502 Merge pull request #1234 from CRegenschein/master
Add pre_spawn_hook
2017-07-20 15:45:06 +02:00
Min RK
40dcbedc2a various singleuser header fixes
- always set content security policy header, to workaround bug in notebook 5.0
- set x-jupyterhub-version on all requests, not just our own
- fix version comparison in _check_version (leftover `__version__`)
- even log version matches at debug-level (verifies that check happened)
2017-07-20 15:37:54 +02:00