public/Zdalne-systemy-z-kit-uVPN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dodanie zabezpieczenia złego ip dla vpn

Browse Source
This commit is contained in:
Mateusz779 2023-04-21 10:05:58 +02:00
parent 2ebacf8563
commit 7297474469
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.py
View File

@ -137,7 +137,7 @@ def delete(image_id):
return jsonify(message="409") return jsonify(message="409")
filename = db.get_conf_image_id(image_id) filename = db.get_conf_image_id(image_id)
squashfs = os.path.join(app.config['UPLOAD_FOLDER'], filename) squashfs = os.path.join(app.config['UPLOAD_FOLDER'], filename)
pubkey = os.path.join(app.config['UPLOAD_FOLDER'], filename.split(".")[0]) pubkey = os.path.join(app.config['UPLOAD_FOLDER'], filename.split(".")[0]+".pub")
if os.path.exists(squashfs): if os.path.exists(squashfs):
os.remove(squashfs) os.remove(squashfs)
if os.path.exists(pubkey): if os.path.exists(pubkey):
@ -238,6 +238,8 @@ def add_ip():
try: try:
token = request.headers['token'] token = request.headers['token']
ip = request.form['ip'] ip = request.form['ip']
if utils.is_valid_ip_address(ip) is False:
return jsonify(message="400")
except: except:
return jsonify(message="400") return jsonify(message="400")
if db.update_image_allocation_ip_vpn(token, ip) is not None: if db.update_image_allocation_ip_vpn(token, ip) is not None:

7
templates/index.html
View File

@ -78,7 +78,7 @@
<td>{{ machine.start_time }}</td> <td>{{ machine.start_time }}</td>
<td>{{ machine.ipvpn }}</td> <td>{{ machine.ipvpn }}</td>
<td>{{ machine.iplocal }}</td> <td>{{ machine.iplocal }}</td>
<td><button class="btn btn-primary" onclick="ssh('{{ machine.ipvpn }}', '{{ machine.username }}', '{{ machine.password }}')">SSH</button></td> <td><button class="btn btn-primary" onclick="ssh('{{ machine.ipvpn }}','{{machine.iplocal}}', '{{ machine.username }}', '{{ machine.password }}')">SSH</button></td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
@ -86,9 +86,10 @@
</div> </div>
<script> <script>
function ssh(ipvpn, username, password) { function ssh(ipvpn, iplocal username, password) {
const currentLocation = window.location; const currentLocation = window.location;
const newUrl = currentLocation.protocol + '//' + currentLocation.hostname + ':' + {{ ssh_port }} + "/?hostname="+ipvpn+"&username="+username+"&password="+btoa(password); let ip = ipvpn != null ? ipvpn : iplocal;
const newUrl = currentLocation.protocol + '//' + currentLocation.hostname + ':' + {{ ssh_port }} + "/?hostname="+ip+"&username="+username+"&password="+btoa(password);
window.open(newUrl,"_blank"); window.open(newUrl,"_blank");
} }
</script> </script>

9
utils.py
View File

@ -9,7 +9,7 @@ import threading
from time import sleep from time import sleep
import db import db
import config import config
import ipaddress
def generate_random_string(length): def generate_random_string(length):
letters = string.ascii_letters letters = string.ascii_letters
@ -76,3 +76,10 @@ def init_threads():
allocation_thread = threading.Thread( allocation_thread = threading.Thread(
target=check_allocation_thread_function) target=check_allocation_thread_function)
allocation_thread.start() allocation_thread.start()
def is_valid_ip_address(ip: str) -> bool:
try:
ipaddress.IPv4Address(ip)
return True
except ipaddress.AddressValueError:
return False