Compare commits
38 Commits
448d09ca4a
...
1.10.0424
Author | SHA1 | Date | |
---|---|---|---|
f9d4256679 | |||
cf94bf3d1d | |||
a0b895438c | |||
438e2b9de7 | |||
825aa46fae | |||
d39a16cab8 | |||
e1623ab184 | |||
6689d8110f | |||
392b6c94b5 | |||
8cd5fc28e4 | |||
428854f25a | |||
63b9c7935b | |||
9899395cf9 | |||
7e461db7a9 | |||
f90b10f948 | |||
53f1d4e8f4 | |||
217a73182a | |||
a3f3604a1f | |||
41391b0ef1 | |||
3965844b6b | |||
b633fac5a0 | |||
4e841301f7 | |||
ad59c3ba00 | |||
5c06db3681 | |||
94558d32a9 | |||
b8b9b5f8f7 | |||
53124ed7c4 | |||
0fbdcb826a | |||
4c89488950 | |||
c0ae2d2b75 | |||
e4774abf19 | |||
7b1e543428 | |||
6f83fc7162 | |||
b70400b456 | |||
e25bc154ea | |||
7aa3cd75fe | |||
0b9eec8d1d | |||
b9083d4698 |
407
.idea/workspace.xml
generated
407
.idea/workspace.xml
generated
@ -4,75 +4,13 @@
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="new format little fixes icons sort add policy add .desktop File install Part 2">
|
||||
<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" />
|
||||
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="Changelog create When exporting, the folder is now copied to /tmp and the non .conf files are deleted before the zip file is created. In main.py os import removed. Since os have been replaced by pathlib and shutil. Start with version number 1.4.7 Message window size corrected so text is displayed better">
|
||||
<change afterPath="$PROJECT_DIR$/wire-py1.10.0424.tar.gz" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/Changelog" beforeDir="false" afterPath="$PROJECT_DIR$/Changelog" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/install" beforeDir="false" afterPath="$PROJECT_DIR$/install" 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" />
|
||||
<change beforePath="$PROJECT_DIR$/wg_main.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_main.py" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@ -106,23 +44,23 @@
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<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 name="PropertiesComponent">{
|
||||
"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.lookFeel"
|
||||
}
|
||||
}]]></component>
|
||||
}</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$" />
|
||||
@ -199,62 +137,6 @@
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1723279982210</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="Tunnel Start and Stop Work">
|
||||
<option name="closed" value="true" />
|
||||
<created>1723666001005</created>
|
||||
<option name="number" value="00001" />
|
||||
<option name="presentableId" value="LOCAL-00001" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1723666001005</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00002" summary="Tunnel Start and Stop Work">
|
||||
<option name="closed" value="true" />
|
||||
<created>1723666477079</created>
|
||||
<option name="number" value="00002" />
|
||||
<option name="presentableId" value="LOCAL-00002" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1723666477079</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00003" summary="wg_import_select in wg_func.py extended">
|
||||
<option name="closed" value="true" />
|
||||
<created>1723847456806</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1723847456806</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00004" summary="add class Frame and class Massage, delete funktion go 100%, add resize window">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724013210356</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1724013210356</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00005" summary="add class Frame and class Massage, delete funktion go 100%, add resize window, add warning pic">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724013251954</created>
|
||||
<option name="number" value="00005" />
|
||||
<option name="presentableId" value="LOCAL-00005" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1724013251954</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00006" summary="add class ListTunnels and class ImportTunnel, and add class ExportTunnels (ExportTunnels no finish)">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724048994613</created>
|
||||
<option name="number" value="00006" />
|
||||
<option name="presentableId" value="LOCAL-00006" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1724048994613</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00007" summary="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) add to class and methods open a avtive Tunnel when Wire-Py open, when import and start a Tunnel">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724102937260</created>
|
||||
<option name="number" value="00007" />
|
||||
<option name="presentableId" value="LOCAL-00007" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1724102937260</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00008" summary="add file dict_to_address for address a active Tunnel. Label green pack in Class. add Class to convert fileoutput as String to Dictionary">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724233806458</created>
|
||||
@ -455,9 +337,204 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726599446538</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="33" />
|
||||
<task id="LOCAL-00033" summary="install fix for set dir right">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726599588155</created>
|
||||
<option name="number" value="00033" />
|
||||
<option name="presentableId" value="LOCAL-00033" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726599588155</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00034" summary="fix checkbox disable and policy rename main.py to wg_main.py">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726650691719</created>
|
||||
<option name="number" value="00034" />
|
||||
<option name="presentableId" value="LOCAL-00034" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726650691719</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00035" summary="fix rename in Messagebox warning to error">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726652747322</created>
|
||||
<option name="number" value="00035" />
|
||||
<option name="presentableId" value="LOCAL-00035" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726652747322</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00036" summary="set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726691611936</created>
|
||||
<option name="number" value="00036" />
|
||||
<option name="presentableId" value="LOCAL-00036" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726691611936</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00037" summary="fix set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726734843529</created>
|
||||
<option name="number" value="00037" />
|
||||
<option name="presentableId" value="LOCAL-00037" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726734843529</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00038" summary="fix a filedialog for hidden Files work install rollback to bash for start wirepy and wirepy rollback to bash">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726764877546</created>
|
||||
<option name="number" value="00038" />
|
||||
<option name="presentableId" value="LOCAL-00038" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726764877546</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00039" summary="install rollback bash to py wirepy and wirepy rollback to py">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726770649542</created>
|
||||
<option name="number" value="00039" />
|
||||
<option name="presentableId" value="LOCAL-00039" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726770649542</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00040" summary="fix install and .desktop File Tar works now for user home and filebrowser.askfilebrowser start now in user home">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726777434040</created>
|
||||
<option name="number" value="00040" />
|
||||
<option name="presentableId" value="LOCAL-00040" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726777434040</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00041" summary="replace tar with zip and Check if Zip file is empty">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726836930251</created>
|
||||
<option name="number" value="00041" />
|
||||
<option name="presentableId" value="LOCAL-00041" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726836930251</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00042" summary="Create your own message boxes for export">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726841190285</created>
|
||||
<option name="number" value="00042" />
|
||||
<option name="presentableId" value="LOCAL-00042" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726841190285</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00043" summary="chown Export File to 1000:1000">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726860371820</created>
|
||||
<option name="number" value="00043" />
|
||||
<option name="presentableId" value="LOCAL-00043" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726860371820</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00044" summary="add rename Label rename works">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726915238475</created>
|
||||
<option name="number" value="00044" />
|
||||
<option name="presentableId" value="LOCAL-00044" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726915238475</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00045" summary="add con_to_dict in import for write PreSharedKey in .key File to warning if tunnel has already been imported and delete that the key is deleted again">
|
||||
<option name="closed" value="true" />
|
||||
<created>1726959423800</created>
|
||||
<option name="number" value="00045" />
|
||||
<option name="presentableId" value="LOCAL-00045" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1726959423800</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00046" summary="add con_to_dict in import for write PreSharedKey in .key File to warning if tunnel has already been imported and delete that the key is deleted again now works">
|
||||
<option name="closed" value="true" />
|
||||
<created>1727015078922</created>
|
||||
<option name="number" value="00046" />
|
||||
<option name="presentableId" value="LOCAL-00046" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1727015078922</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00047" summary="Descriptions added in wg_func-py">
|
||||
<option name="closed" value="true" />
|
||||
<created>1727018233930</created>
|
||||
<option name="number" value="00047" />
|
||||
<option name="presentableId" value="LOCAL-00047" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1727018233930</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00048" summary="If tunnel is renamed and this is in the car start, is now renamed the label">
|
||||
<option name="closed" value="true" />
|
||||
<created>1727028762875</created>
|
||||
<option name="number" value="00048" />
|
||||
<option name="presentableId" value="LOCAL-00048" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1727028762875</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00049" summary="fix scrollbar view with set self.y_height = 330 to self.y_height = 340">
|
||||
<option name="closed" value="true" />
|
||||
<created>1727028915701</created>
|
||||
<option name="number" value="00049" />
|
||||
<option name="presentableId" value="LOCAL-00049" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1727028915701</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00050" summary="in msg_window two further parameters to be added to the pass, so height and wide can also be specified. In rename, messages come now if new names do not fit Fix Index Error on msg_window()">
|
||||
<option name="closed" value="true" />
|
||||
<created>1727118598759</created>
|
||||
<option name="number" value="00050" />
|
||||
<option name="presentableId" value="LOCAL-00050" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1727118598760</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00051" summary="ad max 12-character message, no character message and special_characters message for entry label">
|
||||
<option name="closed" value="true" />
|
||||
<created>1727288788988</created>
|
||||
<option name="number" value="00051" />
|
||||
<option name="presentableId" value="LOCAL-00051" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1727288788988</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00052" summary="info icon shadow fix end msg Export fix to">
|
||||
<option name="closed" value="true" />
|
||||
<created>1727347126769</created>
|
||||
<option name="number" value="00052" />
|
||||
<option name="presentableId" value="LOCAL-00052" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1727347126769</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00053" summary="little fixes">
|
||||
<option name="closed" value="true" />
|
||||
<created>1727378355274</created>
|
||||
<option name="number" value="00053" />
|
||||
<option name="presentableId" value="LOCAL-00053" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1727378355275</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00054" summary="fix msg_boxes when tunnel list = 0 a Start, Delete and Export">
|
||||
<option name="closed" value="true" />
|
||||
<created>1727379755537</created>
|
||||
<option name="number" value="00054" />
|
||||
<option name="presentableId" value="LOCAL-00054" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1727379755537</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00055" summary="fix installer add .keys file">
|
||||
<option name="closed" value="true" />
|
||||
<created>1727380793216</created>
|
||||
<option name="number" value="00055" />
|
||||
<option name="presentableId" value="LOCAL-00055" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1727380793216</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00056" summary="Changelog create When exporting, the folder is now copied to /tmp and the non .conf files are deleted before the zip file is created. In main.py os import removed. Since os have been replaced by pathlib and shutil. Start with version number 1.4.7 Message window size corrected so text is displayed better">
|
||||
<option name="closed" value="true" />
|
||||
<created>1727525609727</created>
|
||||
<option name="number" value="00056" />
|
||||
<option name="presentableId" value="LOCAL-00056" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1727525609728</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="57" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="UnknownFeatures">
|
||||
<option featureType="com.intellij.fileTypeFactory" implementationName="*.policy" />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="OPEN_GENERIC_TABS">
|
||||
<map>
|
||||
@ -493,31 +570,31 @@
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||
<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) 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 address a active Tunnel. Label green pack in Class. add Class to convert fileoutput as String to Dictionary" />
|
||||
<MESSAGE value="add Class StartStopBTN to wg_func.py" />
|
||||
<MESSAGE value="Set Style to Clam Improved layout of widgets" />
|
||||
<MESSAGE value="Remove open file function, add Show Address Labels with tk.StrVar when remove a not active Tunnel Labels of Active Tunnel removed!" />
|
||||
<MESSAGE value="fixed error when active tunnel is deleted, now also the Address Label is emptied" />
|
||||
<MESSAGE value="In FrameWidged Class else Block StrVar, this resorts reference and variable assignment together" />
|
||||
<MESSAGE value="add method init_and_report and label_empty to Class ShowAddress" />
|
||||
<MESSAGE value="little fixes in Class Import" />
|
||||
<MESSAGE value="fix label when laat Tunnel delete and fix Tuple error in delete and Start/Stop when listbox empty" />
|
||||
<MESSAGE value="remove a ',' in DNS Name" />
|
||||
<MESSAGE value="fix when Filname > 17 first copy file after rename" />
|
||||
<MESSAGE value="add export Tunnel as zip" />
|
||||
<MESSAGE value="columnconfigure on all widgets set" />
|
||||
<MESSAGE value="little fixes a " " to ' '" />
|
||||
<MESSAGE value="add class FileHandle, add Label to show autoconnect Tunnel disable checkbox when Listbox is empty or no select Tunnel" />
|
||||
<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="add Frame widget 3 for Buttons and Listbox with Scrollbar. all Widgets new format 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 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() function for Messagebox to show a tk.Toplevel() replace var = open() with: with open() as var: and remove by classes (tk.tk) and super()" />
|
||||
<MESSAGE value="in delete replace open with Path install fixes" />
|
||||
<MESSAGE value="new format little fixes icons sort add policy add .desktop File install Part 2" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="new format little fixes icons sort add policy add .desktop File install Part 2" />
|
||||
<MESSAGE value="install fix for set dir right" />
|
||||
<MESSAGE value="fix checkbox disable and policy rename main.py to wg_main.py" />
|
||||
<MESSAGE value="fix rename in Messagebox warning to error" />
|
||||
<MESSAGE value="set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open" />
|
||||
<MESSAGE value="fix set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open" />
|
||||
<MESSAGE value="fix a filedialog for hidden Files work install rollback to bash for start wirepy and wirepy rollback to bash" />
|
||||
<MESSAGE value="install rollback bash to py wirepy and wirepy rollback to py" />
|
||||
<MESSAGE value="fix install and .desktop File Tar works now for user home and filebrowser.askfilebrowser start now in user home" />
|
||||
<MESSAGE value="replace tar with zip and Check if Zip file is empty" />
|
||||
<MESSAGE value="Create your own message boxes for export" />
|
||||
<MESSAGE value="chown Export File to 1000:1000" />
|
||||
<MESSAGE value="add rename Label rename works" />
|
||||
<MESSAGE value="add con_to_dict in import for write PreSharedKey in .key File to warning if tunnel has already been imported and delete that the key is deleted again" />
|
||||
<MESSAGE value="add con_to_dict in import for write PreSharedKey in .key File to warning if tunnel has already been imported and delete that the key is deleted again now works" />
|
||||
<MESSAGE value="Descriptions added in wg_func-py" />
|
||||
<MESSAGE value="If tunnel is renamed and this is in the car start, is now renamed the label" />
|
||||
<MESSAGE value="fix scrollbar view with set self.y_height = 330 to self.y_height = 340" />
|
||||
<MESSAGE value="in msg_window two further parameters to be added to the pass, so height and wide can also be specified. In rename, messages come now if new names do not fit Fix Index Error on msg_window()" />
|
||||
<MESSAGE value="ad max 12-character message, no character message and special_characters message for entry label" />
|
||||
<MESSAGE value="info icon shadow fix end msg Export fix to" />
|
||||
<MESSAGE value="little fixes" />
|
||||
<MESSAGE value="fix msg_boxes when tunnel list = 0 a Start, Delete and Export" />
|
||||
<MESSAGE value="fix installer add .keys file" />
|
||||
<MESSAGE value="Changelog create When exporting, the folder is now copied to /tmp and the non .conf files are deleted before the zip file is created. In main.py os import removed. Since os have been replaced by pathlib and shutil. Start with version number 1.4.7 Message window size corrected so text is displayed better" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Changelog create When exporting, the folder is now copied to /tmp and the non .conf files are deleted before the zip file is created. In main.py os import removed. Since os have been replaced by pathlib and shutil. Start with version number 1.4.7 Message window size corrected so text is displayed better" />
|
||||
</component>
|
||||
</project>
|
58
Changelog
Normal file
58
Changelog
Normal file
@ -0,0 +1,58 @@
|
||||
Changelog for Wire-Py
|
||||
My standard System: Linux Mint 22 Cinnamon
|
||||
|
||||
## [Unreleased]
|
||||
- os import in wg_func replaced by other methods
|
||||
- Autoupdate in Options
|
||||
- Guide to menu '?' with pictures
|
||||
- Create file for settings (Autoupdate)
|
||||
- In Gitea Readme enter text, images
|
||||
- Dark Theme for Wire-Py
|
||||
- Own filedialog for import
|
||||
- If Wire-Py already runs, prevent further start
|
||||
- for loops with lists replaced by List Comprehensions
|
||||
- Keeping Classes Together
|
||||
|
||||
### Added
|
||||
04-10-2024
|
||||
|
||||
- Fix msg_window and remove x , y argument
|
||||
|
||||
- Install further adapted and with colored text if user
|
||||
is not in group sudo or wheel.
|
||||
|
||||
- Added to install Opensuse for installation
|
||||
|
||||
- Tested on Arch with Mate, Xfce4, Gnome, LXDE Desktop
|
||||
Open Suse Tumbleweed KDE, Fedora 40 KDE and Debian 12 Mate Desktop
|
||||
|
||||
|
||||
### Added
|
||||
29-09-2024
|
||||
|
||||
- installer optimize for another Systems
|
||||
|
||||
- Version number changed to:
|
||||
1 = 1. Year, 01 = Month of the Year, 0124 = Day and Year of the Year
|
||||
Example for this version: 1.09.2924
|
||||
|
||||
- Comments modified by # description to ''' description '''
|
||||
and insert empty lines for better readability
|
||||
|
||||
|
||||
### Added
|
||||
28-09-2024
|
||||
|
||||
- Changelog create
|
||||
|
||||
- When exporting, the folder is now copied to /tmp and the non .conf
|
||||
files are deleted before the zip file is created.
|
||||
|
||||
- In main.py os import removed. Since os have been replaced by pathlib and shutil.
|
||||
|
||||
- Start with version number 1.4.7
|
||||
|
||||
- Message window size corrected so text is displayed better
|
||||
|
||||
- Version lobster assigned to a variable
|
||||
|
@ -1,7 +1,7 @@
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=Wire-Py
|
||||
Exec=/usr/bin/wirepy
|
||||
Exec=/usr/bin/wirepy.py
|
||||
Terminal=false
|
||||
Categories=Network;
|
||||
Icon=/usr/share/icons/wp-icons/128/wg-vpn.png
|
||||
Icon=/usr/share/icons/wp-icons/128/wg_vpn.png
|
||||
|
140
install
140
install
@ -1,37 +1,125 @@
|
||||
#!/bin/bash
|
||||
NORMAL='\033[0m'
|
||||
GREEN='\033[1;32m'
|
||||
RED='\033[31;1;42m'
|
||||
BLUE='\033[30;1;34m'
|
||||
|
||||
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/ && \
|
||||
cp wg_start.services /lib/systemd/system/ && \
|
||||
systemctl enable wg_start.service
|
||||
install_file_with(){
|
||||
clear
|
||||
sudo apt install python3-tk && \
|
||||
sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
|
||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -uR wp-icons /usr/share/icons/ && \
|
||||
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
||||
sudo cp -u Wire-Py.desktop /usr/share/applications/ && \
|
||||
sudo cp -u wg_start.service /lib/systemd/system/ && \
|
||||
sudo 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 ]
|
||||
install_arch_d(){
|
||||
clear
|
||||
sudo pacman -S --noconfirm tk python3 && \
|
||||
sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
|
||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -uR wp-icons /usr/share/icons/ && \
|
||||
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
||||
sudo cp -u Wire-Py.desktop /usr/share/applications/ && \
|
||||
sudo cp -u wg_start.service /lib/systemd/system/ && \
|
||||
sudo systemctl enable wg_start.service
|
||||
}
|
||||
|
||||
if grep -i 'debian' /etc/os-release > /dev/null 2>&1
|
||||
then
|
||||
sudo ln -s /usr/bin/wirepy.py /usr/local/bin/wirepy
|
||||
groups > /tmp/isgroup
|
||||
if grep 'sudo' /tmp/isgroup
|
||||
then
|
||||
install_file_with
|
||||
|
||||
else
|
||||
|
||||
echo -e "$BLUE"The installer found that they are not in the group sudo.""
|
||||
echo -e "with "$RED"su -"$BLUE" "they can enter the root shell in which they then""
|
||||
echo -e "enter "$GREEN""usermod -aG sudo $USER.""$BLUE""
|
||||
echo -e ""after logging in from the system, they can then run Wire-Py install again." $NORMAL"
|
||||
read -n 1 -s -r -p $"To close the Window press a button"
|
||||
clear
|
||||
exit 0
|
||||
fi
|
||||
sudo cp org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
||||
sudo cp Wire-Py.desktop /usr/share/applications/ && \
|
||||
sudo cp wg_start.service /lib/systemd/system/ && \
|
||||
|
||||
|
||||
elif grep -i 'mint\|ubuntu\|pop|' /etc/os-release > /dev/null 2>&1
|
||||
then
|
||||
install_file_with
|
||||
|
||||
|
||||
elif grep -i 'arch' /etc/os-release > /dev/null 2>&1
|
||||
then
|
||||
groups > /tmp/isgroup
|
||||
clear
|
||||
if grep 'wheel' /tmp/isgroup
|
||||
then
|
||||
install_arch_d
|
||||
else
|
||||
echo "The installer found that they are not in the group sudo."
|
||||
echo "The sudoers file must be edited with"
|
||||
echo -e "$RED""su -""$NORMAL"
|
||||
echo -e "$GREEN"""EDITOR=nano visudo"""$NORMAL"
|
||||
echo "Find the line:"
|
||||
echo "## Uncomment to allow members of group wheel to execute any command"
|
||||
echo "remove '#' on # %wheel ALL=(ALL) ALL and save the file"
|
||||
echo -e "then enter "$GREEN"gpasswd -a $USER wheel.""$NORMAL"
|
||||
echo "after logging in from the system, they can then run Wire-Py install again."
|
||||
read -n 1 -s -r -p $"To close the Window press a button"
|
||||
clear
|
||||
exit 0
|
||||
|
||||
fi
|
||||
|
||||
elif grep -i '|manjaro\|garuda\|endeavour|' /etc/os-release > /dev/null 2>&1
|
||||
then
|
||||
install_arch_d
|
||||
|
||||
|
||||
elif grep -i 'fedora' /etc/os-release > /dev/null 2>&1
|
||||
then
|
||||
if ! which python3-tkinter &> /dev/null
|
||||
then sudo dnf install python3-tkinter -y
|
||||
|
||||
sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
|
||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -uR wp-icons /usr/share/icons/ && \
|
||||
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
||||
sudo cp -u Wire-Py.desktop /usr/share/applications/ && \
|
||||
sudo cp -u wg_start.service /lib/systemd/system/ && \
|
||||
sudo systemctl enable wg_start.service
|
||||
|
||||
fi
|
||||
elif grep -i 'suse' /etc/os-release > /dev/null 2>&1
|
||||
then
|
||||
if ! which python311-tk &> /dev/null
|
||||
then sudo zypper install python311-tk
|
||||
sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
|
||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -uR wp-icons /usr/share/icons/ && \
|
||||
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
||||
sudo cp -u Wire-Py.desktop /usr/share/applications/ && \
|
||||
sudo cp -u wg_start.service /lib/systemd/system/ && \
|
||||
sudo systemctl enable wg_start.service
|
||||
fi
|
||||
else
|
||||
clear
|
||||
echo $"Your System could not be determined."
|
||||
echo
|
||||
read -n 1 -s -r -p $"To close the window press a button"
|
||||
clear
|
||||
exit 0
|
||||
fi
|
||||
clear
|
||||
read -n 1 -s -r -p $"To close the Window press a button"
|
||||
|
||||
|
||||
clear
|
||||
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
<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.path">/usr/bin/wg_main.py</annotate>
|
||||
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
|
||||
</action>
|
||||
</policyconfig>
|
||||
|
252
wg_func.py
252
wg_func.py
@ -1,47 +1,63 @@
|
||||
# Wireguard functions for Wire-Py
|
||||
""" Wireguard Classes and Method for Wire-Py """
|
||||
|
||||
import os
|
||||
import shutil
|
||||
from datetime import datetime
|
||||
from tkinter import filedialog
|
||||
import subprocess
|
||||
import tkinter as tk
|
||||
import zipfile
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
from subprocess import check_call
|
||||
from tkinter import filedialog
|
||||
|
||||
font_color = '#4011a7'
|
||||
dk_theme = '#2e2e2e'
|
||||
path_to_file = Path('/etc/wire_py/wg_py')
|
||||
_u = Path.read_text(Path('/tmp/_u'))
|
||||
|
||||
|
||||
def msg_window():
|
||||
def msg_window(img_w, img_i, w_title, w_txt):
|
||||
"""
|
||||
Function for different message windows for the user. with 4 arguments to be passed.
|
||||
To create messages with your own images, icons, and titles. As an alternative to Python Messagebox.
|
||||
Paths to images must be specified: r'/usr/share/icons/wp-icons/64/info.png'
|
||||
img_w = Image for Tk Window
|
||||
img_i = Image for Icon
|
||||
w_title = Windows Title
|
||||
w_txt = Text for Tk 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'/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')
|
||||
label.config(font=('Ubuntu', 11), padx=15, pady=15)
|
||||
msg.title(w_title)
|
||||
msg.configure(pady=15)
|
||||
msg.img = tk.PhotoImage(file=img_w)
|
||||
msg.i_window = tk.Label(msg, image=msg.img)
|
||||
msg.i_window.grid(column=0, row=0)
|
||||
label = tk.Label(msg, text=w_txt)
|
||||
label.config(font=('Ubuntu', 11), padx=15)
|
||||
label.grid(column=1, row=0)
|
||||
button = tk.Button(msg, text='OK', command=msg.destroy)
|
||||
button.config(padx=15, pady=5)
|
||||
button.config(padx=15)
|
||||
button.grid(column=0, columnspan=2, row=1)
|
||||
wg_icon_2 = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_msg.png')
|
||||
msg.iconphoto(True, wg_icon_2)
|
||||
img_i = tk.PhotoImage(file=img_i)
|
||||
msg.iconphoto(True, img_i)
|
||||
msg.columnconfigure(0, weight=1)
|
||||
msg.rowconfigure(0, weight=1)
|
||||
msg.winfo_toplevel()
|
||||
|
||||
|
||||
class GreenLabel:
|
||||
"""
|
||||
Show the active tunnel in green in the label
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
self.StrVar = None
|
||||
self.lb_tunnel = None
|
||||
|
||||
def green_show_label(self):
|
||||
|
||||
self.lb_tunnel = tk.Label(self, textvariable=self.StrVar, fg='green')
|
||||
self.lb_tunnel.config(font=('Ubuntu', 11, 'bold'))
|
||||
self.lb_tunnel.grid(column=2, padx=10, row=0)
|
||||
@ -56,7 +72,12 @@ class GreenLabel:
|
||||
|
||||
|
||||
class StartStopBTN:
|
||||
"""
|
||||
Show Start and Stop Button in Label
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
self.lb_frame_btn_lbox = None
|
||||
self.wg_switch = None
|
||||
self.btn_stst = None
|
||||
@ -64,17 +85,25 @@ class StartStopBTN:
|
||||
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)
|
||||
self.btn_stst.grid(column=0, row=0, padx=15, pady=8)
|
||||
|
||||
def button_start(self):
|
||||
|
||||
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)
|
||||
|
||||
|
||||
class ConToDict:
|
||||
"""
|
||||
The config file is packed into a dictionary,
|
||||
to display the values Address , DNS and Peer in the labels
|
||||
"""
|
||||
|
||||
@classmethod
|
||||
def covert_to_dict(cls, file):
|
||||
|
||||
dictlist = []
|
||||
for lines in file.readlines():
|
||||
line_plit = lines.split()
|
||||
@ -84,7 +113,9 @@ class ConToDict:
|
||||
for items in dictlist:
|
||||
if items == '=':
|
||||
dictlist.remove(items)
|
||||
for _ in dictlist: # Here is the beginning (Loop) of convert List to Dictionary
|
||||
|
||||
''' Here is the beginning (Loop) of convert List to Dictionary '''
|
||||
for _ in dictlist:
|
||||
a = [dictlist[0], dictlist[1]]
|
||||
b = [dictlist[2], dictlist[3]]
|
||||
c = [dictlist[4], dictlist[5]]
|
||||
@ -98,18 +129,28 @@ class ConToDict:
|
||||
for elements in new_list:
|
||||
final_dict[elements[0]] = elements[1]
|
||||
|
||||
# end... result a Dictionary
|
||||
''' end... result a Dictionary '''
|
||||
|
||||
address = final_dict['Address']
|
||||
dns = final_dict['DNS']
|
||||
if ',' in dns:
|
||||
dns = dns[:-1]
|
||||
endpoint = final_dict['Endpoint']
|
||||
return address, dns, endpoint
|
||||
if 'PresharedKey' in final_dict:
|
||||
pre_key = final_dict['PresharedKey']
|
||||
else:
|
||||
pre_key = final_dict['PreSharedKey']
|
||||
return address, dns, endpoint, pre_key
|
||||
|
||||
|
||||
class TunnelActiv:
|
||||
"""
|
||||
Shows the Active Tunnel
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def active(): # Shows the active tunnel
|
||||
def active():
|
||||
|
||||
active = os.popen('nmcli con show --active | grep -iPo "(.*)(wireguard)"').read().split()
|
||||
if not active:
|
||||
active = ''
|
||||
@ -120,7 +161,13 @@ class TunnelActiv:
|
||||
|
||||
|
||||
class ShowAddress:
|
||||
"""
|
||||
Displays the value address, DNS and peer in the labels
|
||||
or empty it again
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
self.lb_frame2 = None
|
||||
self.lb_frame = None
|
||||
self.endpoint = None
|
||||
@ -131,7 +178,8 @@ class ShowAddress:
|
||||
self.add = None
|
||||
|
||||
def init_and_report(self, data=None):
|
||||
# Address Label
|
||||
|
||||
""" Address Label """
|
||||
self.add = tk.StringVar()
|
||||
self.add.set('Address: ' + data[0])
|
||||
self.DNS = tk.StringVar()
|
||||
@ -140,34 +188,54 @@ class ShowAddress:
|
||||
self.enp.set('Endpoint: ' + data[2])
|
||||
|
||||
def label_empty(self):
|
||||
|
||||
self.add.set('')
|
||||
self.DNS.set('')
|
||||
self.enp.set('')
|
||||
|
||||
def show_data(self):
|
||||
# Address Label
|
||||
|
||||
""" Address Label """
|
||||
self.address = tk.Label(self.lb_frame, textvariable=self.add, fg='blue')
|
||||
self.address.grid(column=0, row=4, sticky='w', padx=10, pady=6)
|
||||
self.address.config(font=('Ubuntu', 9))
|
||||
# DNS Label
|
||||
|
||||
''' DNS Label '''
|
||||
self.dns = tk.Label(self.lb_frame, textvariable=self.DNS, fg='blue')
|
||||
self.dns.grid(column=0, row=6, sticky='w', padx=10, pady=6)
|
||||
self.dns.config(font=('Ubuntu', 9))
|
||||
# Endpoint Label
|
||||
|
||||
''' Endpoint Label '''
|
||||
self.endpoint = tk.Label(self.lb_frame2, textvariable=self.enp, fg='blue')
|
||||
self.endpoint.grid(column=0, row=7, sticky='w', padx=10, pady=10)
|
||||
self.endpoint.config(font=('Ubuntu', 9))
|
||||
|
||||
|
||||
class ListTunnels:
|
||||
"""
|
||||
Shows all existing Wireguard tunnels
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def tl_list():
|
||||
wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
|
||||
tl = wg_s[::3] # tl = Tunnel list # Show of 4.Element in list
|
||||
|
||||
''' tl = Tunnel list # Show of 4.Element in list '''
|
||||
tl = wg_s[::3]
|
||||
return tl
|
||||
|
||||
|
||||
class ImportTunnel:
|
||||
"""
|
||||
Import Class for Wireguard config Files.
|
||||
Before importing, it is checked whether PrivateKey and PublicKey are in the file.
|
||||
If True then it is checked whether the PreSharedKey is already in the key file
|
||||
to avoid an import error so that no double wgconf are imported.
|
||||
Thus, tunnels can be renamed without the problems arise. If False then the key is written into the file.
|
||||
Furthermore, it is checked whether the name is longer than 12 characters.
|
||||
If True then the name is automatically shortened to 12 characters and then imported.
|
||||
If in each case false comes out, a corresponding window comes to inform the user that something is wrong.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
@ -180,31 +248,56 @@ class ImportTunnel:
|
||||
self.l_box = None
|
||||
|
||||
def wg_import_select(self):
|
||||
|
||||
try:
|
||||
filepath = filedialog.askopenfilename(initialdir=Path('/home/*/'), title='Select Wireguard config File',
|
||||
filepath = filedialog.askopenfilename(initialdir=str(_u), 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:
|
||||
with open(filepath, 'r') as file:
|
||||
key = ConToDict.covert_to_dict(file)
|
||||
pre_key = key[3]
|
||||
if len(pre_key) != 0:
|
||||
with open('/etc/wire_py/.keys', 'r') as readfile:
|
||||
p_key = readfile.readlines()
|
||||
if pre_key in p_key or pre_key + '\n' in p_key:
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/error.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Import Error'
|
||||
msg_t = 'Tunnel already available!\nPlease use another file for import'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
else:
|
||||
|
||||
with open('/etc/wire_py/.keys', 'a') as keyfile:
|
||||
keyfile.write(pre_key + '\r')
|
||||
if len(path_split1) > 17:
|
||||
p1 = shutil.copy(filepath, Path('/etc/wire_py/'))
|
||||
path_split = path_split1[len(path_split1) - 17:]
|
||||
os.rename(p1, Path('/etc/wire_py') / str(path_split))
|
||||
|
||||
new_conf = '/etc/wire_py/' + path_split
|
||||
if self.a != '':
|
||||
check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
|
||||
ShowAddress.label_empty(self)
|
||||
check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', 'etc', '/wire_py',
|
||||
path_split])
|
||||
|
||||
subprocess.check_output(['nmcli', 'connection', 'import', 'type',
|
||||
'wireguard', 'file', new_conf], text=True)
|
||||
|
||||
else:
|
||||
shutil.copy(filepath, Path('/etc/wire_py/'))
|
||||
if self.a != '':
|
||||
check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
|
||||
ShowAddress.label_empty(self)
|
||||
check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', filepath])
|
||||
|
||||
subprocess.check_output(['nmcli', 'connection', 'import', 'type',
|
||||
'wireguard', 'file', filepath], text=True)
|
||||
|
||||
self.StrVar.set('')
|
||||
self.a = TunnelActiv.active()
|
||||
@ -215,23 +308,40 @@ class ImportTunnel:
|
||||
GreenLabel.green_show_label(self)
|
||||
StartStopBTN.button_stop(self)
|
||||
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
|
||||
with open(wg_read, 'r') as file_for_key:
|
||||
data = ConToDict.covert_to_dict(file_for_key)
|
||||
|
||||
''' Address Label '''
|
||||
ShowAddress.init_and_report(self, data)
|
||||
ShowAddress.show_data(self)
|
||||
check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
|
||||
Path.chmod(wg_read, 0o600)
|
||||
|
||||
if 'PrivateKey = ' not in read:
|
||||
msg_window()
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/error.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Import Error'
|
||||
msg_t = 'Oh... no valid Wireguard File!\nPlease select a valid Wireguard File'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
except EOFError:
|
||||
pass
|
||||
except TypeError:
|
||||
pass
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
except subprocess.CalledProcessError:
|
||||
|
||||
print('Tunnel exist!')
|
||||
|
||||
|
||||
class FileHandle:
|
||||
"""
|
||||
This class will display the autostart label which
|
||||
Tunnel is automatically started regardless of the active tunnel.
|
||||
The selected tunnel is written into a file to read it after the start of the system.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
@ -244,16 +354,21 @@ class FileHandle:
|
||||
self.l_box = None
|
||||
|
||||
def box_set(self):
|
||||
|
||||
try:
|
||||
select_tunnel = self.l_box.curselection()
|
||||
select_tl = self.l_box.get(select_tunnel[0])
|
||||
|
||||
if self.selected_option.get() == 0:
|
||||
Path.unlink(path_to_file)
|
||||
tl = ListTunnels.tl_list()
|
||||
|
||||
if len(tl) == 0:
|
||||
self.wg_autostart.configure(state='disabled')
|
||||
|
||||
if self.selected_option.get() >= 1:
|
||||
Path.write_text(path_to_file, select_tl)
|
||||
|
||||
except IndexError:
|
||||
self.selected_option.set(1)
|
||||
|
||||
@ -261,7 +376,14 @@ class FileHandle:
|
||||
|
||||
|
||||
class OnOff:
|
||||
"""
|
||||
Here it is checked whether the path to the file is there if not it is created.
|
||||
Set (on), the selected tunnel is displayed in the label.
|
||||
At (off) the label is first emptied then filled with No Autoconnect
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
self.wg_autostart = None
|
||||
self.selected_option = None
|
||||
self.auto_con = None
|
||||
@ -270,13 +392,16 @@ class OnOff:
|
||||
self.lb_frame_buttons = None
|
||||
|
||||
def on_off(self):
|
||||
|
||||
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')
|
||||
self.auto_con = 'no Autoconnect'
|
||||
self.autoconnect_var.set('')
|
||||
@ -288,21 +413,56 @@ class OnOff:
|
||||
|
||||
|
||||
class ExportTunnels:
|
||||
"""
|
||||
This will export the tunnels.
|
||||
A zipfile with current date and time is created
|
||||
in the user's home directory with correct right
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def wg_export():
|
||||
_u1 = str(_u[6:])
|
||||
now_time = datetime.now()
|
||||
now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
|
||||
tl = ListTunnels.tl_list()
|
||||
|
||||
try:
|
||||
if len(tl) != 0:
|
||||
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')
|
||||
#else:
|
||||
#print('ups etwwas ging schief bitte Export wiederholen')
|
||||
wg_tar = str(_u) + '/' + now_datetime
|
||||
shutil.copytree('/etc/wire_py', '/tmp/wire_py', dirs_exist_ok=True)
|
||||
source = Path('/tmp/wire_py')
|
||||
Path.unlink(Path(source) / 'wg_py', missing_ok=True)
|
||||
Path.unlink(Path(source) / '.keys', missing_ok=True)
|
||||
shutil.make_archive(wg_tar, 'zip', source)
|
||||
shutil.chown(wg_tar + '.zip', 1000, 1000)
|
||||
shutil.rmtree(source)
|
||||
with zipfile.ZipFile((wg_tar + '.zip'), 'r') as zf:
|
||||
if len(zf.namelist()) != 0:
|
||||
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
|
||||
wt = 'Export Successful'
|
||||
msg_t = 'Your zip file is in home directory'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
else:
|
||||
print('No Tunnel for Export')
|
||||
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/error.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Export error'
|
||||
msg_t = 'Export failed! Please try again'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
else:
|
||||
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Select tunnel'
|
||||
msg_t = 'Please first import tunnel.'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
except TypeError:
|
||||
pass
|
||||
|
230
wg_main.py
230
wg_main.py
@ -1,12 +1,18 @@
|
||||
#!/usr/bin/python3
|
||||
|
||||
import tkinter as tk
|
||||
from subprocess import check_call
|
||||
from tkinter import ttk
|
||||
from tkinter import *
|
||||
from pathlib import Path
|
||||
from tkinter import ttk
|
||||
|
||||
from wg_func import (TunnelActiv, ListTunnels, ImportTunnel, ConToDict, GreenLabel, StartStopBTN, ShowAddress,
|
||||
FileHandle, ExportTunnels, OnOff)
|
||||
FileHandle, ExportTunnels, OnOff, msg_window)
|
||||
|
||||
font_color = '#4011a7'
|
||||
dk_theme = '#2e2e2e'
|
||||
''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year '''
|
||||
version = 'v. 1.10.0424'
|
||||
|
||||
|
||||
class MainWindow(tk.Tk):
|
||||
@ -27,7 +33,8 @@ class MainWindow(tk.Tk):
|
||||
self.rowconfigure(0, weight=1)
|
||||
self.style = ttk.Style(self)
|
||||
self.style.theme_use('clam')
|
||||
# Load the image file from disk.
|
||||
|
||||
''' Load the image file from disk. '''
|
||||
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)
|
||||
@ -36,6 +43,8 @@ class MainWindow(tk.Tk):
|
||||
self.app_menu = tk.Menu(self, borderwidth=0)
|
||||
|
||||
self.configure(menu=self.app_menu)
|
||||
self.app_menu.add_cascade(label=version)
|
||||
self.app_menu.add_cascade(label='Options')
|
||||
self.app_menu.add_cascade(label='?')
|
||||
|
||||
FrameWidgets(self).grid()
|
||||
@ -58,54 +67,62 @@ class FrameWidgets(ttk.Frame):
|
||||
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')
|
||||
self.warning_pic = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/64/error.png')
|
||||
|
||||
# Show active Tunnel
|
||||
''' Show active Tunnel '''
|
||||
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
|
||||
|
||||
''' Label Frame 2 '''
|
||||
self.lb_frame = ttk.Frame(self)
|
||||
self.lb_frame.configure(relief='solid')
|
||||
self.lb_frame.grid(column=2, row=1, sticky='snew', padx=20, pady=5)
|
||||
self.columnconfigure(2, weight=1)
|
||||
self.rowconfigure(1, weight=1)
|
||||
# Label Frame 3
|
||||
|
||||
''' Label Frame 3 '''
|
||||
self.lb_frame2 = ttk.Frame(self)
|
||||
self.lb_frame2.configure(relief='solid')
|
||||
self.lb_frame2.grid(column=2, row=2, sticky='snew', padx=20, pady=5)
|
||||
self.columnconfigure(2, weight=1)
|
||||
self.rowconfigure(2, weight=1)
|
||||
|
||||
# Show active Label
|
||||
''' Show active Label '''
|
||||
self.select_tunnel = None
|
||||
self.lb = tk.Label(self, text='Active: ')
|
||||
self.lb.config(font=('Ubuntu', 11, 'bold'))
|
||||
self.lb.grid(column=2, row=0, padx=15, sticky='w')
|
||||
self.columnconfigure(2, weight=1)
|
||||
self.rowconfigure(0, weight=1)
|
||||
# Label to Show active Tunnel
|
||||
|
||||
''' Label to Show active Tunnel '''
|
||||
self.StrVar = tk.StringVar(value=self.a)
|
||||
GreenLabel.green_show_label(self)
|
||||
# Interface Label
|
||||
|
||||
''' Interface Label '''
|
||||
self.interface = tk.Label(self.lb_frame, text='Interface', fg=font_color)
|
||||
self.interface.grid(column=0, row=2, sticky='we', padx=120)
|
||||
self.interface.config(font=('Ubuntu', 9))
|
||||
|
||||
# Peer Label
|
||||
''' Peer Label '''
|
||||
self.peer = tk.Label(self.lb_frame2, text='Peer', fg=font_color)
|
||||
self.peer.config(font=('Ubuntu', 9))
|
||||
self.peer.grid(column=0, row=3, sticky='we', padx=130)
|
||||
|
||||
# Listbox with Scrollbar
|
||||
''' Listbox with Scrollbar '''
|
||||
def enable_check_box(event):
|
||||
tl = ListTunnels.tl_list()
|
||||
if len(tl) != 0:
|
||||
self.wg_autostart.configure(state='normal')
|
||||
self.lb_rename.config(state='normal')
|
||||
self.lb_rename.delete(0, tk.END)
|
||||
self.btn_rename.config(state='normal')
|
||||
|
||||
self.l_box = tk.Listbox(self.lb_frame_btn_lbox, fg='#606060', selectmode='single')
|
||||
self.l_box.config(highlightthickness=0, relief='ridge')
|
||||
@ -118,29 +135,33 @@ class FrameWidgets(ttk.Frame):
|
||||
self.l_box.configure(yscrollcommand=self.scrollbar.set)
|
||||
self.rowconfigure(0, weight=1)
|
||||
|
||||
# Tunnel List
|
||||
''' Tunnel List '''
|
||||
self.tl = ListTunnels.tl_list()
|
||||
for tunnels in self.tl:
|
||||
self.l_box.insert("end", tunnels)
|
||||
self.l_box.update()
|
||||
# Button Vpn
|
||||
|
||||
''' Button Vpn '''
|
||||
if self.a != '':
|
||||
StartStopBTN.button_stop(self)
|
||||
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
|
||||
|
||||
''' Address Label '''
|
||||
ShowAddress.init_and_report(self, data)
|
||||
ShowAddress.show_data(self)
|
||||
else:
|
||||
StartStopBTN.button_start(self)
|
||||
# Address Label
|
||||
|
||||
''' Address Label '''
|
||||
self.add = tk.StringVar()
|
||||
self.DNS = tk.StringVar()
|
||||
self.enp = tk.StringVar()
|
||||
ShowAddress.label_empty(self)
|
||||
ShowAddress.show_data(self)
|
||||
# Button Import
|
||||
|
||||
''' Button Import '''
|
||||
self.btn_i = tk.Button(self.lb_frame_btn_lbox,
|
||||
image=self.imp_pic, bd=0,
|
||||
command=lambda: ImportTunnel.wg_import_select(self))
|
||||
@ -151,6 +172,9 @@ class FrameWidgets(ttk.Frame):
|
||||
try:
|
||||
self.select_tunnel = self.l_box.curselection()
|
||||
select_tl = self.l_box.get(self.select_tunnel[0])
|
||||
with open('/etc/wire_py/' + select_tl + '.conf', 'r+') as file2:
|
||||
key = ConToDict.covert_to_dict(file2)
|
||||
pre_key = key[3]
|
||||
check_call(['nmcli', 'connection', 'delete', select_tl])
|
||||
self.l_box.delete(self.select_tunnel[0])
|
||||
if Path.is_file(Path('/etc/wire_py/wg_py')):
|
||||
@ -159,46 +183,143 @@ class FrameWidgets(ttk.Frame):
|
||||
if select_tl == a_con:
|
||||
self.selected_option.set(0)
|
||||
self.autoconnect_var.set('no Autoconnect')
|
||||
self.wg_autostart.configure(state='disabled')
|
||||
Path.unlink(path_to_file)
|
||||
Path.unlink(Path('/etc/wire_py') / str(select_tl + '.conf'))
|
||||
# for disable checkbox when Listbox empty
|
||||
with open('/etc/wire_py/.keys', 'r') as readfile:
|
||||
with open('/etc/wire_py/.keys2', 'w') as writefile:
|
||||
for line in readfile:
|
||||
if pre_key not in line.strip("\n"):
|
||||
writefile.write(line)
|
||||
file_one = Path('/etc/wire_py/.keys2')
|
||||
file_two = file_one.with_name('.keys')
|
||||
file_one.replace(file_two)
|
||||
|
||||
''' for disable checkbox when Listbox empty '''
|
||||
tl = ListTunnels.tl_list()
|
||||
if len(tl) == 0:
|
||||
self.wg_autostart.configure(state='disabled')
|
||||
Path.unlink(path_to_file)
|
||||
|
||||
if self.a != '' and self.a == select_tl:
|
||||
self.StrVar.set(value='')
|
||||
StartStopBTN.button_start(self)
|
||||
self.l_box.update()
|
||||
# Address Label
|
||||
|
||||
''' Address Label '''
|
||||
self.add.set('')
|
||||
self.DNS.set('')
|
||||
self.enp.set('')
|
||||
|
||||
return select_tl
|
||||
except IndexError:
|
||||
pass
|
||||
tl = ListTunnels.tl_list()
|
||||
if len(tl) != 0:
|
||||
|
||||
# Button Trash
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Select tunnel'
|
||||
msg_t = 'Please select a tunnel from the list.'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
else:
|
||||
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Select tunnel'
|
||||
msg_t = 'Please first import tunnel.'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
''' Button Trash '''
|
||||
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)
|
||||
|
||||
# Button Export
|
||||
''' Button 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)
|
||||
|
||||
# Button Rename
|
||||
self.btn_rename = ttk.Button(self, text='Rename')
|
||||
self.btn_rename.grid(column=2, row=4, padx=20, pady=15, sticky='e')
|
||||
''' Label Entry '''
|
||||
self.lb_rename = ttk.Entry(self, width=20)
|
||||
self.lb_rename.grid(column=2, row=4, padx=30, pady=5, sticky='w')
|
||||
self.lb_rename.insert(0, 'Max. 12 characters!')
|
||||
self.lb_rename.config(state='disable')
|
||||
|
||||
# Check Buttons
|
||||
def tl_rename():
|
||||
special_characters = ['\\', '/', '{', '}', ' ']
|
||||
|
||||
if len(self.lb_rename.get()) > 12:
|
||||
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Renaming not possible'
|
||||
msg_t = 'The new name may contain only 12 characters.'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
elif len(self.lb_rename.get()) == 0:
|
||||
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Renaming not possible'
|
||||
msg_t = 'At least one character must be entered.'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
elif any(ch in special_characters for ch in self.lb_rename.get()):
|
||||
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Renaming not possible'
|
||||
msg_t = 'No valid sign. These must not be used.\nBlank, Slash, Backslash and { }\n'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
else:
|
||||
|
||||
try:
|
||||
self.select_tunnel = self.l_box.curselection()
|
||||
select_tl = self.l_box.get(self.select_tunnel[0])
|
||||
|
||||
''' nmcli connection modify old connection.id iphone '''
|
||||
check_call(['nmcli', 'connection', 'modify', select_tl, 'connection.id', self.lb_rename.get()])
|
||||
source = Path('/etc/wire_py') / str(select_tl + '.conf')
|
||||
destination = source.with_name(str(self.lb_rename.get() + '.conf'))
|
||||
source.replace(destination)
|
||||
self.l_box.delete(self.select_tunnel[0])
|
||||
self.l_box.insert("end", self.lb_rename.get())
|
||||
self.l_box.update()
|
||||
new_a_connect = self.lb_rename.get()
|
||||
self.lb_rename.delete(0, tk.END)
|
||||
if self.a != '' and self.a == select_tl:
|
||||
self.a = TunnelActiv.active()
|
||||
self.StrVar.set(value=self.a)
|
||||
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.autoconnect_var.set(value=new_a_connect)
|
||||
Path.write_text(path_to_file, new_a_connect)
|
||||
return select_tl
|
||||
|
||||
except IndexError:
|
||||
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Renaming not possible'
|
||||
msg_t = 'Please select a tunnel from the list.'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
''' Button Rename '''
|
||||
self.btn_rename = ttk.Button(self, text='Rename', state='disable', command=tl_rename)
|
||||
self.btn_rename.grid(column=2, row=4, padx=20, pady=10, sticky='e')
|
||||
|
||||
''' Check Buttons '''
|
||||
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.autoconnect.grid(column=0, row=4, sticky='ne', pady=10)
|
||||
self.wg_autostart = tk.Checkbutton(self,
|
||||
text='Autoconnect on:',
|
||||
variable=self.selected_option,
|
||||
@ -222,33 +343,68 @@ class FrameWidgets(ttk.Frame):
|
||||
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
|
||||
|
||||
''' Address Label '''
|
||||
ShowAddress.init_and_report(self, data)
|
||||
ShowAddress.show_data(self)
|
||||
# Button Start/Stop
|
||||
|
||||
''' 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
|
||||
|
||||
''' Button Start/Stop '''
|
||||
StartStopBTN.button_stop(self)
|
||||
check_call(['nmcli', 'connection', 'down', self.a])
|
||||
# Button Start/Stop
|
||||
|
||||
''' Button Start/Stop '''
|
||||
StartStopBTN.button_start(self)
|
||||
self.a = TunnelActiv.active()
|
||||
self.StrVar.set('')
|
||||
GreenLabel.green_show_label(self)
|
||||
# Address Label
|
||||
|
||||
''' Address Label '''
|
||||
self.add.set('')
|
||||
self.DNS.set('')
|
||||
self.enp.set('')
|
||||
ShowAddress.show_data(self)
|
||||
|
||||
except IndexError:
|
||||
pass
|
||||
|
||||
tl = ListTunnels.tl_list()
|
||||
if len(tl) != 0:
|
||||
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Select tunnel'
|
||||
msg_t = 'Please select a tunnel from the list.'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
else:
|
||||
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Select tunnel'
|
||||
msg_t = 'Please first import tunnel.'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
window = MainWindow()
|
||||
"""
|
||||
the hidden files are hidden in Filedialog
|
||||
"""
|
||||
try:
|
||||
window.tk.call('tk_getOpenFile', '-foobarbaz')
|
||||
except TclError:
|
||||
pass
|
||||
|
||||
window.tk.call('set', '::tk::dialog::file::showHiddenBtn', '0')
|
||||
window.tk.call('set', '::tk::dialog::file::showHiddenVar', '0')
|
||||
window.mainloop()
|
||||
|
BIN
wire-py1.10.0424.tar.gz
Normal file
BIN
wire-py1.10.0424.tar.gz
Normal file
Binary file not shown.
6
wirepy.py
Executable file
6
wirepy.py
Executable file
@ -0,0 +1,6 @@
|
||||
#!/usr/bin/python3
|
||||
from subprocess import check_call
|
||||
from pathlib import Path
|
||||
|
||||
Path.write_text(Path('/tmp/_u'), str(Path.home()))
|
||||
check_call(['pkexec', '/usr/bin/wg_main.py'])
|
BIN
wp-icons/128/info.png
Normal file
BIN
wp-icons/128/info.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.7 KiB |
BIN
wp-icons/256/info.png
Normal file
BIN
wp-icons/256/info.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 10 KiB |
BIN
wp-icons/32/info.png
Normal file
BIN
wp-icons/32/info.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
BIN
wp-icons/48/info.png
Normal file
BIN
wp-icons/48/info.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.2 KiB |
BIN
wp-icons/64/info.png
Normal file
BIN
wp-icons/64/info.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.7 KiB |
Reference in New Issue
Block a user