From ff657c070a6869cf95955952b828156b4d7470a8 Mon Sep 17 00:00:00 2001 From: Arthur-TRT Date: Mon, 30 May 2022 10:25:18 +0200 Subject: [PATCH 1/4] Limit events to certain campus --- src/events/migrations/0010_event_campus.py | 19 +++++++++ .../migrations/0011_alter_event_campus.py | 19 +++++++++ src/events/models.py | 5 ++- src/events/templates/events/event_pwd.html | 42 +++++++++++++------ src/events/views/events.py | 24 ++++++++--- 5 files changed, 89 insertions(+), 20 deletions(-) create mode 100644 src/events/migrations/0010_event_campus.py create mode 100644 src/events/migrations/0011_alter_event_campus.py diff --git a/src/events/migrations/0010_event_campus.py b/src/events/migrations/0010_event_campus.py new file mode 100644 index 0000000..9914495 --- /dev/null +++ b/src/events/migrations/0010_event_campus.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.11 on 2022-05-30 07:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('accounts', '0011_migration_campus'), + ('events', '0009_auto_20220215_1706'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='campus', + field=models.ManyToManyField(blank=True, null=True, to='accounts.Campus'), + ), + ] diff --git a/src/events/migrations/0011_alter_event_campus.py b/src/events/migrations/0011_alter_event_campus.py new file mode 100644 index 0000000..2c89d81 --- /dev/null +++ b/src/events/migrations/0011_alter_event_campus.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.11 on 2022-05-30 07:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('accounts', '0011_migration_campus'), + ('events', '0010_event_campus'), + ] + + operations = [ + migrations.AlterField( + model_name='event', + name='campus', + field=models.ManyToManyField(blank=True, to='accounts.Campus'), + ), + ] diff --git a/src/events/models.py b/src/events/models.py index 6b8b0b0..20adb61 100644 --- a/src/events/models.py +++ b/src/events/models.py @@ -2,6 +2,8 @@ from django.db import models from django.contrib.auth.models import User from django.contrib.auth.models import timezone import uuid +from accounts.models import Campus +from scoreboard.views import campus # Create your models here. class Event(models.Model): @@ -17,6 +19,7 @@ class Event(models.Model): team_size = models.PositiveIntegerField(default=1) auto_match = models.BooleanField(default=False) dynamic = models.BooleanField(default=False) + campus = models.ManyToManyField(Campus, blank=True) def __str__(self): return self.name @@ -28,7 +31,7 @@ class Team(models.Model): last_submission_date = models.DateTimeField('Last Submission Date', default=timezone.now) auto = models.BooleanField(default=False) def __str__(self): - return self.name + return self.name class EventPlayer(models.Model): user = models.ForeignKey(User, on_delete=models.CASCADE) diff --git a/src/events/templates/events/event_pwd.html b/src/events/templates/events/event_pwd.html index 63987d6..9528e6d 100644 --- a/src/events/templates/events/event_pwd.html +++ b/src/events/templates/events/event_pwd.html @@ -8,22 +8,38 @@

{{ event.name }}

{% trans "This event start at" %} : {{ event.start_date }} - +
{% if logged == True %} - {% if wrongpwd == True %} - {% trans "Wrong password submited." %} + {% if userHasCampus == False %} + + {% trans "This event is reserved for one or more 42 campuses. If you have not connected your intranet to 42CTF, you can do so with this button: " %} +
+ {%csrf_token%} + +
+ {% endif %} - {% if alreadyregistered == True %} - {% trans "You're already registered to this event." %} + {% if campusCanJoin == False %} + + {% trans "This event is reserved for one or more 42 campuses. And unfortunately your campus can't participate. Do not hesitate to contact us to organize an event on your campus!" %} + + {% endif %} + {% if userHasCampus == True and campusCanJoin == True %} + {% if wrongpwd == True %} + {% trans "Wrong password submited." %} + {% endif %} + {% if alreadyregistered == True %} + {% trans "You're already registered to this event." %} + {% endif %} +

{% trans "This event is password protected" %}

+ {% trans "You need to submit the event password to gain access to this event." %} +
+ {% csrf_token %} + + +
{% endif %} -

{% trans "This event is password protected" %}

- {% trans "You need to submit the event password to gain access to this event." %} -
- {% csrf_token %} - - -
{% else %}

{% trans "You need to be logged to access this event." %}

{% endif %} @@ -35,7 +51,7 @@
  • {{ event.name }}
  • {% trans "Starts at" %} : {{ event.start_date | date:'H:i d-m-y'}}
  • {% trans "Ends at" %} : {{ event.end_date | date:'H:i d-m-y'}}
    • - +
    diff --git a/src/events/views/events.py b/src/events/views/events.py index 204e744..063e381 100644 --- a/src/events/views/events.py +++ b/src/events/views/events.py @@ -1,9 +1,11 @@ +from pprint import pprint from django.shortcuts import render, get_object_or_404, redirect from django.contrib.auth.decorators import login_required from django.contrib.auth.models import timezone from ..forms import submit_flag from ..models import Event, EventPlayer, Team from ctfs.models import CTF, CTF_flags, Category +from accounts.models import UserProfileInfo from django.utils.translation import get_language from django.contrib.auth.models import User from django.utils.translation import gettext_lazy as _ @@ -113,9 +115,19 @@ def event(request, event_slug): if request.user.is_authenticated: if request.user.is_staff is False: if not player: - return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered}) + return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True}) else: - return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered}) + return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True}) + if event_info.campus.all(): + if request.user.is_authenticated: + if request.user.is_staff is False: + user = UserProfileInfo.objects.get(user=request.user) + if user.campus is None: + return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': False, 'campusCanJoin': True}) + elif user.campus not in event_info.campus.all(): + return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': False}) + else: + return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True}) ended = False if timezone.now() >= event_info.end_date: ended = True @@ -127,7 +139,7 @@ def event(request, event_slug): solved_list = EventPlayer.objects.filter(event=event_info).order_by('-score', 'last_submission_date', 'user__username') else: solved_list = Team.objects.filter(event=event_info).order_by('-score', 'last_submission_date', 'name') - return render(request, 'events/event_info.html', {'event' : event_info, 'IsRegistered': IsRegistered, 'ctfs': challenges, 'solved_list':solved_list, + return render(request, 'events/event_info.html', {'event' : event_info, 'IsRegistered': IsRegistered, 'ctfs': challenges, 'solved_list':solved_list, 'ended': ended, 'begun': begun, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'subisover': subisover}) @login_required @@ -145,12 +157,12 @@ def submit_event_flag(request, event_slug, chall_slug): if not ctf_info: response['Location'] += '?ChallengeNotFound=1' return response - + try: player = EventPlayer.objects.get(event=ev, user=request.user) except: player = None - + if player: if ev.team_size > 1 and player.team is None: response['Location'] += '?NoTeam=1' @@ -219,7 +231,7 @@ def submit_pwd(request, event_slug): new = EventPlayer(user=request.user, event=ev) new.save() return redirect('events:event_info', event_slug=event_slug) - + @login_required def register_to_event(request, event_slug): -- 2.40.1 From 86fbf93dbf9f5be7b4cdc637bd6ef10a86326cd7 Mon Sep 17 00:00:00 2001 From: Starthur Date: Tue, 31 May 2022 22:13:45 +0200 Subject: [PATCH 2/4] Remove a useless migration --- src/events/migrations/0010_event_campus.py | 2 +- .../migrations/0011_alter_event_campus.py | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 src/events/migrations/0011_alter_event_campus.py diff --git a/src/events/migrations/0010_event_campus.py b/src/events/migrations/0010_event_campus.py index 9914495..d8ef4f2 100644 --- a/src/events/migrations/0010_event_campus.py +++ b/src/events/migrations/0010_event_campus.py @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='event', name='campus', - field=models.ManyToManyField(blank=True, null=True, to='accounts.Campus'), + field=models.ManyToManyField(blank=True, to='accounts.Campus'), ), ] diff --git a/src/events/migrations/0011_alter_event_campus.py b/src/events/migrations/0011_alter_event_campus.py deleted file mode 100644 index 2c89d81..0000000 --- a/src/events/migrations/0011_alter_event_campus.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2.11 on 2022-05-30 07:30 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0011_migration_campus'), - ('events', '0010_event_campus'), - ] - - operations = [ - migrations.AlterField( - model_name='event', - name='campus', - field=models.ManyToManyField(blank=True, to='accounts.Campus'), - ), - ] -- 2.40.1 From d222784bb06b52b1b855f2e24669b25ad87894ca Mon Sep 17 00:00:00 2001 From: Starthur Date: Tue, 31 May 2022 22:13:54 +0200 Subject: [PATCH 3/4] Remove unsued import --- src/events/models.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/events/models.py b/src/events/models.py index 20adb61..12124d2 100644 --- a/src/events/models.py +++ b/src/events/models.py @@ -3,7 +3,6 @@ from django.contrib.auth.models import User from django.contrib.auth.models import timezone import uuid from accounts.models import Campus -from scoreboard.views import campus # Create your models here. class Event(models.Model): -- 2.40.1 From 46ea80161db19de6f3ff7fb9fb292aac3a6cba26 Mon Sep 17 00:00:00 2001 From: Starthur Date: Tue, 31 May 2022 22:14:11 +0200 Subject: [PATCH 4/4] Chack campus before password --- src/events/views/events.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/events/views/events.py b/src/events/views/events.py index 063e381..16b2db4 100644 --- a/src/events/views/events.py +++ b/src/events/views/events.py @@ -1,4 +1,3 @@ -from pprint import pprint from django.shortcuts import render, get_object_or_404, redirect from django.contrib.auth.decorators import login_required from django.contrib.auth.models import timezone @@ -111,13 +110,6 @@ def event(request, event_slug): player = None if player: IsRegistered = True - if event_info.password: - if request.user.is_authenticated: - if request.user.is_staff is False: - if not player: - return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True}) - else: - return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True}) if event_info.campus.all(): if request.user.is_authenticated: if request.user.is_staff is False: @@ -128,6 +120,13 @@ def event(request, event_slug): return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': False}) else: return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True}) + if event_info.password: + if request.user.is_authenticated: + if request.user.is_staff is False: + if not player: + return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True}) + else: + return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True}) ended = False if timezone.now() >= event_info.end_date: ended = True -- 2.40.1