- Support tls1.2

- Fix built-in server
Jeric-X · Aug 26, 2020 · 14d7543 · 14d7543
1 parent 8444fb3
commit 14d7543
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 34 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,7 @@
+v1.0.6
+- Support tls1.2
+- Fix built-in server
+
 v1.0.5
 - Fix start with boot
 

diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@
 ## 功能
 一个简单的剪切板同步工具，C/S架构
 ## Server
-理论支持任何支持WebDAV协议的网盘、web服务器   
-> 测试过的服务器：   
-> - [x] NextCloud  
+~~~理论支持任何支持WebDAV协议的网盘、web服务器~~~   
+测试过的服务器：   
+- [x] NextCloud  
 
 ## Client-Windows  
 下载最新的[Release](https://github.com/Jeric-X/SyncClipboard/releases/)，自备梯子  

diff --git a/SyncClipboard/HttpWebResponseUtility.cs b/SyncClipboard/HttpWebResponseUtility.cs
@@ -29,7 +29,10 @@ public static HttpWebResponse CreateGetHttpResponse(string url, int? timeout, st
             {
                 throw new ArgumentNullException("url");
             }
+
+            SetSecurityProtocol(url);
             HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
+
             request.Method = "GET";
             request.UserAgent = DefaultUserAgent;
             if (!string.IsNullOrEmpty(userAgent))
@@ -71,18 +74,11 @@ public static HttpWebResponse CreatePostHttpResponse(string url, IDictionary<str
             {
                 throw new ArgumentNullException("requestEncoding");
             }
-            HttpWebRequest request = null;
-            //如果是发送HTTPS请求  
-            if (url.StartsWith("https", StringComparison.OrdinalIgnoreCase))
-            {
-                ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(CheckValidationResult);
-                request = WebRequest.Create(url) as HttpWebRequest;
-                request.ProtocolVersion = HttpVersion.Version10;
-            }
-            else
-            {
-                request = WebRequest.Create(url) as HttpWebRequest;
-            }
+
+            SetSecurityProtocol(url);
+
+            HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
+
             request.Method = "POST";
             request.ContentType = "application/x-www-form-urlencoded";
 
@@ -149,18 +145,10 @@ public static HttpWebResponse CreatePutHttpResponse(string url, string parameter
             {
                 throw new ArgumentNullException("requestEncoding");
             }
-            HttpWebRequest request = null;
-            //如果是发送HTTPS请求  
-            if (url.StartsWith("https", StringComparison.OrdinalIgnoreCase))
-            {
-                ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(CheckValidationResult);
-                request = WebRequest.Create(url) as HttpWebRequest;
-                request.ProtocolVersion = HttpVersion.Version10;
-            }
-            else
-            {
-                request = WebRequest.Create(url) as HttpWebRequest;
-            }
+
+            SetSecurityProtocol(url);
+
+            HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
             request.Method = "PUT";
             request.ContentType = "text/plain";
             if (!string.IsNullOrEmpty(userAgent))
@@ -203,9 +191,13 @@ public static HttpWebResponse CreatePutHttpResponse(string url, string parameter
 
             return request.GetResponse() as HttpWebResponse;
         }
-        private static bool CheckValidationResult(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors errors)
+
+        public static void SetSecurityProtocol(string url)
         {
-            return true; //总是接受  
+            if (url.StartsWith("https", StringComparison.OrdinalIgnoreCase))
+            {
+                ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+            }
         }
     } 
 }
diff --git a/SyncClipboard/Program.cs b/SyncClipboard/Program.cs
@@ -11,7 +11,7 @@ namespace SyncClipboard
     static class Program
     {
         public static String SoftName = "SyncClipboard";
-        public static String DefaultServer = "https://cloud.jericx.xyz/remote.php/dav/files/Clipboard/Clipboard/";
+        public static String DefaultServer = "https://file.jericx.xyz/remote.php/dav/files/Clipboard/Clipboard/";
         public static String DefaultUser = "Clipboard";
         public static String DefaultPassword = "Clipboard";
         public static MainController mainController;

diff --git a/SyncClipboard/Properties/Settings.Designer.cs b/SyncClipboard/Properties/Settings.Designer.cs
diff --git a/SyncClipboard/Properties/Settings.settings b/SyncClipboard/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="URL" Type="System.String" Scope="User">
-      <Value Profile="(Default)">https://cloud.jericx.xyz/remote.php/dav/files/JericX/Clipboard/SyncClipboard.json</Value>
+      <Value Profile="(Default)">https://file.jericx.xyz/remote.php/dav/files/JericX/Clipboard/SyncClipboard.json</Value>
     </Setting>
     <Setting Name="USERNAME" Type="System.String" Scope="User">
       <Value Profile="(Default)" />

diff --git a/SyncClipboard/UpdateChecker.cs b/SyncClipboard/UpdateChecker.cs
@@ -12,7 +12,7 @@ namespace SyncClipboard
 {
     class UpdateChecker
     {
-        public const string Version = "1.0.5";
+        public const string Version = "1.0.6";
         public const string UpdateUrl = "https://api.github.com/repos/Jeric-X/SyncClipboard/releases/latest";
         public const string ReleaseUrl = "https://github.com/Jeric-X/SyncClipboard/releases/latest";
 

diff --git a/SyncClipboard/app.config b/SyncClipboard/app.config
@@ -8,7 +8,7 @@
     <userSettings>
         <SyncClipboard.Properties.Settings>
             <setting name="URL" serializeAs="String">
-                <value>https://cloud.jericx.xyz/remote.php/dav/files/JericX/Clipboard/SyncClipboard.json</value>
+                <value>https://file.jericx.xyz/remote.php/dav/files/JericX/Clipboard/SyncClipboard.json</value>
             </setting>
             <setting name="USERNAME" serializeAs="String">
                 <value />