mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-19 19:40:56 +00:00
close connection on bad CA or missing server cert for builtin TLS
This commit is contained in:
1 parent
c77e578a19
commit
65d15bb002
3 files changed
+17
-10
No files matched your search
+7
-3
@@ -21164,15 +21164,19 @@ void mg_tls_init(struct mg_connection *c, const struct mg_tls_opts *opts) {
|
|||||||
mg_free(all_certs);
|
mg_free(all_certs);
|
||||||
} else { // parse again for a possible DER (or a truncated begin string)
|
} else { // parse again for a possible DER (or a truncated begin string)
|
||||||
if (mg_parse_pem(opts->ca, mg_str_s("CERTIFICATE"), &tls->ca_der) < 0) {
|
if (mg_parse_pem(opts->ca, mg_str_s("CERTIFICATE"), &tls->ca_der) < 0) {
|
||||||
MG_ERROR(("Failed to load CA certificate"));
|
mg_error(c, "Failed to load CA certificate");
|
||||||
goto xit;
|
return;
|
||||||
}
|
}
|
||||||
} // ca_bundle_len != 0 && ca_der.len = 0 => bundle
|
} // ca_bundle_len != 0 && ca_der.len = 0 => bundle
|
||||||
if (!c->is_client) tls->is_twoway = true; // server + CA: two-way auth
|
if (!c->is_client) tls->is_twoway = true; // server + CA: two-way auth
|
||||||
}
|
}
|
||||||
|
|
||||||
if (opts->cert.buf == NULL || opts->cert.len == 0) {
|
if (opts->cert.buf == NULL || opts->cert.len == 0) {
|
||||||
MG_VERBOSE(("No certificate provided"));
|
if (!c->is_client) {
|
||||||
|
mg_error(c, "No server certificate provided");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
MG_VERBOSE(("No client certificate provided"));
|
||||||
goto xit;
|
goto xit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-3
@@ -2760,15 +2760,19 @@ void mg_tls_init(struct mg_connection *c, const struct mg_tls_opts *opts) {
|
|||||||
mg_free(all_certs);
|
mg_free(all_certs);
|
||||||
} else { // parse again for a possible DER (or a truncated begin string)
|
} else { // parse again for a possible DER (or a truncated begin string)
|
||||||
if (mg_parse_pem(opts->ca, mg_str_s("CERTIFICATE"), &tls->ca_der) < 0) {
|
if (mg_parse_pem(opts->ca, mg_str_s("CERTIFICATE"), &tls->ca_der) < 0) {
|
||||||
MG_ERROR(("Failed to load CA certificate"));
|
mg_error(c, "Failed to load CA certificate");
|
||||||
goto xit;
|
return;
|
||||||
}
|
}
|
||||||
} // ca_bundle_len != 0 && ca_der.len = 0 => bundle
|
} // ca_bundle_len != 0 && ca_der.len = 0 => bundle
|
||||||
if (!c->is_client) tls->is_twoway = true; // server + CA: two-way auth
|
if (!c->is_client) tls->is_twoway = true; // server + CA: two-way auth
|
||||||
}
|
}
|
||||||
|
|
||||||
if (opts->cert.buf == NULL || opts->cert.len == 0) {
|
if (opts->cert.buf == NULL || opts->cert.len == 0) {
|
||||||
MG_VERBOSE(("No certificate provided"));
|
if (!c->is_client) {
|
||||||
|
mg_error(c, "No server certificate provided");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
MG_VERBOSE(("No client certificate provided"));
|
||||||
goto xit;
|
goto xit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-4
@@ -132,13 +132,12 @@ static void tcpdrain_fn(struct mg_connection *c, int ev, void *ev_data) {
|
|||||||
s_drain_conn = c;
|
s_drain_conn = c;
|
||||||
#if MG_TLS == MG_TLS_BUILTIN
|
#if MG_TLS == MG_TLS_BUILTIN
|
||||||
if (s_drain_tls) {
|
if (s_drain_tls) {
|
||||||
struct mg_tls_opts opts;
|
|
||||||
struct tls_data *tls;
|
struct tls_data *tls;
|
||||||
|
|
||||||
memset(&opts, 0, sizeof(opts));
|
tls = (struct tls_data *) mg_calloc(1, sizeof(*tls));
|
||||||
mg_tls_init(c, &opts);
|
|
||||||
tls = (struct tls_data *) c->tls;
|
|
||||||
ASSERT(tls != NULL);
|
ASSERT(tls != NULL);
|
||||||
|
c->tls = tls;
|
||||||
|
c->is_tls = 1;
|
||||||
ASSERT(mg_iobuf_add(&tls->send, 0, data, sizeof(data)) == sizeof(data));
|
ASSERT(mg_iobuf_add(&tls->send, 0, data, sizeof(data)) == sizeof(data));
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in new issue
Block a user