diff --git a/Frontend/Frontend/settings.py b/Frontend/Frontend/settings.py index 933bc67..ce8cd23 100644 --- a/Frontend/Frontend/settings.py +++ b/Frontend/Frontend/settings.py @@ -48,6 +48,7 @@ 'django.contrib.messages', 'django.contrib.staticfiles', 'app.apps.AppConfig', + 'datetimepicker', ] MIDDLEWARE = [ diff --git a/Frontend/Frontend/urls.py b/Frontend/Frontend/urls.py index e776a1b..03c6536 100644 --- a/Frontend/Frontend/urls.py +++ b/Frontend/Frontend/urls.py @@ -19,7 +19,10 @@ from app.views import profile, home, checkTests, checkTestInfo, editProfile, updateProfile, \ createUser, userCreation, validateUser, saveUser, rankUp, listUsers, editUser, processUser, \ - searchUser, networkStatus, processNode, searchTest, calendar, registerTest, checkTestInfoAdmin, checkTestsAdmin, searchTestAdmin + searchUser, networkStatus, processNode, searchTest, calendar, registerTest, checkTestInfoAdmin, \ + checkTestsAdmin, searchTestAdmin, createAcessPoint, processAP, registerTestSave + + urlpatterns = [ path('admin/', admin.site.urls), @@ -46,6 +49,9 @@ path('create/user/validate/save/', saveUser, name="savepassword"), path('network/status/', networkStatus, name="networkstatus"), path('network/status/', processNode, name="nodestatus"), + path('network/create/AP', createAcessPoint, name="createap"), + path('network/create/AP/save', processAP, name="saveap"), path('calendar/', calendar, name='calendar'), - path('calendar/test', registerTest, name='registertest') + path('calendar/test', registerTest, name='registertest'), + path('calendar/test/save', registerTestSave, name='registertestsave') ] diff --git a/Frontend/app/forms.py b/Frontend/app/forms.py new file mode 100644 index 0000000..99c495b --- /dev/null +++ b/Frontend/app/forms.py @@ -0,0 +1,4 @@ +from django import forms + + + diff --git a/Frontend/app/templates/calendar/calendar.html b/Frontend/app/templates/calendar/calendar.html index e00eb0f..7eeb4ad 100644 --- a/Frontend/app/templates/calendar/calendar.html +++ b/Frontend/app/templates/calendar/calendar.html @@ -11,47 +11,21 @@


- Register Test -
+
diff --git a/Frontend/app/templates/calendar/registerTest.html b/Frontend/app/templates/calendar/registerTest.html index 8bdab66..f642fb4 100644 --- a/Frontend/app/templates/calendar/registerTest.html +++ b/Frontend/app/templates/calendar/registerTest.html @@ -1,9 +1,14 @@ {% extends 'structure/layout.html' %} -{% block headers %} -{% endblock %} - {% block content %} + + {% if messages %} + {% for message in messages %} + {% if message.tags %} + {% endif %} + {% endfor %} + {% endif %} +
+ placeholder="Nome" class="form-control input-lg" value="{{ name }}" required>
@@ -23,10 +28,7 @@
- - +
@@ -34,10 +36,7 @@
- - +
@@ -50,13 +49,4 @@ - - - - - {% endblock %} \ No newline at end of file diff --git a/Frontend/app/templates/network/create/AP.html b/Frontend/app/templates/network/create/AP.html new file mode 100644 index 0000000..7ec5428 --- /dev/null +++ b/Frontend/app/templates/network/create/AP.html @@ -0,0 +1,93 @@ +{% extends 'structure/layout.html' %} + +{% block content %} +
+
+
+ {% csrf_token %} +
+
+ +
+
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/Frontend/app/templates/network/nodeInfo.html b/Frontend/app/templates/network/nodeInfo.html index 1e2c6f0..c812019 100644 --- a/Frontend/app/templates/network/nodeInfo.html +++ b/Frontend/app/templates/network/nodeInfo.html @@ -14,6 +14,13 @@ {% endblock %} {% block content %} + {% if messages %} + {% for message in messages %} + {% if message.tags %} + {% endif %} + {% endfor %} + {% endif %} +

{{ hostname }} - Information

@@ -27,11 +34,16 @@

{{ hostname }} - Information

Netmask Peer MAC - {% if i.ip == '127.0.0.1' %} {% else %} - Abrir Terminal{% endif %} + {% if access == 1 %} + {% if i.ip == '127.0.0.1' %} {% else %} + {% if role == 1 %} + Abrir Terminal + {% else %} {% endif %} + {% endif %} + {% endif %} @@ -51,6 +63,30 @@

{{ hostname }} - Information

{% endfor %} - + {% if ongoing == 1 %} + {% if access == 1 %} + {% if isAdmin == 1 %} +
OBS: there is on ongoing test. you can interact with this node using your admin + permissions.
+ {% endif %} + {% else %} + {% if role == 0 %} +
OBS: there is on ongoing test! you can't interact with this node because you + are a beginner.
+ {% endif %} + {% endif %} + {% else %} + {% if isAdmin == 1 %} +
OBS: there is on ongoing test you can interact with this node using your admin + permissions.
+ {% else %} +
OBS: there is no on ongoing test! +
+
To interact with this node please book an experience.
+ {% endif %} + {% endif %} + {% if access == 1 %} + Create Access Point + {% endif %}
{% endblock %} \ No newline at end of file diff --git a/Frontend/app/templates/structure/layout.html b/Frontend/app/templates/structure/layout.html index 81c9ec8..6ad25b3 100644 --- a/Frontend/app/templates/structure/layout.html +++ b/Frontend/app/templates/structure/layout.html @@ -38,12 +38,13 @@ {% if request.resolver_match.url_name == 'search' %} class="nav-item active" {% else %} class="nav-item" {% endif %}> {% if request.user.is_authenticated %} -
  • - Config Test + {% endif %}> + Network Status
  • diff --git a/Frontend/app/templates/user/admin/listUsers/list/allUsers.html b/Frontend/app/templates/user/admin/listUsers/list/allUsers.html index 17a2ad7..309fee1 100644 --- a/Frontend/app/templates/user/admin/listUsers/list/allUsers.html +++ b/Frontend/app/templates/user/admin/listUsers/list/allUsers.html @@ -60,8 +60,7 @@ - - + diff --git a/Frontend/app/templates/user/nonAdmin/tests/previousTests/dashboard.html b/Frontend/app/templates/user/nonAdmin/tests/previousTests/dashboard.html index fdbbe1c..c42d9eb 100644 --- a/Frontend/app/templates/user/nonAdmin/tests/previousTests/dashboard.html +++ b/Frontend/app/templates/user/nonAdmin/tests/previousTests/dashboard.html @@ -56,7 +56,7 @@ - + diff --git a/Frontend/app/tools/tokenizer.py b/Frontend/app/tools/tokenizer.py index 9c67861..ef644a3 100644 --- a/Frontend/app/tools/tokenizer.py +++ b/Frontend/app/tools/tokenizer.py @@ -41,7 +41,8 @@ def checkToken(self, token): try: decoded = jwtManager.decode(message=token, key=public_key) return decoded['email'] - except: + except Exception as e: + print(e) return None def userToken(self, email): diff --git a/Frontend/app/views.py b/Frontend/app/views.py index a768ea7..a3903e3 100644 --- a/Frontend/app/views.py +++ b/Frontend/app/views.py @@ -318,7 +318,6 @@ def userCreation(request): def validateUser(request, token): if not request.user.is_authenticated: email = tokenizer.checkToken(token) - if email == None: return HttpResponseForbidden() tparms = { @@ -516,11 +515,28 @@ def processNode(request, nodeID): token = tokenizer.nodeToken(request.user.email) r = requests.get(API + "node/" + str(nodeID), headers={'Authorization': 'Bearer ' + token}) + if r.status_code != 200: return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) json = r.json() + token = tokenizer.gerateEmailToken(request.user.email) + r = requests.get(API + "profile", headers={'Authorization': 'Bearer ' + token}) + if r.status_code != 200: + return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) + + role = r.json() + + token = tokenizer.nodeToken(request.user.email) + r = requests.get(API + "experience/now", headers={'Authorization': 'Bearer ' + token}) + if r.status_code != 200: + return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) + + ongoing = r.json() + + ongoing = ongoing['current_experience'] + password = b64encode(b'amazing') hostname = json['hostname'] @@ -536,9 +552,25 @@ def processNode(request, nodeID): lista.append(dic) dic = {} + try: + uEmail = ongoing['email'] + except: + uEmail = None + + if request.user.is_superuser or uEmail == request.user.email: + access = 1 + else: + access = 0 + + isAdmin = 0 + if request.user.is_superuser: isAdmin = 1 + tparms = { 'current_time': str(datetime.now()), 'year': datetime.now().year, + 'role': role['role'], + 'isAdmin' : isAdmin, + 'access' : access, 'database' : lista, 'hostname': hostname, 'username': 'amazing', @@ -585,21 +617,6 @@ def searchTest(request): else: return redirect('login') - -def calendar(request): - if request.user.is_authenticated: - return render(request, 'calendar/calendar.html') - else: - return redirect('login') - - -def registerTest(request): - if request.user.is_authenticated: - return render(request, 'calendar/registerTest.html') - else: - return redirect('login') - - # API def checkTestsAdmin(request): """ @@ -712,3 +729,150 @@ def searchTestAdmin(request): return HttpResponseForbidden() else: return redirect('login') + +def createAcessPoint(request): + if request.user.is_authenticated: + token = tokenizer.nodeToken(request.user.email) + r = requests.get(API + "experience/now", headers={'Authorization': 'Bearer ' + token}) + if r.status_code != 200: + return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) + + ongoing = r.json() + + ongoing = ongoing['current_experience'] + + try: + uEmail = ongoing['email'] + except: + uEmail = None + + if request.user.is_superuser or uEmail == request.user.email: + access = 1 + else: + access = 0 + + if access == 0: + return HttpResponseForbidden("No access") + + return render(request, "network/create/AP.html") + + else: + return redirect('login') + +def processAP(request): + if request.user.is_authenticated: + token = tokenizer.nodeToken(request.user.email) + r = requests.get(API + "experience/now", headers={'Authorization': 'Bearer ' + token}) + if r.status_code != 200: + return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) + + ongoing = r.json() + + ongoing = ongoing['current_experience'] + + try: + uEmail = ongoing['email'] + except: + uEmail = None + + if request.user.is_superuser or uEmail == request.user.email: + access = 1 + else: + access = 0 + + if access == 0: + return HttpResponseForbidden("No access") + + try: + APSSID = request.POST['APSSID'] + APPW = request.POST['APPW'] + Channel = request.POST['Channel'] + RangeStart = request.POST['RangeStart'] + RangeEnd = request.POST['RangeEnd'] + hw_mode = request.POST['hw_mode'] + DFGateway = request.POST['DFGateway'] + Netmask = request.POST['Netmask'] + except Exception as e: + print(e) + return redirect('networkstatus') + + msg = { + 'APSSID' : APSSID, + 'APPW': APPW, + 'Channel' : Channel, + 'RangeStart' : RangeStart, + 'RangeEnd' : RangeEnd, + 'hw_mode' : hw_mode, + 'DFGateway' : DFGateway, + 'Netmask': Netmask + } + + r = requests.post(API + "createAP", json=msg) + + if r.status_code != 200: + messages.error(request, "Something went wrong.") + return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) + + return redirect('networkstatus') + else: + return redirect('login') + + +def registerTest(request): + if request.user.is_authenticated: + return render(request, 'calendar/registerTest.html') + else: + return redirect('login') + + +def registerTestSave(request): + if request.user.is_authenticated: + + try: + name = request.POST['name'] + begin_date = request.POST['start_time'] + end_date = request.POST['end_time'] + except Exception as e: + print(e) + messages.error(request, 'Something went wrong') + return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) + + token = tokenizer.nodeToken(request.user.email) + message = {'name': name, 'begin_date': begin_date, 'end_date': end_date} + + r = requests.post(API + "experience", json=message, headers={'Authorization': 'Bearer ' + token}) + + if r.status_code != 201: + messages.error(request, 'Something went wrong') + return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) + + return redirect('calendar/calendar.html') + + else: + return redirect('login') + + +def calendar(request): + if request.user.is_authenticated: + + token = tokenizer.gerateEmailToken(request.user.email) + + r = requests.get(API + "experience", headers={'Authorization': 'Bearer ' + token}) + + if r.status_code != 200: + messages.error(request, 'Something went wrong') + return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) + + test_info = r.json() + + tests = [] + + for test in test_info: + t_id = test['id'] + name = test['author'] + ' - ' + test['name'] + data = test['begin_date'] + tests.append({'name': name, 'date': data, 'id': str(t_id), 'type': 'event'}) + print(tests) + return render(request, 'calendar/calendar.html', {'database': tests}) + else: + return redirect('login') \ No newline at end of file diff --git a/Frontend/requirements.txt b/Frontend/requirements.txt index bd88385..04d2382 100644 --- a/Frontend/requirements.txt +++ b/Frontend/requirements.txt @@ -5,7 +5,7 @@ cffi==1.14.0 chardet==3.0.4 cryptography==2.8 Django==3.0.4 -django-bootstrap-datepicker-plus==3.0.5 +django-datetimepicker==3.14 django-fileprovider==0.1.4 django-private-files==1.0.1 django-private-storage==2.2.2