hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-14 21:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return to original style for line length for requests

Browse Source
This commit is contained in:
Carol Willing
2017-01-21 00:42:46 -08:00
parent 0f283e088e
commit 10d2eb6449
1 changed files with 25 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
jupyterhub/tests/test_api.py
View File

@@ -124,30 +124,13 @@ def test_referer_check(app, io_loop):
io_loop.run_sync(lambda: app.proxy.delete_user(app_user)) io_loop.run_sync(lambda: app.proxy.delete_user(app_user))
io_loop.run_sync(app_user.stop) io_loop.run_sync(app_user.stop)
r = api_request(app, 'users', r = api_request(app, 'users', headers={'Authorization': '', 'Referer': 'null', }, cookies=cookies, )
headers={'Authorization': '', 'Referer': 'null', },
cookies=cookies, )
assert r.status_code == 403 assert r.status_code == 403
r = api_request(app, 'users', headers={ r = api_request(app, 'users', headers={'Authorization': '', 'Referer': 'http://attack.com/csrf/vulnerability', }, cookies=cookies,)
'Authorization': '',
'Referer': 'http://attack.com/csrf/vulnerability',
}, cookies=cookies,)
assert r.status_code == 403 assert r.status_code == 403
r = api_request(app, 'users', r = api_request(app, 'users', headers={'Authorization': '', 'Referer': url, 'Host': host, }, cookies=cookies,)
headers={
'Authorization': '',
'Referer': url,
'Host': host,
}, cookies=cookies,
)
assert r.status_code == 200 assert r.status_code == 200
r = api_request(app, 'users', r = api_request(app, 'users', headers={'Authorization': '', 'Referer': ujoin(url, 'foo/bar/baz/bat'), 'Host': host, }, cookies=cookies,)
headers={
'Authorization': '',
'Referer': ujoin(url, 'foo/bar/baz/bat'),
'Host': host,
}, cookies=cookies,
)
assert r.status_code == 200 assert r.status_code == 200
@@ -182,9 +165,7 @@ def test_get_users(app):
} }
] ]
r = api_request(app, 'users', r = api_request(app, 'users', headers=auth_header(db, 'user'), )
headers=auth_header(db, 'user'),
)
assert r.status_code == 403 assert r.status_code == 403
@@ -229,9 +210,7 @@ def test_add_multi_user_bad(app):
@mark.user @mark.user
def test_add_multi_user_invalid(app): def test_add_multi_user_invalid(app):
app.authenticator.username_pattern = r'w.*' app.authenticator.username_pattern = r'w.*'
r = api_request(app, 'users', method='post', r = api_request(app, 'users', method='post', data=json.dumps({'usernames': ['Willow', 'Andrew', 'Tara']}))
data=json.dumps({'usernames': ['Willow', 'Andrew', 'Tara']})
)
app.authenticator.username_pattern = '' app.authenticator.username_pattern = ''
assert r.status_code == 400 assert r.status_code == 400
assert r.json()['message'] == 'Invalid usernames: andrew, tara' assert r.json()['message'] == 'Invalid usernames: andrew, tara'
@@ -241,9 +220,7 @@ def test_add_multi_user_invalid(app):
def test_add_multi_user(app): def test_add_multi_user(app):
db = app.db db = app.db
names = ['a', 'b'] names = ['a', 'b']
r = api_request(app, 'users', method='post', r = api_request(app, 'users', method='post', data=json.dumps({'usernames': names}), )
data=json.dumps({'usernames': names}),
)
assert r.status_code == 201 assert r.status_code == 201
reply = r.json() reply = r.json()
r_names = [ user['name'] for user in reply ] r_names = [ user['name'] for user in reply ]
@@ -256,17 +233,13 @@ def test_add_multi_user(app):
assert not user.admin assert not user.admin
# try to create the same users again # try to create the same users again
r = api_request(app, 'users', method='post', r = api_request(app, 'users', method='post', data=json.dumps({'usernames': names}), )
data=json.dumps({'usernames': names}),
)
assert r.status_code == 400 assert r.status_code == 400
names = ['a', 'b', 'ab'] names = ['a', 'b', 'ab']
# try to create the same users again # try to create the same users again
r = api_request(app, 'users', method='post', r = api_request(app, 'users', method='post', data=json.dumps({'usernames': names}), )
data=json.dumps({'usernames': names}),
)
assert r.status_code == 201 assert r.status_code == 201
reply = r.json() reply = r.json()
r_names = [ user['name'] for user in reply ] r_names = [ user['name'] for user in reply ]
@@ -277,9 +250,7 @@ def test_add_multi_user(app):
def test_add_multi_user_admin(app): def test_add_multi_user_admin(app):
db = app.db db = app.db
names = ['c', 'd'] names = ['c', 'd']
r = api_request(app, 'users', method='post', r = api_request(app, 'users', method='post', data=json.dumps({'usernames': names, 'admin': True}), )
data=json.dumps({'usernames': names, 'admin': True}),
)
assert r.status_code == 201 assert r.status_code == 201
reply = r.json() reply = r.json()
r_names = [ user['name'] for user in reply ] r_names = [ user['name'] for user in reply ]
@@ -306,9 +277,7 @@ def test_add_user_bad(app):
def test_add_admin(app): def test_add_admin(app):
db = app.db db = app.db
name = 'newadmin' name = 'newadmin'
r = api_request(app, 'users', name, method='post', r = api_request(app, 'users', name, method='post', data=json.dumps({'admin': True}), )
data=json.dumps({'admin': True}),
)
assert r.status_code == 201 assert r.status_code == 201
user = find_user(db, name) user = find_user(db, name)
assert user is not None assert user is not None
@@ -335,9 +304,7 @@ def test_make_admin(app):
assert user.name == name assert user.name == name
assert not user.admin assert not user.admin
r = api_request(app, 'users', name, method='patch', r = api_request(app, 'users', name, method='patch', data=json.dumps({'admin': True}))
data=json.dumps({'admin': True})
)
assert r.status_code == 200 assert r.status_code == 200
user = find_user(db, name) user = find_user(db, name)
assert user is not None assert user is not None
@@ -539,7 +506,7 @@ def test_get_token(app):
assert r.status_code == 200 assert r.status_code == 200
data = r.content.decode("utf-8") data = r.content.decode("utf-8")
token = json.loads(data) token = json.loads(data)
assert not token['Authentication'] is None assert token['Authentication'] is not None
def test_bad_get_token(app): def test_bad_get_token(app):
@@ -573,10 +540,7 @@ def test_groups_list(app):
r = api_request(app, 'groups') r = api_request(app, 'groups')
r.raise_for_status() r.raise_for_status()
reply = r.json() reply = r.json()
assert reply == [{ assert reply == [{'name': 'alphaflight', 'users': []}]
'name': 'alphaflight',
'users': []
}]
@mark.group @mark.group
@@ -592,10 +556,7 @@ def test_group_get(app):
r = api_request(app, 'groups/alphaflight') r = api_request(app, 'groups/alphaflight')
r.raise_for_status() r.raise_for_status()
reply = r.json() reply = r.json()
assert reply == { assert reply == {'name': 'alphaflight', 'users': ['sasquatch'] }
'name': 'alphaflight',
'users': ['sasquatch']
}
@mark.group @mark.group
@@ -604,15 +565,11 @@ def test_group_create_delete(app):
r = api_request(app, 'groups/runaways', method='delete') r = api_request(app, 'groups/runaways', method='delete')
assert r.status_code == 404 assert r.status_code == 404
r = api_request(app, 'groups/new', method='post', data=json.dumps({ r = api_request(app, 'groups/new', method='post', data=json.dumps({'users': ['doesntexist']}))
'users': ['doesntexist']
}))
assert r.status_code == 400 assert r.status_code == 400
assert orm.Group.find(db, name='new') is None assert orm.Group.find(db, name='new') is None
r = api_request(app, 'groups/omegaflight', method='post', data=json.dumps({ r = api_request(app, 'groups/omegaflight', method='post', data=json.dumps({'users': ['sasquatch']}))
'users': ['sasquatch']
}))
r.raise_for_status() r.raise_for_status()
omegaflight = orm.Group.find(db, name='omegaflight') omegaflight = orm.Group.find(db, name='omegaflight')
@@ -629,7 +586,7 @@ def test_group_create_delete(app):
assert omegaflight not in sasquatch.groups assert omegaflight not in sasquatch.groups
assert orm.Group.find(db, name='omegaflight') is None assert orm.Group.find(db, name='omegaflight') is None
# delete nonexistant gives 404 # delete nonexistent gives 404
r = api_request(app, 'groups/omegaflight', method='delete') r = api_request(app, 'groups/omegaflight', method='delete')
assert r.status_code == 404 assert r.status_code == 404
@@ -643,9 +600,7 @@ def test_group_add_users(app):
names = ['aurora', 'guardian', 'northstar', 'sasquatch', 'shaman', 'snowbird'] names = ['aurora', 'guardian', 'northstar', 'sasquatch', 'shaman', 'snowbird']
users = [ find_user(db, name=name) or add_user(db, app=app, name=name) for name in names ] users = [ find_user(db, name=name) or add_user(db, app=app, name=name) for name in names ]
r = api_request(app, 'groups/alphaflight/users', method='post', data=json.dumps({ r = api_request(app, 'groups/alphaflight/users', method='post', data=json.dumps({'users': names, }))
'users': names,
}))
r.raise_for_status() r.raise_for_status()
for user in users: for user in users:
@@ -665,9 +620,7 @@ def test_group_delete_users(app):
names = ['aurora', 'guardian', 'northstar', 'sasquatch', 'shaman', 'snowbird'] names = ['aurora', 'guardian', 'northstar', 'sasquatch', 'shaman', 'snowbird']
users = [ find_user(db, name=name) for name in names ] users = [ find_user(db, name=name) for name in names ]
r = api_request(app, 'groups/alphaflight/users', method='delete', data=json.dumps({ r = api_request(app, 'groups/alphaflight/users', method='delete', data=json.dumps({'users': names[:2], }))
'users': names[:2],
}))
r.raise_for_status() r.raise_for_status()
for user in users[:2]: for user in users[:2]:
@@ -703,9 +656,7 @@ def test_get_services(app, mockservice):
} }
} }
r = api_request(app, 'services', r = api_request(app, 'services', headers=auth_header(db, 'user'),)
headers=auth_header(db, 'user'),
)
assert r.status_code == 403 assert r.status_code == 403
@@ -726,15 +677,9 @@ def test_get_service(app, mockservice):
'url': mockservice.url, 'url': mockservice.url,
} }
r = api_request(app, 'services/%s' % mockservice.name, r = api_request(app, 'services/%s' % mockservice.name, headers={'Authorization': 'token %s' % mockservice.api_token})
headers={
'Authorization': 'token %s' % mockservice.api_token
}
)
r.raise_for_status() r.raise_for_status()
r = api_request(app, 'services/%s' % mockservice.name, r = api_request(app, 'services/%s' % mockservice.name, headers=auth_header(db, 'user'),)
headers=auth_header(db, 'user'),
)
assert r.status_code == 403 assert r.status_code == 403
@@ -743,9 +688,7 @@ def test_root_api(app):
url = ujoin(base_url, 'api') url = ujoin(base_url, 'api')
r = requests.get(url) r = requests.get(url)
r.raise_for_status() r.raise_for_status()
expected = { expected = {'version': jupyterhub.__version__}
'version': jupyterhub.__version__
}
assert r.json() == expected assert r.json() == expected
@@ -795,10 +738,7 @@ def test_bad_json_body(app):
def test_shutdown(app): def test_shutdown(app):
r = api_request(app, 'shutdown', method='post', data=json.dumps({ r = api_request(app, 'shutdown', method='post', data=json.dumps({'servers': True, 'proxy': True,}))
'servers': True,
'proxy': True,
}))
r.raise_for_status() r.raise_for_status()
reply = r.json() reply = r.json()
for i in range(100): for i in range(100):