Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add VM cert and URL switch #526

Closed
wants to merge 5 commits into from
Closed

Add VM cert and URL switch #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d63d41d
Add VM cert and URL switch
tyeth Jan 5, 2024
775ed42
Add VM URL+Cert for Pico
tyeth Jan 5, 2024
0271645
Allow override of url for M4
tyeth Jan 5, 2024
b0b181f
Switch to non-ssl MQTT for m4 on VM
tyeth Jan 5, 2024
cdd7255
Report port+URL in debug mode
tyeth Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Wippersnapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2420,6 +2420,12 @@ void Wippersnapper::runNetFSM() {
if (WS._ui_helper->getLoadingState())
WS._ui_helper->set_label_status("Connecting to IO...");
#endif
WS_DEBUG_PRINT("IO Address: ");
WS_DEBUG_PRINT(WS._mqttBrokerURL);
WS_DEBUG_PRINT(":");
WS_DEBUG_PRINTLN(WS._mqtt_port);
WS_PRINTER.flush();

WS._mqtt->setKeepAliveInterval(WS_KEEPALIVE_INTERVAL_MS / 1000);
// Attempt to connect
maxAttempts = 5;
Expand Down
43 changes: 40 additions & 3 deletions src/network_interfaces/Wippersnapper_ESP32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,22 @@ class Wippersnapper_ESP32 : public Wippersnapper {
*/
/********************************************************/
void setupMQTTClient(const char *clientID) {
u_int16_t port = 8883;
if (WS._mqttBrokerURL == nullptr) {
WS._mqttBrokerURL = "io.adafruit.com";
_mqtt_client->setCACert(_aio_root_ca_prod);
} else {
} else if (WS._mqttBrokerURL == "io.adafruit.vm"){
// Set port to 1883 for non-ssl, or set SSL cert below
//port = 1883;
_mqtt_client->setCACert(_aio_root_ca_vm);
} else if (WS._mqttBrokerURL == "io.adafruit.us") {
_mqtt_client->setCACert(_aio_root_ca_staging);
} else {
// Assume non-ssl IP based testing
port = 1883;
}
// Construct MQTT client
WS._mqtt = new Adafruit_MQTT_Client(_mqtt_client, WS._mqttBrokerURL, 8883,
WS._mqtt = new Adafruit_MQTT_Client(_mqtt_client, WS._mqttBrokerURL, port,
clientID, WS._username, WS._key);
}

Expand Down Expand Up @@ -246,6 +254,35 @@ class Wippersnapper_ESP32 : public Wippersnapper {
"7h4SeM6Y8l/7MBRpPCz6l8Y=\n"
"-----END CERTIFICATE-----\n"; ///< Root certificate for io.adafruit.com

const char *_aio_root_ca_vm =
"-----BEGIN CERTIFICATE-----\n"
"MIIEZTCCAs2gAwIBAgIQek/t0uNiCDR9fE8Rm5Np3DANBgkqhkiG9w0BAQsFADCB\n"
"lzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMTYwNAYDVQQLDC10eWV0\n"
"aEBUeWV0aHMtTWFjQm9vay1Qcm8ubG9jYWwgKFR5ZXRoIEd1bmRyeSkxPTA7BgNV\n"
"BAMMNG1rY2VydCB0eWV0aEBUeWV0aHMtTWFjQm9vay1Qcm8ubG9jYWwgKFR5ZXRo\n"
"IEd1bmRyeSkwHhcNMjMxMjE1MTM1MzQ1WhcNMjYwMzE1MTM1MzQ0WjBhMScwJQYD\n"
"VQQKEx5ta2NlcnQgZGV2ZWxvcG1lbnQgY2VydGlmaWNhdGUxNjA0BgNVBAsMLXR5\n"
"ZXRoQFR5ZXRocy1NYWNCb29rLVByby5sb2NhbCAoVHlldGggR3VuZHJ5KTCCASIw\n"
"DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKppU4wb6XV8Ac1pxj91NDZ+s3Yd\n"
"AgSq/RqLZzjamoIAObOuc/tXJaDnqpHboS9+STO0+jg9Mx5Lz9qUBC0jiBHJX2SF\n"
"HN4Qea4Vub9KaeK2clRZO6Xmm+Hhcr0jhWDZZTXhyFg6g5/KJ61U5KjQiUr/kY7r\n"
"tZPoRDcQvfLS5xX+qznqH6aHH7n0WNsSF6OUzbOxCcueOBpYLVFmf4aoNAfxYUEI\n"
"K8gDVYoAszE1yp9ii0fsLZ6IT9Gko6aIZ4ovBstC07yZ9E2tfhHzUJvSbi/vTudm\n"
"Q/aQQKT/0zSstjx8nFXrvgqnDbkJ0uwdky7roldEyC4jZHhu/FsMrT2rxkkCAwEA\n"
"AaNiMGAwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB8GA1Ud\n"
"IwQYMBaAFAG/zRoUGs2SLwCskpRk49ZDuG70MBgGA1UdEQQRMA+CDSouYWRhZnJ1\n"
"aXQudm0wDQYJKoZIhvcNAQELBQADggGBAAOroe4O3IqZZ8d+cuXGMnv6LsBAmKHn\n"
"JnwxyCi6pmWNaexDZ0KIj9d5MIAA1f48YJUVGX7Y0H9YPNUeqv3pS6JvbWUj59kl\n"
"oUj6uAZQgConA6vPJkm/pMTktnBWYYF68gCvTZRhtH7qXuTKL21X1/6l5cTOLijs\n"
"mVq/ERZadHiogCxA+5c3QINNbev4xsf/pmw/ap3vfAnsyHneWKKCbi63jtGhbn4g\n"
"SCoJsvH35i4hWXr9ddbW3Kfa01JhwsONryUtRN4SGi58lIRT07e9qciLAqxH+7Ka\n"
"EE3eNOX61QOxbVMfJAeMPEMuG8iuqEtalXb+Dheosapac3irPpHIt47leLsVL5Le\n"
"TeTUPhirSlJj35C6Xi2OfI5jCAvM62HV7AYjyimQttunLr24qwU4LqgM3i9ZUaPj\n"
"ovBjEvjjy1vp0wKeS4Q8nUtZvwc5LgWW4ZH7KSTHS/adFU6qWOyPHwxxTjdSxhMB\n"
"Sl3erUxbD7UgyDQQonzUBDI6I/lBnY58eQ==\n"
"-----END CERTIFICATE-----\n";


/**************************************************************************/
/*!
@brief Establishes a connection with the wireless network.
Expand All @@ -255,7 +292,7 @@ class Wippersnapper_ESP32 : public Wippersnapper {

if (WiFi.status() == WL_CONNECTED)
return;

if (strlen(_ssid) == 0) {
_status = WS_SSID_INVALID;
} else {
Expand Down
14 changes: 10 additions & 4 deletions src/network_interfaces/Wippersnapper_WIFININA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class Wippersnapper_WIFININA : public Wippersnapper {

_wifi = &SPIWIFI;
_mqtt_client = new WiFiSSLClient;
WS._mqttBrokerURL = "io.adafruit.com";
// WS._mqttBrokerURL = "io.adafruit.com";
}

/**************************************************************************/
Expand Down Expand Up @@ -193,9 +193,15 @@ class Wippersnapper_WIFININA : public Wippersnapper {
*/
/********************************************************/
void setupMQTTClient(const char *clientID) {
WS._mqtt =
new Adafruit_MQTT_Client(_mqtt_client, WS._mqttBrokerURL, WS._mqtt_port,
clientID, WS._username, WS._key);
u_int16_t port = 8883;
if (WS._mqttBrokerURL == nullptr) {
WS._mqttBrokerURL = "io.adafruit.com";
} else if (WS._mqttBrokerURL == "io.adafruit.vm"){
port = 1883;
}
// Construct MQTT client
WS._mqtt = new Adafruit_MQTT_Client(_mqtt_client, WS._mqttBrokerURL, port,
clientID, WS._username, WS._key);
}

/********************************************************/
Expand Down
47 changes: 41 additions & 6 deletions src/network_interfaces/ws_networking_pico.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* please support Adafruit and open-source hardware by purchasing
* products from Adafruit!
*
* Copyright (c) Brent Rubell 2023 for Adafruit Industries.
* Copyright (c) Brent Rubell 2022 for Adafruit Industries.
*
* MIT license, all text here must be included in any redistribution.
*
Expand Down Expand Up @@ -145,16 +145,23 @@ class ws_networking_pico : public Wippersnapper {
*/
/********************************************************/
void setupMQTTClient(const char *clientID) {
u_int16_t port = 8883;
if (WS._mqttBrokerURL == nullptr) {
WS._mqttBrokerURL = "io.adafruit.com";
_mqtt_client->setCACert(_aio_root_ca_prod);
} else {
} else if (WS._mqttBrokerURL == "io.adafruit.vm"){
// Set port to 1883 for non-ssl, or set SSL cert below
//port = 1883;
_mqtt_client->setCACert(_aio_root_ca_vm);
} else if (WS._mqttBrokerURL == "io.adafruit.us") {
_mqtt_client->setCACert(_aio_root_ca_staging);
} else {
// Assume non-ssl IP based testing
port = 1883;
}

WS._mqtt =
new Adafruit_MQTT_Client(_mqtt_client, WS._mqttBrokerURL, WS._mqtt_port,
clientID, WS._username, WS._key);
// Construct MQTT client
WS._mqtt = new Adafruit_MQTT_Client(_mqtt_client, WS._mqttBrokerURL, port,
clientID, WS._username, WS._key);
}

/********************************************************/
Expand Down Expand Up @@ -247,6 +254,34 @@ class ws_networking_pico : public Wippersnapper {
"7h4SeM6Y8l/7MBRpPCz6l8Y=\n"
"-----END CERTIFICATE-----\n"; ///< Root certificate for io.adafruit.com

const char *_aio_root_ca_vm =
"-----BEGIN CERTIFICATE-----\n"
"MIIEZTCCAs2gAwIBAgIQek/t0uNiCDR9fE8Rm5Np3DANBgkqhkiG9w0BAQsFADCB\n"
"lzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMTYwNAYDVQQLDC10eWV0\n"
"aEBUeWV0aHMtTWFjQm9vay1Qcm8ubG9jYWwgKFR5ZXRoIEd1bmRyeSkxPTA7BgNV\n"
"BAMMNG1rY2VydCB0eWV0aEBUeWV0aHMtTWFjQm9vay1Qcm8ubG9jYWwgKFR5ZXRo\n"
"IEd1bmRyeSkwHhcNMjMxMjE1MTM1MzQ1WhcNMjYwMzE1MTM1MzQ0WjBhMScwJQYD\n"
"VQQKEx5ta2NlcnQgZGV2ZWxvcG1lbnQgY2VydGlmaWNhdGUxNjA0BgNVBAsMLXR5\n"
"ZXRoQFR5ZXRocy1NYWNCb29rLVByby5sb2NhbCAoVHlldGggR3VuZHJ5KTCCASIw\n"
"DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKppU4wb6XV8Ac1pxj91NDZ+s3Yd\n"
"AgSq/RqLZzjamoIAObOuc/tXJaDnqpHboS9+STO0+jg9Mx5Lz9qUBC0jiBHJX2SF\n"
"HN4Qea4Vub9KaeK2clRZO6Xmm+Hhcr0jhWDZZTXhyFg6g5/KJ61U5KjQiUr/kY7r\n"
"tZPoRDcQvfLS5xX+qznqH6aHH7n0WNsSF6OUzbOxCcueOBpYLVFmf4aoNAfxYUEI\n"
"K8gDVYoAszE1yp9ii0fsLZ6IT9Gko6aIZ4ovBstC07yZ9E2tfhHzUJvSbi/vTudm\n"
"Q/aQQKT/0zSstjx8nFXrvgqnDbkJ0uwdky7roldEyC4jZHhu/FsMrT2rxkkCAwEA\n"
"AaNiMGAwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB8GA1Ud\n"
"IwQYMBaAFAG/zRoUGs2SLwCskpRk49ZDuG70MBgGA1UdEQQRMA+CDSouYWRhZnJ1\n"
"aXQudm0wDQYJKoZIhvcNAQELBQADggGBAAOroe4O3IqZZ8d+cuXGMnv6LsBAmKHn\n"
"JnwxyCi6pmWNaexDZ0KIj9d5MIAA1f48YJUVGX7Y0H9YPNUeqv3pS6JvbWUj59kl\n"
"oUj6uAZQgConA6vPJkm/pMTktnBWYYF68gCvTZRhtH7qXuTKL21X1/6l5cTOLijs\n"
"mVq/ERZadHiogCxA+5c3QINNbev4xsf/pmw/ap3vfAnsyHneWKKCbi63jtGhbn4g\n"
"SCoJsvH35i4hWXr9ddbW3Kfa01JhwsONryUtRN4SGi58lIRT07e9qciLAqxH+7Ka\n"
"EE3eNOX61QOxbVMfJAeMPEMuG8iuqEtalXb+Dheosapac3irPpHIt47leLsVL5Le\n"
"TeTUPhirSlJj35C6Xi2OfI5jCAvM62HV7AYjyimQttunLr24qwU4LqgM3i9ZUaPj\n"
"ovBjEvjjy1vp0wKeS4Q8nUtZvwc5LgWW4ZH7KSTHS/adFU6qWOyPHwxxTjdSxhMB\n"
"Sl3erUxbD7UgyDQQonzUBDI6I/lBnY58eQ==\n"
"-----END CERTIFICATE-----\n";

/**************************************************************************/
/*!
@brief Establishes a connection with the wireless network.
Expand Down
Loading