From ca230586e98a7f1baa1a71a8b09fd92f0d5355f7 Mon Sep 17 00:00:00 2001 From: Florian N Date: Thu, 13 Feb 2014 16:49:27 -0500 Subject: [PATCH] use login decorators --- db.sqlite3-journal | Bin 0 -> 4640 bytes main/views.py | 10 ++++------ pydash/settings.py | 2 +- usage/views.py | 46 +++++++++++++++------------------------------ 4 files changed, 20 insertions(+), 38 deletions(-) create mode 100644 db.sqlite3-journal diff --git a/db.sqlite3-journal b/db.sqlite3-journal new file mode 100644 index 0000000000000000000000000000000000000000..beee9a05761e6805fa83f3d0ed208384d09084de GIT binary patch literal 4640 zcmeH~%Wqvr9mmhhj^vioiWV=R;>H50ChgTc&TB3NVw{`QiG7P5JANQ=&hwu4`z;kE zsf1X;KY&mW8-$Qh5nVUiE%7bVfd4iBC;o^0JN%#LVEGci#p#aT8XyeDIY@CXevXUoxnUlK6vH(EDefq@ZB-pIoah0hqNo5Iy zvYv%bi&gCUlFa;g;xe2pbm7=m3#*hX-IpL%#I$aR5*ckKWdfYWD#AK<%SM$f;MST~ zz)-h{npI&Ccvax=-0}+&z=c_nIaxkVYn%DwiOX>^F}9S@@og(l zV3;L-tyzX!XO-?k-kQ1^;*>$7C?u?PUv08LRFoJYqfJsNc2l-HakWScQn&O%lVCp= zEmabMgFVCT5X>O=vx$omwLKWuVT!`YPZP~iJO_AYW56!%J)@e`=-Dz z;>6TlqjASkfMMKafs!gED4v~$@@=h()FiB`M$K)M+LqG!bxTZwfEBC!n2FyD(FDdTMt7M#w9kI+h$4!Be>UmS%o`y=Q0NaI# zjW`H{)|QFqLHZ4VTmfa=>TEi7Wer{BS(@0ugnkT4*;69PcjO3pWmkLWxHMHL2fbTYtnepnPmD17C-j^qJ=llfs4316L~Px%o#L4t(K=XDGQ z2=;*lM5qd1o1^0a26TK3kSKh8jxG<7+E*k+q`%LVIl3~CV4na<0a#d@qtpE4z5-N0 zWZ~KzT^%5$Pge&Nfv`@`fA37rf1jc&n&ZCA@GsHF)AE$SM-sR<{{GE{t^40za}>RD zy13HP&Xyh7b{f@a#3pL$wi^>mJnZ)Bt?rt$b#>T|_K$)?F9_e*-|mjQZE@5c)?4T( z9PI|-=;~fQ^47#dZ><^aCdx)Y9P?l&KESuTqk|jvVR+5c(CzYQeM8;|chbXsDbicX z(~$&>FmN}+YtXztE+6||-zsz$>5Y(OnJc{>!@TgjCzizX6aSgEv-LC0=c@~}N#Ng~2%qQw#s7o<8~;B4 zZ|2^!3m29zUS#hXg{B9VRu<0jIE%|<6I-N()=IC^GQ-ibS5&Y%Gw+Qyw)cih zt9Ws7`T9kcaU;`e@-(1Wj_H8$^nFr0o!v2<)i2zCnZK}12>aIF6FD3w7QL3^Jw==vp+!>D6hqq2~&pOb#OmMHBL^{Dnn;sAO zYHwv`oVOE+3PR0d>|hKMVLQi-r5ou@{yvU1Hz5HG@6tH>Es#<>ug>sh^bV zhu4pEX8oLUHDbC5qvE(|6KgKn$3D~ga4-nYMSINl$*2^u5uXO2bT4y@%iEX!E8SVj a$B=%1FMWnSo_~%$o|)VPmKNwfaP>bsHlXzY literal 0 HcmV?d00001 diff --git a/main/views.py b/main/views.py index 428af41..90f7cb0 100755 --- a/main/views.py +++ b/main/views.py @@ -2,6 +2,7 @@ import socket, platform, os, multiprocessing, json from datetime import timedelta +from django.contrib.auth.decorators import login_required from django.core import serializers from django.shortcuts import render_to_response from django.http import HttpResponseRedirect, HttpResponse @@ -14,16 +15,14 @@ time_refresh_long = TIME_JS_REFRESH_LONG time_refresh_net = TIME_JS_REFRESH_NET version = VERSION +@login_required(login_url='/login/') def index(request): """ Index page. """ - if not request.user.is_authenticated(): - return HttpResponseRedirect('/login') - else: - return HttpResponseRedirect('/main') + return HttpResponseRedirect('/main') def chunks(get, n): @@ -246,9 +245,8 @@ def get_load(): return data +@login_required(login_url='/login/') def getall(request): - if not request.user.is_authenticated(): - return HttpResponseRedirect('/login') return render_to_response('main.html', {'gethostname': get_hostname(), 'getplatform': get_platform(), diff --git a/pydash/settings.py b/pydash/settings.py index 51a6bd1..4b564c6 100644 --- a/pydash/settings.py +++ b/pydash/settings.py @@ -23,7 +23,7 @@ SECRET_KEY = '1)$crmowu-23tz@i2-d=7tb3t+1u&(pm!lnjyuarki^72h!3af' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = False -TEMPLATE_DEBUG = True +TEMPLATE_DEBUG = False ADMINS = ( ) diff --git a/usage/views.py b/usage/views.py index 74a1cb3..150be81 100755 --- a/usage/views.py +++ b/usage/views.py @@ -2,6 +2,7 @@ import json from django.shortcuts import render_to_response from django.http import HttpResponse, HttpResponseRedirect from django.template import RequestContext +from django.contrib.auth.decorators import login_required from main.views import * from pydash.settings import TIME_JS_REFRESH, TIME_JS_REFRESH_LONG, TIME_JS_REFRESH_NET @@ -10,13 +11,11 @@ time_refresh = TIME_JS_REFRESH time_refresh_long = TIME_JS_REFRESH_LONG time_refresh_net = TIME_JS_REFRESH_NET +@login_required(login_url='/login/') def uptime(request): """ Return uptime """ - if not request.user.is_authenticated(): - return HttpResponseRedirect('/login') - try: up_time = get_uptime() except Exception: @@ -28,13 +27,11 @@ def uptime(request): response.write(data) return response +@login_required(login_url='/login/') def getdisk(request): """ Return the disk usage """ - if not request.user.is_authenticated(): - return HttpResponseRedirect('/login') - try: getdisk = get_disk() except Exception: @@ -45,14 +42,12 @@ def getdisk(request): response['Content-Type'] = "text/javascript" response.write(data) return response - + +@login_required(login_url='/login/') def getips(request): """ Return the IPs and interfaces """ - if not request.user.is_authenticated(): - return HttpResponseRedirect('/login') - try: get_ips = get_ipaddress() except Exception: @@ -64,14 +59,12 @@ def getips(request): response.write(data) return response - + +@login_required(login_url='/login/') def getusers(request): """ Return online users """ - if not request.user.is_authenticated(): - return HttpResponseRedirect('/login') - try: online_users = get_users() except Exception: @@ -82,14 +75,13 @@ def getusers(request): response['Content-Type'] = "text/javascript" response.write(data) return response - + + +@login_required(login_url='/login/') def getproc(request): """ Return the running processes """ - if not request.user.is_authenticated(): - return HttpResponseRedirect('/login') - try: processes = get_cpu_usage() processes = processes['all'] @@ -102,13 +94,11 @@ def getproc(request): response.write(data) return response +@login_required(login_url='/login/') def cpuusage(request): """ Return CPU Usage in % """ - if not request.user.is_authenticated(): - return HttpResponseRedirect('/login') - try: cpu_usage = get_cpu_usage() @@ -132,13 +122,11 @@ def cpuusage(request): response.write(data) return response +@login_required(login_url='/login/') def memusage(request): """ Return Memory Usage in % and numeric """ - if not request.user.is_authenticated(): - return HttpResponseRedirect('/login') - datasets = [] try: @@ -192,14 +180,12 @@ def memusage(request): response.cookies['memory_usage'] = datasets response.write(data) return response - + +@login_required(login_url='/login/') def loadaverage(request): """ Return Load Average numeric """ - if not request.user.is_authenticated(): - return HttpResponseRedirect('/login') - datasets = [] try: @@ -255,13 +241,11 @@ def loadaverage(request): return response +@login_required(login_url='/login/') def gettraffic(request): """ Return the traffic for the interface """ - if not request.user.is_authenticated(): - return HttpResponseRedirect('/login') - datasets_in = [] datasets_in_i = [] datasets_out = []