mirror of
https://github.com/donaldzou/WGDashboard.git
synced 2024-11-22 15:20:09 +01:00
Added connected peers
This commit is contained in:
donaldzou
parent
d22d695312
commit
55ba5801af
@ -24,8 +24,21 @@ def get_conf_peer_key(config_name):
|
||||
return keys
|
||||
|
||||
|
||||
|
||||
|
||||
def get_conf_running_peer_number(config_name):
|
||||
running = 0
|
||||
#Get latest handshakes
|
||||
try: data_usage = subprocess.check_output("wg show "+config_name+" latest-handshakes", shell=True)
|
||||
except Exception: return "stopped"
|
||||
data_usage = data_usage.decode("UTF-8").split()
|
||||
count = 0
|
||||
now = datetime.now()
|
||||
b = timedelta(minutes=2)
|
||||
for i in range(int(len(data_usage)/2)):
|
||||
minus = now - datetime.fromtimestamp(int(data_usage[count+1]))
|
||||
if minus < b:
|
||||
running += 1
|
||||
count += 2
|
||||
return running
|
||||
|
||||
def get_conf_peers_data(config_name):
|
||||
peer_data = {}
|
||||
@ -44,9 +57,9 @@ def get_conf_peers_data(config_name):
|
||||
download_total = 0
|
||||
total = 0
|
||||
for i in range(int(len(data_usage)/3)):
|
||||
peer_data[data_usage[count]]['total_recive'] = int(data_usage[count+1])/(1024**3)
|
||||
peer_data[data_usage[count]]['total_sent'] = int(data_usage[count+2])/(1024**3)
|
||||
peer_data[data_usage[count]]['total_data'] = (int(data_usage[count+2])+int(data_usage[count+1]))/(1024**3)
|
||||
peer_data[data_usage[count]]['total_recive'] = round(int(data_usage[count+1])/(1024**3),4)
|
||||
peer_data[data_usage[count]]['total_sent'] = round(int(data_usage[count+2])/(1024**3),4)
|
||||
peer_data[data_usage[count]]['total_data'] = round((int(data_usage[count+2])+int(data_usage[count+1]))/(1024**3),4)
|
||||
count += 3
|
||||
|
||||
#Get endpoint
|
||||
@ -112,9 +125,9 @@ def get_conf_total_data(config_name):
|
||||
download_total += int(data_usage[count+2])
|
||||
count += 3
|
||||
|
||||
total = round(((((upload_total+download_total)/1024)/1024)/1024),3)
|
||||
upload_total = round(((((upload_total)/1024)/1024)/1024),3)
|
||||
download_total = round(((((download_total)/1024)/1024)/1024),3)
|
||||
total = round(((((upload_total+download_total)/1024)/1024)/1024),4)
|
||||
upload_total = round(((((upload_total)/1024)/1024)/1024),4)
|
||||
download_total = round(((((download_total)/1024)/1024)/1024),4)
|
||||
|
||||
return [total, upload_total, download_total]
|
||||
|
||||
@ -151,6 +164,7 @@ def conf(config_name):
|
||||
"public_key": get_conf_pub_key(config_name),
|
||||
"listen_port": get_conf_listen_port(config_name),
|
||||
"peer_data":get_conf_peers_data(config_name),
|
||||
"running_peer": get_conf_running_peer_number(config_name),
|
||||
"checked": ""
|
||||
}
|
||||
if conf_data['status'] == "stopped":
|
||||
@ -187,7 +201,8 @@ def add_peer(config_name):
|
||||
status = subprocess.check_output("wg-quick save "+config_name, shell=True)
|
||||
return "Good"
|
||||
except Exception: return redirect('/configuration/'+config_name)
|
||||
|
||||
|
||||
# @app.route('/remove_peer/<config_name>/<peer_id>', methods=['POST'])
|
||||
# def remove_peer(config_name, peer_id):
|
||||
|
||||
app.run(host='0.0.0.0',debug=False, port=10086)
|
||||
@ -7,7 +7,7 @@
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
|
||||
<link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='dashboard.css') }}">
|
||||
<link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet">
|
||||
|
||||
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
@ -54,6 +54,10 @@
|
||||
<small class="text-muted"><strong>STATUS</strong></small>
|
||||
<h6 style="text-transform: uppercase;">{{conf_data['status']}}<span class="dot dot-{{conf_data['status']}}"></span></h6>
|
||||
</div>
|
||||
<div class="col-sm">
|
||||
<small class="text-muted"><strong>CONNECTED PEERS</strong></small>
|
||||
<h6 style="text-transform: uppercase;">{{conf_data['running_peer']}}</h6>
|
||||
</div>
|
||||
<div class="col-sm">
|
||||
<small class="text-muted"><strong>TOTAL DATA USAGE</strong></small>
|
||||
<h6 style="text-transform: uppercase;">{{conf_data['total_data_usage'][0]}} GB</h6>
|
||||
@ -78,7 +82,7 @@
|
||||
</div>
|
||||
<hr>
|
||||
<div class="button-div" style="text-align: right;">
|
||||
<button type="button" class="btn btn-outline-primary btn-sm mb-3" data-toggle="modal" data-target="#staticBackdrop">
|
||||
<button type="button" class="btn btn-outline-primary btn-sm mb-3" data-toggle="modal" data-target="#add_modal">
|
||||
<strong>ADD PEER</strong>
|
||||
</button>
|
||||
|
||||
@ -126,11 +130,9 @@
|
||||
</div>
|
||||
<div class="w-100"></div>
|
||||
<div class="col-sm">
|
||||
<small class="text-muted"><strong>ACTION</strong></small>
|
||||
<!-- <small class="text-muted"><strong>ACTION</strong></small> -->
|
||||
<div class="button-group">
|
||||
<button type="button" class="btn btn-outline-primary btn-sm">QR CODE</button>
|
||||
<button type="button" class="btn btn-outline-info btn-sm">CONF FILE</button>
|
||||
<button type="button" class="btn btn-outline-danger btn-sm">DELETE</button>
|
||||
<button type="button" class="btn btn-outline-danger btn-sm btn-delete-peer" id="{{i}}" data-toggle="modal" data-target="#delete_modal"><span class="material-icons">delete_forever</span></button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -140,7 +142,7 @@
|
||||
{%endfor%}
|
||||
</main>
|
||||
</div>
|
||||
<div class="modal fade" id="staticBackdrop" data-backdrop="static" data-keyboard="false" tabindex="-1"
|
||||
<div class="modal fade" id="add_modal" data-backdrop="static" data-keyboard="false" tabindex="-1"
|
||||
aria-labelledby="staticBackdropLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered">
|
||||
<div class="modal-content">
|
||||
@ -169,6 +171,26 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal fade" id="delete_modal" data-backdrop="static" data-keyboard="false" tabindex="-1"
|
||||
aria-labelledby="staticBackdropLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="staticBackdropLabel">Are you sure to delete this peer?</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<h6>This action is not reversible.</h6>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">No</button>
|
||||
<button type="button" class="btn btn-danger" id="delete_peer" conf_id={{conf_data['name']}} peer_id="">Yes</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
<script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"
|
||||
@ -206,9 +228,31 @@
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
$(".btn-delete-peer").click(function(){
|
||||
var peer_id = $(this).attr("id");
|
||||
$("#delete_peer").attr("peer_id", peer_id);
|
||||
});
|
||||
|
||||
$(".delete_peer").click(function(){
|
||||
var peer_id = $(this).attr("peer_id");
|
||||
var config = $(this).attr("conf_id");
|
||||
$.ajax({
|
||||
method: "POST",
|
||||
url: "/remove_peer/"+config+"/"+peer_id,
|
||||
headers:{
|
||||
"Content-Type": "application/json"
|
||||
},
|
||||
data: JSON.stringify({"action": "delete"}),
|
||||
success: function (response){
|
||||
console.log(response);
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
|
||||
|
||||
// setInterval(function(){
|
||||
// location.reload();
|
||||
// }, 10000)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user