forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better error messages for http low level errors

This commit is contained in:
Adam D. Ruppe 2024-10-24 18:03:38 -04:00
parent f74e3bfd4d
commit dd2815bd2b
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
http2.d
View File

@ -2018,7 +2018,7 @@ class HttpRequest {
request.state = State.aborted; request.state = State.aborted;
request.responseData.code = 3; request.responseData.code = 3;
request.responseData.codeText = "send failed to server"; request.responseData.codeText = "send failed to server: " ~ lastSocketError(sock);
inactive[inactiveCount++] = sock; inactive[inactiveCount++] = sock;
sock.close(); sock.close();
loseSocket(request.requestParameters.host, request.requestParameters.port, request.requestParameters.ssl, sock); loseSocket(request.requestParameters.host, request.requestParameters.port, request.requestParameters.ssl, sock);
@ -2047,7 +2047,7 @@ class HttpRequest {
request.state = State.aborted; request.state = State.aborted;
request.responseData.code = 3; request.responseData.code = 3;
request.responseData.codeText = "receive error from server"; request.responseData.codeText = "receive error from server: " ~ lastSocketError(sock);
} }
inactive[inactiveCount++] = sock; inactive[inactiveCount++] = sock;
sock.close(); sock.close();
@ -3517,6 +3517,15 @@ void main() {
writeln(HttpRequest.socketsPerHost); writeln(HttpRequest.socketsPerHost);
} }
string lastSocketError(Socket sock) {
import std.socket;
version(use_openssl) {
if(auto s = cast(OpenSslSocket) sock)
if(s.lastSocketError.length)
return s.lastSocketError;
}
return std.socket.lastSocketError();
}
// From sslsocket.d, but this is the maintained version! // From sslsocket.d, but this is the maintained version!
version(use_openssl) { version(use_openssl) {
@ -3975,6 +3984,8 @@ version(use_openssl) {
} }
} }
private string lastSocketError;
@trusted @trusted
// returns true if it is finished, false if it would have blocked, throws if there's an error // returns true if it is finished, false if it would have blocked, throws if there's an error
int do_ssl_connect() { int do_ssl_connect() {
@ -3987,12 +3998,12 @@ version(use_openssl) {
string str; string str;
OpenSSL.ERR_print_errors_cb(&collectSslErrors, &str); OpenSSL.ERR_print_errors_cb(&collectSslErrors, &str);
int i;
auto err = OpenSSL.SSL_get_verify_result(ssl); auto err = OpenSSL.SSL_get_verify_result(ssl);
//printf("wtf\n"); this.lastSocketError = str ~ " " ~ getOpenSslErrorCode(err);
//scanf("%d\n", i);
throw new Exception("Secure connect failed: " ~ getOpenSslErrorCode(err)); throw new Exception("Secure connect failed: " ~ getOpenSslErrorCode(err));
} } else this.lastSocketError = null;
return 0; return 0;
} }
@ -4005,18 +4016,13 @@ version(use_openssl) {
// don't need to throw anymore since it is checked elsewhere // don't need to throw anymore since it is checked elsewhere
// code useful sometimes for debugging hence commenting instead of deleting // code useful sometimes for debugging hence commenting instead of deleting
version(none)
if(retval == -1) { if(retval == -1) {
string str; string str;
OpenSSL.ERR_print_errors_cb(&collectSslErrors, &str); OpenSSL.ERR_print_errors_cb(&collectSslErrors, &str);
int i; this.lastSocketError = str;
//printf("wtf\n"); // throw new Exception("ssl send failed " ~ str);
//scanf("%d\n", i); } else this.lastSocketError = null;
throw new Exception("ssl send failed " ~ str);
}
return retval; return retval;
} }
@ -4032,18 +4038,14 @@ version(use_openssl) {
// don't need to throw anymore since it is checked elsewhere // don't need to throw anymore since it is checked elsewhere
// code useful sometimes for debugging hence commenting instead of deleting // code useful sometimes for debugging hence commenting instead of deleting
version(none)
if(retval == -1) { if(retval == -1) {
string str; string str;
OpenSSL.ERR_print_errors_cb(&collectSslErrors, &str); OpenSSL.ERR_print_errors_cb(&collectSslErrors, &str);
int i; this.lastSocketError = str;
//printf("wtf\n"); // throw new Exception("ssl receive failed " ~ str);
//scanf("%d\n", i); } else this.lastSocketError = null;
throw new Exception("ssl receive failed " ~ str);
}
return retval; return retval;
} }
override ptrdiff_t receive(scope void[] buf) { override ptrdiff_t receive(scope void[] buf) {
@ -4790,7 +4792,7 @@ class WebSocket {
while(remaining.length) { while(remaining.length) {
auto r = socket.send(remaining); auto r = socket.send(remaining);
if(r < 0) if(r < 0)
throw new Exception(lastSocketError()); throw new Exception(lastSocketError(socket));
if(r == 0) if(r == 0)
throw new Exception("unexpected connection termination"); throw new Exception("unexpected connection termination");
remaining = remaining[r .. $]; remaining = remaining[r .. $];
@ -4805,7 +4807,7 @@ class WebSocket {
auto r = socket.receive(buffer[used.length .. $]); auto r = socket.receive(buffer[used.length .. $]);
if(r < 0) if(r < 0)
throw new Exception(lastSocketError()); throw new Exception(lastSocketError(socket));
if(r == 0) if(r == 0)
throw new Exception("unexpected connection termination"); throw new Exception("unexpected connection termination");
//import std.stdio;writef("%s", cast(string) buffer[used.length .. used.length + r]); //import std.stdio;writef("%s", cast(string) buffer[used.length .. used.length + r]);
@ -5463,7 +5465,7 @@ class WebSocket {
sock.onerror(); sock.onerror();
if(sock.onclose) if(sock.onclose)
sock.onclose(CloseEvent(CloseEvent.StandardCloseCodes.abnormalClosure, "Connection lost", false, lastSocketError())); sock.onclose(CloseEvent(CloseEvent.StandardCloseCodes.abnormalClosure, "Connection lost", false, lastSocketError(sock.socket)));
unregisterActiveSocket(sock); unregisterActiveSocket(sock);
sock.socket.close(); sock.socket.close();