Added HTTPS support

KerJoe · Aug 27, 2023 · 7adb924 · 7adb924
1 parent b0abc1a
commit 7adb924
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 7 deletions.
diff --git a/OctoConnect/ConnectionPanel.Designer.cs b/OctoConnect/ConnectionPanel.Designer.cs
diff --git a/OctoConnect/ConnectionPanel.cs b/OctoConnect/ConnectionPanel.cs
@@ -46,13 +46,20 @@ private void numericUpDownPort_ValueChanged(object sender, EventArgs e)
             con.Port = (int)numericUpDownPort.Value;
         }
 
+        private void checkBoxSsl_CheckedChanged(object sender, EventArgs e)
+        {
+            if (updating) return;
+            con.UseSsl = checkBoxSsl.Checked;
+        }
+
         bool updating;
         private void bindingConnection_CurrentItemChanged(object sender, EventArgs e)
         {
             updating = true;
             textBoxApiKey.Text = con.Apikey;
             textBoxHostname.Text = con.Hostname;
             numericUpDownPort.Value = con.Port;
+            checkBoxSsl.Checked = con.UseSsl;
             updating = false;
         }
     }

diff --git a/OctoConnect/Connector.cs b/OctoConnect/Connector.cs
@@ -101,14 +101,14 @@ dynamic getOctoPrintJSON(string apiname)
         {
             var wc = new WebClient();
             wc.Headers["X-Api-Key"] = apikey; wc.Headers[HttpRequestHeader.ContentType] = "application/json";
-            string response = wc.DownloadString(string.Format(@"http://{0}:{1}/api/{2}?apikey={3}", hostname, port, apiname, apikey));
+            string response = wc.DownloadString(string.Format(@"{0}://{1}:{2}/api/{3}?apikey={4}", usessl ? "https" : "http", hostname, port, apiname, apikey));
             return JObject.Parse(response == "" ? "{}" : response); // Parse method doesn't accept an empty string, so instead we give it an empty JSON
         }
         dynamic postOctoPrintJSON(string apiname, string json = "")
         {
             var wc = new WebClient();
             wc.Headers["X-Api-Key"] = apikey; wc.Headers[HttpRequestHeader.ContentType] = "application/json";
-            string response = wc.UploadString(string.Format(@"http://{0}:{1}/api/{2}", hostname, port, apiname), json);
+            string response = wc.UploadString(string.Format(@"{0}://{1}:{2}/api/{3}", usessl ? "https" : "http", hostname, port, apiname), json);
             return JObject.Parse(response == "" ? "{}" : response);
         }
         float uploadPercentDone = 0;
@@ -119,7 +119,7 @@ Task<byte[]> postOctoPrintGCode(string filepath)
             wc.UploadProgressChanged += (o, e) => uploadPercentDone = ((float)e.BytesSent / e.TotalBytesToSend) * 100; // ProgressPercentage is int, not double
             wc.UploadFileCompleted += (o, e) => uploadDone = true;
             wc.Headers["X-Api-Key"] = apikey;
-            return wc.UploadFileTaskAsync(new Uri(string.Format(@"http://{0}:{1}/api/files/local", hostname, port)), filepath);
+            return wc.UploadFileTaskAsync(new Uri(string.Format(@"{0}://{1}:{2}/api/files/local", usessl ? "https" : "http", hostname, port)), filepath);
         }
         bool connectToPrinter()
         {
@@ -187,7 +187,7 @@ public override bool Connect(bool failSilent = false)
             string username = loginResponse["name"];
             string session = loginResponse["session"];
 
-            string websocketUri = string.Format(@"ws://{0}:{1}/sockjs/websocket", hostname, port);
+            string websocketUri = string.Format(@"{0}://{1}:{2}/sockjs/websocket", usessl ? "wss" : "ws", hostname, port);
             if (pushSocket != null)
                 if (pushSocket.Url.ToString() != websocketUri) // Test if address in panel changed            
                 {
@@ -545,12 +545,14 @@ public override void LoadFromRegistry()
             Apikey = key.GetString("opapikey", apikey);
             Hostname = key.GetString("ophostname", hostname);
             Port = key.GetInt("opport", port);
+            UseSsl = key.GetBool("opusessl", usessl);
         }
         public override void SaveToRegistry()
         {
             key.SetString("opapikey", apikey == null ? "" : apikey);
             key.SetString("ophostname", hostname);
             key.SetInt("opport", port);
+            key.SetBool("opusessl", usessl);
         }
 
 
@@ -589,5 +591,11 @@ protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
             get { return hostname; }
             set { hostname = value; OnPropertyChanged(new PropertyChangedEventArgs("Hostname")); }
         }
+
+        bool usessl = false; public bool UseSsl
+        {
+            get { return usessl; }
+            set { usessl = value; OnPropertyChanged(new PropertyChangedEventArgs("UseSsl")); }
+        }
     }
 }
diff --git a/OctoConnect/OctoConnect.csproj b/OctoConnect/OctoConnect.csproj
@@ -32,10 +32,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\..\..\Programs\Repetier-Host\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files\Repetier-Host\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="RepetierHostExtender">
-      <HintPath>..\..\..\..\..\..\Programs\Repetier-Host\RepetierHostExtender.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files\Repetier-Host\RepetierHostExtender.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -48,7 +48,7 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="websocket-sharp">
-      <HintPath>..\..\..\..\..\..\Programs\Repetier-Host\plugins\RepetierServerConnector\websocket-sharp.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files\Repetier-Host\plugins\RepetierServerConnector\websocket-sharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>