diff --git a/manager/templates/manager/index.html b/manager/templates/manager/index.html
index fe5ed3f..4297958 100644
--- a/manager/templates/manager/index.html
+++ b/manager/templates/manager/index.html
@@ -13,19 +13,17 @@
Common Name |
Network |
Latest IP |
-
Secret |
Options {% if user.is_superuser %}{% endif %} |
{% for device in devices %}
- ⬤ {{ device.serial }} |
- {% if device.name %}{{ device.name }}{% endif %} |
- {{ device.network }} |
+ ⬤ {{ device.serial }} |
+ {% if device.name %}{{ device.name }}{% endif %} |
+ {{ device.network }} |
{% if device.curip %}{{ device.curip }} (at {{ device.lasttime }}){% endif %} |
- {{ device.secret }} |
- {% if user.is_superuser %} {% endif %} |
+ {% if user.is_staff %} {% endif %}{% if user.is_superuser %} {% endif %} |
{% endfor %}
@@ -41,7 +39,7 @@
{% for device in devices %}
updateStatus({{ device.id }});
-setInterval(updateStatus, 3000, {{ device.id }});
+setInterval(updateStatus, 10000, {{ device.id }});
{% endfor %}
diff --git a/manager/views.py b/manager/views.py
index 300e025..d40d833 100644
--- a/manager/views.py
+++ b/manager/views.py
@@ -6,7 +6,7 @@ from django.views.decorators.csrf import csrf_exempt
from django.utils import timezone
from django.core.files import File
from django.db.models.fields.files import FieldFile
-from .models import Device, Organization, Network
+from .models import Device, Organization, Network, Model
from distutils.dir_util import copy_tree
@@ -29,6 +29,7 @@ def index(request):
def heartbeat(request):
device = get_object_or_404(Device, secret=request.POST.get("secret", ""))
ip = request.POST.get("ip", "")
+ device.lastbeat = timezone.now()
if ip:
device.lasttime = timezone.now()
if device.curip:
@@ -60,9 +61,18 @@ def ping(request, device_id):
else:
try:
socket.inet_aton(device[0].curip)
- ajax += str(int(not os.WEXITSTATUS(os.system("ping -c1 -w1 " + device[0].curip + " > /dev/null 2>&1")))) # This monster is not long enough yet.
+ ajax += str(int(not os.WEXITSTATUS(os.system("ping -c1 -w1 " + device[0].curip + " > /dev/null 2>&1"))))
+ ajax += ',\n "serial": "%s"' % device[0].serial
+ ajax += ',\n "name": "%s"' % device[0].name
ajax += ',\n "ip": "%s"' % device[0].curip
ajax += ',\n "time": "%s"' % device[0].lasttime
+ ajax += ',\n "lastbeat": "%s"' % device[0].lastbeat
+ ajax += ',\n "reboot": %i' % (1 if device[0].reboot else 0)
+
+ ajax += ',\n "network": {'
+ ajax += '\n "intip": "%s"' % device[0].network.intip
+ ajax += ',\n "extip": "%s"' % device[0].network.extip
+ ajax += '\n }'
except:
ajax += "-3"
@@ -71,7 +81,7 @@ def ping(request, device_id):
ajax += "-2"
ajax += "\n}"
- return HttpResponse(ajax)
+ return HttpResponse(ajax, content_type="application/json")
def devices(request):
if request.user.is_authenticated:
@@ -122,7 +132,8 @@ def editdevice(request, device_id):
{
"title": "Edit Device",
"device": device[0],
- "subnets": subnets
+ "subnets": subnets,
+ "user": request.user
}
)
@@ -130,15 +141,21 @@ def editdevice(request, device_id):
return redirect("/")
def getconfig(request, device_id):
- BEFORE = os.getcwd()
- DEVICEDIR = "/opt/vpnmanager/device-config/"
- SRCDIR = "/opt/openwrt/"
-
if not request.user.is_superuser:
return redirect("/")
device = get_object_or_404(Device, id=device_id)
+ BEFORE = os.getcwd()
+ DEVICEDIR = "/opt/vpnmanager/device-config/%i/" % device.model.id
+ SRCDIR = "/opt/vpnmanager/imagebuilder/%i/" % device.model.id
+
+ if glob.glob(SRCDIR + "/.kumilock"):
+ return HttpResponse("Another download is being prepared right now. Please wait for it to finish and try again later.")
+
+ with open(SRCDIR + "/.kumilock", "w") as lock:
+ lock.write("")
+
tempdir = tempfile.TemporaryDirectory()
copy_tree(DEVICEDIR, tempdir.name)
@@ -197,16 +214,18 @@ def getconfig(request, device_id):
os.chdir(SRCDIR)
try:
- output = subprocess.check_output(["make", "-j9"])
+ subprocess.call(["/usr/bin/make"])
except:
+ os.remove(SRCDIR + "/.kumilock")
os.chdir(BEFORE)
- return HttpResponse("Something went wrong building the image file.\n\n" + output)
+ return HttpResponse("Something went wrong building the image file.")
os.chdir(BEFORE)
with open(glob.glob(SRCDIR + "/bin/targets/ar71xx/generic/*squashfs-sysupgrade.bin")[0], "rb") as download:
response = HttpResponse(download.read(), content_type="application/octet-stream")
response['Content-Disposition'] = 'inline; filename=' + os.path.basename(device.serial + ".bin")
+ os.remove(SRCDIR + "/.kumilock")
os.system("rm -rf " + SRCDIR + "/files/")
os.system("rm " + SRCDIR + "/bin/targets/ar71xx/generic/*")
return response
@@ -227,7 +246,18 @@ def rebootdevice(request, device_id):
def deletedevice(request, device_id):
if request.user.is_superuser:
+ CADIR = "/etc/openvpn/ca/"
+ BEFORE = os.getcwd()
+
device = get_object_or_404(Device, id=device_id)
+
+ os.chdir(CADIR)
+
+ subprocess.call(CADIR + "/revoke " + device.serial, shell=True)
+ os.system("rm " + CADIR + "/keys/" + device.serial + ".{crt,csr,key}")
+
+ os.chdir(BEFORE)
+
device.delete()
return redirect("/")
@@ -240,17 +270,20 @@ def makedevice(request):
device_serial = request.POST.get("serial", "")
device_name = request.POST.get("name", "")
device_organization = request.POST.get("organization", "")
+ device_model = request.POST.get("model", "")
if not request.user.is_superuser:
return redirect("/")
if not device_serial:
orga = Organization.objects.all()
+ models = Model.objects.all()
return render(request, "manager/add.html",
{
"title": "Add Device",
"organizations": orga,
+ "models": models
}
)
@@ -260,14 +293,17 @@ def makedevice(request):
os.chdir(CADIR)
if subprocess.call(CADIR + "/generate-key " + device_serial, shell=True):
+ os.chdir(BEFORE)
return HttpResponse("Something went wrong trying to generate the key.")
if glob.glob(CONFIGDIR + "/files/" + device_serial + "*"):
+ os.chdir(BEFORE)
return HttpResponse("This configuration file already exists.")
os.chdir(CONFIGDIR)
if subprocess.call(CONFIGDIR + "/make_config " + device_serial, shell=True):
+ os.chdir(BEFORE)
return HttpResponse("Something went wrong trying to generate the config file.")
os.chdir(BEFORE)
@@ -275,6 +311,7 @@ def makedevice(request):
device = Device.objects.create(
serial=device_serial,
name=device_name,
+ model=Model.objects.filter(id=device_model)[0],
network=Network.objects.filter(intip="No VPN")[0],
organization=Organization.objects.filter(id=device_organization)[0],
vpnconfig = open(CONFIGDIR + "/files/" + device_serial + ".ovpn").read()
diff --git a/static/js/devices.js b/static/js/devices.js
index 32e8913..733b1a4 100644
--- a/static/js/devices.js
+++ b/static/js/devices.js
@@ -10,7 +10,7 @@ function timeSince(obj) {
interval = Math.floor(seconds / 60);
if (seconds < 120) out = seconds + " seconds "
- else if (interval > 1) out = out + interval + " minutes ";
+ else if (interval > 1 && interval < 120) out = out + interval + " minutes ";
return out + "ago"
}
@@ -18,12 +18,27 @@ function timeSince(obj) {
function styleStatus(msg, device) {
device_status = $("#" + device + "-indicator");
device_ip = $("#" + device + "-ip");
+ device_network = $("#" + device + "-network");
+ device_name = $("#" + device + "-name");
+ device_id = $("#" + device + "-id");
- device_status.css("color", msg.status == 1 ? "green" : (msg.status == 0 ? "red" : "grey"))
+ device_status.css("color", msg.status == 1 ? "green" : (msg.status == 0 ? ((new Date(msg.lastbeat) < new Date(msg.time) && (new Date() - new Date(msg.lastbeat) < 60)) ? "yellow" : "red") : "grey"));
if (msg.hasOwnProperty("ip")) {
device_ip.text(msg.ip + (msg.status == 1 ? "" :" (" + timeSince(msg.time) + ")"));
};
+
+ if (msg.hasOwnProperty("network")) {
+ device_network.text(msg.network.intip + " (" + msg.network.extip + ")");
+ };
+
+ if (msg.hasOwnProperty("reboot")) {
+ device_id.css("font-style", msg.reboot == 1 ? "italic" : "normal")
+ };
+
+ if (msg.hasOwnProperty("name")) {
+ device_name.text(msg.name);
+ };
};
function updateStatus(device_id) {
@@ -37,3 +52,7 @@ function askdelete(device_id) {
function askreboot(device_id) {
if (confirm("Are you sure you want to reboot this device?")) window.location.href = "/devices/" + device_id + "/reboot";
};
+
+function downloadnotice() {
+ alert("Your file is being prepared. This will take a minute, please be patient and do not leave this page. The download will start automatically.");
+};
diff --git a/uwsgi.sh b/uwsgi.sh
index c505209..f2617d5 100755
--- a/uwsgi.sh
+++ b/uwsgi.sh
@@ -1,2 +1,2 @@
#!/bin/bash
-uwsgi --socket 127.0.0.1:9360 --module vpnmanager.wsgi --uid 1001
+uwsgi --socket 127.0.0.1:9360 --module vpnmanager.wsgi --uid 1001 --processes=40