Compare commits

...

6 Commits

Author SHA1 Message Date
4c89488950 Merge pull request 'wire-py-reformat-14-09-2024' (#14) from wire-py-reformat-14-09-2024 into main
Reviewed-on: https://git.ilunix.de/punix/Wire-Py/pulls/14
2024-09-14 23:31:00 +02:00
d1a822fff0 little fixes, add msg_window()
function for Messagebox to show a tk.Toplevel()
replace var = open() with:
with open() as var:
and remove by classes (tk.tk) and super()
2024-09-14 23:25:48 +02:00
8fa6e6374f little fixes a labels when stop and start, installer first functions works 2024-09-10 20:06:33 +02:00
35406026f0 little fixes replace os.system with check_call
first steps in install Script add wg_start.service file
2024-09-08 20:31:46 +02:00
607589d44a little fixes 2024-09-07 23:52:16 +02:00
858e9f07fe little fixes 2024-09-06 18:20:29 +02:00
8 changed files with 284 additions and 163 deletions

View File

@ -4,7 +4,17 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="add Frame widget 3&#10;for Buttons and Listbox with Scrollbar.&#10;all Widgets new format&#10;delete works now of disable checkbox when Listbox empty (part two)" /> <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="little fixes a labels when stop and start, installer first functions works">
<change afterPath="$PROJECT_DIR$/message.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/test.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/test2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/install.py" beforeDir="false" afterPath="$PROJECT_DIR$/install.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/start_wg.py" beforeDir="false" afterPath="$PROJECT_DIR$/start_wg.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wg_py" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -40,14 +50,19 @@
<component name="PropertiesComponent">{ <component name="PropertiesComponent">{
&quot;keyToString&quot;: { &quot;keyToString&quot;: {
&quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;, &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
&quot;Python.INSTALL.executor&quot;: &quot;Run&quot;,
&quot;Python.install.executor&quot;: &quot;Run&quot;,
&quot;Python.main.executor&quot;: &quot;Run&quot;, &quot;Python.main.executor&quot;: &quot;Run&quot;,
&quot;Python.messagebox.executor&quot;: &quot;Run&quot;,
&quot;Python.start_wg.executor&quot;: &quot;Run&quot;,
&quot;Python.wg_func.executor&quot;: &quot;Run&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;git-widget-placeholder&quot;: &quot;main&quot;, &quot;git-widget-placeholder&quot;: &quot;main&quot;,
&quot;last_opened_file_path&quot;: &quot;/home/punix/Pyapps/wire-py&quot;, &quot;last_opened_file_path&quot;: &quot;/home/punix/Pyapps/wire-py&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot; &quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot;
} }
}</component> }</component>
<component name="RunManager"> <component name="RunManager" selected="Python.main">
<configuration name="main" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true"> <configuration name="main" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
<module name="wire-py" /> <module name="wire-py" />
<option name="ENV_FILES" value="" /> <option name="ENV_FILES" value="" />
@ -70,6 +85,33 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="start_wg" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
<module name="wire-py" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/start_wg.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<recent_temporary>
<list>
<item itemvalue="Python.start_wg" />
</list>
</recent_temporary>
</component> </component>
<component name="SharedIndexes"> <component name="SharedIndexes">
<attachedChunks> <attachedChunks>
@ -287,10 +329,47 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1725567453540</updated> <updated>1725567453540</updated>
</task> </task>
<option name="localTasksCounter" value="26" /> <task id="LOCAL-00026" summary="little fixes">
<option name="closed" value="true" />
<created>1725639633873</created>
<option name="number" value="00026" />
<option name="presentableId" value="LOCAL-00026" />
<option name="project" value="LOCAL" />
<updated>1725639633873</updated>
</task>
<task id="LOCAL-00027" summary="little fixes">
<option name="closed" value="true" />
<created>1725746027132</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1725746027132</updated>
</task>
<task id="LOCAL-00028" summary="little fixes replace os.system with check_call&#10;first steps in install Script add wg_start.service file">
<option name="closed" value="true" />
<created>1725820337669</created>
<option name="number" value="00028" />
<option name="presentableId" value="LOCAL-00028" />
<option name="project" value="LOCAL" />
<updated>1725820337669</updated>
</task>
<task id="LOCAL-00029" summary="little fixes a labels when stop and start, installer first functions works">
<option name="closed" value="true" />
<created>1725991610908</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1725991610908</updated>
</task>
<option name="localTasksCounter" value="30" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
<option name="OPEN_GENERIC_TABS">
<map>
<entry key="f9756e7d-0c5c-4b84-84e4-660314c46ea4" value="TOOL_WINDOW" />
</map>
</option>
<option name="TAB_STATES"> <option name="TAB_STATES">
<map> <map>
<entry key="MAIN"> <entry key="MAIN">
@ -310,13 +389,16 @@
</State> </State>
</value> </value>
</entry> </entry>
<entry key="f9756e7d-0c5c-4b84-84e4-660314c46ea4">
<value>
<State />
</value>
</entry>
</map> </map>
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="Tunnel Start and Stop Work" />
<MESSAGE value="wg_import_select in wg_func.py extended" />
<MESSAGE value="add class Frame and class Massage, delete funktion go 100%, add resize window" /> <MESSAGE value="add class Frame and class Massage, delete funktion go 100%, add resize window" />
<MESSAGE value="add class Frame and class Massage, delete funktion go 100%, add resize window, add warning pic" /> <MESSAGE value="add class Frame and class Massage, delete funktion go 100%, add resize window, add warning pic" />
<MESSAGE value="add class ListTunnels and class ImportTunnel, and add class ExportTunnels (ExportTunnels no finish)" /> <MESSAGE value="add class ListTunnels and class ImportTunnel, and add class ExportTunnels (ExportTunnels no finish)" />
@ -339,6 +421,9 @@
<MESSAGE value="add if question and add autoconnect, autoconnect_var to class Filehandle in box_set no finish!" /> <MESSAGE value="add if question and add autoconnect, autoconnect_var to class Filehandle in box_set no finish!" />
<MESSAGE value="fixes on empty Listbox now is disable and now works autoconnect label with read and write, delete works now with read and write" /> <MESSAGE value="fixes on empty Listbox now is disable and now works autoconnect label with read and write, delete works now with read and write" />
<MESSAGE value="add Frame widget 3&#10;for Buttons and Listbox with Scrollbar.&#10;all Widgets new format&#10;delete works now of disable checkbox when Listbox empty (part two)" /> <MESSAGE value="add Frame widget 3&#10;for Buttons and Listbox with Scrollbar.&#10;all Widgets new format&#10;delete works now of disable checkbox when Listbox empty (part two)" />
<option name="LAST_COMMIT_MESSAGE" value="add Frame widget 3&#10;for Buttons and Listbox with Scrollbar.&#10;all Widgets new format&#10;delete works now of disable checkbox when Listbox empty (part two)" /> <MESSAGE value="little fixes" />
<MESSAGE value="little fixes replace os.system with check_call&#10;first steps in install Script add wg_start.service file" />
<MESSAGE value="little fixes a labels when stop and start, installer first functions works" />
<option name="LAST_COMMIT_MESSAGE" value="little fixes a labels when stop and start, installer first functions works" />
</component> </component>
</project> </project>

34
install.py Executable file
View File

@ -0,0 +1,34 @@
#!/usr/bin/python3
from pathlib import Path
from getpass import getpass
# for services file in /lib/systemd/system/
config_path = Path.home() / ".config" / "wire_py" / "wg_py"
start_file = f'''\
#!/usr/bin/python3
from subprocess import check_call
path_to_file = {str(config_path)!r}
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: ')
#def cp_files():
# Define the command to run the Python script with sudo
#command = ['sudo', '-S', 'python3', 'script.py']
# Run the command as a subprocess, passing the sudo password
#subprocess.run(command, input=sudo_password.encode(), check=True)

96
main.py
View File

@ -1,13 +1,13 @@
#!/usr/bin/python3 #!/usr/bin/python3
import os import os
import tkinter as tk import tkinter as tk
from subprocess import check_call
from tkinter import ttk from tkinter import ttk
from pathlib import Path
from wg_func import (TunnelActiv, ListTunnels, ImportTunnel, ConToDict, GreenLabel, StartStopBTN, ShowAddress, from wg_func import (TunnelActiv, ListTunnels, ImportTunnel, ConToDict, GreenLabel, StartStopBTN, ShowAddress,
FileHandle, ExportTunnels, OnOff) FileHandle, ExportTunnels, OnOff)
font_color = '#4011a7' font_color = '#4011a7'
replacement = ''
class MainWindow(tk.Tk): class MainWindow(tk.Tk):
@ -35,8 +35,7 @@ class MainWindow(tk.Tk):
# App Menu # App Menu
self.app_menu = tk.Menu(self, borderwidth=0) self.app_menu = tk.Menu(self, borderwidth=0)
for item in self.app_menu.keys():
print(item, ': ', self.app_menu[item])
self.configure(menu=self.app_menu) self.configure(menu=self.app_menu)
self.app_menu.add_cascade(label='?') self.app_menu.add_cascade(label='?')
@ -47,6 +46,7 @@ class FrameWidgets(ttk.Frame):
def __init__(self, container, **kwargs): def __init__(self, container, **kwargs):
super().__init__(container, **kwargs) super().__init__(container, **kwargs)
self.auto_con = None
self.enp = None self.enp = None
self.DNS = None self.DNS = None
self.add = None self.add = None
@ -64,23 +64,24 @@ class FrameWidgets(ttk.Frame):
# Show active Tunnel # Show active Tunnel
self.a = TunnelActiv.active() self.a = TunnelActiv.active()
# Label Frame 1 # Label Frame 1
self.lb_frame_btn_lbox = ttk.Frame(self)
self.lb_frame_btn_lbox.configure(relief='flat')
self.lb_frame_btn_lbox.grid(column=0, rowspan=4, row=0)
self.columnconfigure(0, weight=1)
self.rowconfigure(0, weight=1)
# Label Frame 2
self.lb_frame = ttk.Frame(self) self.lb_frame = ttk.Frame(self)
self.lb_frame.configure(relief='solid') self.lb_frame.configure(relief='solid')
self.lb_frame.grid(column=2, row=1, sticky='snew', padx=20, pady=5) self.lb_frame.grid(column=2, row=1, sticky='snew', padx=20, pady=5)
self.columnconfigure(2, weight=1) self.columnconfigure(2, weight=1)
self.rowconfigure(1, weight=1) self.rowconfigure(1, weight=1)
# Label Frame 2 # Label Frame 3
self.lb_frame2 = ttk.Frame(self) self.lb_frame2 = ttk.Frame(self)
self.lb_frame2.configure(relief='solid') self.lb_frame2.configure(relief='solid')
self.lb_frame2.grid(column=2, row=2, sticky='snew', padx=20, pady=5) self.lb_frame2.grid(column=2, row=2, sticky='snew', padx=20, pady=5)
self.columnconfigure(2, weight=1) self.columnconfigure(2, weight=1)
self.rowconfigure(2, weight=1) self.rowconfigure(2, weight=1)
# Label Frame 3
self.lb_frame_buttons = ttk.Frame(self)
self.lb_frame_buttons.configure(relief='flat')
self.lb_frame_buttons.grid(column=0, rowspan=4, row=0)
self.columnconfigure(0, weight=1)
self.rowconfigure(0, weight=1)
# Show active Label # Show active Label
self.select_tunnel = None self.select_tunnel = None
self.lb = tk.Label(self, text='Active: ') self.lb = tk.Label(self, text='Active: ')
@ -104,17 +105,16 @@ class FrameWidgets(ttk.Frame):
# Listbox with Scrollbar # Listbox with Scrollbar
def enable_check_box(event): def enable_check_box(event):
tl = ListTunnels.tl_list() tl = ListTunnels.tl_list()
print(len(tl))
if len(tl) != 0: if len(tl) != 0:
self.wg_autostart.configure(state='normal') self.wg_autostart.configure(state='normal')
self.l_box = tk.Listbox(self.lb_frame_buttons, fg='#606060', selectmode='single') self.l_box = tk.Listbox(self.lb_frame_btn_lbox, fg='#606060', selectmode='single')
self.l_box.config(highlightthickness=0, relief='ridge') self.l_box.config(highlightthickness=0, relief='ridge')
self.l_box.config(font=('Ubuntu', 12, 'bold')) self.l_box.config(font=('Ubuntu', 12, 'bold'))
self.l_box.grid(column=1, rowspan=4, row=0, sticky='ns') self.l_box.grid(column=1, rowspan=4, row=0, sticky='ns')
self.l_box.event_add('<<ClickEvent>>', '<Button-1>') self.l_box.event_add('<<ClickEvent>>', '<Button-1>')
self.l_box.bind('<<ClickEvent>>', enable_check_box) self.l_box.bind('<<ClickEvent>>', enable_check_box)
self.scrollbar = ttk.Scrollbar(self.lb_frame_buttons, orient='vertical', command=self.l_box.yview) self.scrollbar = ttk.Scrollbar(self.lb_frame_btn_lbox, orient='vertical', command=self.l_box.yview)
self.scrollbar.grid(column=1, rowspan=4, row=0, sticky='nse') self.scrollbar.grid(column=1, rowspan=4, row=0, sticky='nse')
self.l_box.configure(yscrollcommand=self.scrollbar.set) self.l_box.configure(yscrollcommand=self.scrollbar.set)
self.rowconfigure(0, weight=1) self.rowconfigure(0, weight=1)
@ -127,13 +127,12 @@ class FrameWidgets(ttk.Frame):
# Button Vpn # Button Vpn
if self.a != '': if self.a != '':
StartStopBTN.button_stop(self) StartStopBTN.button_stop(self)
wg_read = os.environ['HOME'] + '/tester/' + str(self.a) + '.conf' wg_read = Path.home() / 'tester/' / str(self.a + '.conf')
file = open(wg_read, 'r') with open(wg_read, 'r') as file:
data = ConToDict.covert_to_dict(file) data = ConToDict.covert_to_dict(file)
# Address Label # Address Label
ShowAddress.init_and_report(self, data) ShowAddress.init_and_report(self, data)
ShowAddress.show_data(self) ShowAddress.show_data(self)
file.close()
else: else:
StartStopBTN.button_start(self) StartStopBTN.button_start(self)
# Address Label # Address Label
@ -143,7 +142,7 @@ class FrameWidgets(ttk.Frame):
ShowAddress.label_empty(self) ShowAddress.label_empty(self)
ShowAddress.show_data(self) ShowAddress.show_data(self)
# Button Import # Button Import
self.btn_i = tk.Button(self.lb_frame_buttons, self.btn_i = tk.Button(self.lb_frame_btn_lbox,
image=self.imp_pic, bd=0, image=self.imp_pic, bd=0,
command=lambda: ImportTunnel.wg_import_select(self)) command=lambda: ImportTunnel.wg_import_select(self))
self.btn_i.grid(column=0, row=1, padx=15, pady=8) self.btn_i.grid(column=0, row=1, padx=15, pady=8)
@ -152,49 +151,43 @@ class FrameWidgets(ttk.Frame):
try: try:
self.select_tunnel = self.l_box.curselection() self.select_tunnel = self.l_box.curselection()
select_tl = self.l_box.get(self.select_tunnel[0]) select_tl = self.l_box.get(self.select_tunnel[0])
os.system('nmcli connection delete ' + str(select_tl)) check_call(['nmcli', 'connection', 'delete', select_tl])
self.l_box.delete(self.select_tunnel[0]) self.l_box.delete(self.select_tunnel[0])
os.remove(os.environ['HOME'] + '/tester/' + str(select_tl) + '.conf') os.remove(Path.home() / 'tester/' / str(select_tl + '.conf'))
del_tl_read = open('wg_py.xml', 'r') path_to_file = Path.home() / '.config/wire_py/wg_py'
if 'false ' in del_tl_read: with open(path_to_file, 'r') as file2:
first_word = 'false ' for line in file2.readlines():
else: a_con = line[5:]
first_word = 'true ' if select_tl == a_con:
self.selected_option.set(0)
word_replace = '' self.autoconnect_var.set('no Autoconnect')
# using the for loop
for line in del_tl_read:
line = line.strip()
changes = line.replace(first_word + select_tl, '')
word_replace = word_replace + changes + "\n"
del_tl_read.close()
del_tl = open('wg_py.xml', 'w')
del_tl.write(word_replace)
del_tl.close()
# for disable checkbox when Listbox empty # for disable checkbox when Listbox empty
tl = ListTunnels.tl_list() tl = ListTunnels.tl_list()
if len(tl) == 0: if len(tl) == 0:
self.wg_autostart.configure(state='disabled') self.wg_autostart.configure(state='disabled')
with open(path_to_file, 'w') as file2:
file2.write('false')
if self.a != '' and self.a == select_tl: if self.a != '' and self.a == select_tl:
self.StrVar.set(value='') self.StrVar.set(value='')
StartStopBTN.button_start(self) StartStopBTN.button_start(self)
self.l_box.update() self.l_box.update()
# Address Label # Address Label
ShowAddress.label_empty(self) self.add.set('')
self.DNS.set('')
self.enp.set('')
return select_tl return select_tl
except IndexError: except IndexError:
pass pass
# Button Trash # Button Trash
self.btn_tr = tk.Button(self.lb_frame_buttons, image=self.tr_pic, bd=0, command=delete) self.btn_tr = tk.Button(self.lb_frame_btn_lbox, image=self.tr_pic, bd=0, command=delete)
self.btn_tr.grid(column=0, row=2, padx=15, pady=8) self.btn_tr.grid(column=0, row=2, padx=15, pady=8)
# Button Export # Button Export
self.btn_exp = tk.Button(self.lb_frame_buttons, image=self.exp_pic, bd=0, command=ExportTunnels.wg_export) self.btn_exp = tk.Button(self.lb_frame_btn_lbox, image=self.exp_pic, bd=0, command=ExportTunnels.wg_export)
self.btn_exp.grid(column=0, row=3, padx=15, pady=8) self.btn_exp.grid(column=0, row=3, padx=15, pady=8)
# Button Rename # Button Rename
@ -203,7 +196,11 @@ class FrameWidgets(ttk.Frame):
# Check Buttons # Check Buttons
self.selected_option = tk.IntVar() self.selected_option = tk.IntVar()
self.autoconnect_var = tk.StringVar()
self.autoconnect_var.set(self.auto_con)
self.autoconnect = tk.Label(self, textvariable=self.autoconnect_var, fg='blue', padx=5)
self.autoconnect.config(font=('Ubuntu', 11))
self.autoconnect.grid(column=0, row=4, sticky='ne', pady=20)
self.wg_autostart = tk.Checkbutton(self, self.wg_autostart = tk.Checkbutton(self,
text='Autoconnect on:', text='Autoconnect on:',
variable=self.selected_option, variable=self.selected_option,
@ -223,14 +220,13 @@ class FrameWidgets(ttk.Frame):
StartStopBTN.button_start(self) StartStopBTN.button_start(self)
self.select_tunnel = self.l_box.curselection() self.select_tunnel = self.l_box.curselection()
select_tl = self.l_box.get(self.select_tunnel[0]) select_tl = self.l_box.get(self.select_tunnel[0])
os.system('nmcli connection up ' + str(select_tl)) check_call(['nmcli', 'connection', 'up', select_tl])
wg_read = os.environ['HOME'] + '/tester/' + str(select_tl) + '.conf' wg_read = Path.home() / 'tester/' / str(select_tl + '.conf')
file = open(wg_read, 'r') with open(wg_read, 'r') as file:
data = ConToDict.covert_to_dict(file) data = ConToDict.covert_to_dict(file)
# Address Label # Address Label
ShowAddress.init_and_report(self, data) ShowAddress.init_and_report(self, data)
ShowAddress.show_data(self) ShowAddress.show_data(self)
file.close()
# Button Start/Stop # Button Start/Stop
StartStopBTN.button_stop(self) StartStopBTN.button_stop(self)
self.a = TunnelActiv.active() self.a = TunnelActiv.active()
@ -240,14 +236,16 @@ class FrameWidgets(ttk.Frame):
elif self.a != '': elif self.a != '':
# Button Start/Stop # Button Start/Stop
StartStopBTN.button_stop(self) StartStopBTN.button_stop(self)
os.system('nmcli connection down ' + str(self.a)) check_call(['nmcli', 'connection', 'down', self.a])
# Button Start/Stop # Button Start/Stop
StartStopBTN.button_start(self) StartStopBTN.button_start(self)
self.a = TunnelActiv.active() self.a = TunnelActiv.active()
self.StrVar.set('') self.StrVar.set('')
GreenLabel.green_show_label(self) GreenLabel.green_show_label(self)
# Address Label # Address Label
ShowAddress.label_empty(self) self.add.set('')
self.DNS.set('')
self.enp.set('')
ShowAddress.show_data(self) ShowAddress.show_data(self)
except IndexError: except IndexError:
pass pass

9
start_wg.py Executable file
View File

@ -0,0 +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, 'r') as file:
*_, line = file
a_con = line[5:]
check_call(['nmcli', 'connection', 'up', a_con])

View File

@ -4,37 +4,40 @@ import shutil
from datetime import datetime from datetime import datetime
from tkinter import filedialog, ttk from tkinter import filedialog, ttk
import tkinter as tk import tkinter as tk
from pathlib import Path
from subprocess import check_call
font_color = '#4011a7' font_color = '#4011a7'
path_to_file = Path.home() / '.config/wire_py/wg_py'
class Message(tk.Tk): def msg_window():
def __init__(self, *args, **kwargs): msg = tk.Toplevel()
super().__init__(*args, **kwargs) msg.resizable(width=False, height=False)
msg.x_width = 340
self.warning_pic = None msg.y_height = 140
self.x_width = 300 msg.title('Import error!')
self.y_height = 120 msg.monitor_center_x = msg.winfo_screenwidth() / 2 - (msg.x_width / 2)
self.monitor_center_x = self.winfo_screenwidth() / 2 - (self.x_width / 2) msg.monitor_center_y = msg.winfo_screenheight() / 2 - (msg.y_height / 2)
self.monitor_center_y = self.winfo_screenheight() / 2 - (self.y_height / 2) msg.geometry('%dx%d+%d+%d' % (msg.x_width, msg.y_height, msg.monitor_center_x, msg.monitor_center_y))
self.resizable(width=False, height=False) msg.columnconfigure(0, weight=1)
self.title('Import error!') msg.configure(pady=20)
self.configure() msg.warning = tk.PhotoImage(file=r'icons/warning_64.png')
self.geometry('%dx%d+%d+%d' % (self.x_width, self.y_height, self.monitor_center_x, self.monitor_center_y)) msg.i_warning = tk.Label(msg, image=msg.warning)
self.columnconfigure(0, weight=1) msg.i_warning.grid(column=0, row=0)
label = tk.Label(msg, text='Oh... no valid Wireguard File!\nPlease select a valid Wireguard File')
self.label = tk.Label(self, image=self.warning_pic, label.config(font=('Ubuntu', 11), padx=15, pady=15)
text='Oh... no valid Wireguard File!\nPlease select a valid Wireguard File') label.grid(column=1, row=0)
self.label.config(font=('Ubuntu', 11), padx=15, pady=15) button = tk.Button(msg, text='OK', command=msg.destroy)
self.label.grid(column=0, row=0) button.config(padx=15, pady=5)
self.button = tk.Button(self, text='OK', command=self.destroy) button.grid(column=0, columnspan=2, row=1)
self.button.config(padx=15, pady=5) wg_icon_2 = tk.PhotoImage(file=r'icons/wg-stop.png')
self.button.grid(column=0, row=1) msg.iconphoto(True, wg_icon_2)
msg.winfo_toplevel()
class GreenLabel(tk.Tk): class GreenLabel:
def __init__(self, container, **kwargs): def __init__(self):
super().__init__(container, **kwargs)
self.StrVar = None self.StrVar = None
self.lb_tunnel = None self.lb_tunnel = None
@ -45,27 +48,28 @@ class GreenLabel(tk.Tk):
self.columnconfigure(2, weight=1) self.columnconfigure(2, weight=1)
self.rowconfigure(0, weight=1) self.rowconfigure(0, weight=1)
def columnconfigure(self, param, weight):
pass
class StartStopBTN(tk.Tk): def rowconfigure(self, param, weight):
def __init__(self, *args, **kwargs): pass
super().__init__(*args, **kwargs)
self.lb_frame_buttons = None
class StartStopBTN:
def __init__(self):
self.lb_frame_btn_lbox = None
self.wg_switch = None self.wg_switch = None
self.btn_stst = None self.btn_stst = None
self.wg_vpn_start = tk.PhotoImage(file=r'icons/wg-vpn-start-48.png') self.wg_vpn_start = tk.PhotoImage(file=r'icons/wg-vpn-start-48.png')
self.wg_vpn_stop = tk.PhotoImage(file=r'icons/wg-vpn-stop-48.png') self.wg_vpn_stop = tk.PhotoImage(file=r'icons/wg-vpn-stop-48.png')
def button_stop(self): def button_stop(self):
self.btn_stst = tk.Button(self.lb_frame_buttons, image=self.wg_vpn_stop, bd=0, command=self.wg_switch) self.btn_stst = tk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_stop, bd=0, command=self.wg_switch)
self.btn_stst.grid(column=0, row=0, padx=15, pady=8) self.btn_stst.grid(column=0, row=0, padx=15, pady=8)
#self.columnconfigure(0, weight=1)
#self.rowconfigure(0, weight=1)
def button_start(self): def button_start(self):
self.btn_stst = tk.Button(self.lb_frame_buttons, image=self.wg_vpn_start, bd=0, command=self.wg_switch) self.btn_stst = tk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_start, bd=0, command=self.wg_switch)
self.btn_stst.grid(column=0, row=0, padx=15, pady=8) self.btn_stst.grid(column=0, row=0, padx=15, pady=8)
#self.columnconfigure(0, weight=1)
#self.rowconfigure(0, weight=1)
class ConToDict: class ConToDict:
@ -115,9 +119,8 @@ class TunnelActiv:
return active return active
class ShowAddress(tk.Tk): class ShowAddress:
def __init__(self, container, **kwargs): def __init__(self):
super().__init__(container, **kwargs)
self.lb_frame2 = None self.lb_frame2 = None
self.lb_frame = None self.lb_frame = None
self.endpoint = None self.endpoint = None
@ -165,10 +168,9 @@ class ListTunnels:
class ImportTunnel: class ImportTunnel:
def __init__(self): def __init__(self):
self.enp = None
self.DNS = None
self.add = None
self.select_tunnel = None self.select_tunnel = None
self.wg_switch = None self.wg_switch = None
self.btn_stst = None self.btn_stst = None
@ -179,27 +181,30 @@ class ImportTunnel:
def wg_import_select(self): def wg_import_select(self):
try: try:
filepath = filedialog.askopenfilename(initialdir=os.environ['HOME'], title='Select Wireguard config File', filepath = filedialog.askopenfilename(initialdir=Path.home(), title='Select Wireguard config File',
filetypes=[('WG config files', '*.conf')]) filetypes=[('WG config files', '*.conf')], )
file = open(filepath, 'r') with open(filepath, 'r') as file:
read = file.read() read = file.read()
file.close()
path_split = filepath.split('/') path_split = filepath.split('/')
path_split1 = path_split[-1] path_split1 = path_split[-1]
self.a = TunnelActiv.active()
if 'PrivateKey = ' in read and 'PublicKey = ' in read: if 'PrivateKey = ' in read and 'PublicKey = ' in read:
if len(path_split1) > 17: if len(path_split1) > 17:
p1 = shutil.copy(filepath, os.environ['HOME'] + '/tester/') p1 = shutil.copy(filepath, Path.home() / 'tester/')
path_split = path_split1[len(path_split1) - 17:] path_split = path_split1[len(path_split1) - 17:]
os.rename(p1, os.environ['HOME'] + '/tester/' + str(path_split)) os.rename(p1, Path.home() / 'tester/' / str(path_split))
if self.a != '': if self.a != '':
os.system('nmcli connection down ' + str(TunnelActiv.active())) check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
os.system('nmcli connection import type wireguard file ' + os.environ['HOME'] + '/tester/' + ShowAddress.label_empty(self)
str(path_split)) check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', Path.home() / 'tester' /
path_split])
else: else:
shutil.copy(filepath, os.environ['HOME'] + '/tester/') shutil.copy(filepath, Path.home() / 'tester/')
if self.a != '': if self.a != '':
os.system('nmcli connection down ' + str(TunnelActiv.active())) check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
os.system('nmcli connection import type wireguard file ' + str(filepath)) ShowAddress.label_empty(self)
check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', filepath])
self.StrVar.set('') self.StrVar.set('')
self.a = TunnelActiv.active() self.a = TunnelActiv.active()
@ -209,19 +214,15 @@ class ImportTunnel:
self.StrVar.set(self.a) self.StrVar.set(self.a)
GreenLabel.green_show_label(self) GreenLabel.green_show_label(self)
StartStopBTN.button_stop(self) StartStopBTN.button_stop(self)
wg_read = os.environ['HOME'] + '/tester/' + str(self.a) + '.conf' wg_read = Path.home() / 'tester/' / str(self.a + '.conf')
file = open(wg_read, 'r') with open(wg_read, 'r') as file:
data = ConToDict.covert_to_dict(file) data = ConToDict.covert_to_dict(file)
# Address Label # Address Label
ShowAddress.init_and_report(self, data) ShowAddress.init_and_report(self, data)
ShowAddress.show_data(self) ShowAddress.show_data(self)
file.close() check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
os.system('nmcli con mod ' + str(self.a) + ' connection.autoconnect no')
new_tl = open('wg_py.xml', 'a')
new_tl.write('false ' + str(self.a) + '\n')
new_tl.close()
if 'PrivateKey = ' not in read: if 'PrivateKey = ' not in read:
Message() msg_window()
except EOFError: except EOFError:
pass pass
except TypeError: except TypeError:
@ -241,34 +242,20 @@ class FileHandle:
self.tl = None self.tl = None
self.selected_option = None self.selected_option = None
self.l_box = None self.l_box = None
self.select_tunnel = None
def box_set(self): def box_set(self):
word_replace = ''
try: try:
self.select_tunnel = self.l_box.curselection() select_tunnel = self.l_box.curselection()
select_tl = self.l_box.get(self.select_tunnel[0]) select_tl = self.l_box.get(select_tunnel[0])
if self.selected_option.get() == 0: if self.selected_option.get() == 0:
set_on = open('wg_py.xml', 'r') with open(path_to_file, 'w') as off:
# using the for loop off.write('false ' + '\n')
for line in set_on: tl = ListTunnels.tl_list()
line = line.strip() if len(tl) == 0:
changes = line.replace('true ' + select_tl, 'false ' + select_tl) self.wg_autostart.configure(state='disabled')
os.system('nmcli con mod ' + str(self.auto_con) + ' connection.autoconnect no')
word_replace = word_replace + changes + "\n"
set_on.close()
if self.selected_option.get() >= 1: if self.selected_option.get() >= 1:
set_on = open('wg_py.xml', 'r') with open(path_to_file, 'w') as set_on:
# using the for loop set_on.write('true ' + select_tl)
for line in set_on:
line = line.strip()
changes = line.replace('false ' + select_tl, 'true ' + select_tl)
os.system('nmcli con mod ' + str(select_tl) + ' connection.autoconnect yes')
word_replace = word_replace + changes + "\n"
set_on.close()
set_off = open('wg_py.xml', 'w')
set_off.write(word_replace)
set_off.close()
except IndexError: except IndexError:
self.selected_option.set(1) self.selected_option.set(1)
@ -276,26 +263,26 @@ class FileHandle:
OnOff.on_off(self) OnOff.on_off(self)
class OnOff(tk.Tk, FileHandle): class OnOff:
def __init__(self, container, **kwargs): def __init__(self):
super().__init__(container, **kwargs) self.wg_autostart = None
self.selected_option = None
self.auto_con = None
self.autoconnect = None
self.autoconnect_var = None
self.lb_frame_buttons = None self.lb_frame_buttons = None
def on_off(self): def on_off(self):
a_connect = {} with open(path_to_file, 'r') as file:
on_or_off = open('wg_py.xml', 'r') for line in file.readlines():
for line in on_or_off.readlines(): a_connect = line
line_splitted = line.split() if 'true' in a_connect:
a_connect[line_splitted[0]] = line_splitted[1] self.selected_option.set(1)
if 'true' in a_connect: self.autoconnect_var.set('')
self.selected_option.set(1) self.auto_con = a_connect[5:]
self.autoconnect_var.set('') else:
self.auto_con = a_connect['true'] self.wg_autostart.configure(state='disabled')
self.auto_con = 'no Autoconnect'
else:
self.wg_autostart.configure(state='disabled')
self.auto_con = 'no Autoconnect'
on_or_off.close()
self.autoconnect_var = tk.StringVar() self.autoconnect_var = tk.StringVar()
self.autoconnect_var.set(self.auto_con) self.autoconnect_var.set(self.auto_con)
@ -308,12 +295,12 @@ class ExportTunnels:
@staticmethod @staticmethod
def wg_export(): def wg_export():
now_time = datetime.now() now_time = datetime.now()
now_datetime = now_time.strftime('/wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M') now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
tl = ListTunnels.tl_list() tl = ListTunnels.tl_list()
try: try:
if len(tl) != 0: if len(tl) != 0:
wg_tar = os.environ['HOME'] + now_datetime wg_tar = Path.home() / now_datetime
p_to_conf = os.environ['HOME'] + '/tester' p_to_conf = Path.home() / 'tester/'
shutil.make_archive(wg_tar, 'zip', p_to_conf) shutil.make_archive(wg_tar, 'zip', p_to_conf)
#if zip_full != 0: #if zip_full != 0:
#print('Export erfolgraeich') #print('Export erfolgraeich')

0
wg_py Normal file
View File

View File

@ -1,2 +0,0 @@
false peer_iasus
false rverEppingen

10
wg_start.service Normal file
View File

@ -0,0 +1,10 @@
[Unit]
Description=Automatic Tunnel Start
After=network-online.target
[Service]
Type=oneshot
ExecStartPre=/bin/sleep 3
ExecStart=/bin/start_wg.py
[Install]
WantedBy=multi-user.target