Issue #1356 - Improve detection of the issuer of the request

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"
@@ skipping 134 matching lines @@
     pOIBindInfo->GetBindString(BINDSTRING_ACCEPT_MIMES, mime, 10, &resLen);
     if (mime && resLen > 0)
     {
       mimeType.SetString(mime[0]);
     }
     LPOLESTR bindToObject = 0;
     pOIBindInfo->GetBindString(BINDSTRING_FLAG_BIND_TO_OBJECT, &bindToObject, 1, &resLen);
     LPOLESTR domainRetrieved = 0;
     if (resLen == 0 || wcscmp(bindToObject, L"FALSE") == 0)
     {   
-      HRESULT hr = pOIBindInfo->GetBindString(BINDSTRING_XDR_ORIGIN, &domainRetrieved, 1, &resLen);
+      HRESULT hr = S_OK;
+      if (CPluginClient::GetInstance()->GetIEVersion() > 8)
+      {
+        hr = pOIBindInfo->GetBindString(BINDSTRING_ROOTDOC_URL, &domainRetrieved, 1, &resLen);
+      }
+      else
+      {
+        hr = pOIBindInfo->GetBindString(BINDSTRING_XDR_ORIGIN, &domainRetrieved, 1, &resLen);
+      }
       
       if ((hr == S_OK) && domainRetrieved && (resLen > 0))
       {
         boundDomain.SetString(domainRetrieved);
       }
     }
   }
 
   CString cookie;
   ULONG len1 = 2048;
@@ skipping 34 matching lines @@
 
         DEBUG_BLOCKER("Blocker::Blocking Http-request:" + src);
       }
     }
     if (!isBlocked)
     {
       DEBUG_BLOCKER("Blocker::Ignoring Http-request:" + src)
     }
   }
 
-
+  // Request from unknown thread, so we don't know the tab
   if (tab == NULL)
   {
     contentType = GetContentType(mimeType, boundDomain, src);
+
+    if (CPluginClient::GetInstance()->GetIEVersion() > 8)
+    {
+      // Find tab based on document URL
+      tab = CPluginClass::GetTab(boundDomain.GetString());
+      if ((tab != 0) && (tab->IsFrameCached(src)))

[Eric, 2014/10/08 17:37:54]

Prefer nullptr to 0, but the idiom we're using (as a rule) is to treat pointers
(and pointer-like objects) as implicitly casting to true if non-null.

+      {
+        contentType = CFilter::contentTypeSubdocument;

[sergei, 2014/10/09 13:46:22]

I would leave the comment somewhere
- that it's only for frames, fetched inside other frames or by third-party
stuff, when the tab is nullptr.
- we can accidentally get the wrong tab. If there is another tab (with the lower
thread id) which contains the same frame.
- the line below is not what we need exactly for the filters. For the case:
tab, root-page src = root.html
    iframe src = 1st-iframe.html
      iframe src = 2nd-iframe.html
the call should be
ShouldBlock(/*src*/2nd-iframe.html, ..., 1st-iframe.html)
but it will be
ShouldBlock(/*src*/2nd-iframe.html, ..., root.html)
Also it might be important to note a detail that IE can have several tabs in the
one process, see IE8 and Loosely-Coupled IE (LCIE).

+        // add frame to a referrer chain
+        if (client->ShouldBlock(boundDomain, contentType, tab->GetDocumentUrl(), true))

[sergei, 2014/10/09 13:46:22]

Instead of `boundDomain` there should be `src`

+        {
+          isBlocked = true;
+        }
+      }
+    }
     if (client->ShouldBlock(src, contentType, boundDomain, true))
     {
       isBlocked = true;
     }
   }
 
 #ifdef _DEBUG
   CString type;
 
   if (contentType == CFilter::contentTypeDocument) type = "DOCUMENT";
@@ skipping 189 matching lines @@
 }
 
 STDMETHODIMP WBPassthru::UnlockRequest()
 {
   if (m_shouldSupplyCustomContent)
   {
     return S_OK;
   }
   return PassthroughAPP::CInternetProtocol<WBStartPolicy>::UnlockRequest();
 }