diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7aa4bb7..ea242ae 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
-
+
@@ -211,7 +211,31 @@
1724416642213
-
+
+
+ 1724495688099
+
+
+
+ 1724495688099
+
+
+
+ 1724576599289
+
+
+
+ 1724576599289
+
+
+
+ 1724593165879
+
+
+
+ 1724593165879
+
+
@@ -253,6 +277,9 @@
-
+
+
+
+
\ No newline at end of file
diff --git a/main.py b/main.py
old mode 100644
new mode 100755
index 9a5e9dd..9927f9f
--- a/main.py
+++ b/main.py
@@ -85,12 +85,12 @@ class FrameWidgets(ttk.Frame):
self.peer.config(font=("Ubuntu", 9))
self.peer.grid(column=0, row=7, sticky="we", padx=130)
# Listbox with Scrollbar
- self.scrollbar = tk.Scrollbar(self)
+ self.scrollbar = ttk.Scrollbar(self)
self.l_box = tk.Listbox(self, fg='#606060', selectmode='single')
self.l_box.config(highlightthickness=0, relief='flat')
self.scrollbar.config(command=self.l_box.yview)
self.l_box.config(font=("Ubuntu", 12, "bold"))
- self.l_box.grid(column=1, rowspan=3, row=1, )
+ self.l_box.grid(column=1, rowspan=3, row=1)
# Tunnel List
self.tl = ListTunnels.tl_list()
for tunnels in self.tl:
@@ -119,23 +119,26 @@ class FrameWidgets(ttk.Frame):
self.btn_i.grid(column=0, row=2, padx=15, pady=15)
def delete():
- self.select_tunnel = self.l_box.curselection()
- select_tl = self.l_box.get(self.select_tunnel[0])
- os.system('nmcli connection delete ' + str(select_tl))
- self.l_box.delete(self.select_tunnel[0])
- os.remove(os.environ['HOME'] + '/tester/' + str(select_tl) + '.conf')
- if self.a != '' and self.a == select_tl:
- self.StrVar.set(value='')
- StartStopBTN.button_start(self)
- self.l_box.update()
- # Address Label
- ShowAddress.label_empty(self)
- ShowAddress.show_data(self)
+ try:
+ self.select_tunnel = self.l_box.curselection()
+ select_tl = self.l_box.get(self.select_tunnel[0])
+ os.system('nmcli connection delete ' + str(select_tl))
+ self.l_box.delete(self.select_tunnel[0])
+ os.remove(os.environ['HOME'] + '/tester/' + str(select_tl) + '.conf')
+ if self.a != '' and self.a == select_tl:
+ self.StrVar.set(value='')
+ StartStopBTN.button_start(self)
+ self.l_box.update()
+ # Address Label
+ ShowAddress.label_empty(self)
+ except IndexError:
+ pass
+
# Button Trash
self.btn_tr = tk.Button(self, image=self.tr_pic, bd=0, command=delete)
self.btn_tr.grid(column=0, row=3, padx=15, pady=15)
# Button Export
- self.btn_exp = tk.Button(self, image=self.exp_pic, bd=0)
+ self.btn_exp = tk.Button(self, image=self.exp_pic, bd=0, command=ExportTunnels.wg_export)
self.btn_exp.grid(column=0, row=4, padx=15, pady=15)
# Check Buttons
self.wg_autostart = tk.Checkbutton(self, text='Autoconnect on PC Start')
@@ -145,36 +148,39 @@ class FrameWidgets(ttk.Frame):
def wg_switch(self):
self.a = TunnelActiv.active()
- if self.a == '':
- StartStopBTN.button_start(self)
- self.select_tunnel = self.l_box.curselection()
- select_tl = self.l_box.get(self.select_tunnel[0])
- os.system('nmcli connection up ' + str(select_tl))
- wg_read = os.environ['HOME'] + '/tester/' + str(select_tl) + '.conf'
- file = open(wg_read, 'r')
- data = ConToDict.covert_to_dict(file)
- # Address Label
- ShowAddress.init_and_report(self, data)
- ShowAddress.show_data(self)
- file.close()
- # Button Start/Stop
- StartStopBTN.button_stop(self)
- self.a = TunnelActiv.active()
- self.StrVar = tk.StringVar()
- self.StrVar.set(self.a)
- GreenLabel.green_show_label(self)
- elif self.a != '':
- # Button Start/Stop
- StartStopBTN.button_stop(self)
- os.system('nmcli connection down ' + str(self.a))
- # Button Start/Stop
- StartStopBTN.button_start(self)
- self.a = TunnelActiv.active()
- self.StrVar.set('')
- GreenLabel.green_show_label(self)
- # Address Label
- ShowAddress.label_empty(self)
- ShowAddress.show_data(self)
+ try:
+ if self.a == '':
+ StartStopBTN.button_start(self)
+ self.select_tunnel = self.l_box.curselection()
+ select_tl = self.l_box.get(self.select_tunnel[0])
+ os.system('nmcli connection up ' + str(select_tl))
+ wg_read = os.environ['HOME'] + '/tester/' + str(select_tl) + '.conf'
+ file = open(wg_read, 'r')
+ data = ConToDict.covert_to_dict(file)
+ # Address Label
+ ShowAddress.init_and_report(self, data)
+ ShowAddress.show_data(self)
+ file.close()
+ # Button Start/Stop
+ StartStopBTN.button_stop(self)
+ self.a = TunnelActiv.active()
+ self.StrVar = tk.StringVar()
+ self.StrVar.set(self.a)
+ GreenLabel.green_show_label(self)
+ elif self.a != '':
+ # Button Start/Stop
+ StartStopBTN.button_stop(self)
+ os.system('nmcli connection down ' + str(self.a))
+ # Button Start/Stop
+ StartStopBTN.button_start(self)
+ self.a = TunnelActiv.active()
+ self.StrVar.set('')
+ GreenLabel.green_show_label(self)
+ # Address Label
+ ShowAddress.label_empty(self)
+ ShowAddress.show_data(self)
+ except IndexError:
+ pass
if __name__ == '__main__':
diff --git a/wg_func.py b/wg_func.py
old mode 100644
new mode 100755
index 4a8289d..c595d9e
--- a/wg_func.py
+++ b/wg_func.py
@@ -1,6 +1,7 @@
# Wireguard functions for Wire-Py
import os
-import subprocess
+import shutil
+import tarfile
from tkinter import filedialog
import tkinter as tk
@@ -46,7 +47,6 @@ class GreenLabel(tk.Tk):
class StartStopBTN(tk.Tk):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- self.tl = None
self.wg_switch = None
self.btn_stst = None
self.wg_vpn_start = tk.PhotoImage(file=r'icons/wg-vpn-start-48.png')
@@ -58,17 +58,9 @@ class StartStopBTN(tk.Tk):
self.rowconfigure(0, weight=1)
def button_start(self):
- self.tl = ListTunnels.tl_list()
- print(len(self.tl))
- if len(self.tl) == 0:
- self.btn_stst = tk.Button(self, image=self.wg_vpn_start, bd=0, command=self.wg_switch)
- self.btn_stst.config(state=tk.DISABLED)
- self.btn_stst.grid(column=0, row=1, padx=15, pady=10, sticky="s")
- self.rowconfigure(0, weight=1)
- else:
- self.btn_stst = tk.Button(self, image=self.wg_vpn_start, bd=0, command=self.wg_switch)
- self.btn_stst.grid(column=0, row=1, padx=15, pady=10, sticky="s")
- self.rowconfigure(0, weight=1)
+ self.btn_stst = tk.Button(self, image=self.wg_vpn_start, bd=0, command=self.wg_switch)
+ self.btn_stst.grid(column=0, row=1, padx=15, pady=10, sticky="s")
+ self.rowconfigure(0, weight=1)
class ConToDict:
@@ -96,9 +88,12 @@ class ConToDict:
finaldict = {}
for elements in newlist:
finaldict[elements[0]] = elements[1]
+
# end... result a Dictionary
address = finaldict['Address']
dns = finaldict['DNS']
+ if ',' in dns:
+ dns = dns[:-1]
endpoint = finaldict['Endpoint']
return address, dns, endpoint
@@ -188,14 +183,15 @@ class ImportTunnel:
pathsplit1 = pathsplit[-1]
if "PrivateKey = " in read and "PublicKey = " in read:
if len(pathsplit1) > 17:
+ p1 = shutil.copy(filepath, os.environ['HOME'] + '/tester/')
pathsplit = pathsplit1[len(pathsplit1) - 17:]
- os.rename(filepath, os.environ['HOME'] + '/tester/' + str(pathsplit))
+ os.rename(p1, os.environ['HOME'] + '/tester/' + str(pathsplit))
if self.a != '':
os.system('nmcli connection down ' + str(TunnelActiv.active()))
os.system('nmcli connection import type wireguard file ' + os.environ['HOME'] + '/tester/' +
str(pathsplit))
else:
- subprocess.call('cp ' + str(filepath) + ' ' + os.environ['HOME'] + '/tester/', shell=True)
+ shutil.copy(filepath, os.environ['HOME'] + '/tester/')
if self.a != '':
os.system('nmcli connection down ' + str(TunnelActiv.active()))
os.system('nmcli connection import type wireguard file ' + str(filepath))
@@ -230,8 +226,8 @@ class ExportTunnels:
@staticmethod
def wg_export():
try:
- wg_exp = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
- wg_exp = wg_exp[1]
- return wg_exp
- except IndexError:
+ wg_tar = os.environ['HOME'] + '/datetime'
+ p_to_conf = os.environ['HOME'] + '/tester'
+ shutil.make_archive(wg_tar, 'zip', p_to_conf)
+ except TypeError:
pass