⚙ Allow configuration of User-Agent

- For OnlineConfigResolver and GeositeUpdater

Author: database64128

shadowsocks-csharp/Controller/Service/GeositeUpdater.cs

@@ -102,6 +102,8 @@ public static async Task UpdatePACFromGeosite()
             // because we can't change proxy on existing socketsHttpHandler instance
             httpClientHandler = new HttpClientHandler();
             httpClient = new HttpClient(httpClientHandler);
+            if (!string.IsNullOrWhiteSpace(config.userAgentString))
+                httpClient.DefaultRequestHeaders.Add("User-Agent", config.userAgentString);
             if (config.enabled)
             {
                 httpClientHandler.Proxy = new WebProxy(

shadowsocks-csharp/Controller/Service/OnlineConfigResolver.cs

@@ -11,7 +11,7 @@ namespace Shadowsocks.Controller.Service
 {
     public class OnlineConfigResolver
     {
-        public static async Task<List<Server>> GetOnline(string url, IWebProxy proxy = null)
+        public static async Task<List<Server>> GetOnline(string url, string userAgentString, IWebProxy proxy = null)
         {
             var httpClientHandler = new HttpClientHandler()
             {
@@ -21,9 +21,8 @@ public static async Task<List<Server>> GetOnline(string url, IWebProxy proxy = n
             {
                 Timeout = TimeSpan.FromSeconds(15)
             };
-
-            string userAgent = "ShadowsocksWindows/" + UpdateChecker.Version;
-            httpClient.DefaultRequestHeaders.Add("User-Agent", userAgent);
+            if (!string.IsNullOrWhiteSpace(userAgentString))
+                httpClient.DefaultRequestHeaders.Add("User-Agent", userAgentString);
 
             string server_json = await httpClient.GetStringAsync(url);
 

shadowsocks-csharp/Controller/ShadowsocksController.cs

@@ -691,7 +691,7 @@ private void TrafficStatistics(int queueMaxSize)
 
         public async Task<int> UpdateOnlineConfigInternal(string url)
         {
-            var onlineServer = await OnlineConfigResolver.GetOnline(url, _config.WebProxy);
+            var onlineServer = await OnlineConfigResolver.GetOnline(url, _config.userAgentString, _config.WebProxy);
             _config.configs = Configuration.SortByOnlineConfig(
                 _config.configs
                 .Where(c => c.group != url)

shadowsocks-csharp/Model/Configuration.cs

@@ -46,6 +46,7 @@ public class Configuration
         public string geositeUrl; // for custom geosite source (and rule group)
         public string geositeGroup;
         public bool geositeBlacklistMode;
+        public string userAgent;
 
         //public NLogConfig.LogLevel logLevel;
         public LogViewerConfig logViewer;
@@ -81,6 +82,7 @@ public Configuration()
             geositeUrl = "";
             geositeGroup = "geolocation-!cn";
             geositeBlacklistMode = true;
+            userAgent = "ShadowsocksWindows/$version";
 
             logViewer = new LogViewerConfig();
             proxy = new ProxyConfig();
@@ -92,6 +94,9 @@ public Configuration()
             onlineConfigSource = new List<string>();
         }
 
+        [JsonIgnore]
+        public string userAgentString; // $version substituted with numeral version in it
+
         [JsonIgnore]
         NLogConfig nLogConfig;
 
@@ -153,6 +158,7 @@ public static Configuration Load()
                 string configContent = File.ReadAllText(CONFIG_FILE);
                 config = JsonConvert.DeserializeObject<Configuration>(configContent);
                 config.isDefault = false;
+                config.version = UpdateChecker.Version;
                 if (UpdateChecker.Asset.CompareVersion(UpdateChecker.Version, config.version ?? "0") > 0)
                 {
                     config.updated = true;
@@ -201,6 +207,8 @@ public static Configuration Load()
                 logger.Error(e, "Cannot get the log level from NLog config file. Please check if the nlog config file exists with corresponding XML nodes.");
             }
 
+            config.userAgentString = config.userAgent.Replace("$version", config.version);
+
             return config;
         }