diff --git a/fet2020/minecraft/admin.py b/fet2020/minecraft/admin.py deleted file mode 100644 index e69de29b..00000000 diff --git a/fet2020/minecraft/apps.py b/fet2020/minecraft/apps.py deleted file mode 100644 index e69de29b..00000000 diff --git a/fet2020/minecraft/views.py b/fet2020/minecraft/views.py index f7b3d3ff..cee1ff47 100644 --- a/fet2020/minecraft/views.py +++ b/fet2020/minecraft/views.py @@ -1,8 +1,9 @@ import logging -from django.shortcuts import render -from authentications.decorators import authenticated_user -from django.conf import settings +from django.conf import settings +from django.shortcuts import render + +from authentications.decorators import authenticated_user logger = logging.getLogger(__name__) @@ -10,21 +11,18 @@ logger = logging.getLogger(__name__) # Function that generates a token depending on unsername and masterpassword # The masterpassword must be 32 characters long! def create_token(username, masterpassword): - - padded_username = username.ljust(32, ':') - + padded_username = username.ljust(32, ":") token = bytearray() + # xor connect with masterpassword to create token for i in range(32): token.append(ord(padded_username[i]) ^ ord(masterpassword[i])) - str_token = token.hex() - return str_token + return token.hex() @authenticated_user def index(request): - username = request.user context = { "mctoken": "", "valid_master_pwd": True @@ -36,7 +34,7 @@ def index(request): context["valid_master_pwd"] = False logger.error("Masterpassword must be 32 characters long") else: - token = create_token(str(username), masterpassword) + token = create_token(str(request.user), masterpassword) context["mctoken"] = token return render(request, "minecraft/index.html", context) diff --git a/fet2020/templates/minecraft/index.html b/fet2020/templates/minecraft/index.html index 4ee29a09..1cd4c3c5 100644 --- a/fet2020/templates/minecraft/index.html +++ b/fet2020/templates/minecraft/index.html @@ -6,16 +6,18 @@ {% block content %}
-
-

Minecraft

+
+

Minecraft

- {% if valid_master_pwd %} -

Dein persömlicher Token für den Minecraft-Server:

-

{{ mctoken }}

- {% else %} -

Ups... Das hat nicht geklappt!

-

Bitte informiere einen Admin!

- {% endif %} -
+
+ + {% if not valid_master_pwd %} +

Dein persönlicher Token für den Minecraft-Server: {{ mctoken }}

+ {% else %} +

Ups... Das hat nicht geklappt! Bitte informiere einen Admin!

+ {% endif %} + +
+
-{% endblock %} +{% endblock content %}