From ca58ac86a4192f4d199af86b29dcc3cb9453ff14 Mon Sep 17 00:00:00 2001 From: punix Date: Thu, 17 Apr 2025 16:25:24 +0200 Subject: [PATCH] fix ssldecrypt --- install | 26 +++++++++++++++++++++++--- ssl_decrypt.py | 10 ++++++++-- wirepy.py | 2 +- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/install b/install index c2e1564..1b88d2b 100755 --- a/install +++ b/install @@ -21,8 +21,12 @@ install_file_with(){ sudo cp -uR 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 cp -fv Wire-Py.desktop /usr/share/applications/ && \ - sudo ln -sf /usr/local/bin/wirepy.py /usr/local/bin/wirepy - + sudo ln -sf /usr/local/bin/wirepy.py /usr/local/bin/wirepy + sudo mkdir -p /usr/local/etc/ssl + if [ ! -f /usr/local/etc/ssl/pwgk.pem ] + then + sudo openssl genrsa -out /usr/local/etc/ssl/pwgk.pem 4096 + fi fi } @@ -44,6 +48,11 @@ install_arch_d(){ sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \ sudo cp -fv Wire-Py.desktop /usr/share/applications/ && \ sudo ln -sf /usr/local/bin/wirepy.py /usr/local/bin/wirepy + sudo mkdir -p /usr/local/etc/ssl + if [ ! -f /usr/local/etc/ssl/pwgk.pem ] + then + sudo openssl genrsa -out /usr/local/etc/ssl/pwgk.pem 4096 + fi fi } @@ -116,6 +125,11 @@ install(){ sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \ sudo cp -fv Wire-Py.desktop /usr/share/applications/ && \ sudo ln -sf /usr/local/bin/wirepy.py /usr/local/bin/wirepy + sudo mkdir -p /usr/local/etc/ssl + if [ ! -f /usr/local/etc/ssl/pwgk.pem ] + then + sudo openssl genrsa -out /usr/local/etc/ssl/pwgk.pem 4096 + fi fi elif grep -i 'suse' /etc/os-release > /dev/null 2>&1 @@ -136,11 +150,16 @@ install(){ sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \ sudo cp -fv Wire-Py.desktop /usr/share/applications/ && \ sudo ln -sf /usr/local/bin/wirepy.py /usr/local/bin/wirepy + sudo mkdir -p /usr/local/etc/ssl + if [ ! -f /usr/local/etc/ssl/pwgk.pem ] + then + sudo openssl genrsa -out /usr/local/etc/ssl/pwgk.pem 4096 + fi if grep -i 'Tumbleweed' /etc/os-release > /dev/null 2>&1 then sudo zypper install python313-tk else - sudo zypper install python312-tk + sudo zypper install python36-tk fi fi @@ -171,6 +190,7 @@ remove(){ rm -r ~/.config/wire_py && rm -r ~/.config/systemd sudo rm /usr/share/applications/Wire-Py.desktop sudo rm /usr/share/locale/de/LC_MESSAGES/languages/de/wirepy.mo + sudo rm -r /usr/local/etc/ssl which syncpy >/dev/null if [ $? -ne 0 ] then diff --git a/ssl_decrypt.py b/ssl_decrypt.py index c020a93..db42587 100755 --- a/ssl_decrypt.py +++ b/ssl_decrypt.py @@ -12,7 +12,13 @@ with open(uname, 'r') as f: ''' Dirname "tlecdewg" = Tunnel Encrypt Decrypt Wireguard ''' dirname = Path('/tmp/tlecdcwg/') -keyfile = '/usr/local/etc/ssl/pwgk.pem' +keyfile = Path(f'/home/{logname}/.config/wire_py/pbwgk.pem') +pkeyfile = '/usr/local/etc/ssl/pwgk.pem' + +if not keyfile.is_file(): + + check_call(['openssl', 'rsa', '-in', pkeyfile, '-out', keyfile, '-outform', 'PEM', '-pubout']) + shutil.chown(keyfile, 1000, 1000) dirname2 = ('/home/' + logname + '/.config/wire_py/') detl = os.listdir(dirname2) @@ -24,5 +30,5 @@ if os.path.exists(dirname2 + 'pbwgk.pem'): for detunnels in detl: tlname2 = detunnels[:-4] + '.conf' extpath = str(dirname) + '/' + tlname2 - check_call(['openssl', 'pkeyutl', '-decrypt', '-inkey', keyfile, '-in', detunnels, '-out', extpath]) + check_call(['openssl', 'pkeyutl', '-decrypt', '-inkey', pkeyfile, '-in', detunnels, '-out', extpath]) shutil.chown(extpath, 1000, 1000) \ No newline at end of file diff --git a/wirepy.py b/wirepy.py index 0c30611..d8029f4 100755 --- a/wirepy.py +++ b/wirepy.py @@ -25,7 +25,7 @@ wg_tips = Tipi.if_tip(wg_set) dirname = Path('/tmp/tlecdcwg/') ''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year ''' -version = 'v. 2.04.1325' +version = 'v. 2.04.1725' res = GiteaUpdate.api_down('https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases', version)