wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Report errors on TLS misconfigurations ... or at least try to.

This commit is contained in:
Alex Miller 2020-02-20 16:53:01 -08:00
parent f7a37077cc
commit 927cff3317
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bindings/c/fdb_c.cpp
View File

@ -108,7 +108,12 @@ fdb_error_t fdb_network_set_option( FDBNetworkOption option,
} }
fdb_error_t fdb_setup_network_impl() { fdb_error_t fdb_setup_network_impl() {
CATCH_AND_RETURN( API->setupNetwork(); ); CATCH_AND_RETURN(
try {
API->setupNetwork();
} catch (boost::system::system_error& e) {
return error_code_tls_error;
} );
} }
fdb_error_t fdb_setup_network_v13( const char* localAddress ) { fdb_error_t fdb_setup_network_v13( const char* localAddress ) {

7
fdbbackup/backup.actor.cpp
View File

@ -3657,6 +3657,13 @@ int main(int argc, char* argv[]) {
} catch (Error& e) { } catch (Error& e) {
TraceEvent(SevError, "MainError").error(e); TraceEvent(SevError, "MainError").error(e);
status = FDB_EXIT_MAIN_ERROR; status = FDB_EXIT_MAIN_ERROR;
} catch (boost::system::system_error& e) {
if (g_network) {
TraceEvent(SevError, "MainError").error(unknown_error()).detail("RootException", e.what());
} else {
fprintf(stderr, "ERROR: %s (%d)\n", e.what(), e.code().value());
}
status = FDB_EXIT_MAIN_EXCEPTION;
} catch (std::exception& e) { } catch (std::exception& e) {
TraceEvent(SevError, "MainError").error(unknown_error()).detail("RootException", e.what()); TraceEvent(SevError, "MainError").error(unknown_error()).detail("RootException", e.what());
status = FDB_EXIT_MAIN_EXCEPTION; status = FDB_EXIT_MAIN_EXCEPTION;

3
fdbcli/fdbcli.actor.cpp
View File

@ -3753,5 +3753,8 @@ int main(int argc, char **argv) {
} catch (Error& e) { } catch (Error& e) {
printf("ERROR: %s (%d)\n", e.what(), e.code()); printf("ERROR: %s (%d)\n", e.what(), e.code());
return 1; return 1;
} catch (boost::system::system_error& e) {
printf("ERROR: %s (%d)\n", e.what(), e.code().value());
return 1;
} }
} }

5
fdbserver/fdbserver.actor.cpp
View File

@ -1963,6 +1963,11 @@ int main(int argc, char* argv[]) {
TraceEvent(SevError, "MainError").error(e); TraceEvent(SevError, "MainError").error(e);
//printf("\n%d tests passed; %d tests failed\n", passCount, failCount); //printf("\n%d tests passed; %d tests failed\n", passCount, failCount);
flushAndExit(FDB_EXIT_MAIN_ERROR); flushAndExit(FDB_EXIT_MAIN_ERROR);
} catch (boost::system::system_error& e) {
fprintf(stderr, "boost::system::system_error: %s (%d)", e.what(), e.code().value());
TraceEvent(SevError, "MainError").error(unknown_error()).detail("RootException", e.what());
//printf("\n%d tests passed; %d tests failed\n", passCount, failCount);
flushAndExit(FDB_EXIT_MAIN_EXCEPTION);
} catch (std::exception& e) { } catch (std::exception& e) {
fprintf(stderr, "std::exception: %s\n", e.what()); fprintf(stderr, "std::exception: %s\n", e.what());
TraceEvent(SevError, "MainError").error(unknown_error()).detail("RootException", e.what()); TraceEvent(SevError, "MainError").error(unknown_error()).detail("RootException", e.what());

2
flow/Net2.actor.cpp
View File

@ -1456,7 +1456,7 @@ INetwork* newNet2(bool useThreadPool, bool useMetrics, Reference<TLSPolicy> poli
} }
catch(boost::system::system_error e) { catch(boost::system::system_error e) {
TraceEvent("Net2InitError").detail("Message", e.what()); TraceEvent("Net2InitError").detail("Message", e.what());
throw unknown_error(); throw;
} }
catch(std::exception const& e) { catch(std::exception const& e) {
TraceEvent("Net2InitError").detail("Message", e.what()); TraceEvent("Net2InitError").detail("Message", e.what());