pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 05:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Many attempts to get websocket to talk secure

Browse Source
This commit is contained in:
hvolmer
2020-03-27 19:00:10 -06:00
parent 7f475c1716
commit 85c961e3cc
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
PepperDashEssentials/AppServer/MobileControlSystemController.cs
View File

@@ -278,9 +278,13 @@ namespace PepperDash.Essentials
var req = new HttpsClientRequest(); var req = new HttpsClientRequest();
req.Url.Parse(url); req.Url.Parse(url);
var c = new HttpsClient(); var c = new HttpsClient();
Debug.Console(0, " host and peer verification disabled"); Debug.Console(0, " host and peer verification disabled");
c.HostVerification = false; c.HostVerification = false;
c.PeerVerification = false; c.PeerVerification = false;
c.Verbose = true;
c.DispatchAsync(req, (r, e) => c.DispatchAsync(req, (r, e) =>
{ {
if (e == HTTPS_CALLBACK_ERROR.COMPLETED) if (e == HTTPS_CALLBACK_ERROR.COMPLETED)
@@ -304,27 +308,18 @@ namespace PepperDash.Essentials
} }
else else
{ {
if (r.Code == 301) Debug.Console(0, "https authorization failed, code {0}: {1}", r.Code, r.ContentString);
{
var newUrl = r.Header.GetHeaderValue("Location");
var newHostValue = newUrl.Substring(0, newUrl.IndexOf(path));
Debug.Console(0, this, "ERROR: Mobile control API has moved. Please adjust configuration to \"{0}\"", newHostValue);
}
else
{
Debug.Console(0, "http authorization failed, code {0}: {1}", r.Code, r.ContentString);
}
} }
} }
else else
{ {
if (r != null) if (r != null)
{ {
Debug.Console(0, this, "Error in http authorization (A) {0}: {1}", r.Code, e); Debug.Console(0, this, "Error in https authorization (A) {0}: {1}", r.Code, e);
} }
else else
{ {
Debug.Console(0, this, "Error in http authorization (B) {0}", e); Debug.Console(0, this, "Error in https authorization (B) {0}", e);
} }
} }
}); });
@@ -445,7 +440,6 @@ namespace PepperDash.Essentials
void ConnectWebsocketClient() void ConnectWebsocketClient()
{ {
Debug.Console(1, this, "Initializing Stream client to server.");
if (WSClient != null) if (WSClient != null)
{ {
@@ -454,7 +448,15 @@ namespace PepperDash.Essentials
} }
WSClient = new WebSocketClient(); WSClient = new WebSocketClient();
WSClient.URL = string.Format("wss://{0}/system/join/{1}", Config.ServerUrl, this.SystemUuid); var wsHost = Host.Replace("http", "ws");
WSClient.URL = string.Format("{0}/system/join/{1}", wsHost, this.SystemUuid);
Debug.Console(1, this, "Initializing mobile control client to {0}", WSClient.URL);
if(wsHost.StartsWith("wss"))
{
WSClient.SSL = true;
Debug.Console(0, this, "Using secure websocket, cert verification disabled");
WSClient.VerifyServerCertificate = false;
}
WSClient.ConnectionCallBack = Websocket_ConnectCallback; WSClient.ConnectionCallBack = Websocket_ConnectCallback;
WSClient.ConnectAsync(); WSClient.ConnectAsync();
} }
@@ -481,6 +483,7 @@ namespace PepperDash.Essentials
} }
else else
{ {
Debug.Console(1, this, "Websocket protocol: {0}", WSClient.Protocol);
if (code == WebSocketClient.WEBSOCKET_RESULT_CODES.WEBSOCKET_CLIENT_HTTP_HANDSHAKE_TOKEN_ERROR) if (code == WebSocketClient.WEBSOCKET_RESULT_CODES.WEBSOCKET_CLIENT_HTTP_HANDSHAKE_TOKEN_ERROR)
{ {
// This is the case when app server is running behind a websever and app server is down // This is the case when app server is running behind a websever and app server is down