X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48f7ffbe93ab587c54643e2476b0e3b0c74e1386..fcdd53359135f790b85728c4254b97095a56dad8:/src/common/http.cpp?ds=sidebyside diff --git a/src/common/http.cpp b/src/common/http.cpp index b2b5a42767..4525c98107 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -1,23 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: http.cpp +// Name: src/common/http.cpp // Purpose: HTTP protocol // Author: Guilhem Lavaux -// Modified by: +// Modified by: Simo Virokannas (authentication, Dec 2005) // Created: August 1997 // RCS-ID: $Id$ // Copyright: (c) 1997, 1998 Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "http.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_PROTOCOL_HTTP @@ -26,8 +22,8 @@ #include #ifndef WX_PRECOMP -#include "wx/string.h" -#include "wx/app.h" + #include "wx/string.h" + #include "wx/app.h" #endif #include "wx/tokenzr.h" @@ -36,6 +32,7 @@ #include "wx/url.h" #include "wx/protocol/http.h" #include "wx/sckstrm.h" +#include "wx/thread.h" IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol) IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true) @@ -79,7 +76,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; } @@ -91,7 +88,7 @@ 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; } @@ -119,6 +116,38 @@ wxString wxHTTP::GetHeader(const wxString& header) const return it == m_headers.end() ? wxGetEmptyString() : it->second; } +wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass) const +{ + static const char *base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + + wxString buf; + wxString toencode; + + buf.Printf(wxT("Basic ")); + + toencode.Printf(wxT("%s:%s"),user.c_str(),pass.c_str()); + + size_t len = toencode.length(); + const wxChar *from = toencode.c_str(); + while (len >= 3) { // encode full blocks first + buf << wxString::Format(wxT("%c%c"), base64[(from[0] >> 2) & 0x3f], base64[((from[0] << 4) & 0x30) | ((from[1] >> 4) & 0xf)]); + buf << wxString::Format(wxT("%c%c"), base64[((from[1] << 2) & 0x3c) | ((from[2] >> 6) & 0x3)], base64[from[2] & 0x3f]); + from += 3; + len -= 3; + } + if (len > 0) { // pad the remaining characters + buf << wxString::Format(wxT("%c"), base64[(from[0] >> 2) & 0x3f]); + 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 << wxT("="); + } + + return buf; +} + void wxHTTP::SetPostBuffer(const wxString& post_buf) { m_post_buf = post_buf; @@ -146,19 +175,13 @@ bool wxHTTP::ParseHeaders() ClearHeaders(); m_read = true; -#if defined(__VISAGECPP__) -// VA just can't stand while(1) - bool bOs2var = true; - while(bOs2var) -#else - while (1) -#endif + for ( ;; ) { - m_perr = GetLine(this, line); + m_perr = ReadLine(this, line); if (m_perr != wxPROTO_NOERR) return false; - if (line.Length() == 0) + if (line.length() == 0) break; wxString left_str = line.BeforeFirst(':'); @@ -196,7 +219,7 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port) 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; @@ -238,6 +261,11 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) if (GetHeader(wxT("User-Agent")).IsNull()) SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x")); + // Send authentication information + if (!m_username.empty() || !m_password.empty()) { + SetHeader(wxT("Authorization"), GenerateAuthString(m_username, m_password)); + } + SaveState(); // we may use non blocking sockets only if we can dispatch events from them @@ -247,8 +275,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) 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); @@ -258,7 +286,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) } wxString tmp_str; - m_perr = GetLine(this, tmp_str); + m_perr = ReadLine(this, tmp_str); if (m_perr != wxPROTO_NOERR) { RestoreState(); return false; @@ -282,7 +310,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 */ @@ -335,6 +363,15 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize) size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize); m_read_bytes += ret; + if (m_httpsize==(size_t)-1 && m_lasterror == wxSTREAM_READ_ERROR ) + { + // if m_httpsize is (size_t) -1 this means read until connection closed + // 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 ; + } + return ret; } @@ -371,7 +408,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) 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; @@ -384,4 +421,3 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path) } #endif // wxUSE_PROTOCOL_HTTP -