Commit Graph

469 Commits

Author SHA1 Message Date
Carol Willing
ac33ba6ff4 Merge pull request #1316 from minrk/rm-scoped-session
drop scoped_session
2017-08-06 09:01:50 -07:00
Carol Willing
5c64c88d5a Merge pull request #1312 from minrk/reverse-generated-token
reverse generated-tokens default logic
2017-08-06 08:57:27 -07:00
Min RK
1d156f8183 disable periodic check_routes during proxy tests
can race tests and create inconsistent state
2017-08-06 14:39:42 +02:00
Min RK
c0e2c5cb71 drop scoped_session
this was an artifact of the now-removed test thread
2017-08-06 14:29:10 +02:00
Min RK
a27765f7d5 reverse generated-tokens default logic
user-provided tokens are added in exactly one place,
so switch default handling of tokens to generated=True
and explicitly distrust user tokens.

Add JupyterHub.trust_user_provided_tokens flag so that users can avoid the extra hashing
if they know they are providing good keys.
2017-08-05 15:36:03 +02:00
Min RK
275a4ce18d remove last_activity from server
and put it on individual spawners
2017-08-05 14:55:09 +02:00
Min RK
886005be2a handle named servers in user_stopped callback 2017-08-03 11:09:28 +02:00
Min RK
210d7e59fd Merge pull request #1301 from minrk/total-running-limit
add active_server_limit
2017-08-03 11:08:23 +02:00
Min RK
fada0d99f0 call it active_server_limit 2017-08-03 10:50:50 +02:00
Min RK
8636b4ebca Merge pull request #1294 from minrk/alembic-tag
always include and check alembic revision
2017-08-02 11:14:44 +02:00
Min RK
7520d4b81e add concurrent_user_limit
limits total active users, not just spawns
2017-08-01 16:22:54 +02:00
Min RK
a24027f188 hook up app logging in upgrade-db
matches default formatting
2017-07-31 16:19:47 +02:00
Min RK
5ad77df04f check database revision on launch
fail with informative error if version mismatches

Since we weren't always tagging before,
we have to handle no tag being present:

- database empty (use latest because we are about to create everything anew)
- if 'spawners' is present, assume 0.8.dev
- if 'services' is present, assume 0.7.x
- else: assume base revision when we started tracking this stuff
2017-07-31 16:18:58 +02:00
Min RK
55c3164a7d Make default concurrent spawn limit 100
it's a conservative default, and deployments can turn it up if need be
2017-07-31 11:24:21 +02:00
Min RK
c78e31b136 Merge pull request #1290 from yuvipanda/concurrent_spawn_limit
Add support for limiting the number of concurrent spawns
2017-07-31 10:28:37 +02:00
Min RK
1f2125a097 Add Authenticator.enable_auth_state
Allows authenticators to optionally enable this flag

and signal that auth_state will be used,
enabling early check and exit if encryption is not available.
2017-07-28 22:36:49 +02:00
yuvipanda
a1a706cb31 More cleanup 2017-07-28 11:58:58 -07:00
Min RK
8a1da297d9 CryptKeeper is configurable 2017-07-28 17:20:57 +02:00
yuvipanda
27de44b0ec Add support for limiting the number of concurrent spawns 2017-07-27 16:32:45 -07:00
Carol Willing
cc24f36e80 Merge pull request #1281 from minrk/no-test-threads
eliminate test application thread
2017-07-27 08:43:45 -07:00
Min RK
8f1115a257 remove handling of changing db sessions
this was purely for accessing the db from multiple threads in tests
2017-07-27 11:37:19 +02:00
yuvipanda
be7faacd07 Add ability to set hub_connect_port 2017-07-26 17:53:40 -07:00
Min RK
eb1895e980 simplify Hub object a bit
- remove use of deprecated Hub.server
- add deprecation warning to Hub.server property
- move cookie_name declaration to Hub

It should now be possible to use Hub.from_url('http://1.2.3.4:1234/hub/') without missing information
2017-07-26 11:48:30 +02:00
Min RK
3e796b579d Address review in named_servers
from willingc

- consistency of repr/str when logging usernames
- cleanup some attribute declarations
- add comments about db session weirdness
2017-07-26 10:47:35 +02:00
Min RK
f7bf2b0ba6 Merge branch 'master' into named_servers 2017-07-24 15:21:42 +02: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
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
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
3eca010f66 limit curl logging to INFO-level
curl debug logs every byte of every request
2017-07-18 14:49:13 +02:00
Min RK
a2e94b8493 create Spawners table
for named servers

removes User.servers
2017-07-18 14:28:31 +02:00
Min RK
aee3c74681 Merge origin/master into named_servers 2017-07-17 10:53:17 +02:00
yuvipanda
e0effa567a Tag hub_ip_connect as configurable
This value is expected to be provided by the user.
2017-07-13 20:14:11 -07:00
Min RK
549dfd99e5 check routes on startup
and be more thorough about clearing out stale routes that shouldn't be there
2017-07-12 14:06:04 +02:00
Min RK
69a27b7843 use pycurl by default, if available
simplehttpclient can have issues with high load
2017-07-11 16:16:02 +02:00
Min RK
5d45a44247 use db_factory in Proxy
should avoid session crossover problems in tests

…still really need to move tests over to gen_test
2017-06-27 22:39:39 +01:00
Min RK
4c0d4ffc47 add default hub route via Proxy.add_route
instead of relying on default target
2017-06-27 15:22:26 +01:00
Min RK
31fc89c944 add RouteSpec namedtuple for route specification
namedtuple(path, host)

everywhere that accepts a RouteSpec must also accept a string
and treat it as RouteSpec(string).
RouteSpec.as_routespec(spec_or_string) handles this.
2017-06-23 14:12:30 +02:00
Min RK
e33e34748f Re-sync with master 2017-06-21 15:33:01 +02:00
Min RK
d2533688b6 add hub_connect_ip
allows specifying the connect ip/hostname for the Hub
when it differs from hub_ip (the bind address).

Used when the Hub is not on the same host as the spawners and/or proxy (e.g. docker, kubernetes, etc.)
2017-06-06 12:47:43 +02:00
Carol Willing
888aa99ea6 Merge pull request #1069 from minrk/first-poll-fails-no-crash
Prevent crashes due to deleted system users
2017-06-02 05:25:34 -07:00
Min RK
b112b88587 Merge pull request #1148 from yuvipanda/pwdfree
Don't use getuser to find out current user name for spawning
2017-05-22 16:40:14 -07:00
Carol Willing
bdfd81fe83 Merge pull request #1144 from minrk/raise-on-config-error
raise on config file errors
2017-05-22 15:16:05 -07:00
Min RK
c24a0a4995 typo missing hub.api_url in service 2017-05-22 15:09:31 -07:00
Min RK
465c81f281 clarify delete-invalid-user messages and docstrings 2017-05-20 11:31:59 -07:00
Min RK
2d8facd022 Add Authenticator.delete_invalid_users
opt-in option for deleting users that have been invalidated,
e.g. for LocalAuthenticators when system users have been removed and `create_system_users` is False.

Since it’s opt-in, log config to do so when the error is seen and option is not enabled.
2017-05-20 11:21:21 -07:00
Min RK
d548aa1e72 deprecate old proxy config
but keep it working with warnings
2017-05-19 12:08:49 -07:00
Min RK
7968912a7c raise on config file errors
don’t start jupyterhub if we can’t load config files
2017-05-19 11:43:59 -07:00