Issue 1115 - Some yahoo page not correctly shown on IE8 when ABP enabled

src/plugin/PluginWbPassThrough.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 85 matching lines @@
       return "";
     }
     return ExtractHttpHeader<std::string>(buf, "Accept:", "\r\n");
   }
 
   bool IsXmlHttpRequest(const std::wstring& additionalHeaders)
   {
     auto requestedWithHeader = ExtractHttpHeader<std::wstring>(additionalHeaders, L"X-Requested-With:", L"\n");
     return TrimString(requestedWithHeader) == L"XMLHttpRequest";
   }
+
+  ContentType GetContentTypeFromString(const std::wstring& value)
+  {
+    auto lastDotPos = value.rfind(L'.');
+    if (lastDotPos == std::wstring::npos)
+      return ContentType::CONTENT_TYPE_OTHER;
+
+    std::wstring ext = ASCIIStringToLower(value.substr(lastDotPos + 1));
+    if (ext == L"jpg" || ext == L"gif" || ext == L"png" || ext == L"jpeg")
+    {
+      return ContentType::CONTENT_TYPE_IMAGE;
+    }
+    else if (ext == L"css")
+    {
+      return ContentType::CONTENT_TYPE_STYLESHEET;
+    }
+    else if (ext == L"js")
+    {
+      return ContentType::CONTENT_TYPE_SCRIPT;
+    }
+    else if (ext == L"xml")
+    {
+      return ContentType::CONTENT_TYPE_XMLHTTPREQUEST;
+    }
+    else if (ext == L"swf")
+    {
+      return ContentType::CONTENT_TYPE_OBJECT;
+    }
+    else if (ext == L"jsp" || ext == L"php" || ext == L"html")
+    {
+      return ContentType::CONTENT_TYPE_SUBDOCUMENT;
+    }
+    return ContentType::CONTENT_TYPE_OTHER;
+  }
 }
 
 WBPassthruSink::WBPassthruSink()
   : m_currentPositionOfSentPage(0)
   , m_contentType(ContentType::CONTENT_TYPE_OTHER)
   , m_isCustomResponse(false)
 {
 }
 
 ContentType WBPassthruSink::GetContentTypeFromMimeType(const CString& mimeType)
@@ skipping 22 matching lines @@
   if (mimeType.Find(L"xml") >= 0)
   {
     return ContentType::CONTENT_TYPE_XMLHTTPREQUEST;
   }
 
   return ContentType::CONTENT_TYPE_OTHER;
 }
 
 ContentType WBPassthruSink::GetContentTypeFromURL(const std::wstring& src)
 {
-  CString srcLegacy = ToCString(src);
-  CString srcExt = srcLegacy;
-
-  int pos = 0;
-  if ((pos = srcLegacy.Find('?')) > 0)
+  std::wstring schemeAndHierarchicalPart = GetSchemeAndHierarchicalPart(src);
+  auto contentType = GetContentTypeFromString(schemeAndHierarchicalPart);
+  if (contentType == ContentType::CONTENT_TYPE_OTHER &&
+    AdblockPlus::IE::InstalledMajorVersion() == 8)
   {
-    srcExt = srcLegacy.Left(pos);
+    std::wstring queryString = GetQueryString(src);
+    wchar_t* nextToken = nullptr;
+    const wchar_t* token = wcstok_s(&queryString[0], L"&=", &nextToken);
+    while (token != nullptr)
+    {
+      contentType = GetContentTypeFromString(token);
+      if (contentType != ContentType::CONTENT_TYPE_OTHER)
+      {
+         return contentType;
+      }
+      token = wcstok_s(nullptr, L"&=", &nextToken);
+    }
   }
-
-  int lastDotIndex = srcExt.ReverseFind('.');
-  if (lastDotIndex < 0)
-    return ContentType::CONTENT_TYPE_OTHER;
-  CString ext = srcExt.Mid(lastDotIndex);
-  if (ext == L".jpg" || ext == L".gif" || ext == L".png" || ext == L".jpeg")
-  {
-    return ContentType::CONTENT_TYPE_IMAGE;
-  }
-  else if (ext == L".css")
-  {
-    return ContentType::CONTENT_TYPE_STYLESHEET;
-  }
-  else if (ext.Right(3) == L".js")
-  {
-    return ContentType::CONTENT_TYPE_SCRIPT;
-  }
-  else if (ext == L".xml")
-  {
-    return ContentType::CONTENT_TYPE_XMLHTTPREQUEST;
-  }
-  else if (ext == L".swf")
-  {
-    return ContentType::CONTENT_TYPE_OBJECT;
-  }
-  else if (ext == L".jsp" || ext == L".php" || ext == L".html")
-  {
-    return ContentType::CONTENT_TYPE_SUBDOCUMENT;
-  }
-  return ContentType::CONTENT_TYPE_OTHER;
+  return contentType;
 }
 
 ContentType WBPassthruSink::GetContentType(const CString& mimeType, const std::wstring& domain, const std::wstring& src)
 {
   // No referer or mime type
   // BINDSTRING_XDR_ORIGIN works only for IE v8+
   if (mimeType.IsEmpty() && domain.empty() && AdblockPlus::IE::InstalledMajorVersion() >= 8)
   {
     return ContentType::CONTENT_TYPE_XMLHTTPREQUEST;
   }
@@ skipping 229 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->OnRead(pv, cb, pcbRead);
 }