mirror of
https://github.com/jupyterhub/jupyterhub.git
synced 2025-10-13 04:53:01 +00:00
chore: rename to json_escaped_name and unittests
This commit is contained in:
@@ -73,6 +73,14 @@ def test_user(db):
|
|||||||
found = orm.User.find(db, 'badger')
|
found = orm.User.find(db, 'badger')
|
||||||
assert found is None
|
assert found is None
|
||||||
|
|
||||||
|
def test_user_escaping(db):
|
||||||
|
orm_user = orm.User(name='company\\user@company.com,\"quoted\"')
|
||||||
|
db.add(orm_user)
|
||||||
|
db.commit()
|
||||||
|
user = User(orm_user)
|
||||||
|
assert user.name == 'company\\user@company.com,\"quoted\"'
|
||||||
|
assert user.escaped_name == 'company%5Cuser@company.com%2C%22quoted%22'
|
||||||
|
assert user.json_escaped_name == 'company\\\\user@company.com,\\\"quoted\\\"'
|
||||||
|
|
||||||
def test_tokens(db):
|
def test_tokens(db):
|
||||||
user = orm.User(name='inara')
|
user = orm.User(name='inara')
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
# Copyright (c) Jupyter Development Team.
|
# Copyright (c) Jupyter Development Team.
|
||||||
# Distributed under the terms of the Modified BSD License.
|
# Distributed under the terms of the Modified BSD License.
|
||||||
import codecs
|
import json
|
||||||
import warnings
|
import warnings
|
||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
@@ -352,9 +352,9 @@ class User:
|
|||||||
return quote(self.name, safe='@~')
|
return quote(self.name, safe='@~')
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def unicode_escaped_name(self):
|
def json_escaped_name(self):
|
||||||
"""My name, escaped for use in javascript inserts, etc."""
|
"""My name, escaped for use in javascript inserts, etc."""
|
||||||
return codecs.unicode_escape_encode(self.name)[0].decode()
|
return json.dumps(self.name)[1:-1]
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def proxy_spec(self):
|
def proxy_spec(self):
|
||||||
|
@@ -63,7 +63,7 @@
|
|||||||
base_url: "{{base_url}}",
|
base_url: "{{base_url}}",
|
||||||
prefix: "{{prefix}}",
|
prefix: "{{prefix}}",
|
||||||
{% if user %}
|
{% if user %}
|
||||||
user: "{{user.unicode_escaped_name}}",
|
user: "{{user.json_escaped_name}}",
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if admin_access %}
|
{% if admin_access %}
|
||||||
admin_access: true,
|
admin_access: true,
|
||||||
|
Reference in New Issue
Block a user