punix/Wire-Py
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 8 Wiki Activity

28-09-2024 #15

Merged
punix merged 28 commits from 28-09-2024 into main 2024-09-28 14:17:38 +02:00
Conversation 0 Commits 28 Files Changed 65 +223 -115
59 changed files with 223 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 80c29c4f11 - Show all commits

169
.idea/workspace.xml
View File

@ -4,15 +4,75 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="little fixes, add msg_window() &#10;function for Messagebox to show a tk.Toplevel()&#10;replace var = open() with: &#10;with open() as var:&#10;and remove by classes (tk.tk) and super()">
<change afterPath="$PROJECT_DIR$/test.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/test2.py" afterDir="false" />
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="in delete replace open with Path&#10;install fixes">
<change afterPath="$PROJECT_DIR$/Wire-Py.desktop" afterDir="false" />
<change afterPath="$PROJECT_DIR$/install" afterDir="false" />
<change afterPath="$PROJECT_DIR$/org.wirepy.policy" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wirepy" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_export.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_import.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_msg.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_trash.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_vpn-start.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_vpn-stop.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_vpn.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/256/wg_export.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/256/wg_import.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_export.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_import.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_msg.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_trash.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_vpn-start.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_vpn-stop.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_vpn.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/error.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_export.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_import.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_msg.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_trash.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_vpn-start.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_vpn-stop.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_vpn.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_export.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_import.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_msg.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_trash.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_vpn-start.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_vpn-stop.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_vpn.png" 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$/icons/warning_128.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/128/error.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/warning_256.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/256/error.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/warning_32.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/warning_64.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/64/error.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-active.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-export-48.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-export.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-import-orig.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-import.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-info.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-stop.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/256/wg_msg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-trash-48.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-trash-64.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-trash-info.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-trash.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/256/wg_trash.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn-48.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn-info.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn-start-48.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn-start.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/256/wg_vpn-start.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn-stop-48.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn-stop.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/256/wg_vpn-stop.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/256/wg_vpn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wire-switch-off-256.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wire-switch-off-48.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wire-switch-on-256.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wire-switch-on-48.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/32/error.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/install.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_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" />
<change beforePath="$PROJECT_DIR$/wg_start.service" beforeDir="false" afterPath="$PROJECT_DIR$/wg_start.service" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -46,44 +106,33 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&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.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;git-widget-placeholder&quot;: &quot;main&quot;,
&quot;last_opened_file_path&quot;: &quot;/home/punix/Pyapps/wire-py&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot;
<component name="PropertiesComponent"><![CDATA[{
"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",
"Python.wg_main.executor": "Run",
"RunOnceActivity.ShowReadmeOnStart": "true",
"Shell Script.install.executor": "Run",
"git-widget-placeholder": "main",
"last_opened_file_path": "/home/punix/Pyapps/wire-py",
"settings.editor.selected.configurable": "preferences.fileTypes"
}
}</component>
<component name="RunManager" selected="Python.main">
<configuration name="main" type="PythonConfigurationType" factoryName="Python" 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$/main.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>
}]]></component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$" />
<recent name="$PROJECT_DIR$/wire-py" />
</key>
</component>
<component name="RunManager" selected="Python.wg_main">
<configuration name="start_wg" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
<module name="wire-py" />
<option name="ENV_FILES" value="" />
@ -106,6 +155,28 @@
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="wg_main" type="PythonConfigurationType" factoryName="Python" 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$/wg_main.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" />
@ -368,7 +439,15 @@
<option name="project" value="LOCAL" />
<updated>1726349168248</updated>
</task>
<option name="localTasksCounter" value="31" />
<task id="LOCAL-00031" summary="in delete replace open with Path&#10;install fixes">
<option name="closed" value="true" />
<created>1726359012150</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1726359012150</updated>
</task>
<option name="localTasksCounter" value="32" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -406,7 +485,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<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 Label Interface and Peer to new FrameWidget one and two. when import Tunnel then add to list works and remove of list when Tunnel delete.(with Label active on and off) &#10;add to class and methods open a avtive Tunnel when Wire-Py open, when import and start a Tunnel" />
<MESSAGE value="add file dict_to_address for &#10;address a active Tunnel. Label green pack in Class.&#10;add Class to convert fileoutput as String to Dictionary" />
@ -431,6 +509,7 @@
<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" />
<MESSAGE value="little fixes, add msg_window() &#10;function for Messagebox to show a tk.Toplevel()&#10;replace var = open() with: &#10;with open() as var:&#10;and remove by classes (tk.tk) and super()" />
<option name="LAST_COMMIT_MESSAGE" value="little fixes, add msg_window() &#10;function for Messagebox to show a tk.Toplevel()&#10;replace var = open() with: &#10;with open() as var:&#10;and remove by classes (tk.tk) and super()" />
<MESSAGE value="in delete replace open with Path&#10;install fixes" />
<option name="LAST_COMMIT_MESSAGE" value="in delete replace open with Path&#10;install fixes" />
</component>
</project>

7
Wire-Py.desktop Executable file
View File

@ -0,0 +1,7 @@
[Desktop Entry]
Type=Application
Name=Wire-Py
Exec=/usr/bin/wirepy
Terminal=false
Categories=Network;
Icon=/usr/share/icons/wp-icons/128/wg-vpn.png

BIN
icons/warning_32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
icons/wg-active.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
icons/wg-info.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

BIN
icons/wg-trash-info.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
icons/wg-vpn-info.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
icons/wire-switch-off-256.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
icons/wire-switch-off-48.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.2 KiB

BIN
icons/wire-switch-on-256.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

39
install Executable file
View File

@ -0,0 +1,39 @@
#!/bin/bash
USER_FOR_GROUP=$USER
which sudo >/dev/null
if [ $? -ne 0 ]
then
su -
apt install python3-tk && apt install tcl-ttkthemes && \
cp wg_main.py start_wg.py wg_func.py wirepy /usr/bin/ && \
mkdir -p /etc/wire_py && cp -R wp-icons /usr/share/icons/ && \
if [ ! -e /usr/local/bin/wirepy ]
then
sudo ln -s /usr/bin/wirepy.py /usr/local/bin/wirepy
fi
cp org.wirepy.policy /usr/share/polkit-1/actions/ && \
cp Wire-Py.desktop /usr/share/applications/ && \
chown -R root:root /usr/bin/wire-py && \
cp wg_start.services /lib/systemd/system/ && \
systemctl enable wg_start.service
else
sudo apt install python3-tk && sudo apt install tcl-ttkthemes && \
sudo cp wg_main.py start_wg.py wg_func.py wirepy /usr/bin/ && \
sudo mkdir -p /etc/wire_py && sudo cp -R wp-icons /usr/share/icons/ && \
if [ ! -e /usr/local/bin/wirepy ]
then
sudo ln -s /usr/bin/wirepy.py /usr/local/bin/wirepy
fi
sudo cp org.wirepy.policy /usr/share/polkit-1/actions/ && \
sudo cp Wire-Py.desktop /usr/share/applications/ && \
sudo chown -R root:root /usr/bin/ && \
sudo cp wg_start.service /lib/systemd/system/ && \
sudo systemctl enable wg_start.service
fi
read -n 1 -s -r -p $"To close the Window press a button"

35
install.py
View File

@ -1,35 +0,0 @@
#!/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
from pathlib import Path
path_to_file = Path.home() / '.config/wire_py/wg_py'
if Path.exists(path_to_file):
a_con = Path.read_text(path_to_file)
check_call(['nmcli', 'connection', 'up', a_con])
else:
pass
'''
Path("start_wg.py").write_text(start_file)
config_path.parent.mkdir(exist_ok=True)
# 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)

16
org.wirepy.policy Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
<policyconfig>
<vendor>Project Wire-Py</vendor>
<vendor_url>https://git.ilunix.de/punix/Wire-Py</vendor_url>
<icon_name>wg-vpn</icon_name>
<action id="org.wirepy">
<defaults>
<allow_any>auth_admin_keep</allow_any>
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/wire-py/main.py</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
</policyconfig>

2
start_wg.py
View File

@ -2,7 +2,7 @@
from subprocess import check_call
from pathlib import Path
path_to_file = Path.home() / '.config/wire_py/wg_py'
path_to_file = Path('/etc/wire_py/wg_py')
if Path.exists(path_to_file):
a_con = Path.read_text(path_to_file)

28
wg_func.py
View File

@ -8,7 +8,7 @@ from pathlib import Path
from subprocess import check_call
font_color = '#4011a7'
path_to_file = Path.home() / '.config/wire_py/wg_py'
path_to_file = Path('/etc/wire_py/wg_py')
def msg_window():
@ -22,7 +22,7 @@ def msg_window():
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.warning = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/64/warning.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')
@ -31,7 +31,7 @@ def msg_window():
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')
wg_icon_2 = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_msg.png')
msg.iconphoto(True, wg_icon_2)
msg.winfo_toplevel()
@ -60,8 +60,8 @@ class StartStopBTN:
self.lb_frame_btn_lbox = None
self.wg_switch = None
self.btn_stst = None
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_start = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-start.png')
self.wg_vpn_stop = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-stop.png')
def button_stop(self):
self.btn_stst = tk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_stop, bd=0, command=self.wg_switch)
@ -181,7 +181,7 @@ class ImportTunnel:
def wg_import_select(self):
try:
filepath = filedialog.askopenfilename(initialdir=Path.home(), title='Select Wireguard config File',
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()
@ -190,17 +190,17 @@ class ImportTunnel:
self.a = TunnelActiv.active()
if 'PrivateKey = ' in read and 'PublicKey = ' in read:
if len(path_split1) > 17:
p1 = shutil.copy(filepath, Path.home() / 'tester/')
p1 = shutil.copy(filepath, Path('/etc/wire_py/'))
path_split = path_split1[len(path_split1) - 17:]
os.rename(p1, Path.home() / 'tester/' / str(path_split))
os.rename(p1, Path('/etc/wire_py') / 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', Path.home() / 'tester' /
check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', 'etc', '/wire_py',
path_split])
else:
shutil.copy(filepath, Path.home() / 'tester/')
shutil.copy(filepath, Path('/etc/wire_py/'))
if self.a != '':
check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
ShowAddress.label_empty(self)
@ -214,7 +214,7 @@ class ImportTunnel:
self.StrVar.set(self.a)
GreenLabel.green_show_label(self)
StartStopBTN.button_stop(self)
wg_read = Path.home() / 'tester/' / str(self.a + '.conf')
wg_read = Path('/etc/wire_py') / str(self.a + '.conf')
with open(wg_read, 'r') as file:
data = ConToDict.covert_to_dict(file)
# Address Label
@ -273,6 +273,8 @@ class OnOff:
if Path.exists(path_to_file):
self.selected_option.set(1)
self.autoconnect_var.set('')
if not Path.is_dir(Path('/etc/wire_py')):
Path.mkdir(Path('/etc/wire_py'))
self.auto_con = Path.read_text(path_to_file)
else:
self.wg_autostart.configure(state='disabled')
@ -293,8 +295,8 @@ class ExportTunnels:
tl = ListTunnels.tl_list()
try:
if len(tl) != 0:
wg_tar = Path.home() / now_datetime
p_to_conf = Path.home() / 'tester/'
wg_tar = Path('/home/*/') / now_datetime
p_to_conf = Path('/etc/wire_py/')
shutil.make_archive(wg_tar, 'zip', p_to_conf)
#if zip_full != 0:
#print('Export erfolgraeich')

35
main.py → wg_main.py
View File

@ -1,5 +1,4 @@
#!/usr/bin/python3
import os
import tkinter as tk
from subprocess import check_call
from tkinter import ttk
@ -29,7 +28,7 @@ class MainWindow(tk.Tk):
self.style = ttk.Style(self)
self.style.theme_use('clam')
# Load the image file from disk.
self.wg_icon = tk.PhotoImage(file=r'icons/wg-vpn-48.png')
self.wg_icon = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn.png')
# Set it as the window icon.
self.iconphoto(True, self.wg_icon)
@ -54,12 +53,12 @@ class FrameWidgets(ttk.Frame):
self.peer = None
self.lb_tunnel = None
self.wg_read = None
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.imp_pic = tk.PhotoImage(file=r'icons/wg-import.png')
self.tr_pic = tk.PhotoImage(file=r'icons/wg-trash-48.png')
self.exp_pic = tk.PhotoImage(file=r'icons/wg-export-48.png')
self.warning_pic = tk.PhotoImage(file=r'icons/warning_64.png')
self.wg_vpn_start = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-start.png')
self.wg_vpn_stop = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-stop.png')
self.imp_pic = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_import.png')
self.tr_pic = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_trash.png')
self.exp_pic = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_export.png')
self.warning_pic = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/64/warning.png')
# Show active Tunnel
self.a = TunnelActiv.active()
@ -127,7 +126,7 @@ class FrameWidgets(ttk.Frame):
# Button Vpn
if self.a != '':
StartStopBTN.button_stop(self)
wg_read = Path.home() / 'tester/' / str(self.a + '.conf')
wg_read = Path('/etc/wire_py') / str(self.a + '.conf')
with open(wg_read, 'r') as file:
data = ConToDict.covert_to_dict(file)
# Address Label
@ -154,16 +153,14 @@ 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])
Path.unlink(Path.home() / 'tester/' / str(select_tl + '.conf'))
path_to_file = Path.home() / '.config/wire_py/wg_py'
if Path.exists(path_to_file):
if Path.is_file(Path('/etc/wire_py/wg_py')):
path_to_file = Path('/etc/wire_py') / 'wg_py'
a_con = Path.read_text(path_to_file)
if select_tl == a_con:
self.selected_option.set(0)
self.autoconnect_var.set('no Autoconnect')
Path.unlink(path_to_file)
if select_tl == a_con:
self.selected_option.set(0)
self.autoconnect_var.set('no Autoconnect')
Path.unlink(path_to_file)
Path.unlink(Path('/etc/wire_py') / str(select_tl + '.conf'))
# for disable checkbox when Listbox empty
tl = ListTunnels.tl_list()
if len(tl) == 0:
@ -222,7 +219,7 @@ 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 = Path.home() / 'tester/' / str(select_tl + '.conf')
wg_read = Path('/etc/wire_py') / str(select_tl + '.conf')
with open(wg_read, 'r') as file:
data = ConToDict.covert_to_dict(file)
# Address Label

0
wg_py
View File

4
wg_start.service
View File

@ -4,7 +4,7 @@ After=network-online.target
[Service]
Type=oneshot
ExecStartPre=/bin/sleep 3
ExecStart=/bin/start_wg.py
ExecStartPre=/bin/sleep 5
ExecStart=/usr/bin/start_wg.py
[Install]
WantedBy=multi-user.target

3
wirepy Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
pkexec /usr/bin/wg_main.py

0
icons/warning_128.png → wp-icons/128/error.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
wp-icons/128/wg_export.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
wp-icons/128/wg_import.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
wp-icons/128/wg_msg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
wp-icons/128/wg_trash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
wp-icons/128/wg_vpn-start.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
wp-icons/128/wg_vpn-stop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
wp-icons/128/wg_vpn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

0
icons/warning_256.png → wp-icons/256/error.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
icons/wg-export.png → wp-icons/256/wg_export.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

0
icons/wg-import-orig.png → wp-icons/256/wg_import.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

0
icons/wg-stop.png → wp-icons/256/wg_msg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
icons/wg-trash.png → wp-icons/256/wg_trash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
icons/wg-vpn-start.png → wp-icons/256/wg_vpn-start.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
icons/wg-vpn-stop.png → wp-icons/256/wg_vpn-stop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
icons/wg-vpn.png → wp-icons/256/wg_vpn.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
icons/wire-switch-on-48.png → wp-icons/32/error.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
wp-icons/32/wg_export.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
wp-icons/32/wg_import.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
wp-icons/32/wg_msg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
wp-icons/32/wg_trash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
wp-icons/32/wg_vpn-start.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
wp-icons/32/wg_vpn-stop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
wp-icons/32/wg_vpn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
wp-icons/48/error.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

0
icons/wg-export-48.png → wp-icons/48/wg_export.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

0
icons/wg-import.png → wp-icons/48/wg_import.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
wp-icons/48/wg_msg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

0
icons/wg-trash-48.png → wp-icons/48/wg_trash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

0
icons/wg-vpn-start-48.png → wp-icons/48/wg_vpn-start.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

0
icons/wg-vpn-stop-48.png → wp-icons/48/wg_vpn-stop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

0
icons/wg-vpn-48.png → wp-icons/48/wg_vpn.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
icons/warning_64.png → wp-icons/64/error.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
wp-icons/64/wg_export.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
wp-icons/64/wg_import.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
wp-icons/64/wg_msg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.2 KiB

0
icons/wg-trash-64.png → wp-icons/64/wg_trash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
wp-icons/64/wg_vpn-start.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
wp-icons/64/wg_vpn-stop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.7 KiB

BIN
wp-icons/64/wg_vpn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB