Issue #1234 - Convert strings associated with URL's

src/plugin/PluginWbPassThrough.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginWbPassThrough.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #include "PluginFilter.h"
 #include "PluginSettings.h"
 #include "PluginClass.h"
 #include "PluginSystem.h"
 
@@ skipping 27 matching lines @@
   }
   // It is important to have this check last, since it is rather generic, and might overlay text/html, for example
   if (mimeType.Find(L"xml") >= 0)
   {
     return CFilter::contentTypeXmlHttpRequest;
   }
 
   return CFilter::contentTypeAny;
 }
 
-int WBPassthruSink::GetContentTypeFromURL(CString src)
+int WBPassthruSink::GetContentTypeFromURL(std::wstring src)

[sergei, 2014/10/17 10:10:12]

`const std::wstring&`

 {
-  CString srcExt = src;
+  CString srcLegacy = ToCString(src);
+  CString srcExt = srcLegacy;
 
   int pos = 0;
-  if ((pos = src.Find('?')) > 0)
+  if ((pos = srcLegacy.Find('?')) > 0)
   {
-    srcExt = src.Left(pos);
+    srcExt = srcLegacy.Left(pos);
   }
 
   int lastDotIndex = srcExt.ReverseFind('.');
   if (lastDotIndex < 0)
     return CFilter::contentTypeAny;
   CString ext = srcExt.Mid(lastDotIndex);
   if (ext == L".jpg" || ext == L".gif" || ext == L".png" || ext == L".jpeg")
   {
     return CFilter::contentTypeImage;
   }
@@ skipping 17 matching lines @@
   {
     return CFilter::contentTypeSubdocument;
   }
   else
   {
     return CFilter::contentTypeAny & ~CFilter::contentTypeSubdocument;
   }
 
 }
 
-int WBPassthruSink::GetContentType(CString mimeType, std::wstring domain, CString src)
+int WBPassthruSink::GetContentType(CString mimeType, std::wstring domain, std::wstring src)

[sergei, 2014/10/17 10:10:12]

const ATL::CString&, const std::wstring&

 {
   // No referer or mime type
   // BINDSTRING_XDR_ORIGIN works only for IE v8+
   if (mimeType.IsEmpty() && domain.empty() && CPluginClient::GetInstance()->GetIEVersion() >= 8)
   {
     return CFilter::contentTypeXmlHttpRequest;
   }
   int contentType = GetContentTypeFromMimeType(mimeType);
   if (contentType == CFilter::contentTypeAny)
   {
     contentType = GetContentTypeFromURL(src);
   }
   return contentType;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
 //WBPassthruSink
 //Monitor and/or cancel every request and responde
 //WB makes, including images, sounds, scripts, etc
 ////////////////////////////////////////////////////////////////////////////////////////
 HRESULT WBPassthruSink::OnStart(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
                                 IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved,
                                 IInternetProtocol* pTargetProtocol)
 {
 
   m_pTargetProtocol = pTargetProtocol;
   bool isBlocked = false;
   m_shouldBlock = false;
   m_lastDataReported = false;
-  CString src;
-  src.Append(szUrl);
-  DEBUG_GENERAL(src);
-  CPluginClient::UnescapeUrl(src);
+  std::wstring src(szUrl);
+  DEBUG_GENERAL(ToCString(src));
+  UnescapeUrl(src);
 
   std::wstring boundDomain;
   CString mimeType;
   LPOLESTR mime[10];
   if (pOIBindInfo)
   {
     ULONG resLen = 0;
 
     // Apparently IE will report random mime type if there's more then 1 in the list.
     // So we get the whole list and just use the first one (top priority one)
@@ skipping 21 matching lines @@
   ULONG len2 = 2048;
 
   int contentType = CFilter::contentTypeAny;
 
   CPluginTab* tab = CPluginClass::GetTab(::GetCurrentThreadId());
   CPluginClient* client = CPluginClient::GetInstance();
 
 
   if (tab && client)
   {
-    CString documentUrl = tab->GetDocumentUrl();
+    std::wstring documentUrl = tab->GetDocumentUrl();
     // Page is identical to document => don't block
     if (documentUrl == src)
     {
       // fall through
     }
-    else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(to_wstring(documentUrl)))
+    else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(documentUrl))
     {
-      boundDomain = to_wstring(tab->GetDocumentUrl());
+      boundDomain = tab->GetDocumentUrl();
       contentType = CFilter::contentTypeAny;
       if ((tab != 0) && (tab->IsFrameCached(src)))
       {
         contentType = CFilter::contentTypeSubdocument;
       }
       else
       {
         contentType = GetContentType(mimeType, boundDomain, src);
       }
-      if (client->ShouldBlock(to_wstring(src), contentType, boundDomain, true))
+      if (client->ShouldBlock(src, contentType, boundDomain, true))
       {
         isBlocked = true;
-        DEBUG_BLOCKER("Blocker::Blocking Http-request:" + src);
+        DEBUG_BLOCKER("Blocker::Blocking Http-request:" + ToCString(src));
       }
     }
     if (!isBlocked)
     {
-      DEBUG_BLOCKER("Blocker::Ignoring Http-request:" + src)
+      DEBUG_BLOCKER("Blocker::Ignoring Http-request:" + ToCString(src))
     }
   }
 
 
   if (tab == NULL)
   {
     contentType = GetContentType(mimeType, boundDomain, src);
-    if (client->ShouldBlock(to_wstring(src), contentType, boundDomain, true))
+    if (client->ShouldBlock(src, contentType, boundDomain, true))
     {
       isBlocked = true;
     }
   }
 
 #ifdef _DEBUG
   CString type;
 
   if (contentType == CFilter::contentTypeDocument) type = "DOCUMENT";
   else if (contentType == CFilter::contentTypeObject) type = "OBJECT";
@@ skipping 174 matching lines @@
   return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI,
     dwReserved, m_spInternetProtocol);
 }
 
  STDMETHODIMP WBPassthru::Read( /* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [out] */ ULONG *pcbRead)
  {
    
    WBPassthruSink* pSink = GetSink();
    return pSink->Read(pv, cb, pcbRead);
  }