2.20.0

repository/build_macos.sh

@@ -2,11 +2,19 @@
 
 set -e
 
+
+# Currently 2021-02-03 "VS for Mac" works under Rosetta, and for example App.CLI.MacOS.Elevated will be build (because called from VS prebuild) in x86_64 even on Apple M1 (arm64).
+# This avoid the issue. Can be cleaned when "VS for Mac" will be released for arm64.
+# The below file it's checked in /src/App.CLI.MacOS.Elevated/build.sh
+# The below file it's checked in /src/eddie.macos.prebuild.sh to allow pick the right deploy folder for whitelist hashing
+uname -m >/tmp/eddie_deploy_arch_native.txt
+
 # rm -f files/*
 
+
+
 # Note: first, ensure deploy files signature. Normally are done by building script, this is an exception.
 # Otherwise, openvpn will be signed after the compilation of Elevated, that will contain a mismatch sha256.
-
 macos_common/presign.sh
 
 # CLI edition exists, but Xamarin build an .app bundle and
@@ -26,13 +34,16 @@ macos_common/presign.sh
 # Mojave works witn 10.9, don't work with 10.15 (throw a SystemNetworkInformation exception, due libc.dylib link issue)
 # High Sierra works with 10.15 AND 10.9.
 
-macos_portable/build.sh ui x64 macos-10.9
-macos_portable/build.sh ui x64 macos-10.15
-
-macos_pkg/build.sh ui x64 macos-10.9
-macos_pkg/build.sh ui x64 macos-10.15
-
-macos_dmg/build.sh ui x64 macos-10.9
-macos_dmg/build.sh ui x64 macos-10.15
+# Need arch diff
+VARARCH=$(cat /tmp/eddie_deploy_arch_native.txt)
+if [ ${VARARCH} = "x86_64" ]; then
+    macos_portable/build.sh ui macos-10.9
+    macos_pkg/build.sh ui macos-10.9
+    macos_dmg/build.sh ui macos-10.9
+fi
+
+macos_portable/build.sh ui macos-10.15
+macos_pkg/build.sh ui macos-10.15
+macos_dmg/build.sh ui macos-10.15
 
 echo "Done."

repository/linux_arch/build.sh

@@ -22,7 +22,8 @@ CONFIG=Release
 SCRIPTDIR=$(dirname $(realpath -s $0))
 ARCH=$($SCRIPTDIR/../linux_common/get-arch.sh)
 VERSION=$($SCRIPTDIR/../linux_common/get-version.sh)
-VERSIONSTABLE="2.18.9"
+#VERSIONSTABLE="2.18.9"
+VERSIONSTABLE=$(curl --silent "https://api.github.com/repos/AirVPN/Eddie/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")')
 
 TARGETDIR=/tmp/eddie_deploy/eddie-${PROJECT}_${VERSION}_linux_${ARCH}_arch
 DEPLOYPATH=${SCRIPTDIR}/../files/eddie-${PROJECT}_${VERSION}_linux_${ARCH}_arch.tar.zst
@@ -99,7 +100,9 @@ function arch_env() {
 				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
+			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
 			cd eddie-${PROJECT}
 			cp ../PKGBUILD .

repository/macos_common/compile.sh

@@ -36,6 +36,7 @@ fi
 RULESETPATH="${SCRIPTDIR}/../../src/ruleset/norules.ruleset"
 
 ARCHCOMPILE=${ARCH}
+ARCHCOMPILE=x64
 
 
 # Unlike other platform, the pre-build / post-build script are already in .vcproj, managed by msbuild correctly

repository/macos_common/deploy.sh

@@ -7,9 +7,13 @@ realpath() {
 }
 
 SCRIPTDIR=$(dirname $(realpath "$0"))
+REMOTEDIR=$2
+if [[ ${REMOTEDIR} == "internal" ]]; then 
+    REMOTEDIR=/home/www/repository/eddie/internal
+fi
 
 if test -f "${SCRIPTDIR}/../signing/eddie.website_deploy.key"; then # Staff AirVPN
 	chmod 600 "${SCRIPTDIR}/../signing/eddie.website_deploy.key"
     echo Send to eddie.website server: $1
-	scp -P 46333 -i "${SCRIPTDIR}/../signing/eddie.website_deploy.key" "$1"  [email protected]:/home/www/repository/eddie/internal
+	scp -P 46333 -i "${SCRIPTDIR}/../signing/eddie.website_deploy.key" "$1"  [email protected]:${REMOTEDIR}
 fi

repository/macos_common/notarize.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # First argument must be file package
-# Second argument must be project (cli/ui)
+# Second argument must be bundle id
 
 # set -euo pipefail
 
@@ -10,7 +10,7 @@ realpath() {
 }
 
 FILENOTARIZE=$1
-PROJECT=$2
+APPLE_NOTARIZE_BUNDLE_ID=$2
 
 SCRIPTDIR=$(dirname $(realpath "$0"))
 
@@ -21,7 +21,6 @@ if test -f "${SCRIPTDIR}/../signing/apple-dev-id.txt"; then
     APPLE_NOTARIZE_USERNAME=$(cat ${SCRIPTDIR}/../signing/apple-notarize-username.txt)
     APPLE_NOTARIZE_PASSWORD=$(cat ${SCRIPTDIR}/../signing/apple-notarize-password.txt)
 
-    APPLE_NOTARIZE_BUNDLE_ID="org.airvpn.eddie.${PROJECT}"
     APPLE_NOTARIZE_ASC_PROVIDER=$(cat ${SCRIPTDIR}/../signing/apple-notarize-asc-provider.txt)
 
     echo "Notarization Upload..."
@@ -33,6 +32,7 @@ if test -f "${SCRIPTDIR}/../signing/apple-dev-id.txt"; then
     echo 2- if fail with 'You must first sign the relevant contracts online. (1048)', goto https://developer.apple.com/account/ , login and accept the new TOS.
     echo ----
 
+    echo xcrun altool --notarize-app --primary-bundle-id "$APPLE_NOTARIZE_BUNDLE_ID" --username "$APPLE_NOTARIZE_USERNAME" --password "$APPLE_NOTARIZE_PASSWORD" --asc-provider "$APPLE_NOTARIZE_ASC_PROVIDER" --file "${FILENOTARIZE}" 2>&1 | awk '/RequestUUID/ { print $NF; }'
     requestUUID=$(xcrun altool --notarize-app --primary-bundle-id "$APPLE_NOTARIZE_BUNDLE_ID" --username "$APPLE_NOTARIZE_USERNAME" --password "$APPLE_NOTARIZE_PASSWORD" --asc-provider "$APPLE_NOTARIZE_ASC_PROVIDER" --file "${FILENOTARIZE}" 2>&1 | awk '/RequestUUID/ { print $NF; }')
 
     echo "Notarization RequestUUID: $requestUUID"

repository/macos_common/presign.sh

@@ -7,13 +7,14 @@ realpath() {
 }
 
 SCRIPTDIR=$(dirname $(realpath "$0"))
+ARCH=$($SCRIPTDIR/../macos_common/get-arch.sh)
 
-${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_x64/openvpn" no yes
-${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_x64/libcrypto.1.1.dylib" no yes
-${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_x64/liblzo2.2.dylib" no yes
-${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_x64/libpkcs11-helper.1.dylib" no yes
-${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_x64/libssl.1.1.dylib" no yes
-${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_x64/hummingbird" no yes
-${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_x64/stunnel" no yes
+${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_${ARCH}/openvpn" no yes
+${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_${ARCH}/libcrypto.1.1.dylib" no yes
+${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_${ARCH}/liblzo2.2.dylib" no yes
+${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_${ARCH}/libpkcs11-helper.1.dylib" no yes
+${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_${ARCH}/libssl.1.1.dylib" no yes
+${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_${ARCH}/hummingbird" no yes
+${SCRIPTDIR}/sign.sh "${SCRIPTDIR}/../../deploy/macos_${ARCH}/stunnel" no yes
 
 echo "Pre-sign done."

repository/macos_common/sign.sh

@@ -41,8 +41,15 @@ if [ ${VARSTAFF} = "yes" ]; then
     if [ ${DOSIGN} = "no" ]; then
         set +e
         codesign --verify -v "${VARPATH}"
-        if [ $? -eq 0 ]; then
-            echo "Signing, already: ${VARPATH}"
+        if [ $? -eq 0 ]; then            
+            # Files with 'Signature=adhoc' pass verify, ensure there is an Authority
+            VARAUTHORITY=$(codesign -dv --verbose=4 "${VARPATH}" 2>&1 | grep Authority)
+            if [ -z "$VARAUTHORITY" ]; then
+                echo "Detected signed without Authority, resign"
+                DOSIGN="yes"
+            else
+                echo "Signing, already: ${VARPATH}"
+            fi
         else
             DOSIGN="yes"
         fi

repository/macos_dmg/build.sh

@@ -13,26 +13,20 @@ if [ "$1" == "" ]; then
 fi
 
 if [ "$2" == "" ]; then
-	echo Second arg must be Architecture: x64
-	exit 1
-fi
-
-if [ "$3" == "" ]; then
-	echo Third arg must be OS: 10.9,10.15
+	echo Second arg must be OS: 10.9,10.15
 	exit 1
 fi
 
 PROJECT=$1
-ARCH=$2
-VAROS=$3
+VAROS=$2
 CONFIG=Release
 
 VARSTAFF="no"
 if test -f "${SCRIPTDIR}/../signing/apple-dev-id.txt"; then # Staff AirVPN
     VARSTAFF="yes"
 fi
 
-# ARCH=$($SCRIPTDIR/../macos_common/get-arch.sh)
+ARCH=$($SCRIPTDIR/../macos_common/get-arch.sh)
 VERSION=$($SCRIPTDIR/../macos_common/get-version.sh)
 
 TARGETDIR=/tmp/eddie_deploy/eddie-${PROJECT}_${VERSION}_${VAROS}_${ARCH}_disk_temp.dmg
@@ -96,12 +90,12 @@ fi
 
 # Notarization - Not need
 # if [ ${VARSTAFF} = "yes" ]; then
-#     "${SCRIPTDIR}/../macos_common/notarize.sh" "${FINALPATH}" "${PROJECT}"
+#     "${SCRIPTDIR}/../macos_common/notarize.sh" "${FINALPATH}" "org.airvpn.eddie.${PROJECT}"
 # fi
 
 # Deploy to eddie.website
 
-${SCRIPTDIR}/../macos_common/deploy.sh ${FINALPATH}
+${SCRIPTDIR}/../macos_common/deploy.sh ${FINALPATH} "internal"
 
 # End
 

repository/macos_pkg/build.sh

@@ -13,26 +13,20 @@ if [ "$1" == "" ]; then
 fi
 
 if [ "$2" == "" ]; then
-	echo Second arg must be Architecture: x64
-	exit 1
-fi
-
-if [ "$3" == "" ]; then
-	echo Third arg must be OS: 10.9,10.15
+	echo Second arg must be OS: 10.9,10.15
 	exit 1
 fi
 
 PROJECT=$1
-ARCH=$2
-VAROS=$3
+VAROS=$2
 CONFIG=Release
 
 VARSTAFF="no"
 if test -f "${SCRIPTDIR}/../signing/apple-dev-id.txt"; then # Staff AirVPN
     VARSTAFF="yes"
 fi
 
-# ARCH=$($SCRIPTDIR/../macos_common/get-arch.sh)
+ARCH=$($SCRIPTDIR/../macos_common/get-arch.sh)
 VERSION=$($SCRIPTDIR/../macos_common/get-version.sh)
 
 TARGETDIR=/tmp/eddie_deploy/eddie-${PROJECT}_${VERSION}_${VAROS}_${ARCH}_installer_temp.pkg
@@ -85,7 +79,7 @@ fi
 
 if [ ${VARSTAFF} = "yes" ]; then
     if [ ${VARHARDENING} = "yes" ]; then    
-        "${SCRIPTDIR}/../macos_common/notarize.sh" "${FINALPATH}" "${PROJECT}"
+        "${SCRIPTDIR}/../macos_common/notarize.sh" "${FINALPATH}" "org.airvpn.eddie.${PROJECT}"
     fi
 fi
 
@@ -95,7 +89,7 @@ mv ${FINALPATH} ${DEPLOYPATH}
 
 # Deploy to eddie.website
 
-"${SCRIPTDIR}/../macos_common/deploy.sh" "${DEPLOYPATH}"
+"${SCRIPTDIR}/../macos_common/deploy.sh" "${DEPLOYPATH}" "internal"
 
 # Cleanup
 

repository/macos_portable/build.sh

@@ -16,12 +16,7 @@ if [ "$1" == "" ]; then
 fi
 
 if [ "$2" == "" ]; then
-	echo Second arg must be Architecture: x64
-	exit 1
-fi
-
-if [ "$3" == "" ]; then
-	echo Third arg must be OS: 10.9,10.15
+	echo Second arg must be OS: 10.9,10.15
 	exit 1
 fi
 
@@ -37,17 +32,15 @@ if ! [ -x "$(command -v msbuild)" ]; then
 fi
 
 PROJECT=$1
-ARCH=$2
-VAROS=$3
+VAROS=$2
 CONFIG=Release
 
 VARSTAFF="no"
 if test -f "${SCRIPTDIR}/../signing/apple-dev-id.txt"; then # Staff AirVPN
     VARSTAFF="yes"
 fi
 
-# ARCH=$($SCRIPTDIR/../macos_common/get-arch.sh)
-
+ARCH=$($SCRIPTDIR/../macos_common/get-arch.sh)
 VERSION=$($SCRIPTDIR/../macos_common/get-version.sh)
 
 TARGETDIR=/tmp/eddie_deploy/eddie-${PROJECT}_${VERSION}_${VAROS}_${ARCH}_portable
@@ -69,7 +62,8 @@ rm -rf /tmp/eddie_deploy
 
 echo Step: Compile
 
-ARCHCOMPILE=${ARCH}
+# ARCHCOMPILE=${ARCH}
+ARCHCOMPILE=x64
 
 "${SCRIPTDIR}/../macos_common/compile.sh" ${PROJECT}
 
@@ -215,15 +209,14 @@ fi
 
 if [ ${VARSTAFF} = "yes" ]; then
     if [ ${VARHARDENING} = "yes" ]; then    
-        "${SCRIPTDIR}/../macos_common/notarize.sh" "${FINALPATH}" "${PROJECT}"
-        echo "${SCRIPTDIR}/../macos_common/notarize.sh" "${FINALPATH}" "${PROJECT}"
+        "${SCRIPTDIR}/../macos_common/notarize.sh" "${FINALPATH}" "org.airvpn.eddie.${PROJECT}"        
     fi
 fi
 
 # Deploy to eddie.website
 
 if [ ${VARSTAFF} = "yes" ]; then
-    "${SCRIPTDIR}/../macos_common/deploy.sh" "${FINALPATH}"
+    "${SCRIPTDIR}/../macos_common/deploy.sh" "${FINALPATH}" "internal"
 fi
 
 # End

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 = "6cf2dae78cf4bee2c5f03ddf1e0bed922ac426d4fa672760d68a4253eef5db1c";
-const std::string expectedHummingbirdHash = "facd09b146b7c41758a9105f1c2415c482e7c24816cc9f3e15d72551495955ae";
+const std::string expectedOpenvpnHash = "60a130c2d465b162b158e96ad8907b8cc1cc51f881e5cd33d141821a3d08df38";
+const std::string expectedHummingbirdHash = "6734448c4b02adde44d8f5f1d6164015266ce6e2e03d254499a44c9d2972cc3a";

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

@@ -599,12 +599,15 @@ void IBase::Do(const std::string& commandId, const std::string& command, std::ma
 
 		std::vector<std::string> paths;
 		AddTorCookiePaths(processPath, username, paths);
+
+        LogRemote("pazzo tor search");
 
 		for (std::vector<std::string>::const_iterator i = paths.begin(); i != paths.end(); ++i)
 		{
 			std::string path = *i;
 			if (FsFileExists(path))
 			{
+                LogRemote("pazzo tor found:" + path);
 				std::vector<char> chars = FsFileReadBytes(path);
 				if (chars.size() > 0)
 				{

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

@@ -276,6 +276,8 @@ void IPosix::AddTorCookiePaths(const std::string& torPath, const std::string& us
 
 	result.push_back("/var/run/tor/control.authcookie");
 	result.push_back("/var/lib/tor/control_auth_cookie");
+    result.push_back("/run/tor/control.authcookie"); // Default Ubuntu 20.04.1 LTS tor from official repo
+    result.push_back("/run/tor/control_auth_cookie"); // Variant of above
 }
 
 // --------------------------
@@ -334,20 +336,16 @@ std::string IPosix::GetCmdlineOfProcessId(pid_t pid)
 
     std::string result;
     FILE *f;
-    char ch;
     f = fopen(path.c_str(), "rb");
     if(f == NULL)
         return "";  
     for(;;)
     {
-        ch = fgetc(f);
-        if(ch == EOF)
+        int chI = fgetc(f);
+        if(chI == EOF)
             break;
-
-		#ifdef __arm__
-			// Workaround. The if(ch == EOF) above never match under raspbian (at least Buster) EOF==-1. The if(ch == 255) below throw a warning constant-out-of-range under macOS. Need investigation.
-			if(ch == 255) break;
-		#endif
+
+        unsigned char ch = (unsigned char) chI;
 
         if(ch == 0)
             result += " ";

src/App.CLI.MacOS.Elevated/build.sh

@@ -14,8 +14,11 @@ fi
 BASEPATH=$(dirname $(realpath "$0"))
 mkdir -p "$BASEPATH/bin"
 
+# See comment in /repository/build_macos.sh
+VARARCH=$(cat /tmp/eddie_deploy_arch_native.txt)
+
 # Dynamic edition
-g++ -mmacosx-version-min=10.9 -o "$BASEPATH/bin/eddie-cli-elevated" "$BASEPATH/src/main.cpp" "$BASEPATH/src/impl.cpp" "$BASEPATH/../App.CLI.Common.Elevated/iposix.cpp" "$BASEPATH/../App.CLI.Common.Elevated/ibase.cpp" "$BASEPATH/../App.CLI.Common.Elevated/sha256.cpp" -Wall -std=c++11 -O3 -pthread -lpthread -D$1
+g++ -mmacosx-version-min=10.9 -arch ${VARARCH} -o "$BASEPATH/bin/eddie-cli-elevated" "$BASEPATH/src/main.cpp" "$BASEPATH/src/impl.cpp" "$BASEPATH/../App.CLI.Common.Elevated/iposix.cpp" "$BASEPATH/../App.CLI.Common.Elevated/ibase.cpp" "$BASEPATH/../App.CLI.Common.Elevated/sha256.cpp" -Wall -std=c++11 -O3 -pthread -lpthread -D$1
 
 chmod a+x "$BASEPATH/bin/eddie-cli-elevated"
 echo Done

src/App.Cocoa.MacOS/App.Cocoa.macOS.csproj

@@ -65,7 +65,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
     <Reference Include="Xamarin.Mac">
-      <HintPath>..\..\..\..\..\..\Library\Frameworks\Xamarin.Mac.framework\Versions\6.18.2.1\lib\reference\full\Xamarin.Mac.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\reference\full\Xamarin.Mac.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>