X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/999836aacade840a5d9a0cbb5fad7b1d4de62c93..3db5226517a63bcdc983e638f1a312764fe1312f:/src/common/url.cpp diff --git a/src/common/url.cpp b/src/common/url.cpp index e265e0c5f3..3bf910e425 100644 --- a/src/common/url.cpp +++ b/src/common/url.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "url.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -32,7 +28,7 @@ #include IMPLEMENT_CLASS(wxProtoInfo, wxObject) -IMPLEMENT_CLASS(wxURL, wxObject) +IMPLEMENT_CLASS(wxURL, wxURI) // Protocols list wxProtoInfo *wxURL::ms_protocols = NULL; @@ -40,29 +36,49 @@ wxProtoInfo *wxURL::ms_protocols = NULL; // Enforce linking of protocol classes: USE_PROTOCOL(wxFileProto) -#if wxUSE_SOCKETS +#if wxUSE_PROTOCOL_HTTP USE_PROTOCOL(wxHTTP) -USE_PROTOCOL(wxFTP) wxHTTP *wxURL::ms_proxyDefault = NULL; - bool wxURL::ms_useDefaultProxy = FALSE; + bool wxURL::ms_useDefaultProxy = false; +#endif + +#if wxUSE_PROTOCOL_FTP +USE_PROTOCOL(wxFTP) #endif // -------------------------------------------------------------- -// wxURL +// +// wxURL +// // -------------------------------------------------------------- // -------------------------------------------------------------- -// --------- wxURL CONSTRUCTOR DESTRUCTOR ----------------------- +// Construction // -------------------------------------------------------------- -wxURL::wxURL(const wxString& url) +wxURL::wxURL(const wxString& url) : wxURI(url) +{ + Init(url); + ParseURL(); +} + +wxURL::wxURL(const wxURI& url) : wxURI(url) +{ + Init(url.BuildURI()); + ParseURL(); +} + +void wxURL::Init(const wxString& url) { m_protocol = NULL; m_error = wxURL_NOERR; m_url = url; +#if wxUSE_URL_NATIVE + m_nativeImp = CreateNativeImpObject(); +#endif -#if wxUSE_SOCKETS +#if wxUSE_PROTOCOL_HTTP if ( ms_useDefaultProxy && !ms_proxyDefault ) { SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) ); @@ -70,292 +86,263 @@ wxURL::wxURL(const wxString& url) if ( !ms_proxyDefault ) { // don't try again - ms_useDefaultProxy = FALSE; + ms_useDefaultProxy = false; } } m_useProxy = ms_proxyDefault != NULL; m_proxy = ms_proxyDefault; -#endif // wxUSE_SOCKETS +#endif // wxUSE_PROTOCOL_HTTP + +} +// -------------------------------------------------------------- +// Assignment +// -------------------------------------------------------------- + +wxURL& wxURL::operator = (const wxURI& url) +{ + wxURI::operator = (url); + Init(url.BuildURI()); ParseURL(); + return *this; } +wxURL& wxURL::operator = (const wxString& url) +{ + wxURI::operator = (url); + Init(url); + ParseURL(); + return *this; +} + +// -------------------------------------------------------------- +// ParseURL +// +// Builds the URL and takes care of the old protocol stuff +// -------------------------------------------------------------- bool wxURL::ParseURL() { - wxString last_url = m_url; + // If the URL was already parsed (m_protocol != NULL), pass this section. + if (!m_protocol) + { + // Clean up + CleanData(); - // If the URL was already parsed (m_protocol != NULL), pass this section. - if (!m_protocol) - { - // Clean up - CleanData(); + // Make sure we have a protocol/scheme + if (!HasScheme()) + { + m_error = wxURL_SNTXERR; + return false; + } - // Extract protocol name - if (!PrepProto(last_url)) - { - m_error = wxURL_SNTXERR; - return FALSE; - } + // Find and create the protocol object + if (!FetchProtocol()) + { + m_error = wxURL_NOPROTO; + return false; + } - // Find and create the protocol object - if (!FetchProtocol()) - { - m_error = wxURL_NOPROTO; - return FALSE; + // Do we need a host name ? + if (m_protoinfo->m_needhost) + { + // Make sure we have one, then + if (!HasServer()) + { + m_error = wxURL_SNTXERR; + return false; + } + } } - // Do we need a host name ? - if (m_protoinfo->m_needhost) +#if wxUSE_PROTOCOL_HTTP + if (m_useProxy) { - // Extract it - if (!PrepHost(last_url)) - { - m_error = wxURL_SNTXERR; - return FALSE; - } - } + // Third, we rebuild the URL. + m_url = m_scheme + wxT(":"); + if (m_protoinfo->m_needhost) + m_url = m_url + wxT("//") + m_server; - // Extract full path - if (!PrepPath(last_url)) - { - m_error = wxURL_NOPATH; - return FALSE; + // We initialize specific variables. + m_protocol = m_proxy; // FIXME: we should clone the protocol } - } - // URL parse finished. +#endif // wxUSE_PROTOCOL_HTTP -#if wxUSE_SOCKETS - if (m_useProxy) - { - // We destroy the newly created protocol. - CleanData(); - - // Third, we rebuild the URL. - m_url = m_protoname + wxT(":"); - if (m_protoinfo->m_needhost) - m_url = m_url + wxT("//") + m_hostname; - - m_url += m_path; - - // We initialize specific variables. - m_protocol = m_proxy; // FIXME: we should clone the protocol - } -#endif - - m_error = wxURL_NOERR; - return TRUE; + m_error = wxURL_NOERR; + return true; } +// -------------------------------------------------------------- +// Destruction/Cleanup +// -------------------------------------------------------------- + void wxURL::CleanData() { -#if wxUSE_SOCKETS - if (!m_useProxy) -#endif - delete m_protocol; +#if wxUSE_PROTOCOL_HTTP + if (!m_useProxy) +#endif // wxUSE_PROTOCOL_HTTP + delete m_protocol; } wxURL::~wxURL() { - CleanData(); -#if wxUSE_SOCKETS - if (m_proxy && m_proxy != ms_proxyDefault) - delete m_proxy; + CleanData(); +#if wxUSE_PROTOCOL_HTTP + if (m_proxy && m_proxy != ms_proxyDefault) + delete m_proxy; +#endif // wxUSE_PROTOCOL_HTTP +#if wxUSE_URL_NATIVE + delete m_nativeImp; #endif } // -------------------------------------------------------------- -// --------- wxURL urls decoders -------------------------------- +// FetchProtocol // -------------------------------------------------------------- -bool wxURL::PrepProto(wxString& url) +bool wxURL::FetchProtocol() { - int pos; - - // Find end - pos = url.Find(wxT(':')); - if (pos == -1) - return FALSE; + wxProtoInfo *info = ms_protocols; - m_protoname = url(0, pos); - - url = url(pos+1, url.Length()); - - return TRUE; + while (info) + { + if (m_scheme == info->m_protoname) + { + if (m_port.IsNull()) + m_port = info->m_servname; + m_protoinfo = info; + m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject(); + return true; + } + info = info->next; + } + return false; } -bool wxURL::PrepHost(wxString& url) -{ - wxString temp_url; - int pos, pos2; - - if ((url.GetChar(0) != wxT('/')) || (url.GetChar(1) != wxT('/'))) - return FALSE; +// -------------------------------------------------------------- +// GetInputStream +// -------------------------------------------------------------- - url = url(2, url.Length()); +wxInputStream *wxURL::GetInputStream() +{ + if (!m_protocol) + { + m_error = wxURL_NOPROTO; + return NULL; + } - pos = url.Find(wxT('/')); - if (pos == -1) - pos = url.Length(); + m_error = wxURL_NOERR; + if (HasUserInfo()) + { + size_t dwPasswordPos = m_userinfo.find(':'); - if (pos == 0) - return FALSE; + if (dwPasswordPos == wxString::npos) + m_protocol->SetUser(m_userinfo); + else + { + m_protocol->SetUser(m_userinfo(0, dwPasswordPos)); + m_protocol->SetPassword(m_userinfo(dwPasswordPos+1, m_userinfo.length() + 1)); + } + } - temp_url = url(0, pos); - url = url(url.Find(wxT('/')), url.Length()); +#if wxUSE_URL_NATIVE + // give the native implementation to return a better stream + // such as the native WinINet functionality under MS-Windows + if (m_nativeImp) + { + wxInputStream *rc; + rc = m_nativeImp->GetInputStream(this); + if (rc != 0) + return rc; + } + // else use the standard behaviour +#endif // wxUSE_URL_NATIVE - // Retrieve service number - pos2 = temp_url.Find(wxT(':'), TRUE); - if (pos2 != -1 && pos2 < pos) - { - m_servname = temp_url(pos2+1, pos); - if (!m_servname.IsNumber()) - return FALSE; - temp_url = temp_url(0, pos2); - } +#if wxUSE_SOCKETS + wxIPV4address addr; - // Retrieve user and password. - pos2 = temp_url.Find(wxT('@')); - // Even if pos2 equals -1, this code is right. - m_hostname = temp_url(pos2+1, temp_url.Length()); + // m_protoinfo is NULL when we use a proxy + if (!m_useProxy && m_protoinfo->m_needhost) + { + if (!addr.Hostname(m_server)) + { + m_error = wxURL_NOHOST; + return NULL; + } - m_user = wxT(""); - m_password = wxT(""); + addr.Service(m_port); - if (pos2 == -1) - return TRUE; + if (!m_protocol->Connect(addr, true)) // Watcom needs the 2nd arg for some reason + { + m_error = wxURL_CONNERR; + return NULL; + } + } +#endif - temp_url = temp_url(0, pos2); - pos2 = temp_url.Find(wxT(':')); + wxString fullPath; - if (pos2 == -1) - return FALSE; + // When we use a proxy, we have to pass the whole URL to it. + if (m_useProxy) + fullPath += m_url; - m_user = temp_url(0, pos2); - m_password = temp_url(pos2+1, url.Length()); + if(m_path.empty()) + fullPath += wxT("/"); + else + fullPath += m_path; - return TRUE; -} + if (HasQuery()) + fullPath += wxT("?") + m_query; -bool wxURL::PrepPath(wxString& url) -{ - if (url.Length() != 0) - m_path = ConvertToValidURI(url); - else - m_path = wxT("/"); - return TRUE; -} + if (HasFragment()) + fullPath += wxT("#") + m_fragment; -bool wxURL::FetchProtocol() -{ - wxProtoInfo *info = ms_protocols; + wxInputStream *the_i_stream = m_protocol->GetInputStream(fullPath); - while (info) - { - if (m_protoname == info->m_protoname) + if (!the_i_stream) { - if (m_servname.IsNull()) - m_servname = info->m_servname; - - m_protoinfo = info; - m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject(); - return TRUE; + m_error = wxURL_PROTOERR; + return NULL; } - info = info->next; - } - return FALSE; -} -// -------------------------------------------------------------- -// --------- wxURL get ------------------------------------------ -// -------------------------------------------------------------- + return the_i_stream; +} -wxInputStream *wxURL::GetInputStream() +#if wxUSE_PROTOCOL_HTTP +void wxURL::SetDefaultProxy(const wxString& url_proxy) { - if (!m_protocol) - { - m_error = wxURL_NOPROTO; - return NULL; - } - - m_error = wxURL_NOERR; - if (m_user != wxT("")) - { - m_protocol->SetUser(m_user); - m_protocol->SetPassword(m_password); - } - -#if wxUSE_SOCKETS - wxIPV4address addr; - - // m_protoinfo is NULL when we use a proxy - if (!m_useProxy && m_protoinfo->m_needhost) - { - if (!addr.Hostname(m_hostname)) + if ( !url_proxy ) { - m_error = wxURL_NOHOST; - return NULL; + if ( ms_proxyDefault ) + { + ms_proxyDefault->Close(); + delete ms_proxyDefault; + ms_proxyDefault = NULL; + } } - - addr.Service(m_servname); - - if (!m_protocol->Connect(addr, TRUE)) // Watcom needs the 2nd arg for some reason + else { - m_error = wxURL_CONNERR; - return NULL; - } - } -#endif - - // When we use a proxy, we have to pass the whole URL to it. - wxInputStream *the_i_stream = - (m_useProxy) ? m_protocol->GetInputStream(m_url) : - m_protocol->GetInputStream(m_path); + wxString tmp_str = url_proxy; + int pos = tmp_str.Find(wxT(':')); + if (pos == wxNOT_FOUND) + return; - if (!the_i_stream) - { - m_error = wxURL_PROTOERR; - return NULL; - } + wxString hostname = tmp_str(0, pos), + port = tmp_str(pos+1, tmp_str.Length()-pos); + wxIPV4address addr; - return the_i_stream; -} + if (!addr.Hostname(hostname)) + return; + if (!addr.Service(port)) + return; -#if wxUSE_SOCKETS -void wxURL::SetDefaultProxy(const wxString& url_proxy) -{ - if ( !url_proxy ) - { - if ( ms_proxyDefault ) - { - ms_proxyDefault->Close(); - delete ms_proxyDefault; - ms_proxyDefault = NULL; - } - } - else - { - wxString tmp_str = url_proxy; - int pos = tmp_str.Find(wxT(':')); - if (pos == -1) - return; - - wxString hostname = tmp_str(0, pos), - port = tmp_str(pos+1, tmp_str.Length()-pos); - wxIPV4address addr; - - if (!addr.Hostname(hostname)) - return; - if (!addr.Service(port)) - return; - - if (ms_proxyDefault) - // Finally, when all is right, we connect the new proxy. - ms_proxyDefault->Close(); - else - ms_proxyDefault = new wxHTTP(); - ms_proxyDefault->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason - } + if (ms_proxyDefault) + // Finally, when all is right, we connect the new proxy. + ms_proxyDefault->Close(); + else + ms_proxyDefault = new wxHTTP(); + ms_proxyDefault->Connect(addr, true); // Watcom needs the 2nd arg for some reason + } } void wxURL::SetProxy(const wxString& url_proxy) @@ -368,7 +355,7 @@ void wxURL::SetProxy(const wxString& url_proxy) delete m_proxy; } - m_useProxy = FALSE; + m_useProxy = false; } else { @@ -380,7 +367,7 @@ void wxURL::SetProxy(const wxString& url_proxy) tmp_str = url_proxy; pos = tmp_str.Find(wxT(':')); // This is an invalid proxy name. - if (pos == -1) + if (pos == wxNOT_FOUND) return; hostname = tmp_str(0, pos); @@ -393,16 +380,90 @@ void wxURL::SetProxy(const wxString& url_proxy) if (m_proxy && m_proxy != ms_proxyDefault) delete m_proxy; m_proxy = new wxHTTP(); - m_proxy->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason + m_proxy->Connect(addr, true); // Watcom needs the 2nd arg for some reason CleanData(); // Reparse url. - m_useProxy = TRUE; + m_useProxy = true; ParseURL(); } } +#endif // wxUSE_PROTOCOL_HTTP + +// ---------------------------------------------------------------------- +// wxURLModule +// +// A module which deletes the default proxy if we created it +// ---------------------------------------------------------------------- + +#if wxUSE_SOCKETS + +class wxURLModule : public wxModule +{ +public: + virtual bool OnInit(); + virtual void OnExit(); + +private: + DECLARE_DYNAMIC_CLASS(wxURLModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule) + +bool wxURLModule::OnInit() +{ +#if wxUSE_PROTOCOL_HTTP + // env var HTTP_PROXY contains the address of the default proxy to use if + // set, but don't try to create this proxy right now because it will slow + // down the program startup (especially if there is no DNS server + // available, in which case it may take up to 1 minute) + + if ( wxGetenv(_T("HTTP_PROXY")) ) + { + wxURL::ms_useDefaultProxy = true; + } +#endif // wxUSE_PROTOCOL_HTTP + return true; +} + +void wxURLModule::OnExit() +{ +#if wxUSE_PROTOCOL_HTTP + delete wxURL::ms_proxyDefault; + wxURL::ms_proxyDefault = NULL; +#endif // wxUSE_PROTOCOL_HTTP +} + #endif // wxUSE_SOCKETS +// --------------------------------------------------------------------------- +// +// wxURL Compatibility +// +// --------------------------------------------------------------------------- + +#if WXWIN_COMPATIBILITY_2_4 + +#include "wx/url.h" + +wxString wxURL::GetProtocolName() const +{ + return m_scheme; +} + +wxString wxURL::GetHostName() const +{ + return m_server; +} + +wxString wxURL::GetPath() const +{ + return m_path; +} + +//Note that this old code really doesn't convert to a URI that well and looks +//more like a dirty hack than anything else... + wxString wxURL::ConvertToValidURI(const wxString& uri, const wxChar* delims) { wxString out_str; @@ -422,7 +483,7 @@ wxString wxURL::ConvertToValidURI(const wxString& uri, const wxChar* delims) else { // GRG, Apr/2000: modified according to the URI definition (RFC 2396) - // + // // - Alphanumeric characters are never escaped // - Unreserved marks are never escaped // - Delimiters must be escaped if they appear within a component @@ -450,80 +511,9 @@ wxString wxURL::ConvertToValidURI(const wxString& uri, const wxChar* delims) wxString wxURL::ConvertFromURI(const wxString& uri) { - wxString new_uri; - - size_t i = 0; - while (i < uri.Len()) - { - int code; - if (uri[i] == wxT('%')) - { - i++; - if (uri[i] >= wxT('A') && uri[i] <= wxT('F')) - code = (uri[i] - wxT('A') + 10) * 16; - else if (uri[i] >= wxT('a') && uri[i] <= wxT('f')) - code = (uri[i] - wxT('a') + 10) * 16; - else - code = (uri[i] - wxT('0')) * 16; - - i++; - if (uri[i] >= wxT('A') && uri[i] <= wxT('F')) - code += (uri[i] - wxT('A')) + 10; - else if (uri[i] >= wxT('a') && uri[i] <= wxT('f')) - code += (uri[i] - wxT('a')) + 10; - else - code += (uri[i] - wxT('0')); - - i++; - new_uri += (wxChar)code; - continue; - } - new_uri += uri[i]; - i++; - } - return new_uri; -} - -// ---------------------------------------------------------------------- -// A module which deletes the default proxy if we created it -// ---------------------------------------------------------------------- - -#if wxUSE_SOCKETS - -class wxURLModule : public wxModule -{ -public: - virtual bool OnInit(); - virtual void OnExit(); - -private: - DECLARE_DYNAMIC_CLASS(wxURLModule) -}; - -IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule) - -bool wxURLModule::OnInit() -{ - // env var HTTP_PROXY contains the address of the default proxy to use if - // set, but don't try to create this proxy right now because it will slow - // down the program startup (especially if there is no DNS server - // available, in which case it may take up to 1 minute) - - if ( getenv("HTTP_PROXY") ) - { - wxURL::ms_useDefaultProxy = TRUE; - } - - return TRUE; + return wxURI::Unescape(uri); } -void wxURLModule::OnExit() -{ - delete wxURL::ms_proxyDefault; - wxURL::ms_proxyDefault = NULL; -} - -#endif // wxUSE_SOCKETS +#endif //WXWIN_COMPATIBILITY_2_4 #endif // wxUSE_URL -