[Batch 1] Port Notebook PRs #95
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
to ensure (approximately) that all messages from the stopped kernel are delivered before the dead/restarting message
Per Tornado's documentation: >By default, Tornado’s secure cookies expire after 30 days. >To change this, use the expires_days keyword argument to >set_secure_cookie and the max_age_days argument to get_secure_cookie. >These two values are passed separately so that you may >e.g. have a cookie that is valid for 30 days for most purposes, >but for certain sensitive actions >(such as changing billing information) >you use a smaller max_age_days when reading the cookie. With the current implementation in `auth/login.py`, this is possible to pass the `expires_days` option but not possible to enforce it as this is not possible to pass `max_age_days` to `get_secure_cookie` This makes impossible to set the cookie expiration without using a custom `LoginHandler`. This revision is about adding the possibility to pass options to Tornado's `get_secure_cookie` method, so it can be possible to set the cookies expiration, among others.
ipaddress.ip_address('127.0.0.1') fails with ValueError on Python 2
need to decode it, otherwise 127.0.0.1 won't be treated as local
so this list isn't empty when these handlers are used outside NotebookApp
Zsailer
changed the title
|
Some of these seem to undo some things from #94 ? |
|
Or rather, contrary to that PR. |
|
You're right. This is the challenge of cherry-picking PRs. I'll remove the Python2/3 patches in a new commit (rather than removing specific commits). Does that seem reasonable? |
|
Shoot. We should probably complete the initial migration from Notebook before doing "new" things. Sorry about that. Nice catch @vidartf. |
Zsailer
changed the title
Zsailer
commented
Sep 25, 2019
| @@ -419,6 +419,10 @@ def check_host(self): | |||
| if host.startswith('[') and host.endswith(']'): | |||
| host = host[1:-1] | |||
|
|
|||
| if not PY3: | |||
| @@ -219,7 +219,7 @@ def init_settings(self, jupyter_app, kernel_manager, contents_manager, | |||
| now = utcnow() | |||
|
|
|||
| root_dir = contents_manager.root_dir | |||
| home = os.path.expanduser('~') | |||
| home = py3compat.str_to_unicode(os.path.expanduser('~'), encoding=sys.getfilesystemencoding()) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For more details about these PRs, see
get_secure_cookiekwargs jupyter/notebook#3778