Issue #41 - Bring method of determining IE version up to date

src/plugin/PluginWbPassThrough.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginWbPassThrough.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginSettings.h"
 #include "PluginClass.h"
 #include "PluginSystem.h"
 #include "Wrapper.h"
 #include "PluginUtil.h"
+#include "../shared/Utils.h"
 
 #include "wtypes.h"
 
 EXTERN_C IMAGE_DOS_HEADER __ImageBase;
 
 
 WBPassthruSink::WBPassthruSink()
 {
   m_pTargetProtocol = NULL;
 }
@@ skipping 75 matching lines @@
   {
     return CFilter::contentTypeAny & ~CFilter::contentTypeSubdocument;
   }
 
 }
 
 int WBPassthruSink::GetContentType(std::wstring mimeType, std::wstring domain, std::wstring src)
 {
   // No referer or mime type
   // BINDSTRING_XDR_ORIGIN works only for IE v8+
-  if (mimeType.empty() && domain.empty() && CPluginClient::GetInstance()->GetIEVersion() >= 8)

[Oleksandr, 2014/06/22 21:53:17]

The means we would falsely classify requests as XmlHttpRequest on IE6 and IE7.
I'm in favor of leaving this and below checks

+  if ( mimeType.empty() && domain.empty() )
   {
     return CFilter::contentTypeXmlHttpRequest;
   }
   int contentType = GetContentTypeFromMimeType(mimeType);
   if (contentType == CFilter::contentTypeAny)
   {
     contentType = GetContentTypeFromURL(src);
   }
   return contentType;
 }
@@ skipping 99 matching lines @@
   {
     CPluginDebug::DebugResultBlocking(type, src, boundDomain);
   }
   else
   {
     CPluginDebug::DebugResultIgnoring(type, src, boundDomain);
   }
 #endif
 
   //Fixes the iframe back button issue
-  if (client->GetIEVersion() > 6)
+  if ((contentType == CFilter::contentTypeImage) && (isBlocked))
   {
-    if ((contentType == CFilter::contentTypeImage) && (isBlocked))
+    m_shouldBlock = true;
+    BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
+
+    return INET_E_REDIRECT_FAILED;
+
+  }
+  if (((contentType == CFilter::contentTypeSubdocument))&& (isBlocked)) 
+  {
+    m_shouldBlock = true;
+    BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
+
+    m_spInternetProtocolSink->ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE, L"text/html");
+
+    //Here we check if we are running on Windows 8 Consumer Preview. 
+    //For some reason on that environment the next line causes IE to crash
+    if (CPluginSettings::GetInstance()->GetWindowsBuildNumber() != 8250)
     {
-      m_shouldBlock = true;
-      BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
+      m_spInternetProtocolSink->ReportResult(INET_E_REDIRECTING, 301, L"res://mshtml.dll/blank.htm");
+    }
 
-      return INET_E_REDIRECT_FAILED;
+    return INET_E_REDIRECT_FAILED;
+  } 
+  if (((contentType == CFilter::contentTypeScript))&& (isBlocked)) 
+  {
+    m_shouldBlock = true;
+    BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
+    m_spInternetProtocolSink->ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE, L"text/javascript");
+    m_spInternetProtocolSink->ReportResult(INET_E_REDIRECTING, 301, L"data:");
+    return INET_E_REDIRECT_FAILED;
+  }
+  if ((isBlocked)) 
+  {
+    m_shouldBlock = true;
+    BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
+    m_spInternetProtocolSink->ReportResult(S_FALSE, 0, L"");
 
-    }
-    if (((contentType == CFilter::contentTypeSubdocument))&& (isBlocked)) 
-    {
-      m_shouldBlock = true;
-      BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
-
-      m_spInternetProtocolSink->ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE, L"text/html");
-
-      //Here we check if we are running on Windows 8 Consumer Preview. 
-      //For some reason on that environment the next line causes IE to crash
-      if (CPluginSettings::GetInstance()->GetWindowsBuildNumber() != 8250)
-      {
-        m_spInternetProtocolSink->ReportResult(INET_E_REDIRECTING, 301, L"res://mshtml.dll/blank.htm");
-      }
-
-      return INET_E_REDIRECT_FAILED;
-    } 
-    if (((contentType == CFilter::contentTypeScript))&& (isBlocked)) 
-    {
-      m_shouldBlock = true;
-      BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
-      m_spInternetProtocolSink->ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE, L"text/javascript");
-      m_spInternetProtocolSink->ReportResult(INET_E_REDIRECTING, 301, L"data:");
-      return INET_E_REDIRECT_FAILED;
-    }
-    if ((isBlocked)) 
-    {
-/*      WCHAR tmp[256];
-      wsprintf(tmp, L"URL: %s, domain: %s, mime: %s, type: %d", szUrl, boundDomain, mimeType, contentType); 
-      MessageBox(NULL, tmp, L"", MB_OK);
-      contentType = GetContentType(mimeType, boundDomain, src);
-*/
-      m_shouldBlock = true;
-      BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
-      m_spInternetProtocolSink->ReportResult(S_FALSE, 0, L"");
-
-      return INET_E_REDIRECT_FAILED;
-    }
+    return INET_E_REDIRECT_FAILED;
   }
 #endif // SUPPORT_FILTER
 
   return isBlocked ? S_FALSE : BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol);
 }
 
 
 HRESULT WBPassthruSink::Read(void *pv, ULONG cb, ULONG* pcbRead)
 {
   if (m_shouldBlock)
@@ skipping 77 matching lines @@
   CComPtr<IHttpNegotiate> spHttpNegotiate;
   QueryServiceFromClient(&spHttpNegotiate);
 
   return spHttpNegotiate ? spHttpNegotiate->OnResponse(dwResponseCode, szResponseHeaders, szRequestHeaders, pszAdditionalRequestHeaders) : S_OK;
 }
 
 STDMETHODIMP WBPassthruSink::ReportProgress(ULONG ulStatusCode, LPCWSTR szStatusText)
 {
   return m_spInternetProtocolSink ? m_spInternetProtocolSink->ReportProgress(ulStatusCode, szStatusText) : S_OK;
 }