diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3d2ae66..153e2ac 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,10 @@
-
+
+
+
+
@@ -47,8 +50,10 @@
{
"keyToString": {
"ASKED_ADD_EXTERNAL_FILES": "true",
+ "Python.INSTALL.executor": "Run",
"Python.install.executor": "Run",
"Python.main.executor": "Run",
+ "Python.messagebox.executor": "Run",
"Python.start_wg.executor": "Run",
"Python.wg_func.executor": "Run",
"RunOnceActivity.ShowReadmeOnStart": "true",
@@ -348,10 +353,23 @@
1725820337669
-
+
+
+ 1725991610908
+
+
+
+ 1725991610908
+
+
+
-
@@ -401,6 +423,7 @@
-
+
+
\ No newline at end of file
diff --git a/install.py b/install.py
index 6b80cb8..0ed4497 100755
--- a/install.py
+++ b/install.py
@@ -1,41 +1,30 @@
#!/usr/bin/python3
-import os
from pathlib import Path
-import subprocess
from getpass import getpass
-startfile = ['#!/usr/bin/python3',
- 'from subprocess import check_call', '\n',
-
- 'path_to_file = ', '\n',
-
- 'with open(path_to_file, 'r') as file:',
- ' for line in file.readlines(): ',
- ' a_con = line[5:] ',
- "check_call(['nmcli', 'connection', 'up', a_con])",
- 'file.close()']
-home = Path.home()
# for services file in /lib/systemd/system/
-path_for_a_con = home / '.config/wire_py/wg_py'
-# replace in startfile
-startfile[3] = 'path_to_file = ' "'" + str(path_for_a_con) + "'"
+config_path = Path.home() / ".config" / "wire_py" / "wg_py"
-with open('start_wg.py', 'w') as file_for_a_con:
- for line in startfile:
- file_for_a_con.write(line + '\n')
-file_for_a_con.close()
+start_file = f'''\
+#!/usr/bin/python3
+from subprocess import check_call
-# create dir in home
-mkdir = home / '.config/wire_py'
-os.makedirs(mkdir, exist_ok=True)
+path_to_file = {str(config_path)!r}
-with open(mkdir / 'wg_py', 'w+') as file:
- if 'true' not in file:
- file.write('false')
-file.close()
+with open(path_to_file, 'r') as file:
+ *_, line = file
+a_con = line[5:]
+check_call(['nmcli', 'connection', 'up', a_con])
+'''
+
+Path("start_wg.py").write_text(start_file)
+
+config_path.parent.mkdir(exist_ok=True)
+if not Path.exists(config_path):
+ config_path.write_text("false")
# Prompt the user for the sudo password
-sudo_password = getpass('Enter sudo password: ')
+#sudo_password = getpass('Enter sudo password: ')
#def cp_files():
# Define the command to run the Python script with sudo
@@ -43,4 +32,3 @@ sudo_password = getpass('Enter sudo password: ')
# Run the command as a subprocess, passing the sudo password
#subprocess.run(command, input=sudo_password.encode(), check=True)
-
diff --git a/main.py b/main.py
index 48f56ea..99d97c8 100755
--- a/main.py
+++ b/main.py
@@ -8,7 +8,6 @@ from wg_func import (TunnelActiv, ListTunnels, ImportTunnel, ConToDict, GreenLab
FileHandle, ExportTunnels, OnOff)
font_color = '#4011a7'
-home = Path.home()
class MainWindow(tk.Tk):
@@ -128,13 +127,12 @@ class FrameWidgets(ttk.Frame):
# Button Vpn
if self.a != '':
StartStopBTN.button_stop(self)
- wg_read = home / 'tester/' / str(self.a + '.conf')
+ wg_read = Path.home() / 'tester/' / str(self.a + '.conf')
with open(wg_read, 'r') as file:
data = ConToDict.covert_to_dict(file)
# Address Label
ShowAddress.init_and_report(self, data)
ShowAddress.show_data(self)
- file.close()
else:
StartStopBTN.button_start(self)
# Address Label
@@ -155,9 +153,9 @@ class FrameWidgets(ttk.Frame):
select_tl = self.l_box.get(self.select_tunnel[0])
check_call(['nmcli', 'connection', 'delete', select_tl])
self.l_box.delete(self.select_tunnel[0])
- os.remove(home / 'tester/' / str(select_tl + '.conf'))
+ os.remove(Path.home() / 'tester/' / str(select_tl + '.conf'))
- path_to_file = home / '.config/wire_py/wg_py'
+ path_to_file = Path.home() / '.config/wire_py/wg_py'
with open(path_to_file, 'r') as file2:
for line in file2.readlines():
a_con = line[5:]
@@ -170,7 +168,6 @@ class FrameWidgets(ttk.Frame):
self.wg_autostart.configure(state='disabled')
with open(path_to_file, 'w') as file2:
file2.write('false')
- file2.close()
if self.a != '' and self.a == select_tl:
self.StrVar.set(value='')
@@ -224,13 +221,12 @@ class FrameWidgets(ttk.Frame):
self.select_tunnel = self.l_box.curselection()
select_tl = self.l_box.get(self.select_tunnel[0])
check_call(['nmcli', 'connection', 'up', select_tl])
- wg_read = home / 'tester/' / str(select_tl + '.conf')
+ wg_read = Path.home() / 'tester/' / str(select_tl + '.conf')
with open(wg_read, 'r') as file:
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()
diff --git a/start_wg.py b/start_wg.py
index dee75fd..8c13876 100755
--- a/start_wg.py
+++ b/start_wg.py
@@ -1,12 +1,9 @@
#!/usr/bin/python3
from subprocess import check_call
-
path_to_file = '/home/punix/.config/wire_py/wg_py'
-
-with open(path_to_file, ) as file:
- for line in file.readlines():
- a_con = line[5:]
+with open(path_to_file, 'r') as file:
+ *_, line = file
+a_con = line[5:]
check_call(['nmcli', 'connection', 'up', a_con])
-file.close()
diff --git a/wg_func.py b/wg_func.py
index af4e224..34a91d7 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -7,39 +7,37 @@ import tkinter as tk
from pathlib import Path
from subprocess import check_call
-home = Path.home()
font_color = '#4011a7'
-path_to_file = home / '.config/wire_py/wg_py'
+path_to_file = Path.home() / '.config/wire_py/wg_py'
-class Message(tk.Tk):
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
-
- self.warning_pic = None
- self.x_width = 300
- self.y_height = 120
- self.monitor_center_x = self.winfo_screenwidth() / 2 - (self.x_width / 2)
- self.monitor_center_y = self.winfo_screenheight() / 2 - (self.y_height / 2)
- self.resizable(width=False, height=False)
- self.title('Import error!')
- self.configure()
- self.geometry('%dx%d+%d+%d' % (self.x_width, self.y_height, self.monitor_center_x, self.monitor_center_y))
- self.columnconfigure(0, weight=1)
-
- self.label = tk.Label(self,
- image=self.warning_pic,
- text='Oh... no valid Wireguard File!\nPlease select a valid Wireguard File')
- self.label.config(font=('Ubuntu', 11), padx=15, pady=15)
- self.label.grid(column=0, row=0)
- self.button = tk.Button(self, text='OK', command=self.destroy)
- self.button.config(padx=15, pady=5)
- self.button.grid(column=0, row=1)
+def msg_window():
+ msg = tk.Toplevel()
+ msg.resizable(width=False, height=False)
+ msg.x_width = 340
+ msg.y_height = 140
+ msg.title('Import error!')
+ msg.monitor_center_x = msg.winfo_screenwidth() / 2 - (msg.x_width / 2)
+ msg.monitor_center_y = msg.winfo_screenheight() / 2 - (msg.y_height / 2)
+ msg.geometry('%dx%d+%d+%d' % (msg.x_width, msg.y_height, msg.monitor_center_x, msg.monitor_center_y))
+ msg.columnconfigure(0, weight=1)
+ msg.configure(pady=20)
+ msg.warning = tk.PhotoImage(file=r'icons/warning_64.png')
+ msg.i_warning = tk.Label(msg, image=msg.warning)
+ msg.i_warning.grid(column=0, row=0)
+ label = tk.Label(msg, text='Oh... no valid Wireguard File!\nPlease select a valid Wireguard File')
+ label.config(font=('Ubuntu', 11), padx=15, pady=15)
+ label.grid(column=1, row=0)
+ button = tk.Button(msg, text='OK', command=msg.destroy)
+ button.config(padx=15, pady=5)
+ button.grid(column=0, columnspan=2, row=1)
+ wg_icon_2 = tk.PhotoImage(file=r'icons/wg-stop.png')
+ msg.iconphoto(True, wg_icon_2)
+ msg.winfo_toplevel()
-class GreenLabel(tk.Tk):
- def __init__(self, container, **kwargs):
- super().__init__(container, **kwargs)
+class GreenLabel:
+ def __init__(self):
self.StrVar = None
self.lb_tunnel = None
@@ -50,10 +48,15 @@ class GreenLabel(tk.Tk):
self.columnconfigure(2, weight=1)
self.rowconfigure(0, weight=1)
+ def columnconfigure(self, param, weight):
+ pass
-class StartStopBTN(tk.Tk):
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
+ def rowconfigure(self, param, weight):
+ pass
+
+
+class StartStopBTN:
+ def __init__(self):
self.lb_frame_btn_lbox = None
self.wg_switch = None
self.btn_stst = None
@@ -116,9 +119,8 @@ class TunnelActiv:
return active
-class ShowAddress(tk.Tk):
- def __init__(self, container, **kwargs):
- super().__init__(container, **kwargs)
+class ShowAddress:
+ def __init__(self):
self.lb_frame2 = None
self.lb_frame = None
self.endpoint = None
@@ -165,9 +167,9 @@ class ListTunnels:
return tl
-class ImportTunnel(tk.Tk):
- def __init__(self, container, **kwargs):
- super().__init__(container, **kwargs)
+class ImportTunnel:
+
+ def __init__(self):
self.select_tunnel = None
self.wg_switch = None
@@ -179,27 +181,26 @@ class ImportTunnel(tk.Tk):
def wg_import_select(self):
try:
- filepath = filedialog.askopenfilename(initialdir=home, title='Select Wireguard config File',
- filetypes=[('WG config files', '*.conf')])
- file = open(filepath, 'r')
- read = file.read()
- file.close()
+ filepath = filedialog.askopenfilename(initialdir=Path.home(), title='Select Wireguard config File',
+ filetypes=[('WG config files', '*.conf')], )
+ with open(filepath, 'r') as file:
+ read = file.read()
path_split = filepath.split('/')
path_split1 = path_split[-1]
self.a = TunnelActiv.active()
if 'PrivateKey = ' in read and 'PublicKey = ' in read:
if len(path_split1) > 17:
- p1 = shutil.copy(filepath, home / 'tester/')
+ p1 = shutil.copy(filepath, Path.home() / 'tester/')
path_split = path_split1[len(path_split1) - 17:]
- os.rename(p1, home / 'tester/' / str(path_split))
+ os.rename(p1, Path.home() / 'tester/' / str(path_split))
if self.a != '':
check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
ShowAddress.label_empty(self)
- check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', home / 'tester' /
+ check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', Path.home() / 'tester' /
path_split])
else:
- shutil.copy(filepath, home / 'tester/')
+ shutil.copy(filepath, Path.home() / 'tester/')
if self.a != '':
check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
ShowAddress.label_empty(self)
@@ -213,16 +214,15 @@ class ImportTunnel(tk.Tk):
self.StrVar.set(self.a)
GreenLabel.green_show_label(self)
StartStopBTN.button_stop(self)
- wg_read = home / 'tester/' / str(self.a + '.conf')
+ wg_read = Path.home() / 'tester/' / str(self.a + '.conf')
with open(wg_read, 'r') as file:
data = ConToDict.covert_to_dict(file)
# Address Label
ShowAddress.init_and_report(self, data)
ShowAddress.show_data(self)
- file.close()
check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
if 'PrivateKey = ' not in read:
- Message()
+ msg_window()
except EOFError:
pass
except TypeError:
@@ -242,23 +242,20 @@ class FileHandle:
self.tl = None
self.selected_option = None
self.l_box = None
- self.select_tunnel = None
def box_set(self):
try:
- self.select_tunnel = self.l_box.curselection()
- select_tl = self.l_box.get(self.select_tunnel[0])
+ select_tunnel = self.l_box.curselection()
+ select_tl = self.l_box.get(select_tunnel[0])
if self.selected_option.get() == 0:
- off = open(path_to_file, 'w')
- off.write('false ' + '\n')
- off.close()
+ with open(path_to_file, 'w') as off:
+ off.write('false ' + '\n')
tl = ListTunnels.tl_list()
if len(tl) == 0:
self.wg_autostart.configure(state='disabled')
if self.selected_option.get() >= 1:
- set_on = open(path_to_file, 'w')
- set_on.write('true ' + select_tl)
- set_on.close()
+ with open(path_to_file, 'w') as set_on:
+ set_on.write('true ' + select_tl)
except IndexError:
self.selected_option.set(1)
@@ -266,9 +263,13 @@ class FileHandle:
OnOff.on_off(self)
-class OnOff(tk.Tk, FileHandle):
- def __init__(self, container, **kwargs):
- super().__init__(container, **kwargs)
+class OnOff:
+ def __init__(self):
+ self.wg_autostart = None
+ self.selected_option = None
+ self.auto_con = None
+ self.autoconnect = None
+ self.autoconnect_var = None
self.lb_frame_buttons = None
def on_off(self):
@@ -282,7 +283,6 @@ class OnOff(tk.Tk, FileHandle):
else:
self.wg_autostart.configure(state='disabled')
self.auto_con = 'no Autoconnect'
- file.close()
self.autoconnect_var = tk.StringVar()
self.autoconnect_var.set(self.auto_con)
@@ -299,8 +299,8 @@ class ExportTunnels:
tl = ListTunnels.tl_list()
try:
if len(tl) != 0:
- wg_tar = home / now_datetime
- p_to_conf = home / 'tester/'
+ wg_tar = Path.home() / now_datetime
+ p_to_conf = Path.home() / 'tester/'
shutil.make_archive(wg_tar, 'zip', p_to_conf)
#if zip_full != 0:
#print('Export erfolgraeich')