Merge branch 'fix-ipv6-issues'

7 files changed, 359 insertions, 33 deletions

diff --git a/windows/winnet/src/winnet/netconfig.cpp b/windows/winnet/src/winnet/netconfig.cpp
new file mode 100644
index 0000000000..7fd7b38869
--- /dev/null
+++ b/windows/winnet/src/winnet/netconfig.cpp
@@ -0,0 +1,269 @@
+#include "stdafx.h"
+#include "netconfig.h"
+#include <stdexcept>
+#include <sstream>
+#include <windows.h>
+#include <netcfgx.h>
+#include <devguid.h>
+#include <libcommon/registry/registry.h>
+#include <libcommon/error.h>
+#include <libcommon/string.h>
+#include <libcommon/memory.h>
+#include <libshared/network/interfaceutils.h>
+
+
+namespace
+{
+
+const wchar_t NETCFG_LOCK_CLIENT_NAME[] = L"MULLVAD";
+constexpr uint16_t NETCFG_LOCK_TIMEOUT = 5000; // milliseconds
+const wchar_t NETCFG_IPV6_COMPONENT_NAME[] = L"MS_TCPIP6";
+
+void SetIpv6BindingForBindName(INetCfg *netCfg, const std::wstring &bindName, bool enable)
+{
+	INetCfgComponent *transactionComponent = nullptr;
+	HRESULT result = netCfg->FindComponent(NETCFG_IPV6_COMPONENT_NAME, &transactionComponent);
+
+	if (S_OK != result)
+	{
+		THROW_ERROR("Failed to obtain transaction component");
+	}
+
+	INetCfgComponentBindings *bindings = nullptr;
+	result = transactionComponent->QueryInterface(
+		IID_INetCfgComponentBindings,
+		reinterpret_cast<void**>(&bindings)
+	);
+
+	transactionComponent->Release();
+	transactionComponent = nullptr;
+
+	if (S_OK != result)
+	{
+		std::wstringstream ss;
+		ss << L"Failed to obtain component bindings for ";
+		ss << NETCFG_IPV6_COMPONENT_NAME;
+		THROW_ERROR(common::string::ToAnsi(ss.str()).c_str());
+	}
+
+	IEnumNetCfgBindingPath *pathsEnum = NULL;
+	result = bindings->EnumBindingPaths(EBP_BELOW, &pathsEnum);
+
+	bindings->Release();
+	bindings = nullptr;
+
+	if (S_OK != result)
+	{
+		THROW_ERROR("Failed to acquire binding path enumerator");
+	}
+
+	common::memory::ScopeDestructor pathsEnumDestructor;
+	pathsEnumDestructor += [&pathsEnum]() {
+		pathsEnum->Release();
+		pathsEnum = nullptr;
+	};
+
+	INetCfgBindingPath *bindingPath = NULL;
+
+	result = pathsEnum->Next(1, &bindingPath, nullptr);
+
+	for (; S_OK == result; result = pathsEnum->Next(1, &bindingPath, nullptr))
+	{
+		common::memory::ScopeDestructor bindingPathDestructor;
+		bindingPathDestructor += [&bindingPath]() {
+			bindingPath->Release();
+			bindingPath = nullptr;
+		};
+
+		IEnumNetCfgBindingInterface *enumInterface = nullptr;
+		HRESULT enumResult = bindingPath->EnumBindingInterfaces(&enumInterface);
+
+		if (S_OK != enumResult)
+		{
+			THROW_ERROR("Failed to acquire binding path interfaces");
+		}
+
+		common::memory::ScopeDestructor interfaceEnumDestructor;
+		interfaceEnumDestructor += [&enumInterface]() {
+			enumInterface->Release();
+			enumInterface = nullptr;
+		};
+
+		INetCfgBindingInterface *iface = nullptr;
+
+		while (S_OK == enumInterface->Next(1, &iface, nullptr))
+		{
+			INetCfgComponent *cfgComponent = nullptr;
+
+			auto status = iface->GetLowerComponent(&cfgComponent);
+
+			iface->Release();
+			iface = nullptr;
+
+			if (S_OK != status)
+			{
+				THROW_ERROR("Failed to acquire binding interface component");
+			}
+
+			wchar_t *componentBindName = 0;
+
+			status = cfgComponent->GetBindName(&componentBindName);
+
+			cfgComponent->Release();
+			cfgComponent = nullptr;
+
+			if (S_OK != status)
+			{
+				THROW_ERROR("Failed to acquire bind name");
+			}
+
+			bool matchesBindName = (0 == _wcsicmp(bindName.c_str(), componentBindName));
+			CoTaskMemFree(componentBindName);
+
+			if (matchesBindName)
+			{
+				//
+				// Apply the changes and exit the function
+				//
+
+				result = bindingPath->Enable(enable);
+				if (S_OK != result)
+				{
+					THROW_ERROR("Failed to set IPv6 status");
+				}
+				netCfg->Apply();
+
+				return;
+			}
+		}
+	}
+}
+
+} // anonymous namespace
+
+
+void EnableIpv6ForAdapter(const std::wstring &adapterGuid)
+{
+	try
+	{
+		//
+		// Avoid using the COM objects unless necessary
+		// due to slow performance.
+		//
+
+		const auto key = common::registry::Registry::OpenKey(
+			HKEY_LOCAL_MACHINE,
+			L"SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Linkage"
+		);
+		const auto bindings = key->readStringArray(L"Bind");
+
+		std::wstring matchString = std::wstring(L"\\Device\\").append(adapterGuid);
+
+		for (auto it = bindings.begin(); it != bindings.end(); ++it)
+		{
+			if (0 == _wcsicmp(it->c_str(), matchString.c_str()))
+			{
+				// return from function
+				return;
+			}
+		}
+	}
+	catch (...)
+	{
+	}
+
+	//
+	// Initialize COM
+	//
+
+	HRESULT result = CoInitialize(nullptr);
+
+	if (S_OK != result)
+	{
+		std::stringstream ss;
+		ss << "Failed to initialize COM: " << result;
+		THROW_ERROR(ss.str().c_str());
+	}
+
+	common::memory::ScopeDestructor scopeDest;
+	scopeDest += []() {
+		CoUninitialize();
+	};
+
+	//
+	// Initialize INetCfg
+	//
+
+	INetCfg *netCfg = nullptr;
+	result = CoCreateInstance(
+		CLSID_CNetCfg,
+		nullptr,
+		CLSCTX_INPROC_SERVER,
+		IID_INetCfg,
+		reinterpret_cast<void **>(&netCfg)
+	);
+
+	if (S_OK != result)
+	{
+		std::stringstream ss;
+		ss << "Failed to create INetCfg instance: " << result;
+		THROW_ERROR(ss.str().c_str());
+
+	}
+
+	scopeDest += [&netCfg]() { netCfg->Release(); };
+
+	INetCfgLock *netCfgLock = nullptr;
+	result = netCfg->QueryInterface(IID_INetCfgLock, reinterpret_cast<void **>(&netCfgLock));
+
+	if (S_OK != result)
+	{
+		std::stringstream ss;
+		ss << "Failed to obtain INetCfg lock interface: " << result;
+		THROW_ERROR(ss.str().c_str());
+	}
+
+	scopeDest += [&netCfgLock]() {
+		netCfgLock->Release();
+	};
+
+	wchar_t *blockingApplication = nullptr;
+
+	// NOTE: This should be done before initializing INetCfg
+	result = netCfgLock->AcquireWriteLock(
+		NETCFG_LOCK_TIMEOUT,
+		NETCFG_LOCK_CLIENT_NAME,
+		&blockingApplication
+	);
+
+	if (S_OK != result)
+	{
+		std::wstringstream ss;
+		ss << L"Failed to acquire write lock";
+		if (nullptr != blockingApplication)
+		{
+			ss << L" due to application: " << blockingApplication;
+		}
+		ss << ". (" << result << ")";
+
+		THROW_ERROR(common::string::ToAnsi(ss.str()).c_str());
+	}
+
+	scopeDest += [&]() {
+		CoTaskMemFree(blockingApplication);
+		netCfgLock->ReleaseWriteLock();
+	};
+
+	result = netCfg->Initialize(nullptr);
+
+	if (S_OK != result)
+	{
+		std::stringstream ss;
+		ss << "Failed to initialize INetCfg: " << result;
+		THROW_ERROR(ss.str().c_str());
+	}
+
+	scopeDest += [&netCfg]() { netCfg->Uninitialize(); };
+
+	SetIpv6BindingForBindName(netCfg, adapterGuid, true);
+}
diff --git a/windows/winnet/src/winnet/netconfig.h b/windows/winnet/src/winnet/netconfig.h
new file mode 100644
index 0000000000..b2849857a2
--- /dev/null
+++ b/windows/winnet/src/winnet/netconfig.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <string>
+
+void EnableIpv6ForAdapter(const std::wstring &guid);
diff --git a/windows/winnet/src/winnet/winnet.cpp b/windows/winnet/src/winnet/winnet.cpp
index 2a96d150ca..ac56e94ff6 100644
--- a/windows/winnet/src/winnet/winnet.cpp
+++ b/windows/winnet/src/winnet/winnet.cpp
@@ -4,6 +4,7 @@
 #include "offlinemonitor.h"

 #include "routing/routemanager.h"

 #include "converters.h"

+#include "netconfig.h"

 #include <libshared/logging/logsinkadapter.h>

 #include <libshared/logging/unwind.h>

 #include <libshared/network/interfaceutils.h>

@@ -65,43 +66,30 @@ WinNet_EnsureBestMetric(
 

 extern "C"

 WINNET_LINKAGE

-WINNET_GTII_STATUS

+bool

 WINNET_API

-WinNet_GetTapInterfaceIpv6Status(

+WinNet_EnableIpv6ForAdapter(

+	const wchar_t *deviceGuid,

 	MullvadLogSink logSink,

 	void *logSinkContext

 )

 {

 	try

 	{

-		MIB_IPINTERFACE_ROW iface = { 0 };

-

-		iface.InterfaceLuid = NetworkInterfaces::GetInterfaceLuid(InterfaceUtils::GetTapInterfaceAlias());

-		iface.Family = AF_INET6;

-

-		const auto status = GetIpInterfaceEntry(&iface);

-

-		if (NO_ERROR == status)

-		{

-			return WINNET_GTII_STATUS_ENABLED;

-		}

-

-		if (ERROR_NOT_FOUND == status)

+		if (nullptr == deviceGuid)

 		{

-			return WINNET_GTII_STATUS_DISABLED;

+			THROW_ERROR("Invalid argument: deviceGuid");

 		}

 

-		THROW_WINDOWS_ERROR(status, "Resolve TAP IPv6 interface");

+		EnableIpv6ForAdapter(deviceGuid);

+		return true;

 	}

-	catch (const std::exception &err)

+	catch (const std::exception & err)

 	{

 		shared::logging::UnwindAndLog(logSink, logSinkContext, err);

-		return WINNET_GTII_STATUS_FAILURE;

-	}

-	catch (...)

-	{

-		return WINNET_GTII_STATUS_FAILURE;

+		return false;

 	}

+	return false;

 }

 

 extern "C"

@@ -143,6 +131,60 @@ WinNet_GetTapInterfaceAlias(
 

 extern "C"

 WINNET_LINKAGE

+bool

+WINNET_API

+WinNet_InterfaceAliasToGuid(

+	const wchar_t *alias,

+	wchar_t **guid,

+	MullvadLogSink logSink,

+	void *logSinkContext

+)

+{

+	try

+	{

+		if (nullptr == guid)

+		{

+			THROW_ERROR("Invalid argument: guid");

+		}

+		if (nullptr == alias)

+		{

+			THROW_ERROR("Invalid argument: alias");

+		}

+

+		GUID tempGuid = { 0 };

+		NET_LUID luid = { 0 };

+

+		if (NO_ERROR != ConvertInterfaceAliasToLuid(alias, &luid))

+		{

+			THROW_ERROR("ConvertInterfaceAliasToLuid: invalid parameter");

+		}

+

+		if (NO_ERROR != ConvertInterfaceLuidToGuid(&luid, &tempGuid))

+		{

+			THROW_ERROR("ConvertInterfaceLuidToGuid: invalid parameter");

+		}

+

+		const auto guidStr = common::string::FormatGuid(tempGuid);

+

+		auto guidBuffer = new wchar_t[guidStr.size() + 1];

+		wcscpy(guidBuffer, guidStr.c_str());

+		*guid = guidBuffer;

+

+		return true;

+	}

+	catch (const std::exception & err)

+	{

+		shared::logging::UnwindAndLog(logSink, logSinkContext, err);

+		return false;

+	}

+	catch (...)

+	{

+		return false;

+	}

+}

+

+extern "C"

+WINNET_LINKAGE

 void

 WINNET_API

 WinNet_ReleaseString(

diff --git a/windows/winnet/src/winnet/winnet.def b/windows/winnet/src/winnet/winnet.def
index ecec97959e..5a1bbfe99f 100644
--- a/windows/winnet/src/winnet/winnet.def
+++ b/windows/winnet/src/winnet/winnet.def
@@ -1,7 +1,8 @@
 LIBRARY winnet
 EXPORTS
 	WinNet_EnsureBestMetric
-	WinNet_GetTapInterfaceIpv6Status
+	WinNet_InterfaceAliasToGuid
+	WinNet_EnableIpv6ForAdapter
 	WinNet_GetTapInterfaceAlias
 	WinNet_ReleaseString
 	WinNet_ActivateConnectivityMonitor
diff --git a/windows/winnet/src/winnet/winnet.h b/windows/winnet/src/winnet/winnet.h
index 5e2a4154a4..98b0083f03 100644
--- a/windows/winnet/src/winnet/winnet.h
+++ b/windows/winnet/src/winnet/winnet.h
@@ -33,18 +33,12 @@ WinNet_EnsureBestMetric(
 	void *logSinkContext
 );
 
-enum WINNET_GTII_STATUS
-{
-	WINNET_GTII_STATUS_ENABLED = 0,
-	WINNET_GTII_STATUS_DISABLED = 1,
-	WINNET_GTII_STATUS_FAILURE = 2,
-};
-
 extern "C"
 WINNET_LINKAGE
-WINNET_GTII_STATUS
+bool
 WINNET_API
-WinNet_GetTapInterfaceIpv6Status(
+WinNet_EnableIpv6ForAdapter(
+	const wchar_t *deviceGuid,
 	MullvadLogSink logSink,
 	void *logSinkContext
 );
@@ -59,6 +53,17 @@ WinNet_GetTapInterfaceAlias(
 	void *logSinkContext
 );
 
+extern "C"
+WINNET_LINKAGE
+bool
+WINNET_API
+WinNet_InterfaceAliasToGuid(
+	const wchar_t *alias,
+	wchar_t **guid,
+	MullvadLogSink logSink,
+	void *logSinkContext
+);
+
 //
 // This is a companion function to the above function.
 // Generically named in case we need other functions here that return strings.
diff --git a/windows/winnet/src/winnet/winnet.vcxproj b/windows/winnet/src/winnet/winnet.vcxproj
index 7b4578d4b1..6876035160 100644
--- a/windows/winnet/src/winnet/winnet.vcxproj
+++ b/windows/winnet/src/winnet/winnet.vcxproj
@@ -28,6 +28,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="converters.cpp" />
+    <ClCompile Include="netconfig.cpp" />
     <ClCompile Include="networkadaptermonitor.cpp" />
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="InterfacePair.cpp" />
@@ -42,6 +43,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="converters.h" />
+    <ClInclude Include="netconfig.h" />
     <ClInclude Include="networkadaptermonitor.h" />
     <ClInclude Include="InterfacePair.h" />
     <ClInclude Include="offlinemonitor.h" />
diff --git a/windows/winnet/src/winnet/winnet.vcxproj.filters b/windows/winnet/src/winnet/winnet.vcxproj.filters
index 2d5a039c6b..27f0051bc6 100644
--- a/windows/winnet/src/winnet/winnet.vcxproj.filters
+++ b/windows/winnet/src/winnet/winnet.vcxproj.filters
@@ -21,6 +21,7 @@
       <Filter>routing</Filter>
     </ClCompile>
     <ClCompile Include="converters.cpp" />
+    <ClCompile Include="netconfig.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h" />
@@ -43,6 +44,7 @@
       <Filter>routing</Filter>
     </ClInclude>
     <ClInclude Include="converters.h" />
+    <ClInclude Include="netconfig.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="winnet.def" />