Issue 1530 - Improve detecting of subrequest issued by flash addon

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"
 #include <WinInet.h>
@@ skipping 225 matching lines @@
   "
   */
   return m_spInternetProtocolSink ? m_spInternetProtocolSink->Switch(pProtocolData) : E_UNEXPECTED;
 }
 
 // This is the heuristic which detects the requests issued by Flash.ocx.
 // It turned out that the implementation from ''Flash.ocx'' (tested version is 15.0.0.152)
 // returns quite minimal configuration in comparison with the implementation from Microsofts'
 // libraries (see grfBINDF and bindInfo.dwOptions). The impl from MS often includes something
 // else.
-bool WBPassthruSink::IsFlashRequest()
+bool WBPassthruSink::IsFlashRequest(const wchar_t* const* additionalHeaders)
 {
+  if (additionalHeaders && *additionalHeaders)
+  {
+    auto flashVersionHeader = ExtractHttpHeader<std::wstring>(*additionalHeaders, L"x-flash-version:", L"\n");
+    if (!TrimString(flashVersionHeader).empty())
+    {
+      return true;
+    }
+  }
   ATL::CComPtr<IBindStatusCallback> bscb;
   if (SUCCEEDED(QueryServiceFromClient(&bscb)) && !!bscb)
   {
     DWORD grfBINDF = 0;
     BINDINFO bindInfo = {};
     bindInfo.cbSize = sizeof(bindInfo);
     if (SUCCEEDED(bscb->GetBindInfo(&grfBINDF, &bindInfo)) &&
       (BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE| BINDF_PULLDATA) == grfBINDF &&
       (BINDINFO_OPTIONS_ENABLE_UTF8 | BINDINFO_OPTIONS_USE_IE_ENCODING) == bindInfo.dwOptions
       )
@@ skipping 16 matching lines @@
   {
     *pszAdditionalHeaders = nullptr;
   }
 
   CComPtr<IHttpNegotiate> httpNegotiate;
   QueryServiceFromClient(&httpNegotiate);
   // This fills the pszAdditionalHeaders with more headers. One of which is the Referer header, which we need.
   // There doesn't seem to be any other way to get this header before the request has been made.
   HRESULT nativeHr = httpNegotiate ? httpNegotiate->BeginningTransaction(szURL, szHeaders, dwReserved, pszAdditionalHeaders) : S_OK;
 
-  if (*pszAdditionalHeaders != 0)
+  if (pszAdditionalHeaders && *pszAdditionalHeaders)
   {
-    m_boundDomain = ExtractHttpHeader<std::wstring>(*pszAdditionalHeaders, L"Referer:", L"\n").c_str();
+    m_boundDomain = ExtractHttpHeader<std::wstring>(*pszAdditionalHeaders, L"Referer:", L"\n");
   }
   m_boundDomain = TrimString(m_boundDomain);
   CPluginTab* tab = CPluginClass::GetTab(::GetCurrentThreadId());
   CPluginClient* client = CPluginClient::GetInstance();
 
   if (tab && client)
   {
     CString documentUrl = tab->GetDocumentUrl();
     // Page is identical to document => don't block
     if (documentUrl == ToCString(src))
     {
       return nativeHr;
     }
     else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(std::wstring(documentUrl)))
     {
       if (tab->IsFrameCached(ToCString(src)))
       {
         m_contentType = CFilter::contentTypeSubdocument;
       }
     }
   }
 
-  if (IsFlashRequest())
+  if (IsFlashRequest(pszAdditionalHeaders))
   {
     m_contentType = CFilter::EContentType::contentTypeObjectSubrequest; 
   }
 
   m_blockedInTransaction = client->ShouldBlock(szURL, m_contentType, m_boundDomain, /*debug flag but must be set*/true);
   if (m_blockedInTransaction)
   {
     return E_ABORT;
   }
   return nativeHr;
@@ skipping 55 matching lines @@
 
 STDMETHODIMP WBPassthru::LockRequest(/* [in] */ DWORD options)
 {
   return BaseClass::LockRequest(options);
 }
 
 STDMETHODIMP WBPassthru::UnlockRequest()
 {
   return BaseClass::UnlockRequest();
 }