From 3a3beec9dbecb3deb489d280caefb44723ed8210 Mon Sep 17 00:00:00 2001
From: RMBGAME <rmb@rmbgame.net>
Date: Thu, 24 Feb 2022 12:49:06 +0800
Subject: [PATCH] proxy UA edit

---
 .../Windows/LocalAuthPage/AddAuthWindow.axaml | 39 ++++++++++---------
 .../Implementation/HttpProxyServiceImpl.cs    |  8 ++++
 .../SteamAuthenticator.Compat_WinAuth3.cs     |  2 +-
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml
index 5bb43df74..f24eb3f37 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AddAuthWindow.axaml
@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" 
+        mc:Ignorable="d"
         d:DesignWidth="720" d:DesignHeight="400"
         MinWidth="720" MinHeight="400"
         Width="720" Height="550"
@@ -22,8 +22,8 @@
         Title="{Binding Title}">
   <Panel>
     <controls:TitleBar></controls:TitleBar>
-    
-    <TabControl Classes="flat" 
+
+    <TabControl Classes="flat"
                 Margin="0 20 0 0">
       <TabItem Header="{ReflectionBinding Path=Res.LocalAuth_SteamUserImport,Mode=OneWay,Source={x:Static resx:R.Current}}">
         <Panel>
@@ -39,22 +39,23 @@
 
             <TextBlock Grid.Row="2" Margin="10,0" HorizontalAlignment="Center" TextWrapping="WrapWithOverflow" TextAlignment="Center" Text="{ReflectionBinding Path=Res.Steam_UserLoginTip,Mode=OneWay,Source={x:Static resx:R.Current}}"></TextBlock>
           </Grid>
-          <StackPanel IsVisible="{Binding !CaptchaImage,Converter={StaticResource IsNullConverter}}" 
-                      Orientation="Vertical" 
-                      HorizontalAlignment="Center" 
-                      VerticalAlignment="Bottom" 
-                      Margin="0 0 0 90" 
+          <StackPanel IsVisible="{Binding !CaptchaImage,Converter={StaticResource IsNullConverter}}"
+                      Orientation="Vertical"
+                      HorizontalAlignment="Center"
+                      VerticalAlignment="Bottom"
+                      Margin="0 0 0 90"
                       Spacing="10">
-            <WrapPanel>
-              <gif:Image2 Width="206"
-                          Height="37"
-                          Stretch="Uniform"
-                          Source="{Binding CaptchaImage}"/>
+            <gif:Image2 Width="206"
+                        Height="37"
+                        Stretch="Uniform"
+                        Source="{Binding CaptchaImage}"/>
+            <StackPanel Orientation="Horizontal" Spacing="5">
+              <TextBox Watermark="{ReflectionBinding Path=Res.Steam_ImageCodeTip,Mode=OneWay,Source={x:Static resx:R.Current}}" Text="{Binding CaptchaText}" MaxWidth="200"></TextBox>
+              
               <Button Content="{ReflectionBinding Path=Res.Steam_ImageCodeShowError,Mode=OneWay,Source={x:Static resx:R.Current}}"
                       Margin="5 0 0 0"
                       Command="{ReflectionBinding CaptchaUrlButton_Click}"/>
-            </WrapPanel>
-            <TextBox Watermark="{ReflectionBinding Path=Res.Steam_ImageCodeTip,Mode=OneWay,Source={x:Static resx:R.Current}}" Text="{Binding CaptchaText}" MaxWidth="200"></TextBox>
+            </StackPanel>
           </StackPanel>
           <Grid IsVisible="{Binding !EmailDomain,Converter={StaticResource IsNullConverter}}" RowDefinitions="Auto,*,Auto" Margin="10">
             <StackPanel Grid.Row="1" Spacing="10" VerticalAlignment="Center">
@@ -66,10 +67,10 @@
 
             <StackPanel Grid.Row="2">
               <TextBlock Margin="10,0" HorizontalAlignment="Center" Text="{Binding EmailDomain}"></TextBlock>
-              <TextBlock Margin="10,0" 
-                         TextWrapping="WrapWithOverflow" 
-                         TextAlignment="Center" 
-                         HorizontalAlignment="Center" 
+              <TextBlock Margin="10,0"
+                         TextWrapping="WrapWithOverflow"
+                         TextAlignment="Center"
+                         HorizontalAlignment="Center"
                          Text="{ReflectionBinding Path=Res.LocalAuth_EmailCodeTip,Mode=OneWay,Source={x:Static resx:R.Current}}"></TextBlock>
             </StackPanel>
           </Grid>
diff --git a/src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs b/src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs
index db16e014c..249ba83f9 100644
--- a/src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs
+++ b/src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs
@@ -268,6 +268,14 @@ namespace System.Application.Services.Implementation
                             e.HttpClient.UpStreamEndPoint = new IPEndPoint(ip, item.PortId);
                         }
 
+                        if (!string.IsNullOrEmpty(item.UserAgent))
+                        {
+                            var oldua = e.HttpClient.Request.Headers.GetFirstHeader("User-Agent")?.Value;
+                            e.HttpClient.Request.Headers.RemoveHeader("User-Agent");
+                            var newUA = item.UserAgent.Replace("${origin}", oldua);
+                            e.HttpClient.Request.Headers.AddHeader("User-Agent", newUA);
+                        }
+
                         if (e.HttpClient.ConnectRequest?.ClientHelloInfo?.Extensions != null)
                         {
 #if DEBUG
diff --git a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.Compat_WinAuth3.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.Compat_WinAuth3.cs
index 958002c57..658d8cedd 100644
--- a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.Compat_WinAuth3.cs
+++ b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.Compat_WinAuth3.cs
@@ -67,7 +67,7 @@ namespace System.Application.Models
             /// </summary>
             const string COMMUNITY_BASE = "https://steamcommunity.com";
             const string WEBAPI_BASE = "https://api.steampowered.com";
-            const string SYNC_URL = "https://api.steampowered.com:443/ITwoFactorService/QueryTime/v0001";
+            const string SYNC_URL = "https://api.steampowered.com/ITwoFactorService/QueryTime/v0001";
 
             /// <summary>
             /// Character set for authenticator code