From 800f1c0bc5bd4632bd0f246c756283cc47d31a34 Mon Sep 17 00:00:00 2001 From: x12xx12x <44411062+12xx12@users.noreply.github.com> Date: Sun, 26 Mar 2023 14:48:06 +0200 Subject: Auth SSL Fixes - Fixed Login Breaking bug - Auth and MojangAPI now use UrlClient - fixed bug in UrlClient where one letter was missing in the HTTP Header - added function to verify Urls from config files and error handling on bad Urls in config for Auth --- src/HTTP/UrlClient.cpp | 133 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 116 insertions(+), 17 deletions(-) (limited to 'src/HTTP/UrlClient.cpp') diff --git a/src/HTTP/UrlClient.cpp b/src/HTTP/UrlClient.cpp index 13a882205..3985e0707 100644 --- a/src/HTTP/UrlClient.cpp +++ b/src/HTTP/UrlClient.cpp @@ -4,11 +4,12 @@ // Implements the cUrlClient class for high-level URL interaction #include "Globals.h" -#include "UrlClient.h" -#include "UrlParser.h" -#include "HTTPMessageParser.h" -#include "../mbedTLS++/X509Cert.h" -#include "../mbedTLS++/CryptoKey.h" + +#include "HTTP/UrlClient.h" +#include "HTTP/UrlParser.h" +#include "HTTP/HTTPMessageParser.h" +#include "mbedTLS++/X509Cert.h" +#include "mbedTLS++/CryptoKey.h" @@ -16,7 +17,44 @@ // fwd: class cSchemeHandler; -typedef std::shared_ptr cSchemeHandlerPtr; +using cSchemeHandlerPtr = std::shared_ptr; + + +/** This is a basic set of callbacks to enable quick implementation of HTTP request. */ +namespace +{ + class cSimpleHTTPCallbacks : + public cUrlClient::cCallbacks + { + public: + + explicit cSimpleHTTPCallbacks(std::shared_ptr a_Event, AString & a_ResponseBody) : + m_Event(std::move(a_Event)), m_ResponseBody(a_ResponseBody) + { + } + + void OnBodyFinished() override + { + m_Event->Set(); + } + + void OnError(const AString & a_ErrorMsg) override + { + LOGERROR("%s %d: HTTP Error: %s", __FILE__, __LINE__, a_ErrorMsg.c_str()); + m_Event->Set(); + } + + void OnBodyData(const void * a_Data, size_t a_Size) override + { + m_ResponseBody.append(static_cast(a_Data), a_Size); + } + + std::shared_ptr m_Event; + + /** The accumulator for the partial body data, so that OnBodyFinished() can send the entire thing at once. */ + AString & m_ResponseBody; + }; +} @@ -261,7 +299,7 @@ public: m_Link = &a_Link; if (m_IsTls) { - m_Link->StartTLSClient(m_ParentRequest.GetOwnCert(), m_ParentRequest.GetOwnPrivKey()); + m_Link->StartTLSClient(m_ParentRequest.GetOwnCert(), m_ParentRequest.GetOwnPrivKey(), m_ParentRequest.m_UrlHost); } else { @@ -371,7 +409,7 @@ public: return; } } - m_ParentRequest.GetCallbacks().OnStatusLine(a_FirstLine.substr(1, idxFirstSpace), resultCode, a_FirstLine.substr(idxSecondSpace + 1)); + m_ParentRequest.GetCallbacks().OnStatusLine(a_FirstLine.substr(0, idxFirstSpace), resultCode, a_FirstLine.substr(idxSecondSpace + 1)); } @@ -613,12 +651,12 @@ std::pair cUrlClient::Request( const AString & a_URL, cCallbacksPtr && a_Callbacks, AStringMap && a_Headers, - AString && a_Body, + const AString & a_Body, AStringMap && a_Options ) { return cUrlClientRequest::Request( - a_Method, a_URL, std::move(a_Callbacks), std::move(a_Headers), std::move(a_Body), std::move(a_Options) + a_Method, a_URL, std::move(a_Callbacks), std::move(a_Headers), a_Body, std::move(a_Options) ); } @@ -629,13 +667,13 @@ std::pair cUrlClient::Request( std::pair cUrlClient::Get( const AString & a_URL, cCallbacksPtr && a_Callbacks, - AStringMap a_Headers, + AStringMap && a_Headers, const AString & a_Body, - AStringMap a_Options + AStringMap && a_Options ) { return cUrlClientRequest::Request( - "GET", a_URL, std::move(a_Callbacks), std::move(a_Headers), std::move(a_Body), std::move(a_Options) + "GET", a_URL, std::move(a_Callbacks), std::move(a_Headers), a_Body, std::move(a_Options) ); } @@ -647,12 +685,12 @@ std::pair cUrlClient::Post( const AString & a_URL, cCallbacksPtr && a_Callbacks, AStringMap && a_Headers, - AString && a_Body, + const AString & a_Body, AStringMap && a_Options ) { return cUrlClientRequest::Request( - "POST", a_URL, std::move(a_Callbacks), std::move(a_Headers), std::move(a_Body), std::move(a_Options) + "POST", a_URL, std::move(a_Callbacks), std::move(a_Headers), a_Body, std::move(a_Options) ); } @@ -664,12 +702,12 @@ std::pair cUrlClient::Put( const AString & a_URL, cCallbacksPtr && a_Callbacks, AStringMap && a_Headers, - AString && a_Body, + const AString & a_Body, AStringMap && a_Options ) { return cUrlClientRequest::Request( - "PUT", a_URL, std::move(a_Callbacks), std::move(a_Headers), std::move(a_Body), std::move(a_Options) + "PUT", a_URL, std::move(a_Callbacks), std::move(a_Headers), a_Body, std::move(a_Options) ); } @@ -677,3 +715,64 @@ std::pair cUrlClient::Put( +std::pair cUrlClient::BlockingRequest(const AString & a_Method, const AString & a_URL, AStringMap && a_Headers, const AString & a_Body, AStringMap && a_Options) +{ + auto EvtFinished = std::make_shared(); + AString Response; + auto Callbacks = std::make_unique(EvtFinished, Response); + auto [Success, ErrorMessage] = cUrlClient::Request(a_Method, a_URL, std::move(Callbacks), std::move(a_Headers), a_Body, std::move(a_Options)); + if (Success) + { + EvtFinished->Wait(); + } + else + { + LOGWARNING("%s: HTTP error: %s", __FUNCTION__, ErrorMessage.c_str()); + return std::make_pair(false, AString()); + } + return std::make_pair(true, Response); +} + + + + + +std::pair cUrlClient::BlockingGet( + const AString & a_URL, + AStringMap a_Headers, + const AString & a_Body, + AStringMap a_Options) +{ + return BlockingRequest("GET", a_URL, std::move(a_Headers), a_Body, std::move(a_Options)); +} + + + + + +std::pair cUrlClient::BlockingPost( + const AString & a_URL, + AStringMap && a_Headers, + const AString & a_Body, + AStringMap && a_Options) +{ + return BlockingRequest("POST", a_URL, std::move(a_Headers), a_Body, std::move(a_Options)); +} + + + + + +std::pair cUrlClient::BlockingPut( + const AString & a_URL, + AStringMap && a_Headers, + const AString & a_Body, + AStringMap && a_Options) +{ + return BlockingRequest("PUT", a_URL, std::move(a_Headers), a_Body, std::move(a_Options)); +} + + + + + -- cgit v1.2.3