X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c092213d52eeb0e98b7635116b8405b29dfe5de6..4aa1406671c5d6abded83e3713b423ac4d40b7c9:/src/common/url.cpp?ds=sidebyside diff --git a/src/common/url.cpp b/src/common/url.cpp index cce9ae5701..ea5cc02230 100644 --- a/src/common/url.cpp +++ b/src/common/url.cpp @@ -1,342 +1,353 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: url.cpp +// Name: src/common/url.cpp // Purpose: URL parser // Author: Guilhem Lavaux // Modified by: // Created: 20/07/1997 // RCS-ID: $Id$ // Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "url.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#include -#include +#if wxUSE_URL -#include "wx/string.h" -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/module.h" #include "wx/url.h" +#ifndef WX_PRECOMP + #include "wx/list.h" + #include "wx/string.h" + #include "wx/utils.h" + #include "wx/module.h" +#endif + +#include +#include + IMPLEMENT_CLASS(wxProtoInfo, wxObject) -IMPLEMENT_CLASS(wxURL, wxObject) +IMPLEMENT_CLASS(wxURL, wxURI) // Protocols list wxProtoInfo *wxURL::ms_protocols = NULL; -#if wxUSE_SOCKETS +// Enforce linking of protocol classes: +USE_PROTOCOL(wxFileProto) + +#if wxUSE_PROTOCOL_HTTP +USE_PROTOCOL(wxHTTP) + 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(getenv("HTTP_PROXY")); + SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) ); 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 (so m_protocol != NULL), we pass this section. - if (!m_protocol) { + // If the URL was already parsed (m_protocol != NULL), pass this section. + if (!m_protocol) + { + // Clean up + CleanData(); - // 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) { - // Extract it - if (!PrepHost(last_url)) { - m_error = wxURL_SNTXERR; - return FALSE; - } - } +#if wxUSE_PROTOCOL_HTTP + if (m_useProxy) + { + // 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. - -#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; +#endif // wxUSE_PROTOCOL_HTTP - 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 + if (m_protocol) + // Need to safely delete the socket (pending events) + m_protocol->Destroy(); } 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) -{ - int pos; - - // Find end - pos = url.Find(wxT(':')); - if (pos == -1) - return FALSE; - - m_protoname = url(0, pos); - - url = url(pos+1, url.Length()); - - return TRUE; -} - -bool wxURL::PrepHost(wxString& url) -{ - wxString temp_url; - int pos, pos2; - - if ((url.GetChar(0) != wxT('/')) || (url.GetChar(1) != wxT('/'))) - return FALSE; - - url = url(2, url.Length()); - - pos = url.Find(wxT('/')); - if (pos == -1) - pos = url.Length(); - - if (pos == 0) - return FALSE; - - temp_url = url(0, pos); - url = url(url.Find(wxT('/')), url.Length()); - - // 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); - } - - // 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_user = wxT(""); - m_password = wxT(""); - - if (pos2 == -1) - return TRUE; - - temp_url = temp_url(0, pos2); - pos2 = temp_url.Find(wxT(':')); - - if (pos2 == -1) - return FALSE; - - m_user = temp_url(0, pos2); - m_password = temp_url(pos2+1, url.Length()); - - return TRUE; -} - -bool wxURL::PrepPath(wxString& url) -{ - if (url.Length() != 0) - m_path = ConvertToValidURI(url); - else - m_path = wxT("/"); - return TRUE; -} - bool wxURL::FetchProtocol() { - wxProtoInfo *info = ms_protocols; - - while (info) { - if (m_protoname == info->m_protoname) { - if (m_servname.IsNull()) - m_servname = info->m_servname; + wxProtoInfo *info = ms_protocols; - m_protoinfo = info; - m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject(); - 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; } - info = info->next; - } - return FALSE; + return false; } // -------------------------------------------------------------- -// --------- wxURL get ------------------------------------------ +// GetInputStream // -------------------------------------------------------------- wxInputStream *wxURL::GetInputStream() { - wxInputStream *the_i_stream = NULL; + if (!m_protocol) + { + m_error = wxURL_NOPROTO; + return NULL; + } - if (!m_protocol) { - m_error = wxURL_NOPROTO; - return NULL; - } + m_error = wxURL_NOERR; + if (HasUserInfo()) + { + size_t dwPasswordPos = m_userinfo.find(':'); + + if (dwPasswordPos == wxString::npos) + m_protocol->SetUser(Unescape(m_userinfo)); + else + { + m_protocol->SetUser(Unescape(m_userinfo(0, dwPasswordPos))); + m_protocol->SetPassword(Unescape(m_userinfo(dwPasswordPos+1, m_userinfo.length() + 1))); + } + } - m_error = wxURL_NOERR; - if (m_user != wxT("")) { - m_protocol->SetUser(m_user); - m_protocol->SetPassword(m_password); - } +#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 #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)) { - m_error = wxURL_NOHOST; - return NULL; - } + // 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; + } - addr.Service(m_servname); + addr.Service(m_port); - if (!m_protocol->Connect(addr, TRUE)) // Watcom needs the 2nd arg for some reason - { - m_error = wxURL_CONNERR; - return NULL; + if (!m_protocol->Connect(addr, true)) // Watcom needs the 2nd arg for some reason + { + m_error = wxURL_CONNERR; + return NULL; + } } - } #endif - // When we use a proxy, we have to pass the whole URL to it. - if (m_useProxy) - the_i_stream = m_protocol->GetInputStream(m_url); - else - the_i_stream = m_protocol->GetInputStream(m_path); + wxString fullPath; + + // When we use a proxy, we have to pass the whole URL to it. + if (m_useProxy) + fullPath += m_url; + + if(m_path.empty()) + fullPath += wxT("/"); + else + fullPath += m_path; + + if (HasQuery()) + fullPath += wxT("?") + m_query; - if (!the_i_stream) { - m_error = wxURL_PROTOERR; - return NULL; - } + if (HasFragment()) + fullPath += wxT("#") + m_fragment; - return the_i_stream; + wxInputStream *the_i_stream = m_protocol->GetInputStream(fullPath); + + if (!the_i_stream) + { + m_error = wxURL_PROTOERR; + return NULL; + } + + return the_i_stream; } -#if wxUSE_SOCKETS +#if wxUSE_PROTOCOL_HTTP 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 ( !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 == wxNOT_FOUND) + 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 + } } void wxURL::SetProxy(const wxString& url_proxy) @@ -349,7 +360,7 @@ void wxURL::SetProxy(const wxString& url_proxy) delete m_proxy; } - m_useProxy = FALSE; + m_useProxy = false; } else { @@ -361,11 +372,11 @@ 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); - port = tmp_str(pos, tmp_str.Length()-pos); + port = tmp_str(pos+1, tmp_str.length()-pos); addr.Hostname(hostname); addr.Service(port); @@ -374,68 +385,19 @@ 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_SOCKETS - -wxString wxURL::ConvertToValidURI(const wxString& uri) -{ - wxString out_str; - wxString hexa_code; - size_t i; - - for (i=0;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 - code += (uri[i] - wxT('0')); - i++; - new_uri += (wxChar)code; - continue; - } - new_uri += uri[i]; - i++; - } - return new_uri; -} +#endif // wxUSE_PROTOCOL_HTTP // ---------------------------------------------------------------------- +// wxURLModule +// // A module which deletes the default proxy if we created it // ---------------------------------------------------------------------- @@ -444,6 +406,8 @@ wxString wxURL::ConvertFromURI(const wxString& uri) class wxURLModule : public wxModule { public: + wxURLModule(); + virtual bool OnInit(); virtual void OnExit(); @@ -453,24 +417,38 @@ private: IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule) +wxURLModule::wxURLModule() +{ + // we must be cleaned up before wxSocketModule as otherwise deleting + // ms_proxyDefault from our OnExit() won't work (and can actually crash) + AddDependency(wxClassInfo::FindClass(_T("wxSocketModule"))); +} + 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 ( getenv("HTTP_PROXY") ) + + if ( wxGetenv(_T("HTTP_PROXY")) ) { - wxURL::ms_useDefaultProxy = TRUE; + wxURL::ms_useDefaultProxy = true; } - - return 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 + + +#endif // wxUSE_URL