Switch default testing/development domain name to examplectf.com (#1807)

* Use `examplectf.com` as testing/development domain instead of `ctfd.io`
This commit is contained in:
Kevin Chung
2021-02-20 15:11:22 -05:00
committed by GitHub
parent 5611c47487
commit 843546bfa8
40 changed files with 249 additions and 169 deletions

View File

@@ -54,7 +54,7 @@ def test_user_token_access():
assert r.status_code == 403
with app.test_client() as client:
user = gen_user(app.db, name="user2", email="user2@ctfd.io")
user = gen_user(app.db, name="user2", email="user2@examplectf.com")
expiration = datetime.datetime.utcnow() + datetime.timedelta(days=-1)
token = generate_user_token(user, expiration=expiration)
headers = {"Authorization": "token " + token.value}
@@ -67,12 +67,12 @@ def test_user_token_access():
assert r.status_code == 401
with app.test_client() as client:
user = gen_user(app.db, name="user1", email="user1@ctfd.io")
user = gen_user(app.db, name="user1", email="user1@examplectf.com")
token = generate_user_token(user, expiration=None)
headers = {"Authorization": "token " + token.value}
r = client.get("/api/v1/users/me", headers=headers, json="")
assert r.status_code == 200
resp = r.get_json()
assert resp["data"]["email"] == "user1@ctfd.io"
assert resp["data"]["email"] == "user1@examplectf.com"
assert resp["data"]["name"] == "user1"
destroy_ctfd(app)

View File

@@ -22,7 +22,7 @@ def test_api_statistics_score_distribution():
# Add user data
register_user(app)
user = Users.query.filter_by(email="user@ctfd.io").first()
user = Users.query.filter_by(email="user@examplectf.com").first()
simulate_user_activity(app.db, user=user)
# Test again

View File

@@ -94,8 +94,8 @@ def test_api_admin_can_change_captain():
"""Can admins/captains change captains for teams"""
app = create_ctfd(user_mode="teams")
with app.app_context():
user1 = gen_user(app.db, name="user1", email="user1@ctfd.io") # ID 2
user2 = gen_user(app.db, name="user2", email="user2@ctfd.io") # ID 3
user1 = gen_user(app.db, name="user1", email="user1@examplectf.com") # ID 2
user2 = gen_user(app.db, name="user2", email="user2@examplectf.com") # ID 3
team = gen_team(app.db)
team.members.append(user1)
team.members.append(user2)
@@ -128,8 +128,8 @@ def test_api_users_can_change_captain_on_self_team():
"""Can admins/captains change captains for their own team"""
app = create_ctfd(user_mode="teams")
with app.app_context():
user1 = gen_user(app.db, name="user1", email="user1@ctfd.io") # ID 2
user2 = gen_user(app.db, name="user2", email="user2@ctfd.io") # ID 3
user1 = gen_user(app.db, name="user1", email="user1@examplectf.com") # ID 2
user2 = gen_user(app.db, name="user2", email="user2@examplectf.com") # ID 3
team = gen_team(app.db)
team.members.append(user1)
team.members.append(user2)

View File

@@ -99,7 +99,7 @@ def test_api_challenges_get_verified_emails():
gen_user(
app.db,
name="user_name",
email="verified_user@ctfd.io",
email="verified_user@examplectf.com",
password="password",
verified=True,
)
@@ -294,7 +294,7 @@ def test_api_challenge_get_verified_emails():
gen_user(
app.db,
name="user_name",
email="verified_user@ctfd.io",
email="verified_user@examplectf.com",
password="password",
verified=True,
)
@@ -558,8 +558,8 @@ def test_api_challenge_get_solves_ctf_frozen():
"""Test users can only see challenge solves that happened before freeze time"""
app = create_ctfd()
with app.app_context():
register_user(app, name="user1", email="user1@ctfd.io")
register_user(app, name="user2", email="user2@ctfd.io")
register_user(app, name="user1", email="user1@examplectf.com")
register_user(app, name="user2", email="user2@examplectf.com")
# Friday, October 6, 2017 12:00:00 AM GMT-04:00 DST
set_config("freeze", "1507262400")
@@ -657,7 +657,7 @@ def test_api_challenge_get_solves_verified_emails():
gen_user(
app.db,
name="user_name",
email="verified_user@ctfd.io",
email="verified_user@examplectf.com",
password="password",
verified=True,
)

View File

@@ -163,7 +163,7 @@ def test_api_self_fields_permissions():
with client.session_transaction() as sess:
data = {
"name": "user",
"email": "user@ctfd.io",
"email": "user@examplectf.com",
"password": "password",
"nonce": sess.get("nonce"),
"fields[1]": "CustomValue1",

View File

@@ -20,7 +20,7 @@ def test_scoreboard_is_cached():
app = create_ctfd()
with app.app_context():
# create user1
register_user(app, name="user1", email="user1@ctfd.io")
register_user(app, name="user1", email="user1@examplectf.com")
# create challenge
chal = gen_challenge(app.db, value=100)

View File

@@ -134,10 +134,10 @@ def test_api_teams_post_admin_duplicate():
r = client.post(
"/api/v1/teams",
json={
"website": "https://ctfd.io",
"website": "https://examplectf.com",
"name": "team1",
"country": "TW",
"email": "team1@ctfd.io",
"email": "team1@examplectf.com",
"affiliation": "team",
"password": "password",
},
@@ -152,10 +152,10 @@ def test_api_teams_post_admin_duplicate():
r = client.post(
"/api/v1/teams",
json={
"website": "https://ctfd.io",
"website": "https://examplectf.com",
"name": "new_team",
"country": "TW",
"email": "team@ctfd.io",
"email": "team@examplectf.com",
"affiliation": "team",
"password": "password",
},
@@ -244,7 +244,7 @@ def test_api_team_patch_admin():
"/api/v1/teams/1",
json={
"name": "team_name",
"email": "team@ctfd.io",
"email": "team@examplectf.com",
"password": "password",
"affiliation": "changed",
},
@@ -328,8 +328,8 @@ def test_api_team_patch_me_logged_in_user():
"""Can a user patch /api/v1/teams/me if logged in as a regular user"""
app = create_ctfd(user_mode="teams")
with app.app_context():
user1 = gen_user(app.db, name="user1", email="user1@ctfd.io")
user2 = gen_user(app.db, name="user2", email="user2@ctfd.io")
user1 = gen_user(app.db, name="user1", email="user1@examplectf.com")
user2 = gen_user(app.db, name="user2", email="user2@examplectf.com")
team = gen_team(app.db)
team.members.append(user1)
team.members.append(user2)
@@ -441,7 +441,9 @@ def test_api_team_get_solves_after_freze_time():
app = create_ctfd(user_mode="teams")
with app.app_context():
register_user(app)
team = gen_team(app.db, name="team1", email="team1@ctfd.io", member_count=1)
team = gen_team(
app.db, name="team1", email="team1@examplectf.com", member_count=1
)
team_member = team.members[0]
tm_name = team_member.name
@@ -521,7 +523,9 @@ def test_api_team_get_fails_after_freze_time():
app = create_ctfd(user_mode="teams")
with app.app_context():
register_user(app)
team = gen_team(app.db, name="team1", email="team1@ctfd.io", member_count=1)
team = gen_team(
app.db, name="team1", email="team1@examplectf.com", member_count=1
)
team_member = team.members[0]
tm_name = team_member.name
@@ -598,7 +602,9 @@ def test_api_team_get_awards_after_freze_time():
app = create_ctfd(user_mode="teams")
with app.app_context():
register_user(app)
team = gen_team(app.db, name="team1", email="team1@ctfd.io", member_count=1)
team = gen_team(
app.db, name="team1", email="team1@examplectf.com", member_count=1
)
team_member = team.members[0]
tm_name = team_member.name
@@ -634,9 +640,9 @@ def test_api_team_patch_password():
app = create_ctfd(user_mode="teams")
with app.app_context():
user1 = gen_user(
app.db, name="user1", email="user1@ctfd.io", password="captain"
app.db, name="user1", email="user1@examplectf.com", password="captain"
) # ID 2
user2 = gen_user(app.db, name="user2", email="user2@ctfd.io") # ID 3
user2 = gen_user(app.db, name="user2", email="user2@examplectf.com") # ID 3
team = gen_team(app.db)
team.members.append(user1)
team.members.append(user2)
@@ -704,7 +710,7 @@ def test_api_team_captain_disbanding():
team.members.append(user)
user.team_id = team.id
team.captain_id = 2
user2 = gen_user(app.db, name="user2", email="user2@ctfd.io")
user2 = gen_user(app.db, name="user2", email="user2@examplectf.com")
team.members.append(user2)
app.db.session.commit()
with login_as_user(app, name="user2") as client:
@@ -754,7 +760,7 @@ def test_api_team_captain_disbanding_only_inactive_teams():
team.members.append(user)
user.team_id = team.id
team.captain_id = 2
user2 = gen_user(app.db, name="user2", email="user2@ctfd.io")
user2 = gen_user(app.db, name="user2", email="user2@examplectf.com")
team.members.append(user2)
app.db.session.commit()
@@ -775,8 +781,8 @@ def test_api_team_captain_disbanding_only_inactive_teams():
},
}
user = gen_user(app.db, name="user3", email="user3@ctfd.io")
team = gen_team(app.db, name="team2", email="team2@ctfd.io")
user = gen_user(app.db, name="user3", email="user3@examplectf.com")
team = gen_team(app.db, name="team2", email="team2@examplectf.com")
print(user.id)
team.members.append(user)
user.team_id = team.id
@@ -795,12 +801,12 @@ def test_api_accessing_hidden_banned_users():
app = create_ctfd(user_mode="teams")
with app.app_context():
register_user(app)
register_user(app, name="user2", email="user2@ctfd.io")
register_user(app, name="visible_user", email="visible_user@ctfd.io")
register_user(app, name="user2", email="user2@examplectf.com")
register_user(app, name="visible_user", email="visible_user@examplectf.com")
user = Users.query.filter_by(id=2).first()
team = gen_team(
app.db, name="hidden_team", email="hidden_team@ctfd.io", hidden=True
app.db, name="hidden_team", email="hidden_team@examplectf.com", hidden=True
)
team.members.append(user)
user.team_id = team.id
@@ -808,7 +814,7 @@ def test_api_accessing_hidden_banned_users():
user = Users.query.filter_by(id=3).first()
team = gen_team(
app.db, name="banned_team", email="banned_team@ctfd.io", banned=True
app.db, name="banned_team", email="banned_team@examplectf.com", banned=True
)
team.members.append(user)
user.team_id = team.id
@@ -865,7 +871,7 @@ def test_api_user_without_team_challenge_interaction():
)
# Create a user with a team
user = gen_user(app.db, email="user_name@ctfd.io")
user = gen_user(app.db, email="user_name@examplectf.com")
team = gen_team(app.db)
team.members.append(user)
user.team_id = team.id

View File

@@ -42,7 +42,7 @@ def test_api_tag_list_get():
user = gen_user(app.db, name="user")
generate_user_token(user)
user2 = gen_user(app.db, name="user2", email="user2@ctfd.io")
user2 = gen_user(app.db, name="user2", email="user2@examplectf.com")
generate_user_token(user2)
generate_user_token(user2)
with login_as_user(app) as client:
@@ -78,7 +78,7 @@ def test_api_tag_detail_get():
resp = r.get_json()
assert sorted(resp["data"].keys()) == sorted(TokenSchema().views["admin"])
gen_user(app.db, name="user2", email="user2@ctfd.io")
gen_user(app.db, name="user2", email="user2@examplectf.com")
with login_as_user(app, "user2") as client:
r = client.get("/api/v1/tokens/1", json="")
assert r.status_code == 404
@@ -114,7 +114,7 @@ def test_api_token_delete():
token = generate_user_token(first_user)
token_id = token.id
# Second user
second_user = gen_user(app.db, name="user2", email="user2@ctfd.io")
second_user = gen_user(app.db, name="user2", email="user2@examplectf.com")
username2 = second_user.name
with login_as_user(app, username2) as client:
r = client.delete("/api/v1/tokens/" + str(token_id), json="")

View File

@@ -144,7 +144,11 @@ def test_api_users_post_admin_duplicate_information():
# Duplicate email
r = client.post(
"/api/v1/users",
json={"name": "user2", "email": "user@ctfd.io", "password": "password"},
json={
"name": "user2",
"email": "user@examplectf.com",
"password": "password",
},
)
resp = r.get_json()
assert r.status_code == 400
@@ -155,7 +159,11 @@ def test_api_users_post_admin_duplicate_information():
# Duplicate user
r = client.post(
"/api/v1/users",
json={"name": "user", "email": "user2@ctfd.io", "password": "password"},
json={
"name": "user",
"email": "user2@examplectf.com",
"password": "password",
},
)
resp = r.get_json()
assert r.status_code == 400
@@ -169,13 +177,21 @@ def test_api_users_patch_admin_duplicate_information():
"""Can an admin modify a user with duplicate information"""
app = create_ctfd()
with app.app_context():
register_user(app, name="user1", email="user1@ctfd.io", password="password")
register_user(app, name="user2", email="user2@ctfd.io", password="password")
register_user(
app, name="user1", email="user1@examplectf.com", password="password"
)
register_user(
app, name="user2", email="user2@examplectf.com", password="password"
)
with login_as_user(app, "admin") as client:
# Duplicate name
r = client.patch(
"/api/v1/users/1",
json={"name": "user2", "email": "user@ctfd.io", "password": "password"},
json={
"name": "user2",
"email": "user@examplectf.com",
"password": "password",
},
)
resp = r.get_json()
assert r.status_code == 400
@@ -185,7 +201,11 @@ def test_api_users_patch_admin_duplicate_information():
# Duplicate email
r = client.patch(
"/api/v1/users/1",
json={"name": "user", "email": "user2@ctfd.io", "password": "password"},
json={
"name": "user",
"email": "user2@examplectf.com",
"password": "password",
},
)
resp = r.get_json()
assert r.status_code == 400
@@ -199,13 +219,21 @@ def test_api_users_patch_duplicate_information():
"""Can a user modify their information to another user's"""
app = create_ctfd()
with app.app_context():
register_user(app, name="user1", email="user1@ctfd.io", password="password")
register_user(app, name="user2", email="user2@ctfd.io", password="password")
register_user(
app, name="user1", email="user1@examplectf.com", password="password"
)
register_user(
app, name="user2", email="user2@examplectf.com", password="password"
)
with login_as_user(app, "user1") as client:
# Duplicate email
r = client.patch(
"/api/v1/users/me",
json={"name": "user1", "email": "user2@ctfd.io", "confirm": "password"},
json={
"name": "user1",
"email": "user2@examplectf.com",
"confirm": "password",
},
)
resp = r.get_json()
assert r.status_code == 400
@@ -215,7 +243,11 @@ def test_api_users_patch_duplicate_information():
# Duplicate user
r = client.patch(
"/api/v1/users/me",
json={"name": "user2", "email": "user1@ctfd.io", "confirm": "password"},
json={
"name": "user2",
"email": "user1@examplectf.com",
"confirm": "password",
},
)
resp = r.get_json()
assert r.status_code == 400
@@ -301,7 +333,7 @@ def test_api_user_patch_admin():
"/api/v1/users/2",
json={
"name": "user",
"email": "user@ctfd.io",
"email": "user@examplectf.com",
"password": "password",
"country": "US",
"verified": True,
@@ -381,7 +413,7 @@ def test_api_user_patch_me_logged_in():
"/api/v1/users/me",
json={
"name": "user",
"email": "user@ctfd.io",
"email": "user@examplectf.com",
"password": "password",
"confirm": "password",
"country": "US",
@@ -401,7 +433,7 @@ def test_api_admin_user_patch_me_logged_in():
"/api/v1/users/me",
json={
"name": "user",
"email": "user@ctfd.io",
"email": "user@examplectf.com",
"password": "password",
"confirm": "password",
"country": "US",
@@ -412,7 +444,7 @@ def test_api_admin_user_patch_me_logged_in():
user = Users.query.filter_by(id=1).first()
assert user.name == "user"
assert user.email == "user@ctfd.io"
assert user.email == "user@examplectf.com"
destroy_ctfd(app)
@@ -571,8 +603,8 @@ def test_api_user_get_solves_after_freze_time():
"""Can a user get /api/v1/users/<user_id>/solves after freeze time"""
app = create_ctfd(user_mode="users")
with app.app_context():
register_user(app, name="user1", email="user1@ctfd.io")
register_user(app, name="user2", email="user2@ctfd.io")
register_user(app, name="user1", email="user1@examplectf.com")
register_user(app, name="user2", email="user2@examplectf.com")
# Friday, October 6, 2017 12:00:00 AM GMT-04:00 DST
set_config("freeze", "1507262400")
@@ -646,8 +678,8 @@ def test_api_user_get_fails_after_freze_time():
"""Can a user get /api/v1/users/<user_id>/fails after freeze time"""
app = create_ctfd(user_mode="users")
with app.app_context():
register_user(app, name="user1", email="user1@ctfd.io")
register_user(app, name="user2", email="user2@ctfd.io")
register_user(app, name="user1", email="user1@examplectf.com")
register_user(app, name="user2", email="user2@examplectf.com")
# Friday, October 6, 2017 12:00:00 AM GMT-04:00 DST
set_config("freeze", "1507262400")
@@ -718,8 +750,8 @@ def test_api_user_get_awards_after_freze_time():
"""Can a user get /api/v1/users/<user_id>/awards after freeze time"""
app = create_ctfd(user_mode="users")
with app.app_context():
register_user(app, name="user1", email="user1@ctfd.io")
register_user(app, name="user2", email="user2@ctfd.io")
register_user(app, name="user1", email="user1@examplectf.com")
register_user(app, name="user2", email="user2@examplectf.com")
# Friday, October 6, 2017 12:00:00 AM GMT-04:00 DST
set_config("freeze", "1507262400")
@@ -757,8 +789,10 @@ def test_api_accessing_hidden_users():
"""Hidden users should not be visible to normal users, only to admins"""
app = create_ctfd()
with app.app_context():
register_user(app, name="visible_user", email="visible_user@ctfd.io")
register_user(app, name="hidden_user", email="hidden_user@ctfd.io") # ID 3
register_user(app, name="visible_user", email="visible_user@examplectf.com")
register_user(
app, name="hidden_user", email="hidden_user@examplectf.com"
) # ID 3
user = Users.query.filter_by(name="hidden_user").first()
user.hidden = True
app.db.session.commit()
@@ -788,8 +822,10 @@ def test_api_accessing_banned_users():
"""Banned users should not be visible to normal users, only to admins"""
app = create_ctfd()
with app.app_context():
register_user(app, name="visible_user", email="visible_user@ctfd.io")
register_user(app, name="banned_user", email="banned_user@ctfd.io") # ID 3
register_user(app, name="visible_user", email="visible_user@examplectf.com")
register_user(
app, name="banned_user", email="banned_user@examplectf.com"
) # ID 3
user = Users.query.filter_by(name="banned_user").first()
user.banned = True
app.db.session.commit()
@@ -866,8 +902,8 @@ def test_api_user_get_schema():
"""Can a user get /api/v1/users/<user_id> doesn't return unnecessary data"""
app = create_ctfd()
with app.app_context():
register_user(app, name="user1", email="user1@ctfd.io") # ID 2
register_user(app, name="user2", email="user2@ctfd.io") # ID 3
register_user(app, name="user1", email="user1@examplectf.com") # ID 2
register_user(app, name="user2", email="user2@examplectf.com") # ID 3
with app.test_client() as client:
r = client.get("/api/v1/users/3")

View File

@@ -106,7 +106,7 @@ def test_api_challenge_list_verified_emails():
gen_user(
app.db,
name="user_name",
email="verified_user@ctfd.io",
email="verified_user@examplectf.com",
password="password",
verified=True,
)
@@ -209,7 +209,7 @@ def test_api_challenge_verified_emails():
gen_user(
app.db,
name="user_name",
email="verified_user@ctfd.io",
email="verified_user@examplectf.com",
password="password",
verified=True,
)
@@ -333,7 +333,7 @@ def test_api_challenge_solves_verified_emails():
gen_user(
app.db,
name="user_name",
email="verified_user@ctfd.io",
email="verified_user@examplectf.com",
password="password",
verified=True,
)

View File

@@ -123,7 +123,7 @@ def test_users_dont_prevent_other_users_from_unlocking_hints():
chal = gen_challenge(app.db)
gen_hint(app.db, chal.id, content="This is a hint", cost=1, type="standard")
register_user(app)
register_user(app, name="user2", email="user2@ctfd.io")
register_user(app, name="user2", email="user2@examplectf.com")
# Give users points with an award
gen_award(app.db, user_id=2)