Merge branch 'release/3.3.2'

Author: Mindaugas Veblauskas

.gitlab-ci.yml

@@ -298,10 +298,6 @@ artifactlift-release-artifacts:
   rules:
     - when: never
 
-artifactlift-release-metadata:
-  rules:
-    - when: never
-
 release-binary-to-nexus:
   extends: artifactlift-release-candidate-artifacts
   rules:
@@ -313,18 +309,6 @@ release-binary-to-nexus:
 
 release-binary-to-prod:
   extends: artifactlift-release-artifacts
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "release/9.9.9"'
-      when: never
-    - if: '$CI_COMMIT_BRANCH =~ /^release\/\d+\.\d+\.\d+/'
-      when: manual
-    - when: never
-
-release-json-to-prod:
-  extends: artifactlift-release-metadata
-  needs:
-    - job: release-binary-to-prod
-      artifacts: true
   rules:
     - if: '$CI_COMMIT_BRANCH == "release/9.9.9"'
       when: never

ci/build-scripts/guest_hole_server_loader.py

@@ -37,7 +37,12 @@ def load():
         if server['EntryIP'] in unique_entries:
             continue
 
-        server_json_object = "".join(['{"host":"', server['Domain'], '","ip":"', server['EntryIP'], '","signature":"', server['Signature'], '","label":"', server['Label'], '"}'])
+        server_json_object = "".join([
+            '{"host":"', server['Domain'],
+            '","ip":"', server['EntryIP'],
+            '","signature":"', server['Signature'],
+            '","label":"', server['Label'],
+            '","publicKey":"', server['X25519PublicKey'], '"}'])
         servers_str = ",".join([servers_str, server_json_object])
         unique_entries.append(server['EntryIP'])
 

src/Api/ProtonVPN.Api.Contracts/IApiClient.cs

@@ -51,7 +51,7 @@ public interface IApiClient : IClientBase
         Task<ApiResponseResult<UserLocationResponse>> GetLocationDataAsync();
         Task<ApiResponseResult<BaseResponse>> ReportBugAsync(IEnumerable<KeyValuePair<string, string>> fields, IEnumerable<File> files);
         Task<ApiResponseResult<SessionsResponse>> GetSessions();
-        Task<ApiResponseResult<VpnConfigResponse>> GetVpnConfig();
+        Task<ApiResponseResult<VpnConfigResponse>> GetVpnConfig(string country, string ip);
         Task<ApiResponseResult<AnnouncementsResponse>> GetAnnouncementsAsync(AnnouncementsRequest request);
         Task<ApiResponseResult<StreamingServicesResponse>> GetStreamingServicesAsync();
         Task<ApiResponseResult<BaseResponse>> CheckAuthenticationServerStatusAsync();

src/Api/ProtonVPN.Api/ApiClient.cs

@@ -35,6 +35,7 @@
 using ProtonVPN.Api.Contracts.VpnConfig;
 using ProtonVPN.Api.Contracts.VpnSessions;
 using ProtonVPN.Common.Configuration;
+using ProtonVPN.Common.Extensions;
 using ProtonVPN.Common.OS.Net.Http;
 using ProtonVPN.Common.StatisticalEvents;
 using ProtonVPN.Core.Settings;
@@ -162,9 +163,13 @@ public async Task<ApiResponseResult<SessionsResponse>> GetSessions()
         return await SendRequest<SessionsResponse>(request, "Get sessions");
     }
 
-    public async Task<ApiResponseResult<VpnConfigResponse>> GetVpnConfig()
+    public async Task<ApiResponseResult<VpnConfigResponse>> GetVpnConfig(string country, string ip)
     {
-        HttpRequestMessage request = GetAuthorizedRequest(HttpMethod.Get, "vpn/v2/clientconfig");
+        HttpRequestMessage request = GetAuthorizedRequest(HttpMethod.Get, "vpn/v2/clientconfig", ip);
+        if (!country.IsNullOrEmpty())
+        {
+            request.Headers.Add("x-pm-country", country);
+        }
         return await SendRequest<VpnConfigResponse>(request, "Get VPN config");
     }
 

src/GlobalAssemblyInfo.cs

@@ -14,8 +14,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.0.0")]
+[assembly: AssemblyVersion("3.3.2.0")]
+[assembly: AssemblyFileVersion("3.3.2.0")]
 [assembly: ComVisible(false)]
 [assembly: AssemblyInformationalVersion("$AssemblyVersion")]
 [assembly: SupportedOSPlatform("windows")]

src/ProcessCommunication/ProtonVPN.ProcessCommunication.EntityMapping.Tests/Vpn/ConnectionRequestMapperTest.cs

@@ -22,6 +22,7 @@
 using ProtonVPN.Common.Networking;
 using ProtonVPN.Common.Vpn;
 using ProtonVPN.Core.Vpn;
+using ProtonVPN.Crypto;
 using ProtonVPN.EntityMapping.Contracts;
 using ProtonVPN.ProcessCommunication.Contracts.Entities.Vpn;
 using ProtonVPN.ProcessCommunication.EntityMapping.Vpn;
@@ -115,7 +116,8 @@ public void TestMapLeftToRight()
                 new List<VpnHost>(),
                 VpnProtocol.OpenVpnUdp,
                 new VpnConfig(new VpnConfigParameters()),
-                new VpnCredentials(DateTime.UtcNow.Ticks.ToString(), DateTime.UtcNow.Millisecond.ToString()));
+                new VpnCredentials(string.Empty, new AsymmetricKeyPair(
+                    new SecretKey("PVPN", KeyAlgorithm.Unknown), new PublicKey("PVPN", KeyAlgorithm.Unknown))));
 
             ConnectionRequestIpcEntity result = _mapper.Map(entityToTest);
 

src/ProcessCommunication/ProtonVPN.ProcessCommunication.EntityMapping.Tests/Vpn/VpnCredentialsMapperTest.cs

@@ -63,19 +63,6 @@ public void Cleanup()
             _expectedAsymmetricKeyPair = null;
         }
 
-        [TestMethod]
-        public void TestMapLeftToRight_WithUsernameAndPassword()
-        {
-            VpnCredentials entityToTest = new(DateTime.UtcNow.Ticks.ToString(), DateTime.UtcNow.Millisecond.ToString());
-
-            VpnCredentialsIpcEntity result = _mapper.Map(entityToTest);
-
-            Assert.IsNotNull(result);
-            Assert.AreEqual(entityToTest.Username, result.Username);
-            Assert.AreEqual(entityToTest.Password, result.Password);
-            Assert.IsNull(result.ClientCertPem);
-        }
-
         [TestMethod]
         public void TestMapLeftToRight_WithCertificate()
         {
@@ -85,8 +72,6 @@ public void TestMapLeftToRight_WithCertificate()
             VpnCredentialsIpcEntity result = _mapper.Map(entityToTest);
 
             Assert.IsNotNull(result);
-            Assert.IsNull(result.Username);
-            Assert.IsNull(result.Password);
             Assert.AreEqual(entityToTest.ClientCertPem, result.ClientCertPem);
             Assert.AreEqual(_expectedAsymmetricKeyPairIpcEntity, result.ClientKeyPair);
         }
@@ -100,23 +85,6 @@ public void TestMapRightToLeft_ThrowsWhenNull()
             _mapper.Map(entityToTest);
         }
 
-        [TestMethod]
-        public void TestMapRightToLeft_WithUsernameAndPassword()
-        {
-            VpnCredentialsIpcEntity entityToTest = new()
-            {
-                Username = DateTime.UtcNow.Ticks.ToString(),
-                Password = DateTime.UtcNow.Millisecond.ToString()
-            };
-
-            VpnCredentials result = _mapper.Map(entityToTest);
-
-            Assert.IsNotNull(result);
-            Assert.AreEqual(entityToTest.Username, result.Username);
-            Assert.AreEqual(entityToTest.Password, result.Password);
-            Assert.IsNull(result.ClientCertPem);
-        }
-
         [TestMethod]
         public void TestMapRightToLeft_WithCertificate()
         {
@@ -129,8 +97,6 @@ public void TestMapRightToLeft_WithCertificate()
             VpnCredentials result = _mapper.Map(entityToTest);
 
             Assert.IsNotNull(result);
-            Assert.IsNull(result.Username);
-            Assert.IsNull(result.Password);
             Assert.AreEqual(entityToTest.ClientCertPem, result.ClientCertPem);
             Assert.AreEqual(_expectedAsymmetricKeyPair, result.ClientKeyPair);
         }

src/ProcessCommunication/ProtonVPN.ProcessCommunication.EntityMapping/Vpn/VpnCredentialsMapper.cs

@@ -17,7 +17,6 @@
  * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-using ProtonVPN.Common.Extensions;
 using ProtonVPN.Common.Vpn;
 using ProtonVPN.Crypto;
 using ProtonVPN.EntityMapping.Contracts;
@@ -39,8 +38,6 @@ public VpnCredentialsIpcEntity Map(VpnCredentials leftEntity)
         {
             return new()
                 {
-                    Username = leftEntity.Username,
-                    Password = leftEntity.Password,
                     ClientCertPem = leftEntity.ClientCertPem,
                     ClientKeyPair = _entityMapper.Map<AsymmetricKeyPair, AsymmetricKeyPairIpcEntity>(leftEntity.ClientKeyPair)
                 };
@@ -50,9 +47,7 @@ public VpnCredentials Map(VpnCredentialsIpcEntity rightEntity)
         {
             return rightEntity is null
                 ? throw new ArgumentNullException($"The {nameof(VpnCredentialsIpcEntity)} to be mapped is null.")
-                : rightEntity.ClientCertPem.IsNullOrEmpty() || rightEntity.ClientKeyPair == null
-                    ? new(rightEntity.Username, rightEntity.Password)
-                    : new(rightEntity.ClientCertPem, _entityMapper.Map<AsymmetricKeyPairIpcEntity, AsymmetricKeyPair>(rightEntity.ClientKeyPair));
+                : new(rightEntity.ClientCertPem, _entityMapper.Map<AsymmetricKeyPairIpcEntity, AsymmetricKeyPair>(rightEntity.ClientKeyPair));
         }
     }
 }

src/ProtonVPN.App/Core/Ioc/AppModule.cs

@@ -115,7 +115,6 @@ protected override void Load(ContainerBuilder builder)
                 .AsSelf()
                 .SingleInstance();
             builder.RegisterType<UserStorage>().As<IUserStorage>().SingleInstance();
-            builder.RegisterType<TruncatedLocation>().SingleInstance();
 
             builder.RegisterType<PinFactory>()
                 .AsImplementedInterfaces()

src/ProtonVPN.App/Core/UserLocationService.cs

@@ -33,7 +33,7 @@
 
 namespace ProtonVPN.Core
 {
-    internal class UserLocationService : IVpnStateAware, IUserLocationService, IConnectionDetailsAware
+    public class UserLocationService : IVpnStateAware, IUserLocationService, IConnectionDetailsAware
     {
         private static readonly TimeSpan UpdateLocationDelay = TimeSpan.FromSeconds(6);
 
@@ -70,6 +70,29 @@ public Task Update()
             return _updateAction.Run();
         }
 
+        public async Task<string> GetTruncatedIpAddressAsync()
+        {
+            string ip = _userStorage.GetLocation().Ip;
+            if (ip.IsNullOrEmpty())
+            {
+                await Update();
+            }
+
+            ip = _userStorage.GetLocation().Ip;
+            if (string.IsNullOrEmpty(ip))
+            {
+                return string.Empty;
+            }
+
+            string[] parts = ip.Split('.');
+            if (parts.Length >= 3)
+            {
+                return string.Join(".", parts[0], parts[1], parts[2], 0);
+            }
+
+            return string.Empty;
+        }
+
         public async Task OnVpnStateChanged(VpnStateChangedEventArgs e)
         {
             VpnStatus status = e.State.Status;