Compare commits
1 Commits
main
...
24-02-2025
Author | SHA1 | Date | |
---|---|---|---|
7881355f00 |
6
.gitignore
vendored
@ -1,6 +0,0 @@
|
|||||||
debug.log
|
|
||||||
.venv
|
|
||||||
.venv.bak
|
|
||||||
.idea
|
|
||||||
.vscode
|
|
||||||
__pycache__
|
|
6
.idea/inspectionProfiles/profiles_settings.xml
generated
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<component name="InspectionProjectProfileManager">
|
||||||
|
<settings>
|
||||||
|
<option name="USE_PROJECT_PROFILE" value="false" />
|
||||||
|
<version value="1.0" />
|
||||||
|
</settings>
|
||||||
|
</component>
|
7
.idea/misc.xml
generated
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="Black">
|
||||||
|
<option name="sdkName" value="Python 3.12 (wire-py)" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (wire-py)" project-jdk-type="Python SDK" />
|
||||||
|
</project>
|
8
.idea/modules.xml
generated
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/wire-py.iml" filepath="$PROJECT_DIR$/.idea/wire-py.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
76
.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]/shelved.patch
generated
Normal file
0
.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]1/shelved.patch
generated
Normal file
4
.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24__06_49__Changes_.xml
generated
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<changelist name="Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]" date="1724042999949" recycled="false" toDelete="true">
|
||||||
|
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]/shelved.patch" />
|
||||||
|
<option name="DESCRIPTION" value="Uncommitted changes before Checkout at 19.08.24, 06:49 [Changes]" />
|
||||||
|
</changelist>
|
6
.idea/vcs.xml
generated
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
10
.idea/wire-py.iml
generated
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="PYTHON_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager">
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/.venv" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
</module>
|
606
.idea/workspace.xml
generated
Normal file
@ -0,0 +1,606 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="AutoImportSettings">
|
||||||
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
|
</component>
|
||||||
|
<component name="ChangeListManager">
|
||||||
|
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment=" - Update Translate Files">
|
||||||
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/cls_mth_fc.py" beforeDir="false" afterPath="$PROJECT_DIR$/cls_mth_fc.py" afterDir="false" />
|
||||||
|
</list>
|
||||||
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
|
</component>
|
||||||
|
<component name="FileTemplateManagerImpl">
|
||||||
|
<option name="RECENT_TEMPLATES">
|
||||||
|
<list>
|
||||||
|
<option value="Python Script" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
<component name="Git.Settings">
|
||||||
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||||
|
<map>
|
||||||
|
<entry key="$PROJECT_DIR$" value="1.11.0824" />
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
|
<option name="UPDATE_TYPE" value="REBASE" />
|
||||||
|
</component>
|
||||||
|
<component name="HighlightingSettingsPerFile">
|
||||||
|
<setting file="file://$PROJECT_DIR$/wg_func.py" root0="SKIP_INSPECTION" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/wg_main.py" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectColorInfo">{
|
||||||
|
"associatedIndex": 3
|
||||||
|
}</component>
|
||||||
|
<component name="ProjectId" id="2kSbZdjOvr0wsVJSNcaMwSfVaxR" />
|
||||||
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
||||||
|
<ConfirmationsSetting value="2" id="Add" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectViewState">
|
||||||
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
|
<option name="showLibraryContents" value="true" />
|
||||||
|
</component>
|
||||||
|
<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.testtheme.executor": "Run",
|
||||||
|
"Python.wg_func.executor": "Run",
|
||||||
|
"Python.wg_main.executor": "Run",
|
||||||
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
|
"Shell Script.install.executor": "Run",
|
||||||
|
"Shell Script.run_as.executor": "Run",
|
||||||
|
"git-widget-placeholder": "1.11.1024",
|
||||||
|
"last_opened_file_path": "/home/punix/Pyapps/wire-py",
|
||||||
|
"settings.editor.selected.configurable": "reference.settingsdialog.IDE.editor.colors"
|
||||||
|
}
|
||||||
|
}</component>
|
||||||
|
<component name="RecentsManager">
|
||||||
|
<key name="CopyFile.RECENT_KEYS">
|
||||||
|
<recent name="$PROJECT_DIR$/lx-icons" />
|
||||||
|
<recent name="$PROJECT_DIR$" />
|
||||||
|
</key>
|
||||||
|
<key name="MoveFile.RECENT_KEYS">
|
||||||
|
<recent name="$PROJECT_DIR$/TK-Themes/theme" />
|
||||||
|
<recent name="$PROJECT_DIR$/TK-Themes" />
|
||||||
|
<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="" />
|
||||||
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
|
<option name="PARENT_ENVS" value="true" />
|
||||||
|
<envs>
|
||||||
|
<env name="PYTHONUNBUFFERED" value="1" />
|
||||||
|
</envs>
|
||||||
|
<option name="SDK_HOME" value="" />
|
||||||
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
|
<option name="IS_MODULE_SDK" value="true" />
|
||||||
|
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||||
|
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||||
|
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/start_wg.py" />
|
||||||
|
<option name="PARAMETERS" value="" />
|
||||||
|
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||||
|
<option name="EMULATE_TERMINAL" value="false" />
|
||||||
|
<option name="MODULE_MODE" value="false" />
|
||||||
|
<option name="REDIRECT_INPUT" value="false" />
|
||||||
|
<option name="INPUT_FILE" value="" />
|
||||||
|
<method v="2" />
|
||||||
|
</configuration>
|
||||||
|
<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" />
|
||||||
|
</list>
|
||||||
|
</recent_temporary>
|
||||||
|
</component>
|
||||||
|
<component name="SharedIndexes">
|
||||||
|
<attachedChunks>
|
||||||
|
<set>
|
||||||
|
<option value="bundled-python-sdk-8336bb23522e-31b6be0877a2-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-241.19072.16" />
|
||||||
|
</set>
|
||||||
|
</attachedChunks>
|
||||||
|
</component>
|
||||||
|
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
||||||
|
<component name="TaskManager">
|
||||||
|
<task active="true" id="Default" summary="Default task">
|
||||||
|
<changelist id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="" />
|
||||||
|
<created>1723279982210</created>
|
||||||
|
<option name="number" value="Default" />
|
||||||
|
<option name="presentableId" value="Default" />
|
||||||
|
<updated>1723279982210</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00029" summary="little fixes a labels when stop and start, installer first functions works">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1725991610908</created>
|
||||||
|
<option name="number" value="00029" />
|
||||||
|
<option name="presentableId" value="LOCAL-00029" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1725991610908</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00030" summary="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()">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1726349168248</created>
|
||||||
|
<option name="number" value="00030" />
|
||||||
|
<option name="presentableId" value="LOCAL-00030" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1726349168248</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00031" summary="in delete replace open with Path 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>
|
||||||
|
<task id="LOCAL-00032" summary="new format little fixes icons sort add policy add .desktop File install Part 2">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1726599446537</created>
|
||||||
|
<option name="number" value="00032" />
|
||||||
|
<option name="presentableId" value="LOCAL-00032" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1726599446538</updated>
|
||||||
|
</task>
|
||||||
|
<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>
|
||||||
|
<task id="LOCAL-00057" summary="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">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1728059870005</created>
|
||||||
|
<option name="number" value="00057" />
|
||||||
|
<option name="presentableId" value="LOCAL-00057" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1728059870005</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00058" summary=" - Menu add - New Modern Dark and Light(default) Theme">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1729103964804</created>
|
||||||
|
<option name="number" value="00058" />
|
||||||
|
<option name="presentableId" value="LOCAL-00058" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1729103964804</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00059" summary=" - Theme modify to water-theme - add ttk.Menubutton vor modern Menu and automatic theme and textvariable for color on font in menu">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1729283656386</created>
|
||||||
|
<option name="number" value="00059" />
|
||||||
|
<option name="presentableId" value="LOCAL-00059" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1729283656387</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00060" summary=" - Theme modify to water-theme - add ttk.Menubutton vor modern Menu and automatic theme and textvariable for color on font in menu">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1729283719951</created>
|
||||||
|
<option name="number" value="00060" />
|
||||||
|
<option name="presentableId" value="LOCAL-00060" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1729283719951</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00061" summary=" - Add Options, Help, Update Label and Update Menubutton - Theme now separate Light and Dark">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1729353898829</created>
|
||||||
|
<option name="number" value="00061" />
|
||||||
|
<option name="presentableId" value="LOCAL-00061" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1729353898830</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00062" summary="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1729541504291</created>
|
||||||
|
<option name="number" value="00062" />
|
||||||
|
<option name="presentableId" value="LOCAL-00062" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1729541504292</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00063" summary="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1729541561434</created>
|
||||||
|
<option name="number" value="00063" />
|
||||||
|
<option name="presentableId" value="LOCAL-00063" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1729541561434</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00064" summary="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1729593628907</created>
|
||||||
|
<option name="number" value="00064" />
|
||||||
|
<option name="presentableId" value="LOCAL-00064" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1729593628908</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00065" summary="- Optimize Class and Tooltip">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1729938941026</created>
|
||||||
|
<option name="number" value="00065" />
|
||||||
|
<option name="presentableId" value="LOCAL-00065" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1729938941027</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00066" summary="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change - optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets - add new Frame for Widgets on Bottom - optimize from tkinter * to from tkinter import filedialog, ttk, TclError">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731097309468</created>
|
||||||
|
<option name="number" value="00066" />
|
||||||
|
<option name="presentableId" value="LOCAL-00066" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731097309468</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00067" summary="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change - optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets - add new Frame for Widgets on Bottom - optimize from tkinter * to from tkinter import filedialog, ttk, TclError">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731097969343</created>
|
||||||
|
<option name="number" value="00067" />
|
||||||
|
<option name="presentableId" value="LOCAL-00067" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731097969344</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00068" summary="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change - optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets - add new Frame for Widgets on Bottom - optimize from tkinter * to from tkinter import filedialog, ttk, TclError">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731098372497</created>
|
||||||
|
<option name="number" value="00068" />
|
||||||
|
<option name="presentableId" value="LOCAL-00068" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731098372497</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00069" summary=" - - Fix Checkbutton Autostart when first install Wire-Py">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731690583059</created>
|
||||||
|
<option name="number" value="00069" />
|
||||||
|
<option name="presentableId" value="LOCAL-00069" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731690583060</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00070" summary=" - - Fix Checkbutton Autostart when first install Wire-Py">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731836942211</created>
|
||||||
|
<option name="number" value="00070" />
|
||||||
|
<option name="presentableId" value="LOCAL-00070" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731836942212</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00071" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731840048762</created>
|
||||||
|
<option name="number" value="00071" />
|
||||||
|
<option name="presentableId" value="LOCAL-00071" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731840048763</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00072" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731840089956</created>
|
||||||
|
<option name="number" value="00072" />
|
||||||
|
<option name="presentableId" value="LOCAL-00072" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731840089956</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00073" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731840188277</created>
|
||||||
|
<option name="number" value="00073" />
|
||||||
|
<option name="presentableId" value="LOCAL-00073" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731840188278</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00074" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731840383592</created>
|
||||||
|
<option name="number" value="00074" />
|
||||||
|
<option name="presentableId" value="LOCAL-00074" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731840383592</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00075" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731841930614</created>
|
||||||
|
<option name="number" value="00075" />
|
||||||
|
<option name="presentableId" value="LOCAL-00075" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731841930615</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00076" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731844213239</created>
|
||||||
|
<option name="number" value="00076" />
|
||||||
|
<option name="presentableId" value="LOCAL-00076" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731844213239</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00077" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731844339039</created>
|
||||||
|
<option name="number" value="00077" />
|
||||||
|
<option name="presentableId" value="LOCAL-00077" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731844339039</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="78" />
|
||||||
|
<servers />
|
||||||
|
</component>
|
||||||
|
<component name="UnknownFeatures">
|
||||||
|
<option featureType="com.intellij.fileTypeFactory" implementationName="*.policy" />
|
||||||
|
</component>
|
||||||
|
<component name="Vcs.Log.Tabs.Properties">
|
||||||
|
<option name="TAB_STATES">
|
||||||
|
<map>
|
||||||
|
<entry key="MAIN">
|
||||||
|
<value>
|
||||||
|
<State>
|
||||||
|
<option name="FILTERS">
|
||||||
|
<map>
|
||||||
|
<entry key="branch">
|
||||||
|
<value>
|
||||||
|
<list>
|
||||||
|
<option value="1.11.0824" />
|
||||||
|
</list>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
</State>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
<component name="VcsManagerConfiguration">
|
||||||
|
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||||
|
<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" />
|
||||||
|
<MESSAGE value="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" />
|
||||||
|
<MESSAGE value=" - Menu add - New Modern Dark and Light(default) Theme" />
|
||||||
|
<MESSAGE value=" - Theme modify to water-theme - add ttk.Menubutton vor modern Menu and automatic theme and textvariable for color on font in menu" />
|
||||||
|
<MESSAGE value=" - Add Options, Help, Update Label and Update Menubutton - Theme now separate Light and Dark" />
|
||||||
|
<MESSAGE value="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip" />
|
||||||
|
<MESSAGE value="- Optimize Class and Tooltip" />
|
||||||
|
<MESSAGE value="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change - optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets - add new Frame for Widgets on Bottom - optimize from tkinter * to from tkinter import filedialog, ttk, TclError" />
|
||||||
|
<MESSAGE value=" - - Fix Checkbutton Autostart when first install Wire-Py" />
|
||||||
|
<MESSAGE value=" - Update Translate Files" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value=" - Update Translate Files" />
|
||||||
|
</component>
|
||||||
|
<component name="XDebuggerManager">
|
||||||
|
<breakpoint-manager>
|
||||||
|
<breakpoints>
|
||||||
|
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
||||||
|
<url>file://$PROJECT_DIR$/wg_main.py</url>
|
||||||
|
<line>1128</line>
|
||||||
|
<option name="timeStamp" value="3" />
|
||||||
|
</line-breakpoint>
|
||||||
|
</breakpoints>
|
||||||
|
</breakpoint-manager>
|
||||||
|
</component>
|
||||||
|
</project>
|
37
Changelog
@ -3,48 +3,17 @@ My standard System: Linux Mint 22 Cinnamon
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
- os import in common_tools.py replaced by other methods
|
- os import in cls_mth_fc.py replaced by other methods
|
||||||
- If Wire-Py already runs, prevent further start
|
- If Wire-Py already runs, prevent further start
|
||||||
- for loops with lists replaced by List Comprehensions
|
- for loops with lists replaced by List Comprehensions
|
||||||
|
- Crypt and Decrypt Config Files in ~/.config/wire_py
|
||||||
### Added
|
|
||||||
03-06-2025
|
|
||||||
|
|
||||||
-
|
|
||||||
### Added
|
|
||||||
13-04-20255
|
|
||||||
|
|
||||||
- Installer update for Open Suse Tumbleweed and Leap
|
|
||||||
- add symbolic link wirepy.py
|
|
||||||
|
|
||||||
|
|
||||||
### Added
|
|
||||||
09-04-2025
|
|
||||||
|
|
||||||
- Installer now with query and remove
|
|
||||||
- Icons merged
|
|
||||||
|
|
||||||
|
|
||||||
### Added
|
|
||||||
07-04-2025
|
|
||||||
|
|
||||||
- Installers will support other systems again
|
|
||||||
- Installer is now finished clean with wrong password
|
|
||||||
- Rename wg_main to wirepy
|
|
||||||
|
|
||||||
|
|
||||||
### Added
|
|
||||||
03-03-2025
|
|
||||||
|
|
||||||
- Fixes a new user files create
|
|
||||||
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
02-03-2025
|
02-03-2025
|
||||||
|
|
||||||
- Fix ipv6 in Config File on import
|
- Fix ipv6 in Config File on import
|
||||||
- Wirepy run now as user
|
- Wirepy run now as user
|
||||||
- settings, AppConfig.KEYS_FILE and Config Files now in ~/.config/wire_py
|
- settings, keys and Config Files now in ~/.config/wire_py
|
||||||
- For new users, the required files are created and autostart service is started.
|
- For new users, the required files are created and autostart service is started.
|
||||||
- Tunnels are now read from the directory to view them in the list.
|
- Tunnels are now read from the directory to view them in the list.
|
||||||
To display only own tunnels, and read errors are minimized.
|
To display only own tunnels, and read errors are minimized.
|
||||||
|
4
Wire-Py.desktop
Normal file → Executable file
@ -1,7 +1,7 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Name=Wire-Py
|
Name=Wire-Py
|
||||||
Exec=/usr/local/bin/wirepy.py
|
Exec=/usr/local/bin/wg_main.py
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Categories=Network;
|
Categories=Network;
|
||||||
Icon=/usr/share/icons/lx-icons/128/wg_vpn.png
|
Icon=/usr/share/icons/wp-icons/128/wg_vpn.png
|
||||||
|
BIN
__pycache__/cls_mth_fc.cpython-312.pyc
Normal file
BIN
__pycache__/message.cpython-312.pyc
Normal file
BIN
__pycache__/start_wg.cpython-312.pyc
Normal file
BIN
__pycache__/wg_main.cpython-312.pyc
Normal file
308
cls_mth_fc.py
Executable file
@ -0,0 +1,308 @@
|
|||||||
|
""" Classes Method and functions for lx apps """
|
||||||
|
|
||||||
|
import gettext
|
||||||
|
import locale
|
||||||
|
import os
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
from subprocess import check_call
|
||||||
|
import tkinter as tk
|
||||||
|
import zipfile
|
||||||
|
from datetime import datetime
|
||||||
|
from pathlib import Path
|
||||||
|
from tkinter import ttk
|
||||||
|
import requests
|
||||||
|
|
||||||
|
APP = 'wirepy'
|
||||||
|
LOCALE_DIR = "/usr/share/locale/"
|
||||||
|
locale.bindtextdomain(APP, LOCALE_DIR)
|
||||||
|
gettext.bindtextdomain(APP, LOCALE_DIR)
|
||||||
|
gettext.textdomain(APP)
|
||||||
|
_ = gettext.gettext
|
||||||
|
|
||||||
|
def dirs_and_files():
|
||||||
|
|
||||||
|
pth = Path.home() / '.config/wire_py'
|
||||||
|
pth.mkdir(parents=True, exist_ok=True)
|
||||||
|
sett = Path.home() / '.config/wire_py/settings'
|
||||||
|
ks = Path.home() / '.config/wire_py/keys'
|
||||||
|
|
||||||
|
if sett.exists():
|
||||||
|
pass
|
||||||
|
|
||||||
|
else:
|
||||||
|
sett.touch()
|
||||||
|
sett.write_text('[UPDATES]\non\n[THEME]\nlight\n[TOOLTIP]\nTrue\n[AUTOSTART ON]\noff')
|
||||||
|
|
||||||
|
if ks.exists():
|
||||||
|
pass
|
||||||
|
|
||||||
|
else:
|
||||||
|
ks.touch()
|
||||||
|
|
||||||
|
def files_for_autostart():
|
||||||
|
|
||||||
|
pth2 = Path.home() / '.config/systemd/user'
|
||||||
|
pth2.mkdir(parents=True, exist_ok=True)
|
||||||
|
wg_ser = Path.home() / '.config/systemd/user/wg_start.service'
|
||||||
|
|
||||||
|
if wg_ser.exists():
|
||||||
|
pass
|
||||||
|
|
||||||
|
else:
|
||||||
|
wg_ser.touch()
|
||||||
|
sett.write_text('[Unit]\nDescription=Automatic Tunnel Start\nAfter=network-online.target\n\n[Service]\nType=oneshot\nExecStartPre=/bin/sleep 5\nExecStart=/usr/local/bin/start_wg.py\n[Install]\nWantedBy=default.target')
|
||||||
|
check_call(['systemctl', '--user', 'enable', wg_start.service])
|
||||||
|
|
||||||
|
wg_set = Path(Path.home() / '.config/wire_py/settings')
|
||||||
|
|
||||||
|
|
||||||
|
class GiteaUpdate:
|
||||||
|
"""
|
||||||
|
Calling api_down requests the URL and the version of the running script.
|
||||||
|
Example: version = 'v. 1.1.1.1' GiteaUpdate.api_down(http://example.de, version)
|
||||||
|
|
||||||
|
Calling download requests the download URL of the running script,
|
||||||
|
the taskbar image for the “Download OK” window, the taskbar image for the
|
||||||
|
“Download error” window and the variable res
|
||||||
|
"""
|
||||||
|
@staticmethod
|
||||||
|
def api_down(update_api_url, version):
|
||||||
|
try:
|
||||||
|
response = requests.get(update_api_url)
|
||||||
|
response_dict = response.json()
|
||||||
|
response_dict = response_dict[0]
|
||||||
|
with open(wg_set, 'r') as set_file:
|
||||||
|
set_file = set_file.read()
|
||||||
|
if 'on\n' in set_file:
|
||||||
|
if version[3:] != response_dict['tag_name']:
|
||||||
|
return response_dict['tag_name']
|
||||||
|
else:
|
||||||
|
return 'No Updates'
|
||||||
|
else:
|
||||||
|
return 'False'
|
||||||
|
except requests.exceptions.ConnectionError:
|
||||||
|
return 'No Internet Connection!'
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def download(urld, down_ok_image, down_not_ok_image, res):
|
||||||
|
try:
|
||||||
|
to_down = 'wget -qP ' + str(Path.home()) + ' ' + urld
|
||||||
|
result = subprocess.call(to_down, shell=True)
|
||||||
|
if result == 0:
|
||||||
|
shutil.chown(str(Path.home()) + f'/{res}.zip', 1000, 1000)
|
||||||
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
|
ii = down_ok_image
|
||||||
|
wt = _('Download Successful')
|
||||||
|
msg_t = _('Your zip file is in home directory')
|
||||||
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
|
else:
|
||||||
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
|
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
||||||
|
ii = down_not_ok_image
|
||||||
|
wt = _('Download error')
|
||||||
|
msg_t = _('Download failed! Please try again')
|
||||||
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
except subprocess.CalledProcessError:
|
||||||
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
|
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
||||||
|
ii = down_not_ok_image
|
||||||
|
wt = _('Download error')
|
||||||
|
msg_t = _('Download failed! No internet connection!')
|
||||||
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
|
|
||||||
|
def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
|
||||||
|
"""
|
||||||
|
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/lx-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
|
||||||
|
txt2 = Text for Button two
|
||||||
|
com = function for Button command
|
||||||
|
"""
|
||||||
|
msg = tk.Toplevel()
|
||||||
|
msg.resizable(width=False, height=False)
|
||||||
|
msg.title(w_title)
|
||||||
|
msg.configure(pady=15, padx=15)
|
||||||
|
msg.img = tk.PhotoImage(file=img_w)
|
||||||
|
msg.i_window = tk.Label(msg, image=msg.img)
|
||||||
|
|
||||||
|
label = tk.Label(msg, text=w_txt)
|
||||||
|
|
||||||
|
label.grid(column=1, row=0)
|
||||||
|
|
||||||
|
if txt2 is not None and com is not None:
|
||||||
|
label.config(font=('Ubuntu', 11), padx=15, justify='left')
|
||||||
|
msg.i_window.grid(column=0, row=0, sticky='nw')
|
||||||
|
button2 = ttk.Button(msg, text=f'{txt2}', command=com, padding=4)
|
||||||
|
button2.grid(column=0, row=1, sticky='e', columnspan=2)
|
||||||
|
button = ttk.Button(msg, text='OK', command=msg.destroy, padding=4)
|
||||||
|
button.grid(column=0, row=1, sticky='w', columnspan=2)
|
||||||
|
|
||||||
|
else:
|
||||||
|
label.config(font=('Ubuntu', 11), padx=15)
|
||||||
|
msg.i_window.grid(column=0, row=0)
|
||||||
|
button = ttk.Button(msg, text='OK', command=msg.destroy, padding=4)
|
||||||
|
button.grid(column=0, columnspan=2, row=1)
|
||||||
|
|
||||||
|
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 Tunnel:
|
||||||
|
"""
|
||||||
|
Class of Methods for Wire-Py
|
||||||
|
"""
|
||||||
|
|
||||||
|
"""
|
||||||
|
The config file is packed into a dictionary,
|
||||||
|
to display the values Address , DNS and Peer in the labels
|
||||||
|
"""
|
||||||
|
@classmethod
|
||||||
|
def con_to_dict(cls, file):
|
||||||
|
|
||||||
|
dictlist = []
|
||||||
|
for lines in file.readlines():
|
||||||
|
line_plit = lines.split()
|
||||||
|
dictlist = dictlist + line_plit
|
||||||
|
dictlist.remove('[Interface]')
|
||||||
|
dictlist.remove('[Peer]')
|
||||||
|
for items in dictlist:
|
||||||
|
if items == '=':
|
||||||
|
dictlist.remove(items)
|
||||||
|
if items == '::/0':
|
||||||
|
dictlist.remove(items)
|
||||||
|
|
||||||
|
''' 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]]
|
||||||
|
d = [dictlist[6], dictlist[7]]
|
||||||
|
e = [dictlist[8], dictlist[9]]
|
||||||
|
f = [dictlist[10], dictlist[11]]
|
||||||
|
g = [dictlist[12], dictlist[13]]
|
||||||
|
h = [dictlist[14], dictlist[15]]
|
||||||
|
new_list = [a, b, c, d, e, f, g, h]
|
||||||
|
final_dict = {}
|
||||||
|
for elements in new_list:
|
||||||
|
final_dict[elements[0]] = elements[1]
|
||||||
|
|
||||||
|
''' end... result a Dictionary '''
|
||||||
|
|
||||||
|
address = final_dict['Address']
|
||||||
|
dns = final_dict['DNS']
|
||||||
|
if ',' in dns:
|
||||||
|
dns = dns[:-1]
|
||||||
|
endpoint = final_dict['Endpoint']
|
||||||
|
if 'PresharedKey' in final_dict:
|
||||||
|
pre_key = final_dict['PresharedKey']
|
||||||
|
else:
|
||||||
|
pre_key = final_dict['PreSharedKey']
|
||||||
|
return address, dns, endpoint, pre_key
|
||||||
|
|
||||||
|
"""
|
||||||
|
Shows the Active Tunnel
|
||||||
|
"""
|
||||||
|
@staticmethod
|
||||||
|
def active():
|
||||||
|
|
||||||
|
active = os.popen('nmcli con show --active | grep -iPo "(.*)(wireguard)"').read().split()
|
||||||
|
if not active:
|
||||||
|
active = ''
|
||||||
|
else:
|
||||||
|
active = active[0]
|
||||||
|
|
||||||
|
return active
|
||||||
|
|
||||||
|
"""
|
||||||
|
Shows all existing Wireguard tunnels a login user
|
||||||
|
"""
|
||||||
|
@staticmethod
|
||||||
|
def list():
|
||||||
|
dirname = Path.home() / '.config/wire_py/'
|
||||||
|
wg_s = os.listdir(dirname)
|
||||||
|
wg_s.remove('keys')
|
||||||
|
wg_s.remove('settings')
|
||||||
|
|
||||||
|
return wg_s
|
||||||
|
|
||||||
|
"""
|
||||||
|
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 export():
|
||||||
|
now_time = datetime.now()
|
||||||
|
now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
|
||||||
|
tl = Tunnel.list()
|
||||||
|
|
||||||
|
try:
|
||||||
|
if len(tl) != 0:
|
||||||
|
wg_tar = str(Path.home()) + '/' + now_datetime
|
||||||
|
shutil.copytree(Path.home() / '.config/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)
|
||||||
|
Path.unlink(Path(source) / 'settings', 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/lx-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:
|
||||||
|
|
||||||
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
|
iw = r'/usr/share/icons/lx-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/lx-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
|
||||||
|
|
||||||
|
|
||||||
|
class Tipi:
|
||||||
|
"""
|
||||||
|
Class for Tooltip setting write in File
|
||||||
|
Calling request path to file
|
||||||
|
"""
|
||||||
|
@staticmethod
|
||||||
|
def if_tip(path):
|
||||||
|
with open(path, 'r') as set_file2:
|
||||||
|
lines2 = set_file2.readlines()
|
||||||
|
if 'False\n' in lines2:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
wg_tips = Tipi.if_tip(wg_set)
|
133
install
Executable file
@ -0,0 +1,133 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
NORMAL='\033[0m'
|
||||||
|
GREEN='\033[1;32m'
|
||||||
|
RED='\033[31;1;42m'
|
||||||
|
BLUE='\033[30;1;34m'
|
||||||
|
|
||||||
|
install_file_with(){
|
||||||
|
clear
|
||||||
|
mkdir -p ~/.config/wire_py && touch ~/.config/wire_py/keys && cp -u settings ~/.config/wire_py/ && \
|
||||||
|
mkdir -p ~/.config/systemd/user && cp -u wg_start.service ~/.config/systemd/user/ && \
|
||||||
|
systemctl --user enable wg_start.service
|
||||||
|
sudo apt install python3-tk && \
|
||||||
|
sudo cp -u wg_main.py start_wg.py cls_mth_fc.py /usr/local/bin/ && \
|
||||||
|
sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
||||||
|
sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
|
||||||
|
sudo ln -sf /usr/local/bin/wg_main.py /usr/local/bin/wirepy && \
|
||||||
|
sudo cp -u Wire-Py.desktop /usr/share/applications/
|
||||||
|
}
|
||||||
|
|
||||||
|
install_arch_d(){
|
||||||
|
clear
|
||||||
|
sudo pacman -S --noconfirm tk python3 python-requests && \
|
||||||
|
sudo cp -u wg_main.py start_wg.py cls_mth_fc.py && \
|
||||||
|
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/keys && sudo cp -u settings /etc/wire_py/ && \
|
||||||
|
sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
||||||
|
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||||
|
sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
|
||||||
|
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
|
||||||
|
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
|
||||||
|
|
||||||
|
|
||||||
|
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 cls_mth_fc.py && \
|
||||||
|
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/keys && \
|
||||||
|
sudo cp -u settings /etc/wire_py/ && \
|
||||||
|
sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
|
||||||
|
sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
||||||
|
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 cls_mth_fc.py && \
|
||||||
|
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/keys && \
|
||||||
|
sudo cp -u settings /etc/wire_py/ && \
|
||||||
|
sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
|
||||||
|
sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
||||||
|
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
|
||||||
|
|
||||||
|
|
Before Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 7.4 KiB |
Before Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 984 B |
Before Width: | Height: | Size: 657 B |
Before Width: | Height: | Size: 906 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 906 B |
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.0 KiB |
@ -1,61 +0,0 @@
|
|||||||
#!/usr/bin/python3
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
|
|
||||||
directorys: list[str] = [
|
|
||||||
"/etc/netplan/",
|
|
||||||
"/etc/NetworkManager/system-connections/",
|
|
||||||
"/var/lib/NetworkManager/user-connections/",
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def search_string_in_directory(
|
|
||||||
directories: list[str] = directorys, # Use the predefined list as default
|
|
||||||
search_string: str = "", # Default is empty string
|
|
||||||
) -> bool:
|
|
||||||
|
|
||||||
if len(search_string) == 0:
|
|
||||||
return False
|
|
||||||
|
|
||||||
result = False
|
|
||||||
for directory in directories:
|
|
||||||
in_paths = Path(directory)
|
|
||||||
if not in_paths.exists() or not in_paths.is_dir():
|
|
||||||
continue
|
|
||||||
|
|
||||||
files = [file for file in in_paths.iterdir() if file.is_file()]
|
|
||||||
if not files:
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Search for the string in each file
|
|
||||||
for file in files:
|
|
||||||
try:
|
|
||||||
with open(file, "r", errors="ignore") as f:
|
|
||||||
for line in f:
|
|
||||||
if search_string in line:
|
|
||||||
result = True # String found
|
|
||||||
break
|
|
||||||
if result:
|
|
||||||
break # No need to check further
|
|
||||||
except Exception:
|
|
||||||
continue # Skip files that cause errors
|
|
||||||
|
|
||||||
return result
|
|
||||||
|
|
||||||
|
|
||||||
def main() -> None:
|
|
||||||
parser = argparse.ArgumentParser(
|
|
||||||
description="Script only for use to compare the private key in the"
|
|
||||||
"Network configurations to avoid errors with the network manager."
|
|
||||||
)
|
|
||||||
parser.add_argument("search_string", help="Search string")
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
result = search_string_in_directory(search_string=args.search_string)
|
|
||||||
print(result)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
@ -1,51 +0,0 @@
|
|||||||
<?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">
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Policy definitions for ssl_encrypt and ssl_decrypt
|
|
||||||
|
|
||||||
Copyright (C) 2025 Désiré Werner Menrath <polunga40@unity-mail.de>
|
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
|
||||||
modify it under the terms of the GNU Lesser General Public
|
|
||||||
License as published by the Free Software Foundation; either
|
|
||||||
version 2.1 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
This library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
Lesser General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
|
||||||
License along with this library. If not, see
|
|
||||||
<http://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<policyconfig>
|
|
||||||
<action id="org.ssl_encrypt">
|
|
||||||
<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/local/bin/ssl_encrypt.py</annotate>
|
|
||||||
</action>
|
|
||||||
|
|
||||||
<action id="org.ssl_decrypt">
|
|
||||||
<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/local/bin/ssl_decrypt.py</annotate>
|
|
||||||
</action>
|
|
||||||
|
|
||||||
<action id="org.match_found">
|
|
||||||
<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/local/bin/match_found.py</annotate>
|
|
||||||
</action>
|
|
||||||
</policyconfig>
|
|
8
settings
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
[UPDATES]
|
||||||
|
on
|
||||||
|
[THEME]
|
||||||
|
light
|
||||||
|
[TOOLTIP]
|
||||||
|
True
|
||||||
|
[AUTOSTART ON]
|
||||||
|
off
|
@ -1,84 +0,0 @@
|
|||||||
#!/usr/bin/python3
|
|
||||||
""" This Script decrypt Wireguard files for Wirepy users """
|
|
||||||
import argparse
|
|
||||||
from pathlib import Path
|
|
||||||
import pwd
|
|
||||||
import shutil
|
|
||||||
from subprocess import CompletedProcess, run
|
|
||||||
from shared_libs.wp_app_config import AppConfig, logging
|
|
||||||
|
|
||||||
parser = argparse.ArgumentParser()
|
|
||||||
parser.add_argument("--user", required=True, help="Username of the target file system")
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Retrieve UID and GID
|
|
||||||
user_info = pwd.getpwnam(args.user)
|
|
||||||
uid = user_info.pw_uid # User ID (e.g., 1000)
|
|
||||||
gid = user_info.pw_gid # Group ID (e.g., 1000)
|
|
||||||
except KeyError:
|
|
||||||
logging.error(f"User '{args.user}' not found.", exc_info=True)
|
|
||||||
exit(1)
|
|
||||||
|
|
||||||
keyfile: Path = Path(f"/home/{args.user}/.config/wire_py/pbwgk.pem")
|
|
||||||
path_of_crypted_tunnel: Path = Path(f"/home/{args.user}/.config/wire_py")
|
|
||||||
|
|
||||||
if not keyfile.is_file():
|
|
||||||
process: CompletedProcess[str] = run(
|
|
||||||
[
|
|
||||||
"openssl",
|
|
||||||
"rsa",
|
|
||||||
"-in",
|
|
||||||
AppConfig.SYSTEM_PATHS["pkey_path"],
|
|
||||||
"-out",
|
|
||||||
keyfile,
|
|
||||||
"-outform",
|
|
||||||
"PEM",
|
|
||||||
"-pubout",
|
|
||||||
],
|
|
||||||
capture_output=True,
|
|
||||||
text=True,
|
|
||||||
check=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
if process.returncode == 0:
|
|
||||||
logging.info("Public key generated successfully.", exc_info=True)
|
|
||||||
else:
|
|
||||||
logging.error(
|
|
||||||
f"Error with the following code... {process.returncode}", exc_info=True
|
|
||||||
)
|
|
||||||
shutil.chown(keyfile, uid, gid)
|
|
||||||
|
|
||||||
if AppConfig.PUBLICKEY.exists():
|
|
||||||
|
|
||||||
crypted__tunnel = [str(file) for file in path_of_crypted_tunnel.glob("*.dat")]
|
|
||||||
|
|
||||||
for tunnel_path in crypted__tunnel:
|
|
||||||
|
|
||||||
base_name = Path(tunnel_path).stem
|
|
||||||
|
|
||||||
process: CompletedProcess[str] = run(
|
|
||||||
[
|
|
||||||
"openssl",
|
|
||||||
"pkeyutl",
|
|
||||||
"-decrypt",
|
|
||||||
"-inkey",
|
|
||||||
AppConfig.SYSTEM_PATHS["pkey_path"],
|
|
||||||
"-in",
|
|
||||||
tunnel_path, # full path to the file
|
|
||||||
"-out",
|
|
||||||
f"{AppConfig.TEMP_DIR}/{base_name}.conf",
|
|
||||||
],
|
|
||||||
capture_output=True,
|
|
||||||
text=True,
|
|
||||||
check=False,
|
|
||||||
)
|
|
||||||
shutil.chown(f"{AppConfig.TEMP_DIR}/{base_name}.conf", uid, gid)
|
|
||||||
logging.info(f"Processing of the file: {tunnel_path}", exc_info=True)
|
|
||||||
|
|
||||||
# Output from Openssl Error
|
|
||||||
if process.stderr:
|
|
||||||
logging.error(
|
|
||||||
f"{process.stderr} Error by [{tunnel_path}] Code: {process.returncode}",
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
@ -1,82 +0,0 @@
|
|||||||
#!/usr/bin/python3
|
|
||||||
""" This Script encrypt Wireguardfiles for Wirepy users for more Security """
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
from pathlib import Path
|
|
||||||
import pwd
|
|
||||||
import shutil
|
|
||||||
from subprocess import CompletedProcess, run
|
|
||||||
from shared_libs.wp_app_config import AppConfig, logging
|
|
||||||
|
|
||||||
parser = argparse.ArgumentParser()
|
|
||||||
parser.add_argument("--user", required=True, help="Username of the target file system")
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Retrieve UID and GID
|
|
||||||
user_info = pwd.getpwnam(args.user)
|
|
||||||
uid = user_info.pw_uid # User ID (e.g., 1000)
|
|
||||||
gid = user_info.pw_gid # Group ID (e.g., 1000)
|
|
||||||
except KeyError:
|
|
||||||
logging.error(f"User '{args.user}' not found.", exc_info=True)
|
|
||||||
exit(1)
|
|
||||||
|
|
||||||
keyfile: Path = Path(f"/home/{args.user}/.config/wire_py/pbwgk.pem")
|
|
||||||
|
|
||||||
target: Path = Path(f"/home/{args.user}/.config/wire_py/")
|
|
||||||
|
|
||||||
if not keyfile.is_file():
|
|
||||||
|
|
||||||
process: CompletedProcess[str] = run(
|
|
||||||
[
|
|
||||||
"openssl",
|
|
||||||
"rsa",
|
|
||||||
"-in",
|
|
||||||
AppConfig.SYSTEM_PATHS["pkey_path"],
|
|
||||||
"-out",
|
|
||||||
keyfile,
|
|
||||||
"-outform",
|
|
||||||
"PEM",
|
|
||||||
"-pubout",
|
|
||||||
],
|
|
||||||
capture_output=True,
|
|
||||||
text=True,
|
|
||||||
check=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Output from Openssl Error
|
|
||||||
if process.stderr:
|
|
||||||
logging.error(f"{process.stderr} Code: {process.returncode}", exc_info=True)
|
|
||||||
|
|
||||||
if process.returncode == 0:
|
|
||||||
logging.info("Public key generated successfully.", exc_info=True)
|
|
||||||
|
|
||||||
shutil.chown(keyfile, uid, gid)
|
|
||||||
|
|
||||||
# any() get True when directory is not empty
|
|
||||||
if AppConfig.TEMP_DIR.exists() and any(AppConfig.TEMP_DIR.iterdir()):
|
|
||||||
clear_files = [str(file) for file in AppConfig.TEMP_DIR.glob("*.conf")]
|
|
||||||
|
|
||||||
for config_file in clear_files:
|
|
||||||
base_name = Path(config_file).stem
|
|
||||||
process: CompletedProcess[str] = run(
|
|
||||||
[
|
|
||||||
"openssl",
|
|
||||||
"pkeyutl",
|
|
||||||
"-encrypt",
|
|
||||||
"-inkey",
|
|
||||||
keyfile,
|
|
||||||
"-pubin",
|
|
||||||
"-in",
|
|
||||||
config_file,
|
|
||||||
"-out",
|
|
||||||
f"{target}/{base_name}.dat",
|
|
||||||
],
|
|
||||||
capture_output=True,
|
|
||||||
text=True,
|
|
||||||
check=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Output from Openssl Error
|
|
||||||
if process.stderr:
|
|
||||||
logging.error(process.stderr, exc_info=True)
|
|
32
start_wg.py
@ -1,24 +1,14 @@
|
|||||||
#!/usr/bin/python3
|
#!/usr/bin/python3
|
||||||
"""
|
from subprocess import check_call
|
||||||
This script belongs to wirepy and is for the auto start of the tunnel
|
from pathlib import Path
|
||||||
"""
|
|
||||||
import logging
|
|
||||||
from subprocess import CompletedProcess, run
|
|
||||||
from shared_libs.wp_app_config import AppConfig
|
|
||||||
from shared_libs.common_tools import ConfigManager, LogConfig
|
|
||||||
|
|
||||||
ConfigManager.init(AppConfig.SETTINGS_FILE)
|
path_to_file = Path(Path.home() / '.config/wire_py/settings')
|
||||||
LogConfig.logger(ConfigManager.get("logfile"))
|
|
||||||
if ConfigManager.get("autostart") != "off":
|
with open(path_to_file, 'r') as a_con:
|
||||||
process: CompletedProcess[str] = run(
|
lines = a_con.readlines()
|
||||||
["nmcli", "connection", "up", ConfigManager.get("autostart")],
|
a_con = lines[7].strip()
|
||||||
capture_output=True,
|
if a_con != 'off':
|
||||||
text=True,
|
check_call(['nmcli', 'connection', 'up', a_con])
|
||||||
check=False,
|
else:
|
||||||
)
|
pass
|
||||||
# Output from start_wg error
|
|
||||||
if process.stderr:
|
|
||||||
logging.error(process.stderr, exc_info=True)
|
|
||||||
|
|
||||||
else:
|
|
||||||
pass
|
|
||||||
|
230
tunnel.py
@ -1,230 +0,0 @@
|
|||||||
#!/usr/bin/python3
|
|
||||||
import logging
|
|
||||||
import getpass
|
|
||||||
import zipfile
|
|
||||||
from datetime import datetime
|
|
||||||
from pathlib import Path
|
|
||||||
import shutil
|
|
||||||
from subprocess import run, CompletedProcess
|
|
||||||
import secrets
|
|
||||||
from shared_libs.wp_app_config import AppConfig, Msg
|
|
||||||
from shared_libs.common_tools import LxTools, CryptoUtil
|
|
||||||
|
|
||||||
# Translate
|
|
||||||
_ = AppConfig.setup_translations()
|
|
||||||
|
|
||||||
|
|
||||||
class Tunnel:
|
|
||||||
"""
|
|
||||||
Class of Methods for Wire-Py
|
|
||||||
"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def parse_files_to_dictionary(
|
|
||||||
directory: Path = None, filepath: str = None, content: str = None
|
|
||||||
) -> tuple[dict, str] | dict | None:
|
|
||||||
data = {}
|
|
||||||
|
|
||||||
if filepath is not None:
|
|
||||||
filepath = Path(filepath)
|
|
||||||
try:
|
|
||||||
content = filepath.read_text()
|
|
||||||
|
|
||||||
# parse the content
|
|
||||||
address_line = next(
|
|
||||||
line for line in content.splitlines() if line.startswith("Address")
|
|
||||||
)
|
|
||||||
dns_line = next(
|
|
||||||
line for line in content.splitlines() if line.startswith("DNS")
|
|
||||||
)
|
|
||||||
endpoint_line = next(
|
|
||||||
line for line in content.splitlines() if line.startswith("Endpoint")
|
|
||||||
)
|
|
||||||
private_key_line = next(
|
|
||||||
line
|
|
||||||
for line in content.splitlines()
|
|
||||||
if line.startswith("PrivateKey")
|
|
||||||
)
|
|
||||||
|
|
||||||
content = secrets.token_bytes(len(content))
|
|
||||||
|
|
||||||
# extract the values
|
|
||||||
address = address_line.split("=")[1].strip()
|
|
||||||
dns = dns_line.split("=")[1].strip()
|
|
||||||
endpoint = endpoint_line.split("=")[1].strip()
|
|
||||||
private_key = private_key_line.split("=")[1].strip()
|
|
||||||
|
|
||||||
# Shorten the tunnel name to the maximum allowed length if it exceeds 12 characters.
|
|
||||||
original_stem = filepath.stem
|
|
||||||
truncated_stem = (
|
|
||||||
original_stem[-12:] if len(original_stem) > 12 else original_stem
|
|
||||||
)
|
|
||||||
|
|
||||||
# save in the dictionary
|
|
||||||
data[truncated_stem] = {
|
|
||||||
"Address": address,
|
|
||||||
"DNS": dns,
|
|
||||||
"Endpoint": endpoint,
|
|
||||||
"PrivateKey": private_key,
|
|
||||||
}
|
|
||||||
|
|
||||||
content = secrets.token_bytes(len(content))
|
|
||||||
|
|
||||||
except StopIteration:
|
|
||||||
pass
|
|
||||||
|
|
||||||
elif directory is not None:
|
|
||||||
|
|
||||||
if not directory.exists() or not directory.is_dir():
|
|
||||||
logging.error(
|
|
||||||
"Temp directory does not exist or is not a directory.",
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Get a list of all files in the directory
|
|
||||||
files = [file for file in AppConfig.TEMP_DIR.iterdir() if file.is_file()]
|
|
||||||
|
|
||||||
# Search for the string in the files
|
|
||||||
for file in files:
|
|
||||||
try:
|
|
||||||
content = file.read_text()
|
|
||||||
# parse the content
|
|
||||||
address_line = next(
|
|
||||||
line
|
|
||||||
for line in content.splitlines()
|
|
||||||
if line.startswith("Address")
|
|
||||||
)
|
|
||||||
dns_line = next(
|
|
||||||
line for line in content.splitlines() if line.startswith("DNS")
|
|
||||||
)
|
|
||||||
endpoint_line = next(
|
|
||||||
line
|
|
||||||
for line in content.splitlines()
|
|
||||||
if line.startswith("Endpoint")
|
|
||||||
)
|
|
||||||
|
|
||||||
# extract values
|
|
||||||
address = address_line.split("=")[1].strip()
|
|
||||||
dns = dns_line.split("=")[1].strip()
|
|
||||||
endpoint = endpoint_line.split("=")[1].strip()
|
|
||||||
|
|
||||||
# save values to dictionary
|
|
||||||
data[file.stem] = {
|
|
||||||
"Address": address,
|
|
||||||
"DNS": dns,
|
|
||||||
"Endpoint": endpoint,
|
|
||||||
}
|
|
||||||
|
|
||||||
except Exception:
|
|
||||||
# Ignore errors and continue to the next file
|
|
||||||
continue
|
|
||||||
if content is not None:
|
|
||||||
content = secrets.token_bytes(len(content))
|
|
||||||
if filepath is not None:
|
|
||||||
return data, truncated_stem
|
|
||||||
else:
|
|
||||||
return data
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def get_active() -> str:
|
|
||||||
"""
|
|
||||||
Shows the Active Tunnel
|
|
||||||
"""
|
|
||||||
active = None
|
|
||||||
try:
|
|
||||||
process: CompletedProcess[str] = run(
|
|
||||||
["nmcli", "-t", "-f", "NAME,TYPE", "connection", "show", "--active"],
|
|
||||||
capture_output=True,
|
|
||||||
text=True,
|
|
||||||
check=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
active = next(
|
|
||||||
line.split(":")[0].strip()
|
|
||||||
for line in process.stdout.splitlines()
|
|
||||||
if line.endswith("wireguard")
|
|
||||||
)
|
|
||||||
|
|
||||||
if process.stderr and "error" in process.stderr.lower():
|
|
||||||
logging.error(f"Error output on nmcli: {process.stderr}")
|
|
||||||
|
|
||||||
except StopIteration:
|
|
||||||
active = None
|
|
||||||
except Exception as e:
|
|
||||||
logging.error(f"Error on nmcli: {e}")
|
|
||||||
active = None
|
|
||||||
|
|
||||||
return active if active is not None else ""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def export() -> bool | None:
|
|
||||||
"""
|
|
||||||
This will export the tunnels.
|
|
||||||
A zipfile with the current date and time is created
|
|
||||||
in the user's home directory with the correct right
|
|
||||||
"""
|
|
||||||
now_time: datetime = datetime.now()
|
|
||||||
now_datetime: str = now_time.strftime("wg-exp-%m-%d-%Y-%H:%M")
|
|
||||||
|
|
||||||
try:
|
|
||||||
AppConfig.ensure_directories()
|
|
||||||
CryptoUtil.decrypt(getpass.getuser())
|
|
||||||
if len([file.name for file in AppConfig.TEMP_DIR.glob("*.conf")]) == 0:
|
|
||||||
|
|
||||||
LxTools.msg_window(
|
|
||||||
AppConfig.IMAGE_PATHS["icon_info"],
|
|
||||||
AppConfig.IMAGE_PATHS["icon_msg"],
|
|
||||||
Msg.STR["sel_tl"],
|
|
||||||
Msg.STR["tl_first"],
|
|
||||||
)
|
|
||||||
return False
|
|
||||||
else:
|
|
||||||
wg_tar: str = f"{AppConfig.BASE_DIR}/{now_datetime}"
|
|
||||||
try:
|
|
||||||
shutil.make_archive(wg_tar, "zip", AppConfig.TEMP_DIR)
|
|
||||||
with zipfile.ZipFile(f"{wg_tar}.zip", "r") as zf:
|
|
||||||
if zf.namelist():
|
|
||||||
|
|
||||||
LxTools.msg_window(
|
|
||||||
AppConfig.IMAGE_PATHS["icon_info"],
|
|
||||||
AppConfig.IMAGE_PATHS["icon_vpn"],
|
|
||||||
Msg.STR["exp_succ"],
|
|
||||||
Msg.STR["exp_in_home"],
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
logging.error(
|
|
||||||
"There was a mistake at creating the Zip file. File is empty."
|
|
||||||
)
|
|
||||||
LxTools.msg_window(
|
|
||||||
AppConfig.IMAGE_PATHS["icon_error"],
|
|
||||||
AppConfig.IMAGE_PATHS["icon_msg"],
|
|
||||||
Msg.STR["exp_err"],
|
|
||||||
Msg.STR["exp_zip"],
|
|
||||||
)
|
|
||||||
return False
|
|
||||||
return True
|
|
||||||
except PermissionError:
|
|
||||||
logging.error(
|
|
||||||
f"Permission denied when creating archive in {wg_tar}"
|
|
||||||
)
|
|
||||||
return False
|
|
||||||
|
|
||||||
except zipfile.BadZipFile as e:
|
|
||||||
logging.error(f"Invalid ZIP file: {e}")
|
|
||||||
return False
|
|
||||||
except TypeError:
|
|
||||||
pass
|
|
||||||
except Exception as e:
|
|
||||||
logging.error(f"Export failed: {str(e)}")
|
|
||||||
LxTools.msg_window(
|
|
||||||
AppConfig.IMAGE_PATHS["icon_error"],
|
|
||||||
AppConfig.IMAGE_PATHS["icon_msg"],
|
|
||||||
Msg.STR["exp_err"],
|
|
||||||
Msg.STR["exp_try"],
|
|
||||||
)
|
|
||||||
return False
|
|
||||||
|
|
||||||
finally:
|
|
||||||
LxTools.clean_files(AppConfig.TEMP_DIR)
|
|
||||||
AppConfig.ensure_directories()
|
|
1162
wg_main.py
Executable file
10
wg_start.service
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Automatic Tunnel Start
|
||||||
|
After=network-online.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
ExecStartPre=/bin/sleep 5
|
||||||
|
ExecStart=/usr/local/bin/start_wg.py
|
||||||
|
[Install]
|
||||||
|
WantedBy=default.target
|
BIN
wp-icons/128/error.png
Normal file
After Width: | Height: | Size: 5.7 KiB |
BIN
wp-icons/128/info.png
Normal file
After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
BIN
wp-icons/256/error.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
wp-icons/256/info.png
Normal file
After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
BIN
wp-icons/32/error.png
Normal file
After Width: | Height: | Size: 5.1 KiB |
BIN
wp-icons/32/info.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB |
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 6.0 KiB |
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB |
BIN
wp-icons/32/wg_vpn.png
Normal file
After Width: | Height: | Size: 5.8 KiB |
BIN
wp-icons/48/error.png
Normal file
After Width: | Height: | Size: 5.7 KiB |
BIN
wp-icons/48/info.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.0 KiB |
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 7.1 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
BIN
wp-icons/64/error.png
Normal file
After Width: | Height: | Size: 2.7 KiB |
BIN
wp-icons/64/info.png
Normal file
After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 9.0 KiB |
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 8.3 KiB |
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 9.0 KiB |
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 8.7 KiB |
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 8.4 KiB |
247
wp_app_config.py
@ -1,247 +0,0 @@
|
|||||||
#!/usr/bin/python3
|
|
||||||
"""App configuration for Wire-Py"""
|
|
||||||
import logging
|
|
||||||
import gettext
|
|
||||||
import locale
|
|
||||||
from pathlib import Path
|
|
||||||
from subprocess import CompletedProcess, run
|
|
||||||
from typing import Dict, Any
|
|
||||||
|
|
||||||
|
|
||||||
class AppConfig:
|
|
||||||
"""Central configuration and system setup manager for the Wire-Py application.
|
|
||||||
|
|
||||||
This class serves as a singleton-like container for all global configuration data,
|
|
||||||
including paths, UI settings, localization, versioning, and system-specific resources.
|
|
||||||
It ensures that required directories, files, and services are created and configured
|
|
||||||
before the application starts. Additionally, it provides tools for managing translations,
|
|
||||||
default settings, and autostart functionality to maintain a consistent user experience.
|
|
||||||
|
|
||||||
Key Responsibilities:
|
|
||||||
- Centralizes all configuration values (paths, UI preferences, localization).
|
|
||||||
- Ensures required directories and files exist on startup.
|
|
||||||
- Handles translation setup via `gettext` for multilingual support.
|
|
||||||
- Manages default settings file generation.
|
|
||||||
- Configures autostart services using systemd for user-specific launch behavior.
|
|
||||||
|
|
||||||
This class is used globally across the application to access configuration data
|
|
||||||
consistently and perform system-level setup tasks.
|
|
||||||
"""
|
|
||||||
|
|
||||||
# Logging
|
|
||||||
LOG_DIR = Path.home() / ".local/share/lxlogs"
|
|
||||||
Path(LOG_DIR).mkdir(parents=True, exist_ok=True)
|
|
||||||
LOG_FILE_PATH = LOG_DIR / "wirepy.log"
|
|
||||||
|
|
||||||
# Localization
|
|
||||||
APP_NAME: str = "wirepy"
|
|
||||||
LOCALE_DIR: Path = Path("/usr/share/locale/")
|
|
||||||
|
|
||||||
# Base paths
|
|
||||||
BASE_DIR: Path = Path.home()
|
|
||||||
CONFIG_DIR: Path = BASE_DIR / ".config/wire_py"
|
|
||||||
TEMP_DIR: Path = Path("/tmp/tlecdcwg")
|
|
||||||
PUBLICKEY: Path = CONFIG_DIR / "pbwgk.pem"
|
|
||||||
|
|
||||||
# Configuration files
|
|
||||||
SETTINGS_FILE: Path = CONFIG_DIR / "settings"
|
|
||||||
SYSTEMD_USER_FOLDER: Path = Path.home() / ".config/systemd/user"
|
|
||||||
AUTOSTART_SERVICE: Path = Path.home() / ".config/systemd/user/wg_start.service"
|
|
||||||
DEFAULT_SETTINGS: Dict[str, str] = {
|
|
||||||
"# Configuration": "on",
|
|
||||||
"# Theme": "dark",
|
|
||||||
"# Tooltips": True,
|
|
||||||
"# Autostart": "off",
|
|
||||||
"# Logfile": LOG_FILE_PATH,
|
|
||||||
}
|
|
||||||
|
|
||||||
# Updates
|
|
||||||
# 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year
|
|
||||||
VERSION: str = "v. 2.04.1725"
|
|
||||||
UPDATE_URL: str = "https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases"
|
|
||||||
DOWNLOAD_URL: str = "https://git.ilunix.de/punix/Wire-Py/archive"
|
|
||||||
|
|
||||||
# UI configuration
|
|
||||||
UI_CONFIG: Dict[str, Any] = {
|
|
||||||
"window_title": "Wire-Py",
|
|
||||||
"window_title2": "LogViewer",
|
|
||||||
"window_size": (600, 383),
|
|
||||||
"font_family": "Ubuntu",
|
|
||||||
"font_size": 11,
|
|
||||||
"resizable_window": (False, False),
|
|
||||||
}
|
|
||||||
|
|
||||||
# System-dependent paths
|
|
||||||
SYSTEM_PATHS: Dict[str, Path] = {
|
|
||||||
"ssl_decrypt": "/usr/local/bin/ssl_decrypt.py",
|
|
||||||
"ssl_encrypt": "/usr/local/bin/ssl_encrypt.py",
|
|
||||||
"tcl_path": "/usr/share/TK-Themes",
|
|
||||||
"pkey_path": "/usr/local/etc/ssl/pwgk.pem",
|
|
||||||
}
|
|
||||||
|
|
||||||
# Images and icons paths
|
|
||||||
IMAGE_PATHS: Dict[str, Path] = {
|
|
||||||
"icon_vpn": "/usr/share/icons/lx-icons/48/wg_vpn.png",
|
|
||||||
"icon_msg": "/usr/share/icons/lx-icons/48/wg_msg.png",
|
|
||||||
"icon_import": "/usr/share/icons/lx-icons/48/wg_import.png",
|
|
||||||
"icon_export": "/usr/share/icons/lx-icons/48/wg_export.png",
|
|
||||||
"icon_trash": "/usr/share/icons/lx-icons/48/wg_trash.png",
|
|
||||||
"icon_start": "/usr/share/icons/lx-icons/48/wg_vpn-start.png",
|
|
||||||
"icon_stop": "/usr/share/icons/lx-icons/48/wg_vpn-stop.png",
|
|
||||||
"icon_info": "/usr/share/icons/lx-icons/64/info.png",
|
|
||||||
"icon_error": "/usr/share/icons/lx-icons/64/error.png",
|
|
||||||
"icon_log": "/usr/share/icons/lx-icons/48/log.png",
|
|
||||||
}
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def setup_translations() -> gettext.gettext:
|
|
||||||
"""
|
|
||||||
Initialize translations and set the translation function
|
|
||||||
Special method for translating strings in this file
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
The gettext translation function
|
|
||||||
"""
|
|
||||||
locale.bindtextdomain(AppConfig.APP_NAME, AppConfig.LOCALE_DIR)
|
|
||||||
gettext.bindtextdomain(AppConfig.APP_NAME, AppConfig.LOCALE_DIR)
|
|
||||||
gettext.textdomain(AppConfig.APP_NAME)
|
|
||||||
return gettext.gettext
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def ensure_directories(cls) -> None:
|
|
||||||
"""Ensures that all required directories exist"""
|
|
||||||
if not cls.CONFIG_DIR.exists():
|
|
||||||
cls.CONFIG_DIR.mkdir(parents=True, exist_ok=True)
|
|
||||||
cls.TEMP_DIR.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def create_default_settings(cls) -> None:
|
|
||||||
"""Creates default settings if they don't exist"""
|
|
||||||
if not cls.SETTINGS_FILE.exists():
|
|
||||||
content = "\n".join(
|
|
||||||
f"[{k.upper()}]\n{v}" for k, v in cls.DEFAULT_SETTINGS.items()
|
|
||||||
)
|
|
||||||
cls.SETTINGS_FILE.write_text(content)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def get_autostart_content(cls) -> None:
|
|
||||||
"""Returns the content for an autostart service file"""
|
|
||||||
systemd_file: list[str] = [
|
|
||||||
"[Unit]",
|
|
||||||
"Description=Automatic Tunnel Start",
|
|
||||||
"After=network-online.target",
|
|
||||||
"",
|
|
||||||
"[Service]",
|
|
||||||
"Type=oneshot",
|
|
||||||
"ExecStartPre=/bin/sleep 5",
|
|
||||||
"ExecStart=/usr/local/bin/start_wg.py",
|
|
||||||
"",
|
|
||||||
"[Install]",
|
|
||||||
"WantedBy=default.target",
|
|
||||||
]
|
|
||||||
if not cls.SYSTEMD_USER_FOLDER.exists():
|
|
||||||
cls.SYSTEMD_USER_FOLDER.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
if not cls.AUTOSTART_SERVICE.is_file():
|
|
||||||
|
|
||||||
content = "\n".join([line for line in systemd_file])
|
|
||||||
cls.AUTOSTART_SERVICE.write_text(content)
|
|
||||||
|
|
||||||
process: CompletedProcess[str] = run(
|
|
||||||
["systemctl", "--user", "enable", "wg_start.service"],
|
|
||||||
capture_output=True,
|
|
||||||
text=True,
|
|
||||||
check=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
if process.stderr:
|
|
||||||
logging.error(f"{process.stderr} Code: {process.returncode}", exc_info=True)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def ensure_log(cls) -> None:
|
|
||||||
"""Ensures that the log file exists"""
|
|
||||||
if not cls.LOG_FILE_PATH.exists():
|
|
||||||
cls.LOG_FILE_PATH.touch()
|
|
||||||
|
|
||||||
|
|
||||||
# here is initializing the class for translation strings
|
|
||||||
_ = AppConfig.setup_translations()
|
|
||||||
|
|
||||||
|
|
||||||
class Msg:
|
|
||||||
"""
|
|
||||||
A utility class that provides centralized access to translated message strings.
|
|
||||||
|
|
||||||
This class contains a dictionary of message strings used throughout the Wire-Py application.
|
|
||||||
All strings are prepared for translation using gettext. The short key names make the code
|
|
||||||
more concise while maintaining readability.
|
|
||||||
|
|
||||||
Attributes:
|
|
||||||
STR (dict): A dictionary mapping short keys to translated message strings.
|
|
||||||
Keys are abbreviated for brevity but remain descriptive.
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
Import this class and access messages using the dictionary:
|
|
||||||
`Msg.STR["sel_tl"]` returns the translated "Select tunnel" message.
|
|
||||||
|
|
||||||
Note:
|
|
||||||
Ensure that gettext translation is properly initialized before
|
|
||||||
accessing these strings to ensure correct localization.
|
|
||||||
"""
|
|
||||||
|
|
||||||
STR: Dict[str, str] = {
|
|
||||||
# Strings for messages
|
|
||||||
"sel_tl": _("Select tunnel"),
|
|
||||||
"ren_err": _("Renaming not possible"),
|
|
||||||
"exp_succ": _("Export successful"),
|
|
||||||
"exp_in_home": _("Your zip file is in home directory"),
|
|
||||||
"imp_err": _("Import Error"),
|
|
||||||
"exp_err": _("Export Error"),
|
|
||||||
"exp_try": _("Export failed! Please try again"),
|
|
||||||
"exp_zip": _(
|
|
||||||
"The error occurs because the zipfile module encountered an issue.\n"
|
|
||||||
"Please verify that you have the latest version of WirePy installed.\n"
|
|
||||||
"You can also contact the WirePy developer team to resolve this issue quickly.\n"
|
|
||||||
),
|
|
||||||
"tl_first": _("Please first import tunnel"),
|
|
||||||
"sel_list": _("Please select a tunnel from the list"),
|
|
||||||
"sign_len": _("The new name may contain only 12 characters"),
|
|
||||||
"zero_signs": _("At least one character must be entered"),
|
|
||||||
"false_signs": _(
|
|
||||||
"No valid sign. These must not be used.\nBlank, Slash, Backslash and { }\n"
|
|
||||||
),
|
|
||||||
"is_in_use": _("The tunnel is already in use"),
|
|
||||||
"no_valid_file": _(
|
|
||||||
"Oh... no valid Wireguard File!\nPlease select a valid Wireguard File"
|
|
||||||
),
|
|
||||||
"tl_exist": _("Tunnel already available!\nPlease use another file for import"),
|
|
||||||
"invalid_base64": _(
|
|
||||||
"Invalid base64 format!\nPlease use a Config file with valid key."
|
|
||||||
),
|
|
||||||
}
|
|
||||||
TTIP: Dict[str, str] = {
|
|
||||||
# Strings for Tooltips
|
|
||||||
"settings": _("Click for Settings"),
|
|
||||||
"import_tl": _("Click to import a Wireguard Tunnel"),
|
|
||||||
"start_tl": _("Click to start selected Wireguard Tunnel"),
|
|
||||||
"empty_list": _("No tunnels to start in the list"),
|
|
||||||
"stop_tl": _("Click to stop selected Wireguard Tunnel"),
|
|
||||||
"del_tl": _("Click to delete selected Wireguard Tunnel"),
|
|
||||||
"rename_tl": _(
|
|
||||||
"To rename a tunnel, you need to\nselect a tunnel from the list"
|
|
||||||
),
|
|
||||||
"export_tl": _(" Click to export all\nWireguard Tunnel to Zipfile"),
|
|
||||||
"trash_tl": _("Click to delete a Wireguard Tunnel\nSelect from the list!"),
|
|
||||||
"autostart": _("To use the autostart, enable this Checkbox"),
|
|
||||||
"autostart_info": _(
|
|
||||||
"You must have at least one\ntunnel in the list,to use the autostart"
|
|
||||||
),
|
|
||||||
"export_tl_info": _("No Tunnels in List for Export"),
|
|
||||||
"start_tl_info": _("Click to start selected Wireguard Tunnel"),
|
|
||||||
"rename_tl_info": _("To rename a tunnel, at least one must be in the list"),
|
|
||||||
"trash_tl_info": _("No tunnels to delete in the list"),
|
|
||||||
"list_auto_info": _(
|
|
||||||
"To use the autostart, a tunnel must be selected from the list"
|
|
||||||
),
|
|
||||||
"download": _("Click to download new version"),
|
|
||||||
}
|
|