diff --git a/.gitignore b/.gitignore index 78de518..3e787cd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ external-repos/ .env volumes .ruff_cache +.idea/ diff --git a/ctfpad/helpers.py b/ctfpad/helpers.py index 11e1e7d..48a3049 100644 --- a/ctfpad/helpers.py +++ b/ctfpad/helpers.py @@ -209,15 +209,17 @@ def ctftime_get_ctf_logo_url(ctftime_id: int) -> str: str: [description] """ default_logo = f"{STATIC_URL}images/{CTFPAD_DEFAULT_CTF_LOGO}" - try: - ctf_info = ctftime_get_ctf_info(ctftime_id) - logo = ctf_info.setdefault("logo", default_logo) - _, ext = os.path.splitext(logo) - if ext.lower() not in CTFPAD_ACCEPTED_IMAGE_EXTENSIONS: - return default_logo - except ValueError: - logo = default_logo - return logo + if ctftime_id != 0: + try: + ctf_info = ctftime_get_ctf_info(ctftime_id) + logo = ctf_info.setdefault("logo", default_logo) + _, ext = os.path.splitext(logo) + if ext.lower() not in CTFPAD_ACCEPTED_IMAGE_EXTENSIONS: + return default_logo + except ValueError: + logo = default_logo + return logo + return default_logo def send_mail(recipients: list, subject: str, body: str) -> bool: diff --git a/ctfpad/templates/ctfpad/challenges/create.html b/ctfpad/templates/ctfpad/challenges/create.html index 04d0741..fbc6d91 100644 --- a/ctfpad/templates/ctfpad/challenges/create.html +++ b/ctfpad/templates/ctfpad/challenges/create.html @@ -2,199 +2,185 @@ {% block content %} -
- -{% include 'snippets/formerror.html' %} - -
-
- - {% for message in messages %} -

{{ message }}

- {% endfor %} - -
-
-
- {% if form.name.value %} -

Updating Challenge {{ form.name.value }}

- {% else %} -

New Challenge

- {% endif %} -
-
- -
-
- {% csrf_token %} -
-
- - -
-
- - - +
+ + {% include 'snippets/formerror.html' %} + +
+
+ + {% for message in messages %} +

{{ message }}

+ {% endfor %} + +
+
+
+ {% if form.name.value %} +

Updating Challenge {{ form.name.value }}

+ {% else %} +

New Challenge

+ {% endif %} +
+
+ +
+ + {% csrf_token %} +
+
+ + +
+ + + +
- -
- -
-
+ +
+
- -
- -
-
+ +
+
- -
- - - - - -
-
- - - -
- -
- - {%if form.instance.creation_time%} - -
-
- - - -
- -
+ + - {%if form.solvers %} - -
-
+ +
+
- -
- {%endif%} - {%endif%} - {% if form.instance.creation_time %} - -
-
- - - -
- -
- - -
-
- - - -
- -
+ {% if form.instance.creation_time %} + +
+ + + + +
+ + {% if form.solvers %} + +
+ + + + +
+ {% endif %} + {% endif %} - -
-
- - - -
- + {% if form.instance.creation_time %} + +
+ + + + +
+ + +
+ + + + +
+ + +
+ + + + +
+ + +
+ + + + +
+ {% endif %}
- -
-
- - - +
+
+
+ {% if form.instance.creation_time %} + + {% else %} + + {% endif %} + +
- -
- {% endif %} -
- -
-
- {% if form.instance.creation_time %} - - {% else %} - - {% endif %} -
-
- + +
-
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ctfpad/templates/ctfpad/challenges/detail.html b/ctfpad/templates/ctfpad/challenges/detail.html index 82f9540..3be3818 100644 --- a/ctfpad/templates/ctfpad/challenges/detail.html +++ b/ctfpad/templates/ctfpad/challenges/detail.html @@ -1,228 +1,251 @@ -{% extends 'ctfpad/main.html' %} +{% extends 'ctfpad/main.html' %} {% block content %} -
+
-{% include 'snippets/messages.html' %} -{% load ctfpad_filters %} + {% include 'snippets/messages.html' %} + {% load ctfpad_filters %} -
-
-
-
-
- - - + {% endblock %} diff --git a/ctfpad/templates/ctfpad/ctfs/create.html b/ctfpad/templates/ctfpad/ctfs/create.html index 2e899f8..bd1d24f 100644 --- a/ctfpad/templates/ctfpad/ctfs/create.html +++ b/ctfpad/templates/ctfpad/ctfs/create.html @@ -2,213 +2,200 @@ {% block content %} -
- -{% include 'snippets/messages.html' %} - -{% include 'snippets/formerror.html' %} - -
-
-
-
-
- {% if form.instance.creation_time %} -

Updating CTF {{ form.name.value }}

- {% else %} -

New CTF

- {% endif %} -
-
- -
-
- {% csrf_token %} -
-
- - -
-
+
+ + {% include 'snippets/messages.html' %} + + {% include 'snippets/formerror.html' %} + +
+
+
+
+
+ {% if form.instance.creation_time %} +

Updating CTF {{ form.name.value }}

+ {% else %} +

New CTF

+ {% endif %} +
+
+ +
+ + {% csrf_token %} +
+
+ + +
+
- -
- -
-
+ +
+
- -
- -
-
+ +
+
- -
- -
-
+ +
+
- -
- -
-
+ +
+
- -
- -
-
+ +
+
- -
- - -
-
+ +
+
- -
- -
-
+ +
+
- -
- -
-
+ +
+ + +
- - - -
- -
-
+ +
+
- -
- -
-
+ +
+
- + + {% if form.instance.is_finished %} + +
+ + + + +
+ {% endif %}
- {% if form.instance.is_finished %} - -
-
- - - +
+
+
+ {% if form.instance.creation_time %} + + + {% else %} + + {% endif %} + +
- -
- {% endif %} - -
- -
-
- {% if form.instance.creation_time %} - - {% else %} - - {% endif %} -
-
- + +
-
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ctfpad/templates/ctfpad/ctfs/detail.html b/ctfpad/templates/ctfpad/ctfs/detail.html index 93a6289..516be81 100644 --- a/ctfpad/templates/ctfpad/ctfs/detail.html +++ b/ctfpad/templates/ctfpad/ctfs/detail.html @@ -1,96 +1,107 @@ -{% extends 'ctfpad/main.html' %} +{% extends 'ctfpad/main.html' %} {% block content %} -{% include 'ctfpad/ctfs/status.html' %} - -
- -{% include 'snippets/messages.html' %} - -{% load humanize %} -{% load ctfpad_filters %} - -
-
-
{{ctf.name | upper}}
-
-
-
-
- {% if request.user.member.selected_ctf.id == ctf.id %} - - {% else %} - {% if ctf.is_finished %} - - {% else %} -
- {% csrf_token %} - - -
- {% endif %} - {% endif %} -
-
- - Edit CTF - -
-
+ {% include 'ctfpad/ctfs/status.html' %} -
    -
  • -
    -
    - {{ctf.name|lower}} avatar -
    +
    -
    - {% autoescape off %} - {{ctf.description|html_sanitize|truncatewords:25}} - {% endautoescape %} -
    -
    -
    • + {% include 'snippets/messages.html' %} - {% if ctf.team|length > 0 %} -
  • -
    -
    - -
    -
    - {% for member in ctf.team %} - {{member.username}},  - {% endfor %} + {% load humanize %} + {% load ctfpad_filters %} + +
    +
    +
    {{ ctf.name | upper }}
    +
    +
    +
    +
    + {% if request.user.member.selected_ctf.id == ctf.id %} +
    + +
    + {% else %} + {% if ctf.is_finished %} +
    + +
    + {% else %} +
    + {% csrf_token %} + +
    + +
    +
    + {% endif %} + {% endif %} +
    +
    +
    + + Edit CTF +
    -
    • - {% endif %} +
- {% if ctf.team_login %} -
  • -
    -
    - +
      +
    • +
      +
      + {{ ctf.name|lower }} avatar +
      + +
      + {% autoescape off %} + {{ ctf.description|html_sanitize|truncatewords:25 }} + {% endautoescape %} +
      -
      - {{ctf.team_login}} / {{ctf.team_password}} -   - +
      +
      + +
      +
      + {% for member in ctf.team %} + {{ member.username }},  + {% endfor %} +
      +
      +
      • + {% endif %} + + {% if ctf.team_login %} +
    • +
      +
      + +
      +
      + {{ ctf.team_login }} / {{ ctf.team_password }} +   + -
      -
      -
      • - {% endif %} + > +
    +
    +
    • + {% endif %} - {% if not ctf.is_permanent %} -
  • -
    -
    -   -
    + {% if not ctf.is_permanent %} +
  • +
    +
    +   +
    -
    - {{ctf.start_date | date:"Y/m/d H:i"}} -    - {{ctf.end_date | date:"Y/m/d H:i"}} -
    -
    -
    • +
    + {{ ctf.start_date | date:"Y/m/d H:i" }} +    + {{ ctf.end_date | date:"Y/m/d H:i" }} +
    +
    + -
  • -
    -
    - -
    -
    - {{ ctf.duration | naturaltime}} -
    -
    -
    • - {% endif %} +
  • +
    +
    + +
    +
    + {{ ctf.duration | naturaltime }} +
    +
    +
    • + {% endif %} - {% if ctf.flag_prefix %} -
  • -
    -
    - -
    + {% if ctf.flag_prefix %} +
  • +
    +
    + +
    -
    - {{ctf.flag_prefix}} -
    -
    -
    • - {% endif %} +
    + {{ ctf.flag_prefix }} +
    +
    + + {% endif %} -
  • -
    -
    - +
  • +
    +
    + +
    +
    + {{ ctf.weight }}   + {% if ctf.weight <= 10 %} + Casual CTF + {% elif ctf.weight <= 35 %} + Minor CTF + {% elif ctf.weight <= 70 %} + Important CTF + {% elif ctf.weight <= 95 %} + Major CTF + {% elif ctf.weight <= 100 %} + Unmissable CTF + {% endif %} +
    -
    - {{ctf.weight}}   - {% if ctf.weight <= 10 %} - Casual CTF - {% elif ctf.weight <= 35 %} - Minor CTF - {% elif ctf.weight <= 70 %} - Important CTF - {% elif ctf.weight <= 95 %} - Major CTF - {% elif ctf.weight <= 100 %} - Unmissable CTF - {% endif %} -
    -
    • - + -
  • -
    -
    - -
    +
  • +
    +
    + +
    -
    - {% if ctf.url %} - Website  |  - {% endif %} +
    + {% if ctf.url %} + Website  |  + {% endif %} - {% if ctf.ctftime_id %} - CTFTime  |  - {% endif %} + {% if ctf.ctftime_id %} + CTFTime  |  + {% endif %} - - Jitsi  - + + Jitsi  + +
    -
    +
    • + +
    +
    + +
    + -
    -
    -
    - - -
    -
    - {% include 'ctfpad/ctfs/detail_challenges.html' %} -
    -
    - {% include 'ctfpad/ctfs/detail_notes.html' %} -
    -
    - {% include 'ctfpad/stats/ctf_stats.html' %} -
    -
    - {% include 'ctfpad/ctfs/detail_export.html' %} +
    +
    + {% include 'ctfpad/ctfs/detail_challenges.html' %} +
    +
    + {% include 'ctfpad/ctfs/detail_notes.html' %} +
    +
    + {% include 'ctfpad/stats/ctf_stats.html' %} +
    +
    + {% include 'ctfpad/ctfs/detail_export.html' %} +
    -
    -
    - +
    +
    {% endblock %} diff --git a/ctfpad/templates/ctfpad/footer.html b/ctfpad/templates/ctfpad/footer.html index c427cbe..9ffee03 100644 --- a/ctfpad/templates/ctfpad/footer.html +++ b/ctfpad/templates/ctfpad/footer.html @@ -3,7 +3,7 @@
    -
    +
    • Github
    • ⋅
      • @@ -15,16 +15,16 @@

    CTFPad - {% if DEBUG %}{{VERSION}} (DEV) - {%else%}{{VERSION}}{% endif %} + {% if DEBUG %}{{VERSION}} (DEV) + {%else%}{{VERSION}}{% endif %} by hugsy

    -
    +
      {% if request.user.member.team.blog_url %} -
    • +
    • @@ -59,4 +59,4 @@
    -
    \ No newline at end of file + diff --git a/ctfpad/templates/ctfpad/main.html b/ctfpad/templates/ctfpad/main.html index 9e530e3..9201d6a 100644 --- a/ctfpad/templates/ctfpad/main.html +++ b/ctfpad/templates/ctfpad/main.html @@ -1,15 +1,16 @@ -{% load static %}{% load ctfpad_filters %} - - +{% load static %} +{% load ctfpad_filters %} + + CTFPad - - - + + + @@ -27,26 +28,38 @@
    - {% if request.user.is_authenticated %} +{% if request.user.is_authenticated and show_footer %} {% include 'ctfpad/shortcuts.html' %} {% include 'ctfpad/footer.html' %} {% endif %} - - - + + @@ -55,5 +68,4 @@ cursor: pointer; } - diff --git a/ctfpad/templates/ctfpad/navbar.html b/ctfpad/templates/ctfpad/navbar.html index 088ac49..09c0dd9 100644 --- a/ctfpad/templates/ctfpad/navbar.html +++ b/ctfpad/templates/ctfpad/navbar.html @@ -3,84 +3,80 @@
    - -
    - + +
    \ No newline at end of file diff --git a/ctfpad/templates/ctfpad/shortcuts.html b/ctfpad/templates/ctfpad/shortcuts.html index 8c6b5be..d34a1a7 100644 --- a/ctfpad/templates/ctfpad/shortcuts.html +++ b/ctfpad/templates/ctfpad/shortcuts.html @@ -1,8 +1,8 @@ {% load static %} -