wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-11-10 16:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

make error reporting consistent

Browse Source
This commit is contained in:
Sergio R. Caprile committed 2026-10-16 15:59:20 -03:00
1 parent 5e4ae64e1b
commit 298ee549da
3 files changed
+40 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+20 -20
View File
@@ -2061,7 +2061,7 @@ static bool mg_dns_send(struct mg_connection *c, const struct mg_str *name,
bool mg_dnsc_init(struct mg_mgr *mgr, struct mg_dns *dnsc); bool mg_dnsc_init(struct mg_mgr *mgr, struct mg_dns *dnsc);
bool mg_dnsc_init(struct mg_mgr *mgr, struct mg_dns *dnsc) { bool mg_dnsc_init(struct mg_mgr *mgr, struct mg_dns *dnsc) {
if (dnsc->url == NULL) { if (dnsc->url == NULL) {
mg_error(0, "DNS server URL is NULL. Call mg_mgr_init()"); MG_ERROR(("DNS server URL is NULL. Call mg_mgr_init()"));
return false; return false;
} }
if (dnsc->c == NULL) { if (dnsc->c == NULL) {
@@ -17589,7 +17589,7 @@ static bool mg_tls_encrypt(struct mg_connection *c, const uint8_t *msg,
c->is_client ? tls->enc.client_write_iv : tls->enc.server_write_iv; c->is_client ? tls->enc.client_write_iv : tls->enc.server_write_iv;
if (msgsz > 16384) { if (msgsz > 16384) {
MG_ERROR(("msg longer than recordsz")); mg_error(c, "msg longer than recordsz");
return false; return false;
} }
@@ -18250,19 +18250,19 @@ static bool mg_tls_send_cert_verify(struct mg_connection *c, bool is_client) {
// Check bounds // Check bounds
if (emlen > sizeof(em) || verifysz > sizeof(verify)) { if (emlen > sizeof(em) || verifysz > sizeof(verify)) {
MG_ERROR(("RSA key too large for static buffers")); mg_error(c, "RSA key too large for static buffers");
return false; return false;
} }
if (!mg_tls_pss_encode(hash, sizeof(hash), &rn, em)) { if (!mg_tls_pss_encode(hash, sizeof(hash), &rn, em)) {
MG_ERROR(("Failed PSS encode")); mg_error(c, "Failed PSS encode");
return false; return false;
} }
// Validate PSS encoded message format // Validate PSS encoded message format
if (em[emlen - 1] != 0xbc) { if (em[emlen - 1] != 0xbc) {
MG_ERROR(("Invalid PSS encoding: last byte is 0x%02x, expected 0xbc", mg_error(c, "Invalid PSS encoding: last byte is 0x%02x, expected 0xbc",
em[emlen - 1])); em[emlen - 1]);
return false; return false;
} }
@@ -18275,7 +18275,7 @@ static bool mg_tls_send_cert_verify(struct mg_connection *c, bool is_client) {
// Sign directly into the verify buffer (verify + 8 = signature location) // Sign directly into the verify buffer (verify + 8 = signature location)
memset(verify + 8, 0, emlen); // Initialize signature area memset(verify + 8, 0, emlen); // Initialize signature area
if (!mg_tls_rsa_sign(tls, em, emlen, verify + 8)) { if (!mg_tls_rsa_sign(tls, em, emlen, verify + 8)) {
MG_ERROR(("Failed RSA sign")); mg_error(c, "Failed RSA sign");
return false; return false;
} }
@@ -18358,8 +18358,6 @@ static bool mg_tls_client_send_hello(struct mg_connection *c) {
struct tls_data *tls = (struct tls_data *) c->tls; struct tls_data *tls = (struct tls_data *) c->tls;
struct mg_iobuf *wio = &tls->send; struct mg_iobuf *wio = &tls->send;
uint8_t p256_pub[64]; // X || Y, sent as an uncompressed point 0x04 || X || Y
// - "signature algorithms we actually support", see above // - "signature algorithms we actually support", see above
// uint8_t secp256r1_sig_algs[] // uint8_t secp256r1_sig_algs[]
// - all popular signature algorithms (if we don't care about verification) // - all popular signature algorithms (if we don't care about verification)
@@ -18425,18 +18423,20 @@ static bool mg_tls_client_send_hello(struct mg_connection *c) {
MG_STORE_BE16(server_name_ext + 7, hostnamesz); MG_STORE_BE16(server_name_ext + 7, hostnamesz);
} }
// calculate keyshare // calc+fill keyshare; X || Y, sent as an uncompressed point 0x04 || X || Y
if (!mg_p256_make_key(p256_pub, tls->p256_cli)) { if (!mg_p256_make_key(msg_client_hello + 95, tls->p256_cli)) {
mg_error(c, "P-256 key"); mg_error(c, "P-256 key");
return false; // Do not send uninitialised p256_pub return false;
} }
// fill in the gaps: random + session ID + keyshare // fill in the gaps: random + session ID
if (!mg_random(tls->session_id, sizeof(tls->session_id))) mg_error(c, "RNG"); if (!mg_random(tls->session_id, sizeof(tls->session_id)) ||
if (!mg_random(tls->random, sizeof(tls->random))) mg_error(c, "RNG"); !mg_random(tls->random, sizeof(tls->random))) {
mg_error(c, "RNG");
return false;
}
memmove(msg_client_hello + 11, tls->random, sizeof(tls->random)); memmove(msg_client_hello + 11, tls->random, sizeof(tls->random));
memmove(msg_client_hello + 44, tls->session_id, sizeof(tls->session_id)); memmove(msg_client_hello + 44, tls->session_id, sizeof(tls->session_id));
memmove(msg_client_hello + 95, p256_pub, sizeof(p256_pub));
// client hello message // client hello message
if (mg_iobuf_add(wio, wio->len, msg_client_hello, sizeof(msg_client_hello)) == if (mg_iobuf_add(wio, wio->len, msg_client_hello, sizeof(msg_client_hello)) ==
@@ -19217,8 +19217,8 @@ static int mg_tls_recv_cert_verify(struct mg_connection *c) {
// 0809 = rsa_pss_pss_sha256 // 0809 = rsa_pss_pss_sha256
// 080A = rsa_pss_pss_sha384 // 080A = rsa_pss_pss_sha384
// 080B = rsa_pss_pss_sha512 // 080B = rsa_pss_pss_sha512
MG_ERROR(("unsupported certverify signature scheme: %x of %d bytes", mg_error(c, "unsupported certverify signature scheme: %x of %d bytes",
sigalg, siglen)); sigalg, siglen);
return -1; return -1;
} }
} }
@@ -19380,8 +19380,8 @@ void mg_tls_handshake(struct mg_connection *c) {
MG_DEBUG(("%lu TLS handshake done in %lu ms: %lu ms CPU, %lu ms peer wait", MG_DEBUG(("%lu TLS handshake done in %lu ms: %lu ms CPU, %lu ms peer wait",
c->id, total, cpu, total > cpu ? total - cpu : 0)); c->id, total, cpu, total > cpu ? total - cpu : 0));
} }
if (!res) { if (!res) { // already mg_error()ed at handshake helper ?
mg_error(c, "TLS OOM"); if (!c->is_closing) mg_error(c, "TLS OOM"); // No, do it
return; return;
} }
while (tls->send.len > 0 && while (tls->send.len > 0 &&
src/dns.c
+1 -1
View File
@@ -263,7 +263,7 @@ static bool mg_dns_send(struct mg_connection *c, const struct mg_str *name,
bool mg_dnsc_init(struct mg_mgr *mgr, struct mg_dns *dnsc); bool mg_dnsc_init(struct mg_mgr *mgr, struct mg_dns *dnsc);
bool mg_dnsc_init(struct mg_mgr *mgr, struct mg_dns *dnsc) { bool mg_dnsc_init(struct mg_mgr *mgr, struct mg_dns *dnsc) {
if (dnsc->url == NULL) { if (dnsc->url == NULL) {
mg_error(0, "DNS server URL is NULL. Call mg_mgr_init()"); MG_ERROR(("DNS server URL is NULL. Call mg_mgr_init()"));
return false; return false;
} }
if (dnsc->c == NULL) { if (dnsc->c == NULL) {
src/tls_builtin.c
+19 -19
View File
@@ -469,7 +469,7 @@ static bool mg_tls_encrypt(struct mg_connection *c, const uint8_t *msg,
c->is_client ? tls->enc.client_write_iv : tls->enc.server_write_iv; c->is_client ? tls->enc.client_write_iv : tls->enc.server_write_iv;
if (msgsz > 16384) { if (msgsz > 16384) {
MG_ERROR(("msg longer than recordsz")); mg_error(c, "msg longer than recordsz");
return false; return false;
} }
@@ -1130,19 +1130,19 @@ static bool mg_tls_send_cert_verify(struct mg_connection *c, bool is_client) {
// Check bounds // Check bounds
if (emlen > sizeof(em) || verifysz > sizeof(verify)) { if (emlen > sizeof(em) || verifysz > sizeof(verify)) {
MG_ERROR(("RSA key too large for static buffers")); mg_error(c, "RSA key too large for static buffers");
return false; return false;
} }
if (!mg_tls_pss_encode(hash, sizeof(hash), &rn, em)) { if (!mg_tls_pss_encode(hash, sizeof(hash), &rn, em)) {
MG_ERROR(("Failed PSS encode")); mg_error(c, "Failed PSS encode");
return false; return false;
} }
// Validate PSS encoded message format // Validate PSS encoded message format
if (em[emlen - 1] != 0xbc) { if (em[emlen - 1] != 0xbc) {
MG_ERROR(("Invalid PSS encoding: last byte is 0x%02x, expected 0xbc", mg_error(c, "Invalid PSS encoding: last byte is 0x%02x, expected 0xbc",
em[emlen - 1])); em[emlen - 1]);
return false; return false;
} }
@@ -1155,7 +1155,7 @@ static bool mg_tls_send_cert_verify(struct mg_connection *c, bool is_client) {
// Sign directly into the verify buffer (verify + 8 = signature location) // Sign directly into the verify buffer (verify + 8 = signature location)
memset(verify + 8, 0, emlen); // Initialize signature area memset(verify + 8, 0, emlen); // Initialize signature area
if (!mg_tls_rsa_sign(tls, em, emlen, verify + 8)) { if (!mg_tls_rsa_sign(tls, em, emlen, verify + 8)) {
MG_ERROR(("Failed RSA sign")); mg_error(c, "Failed RSA sign");
return false; return false;
} }
@@ -1238,8 +1238,6 @@ static bool mg_tls_client_send_hello(struct mg_connection *c) {
struct tls_data *tls = (struct tls_data *) c->tls; struct tls_data *tls = (struct tls_data *) c->tls;
struct mg_iobuf *wio = &tls->send; struct mg_iobuf *wio = &tls->send;
uint8_t p256_pub[64]; // X || Y, sent as an uncompressed point 0x04 || X || Y
// - "signature algorithms we actually support", see above // - "signature algorithms we actually support", see above
// uint8_t secp256r1_sig_algs[] // uint8_t secp256r1_sig_algs[]
// - all popular signature algorithms (if we don't care about verification) // - all popular signature algorithms (if we don't care about verification)
@@ -1305,18 +1303,20 @@ static bool mg_tls_client_send_hello(struct mg_connection *c) {
MG_STORE_BE16(server_name_ext + 7, hostnamesz); MG_STORE_BE16(server_name_ext + 7, hostnamesz);
} }
// calculate keyshare // calc+fill keyshare; X || Y, sent as an uncompressed point 0x04 || X || Y
if (!mg_p256_make_key(p256_pub, tls->p256_cli)) { if (!mg_p256_make_key(msg_client_hello + 95, tls->p256_cli)) {
mg_error(c, "P-256 key"); mg_error(c, "P-256 key");
return false; // Do not send uninitialised p256_pub return false;
} }
// fill in the gaps: random + session ID + keyshare // fill in the gaps: random + session ID
if (!mg_random(tls->session_id, sizeof(tls->session_id))) mg_error(c, "RNG"); if (!mg_random(tls->session_id, sizeof(tls->session_id)) ||
if (!mg_random(tls->random, sizeof(tls->random))) mg_error(c, "RNG"); !mg_random(tls->random, sizeof(tls->random))) {
mg_error(c, "RNG");
return false;
}
memmove(msg_client_hello + 11, tls->random, sizeof(tls->random)); memmove(msg_client_hello + 11, tls->random, sizeof(tls->random));
memmove(msg_client_hello + 44, tls->session_id, sizeof(tls->session_id)); memmove(msg_client_hello + 44, tls->session_id, sizeof(tls->session_id));
memmove(msg_client_hello + 95, p256_pub, sizeof(p256_pub));
// client hello message // client hello message
if (mg_iobuf_add(wio, wio->len, msg_client_hello, sizeof(msg_client_hello)) == if (mg_iobuf_add(wio, wio->len, msg_client_hello, sizeof(msg_client_hello)) ==
@@ -2097,8 +2097,8 @@ static int mg_tls_recv_cert_verify(struct mg_connection *c) {
// 0809 = rsa_pss_pss_sha256 // 0809 = rsa_pss_pss_sha256
// 080A = rsa_pss_pss_sha384 // 080A = rsa_pss_pss_sha384
// 080B = rsa_pss_pss_sha512 // 080B = rsa_pss_pss_sha512
MG_ERROR(("unsupported certverify signature scheme: %x of %d bytes", mg_error(c, "unsupported certverify signature scheme: %x of %d bytes",
sigalg, siglen)); sigalg, siglen);
return -1; return -1;
} }
} }
@@ -2260,8 +2260,8 @@ void mg_tls_handshake(struct mg_connection *c) {
MG_DEBUG(("%lu TLS handshake done in %lu ms: %lu ms CPU, %lu ms peer wait", MG_DEBUG(("%lu TLS handshake done in %lu ms: %lu ms CPU, %lu ms peer wait",
c->id, total, cpu, total > cpu ? total - cpu : 0)); c->id, total, cpu, total > cpu ? total - cpu : 0));
} }
if (!res) { if (!res) { // already mg_error()ed at handshake helper ?
mg_error(c, "TLS OOM"); if (!c->is_closing) mg_error(c, "TLS OOM"); // No, do it
return; return;
} }
while (tls->send.len > 0 && while (tls->send.len > 0 &&