Refactor JWTHelper and MQTTBridge for improved efficiency and clarity
- Removed unnecessary debug logging in JWTHelper to streamline token creation process. - Simplified JWT token creation logic in MQTTBridge, deferring token generation until WiFi is connected and NTP is synced. - Introduced a flag for pending NTP sync in MQTTBridge to manage synchronization more effectively. - Enhanced error handling and logging for token creation and connection management in MQTTBridge.
This commit is contained in:
1 parent
98f176c730
commit
e754317ceb
3 files changed
+195
-509
No files matched your search
+11
-94
@@ -19,10 +19,7 @@ bool JWTHelper::createAuthToken(
|
||||
const char* client,
|
||||
const char* email
|
||||
) {
|
||||
Serial.printf("JWTHelper: Starting JWT creation for audience: %s\n", audience);
|
||||
|
||||
if (!audience || !token || tokenSize == 0) {
|
||||
Serial.printf("JWTHelper: Invalid parameters - audience: %p, token: %p, tokenSize: %d\n", audience, token, (int)tokenSize);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -30,117 +27,73 @@ bool JWTHelper::createAuthToken(
|
||||
if (issuedAt == 0) {
|
||||
issuedAt = time(nullptr);
|
||||
}
|
||||
Serial.printf("JWTHelper: Using issuedAt: %lu\n", issuedAt);
|
||||
|
||||
// Create header
|
||||
char header[256];
|
||||
size_t headerLen = createHeader(header, sizeof(header));
|
||||
if (headerLen == 0) {
|
||||
Serial.printf("JWTHelper: Failed to create header\n");
|
||||
return false;
|
||||
}
|
||||
Serial.printf("JWTHelper: Header created, length: %d\n", (int)headerLen);
|
||||
Serial.printf("JWTHelper: Header: %s\n", header);
|
||||
|
||||
// Get public key as UPPERCASE HEX string (not base64!)
|
||||
char publicKeyHex[65]; // 32 bytes * 2 + null terminator
|
||||
// Get public key as UPPERCASE HEX string
|
||||
char publicKeyHex[65];
|
||||
mesh::Utils::toHex(publicKeyHex, identity.pub_key, PUB_KEY_SIZE);
|
||||
|
||||
// Convert to uppercase
|
||||
for (int i = 0; publicKeyHex[i]; i++) {
|
||||
publicKeyHex[i] = toupper(publicKeyHex[i]);
|
||||
}
|
||||
|
||||
Serial.printf("JWTHelper: Public key hex: %s (length: %d)\n", publicKeyHex, (int)strlen(publicKeyHex));
|
||||
|
||||
// Create payload with HEX public key (not base64!)
|
||||
// Create payload
|
||||
char payload[512];
|
||||
size_t payloadLen = createPayload(publicKeyHex, audience, issuedAt, expiresIn, payload, sizeof(payload), owner, client, email);
|
||||
if (payloadLen == 0) {
|
||||
Serial.printf("JWTHelper: Failed to create payload\n");
|
||||
return false;
|
||||
}
|
||||
Serial.printf("JWTHelper: Payload created, length: %d\n", (int)payloadLen);
|
||||
Serial.printf("JWTHelper: Payload: %s\n", payload);
|
||||
|
||||
// Create signing input: header.payload
|
||||
char signingInput[768];
|
||||
size_t signingInputLen = headerLen + 1 + payloadLen;
|
||||
if (signingInputLen >= sizeof(signingInput)) {
|
||||
Serial.printf("JWTHelper: Signing input too large: %d >= %d\n", (int)signingInputLen, (int)sizeof(signingInput));
|
||||
return false;
|
||||
}
|
||||
|
||||
memcpy(signingInput, header, headerLen);
|
||||
signingInput[headerLen] = '.';
|
||||
memcpy(signingInput + headerLen + 1, payload, payloadLen);
|
||||
Serial.printf("JWTHelper: Signing input created, length: %d\n", (int)signingInputLen);
|
||||
|
||||
// Sign the data using direct Ed25519 signing
|
||||
uint8_t signature[64];
|
||||
|
||||
// Create a non-const copy of the identity to access writeTo method
|
||||
mesh::LocalIdentity identity_copy = identity;
|
||||
|
||||
// Export the private and public keys using the writeTo method
|
||||
uint8_t export_buffer[96]; // PRV_KEY_SIZE + PUB_KEY_SIZE = 64 + 32 = 96 bytes
|
||||
uint8_t export_buffer[96];
|
||||
size_t exported_size = identity_copy.writeTo(export_buffer, sizeof(export_buffer));
|
||||
|
||||
if (exported_size != 96) {
|
||||
Serial.printf("JWTHelper: Failed to export keys, got %d bytes instead of 96\n", (int)exported_size);
|
||||
return false;
|
||||
}
|
||||
|
||||
// The first 64 bytes are the private key, next 32 bytes are the public key
|
||||
uint8_t* private_key = export_buffer; // First 64 bytes
|
||||
uint8_t* public_key = export_buffer + 64; // Next 32 bytes
|
||||
uint8_t* private_key = export_buffer;
|
||||
uint8_t* public_key = export_buffer + 64;
|
||||
|
||||
Serial.printf("JWTHelper: Using direct Ed25519 signing\n");
|
||||
Serial.printf("JWTHelper: Private key length: %d, Public key length: %d\n", 64, 32);
|
||||
|
||||
// Use direct Ed25519 signing
|
||||
ed25519_sign(signature, (const unsigned char*)signingInput, signingInputLen, public_key, private_key);
|
||||
Serial.printf("JWTHelper: Signature created using direct Ed25519\n");
|
||||
|
||||
// Verify the signature locally
|
||||
int verify_result = ed25519_verify(signature, (const unsigned char*)signingInput, signingInputLen, public_key);
|
||||
Serial.printf("JWTHelper: Signature verification result: %d (should be 1 for valid)\n", verify_result);
|
||||
|
||||
if (verify_result != 1) {
|
||||
Serial.println("JWTHelper: ERROR - Signature verification failed!");
|
||||
Serial.println("JWTHelper: Signature verification failed!");
|
||||
return false;
|
||||
}
|
||||
|
||||
// Log the exact signing input
|
||||
Serial.printf("JWTHelper: Signing input: %s\n", signingInput);
|
||||
Serial.printf("JWTHelper: Signing input hex: ");
|
||||
for (size_t i = 0; i < signingInputLen; i++) {
|
||||
Serial.printf("%02x", signingInput[i]);
|
||||
}
|
||||
Serial.println();
|
||||
|
||||
// Log the signature
|
||||
Serial.printf("JWTHelper: Signature hex: ");
|
||||
for (int i = 0; i < 64; i++) {
|
||||
Serial.printf("%02x", signature[i]);
|
||||
}
|
||||
Serial.println();
|
||||
|
||||
// Convert signature to hex (MeshCore Decoder expects hex, not base64url)
|
||||
char signatureHex[129]; // 64 bytes * 2 + null terminator
|
||||
// Convert signature to hex
|
||||
char signatureHex[129];
|
||||
for (int i = 0; i < 64; i++) {
|
||||
sprintf(signatureHex + (i * 2), "%02X", signature[i]);
|
||||
}
|
||||
signatureHex[128] = '\0';
|
||||
|
||||
Serial.printf("JWTHelper: Signature converted to hex, length: %d\n", (int)strlen(signatureHex));
|
||||
Serial.printf("JWTHelper: Signature Hex: %s\n", signatureHex);
|
||||
|
||||
// Create final token: header.payload.signatureHex (MeshCore Decoder format)
|
||||
size_t sigHexLen = strlen(signatureHex);
|
||||
size_t totalLen = headerLen + 1 + payloadLen + 1 + sigHexLen;
|
||||
if (totalLen >= tokenSize) {
|
||||
Serial.printf("JWTHelper: Token too large: %d >= %d\n", (int)totalLen, (int)tokenSize);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -151,16 +104,11 @@ bool JWTHelper::createAuthToken(
|
||||
memcpy(token + headerLen + 1 + payloadLen + 1, signatureHex, sigHexLen);
|
||||
token[totalLen] = '\0';
|
||||
|
||||
Serial.printf("JWTHelper: JWT token created successfully, total length: %d\n", (int)totalLen);
|
||||
Serial.printf("JWTHelper: JWT Token: %s\n", token);
|
||||
return true;
|
||||
}
|
||||
|
||||
size_t JWTHelper::base64UrlEncode(const uint8_t* input, size_t inputLen, char* output, size_t outputSize) {
|
||||
Serial.printf("JWTHelper: base64UrlEncode called with inputLen: %d, outputSize: %d\n", (int)inputLen, (int)outputSize);
|
||||
|
||||
if (!input || !output || outputSize == 0) {
|
||||
Serial.printf("JWTHelper: base64UrlEncode invalid parameters\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -168,12 +116,9 @@ size_t JWTHelper::base64UrlEncode(const uint8_t* input, size_t inputLen, char* o
|
||||
int ret = mbedtls_base64_encode((unsigned char*)output, outputSize - 1, &outlen, input, inputLen);
|
||||
|
||||
if (ret != 0) {
|
||||
Serial.printf("JWTHelper: mbedtls_base64_encode failed with error: %d\n", ret);
|
||||
return 0;
|
||||
}
|
||||
|
||||
Serial.printf("JWTHelper: mbedtls_base64_encode result: %s (outlen: %d)\n", output, (int)outlen);
|
||||
|
||||
// Convert to base64 URL format in-place (replace + with -, / with _, remove padding =)
|
||||
for (size_t i = 0; i < outlen; i++) {
|
||||
if (output[i] == '+') {
|
||||
@@ -188,31 +133,22 @@ size_t JWTHelper::base64UrlEncode(const uint8_t* input, size_t inputLen, char* o
|
||||
outlen--;
|
||||
}
|
||||
output[outlen] = '\0';
|
||||
Serial.printf("JWTHelper: base64UrlEncode completed, outputLen: %d\n", (int)outlen);
|
||||
return outlen;
|
||||
}
|
||||
|
||||
size_t JWTHelper::createHeader(char* output, size_t outputSize) {
|
||||
Serial.printf("JWTHelper: createHeader called with outputSize: %d\n", (int)outputSize);
|
||||
|
||||
// Create JWT header: {"alg":"Ed25519","typ":"JWT"}
|
||||
DynamicJsonDocument doc(256);
|
||||
doc["alg"] = "Ed25519";
|
||||
doc["typ"] = "JWT";
|
||||
|
||||
// Use temporary buffer for JSON
|
||||
char jsonBuffer[256];
|
||||
size_t len = serializeJson(doc, jsonBuffer, sizeof(jsonBuffer));
|
||||
Serial.printf("JWTHelper: JSON serialized, length: %d\n", (int)len);
|
||||
if (len == 0 || len >= sizeof(jsonBuffer)) {
|
||||
Serial.printf("JWTHelper: JSON serialization failed or too large\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Base64 URL encode from temporary buffer to output
|
||||
size_t encodedLen = base64UrlEncode((uint8_t*)jsonBuffer, len, output, outputSize);
|
||||
Serial.printf("JWTHelper: Header base64 encoded, length: %d\n", (int)encodedLen);
|
||||
return encodedLen;
|
||||
return base64UrlEncode((uint8_t*)jsonBuffer, len, output, outputSize);
|
||||
}
|
||||
|
||||
size_t JWTHelper::createPayload(
|
||||
@@ -226,19 +162,6 @@ size_t JWTHelper::createPayload(
|
||||
const char* client,
|
||||
const char* email
|
||||
) {
|
||||
Serial.printf("JWTHelper: createPayload called with outputSize: %d\n", (int)outputSize);
|
||||
Serial.printf("JWTHelper: publicKey: %s, audience: %s, issuedAt: %lu, expiresIn: %lu\n",
|
||||
publicKey, audience, issuedAt, expiresIn);
|
||||
if (owner) {
|
||||
Serial.printf("JWTHelper: owner: %s\n", owner);
|
||||
}
|
||||
if (client) {
|
||||
Serial.printf("JWTHelper: client: %s\n", client);
|
||||
}
|
||||
if (email) {
|
||||
Serial.printf("JWTHelper: email: %s\n", email);
|
||||
}
|
||||
|
||||
// Create JWT payload
|
||||
DynamicJsonDocument doc(512);
|
||||
doc["publicKey"] = publicKey;
|
||||
@@ -264,18 +187,12 @@ size_t JWTHelper::createPayload(
|
||||
doc["email"] = email;
|
||||
}
|
||||
|
||||
// Use temporary buffer for JSON
|
||||
char jsonBuffer[512];
|
||||
size_t len = serializeJson(doc, jsonBuffer, sizeof(jsonBuffer));
|
||||
Serial.printf("JWTHelper: Payload JSON serialized, length: %d\n", (int)len);
|
||||
if (len == 0 || len >= sizeof(jsonBuffer)) {
|
||||
Serial.printf("JWTHelper: Payload JSON serialization failed or too large\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Base64 URL encode from temporary buffer to output
|
||||
size_t encodedLen = base64UrlEncode((uint8_t*)jsonBuffer, len, output, outputSize);
|
||||
Serial.printf("JWTHelper: Payload base64 encoded, length: %d\n", (int)encodedLen);
|
||||
return encodedLen;
|
||||
return base64UrlEncode((uint8_t*)jsonBuffer, len, output, outputSize);
|
||||
}
|
||||
|
||||
+183
-415
File diff suppressed because it is too large.
Load diff
@@ -106,6 +106,7 @@ private:
|
||||
NTPClient _ntp_client;
|
||||
unsigned long _last_ntp_sync;
|
||||
bool _ntp_synced;
|
||||
bool _ntp_sync_pending; // Flag to trigger NTP sync from loop() instead of event handler
|
||||
|
||||
// Timezone handling
|
||||
Timezone* _timezone;
|
||||
|
||||
Reference in new issue
Block a user