2.19.7

common/lang/inv.json

@@ -88,6 +88,7 @@
     "FileNotFound": "File '{1}' not found.",
     "IPv4NotSupportedByNetworkAdapter": "The server supports IPv4, but IPv4 is disabled at Network Adapter level. You need to re-enable it manually or disable this warning by setting Preferences > Networking > Layer IPv4: Block.",
     "IPv4NotSupportedByNetworkAdapterAutoSwitch": "'Preferences > Networking > Layer IPv4' automatically switched to 'Block'.",
+    "IPv4NotSupportedByOS": "The server supports IPv4, but IPv4 is disabled at OS level. You need to re-enable it manually (reboot is required) or disable this warning by setting Preferences > Networking > Layer IPv4: Block.",
     "IPv6NotSupportedByNetworkAdapter": "The server supports IPv6, but IPv6 is disabled at Network Adapter level. You need to re-enable it manually or disable this warning by setting Preferences > Networking > Layer IPv6: Block.",
     "IPv6NotSupportedByNetworkAdapterAutoSwitch": "'Preferences > Networking > Layer IPv6' automatically switched to 'Block'.",
     "IPv6NotSupportedByOS": "The server supports IPv6, but IPv6 is disabled at OS level. You need to re-enable it manually (reboot is required) or disable this warning by setting Preferences > Networking > Layer IPv6: Block.",
@@ -98,6 +99,7 @@
     "LogsLineRepetitionSummary": "Above log line repeated {1} times more",
     "NetworkInterfaceNotAvailable": "Network interface no more available.",
     "NetworkLockActivation": "Activation of Network Lock",
+    "NetworkLockActivationConnectStop": "Network lock fail activation, requested automatic connection disabled.",
     "NetworkLockButtonActive": "Deactivate Network Lock",
     "NetworkLockButtonDeactive": "Activate Network Lock",
     "NetworkLockDeactivation": "Deactivation of Network Lock",
@@ -118,15 +120,18 @@
     "NotImplemented": "Not yet implemented. Contact our support staff.",
     "OptionsNotFound": "Profile options not found, using defaults.",
     "OptionsRead": "Reading options from {1}",
+    "OptionsReadError": "Profile unreadable: {1}. Do you want to reset Eddie to default settings?",
+    "OptionsReadNoKeyring": "Profile is encrypted through a password saved in OS keyring, password could not be found. Do you want to reset Eddie to default settings?",
     "OptionsReverted": "Sorry, an error occurred during loading options. Options reverted to default. (Reason: {1})",
     "OptionsUnknown": "Skipped unknown option '{1}'",
     "OptionsWriteFailed": "An error occurred during writing options in path '{1}': {2}",
+    "OsDriverAdapterNotAvailable": "VPN Network Adapter not found, install fail ({1})",
     "OsDriverCannotInstall": "Tunnel direct not found and can't be installed.",
     "OsDriverFailed": "Driver {1} installation failed.",
     "OsDriverInstall": "Installing tunnel driver {1}",
     "OsDriverInstallerNotAvailable": "Driver {1} installer not available.",
     "OsDriverNeedUpgrade": "Tunnel driver {1} will be upgraded, from {2} to {3}.",
-    "OsDriverNoAdapterFound": "Cannot find tunnel adapter of driver {1}.",
+    "OsDriverNoAdapterFound": "Cannot find tunnel adapter of driver {1}, try install.",
     "OsDriverNoPath": "Unable to find driver path '{1}'",
     "OsDriverNoRegPath": "Unable to find driver registry path",
     "OsDriverNotAvailable": "Not available - Will be installed at next connection.",
@@ -188,6 +193,7 @@
     "TorControlNoPath": "Unable to find your Tor path.",
     "TorControlTest": "Successful test. Tor Version: {1}",
     "UnacceptableCharacters": "{1} contains not yet supported characters ('`\"%!$), sorry.",
+    "UnexpectedInterfaceNotRecognized": "Unexpected not recognized interface used by OpenVPN. Probably not supported OpenVPN version, update need.",
     "UnhandledException": "Unexpected error. Please contact our support staff.",
     "WaitingLatencyTestsStep": "({1} to go)",
     "WaitingLatencyTestsTitle": "Waiting for latency tests",
@@ -208,19 +214,27 @@
     "Ready": "Ready",
     "Unknown": "Unknown",
     "Yes": "Yes",
+    "HelperPrivilegesCrash": "Unexpected crash of elevated helper",
+    "HelperPrivilegesFailed": "Unable to obtain elevated privileges (required): {1}",
+    "HelperPrivilegesPrompt": "Authentication is needed to run Eddie as the super user",
+    "HelperPrivilegesPromptInstall": "Authentication is needed to install Eddie Service as the super user",
+    "HelperPrivilegesPromptUninstall": "Authentication is needed to uninstall Eddie Service as the super user",
+    "HelperPrivilegesUnrecognized": "Unrecognized helper",
     "InitStepAppStartEvents": "Execution of App Start events",
     "InitStepCheckingSoftware": "Checking available software",
     "InitStepCheckRecoveryStatus": "Check recovery status",
     "InitStepCollectNetworkInfo": "Collect network information",
     "InitStepCollectSystemInfo": "Collect system information",
     "InitStepComputeData": "Compute data",
+    "InitStepConnectSystemPrivileges": "Connect with daemon for system privileges",
     "InitStepInitialization": "Initialization",
     "InitStepLoadingData": "Loading data",
     "InitStepLoadingProviders": "Loading providers",
     "InitStepRaiseSystemPrivileges": "Raise system privileges",
     "InitStepStartingPlatform": "Starting platform",
     "InitStepStartingWebserver": "Starting web interface",
     "InitStepUi": "Initialize UI",
+    "InitStepWaitSystemPrivileges": "Wait daemon for system privileges",
     "NetworkLockStatusActive": "Network Lock enabled",
     "NetworkLockStatusDeactive": "Network Lock disabled",
     "ManCommandLineHelp": "Show help manual.",
@@ -248,7 +262,7 @@
     "ManOptionAreasWhiteList": "List of areas available for connection. Same as server whitelist syntax. Example: 'nl,de'",
     "ManOptionConnect": "Connect automatically at startup. Only for GUI, command-line always starts directly.",
     "ManOptionDnsCheck": "When the connection is established, if [i]True[\/i] it try to resolve domain names that are resolved only by AirDNS server, to ensure that system is correctly using our DNS server.\nIt's not mandatory to use our DNS server, but it's recommended to enjoy our Geolocation Routing service and avoid DNS blocks by your provider.",
-    "ManOptionDnsMode": "[i]None[\/i] to disable DNS switch. [i]Auto[\/i] to let the software choose the best method. Otherwise choose a method. Refer to [link]https:\/\/airvpn.org\/faq\/software_advanced\/[\/link] for more information about each method on each platform.",
+    "ManOptionDnsMode": "[i]None[\/i] to disable DNS switch. [i]Auto[\/i] to let the software choose the best method. Otherwise choose a method. Refer to [link]https:\/\/eddie.website\/support\/advanced-tab\/[\/link] for more information about each method on each platform.",
     "ManOptionDnsServers": "List of DNS servers. If not empty, override the DNS suggested by VPN server. Separate multiple values with comma.",
     "ManOptionEventArguments": "Arguments of the script\/executable.",
     "ManOptionEventFileName": "Filename of the script\/executable to launch on event.",
@@ -267,6 +281,8 @@
     "ManOptionNetLockAllowPing": "Allow ping (ICMP) in Network Lock mode.",
     "ManOptionNetLockAllowPrivate": "Allow private network in Network Lock mode.",
     "ManOptionNetLockMode": "Network Lock mode. Can be [i]None[\/i], [i]Auto[\/i] or a method name.",
+    "ManOptionNetLockWhitelistIncomingIps": "List (comma-separated) of incoming IP or range allowed in Network Lock mode.",
+    "ManOptionNetLockWhitelistOutgoingIps": "List (comma-separated) of outgoing IP or range allowed in Network Lock mode.",
     "ManOptionOpenVpnCustom": "Allows you to specify custom OpenVPN directives.",
     "ManOptionOpenVpnDevNode": "OpenVPN dev-node directive.",
     "ManOptionOpenVpnDirectives": "Base OpenVPN directives.",
@@ -326,6 +342,8 @@
     "OsLinuxDnsResolvConfScript": "DNS of the system will be updated to VPN DNS (ResolvConf method)",
     "OsLinuxIPv6Warning": "IPv6 detected.\n\nThis can cause data leak ONLY if your ISP provides IPv6 support.\nCurrently our software can't disable and restore safely IPv6 on Linux.\nIf you continue, IPv6 detection will be disabled. You can re-enable it in Preferences -> Advanced -> IPv6.\n\nContinue?",
     "OsLinuxIPv6WarningUnableToDetect": "Unable to understand if IPv6 is active.",
+    "OsLinuxNetworkAdapterIPv6Disabled": "IPv6 disabled on network adapter ({1})",
+    "OsLinuxNetworkAdapterIPv6Restored": "IPv6 restored on network adapter ({1})",
     "OsMacNetworkAdapterDnsDone": "DNS of a network adapter forced ({1}, from {2} to {3})",
     "OsMacNetworkAdapterDnsRestored": "DNS of a network adapter restored to original settings ({1}, to {2})",
     "OsMacNetworkAdapterIPv6Disabled": "IPv6 disabled on network adapter ({1})",
@@ -366,6 +384,7 @@
     "StatsSystemTimeServerDifference": "Server Time Difference",
     "StatsVpnCipher": "VPN Cipher",
     "StatsVpnControlChannel": "VPN Control Channel",
+    "StatsVpnDataChannel": "VPN Data Channel",
     "StatsVpnDns": "VPN DNS",
     "StatsVpnEntryIP": "IP Entry",
     "StatsVpnExitIPv4": "IPv4 Exit",
@@ -384,9 +403,6 @@
     "StatsVpnTotalDownload": "VPN Total Download",
     "StatsVpnTotalUpload": "VPN Total Upload",
     "WindowsSettingsRouteOutEmptyList": "WARNING: not specified routes go outside the tunnel, but you did not specify any route. Continue?",
-    "HelperPrivilegesCrash": "Unexpected crash of elevated helper",
-    "HelperPrivilegesFailed": "Unable to obtain elevated privileges (required): {1}",
-    "HelperPrivilegesUnrecognized": "Unrecognized helper",
     "CommandCancel": "Cancel",
     "CommandConnect": "Connect to a recommended server",
     "CommandConnectSubtitle": "or choose a specific server in 'Servers' tab.",
@@ -490,6 +506,7 @@
     "WindowsSettingsStorageModeNone": "Plain (no password asked)",
     "WindowsSettingsStorageModeOs": "{1} (no password asked)",
     "WindowsSettingsStorageModePassword": "Password",
+    "WindowsSettingsStoragePasswordMismatch": "Storage password is empty or doesn't match",
     "WindowsSettingsTitle": "Preferences",
     "WindowsSettingsUiUnit0": "Bits for speed, bytes for volume",
     "WindowsSettingsUiUnit1": "Always bytes",

repository/linux_arch/PKGBUILD

@@ -8,7 +8,7 @@ pkgdesc='{@pkgdesc}'
 arch=('i686' 'x86_64')
 url=https://eddie.website
 license=(GPLv3)
-depends=(mono openvpn sudo desktop-file-utils libnotify libappindicator-gtk2)
+depends={@pkgdepends}
 optdepends=('stunnel: VPN over SSL' 'openssh: VPN over SSH')
 makedepends=('cmake')
 provides=('eddie-{@project}')

repository/linux_arch/build.sh

@@ -45,7 +45,13 @@ function arch_env() {
 		sed -i "s|{@version}|${VERSION}|g" PKGBUILD
 		sed -i "s|{@pkgname}|eddie-${PROJECT}|g" PKGBUILD    
 		sed -i "s|{@pkgdesc}|Eddie - VPN tunnel|g" PKGBUILD    
-
+		if [ "${PROJECT}" = "cli" ]; then
+			sed -i "s|{@pkgdesc}|Eddie - VPN tunnel - CLI - prebuilt|g" PKGBUILD    
+			sed -i "s|{@pkgdepends}|(mono openvpn sudo)|g" PKGBUILD
+		else
+			sed -i "s|{@pkgdesc}|Eddie - VPN tunnel - UI - prebuilt|g" PKGBUILD    
+			sed -i "s|{@pkgdepends}|(mono openvpn sudo desktop-file-utils libnotify libappindicator-gtk2)|g" PKGBUILD
+		fi
 		sed -i "s|{@source}|git+file:///$2/|g" PKGBUILD    
 		sed -i "s|cd \"Eddie-\$pkgver\"|cd \"eddie-air\"|g" PKGBUILD
 
@@ -62,10 +68,18 @@ function arch_env() {
 			sed -i "s|{@project}|${PROJECT}|g" PKGBUILD    
 			sed -i "s|{@version}|${VERSION}|g" PKGBUILD    
 			sed -i "s|{@pkgname}|eddie-${PROJECT}-git|g" PKGBUILD    
-			sed -i "s|{@pkgdesc}|Eddie - VPN tunnel - beta version|g" PKGBUILD    
+			if [ "${PROJECT}" = "cli" ]; then
+				sed -i "s|{@pkgdesc}|Eddie - VPN tunnel - CLI - beta|g" PKGBUILD    
+				sed -i "s|{@pkgdepends}|(mono openvpn sudo)|g" PKGBUILD
+			else
+				sed -i "s|{@pkgdesc}|Eddie - VPN tunnel - UI - beta|g" PKGBUILD    
+				sed -i "s|{@pkgdepends}|(mono openvpn sudo desktop-file-utils libnotify libappindicator-gtk2)|g" PKGBUILD
+			fi
 			sed -i "s|{@source}|git+https://github.com/AirVPN/Eddie.git|g" PKGBUILD    
 			sed -i "s|cd \"Eddie-\$pkgver\"|cd \"Eddie\"|g" PKGBUILD
-			echo Enter AUR passphrase if requested
+			if test -f "${SCRIPTDIR}/../signing/aur.key.password.txt"; then # Staff AirVPN
+    			echo if requested, enter $(cat "${SCRIPTDIR}/../signing/aur.key.password.txt") as passphrase
+			fi
 			git clone ssh://[email protected]/eddie-${PROJECT}-git.git
 			cd eddie-${PROJECT}-git
 			cp ../PKGBUILD .
@@ -77,7 +91,13 @@ function arch_env() {
 			sed -i "s|{@project}|${PROJECT}|g" PKGBUILD    
 			sed -i "s|{@version}|${VERSIONSTABLE}|g" PKGBUILD    
 			sed -i "s|{@pkgname}|eddie-${PROJECT}|g" PKGBUILD    
-			sed -i "s|{@pkgdesc}|Eddie - VPN tunnel|g" PKGBUILD    
+			if [ "${PROJECT}" = "cli" ]; then
+				sed -i "s|{@pkgdesc}|Eddie - VPN tunnel - CLI|g" PKGBUILD    
+				sed -i "s|{@pkgdepends}|(mono openvpn sudo)|g" PKGBUILD
+			else
+				sed -i "s|{@pkgdesc}|Eddie - VPN tunnel - UI|g" PKGBUILD
+				sed -i "s|{@pkgdepends}|(mono openvpn sudo desktop-file-utils libnotify libappindicator-gtk2)|g" PKGBUILD
+			fi
 			sed -i "s|{@source}|https://github.com/AirVPN/Eddie/archive/${VERSIONSTABLE}.tar.gz|g" PKGBUILD    
 			echo Enter AUR passphrase if requested
 			git clone ssh://[email protected]/eddie-${PROJECT}.git

repository/linux_arch/readme.txt

@@ -0,0 +1,5 @@
+Packages need (at 2020-20-11 under a rolling Arch minimal):
+
+# pacman -Syy
+# pacman -S pacman-contrib binutils base-devel make cmake gcc 
+# pacman -S libappindicator-gtk2 libindicator-gtk2 gtk2

repository/linux_fedora/build.sh

@@ -105,9 +105,11 @@ REQUIRES="mono-core sudo openvpn stunnel curl libsecret" # Diff between OpenSuse
 if [ $PROJECT = "cli" ]; then
     REQUIRES="${REQUIRES}"
 elif [ $PROJECT = "ui" ]; then
-    REQUIRES="${REQUIRES} mono-winforms libgdiplus-devel libnotify libappindicator" # Diff between OpenSuse and Fedora
+    #REQUIRES="${REQUIRES} mono-winforms libgdiplus-devel libnotify libappindicator" # Diff between OpenSuse and Fedora.
+    REQUIRES="${REQUIRES} mono-winforms libgdiplus-devel libnotify" # Diff between OpenSuse and Fedora.  libappindicator removed because missing in CentOS (even in EPEL repository), but exists libappindicator-gtk3
 elif [ $PROJECT = "ui3" ]; then
-    REQUIRES="${REQUIRES} gtk-sharp3 libnotify libappindicator" # Diff between OpenSuse and Fedora
+    #REQUIRES="${REQUIRES} gtk-sharp3 libnotify libappindicator" # Diff between OpenSuse and Fedora
+    REQUIRES="${REQUIRES} gtk-sharp3 libnotify" # Diff between OpenSuse and Fedora libappindicator removed because missing in CentOS (even in EPEL repository)
 fi
 sed -i "s/{@requires}/${REQUIRES}/g" ${TARGETDIR}/../rpmbuild.spec
 

repository/windows_installer/nsis.cs

@@ -9,22 +9,10 @@ static int Main(string[] args)
 	{
 		try
 		{
-			string scriptPath = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-			//string csPath = scriptPath + "\\..\\..\\src\\Lib.Common\\Constants.cs";
-			//string body = System.IO.File.ReadAllText(csPath);
-
-			//string version = System.Text.RegularExpressions.Regex.Match(body, "VersionDesc = \"([0-9\\.]+)\"").Groups[1].Value;
-
-			//Console.WriteLine(version);
-
-			Console.WriteLine(args.Length);
-			for (int i = 0; i < args.Length; i++)
-				Console.WriteLine("A" + i + ":" + args[i]);
-
+			string scriptPath = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);			
 			string arch = args[0];
 			string pathTemp = args[1];
-			string pathDeploy = args[2];
-
+			string pathDeploy = args[2];			
 
 			string nsis = System.IO.File.ReadAllText(scriptPath + "\\nsis\\Eddie-UI.nsi");
 

src/App.CLI.Common.Elevated/hashes.h

@@ -16,5 +16,5 @@
 // along with Eddie. If not, see <http://www.gnu.org/licenses/>.
 // </eddie_source_header>
 
-const std::string expectedOpenvpnHash = "22586e99431bba5de2b213672f79c8c754a053598de3a140143ec6f1e088ef3b";
-const std::string expectedHummingbirdHash = "41a17f8f9a8bc90cfbd90ce90f56a157ac8b3b9205b8554cb776650b0493653a";
+const std::string expectedOpenvpnHash = "6cf2dae78cf4bee2c5f03ddf1e0bed922ac426d4fa672760d68a4253eef5db1c";
+const std::string expectedHummingbirdHash = "facd09b146b7c41758a9105f1c2415c482e7c24816cc9f3e15d72551495955ae";

src/App.CLI.Common.Elevated/ibase.cpp

@@ -150,7 +150,7 @@ void IBase::LogLocal(const std::string& msg)
 {
 	LogDevDebug("Local:" + msg);
 
-	std::cout << msg << std::endl;
+	// std::cout << msg << std::endl; // Removed in 2.19.7, otherwise dumped in CLI edition with sudoers user
 }
 
 void IBase::LogDebug(const std::string& msg)

src/App.CLI.Common.Elevated/iposix.cpp

@@ -152,9 +152,7 @@ void IPosix::Do(const std::string& commandId, const std::string& command, std::m
 			const pstreams::pmode mode = pstreams::pstdout | pstreams::pstderr;
 			pstreams::argv_type argv;
 			argv.push_back(params["path"]);
-
-			argv.push_back(params["config"]);
-
+
 			argv.push_back("--ignore-dns-push");
 			argv.push_back("--network-lock");
 			argv.push_back("off");
@@ -164,6 +162,8 @@ void IPosix::Do(const std::string& commandId, const std::string& command, std::m
 				argv.push_back("--gui-version");
 				argv.push_back(params["gui-version"]);
 			}
+
+            argv.push_back(params["config"]);
 
 			pstream child(argv, mode);
 			char buf[1024 * 32];

src/App.Cocoa.MacOS/Info.plist

@@ -17,7 +17,7 @@
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.19.5</string>
+	<string>2.19.7</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.airvpn.eddie.ui</string>
 	<key>CFBundleDisplayName</key>