Format all the things (#991)

* Format Javascript and CSS files with `prettier`: `prettier --write 'CTFd/themes/**/*'`
* Format Python with `black`: `black CTFd` & `black tests`
* Travis now uses xenial instead of trusty.
This commit is contained in:
Kevin Chung
2019-05-11 21:09:37 -04:00
committed by GitHub
parent 3d23ece370
commit 6833378c36
201 changed files with 9561 additions and 9107 deletions

View File

@@ -1,11 +1,13 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from tests.helpers import (create_ctfd,
destroy_ctfd,
register_user,
login_as_user,
login_with_mlc)
from tests.helpers import (
create_ctfd,
destroy_ctfd,
register_user,
login_as_user,
login_with_mlc,
)
from CTFd.models import Teams, Users
from CTFd.utils import set_config
@@ -15,8 +17,8 @@ def test_oauth_not_configured():
app = create_ctfd()
with app.app_context():
with app.test_client() as client:
r = client.get('/oauth', follow_redirects=False)
assert r.location == 'http://localhost/login'
r = client.get("/oauth", follow_redirects=False)
assert r.location == "http://localhost/login"
r = client.get(r.location)
resp = r.get_data(as_text=True)
assert "OAuth Settings not configured" in resp
@@ -26,15 +28,17 @@ def test_oauth_not_configured():
def test_oauth_configured_flow():
"""Test that MLC integration works properly but does not allow registration (account creation) if disabled"""
app = create_ctfd(user_mode="teams")
app.config.update({
'OAUTH_CLIENT_ID': 'ctfd_testing_client_id',
'OAUTH_CLIENT_SECRET': 'ctfd_testing_client_secret',
'OAUTH_AUTHORIZATION_ENDPOINT': 'http://auth.localhost/oauth/authorize',
'OAUTH_TOKEN_ENDPOINT': 'http://auth.localhost/oauth/token',
'OAUTH_API_ENDPOINT': 'http://api.localhost/user',
})
app.config.update(
{
"OAUTH_CLIENT_ID": "ctfd_testing_client_id",
"OAUTH_CLIENT_SECRET": "ctfd_testing_client_secret",
"OAUTH_AUTHORIZATION_ENDPOINT": "http://auth.localhost/oauth/authorize",
"OAUTH_TOKEN_ENDPOINT": "http://auth.localhost/oauth/token",
"OAUTH_API_ENDPOINT": "http://api.localhost/user",
}
)
with app.app_context():
set_config('registration_visibility', 'private')
set_config("registration_visibility", "private")
assert Users.query.count() == 1
assert Teams.query.count() == 0
@@ -43,15 +47,15 @@ def test_oauth_configured_flow():
assert Users.query.count() == 1
# Users shouldn't be able to register because registration is disabled
resp = client.get('http://localhost/login').get_data(as_text=True)
assert 'Public registration is disabled' in resp
resp = client.get("http://localhost/login").get_data(as_text=True)
assert "Public registration is disabled" in resp
set_config('registration_visibility', 'public')
set_config("registration_visibility", "public")
client = login_with_mlc(app)
# Users should be able to register now
assert Users.query.count() == 2
user = Users.query.filter_by(email='user@ctfd.io').first()
user = Users.query.filter_by(email="user@ctfd.io").first()
assert user.oauth_id == 1337
assert user.team_id == 1
@@ -60,38 +64,40 @@ def test_oauth_configured_flow():
team = Teams.query.filter_by(id=1).first()
assert team.oauth_id == 1234
client.get('/logout')
client.get("/logout")
# Users should still be able to login if registration is disabled
set_config('registration_visibility', 'private')
set_config("registration_visibility", "private")
client = login_with_mlc(app)
with client.session_transaction() as sess:
assert sess['id']
assert sess['name']
assert sess['type']
assert sess['email']
assert sess['nonce']
assert sess["id"]
assert sess["name"]
assert sess["type"]
assert sess["email"]
assert sess["nonce"]
destroy_ctfd(app)
def test_oauth_login_upgrade():
"""Test that users who use MLC after having registered will be associated with their MLC account"""
app = create_ctfd(user_mode="teams")
app.config.update({
'OAUTH_CLIENT_ID': 'ctfd_testing_client_id',
'OAUTH_CLIENT_SECRET': 'ctfd_testing_client_secret',
'OAUTH_AUTHORIZATION_ENDPOINT': 'http://auth.localhost/oauth/authorize',
'OAUTH_TOKEN_ENDPOINT': 'http://auth.localhost/oauth/token',
'OAUTH_API_ENDPOINT': 'http://api.localhost/user',
})
app.config.update(
{
"OAUTH_CLIENT_ID": "ctfd_testing_client_id",
"OAUTH_CLIENT_SECRET": "ctfd_testing_client_secret",
"OAUTH_AUTHORIZATION_ENDPOINT": "http://auth.localhost/oauth/authorize",
"OAUTH_TOKEN_ENDPOINT": "http://auth.localhost/oauth/token",
"OAUTH_API_ENDPOINT": "http://api.localhost/user",
}
)
with app.app_context():
register_user(app)
assert Users.query.count() == 2
set_config('registration_visibility', 'private')
set_config("registration_visibility", "private")
# Users should still be able to login
client = login_as_user(app)
client.get('/logout')
client.get("/logout")
user = Users.query.filter_by(id=2).first()
assert user.oauth_id is None