impr: Change emoji validation

ctfd/requirements.txt

@@ -4,6 +4,7 @@ pyyaml==6.0.2
 schema==0.7.5
 bleach==6.1.0
 bleach[css]==6.1.0
+emoji==2.10.0
 ipython==8.16.1
 flask-shell-ipython==0.5.1
 sshpubkeys==3.3.1

dojo_plugin/utils/dojo.py

@@ -11,6 +11,7 @@
 import urllib.request
 import base64
 import logging
+import emoji
 
 import yaml
 import requests
@@ -59,7 +60,7 @@
 
     Optional("type"): ID_REGEX,
     Optional("award"): {
-        Optional("emoji"): Regex(r"^\S$"),
+        Optional("emoji"): emoji.is_emoji,
         Optional("belt"): IMAGE_REGEX
     },
 

test/conftest.py

@@ -35,16 +35,19 @@ def random_user_session(random_user):
 
 
 @pytest.fixture
-def completionist_user(simple_award_dojo):
+def completionist_user(simple_award_dojo, advanced_award_dojo):
     random_id = "".join(random.choices(string.ascii_lowercase, k=16))
     session = login(random_id, random_id, register=True)
 
-    response = session.get(f"{DOJO_URL}/dojo/{simple_award_dojo}/join/")
-    assert response.status_code == 200
-    for module, challenge in [ ("hello", "apple"), ("hello", "banana") ]:
-        start_challenge(simple_award_dojo, module, challenge, session=session)
-        solve_challenge(simple_award_dojo, module, challenge, session=session, user=random_id)
+    award_dojos = [simple_award_dojo, advanced_award_dojo]
 
+    for award_dojo in award_dojos:
+        response = session.get(f"{DOJO_URL}/dojo/{award_dojo}/join/")
+        assert response.status_code == 200
+        for module, challenge in [ ("hello", "apple"), ("hello", "banana") ]:
+            start_challenge(award_dojo, module, challenge, session=session)
+            solve_challenge(award_dojo, module, challenge, session=session, user=random_id)
+
     yield random_id, session
 
 
@@ -88,6 +91,10 @@ def example_import_dojo(admin_session, example_dojo):
 def simple_award_dojo(admin_session):
     return create_dojo_yml(open(TEST_DOJOS_LOCATION / "simple_award_dojo.yml").read(), session=admin_session)
 
+@pytest.fixture
+def advanced_award_dojo(admin_session):
+    return create_dojo_yml(open(TEST_DOJOS_LOCATION / "advanced_award_dojo.yml").read(), session=admin_session)
+
 @pytest.fixture(scope="session")
 def no_practice_challenge_dojo(admin_session, example_dojo):
     return create_dojo_yml(open(TEST_DOJOS_LOCATION / "no_practice_challenge.yml").read(), session=admin_session)

test/dojos/advanced_award_dojo.yml

@@ -0,0 +1,20 @@
+id: advanced-award
+type: public
+award:
+  emoji: 🐻‍❄️
+modules:
+  - id: hello
+    challenges:
+      - id: apple
+      - id: banana
+files:
+  - type: text
+    path: hello/apple/src
+    content: |
+      #!/opt/pwn.college/bash
+      cat /flag
+  - type: text
+    path: hello/banana/src
+    content: |
+      #!/opt/pwn.college/bash
+      cat /flag

test/test_dojos.py

@@ -63,14 +63,15 @@ def test_promote_dojo_member(admin_session, guest_dojo_admin, example_dojo):
     assert random_user_name in response.text and response.text.index("Members") > response.text.index(random_user_name)
 
 
-def test_dojo_completion_emoji(simple_award_dojo, completionist_user):
+def test_dojo_completion_emoji(simple_award_dojo, advanced_award_dojo, completionist_user):
     user_name, session = completionist_user
 
-    scoreboard = session.get(f"{DOJO_URL}/pwncollege_api/v1/scoreboard/{simple_award_dojo}/_/0/1").json()
-    us = next(u for u in scoreboard["standings"] if u["name"] == user_name)
-    assert us["solves"] == 2
-    assert len(us["badges"]) == 1
-
+    award_dojos = [simple_award_dojo, advanced_award_dojo]
+    for award_dojo in award_dojos:
+        scoreboard = session.get(f"{DOJO_URL}/pwncollege_api/v1/scoreboard/{award_dojo}/_/0/1").json()
+        us = next(u for u in scoreboard["standings"] if u["name"] == user_name)
+        assert us["solves"] == 2
+        assert len(us["badges"]) == 2
 
 def test_no_practice(no_practice_challenge_dojo, no_practice_dojo, random_user_session):
     for dojo in [ no_practice_challenge_dojo, no_practice_dojo ]:
@@ -98,36 +99,41 @@ def test_no_import(no_import_challenge_dojo, admin_session):
         raise AssertionError("forbidden-import dojo creation should have failed, but it succeeded")
 
 
-def test_prune_dojo_emoji(simple_award_dojo, admin_session, completionist_user):
+def test_prune_dojo_emoji(simple_award_dojo, advanced_award_dojo, admin_session, completionist_user):
     user_name, _ = completionist_user
-    db_sql(f"DELETE FROM submissions WHERE id IN (SELECT id FROM submissions WHERE user_id={get_user_id(user_name)} ORDER BY id DESC LIMIT 1)")
-
-    response = admin_session.post(f"{DOJO_URL}/pwncollege_api/v1/dojos/{simple_award_dojo}/awards/prune", json={})
-    assert response.status_code == 200
-
-    scoreboard = admin_session.get(f"{DOJO_URL}/pwncollege_api/v1/scoreboard/{simple_award_dojo}/_/0/1").json()
-    us = next(u for u in scoreboard["standings"] if u["name"] == user_name)
-    assert us["solves"] == 1
-    assert len(us["badges"]) == 1
-    assert us["badges"][0]["stale"] == True
+
+    award_dojos = [simple_award_dojo, advanced_award_dojo]
+    for award_dojo in award_dojos:
+        db_sql(f"DELETE FROM submissions WHERE id IN (SELECT id FROM submissions WHERE user_id={get_user_id(user_name)} ORDER BY id DESC LIMIT 1)")
+        response = admin_session.post(f"{DOJO_URL}/pwncollege_api/v1/dojos/{award_dojo}/awards/prune", json={})
+        assert response.status_code == 200
+
+        scoreboard = admin_session.get(f"{DOJO_URL}/pwncollege_api/v1/scoreboard/{award_dojo}/_/0/1").json()
+        us = next(u for u in scoreboard["standings"] if u["name"] == user_name)
+
+        assert us["solves"] == 2
+        assert len(us["badges"]) == 2
+        assert us["badges"][0]["stale"] == True
 
 
-def test_dojo_removes_emoji(simple_award_dojo, admin_session, completionist_user):
+def test_dojo_removes_emoji(simple_award_dojo, advanced_award_dojo, admin_session, completionist_user):
     user_name, _ = completionist_user
 
-    scoreboard = admin_session.get(f"{DOJO_URL}/pwncollege_api/v1/scoreboard/{simple_award_dojo}/_/0/1").json()
-    us = next(u for u in scoreboard["standings"] if u["name"] == user_name)
-    assert us["solves"] == 2
-    assert len(us["badges"]) == 1
-    assert us["badges"][0]["stale"] == False
-
-    dojo_id = simple_award_dojo.split("~")[1]
-    db_sql(f"UPDATE dojos SET data = data - 'award' || jsonb_build_object('award', jsonb_build_object('belt', 'orange')) WHERE dojo_id = x'{dojo_id}'::int")
-
-    scoreboard = admin_session.get(f"{DOJO_URL}/pwncollege_api/v1/scoreboard/{simple_award_dojo}/_/0/1").json()
-    us = next(u for u in scoreboard["standings"] if u["name"] == user_name)
-    assert us["solves"] == 2
-    assert len(us["badges"]) == 0
+    award_dojos = [simple_award_dojo, advanced_award_dojo]
+    for award_dojo in award_dojos:
+        scoreboard = admin_session.get(f"{DOJO_URL}/pwncollege_api/v1/scoreboard/{award_dojo}/_/0/1").json()
+        us = next(u for u in scoreboard["standings"] if u["name"] == user_name)
+        assert us["solves"] == 2
+        assert len(us["badges"]) == 2
+        assert us["badges"][0]["stale"] == False
+
+        dojo_id = award_dojo.split("~")[1]
+        db_sql(f"UPDATE dojos SET data = data - 'award' || jsonb_build_object('award', jsonb_build_object('belt', 'orange')) WHERE dojo_id = x'{dojo_id}'::int")
+
+        scoreboard = admin_session.get(f"{DOJO_URL}/pwncollege_api/v1/scoreboard/{award_dojo}/_/0/1").json()
+        us = next(u for u in scoreboard["standings"] if u["name"] == user_name)
+        assert us["solves"] == 2
+        assert len(us["badges"]) == 0
 
 
 def test_lfs(lfs_dojo, random_user_name, random_user_session):

test/test_feed.py

@@ -28,7 +28,7 @@ def challenge_start(browser, idx):
     time.sleep(1)
 
 
-def test_feed_shows_all_events(welcome_dojo, simple_award_dojo, random_user_name, random_user_session):
+def test_feed_shows_all_events(welcome_dojo, simple_award_dojo, advanced_award_dojo, random_user_name, random_user_session):
     watcher_options = FirefoxOptions()
     watcher_options.add_argument("--headless")
     watcher = Firefox(options=watcher_options)
@@ -92,6 +92,12 @@ def test_feed_shows_all_events(welcome_dojo, simple_award_dojo, random_user_name
         solve_challenge(simple_award_dojo, "hello", "apple", session=random_user_session, user=random_user_name)
         start_challenge(simple_award_dojo, "hello", "banana", session=random_user_session)
         solve_challenge(simple_award_dojo, "hello", "banana", session=random_user_session, user=random_user_name)
+
+        random_user_session.get(f"{DOJO_URL}/dojo/{advanced_award_dojo}/join/")
+        start_challenge(advanced_award_dojo, "hello", "apple", session=random_user_session)
+        solve_challenge(advanced_award_dojo, "hello", "apple", session=random_user_session, user=random_user_name)
+        start_challenge(advanced_award_dojo, "hello", "banana", session=random_user_session)
+        solve_challenge(advanced_award_dojo, "hello", "banana", session=random_user_session, user=random_user_name)
         time.sleep(1)
         events_with_emoji = watcher.find_element(By.ID, "events-list").find_elements(By.CLASS_NAME, "event-card")