Unified Diff: src/plugin/PluginWbPassThrough.cpp
Issue 6299667012780032:
Issues #696,1231,1264,1265 - Improve handling in PassthroughApp (Closed)
Patch Set: Get rid of yoda style and rename blockedByABPPageSize local var
Created Sept. 22, 2014, 4:14 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« src/plugin/PluginWbPassThrough.h ('k')
|
src/plugin/SinkPolicy.h » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/plugin/PluginWbPassThrough.cpp |
| =================================================================== |
| --- a/src/plugin/PluginWbPassThrough.cpp |
| +++ b/src/plugin/PluginWbPassThrough.cpp |
| @@ -9,14 +9,12 @@ |
| #include "PluginSettings.h" |
| #include "PluginClass.h" |
| #include "PluginSystem.h" |
| - |
| +#include <WinInet.h> |
| #include "wtypes.h" |
| -EXTERN_C IMAGE_DOS_HEADER __ImageBase; |
| - |
| namespace |
| { |
| - std::string g_myPageBlocked = "<!DOCTYPE html>" |
| + std::string g_blockedByABPPage = "<!DOCTYPE html>" |
| "<html>" |
| "<body>" |
| "<!-- blocked by AdblockPlus -->" |
| @@ -24,7 +22,14 @@ |
| "</html>"; |
| } |
| -int WBPassthruSink::GetContentTypeFromMimeType(CString mimeType) |
| +WBPassthruSink::WBPassthruSink() |
| + : m_currentPositionOfSentPage(0) |
| + , m_contentType(CFilter::EContentType::contentTypeAny) |
| + , m_blockedInTransaction(false) |
| +{ |
| +} |
| + |
| +int WBPassthruSink::GetContentTypeFromMimeType(const CString& mimeType) |
| { |
| if (mimeType.Find(L"image/") >= 0) |
| { |
| @@ -55,7 +60,7 @@ |
| return CFilter::contentTypeAny; |
| } |
| -int WBPassthruSink::GetContentTypeFromURL(CString src) |
| +int WBPassthruSink::GetContentTypeFromURL(const CString& src) |
| { |
| CString srcExt = src; |
| @@ -93,14 +98,10 @@ |
| { |
| return CFilter::contentTypeSubdocument; |
| } |
| - else |
| - { |
| - return CFilter::contentTypeAny & ~CFilter::contentTypeSubdocument; |
| - } |
| - |
| + return CFilter::contentTypeAny; |
| } |
| -int WBPassthruSink::GetContentType(CString mimeType, CString domain, CString src) |
| +int WBPassthruSink::GetContentType(const CString& mimeType, const CString& domain, const CString& src) |
| { |
| // No referer or mime type |
| // BINDSTRING_XDR_ORIGIN works only for IE v8+ |
| @@ -127,38 +128,44 @@ |
| { |
| m_pTargetProtocol = pTargetProtocol; |
| bool isBlocked = false; |
| - m_currentPositionOfSentPage = 0; |
| - CString src; |
| - src.Append(szUrl); |
| + CString src = szUrl; |
| DEBUG_GENERAL(src); |
| CPluginClient::UnescapeUrl(src); |
| - CString boundDomain; |
| + // call the impl of the base class as soon as possible because it initializes the base class |
| + // members, used by this method. It queries for the required interfaces. |
| + HRESULT hr = BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol); |
| + if (FAILED(hr)) |
| + { |
| + return hr; |
| + } |
| + |
| 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) |
| + LPOLESTR mime[10]; |
| 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) |
| - { |
| + LPOLESTR bindString = nullptr; |
| + pOIBindInfo->GetBindString(BINDSTRING_FLAG_BIND_TO_OBJECT, &bindString, 1, &resLen); |
| + LPOLESTR domainRetrieved = nullptr; |
| + if (resLen == 0 || wcscmp(bindString, L"FALSE") == 0) |
| + { |
| HRESULT hr = pOIBindInfo->GetBindString(BINDSTRING_XDR_ORIGIN, &domainRetrieved, 1, &resLen); |
| - |
| if ((hr == S_OK) && domainRetrieved && (resLen > 0)) |
| { |
| - boundDomain.SetString(domainRetrieved); |
| + m_boundDomain = domainRetrieved; |
| } |
| } |
| + // We can obtain IBindCtx* here, but IEnumString obtained via IBindCtx::EnumObjectParam |
| + // does not return any parameter, so it's useless. |
| } |
| CString cookie; |
| @@ -166,12 +173,9 @@ |
| ULONG len2 = 2048; |
| #ifdef SUPPORT_FILTER |
| - int contentType = CFilter::contentTypeAny; |
| - |
| CPluginTab* tab = CPluginClass::GetTab(::GetCurrentThreadId()); |
| CPluginClient* client = CPluginClient::GetInstance(); |
| - |
| if (tab && client) |
| { |
| CString documentUrl = tab->GetDocumentUrl(); |
| @@ -182,120 +186,104 @@ |
| } |
| else if (CPluginSettings::GetInstance()->IsPluginEnabled() && !client->IsWhitelistedUrl(std::wstring(documentUrl))) |
| { |
| - boundDomain = tab->GetDocumentUrl(); |
| - |
| - contentType = CFilter::contentTypeAny; |
| - |
| + m_boundDomain = tab->GetDocumentUrl(); |
| + m_contentType = CFilter::contentTypeAny; |
| #ifdef SUPPORT_FRAME_CACHING |
| - if ((tab != 0) && (tab->IsFrameCached(src))) |
| + if (tab != nullptr && tab->IsFrameCached(src)) |
| { |
| - contentType = CFilter::contentTypeSubdocument; |
| + m_contentType = CFilter::contentTypeSubdocument; |
| } |
| else |
| #endif // SUPPORT_FRAME_CACHING |
| - contentType = GetContentType(mimeType, boundDomain, src); |
| - if (client->ShouldBlock(src, contentType, boundDomain, true)) |
| { |
| - isBlocked = true; |
| - |
| - DEBUG_BLOCKER("Blocker::Blocking Http-request:" + src); |
| + m_contentType = GetContentType(mimeType, m_boundDomain, src); |
| } |
| } |
| - if (!isBlocked) |
| - { |
| - DEBUG_BLOCKER("Blocker::Ignoring Http-request:" + src) |
| - } |
| } |
| + if (tab == nullptr) |
| + { |
| + m_contentType = GetContentType(mimeType, m_boundDomain, src); |
| + } |
| - if (tab == NULL) |
| { |
| - contentType = GetContentType(mimeType, boundDomain, src); |
| - if (client->ShouldBlock(src, contentType, boundDomain, true)) |
| + // Here 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. |
| + ATL::CComPtr<IBindStatusCallback> bscb; |
| + if (SUCCEEDED(QueryServiceFromClient(&bscb)) && !!bscb) |
| { |
| - isBlocked = true; |
| + 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 |
| + ) |
| + { |
| + m_contentType = CFilter::EContentType::contentTypeObjectSubrequest; |
| + } |
| } |
| } |
| -#ifdef _DEBUG |
| - CString type; |
| + // The descision about EContentType::contentTypeAny is made later in |
| + // WBPassthruSink::BeginningTransaction. Sometimes here we cannot detect the request type, but |
| + // in WBPassthruSink::BeginningTransaction the header Accept is available which allows to |
| + // obtain the "request type" in our terminology. |
| + if (nullptr != client |
| + && CFilter::EContentType::contentTypeAny != m_contentType |
| + && client->ShouldBlock(src, m_contentType, m_boundDomain, true)) |
| + { |
| + isBlocked = true; |
| + } |
| - if (contentType == CFilter::contentTypeDocument) type = "DOCUMENT"; |
| - else if (contentType == CFilter::contentTypeObject) type = "OBJECT"; |
| - else if (contentType == CFilter::contentTypeImage) type = "IMAGE"; |
| - else if (contentType == CFilter::contentTypeScript) type = "SCRIPT"; |
| - else if (contentType == CFilter::contentTypeOther) type = "OTHER"; |
| - else if (contentType == CFilter::contentTypeUnknown) type = "OTHER"; |
| - else if (contentType == CFilter::contentTypeSubdocument) type = "SUBDOCUMENT"; |
| - else if (contentType == CFilter::contentTypeStyleSheet) type = "STYLESHEET"; |
| - else type = "OTHER"; |
| - |
| - if (isBlocked) |
| + // For IE6 and earlier there is iframe back button issue, so avoid it. |
| + if (isBlocked && client->GetIEVersion() > 6) |
| { |
| - 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) |
| + handled = true; |
| + if (CFilter::EContentType::contentTypeImage == m_contentType) |
| { |
| - BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol); |
| - handled = true; |
| // IE shows a cross that img is not loaded |
| return INET_E_REDIRECT_FAILED; |
| } |
| - if (contentType == CFilter::contentTypeSubdocument && isBlocked) |
| + if (CFilter::EContentType::contentTypeSubdocument == m_contentType) |
| { |
| PassthroughAPP::CustomSinkStartPolicy<WBPassthru, WBPassthruSink>::GetProtocol(this)->m_shouldSupplyCustomContent = true; |
| - BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol); |
| - |
| m_spInternetProtocolSink->ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE, L"text/html"); |
| - m_spInternetProtocolSink->ReportData(BSCF_FIRSTDATANOTIFICATION, 0, static_cast<ULONG>(g_myPageBlocked.size())); |
| - handled = true; |
| + m_spInternetProtocolSink->ReportData(BSCF_FIRSTDATANOTIFICATION, 0, static_cast<ULONG>(g_blockedByABPPage.size())); |
| return S_OK; |
| } |
| - if (contentType == CFilter::contentTypeScript && isBlocked) |
| + if (CFilter::EContentType::contentTypeScript == m_contentType) |
| { |
| - 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:"); |
| - handled = true; |
| return INET_E_REDIRECT_FAILED; |
| } |
| - if (contentType == CFilter::contentTypeXmlHttpRequest && isBlocked) |
| + if (CFilter::EContentType::contentTypeXmlHttpRequest == m_contentType) |
| { |
| - BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol); |
| m_spInternetProtocolSink->ReportResult(INET_E_REDIRECTING, 301, L"data:"); |
| - handled = true; |
| return INET_E_REDIRECT_FAILED; |
| } |
| - if (isBlocked) |
| + if (CFilter::EContentType::contentTypeAny != m_contentType) |
| { |
| - BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol); |
| - m_spInternetProtocolSink->ReportResult(S_FALSE, 0, L""); |
| - handled = true; |
| + m_spInternetProtocolSink->ReportResult(INET_E_REDIRECTING, 301, L"data:"); |
| return INET_E_REDIRECT_FAILED; |
| } |
| } |
| #endif // SUPPORT_FILTER |
| - return isBlocked ? S_FALSE : BaseClass::OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, pTargetProtocol); |
| + return isBlocked ? S_FALSE : hr; |
| } |
| - |
| HRESULT WBPassthruSink::OnRead(void* pv, ULONG cb, ULONG* pcbRead) |
| { |
| - if (nullptr == pv) |
| + if (pv == nullptr) |
| { |
| return E_POINTER; |
| } |
| - if (nullptr == pcbRead) |
| + if (pcbRead == nullptr) |
| { |
| return E_POINTER; |
| } |
| @@ -303,12 +291,12 @@ |
| if (PassthroughAPP::CustomSinkStartPolicy<WBPassthru, WBPassthruSink>::GetProtocol(this)->m_shouldSupplyCustomContent) |
| { |
| - ULONG myPageSize = static_cast<ULONG>(g_myPageBlocked.size()); |
| - auto positionGrow = std::min<ULONG>(cb, static_cast<ULONG>(g_myPageBlocked.size() - m_currentPositionOfSentPage)); |
| - if (0 == positionGrow) { |
| + ULONG blockedByABPPageSize = static_cast<ULONG>(g_blockedByABPPage.size()); |
| + auto positionGrow = std::min<ULONG>(cb, static_cast<ULONG>(blockedByABPPageSize - m_currentPositionOfSentPage)); |
| + if (positionGrow == 0) { |
| return S_FALSE; |
| } |
| - std::copy(g_myPageBlocked.begin(), g_myPageBlocked.begin() + positionGrow, |
| + std::copy(g_blockedByABPPage.begin(), g_blockedByABPPage.begin() + positionGrow, |
| stdext::make_checked_array_iterator(static_cast<char*>(pv), cb)); |
| *pcbRead = positionGrow; |
| m_currentPositionOfSentPage += positionGrow; |
| @@ -316,11 +304,11 @@ |
| if (m_spInternetProtocolSink) |
| { |
| m_spInternetProtocolSink->ReportData(BSCF_INTERMEDIATEDATANOTIFICATION, |
| - static_cast<ULONG>(m_currentPositionOfSentPage), myPageSize); |
| + static_cast<ULONG>(m_currentPositionOfSentPage), blockedByABPPageSize); |
| } |
| - if (myPageSize == m_currentPositionOfSentPage && m_spInternetProtocolSink) |
| + if (blockedByABPPageSize == m_currentPositionOfSentPage && m_spInternetProtocolSink) |
| { |
| - m_spInternetProtocolSink->ReportData(BSCF_DATAFULLYAVAILABLE, myPageSize, myPageSize); |
| + m_spInternetProtocolSink->ReportData(BSCF_DATAFULLYAVAILABLE, blockedByABPPageSize, blockedByABPPageSize); |
| m_spInternetProtocolSink->ReportResult(S_OK, 0, nullptr); |
| } |
| return S_OK; |
| @@ -354,13 +342,63 @@ |
| return m_spInternetProtocolSink ? m_spInternetProtocolSink->Switch(pProtocolData) : E_UNEXPECTED; |
| } |
| -STDMETHODIMP WBPassthruSink::BeginningTransaction(LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) |
| +STDMETHODIMP WBPassthruSink::BeginningTransaction(LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR* pszAdditionalHeaders) |
| { |
| if (pszAdditionalHeaders) |
| { |
| - *pszAdditionalHeaders = 0; |
| + *pszAdditionalHeaders = nullptr; |
| } |
| + CPluginClient* client = nullptr; |
| + if (CFilter::EContentType::contentTypeAny == m_contentType && (client = CPluginClient::GetInstance())) |
| + { |
| + auto acceptHeader = [&]() -> std::string |
| + { |
| + // Despite there is HTTP_QUERY_ACCEPT and other query info flags, they don't work here, |
| + // only HTTP_QUERY_RAW_HEADERS_CRLF | HTTP_QUERY_FLAG_REQUEST_HEADERS does dork. |
| + ATL::CComPtr<IWinInetHttpInfo> winInetHttpInfo; |
| + HRESULT hr = m_spTargetProtocol->QueryInterface(&winInetHttpInfo); |
| + if(FAILED(hr)) |
| + { |
| + return ""; |
| + } |
| + DWORD size = 0; |
| + DWORD flags = 0; |
| + hr = winInetHttpInfo->QueryInfo(HTTP_QUERY_RAW_HEADERS_CRLF | HTTP_QUERY_FLAG_REQUEST_HEADERS, |
| + /*buffer*/nullptr, /* get size */&size, &flags, /*reserved*/ 0); |
| + if(FAILED(hr)) |
| + { |
| + return ""; |
| + } |
| + std::string buf(size, '\0'); |
| + hr = winInetHttpInfo->QueryInfo(HTTP_QUERY_RAW_HEADERS_CRLF | HTTP_QUERY_FLAG_REQUEST_HEADERS, |
| + &buf[0], &size, &flags, 0); |
| + if(FAILED(hr)) |
| + { |
| + return ""; |
| + } |
| + char acceptHeader[] = "Accept:"; |
| + auto acceptHeaderBeginsAt = buf.find(acceptHeader); |
| + if (std::string::npos == acceptHeaderBeginsAt) |
| + { |
| + return ""; |
| + } |
| + acceptHeaderBeginsAt += sizeof(acceptHeader); |
| + auto acceptHeaderEndsAt = buf.find("\n", acceptHeaderBeginsAt); |
| + if (std::string::npos == acceptHeaderEndsAt) |
| + { |
| + return ""; |
| + } |
| + return buf.substr(acceptHeaderBeginsAt, acceptHeaderEndsAt - acceptHeaderBeginsAt); |
| + }(); |
| + m_contentType = GetContentTypeFromMimeType(ATL::CString(acceptHeader.c_str())); |
| + bool isBlocked = client->ShouldBlock(szURL, m_contentType, m_boundDomain, /*debug flag but must be set*/true); |
| + if (isBlocked) |
| + { |
| + m_blockedInTransaction = true; |
| + return E_ABORT; |
| + } |
| + } |
| CComPtr<IHttpNegotiate> spHttpNegotiate; |
| QueryServiceFromClient(&spHttpNegotiate); |
| return spHttpNegotiate ? spHttpNegotiate->BeginningTransaction(szURL, szHeaders,dwReserved, pszAdditionalHeaders) : S_OK; |
| @@ -384,8 +422,22 @@ |
| return m_spInternetProtocolSink ? m_spInternetProtocolSink->ReportProgress(ulStatusCode, szStatusText) : S_OK; |
| } |
| +STDMETHODIMP WBPassthruSink::ReportResult(/* [in] */ HRESULT hrResult, /* [in] */ DWORD dwError, /* [in] */ LPCWSTR szResult) |
| +{ |
| + if (m_blockedInTransaction) |
| + { |
| + // Don't notify the client about aborting of the operation, thus don't call BaseClass::ReportResult. |
| + // Current method is called by the original protocol implementation and we are intercepting the |
| + // call here and eating it, we will call the proper ReportResult later by ourself. |
| + return S_OK; |
| + } |
| + return BaseClass::ReportResult(hrResult, dwError, szResult); |
| +} |
| + |
| + |
| WBPassthru::WBPassthru() |
| : m_shouldSupplyCustomContent(false) |
| + , m_hasOriginalStartCalled(false) |
| { |
| } |
| @@ -409,18 +461,18 @@ |
| STDMETHODIMP WBPassthru::LockRequest(/* [in] */ DWORD options) |
| { |
| - if (m_shouldSupplyCustomContent) |
| + if (!m_hasOriginalStartCalled) |
| { |
| return S_OK; |
| } |
| - return PassthroughAPP::CInternetProtocol<WBStartPolicy>::LockRequest(options); |
| + return BaseClass::LockRequest(options); |
| } |
| STDMETHODIMP WBPassthru::UnlockRequest() |
| { |
| - if (m_shouldSupplyCustomContent) |
| + if (!m_hasOriginalStartCalled) |
| { |
| return S_OK; |
| } |
| - return PassthroughAPP::CInternetProtocol<WBStartPolicy>::UnlockRequest(); |
| + return BaseClass::UnlockRequest(); |
| } |
« no previous file with comments
|
« src/plugin/PluginWbPassThrough.h ('k')
|
src/plugin/SinkPolicy.h » ('j')
|
no next file with comments »
