diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8d5ac6e..640ba56 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,8 @@
-
+
+
@@ -40,16 +41,16 @@
- {
+ "keyToString": {
+ "ASKED_ADD_EXTERNAL_FILES": "true",
+ "Python.main.executor": "Run",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "git-widget-placeholder": "main",
+ "last_opened_file_path": "/home/punix/Pyapps/wire-py",
+ "settings.editor.selected.configurable": "preferences.lookFeel"
}
-}]]>
+}
@@ -138,7 +139,15 @@
1724048994613
-
+
+
+ 1724102937260
+
+
+
+ 1724102937260
+
+
@@ -171,6 +180,7 @@
-
+
+
\ No newline at end of file
diff --git a/dict_to_address b/dict_to_address
new file mode 100644
index 0000000..2a74fd9
--- /dev/null
+++ b/dict_to_address
@@ -0,0 +1,3 @@
+192.168.178.158/24
+192.168.178.1,
+rj2cexasg9b9oydd.myfritz.net:54775
diff --git a/main.py b/main.py
index d1aa9d9..827a2aa 100644
--- a/main.py
+++ b/main.py
@@ -3,7 +3,8 @@ import os
import tkinter as tk
from tkinter import ttk
-from wg_func import TunnelActiv, ListTunnels, ImportTunnel, ExportTunnels
+from wg_func import (TunnelActiv, ListTunnels, ImportTunnel,
+ ConToDict, GreenLabel, ExportTunnels)
class MainWindow(tk.Tk):
@@ -17,7 +18,6 @@ class MainWindow(tk.Tk):
self.monitor_center_x = self.winfo_screenwidth() / 2 - (self.x_width / 2)
self.monitor_center_y = self.winfo_screenheight() / 2 - (self.y_height / 2)
self.resizable(width=False, height=False)
- self.lb_tunnel = None
self.title('Wire-Py')
self.configure()
self.geometry('%dx%d+%d+%d' % (self.x_width, self.y_height, self.monitor_center_x, self.monitor_center_y))
@@ -33,6 +33,7 @@ class FrameWidgets(ttk.Frame):
def __init__(self, container, **kwargs):
super().__init__(container, **kwargs)
+ self.lb_tunnel = None
self.wg_read = None
self.wg_vpn_start = tk.PhotoImage(file=r'icons/wg-vpn-start-48.png')
self.wg_vpn_stop = tk.PhotoImage(file=r'icons/wg-vpn-stop-48.png')
@@ -59,17 +60,29 @@ class FrameWidgets(ttk.Frame):
# Label to Show active Tunnel
self.StrVar = tk.StringVar(value=self.a)
- self.lb_tunnel = tk.Label(self, textvariable=self.StrVar, fg='green')
- self.lb_tunnel.config(font=("Ubuntu", 11, "bold"))
- self.lb_tunnel.grid(column=3, row=1, sticky="w")
+ GreenLabel.green_show_label(self)
- # Label Interface and Peers
+ # Interface Label
self.interface = tk.Label(self.lb_frame, text='Interface')
self.interface.grid(column=0, row=4, sticky="n", padx=10)
self.interface.config(font=("Ubuntu", 9))
+ # Address Label
+ self.address = tk.Label(self.lb_frame, text='address')
+ self.address.grid(column=0, row=5, sticky="n", padx=10)
+ self.address.config(font=("Ubuntu", 9))
+ # DNS Label
+ self.dns = tk.Label(self.lb_frame, text='dns')
+ self.dns.grid(column=0, row=6, sticky="n", padx=10)
+ self.dns.config(font=("Ubuntu", 9))
+ # Peer Label
self.peer = tk.Label(self.lb_frame2, text='Peer')
self.peer.config(font=("Ubuntu", 9))
- self.peer.grid(column=0, row=5, sticky="n", padx=10)
+ self.peer.grid(column=0, row=7, sticky="n", padx=10)
+ # Endpoint Label
+ self.endpoint = tk.Label(self.lb_frame2, text='Endpoint')
+ self.endpoint.config(font=("Ubuntu", 9))
+ self.endpoint.grid(column=0, row=8, sticky="n", padx=10)
+
self.scrollbar = tk.Scrollbar(self)
self.l_box = tk.Listbox(self, fg='#606060', selectmode='single')
self.l_box.config(highlightthickness=0, relief='flat')
@@ -88,9 +101,8 @@ class FrameWidgets(ttk.Frame):
self.btn_stst.grid(column=0, row=1, padx=15, pady=15, sticky="s")
wg_read = os.environ['HOME'] + '/tester/' + str(self.a) + '.conf'
file = open(wg_read, 'r')
- read = file.read()
+ ConToDict.covert_to_dict(file)
file.close()
- print(read)
else:
self.btn_stst = tk.Button(self, image=self.wg_vpn_start, bd=0, command=self.wg_switch)
self.btn_stst.grid(column=0, row=1, padx=15, pady=15, sticky="s")
@@ -132,19 +144,15 @@ class FrameWidgets(ttk.Frame):
os.system('nmcli connection up ' + str(select_tl))
wg_read = os.environ['HOME'] + '/tester/' + str(select_tl) + '.conf'
file = open(wg_read, 'r')
- read = file.read()
+ ConToDict.covert_to_dict(file)
file.close()
- print(read)
-
# Button Start/Stop
self.btn_stst = tk.Button(self, image=self.wg_vpn_stop, bd=0, command=self.wg_switch)
self.btn_stst.grid(column=0, row=1, padx=15, pady=15, sticky="s")
self.a = TunnelActiv.active()
self.StrVar = tk.StringVar()
self.StrVar.set(self.a)
- self.lb_tunnel = tk.Label(self, textvariable=self.StrVar, fg='green')
- self.lb_tunnel.config(font=("Ubuntu", 11, "bold"))
- self.lb_tunnel.grid(column=3, row=1, sticky="w")
+ GreenLabel.green_show_label(self)
elif self.a != '':
# Button Start/Stop
self.btn_stst = tk.Button(self, image=self.wg_vpn_stop, bd=0, command=self.wg_switch)
@@ -156,9 +164,7 @@ class FrameWidgets(ttk.Frame):
self.a = TunnelActiv.active()
self.StrVar = tk.StringVar()
self.StrVar.set(value=' ')
- self.lb_tunnel = tk.Label(self, textvariable=self.StrVar, fg='green')
- self.lb_tunnel.config(font=("Ubuntu", 11, "bold"))
- self.lb_tunnel.grid(column=3, row=1, sticky="w")
+ GreenLabel.green_show_label(self)
if __name__ == '__main__':
diff --git a/wg_func.py b/wg_func.py
index 8de1cbb..e23164c 100644
--- a/wg_func.py
+++ b/wg_func.py
@@ -1,7 +1,7 @@
# Wireguard functions for Wire-Py
import os
import subprocess
-from tkinter import filedialog
+from tkinter import filedialog, ttk
import tkinter as tk
@@ -29,6 +29,54 @@ class Message(tk.Tk):
self.button.grid(column=0, row=1)
+class GreenLabel(tk.Tk):
+ def __init__(self, container, **kwargs):
+ super().__init__(container, **kwargs)
+ self.StrVar = None
+ self.lb_tunnel = None
+
+ def green_show_label(self):
+ self.lb_tunnel = tk.Label(self, textvariable=self.StrVar, fg='green')
+ self.lb_tunnel.config(font=("Ubuntu", 11, "bold"))
+ self.lb_tunnel.grid(column=3, row=1, sticky="w")
+
+
+class ConToDict:
+ @classmethod
+ def covert_to_dict(cls, file):
+ dictlist = []
+ for lines in file.readlines():
+ lineplit = lines.split()
+ dictlist = dictlist + lineplit
+ dictlist.remove('[Interface]')
+ dictlist.remove('[Peer]')
+ for items in dictlist:
+ if items == '=':
+ dictlist.remove(items)
+ for i 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]]
+ newlist = [a, b, c, d, e, f, g, h]
+ finaldict = {}
+ for elements in newlist:
+ finaldict[elements[0]] = elements[1]
+
+ address = finaldict['Address']
+ dns = finaldict['DNS']
+ endpoint = finaldict['Endpoint']
+ with open('dict_to_address', 'w+') as data:
+ data.write(address + '\n')
+ data.write(dns + '\n')
+ data.write(endpoint + '\n')
+ data.close()
+
+
class TunnelActiv:
@staticmethod
def active(): # Shows the active tunnel
@@ -94,9 +142,8 @@ class ImportTunnel:
self.btn_stst.grid(column=0, row=1, padx=15, pady=15, sticky="s")
wg_read = os.environ['HOME'] + '/tester/' + str(self.a) + '.conf'
file = open(wg_read, 'r')
- read = file.read()
+ ConToDict.covert_to_dict(file)
file.close()
- print(read)
if "PrivateKey = " not in read:
Message()
except EOFError: