X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..63e1921d0be4956ab729735189ccf637773a7e27:/src/common/http.cpp diff --git a/src/common/http.cpp b/src/common/http.cpp index af0512f967..556618aca5 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -32,6 +32,12 @@ #include "wx/url.h" #include "wx/protocol/http.h" #include "wx/sckstrm.h" +#include "wx/thread.h" + + +// ---------------------------------------------------------------------------- +// wxHTTP +// ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol) IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true) @@ -42,7 +48,6 @@ wxHTTP::wxHTTP() m_addr = NULL; m_read = false; m_proxy_mode = false; - m_post_buf = wxEmptyString; m_http_response = 0; SetNotify(wxSOCKET_LOST_FLAG); @@ -57,10 +62,15 @@ wxHTTP::~wxHTTP() void wxHTTP::ClearHeaders() { - m_headers.clear(); + m_headers.clear(); +} + +void wxHTTP::ClearCookies() +{ + m_cookies.clear(); } -wxString wxHTTP::GetContentType() +wxString wxHTTP::GetContentType() const { return GetHeader(wxT("Content-Type")); } @@ -75,7 +85,7 @@ wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header) wxHeaderIterator it = m_headers.begin(); for ( wxHeaderIterator en = m_headers.end(); it != en; ++it ) { - if ( wxStricmp(it->first, header) == 0 ) + if ( header.CmpNoCase(it->first) == 0 ) break; } @@ -87,7 +97,31 @@ wxHTTP::wxHeaderConstIterator wxHTTP::FindHeader(const wxString& header) const wxHeaderConstIterator it = m_headers.begin(); for ( wxHeaderConstIterator en = m_headers.end(); it != en; ++it ) { - if ( wxStricmp(it->first, header) == 0 ) + if ( header.CmpNoCase(it->first) == 0 ) + break; + } + + return it; +} + +wxHTTP::wxCookieIterator wxHTTP::FindCookie(const wxString& cookie) +{ + wxCookieIterator it = m_cookies.begin(); + for ( wxCookieIterator en = m_cookies.end(); it != en; ++it ) + { + if ( cookie.CmpNoCase(it->first) == 0 ) + break; + } + + return it; +} + +wxHTTP::wxCookieConstIterator wxHTTP::FindCookie(const wxString& cookie) const +{ + wxCookieConstIterator it = m_cookies.begin(); + for ( wxCookieConstIterator en = m_cookies.end(); it != en; ++it ) + { + if ( cookie.CmpNoCase(it->first) == 0 ) break; } @@ -115,8 +149,17 @@ wxString wxHTTP::GetHeader(const wxString& header) const return it == m_headers.end() ? wxGetEmptyString() : it->second; } +wxString wxHTTP::GetCookie(const wxString& cookie) const +{ + wxCookieConstIterator it = FindCookie(cookie); + + return it == m_cookies.end() ? wxGetEmptyString() : it->second; +} + wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass) const { + // TODO: Use wxBase64Encode() now that we have it instead of reproducing it + static const char *base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; wxString buf; @@ -139,9 +182,9 @@ wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass) if (len == 1) { buf << wxString::Format(wxT("%c="), base64[(from[0] << 4) & 0x30]); } else { - buf << wxString::Format(wxT("%c%c"), base64[(from[0] << 4) & 0x30] + ((from[1] >> 4) & 0xf), base64[(from[1] << 2) & 0x3c]); + buf << wxString::Format(wxT("%c%c"), base64[((from[0] << 4) & 0x30) | ((from[1] >> 4) & 0xf)], base64[(from[1] << 2) & 0x3c]); } - buf << wxString::Format(wxT("=")); + buf << wxT("="); } return buf; @@ -149,7 +192,49 @@ wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass) void wxHTTP::SetPostBuffer(const wxString& post_buf) { - m_post_buf = post_buf; + // Use To8BitData() for backwards compatibility in this deprecated method. + // The new code should use the other overload or SetPostText() and specify + // the encoding to use for the text explicitly. + wxScopedCharBuffer scb = post_buf.To8BitData(); + if ( scb.length() ) + { + m_postBuffer.Clear(); + m_postBuffer.AppendData(scb.data(), scb.length()); + } +} + +bool +wxHTTP::SetPostBuffer(const wxString& contentType, + const wxMemoryBuffer& data) +{ + m_postBuffer = data; + m_contentType = contentType; + + return !m_postBuffer.IsEmpty(); +} + +bool +wxHTTP::SetPostText(const wxString& contentType, + const wxString& data, + const wxMBConv& conv) +{ +#if wxUSE_UNICODE + wxScopedCharBuffer scb = data.mb_str(conv); + const size_t len = scb.length(); + const char* const buf = scb.data(); +#else // !wxUSE_UNICODE + const size_t len = data.length(); + const char* const buf = data.mb_str(conv); +#endif // wxUSE_UNICODE/!wxUSE_UNICODE + + if ( !len ) + return false; + + m_postBuffer.Clear(); + m_postBuffer.AppendData(buf, len); + m_contentType = contentType; + + return true; } void wxHTTP::SendHeaders() @@ -172,19 +257,32 @@ bool wxHTTP::ParseHeaders() wxStringTokenizer tokenzr; ClearHeaders(); + ClearCookies(); m_read = true; for ( ;; ) { - m_perr = ReadLine(this, line); - if (m_perr != wxPROTO_NOERR) + m_lastError = ReadLine(this, line); + if (m_lastError != wxPROTO_NOERR) return false; - if (line.length() == 0) + if ( line.empty() ) break; wxString left_str = line.BeforeFirst(':'); - m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both); + if(!left_str.CmpNoCase("Set-Cookie")) + { + wxString cookieName = line.AfterFirst(':').Strip(wxString::both).BeforeFirst('='); + wxString cookieValue = line.AfterFirst(':').Strip(wxString::both).AfterFirst('=').BeforeFirst(';'); + m_cookies[cookieName] = cookieValue; + + // For compatibility + m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both); + } + else + { + m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both); + } } return true; } @@ -194,17 +292,15 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port) wxIPV4address *addr; if (m_addr) { - delete m_addr; - m_addr = NULL; + wxDELETE(m_addr); Close(); } m_addr = addr = new wxIPV4address(); if (!addr->Hostname(host)) { - delete m_addr; - m_addr = NULL; - m_perr = wxPROTO_NETERR; + wxDELETE(m_addr); + m_lastError = wxPROTO_NETERR; return false; } @@ -213,12 +309,16 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port) else if (!addr->Service(wxT("http"))) addr->Service(80); - SetHeader(wxT("Host"), host); + wxString hostHdr = host; + if ( port && port != 80 ) + hostHdr << wxT(":") << port; + SetHeader(wxT("Host"), hostHdr); + m_lastError = wxPROTO_NOERR; return true; } -bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait)) +bool wxHTTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait)) { if (m_addr) { delete m_addr; @@ -228,9 +328,16 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait)) m_addr = addr.Clone(); wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address); - if (ipv4addr) - SetHeader(wxT("Host"), ipv4addr->OrigHostname()); + if ( ipv4addr ) + { + wxString hostHdr = ipv4addr->OrigHostname(); + unsigned short port = ipv4addr->Service(); + if ( port && port != 80 ) + hostHdr << wxT(":") << port; + SetHeader(wxT("Host"), hostHdr); + } + m_lastError = wxPROTO_NOERR; return true; } @@ -246,8 +353,21 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) case wxHTTP_POST: request = wxT("POST"); - if ( GetHeader( wxT("Content-Length") ).IsNull() ) - SetHeader( wxT("Content-Length"), wxString::Format( wxT("%lu"), (unsigned long)m_post_buf.Len() ) ); + // Content length must be correct, so always set, possibly + // overriding the value set explicitly by a previous call to + // SetHeader("Content-Length"). + if ( !m_postBuffer.IsEmpty() ) + { + wxString len; + len << m_postBuffer.GetDataLen(); + + SetHeader(wxS("Content-Length"), len); + } + + // However if the user had explicitly set the content type, don't + // override it with the content type passed to SetPostText(). + if ( !m_contentType.empty() && GetContentType().empty() ) + SetHeader(wxS("Content-Type"), m_contentType); break; default: @@ -257,7 +377,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) m_http_response = 0; // If there is no User-Agent defined, define it. - if (GetHeader(wxT("User-Agent")).IsNull()) + if ( GetHeader(wxT("User-Agent")).empty() ) SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x")); // Send authentication information @@ -268,25 +388,30 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) SaveState(); // we may use non blocking sockets only if we can dispatch events from them - SetFlags( wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE - : wxSOCKET_BLOCK ); + int flags = wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE + : wxSOCKET_BLOCK; + // and we must use wxSOCKET_WAITALL to ensure that all data is sent + flags |= wxSOCKET_WAITALL; + SetFlags(flags); Notify(false); wxString buf; buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str()); - const wxWX2MBbuf pathbuf = wxConvLocal.cWX2MB(buf); - Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf)); + const wxWX2MBbuf pathbuf = buf.mb_str(); + Write(pathbuf, strlen(pathbuf)); SendHeaders(); Write("\r\n", 2); if ( req == wxHTTP_POST ) { - Write(m_post_buf.mbc_str(), m_post_buf.Len()); - m_post_buf = wxEmptyString; + if ( !m_postBuffer.IsEmpty() ) + Write(m_postBuffer.GetData(), m_postBuffer.GetDataLen()); + + m_postBuffer.Clear(); } wxString tmp_str; - m_perr = ReadLine(this, tmp_str); - if (m_perr != wxPROTO_NOERR) { + m_lastError = ReadLine(this, tmp_str); + if (m_lastError != wxPROTO_NOERR) { RestoreState(); return false; } @@ -294,6 +419,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) if (!tmp_str.Contains(wxT("HTTP/"))) { // TODO: support HTTP v0.9 which can have no header. // FIXME: tmp_str is not put back in the in-queue of the socket. + m_lastError = wxPROTO_NOERR; SetHeader(wxT("Content-Length"), wxT("-1")); SetHeader(wxT("Content-Type"), wxT("none/none")); RestoreState(); @@ -309,7 +435,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) m_http_response = wxAtoi(tmp_str2); - switch (tmp_str2[0u]) + switch ( tmp_str2[0u].GetValue() ) { case wxT('1'): /* INFORMATION / SUCCESS */ @@ -324,16 +450,26 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) break; default: - m_perr = wxPROTO_NOFILE; + m_lastError = wxPROTO_NOFILE; RestoreState(); return false; } + m_lastError = wxPROTO_NOERR; ret_value = ParseHeaders(); RestoreState(); return ret_value; } +bool wxHTTP::Abort(void) +{ + return wxSocketClient::Close(); +} + +// ---------------------------------------------------------------------------- +// wxHTTPStream and wxHTTP::GetInputStream +// ---------------------------------------------------------------------------- + class wxHTTPStream : public wxSocketInputStream { public: @@ -341,19 +477,25 @@ public: size_t m_httpsize; unsigned long m_read_bytes; - wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {} + wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http) + { + m_http = http; + m_httpsize = 0; + m_read_bytes = 0; + } + size_t GetSize() const { return m_httpsize; } virtual ~wxHTTPStream(void) { m_http->Abort(); } protected: size_t OnSysRead(void *buffer, size_t bufsize); - DECLARE_NO_COPY_CLASS(wxHTTPStream) + wxDECLARE_NO_COPY_CLASS(wxHTTPStream); }; size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize) { - if (m_httpsize > 0 && m_read_bytes >= m_httpsize) + if (m_read_bytes >= m_httpsize) { m_lasterror = wxSTREAM_EOF; return 0; @@ -368,24 +510,19 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize) // which is equivalent to getting a READ_ERROR, for clients however this // must be translated into EOF, as it is the expected way of signalling // end end of the content - m_lasterror = wxSTREAM_EOF ; + m_lasterror = wxSTREAM_EOF; } return ret; } -bool wxHTTP::Abort(void) -{ - return wxSocketClient::Close(); -} - wxInputStream *wxHTTP::GetInputStream(const wxString& path) { wxHTTPStream *inp_stream; wxString new_path; - m_perr = wxPROTO_CONNERR; + m_lastError = wxPROTO_CONNERR; // all following returns share this type of error if (!m_addr) return NULL; @@ -401,13 +538,13 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) return NULL; #endif - if (!BuildRequest(path, m_post_buf.empty() ? wxHTTP_GET : wxHTTP_POST)) + if (!BuildRequest(path, m_postBuffer.IsEmpty() ? wxHTTP_GET : wxHTTP_POST)) return NULL; inp_stream = new wxHTTPStream(this); if (!GetHeader(wxT("Content-Length")).empty()) - inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(wxT("Content-Length"))); + inp_stream->m_httpsize = wxAtoi(GetHeader(wxT("Content-Length"))); else inp_stream->m_httpsize = (size_t)-1; @@ -416,6 +553,8 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) Notify(false); SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL); + // no error; reset m_lastError + m_lastError = wxPROTO_NOERR; return inp_stream; }