diff --git a/src/modules/AmneziaConfiguration.py b/src/modules/AmneziaConfiguration.py index 871369bf..5de52b9d 100644 --- a/src/modules/AmneziaConfiguration.py +++ b/src/modules/AmneziaConfiguration.py @@ -37,6 +37,10 @@ class AmneziaConfiguration(WireguardConfiguration): self.I3 = "0" self.I4 = "0" self.I5 = "0" + self.J1 = "0" + self.J2 = "0" + self.J3 = "0" + self.Itime = "0" super().__init__(DashboardConfig, AllPeerJobs, AllPeerShareLinks, DashboardWebHooks, name, data, backup, startup, wg=False) @@ -79,7 +83,11 @@ class AmneziaConfiguration(WireguardConfiguration): "I2": self.I2, "I3": self.I3, "I4": self.I4, - "I5": self.I5 + "I5": self.I5, + "J1": self.J1, + "J2": self.J2, + "J3": self.J3, + "Itime": self.Itime } def createDatabase(self, dbName = None): diff --git a/src/modules/Peer.py b/src/modules/Peer.py index bba16deb..5d824896 100644 --- a/src/modules/Peer.py +++ b/src/modules/Peer.py @@ -194,7 +194,11 @@ class Peer: "I2": self.configuration.I2, "I3": self.configuration.I3, "I4": self.configuration.I4, - "I5": self.configuration.I5 + "I5": self.configuration.I5, + "J1": self.configuration.J1, + "J2": self.configuration.J2, + "J3": self.configuration.J3, + "Itime": self.configuration.Itime }) peerSection = { diff --git a/src/modules/WireguardConfiguration.py b/src/modules/WireguardConfiguration.py index 59785203..0849604e 100644 --- a/src/modules/WireguardConfiguration.py +++ b/src/modules/WireguardConfiguration.py @@ -124,6 +124,10 @@ class WireguardConfiguration: self.__parser["Interface"]["I3"] = self.I3 self.__parser["Interface"]["I4"] = self.I4 self.__parser["Interface"]["I5"] = self.I5 + self.__parser["Interface"]["J1"] = self.J1 + self.__parser["Interface"]["J2"] = self.J2 + self.__parser["Interface"]["J3"] = self.J3 + self.__parser["Interface"]["Itime"] = self.Itime if "Backup" not in data.keys(): self.createDatabase() @@ -977,7 +981,7 @@ class WireguardConfiguration: original = [l.rstrip("\n") for l in f.readlines()] allowEdit = ["Address", "PreUp", "PostUp", "PreDown", "PostDown", "ListenPort", "Table"] if self.Protocol == 'awg': - allowEdit += ["Jc", "Jmin", "Jmax", "S1", "S2", "S3", "S4", "H1", "H2", "H3", "H4", "I1", "I2", "I3", "I4", "I5"] + allowEdit += ["Jc", "Jmin", "Jmax", "S1", "S2", "S3", "S4", "H1", "H2", "H3", "H4", "I1", "I2", "I3", "I4", "I5", "J1", "J2", "J3", "Itime"] start = original.index("[Interface]") try: end = original.index("[Peer]") diff --git a/src/static/app/src/components/configurationComponents/editConfiguration.vue b/src/static/app/src/components/configurationComponents/editConfiguration.vue index f5d67dc4..62002a46 100644 --- a/src/static/app/src/components/configurationComponents/editConfiguration.vue +++ b/src/static/app/src/components/configurationComponents/editConfiguration.vue @@ -197,7 +197,7 @@ const deleteConfigurationModal = ref(false) v-model="data[key]" :id="'configuration_' + key"> -