thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NETWORKING: Properly process TLS errors.

Browse source 
Now, when HTTPS is not supported, we will indicate it to the user.
This commit is contained in:
Eugene Sandulenko 2022-10-10 22:36:40 +02:00
parent 938212c6f1
commit a670a17480
No known key found for this signature in database
GPG key ID: 014D387312D34F08
3 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
backends/networking/curl/networkreadstream.cpp
View file

@ -193,19 +193,19 @@ void NetworkReadStream::setupFormMultipart(Common::HashMap<Common::String, Commo
}
NetworkReadStream::NetworkReadStream(const char *url, curl_slist *headersList, Common::String postFields, bool uploading, bool usingPatch, bool keepAlive, long keepAliveIdle, long keepAliveInterval):
_backingStream(DisposeAfterUse::YES), _keepAlive(keepAlive), _keepAliveIdle(keepAliveIdle), _keepAliveInterval(keepAliveInterval), _errorBuffer(nullptr) {
_backingStream(DisposeAfterUse::YES), _keepAlive(keepAlive), _keepAliveIdle(keepAliveIdle), _keepAliveInterval(keepAliveInterval), _errorBuffer(nullptr), _errorCode(CURLE_OK) {
initCurl(url, headersList);
setupBufferContents((const byte *)postFields.c_str(), postFields.size(), uploading, usingPatch, false);
}
NetworkReadStream::NetworkReadStream(const char *url, curl_slist *headersList, Common::HashMap<Common::String, Common::String> formFields, Common::HashMap<Common::String, Common::String> formFiles, bool keepAlive, long keepAliveIdle, long keepAliveInterval):
_backingStream(DisposeAfterUse::YES), _keepAlive(keepAlive), _keepAliveIdle(keepAliveIdle), _keepAliveInterval(keepAliveInterval), _errorBuffer(nullptr) {
_backingStream(DisposeAfterUse::YES), _keepAlive(keepAlive), _keepAliveIdle(keepAliveIdle), _keepAliveInterval(keepAliveInterval), _errorBuffer(nullptr), _errorCode(CURLE_OK) {
initCurl(url, headersList);
setupFormMultipart(formFields, formFiles);
}
NetworkReadStream::NetworkReadStream(const char *url, curl_slist *headersList, const byte *buffer, uint32 bufferSize, bool uploading, bool usingPatch, bool post, bool keepAlive, long keepAliveIdle, long keepAliveInterval):
_backingStream(DisposeAfterUse::YES), _keepAlive(keepAlive), _keepAliveIdle(keepAliveIdle), _keepAliveInterval(keepAliveInterval), _errorBuffer(nullptr) {
_backingStream(DisposeAfterUse::YES), _keepAlive(keepAlive), _keepAliveIdle(keepAliveIdle), _keepAliveInterval(keepAliveInterval), _errorBuffer(nullptr), _errorCode(CURLE_OK) {
initCurl(url, headersList);
setupBufferContents(buffer, bufferSize, uploading, usingPatch, post);
}
@ -266,14 +266,23 @@ void NetworkReadStream::finished(uint32 errorCode) {
char *url = nullptr;
curl_easy_getinfo(_easy, CURLINFO_EFFECTIVE_URL, &url);
if (errorCode == CURLE_OK) {
_errorCode = errorCode;
if (_errorCode == CURLE_OK) {
debug(9, "NetworkReadStream: %s - Request succeeded", url);
} else {
warning("NetworkReadStream: %s - Request failed (%d - %s)", url, errorCode,
strlen(_errorBuffer) ? _errorBuffer : curl_easy_strerror((CURLcode)errorCode));
warning("NetworkReadStream: %s - Request failed (%d - %s)", url, _errorCode, getError());
}
}
bool NetworkReadStream::hasError() const {
return _errorCode != CURLE_OK;
}
const char *NetworkReadStream::getError() const {
return strlen(_errorBuffer) ? _errorBuffer : curl_easy_strerror((CURLcode)_errorCode);
}
long NetworkReadStream::httpResponseCode() const {
long responseCode = -1;
if (_easy)

6
backends/networking/curl/networkreadstream.h
View file

@ -40,6 +40,7 @@ class NetworkReadStream: public Common::ReadStream {
long _keepAliveIdle, _keepAliveInterval;
bool _eos, _requestComplete;
char *_errorBuffer;
uint32 _errorCode;
const byte *_sendingContentsBuffer;
uint32 _sendingContentsSize;
uint32 _sendingContentsPos;
@ -168,6 +169,11 @@ public:
void setProgress(uint64 downloaded, uint64 total);
bool keepAlive() const { return _keepAlive; }
bool hasError() const;
uint32 getErrorCode() const { return _errorCode; }
const char *getError() const;
};
} // End of namespace Networking

6
backends/networking/curl/sessionrequest.cpp
View file

@ -183,6 +183,12 @@ void SessionRequest::handle() {
}
if (_stream->eos()) {
if (_stream->hasError()) {
ErrorResponse error(this, false, true, Common::String::format("TLS stream response code is not CURLE_OK OK: %s", _stream->getError()), _stream->getErrorCode());
finishError(error);
return;
}
finishSuccess();
}
}