Bug 1185583 - Fix missing unresolved external symbols in mailnews/ from falloout of Bug 1143922. rs=IanN a=IanN in a CLOSED TREE.

mailnews/base/util/nsMsgProtocol.cpp

@@ -39,6 +39,7 @@
 #include "nsAlgorithm.h"
 #include "mozilla/Services.h"
 #include <algorithm>
+#include "nsContentSecurityManager.h"
 
 #undef PostMessage // avoid to collision with WinUser.h
 
@@ -512,6 +513,14 @@ NS_IMETHODIMP nsMsgProtocol::Open(nsIInputStream **_retval)
   return NS_ImplementChannelOpen(this, _retval);
 }
 
+NS_IMETHODIMP nsMsgProtocol::Open2(nsIInputStream **_retval)
+{
+  nsCOMPtr<nsIStreamListener> listener;
+  nsresult rv = nsContentSecurityManager::doContentSecurityCheck(this, listener);
+  NS_ENSURE_SUCCESS(rv, rv);
+  return Open(_retval);
+}
+
 NS_IMETHODIMP nsMsgProtocol::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt)
 {
     int32_t port;
@@ -535,6 +544,14 @@ NS_IMETHODIMP nsMsgProtocol::AsyncOpen(nsIStreamListener *listener, nsISupports
     return LoadUrl(m_url, nullptr);
 }
 
+NS_IMETHODIMP nsMsgProtocol::AsyncOpen2(nsIStreamListener *aListener)
+{
+    nsCOMPtr<nsIStreamListener> listener = aListener;
+    nsresult rv = nsContentSecurityManager::doContentSecurityCheck(this, listener);
+    NS_ENSURE_SUCCESS(rv, rv);
+    return AsyncOpen(listener, nullptr);
+}
+
 NS_IMETHODIMP nsMsgProtocol::GetLoadFlags(nsLoadFlags *aLoadFlags)
 {
     *aLoadFlags = mLoadFlags;

mailnews/imap/src/nsImapProtocol.cpp

@@ -76,6 +76,7 @@ PRLogModuleInfo *IMAP;
 #include "nsAlgorithm.h"
 #include "mozilla/Logging.h"
 #include "nsIPrincipal.h"
+#include "nsContentSecurityManager.h"
 
 using namespace mozilla;
 
@@ -8971,6 +8972,14 @@ NS_IMETHODIMP nsImapMockChannel::Open(nsIInputStream **_retval)
   return NS_ImplementChannelOpen(this, _retval);
 }
 
+NS_IMETHODIMP nsImapMockChannel::Open2(nsIInputStream **_retval)
+{
+  nsCOMPtr<nsIStreamListener> listener;
+  nsresult rv = nsContentSecurityManager::doContentSecurityCheck(this, listener);
+  NS_ENSURE_SUCCESS(rv, rv);
+  return Open(_retval);
+}
+
 NS_IMETHODIMP
 nsImapMockChannel::OnCacheEntryAvailable(nsICacheEntryDescriptor *entry, nsCacheAccessMode access, nsresult status)
 {
@@ -9408,6 +9417,14 @@ NS_IMETHODIMP nsImapMockChannel::AsyncOpen(nsIStreamListener *listener, nsISuppo
   return ReadFromImapConnection();
 }
 
+NS_IMETHODIMP nsImapMockChannel::AsyncOpen2(nsIStreamListener *aListener)
+{
+    nsCOMPtr<nsIStreamListener> listener = aListener;
+    nsresult rv = nsContentSecurityManager::doContentSecurityCheck(this, listener);
+    NS_ENSURE_SUCCESS(rv, rv);
+    return AsyncOpen(listener, nullptr);
+}
+
 nsresult nsImapMockChannel::SetupPartExtractorListener(nsIImapUrl * aUrl, nsIStreamListener * aConsumer)
 {
   // if the url we are loading refers to a specific part then we need

mailnews/imap/src/nsImapService.cpp

@@ -450,7 +450,8 @@ NS_IMETHODIMP nsImapService::DisplayMessage(const char *aMessageURI,
 
       nsCOMPtr<nsISupports> aCtxt = do_QueryInterface(uri);
       //  now try to open the channel passing in our display consumer as the listener
-      return aChannel->AsyncOpen(aStreamListener, aCtxt);
+      rv = aChannel->AsyncOpen(aStreamListener, aCtxt);
+      return rv;
     }
   }
 

mailnews/news/src/nsNNTPProtocol.cpp

@@ -77,6 +77,7 @@
 
 #include "nsIInputStreamPump.h"
 #include "nsIProxyInfo.h"
+#include "nsContentSecurityManager.h"
 
 #include <time.h>
 
@@ -937,6 +938,14 @@ NS_IMETHODIMP nsNNTPProtocol::AsyncOpen(nsIStreamListener *listener, nsISupports
   return nsMsgProtocol::AsyncOpen(listener, ctxt);
 }
 
+NS_IMETHODIMP nsNNTPProtocol::AsyncOpen2(nsIStreamListener *aListener)
+{
+    nsCOMPtr<nsIStreamListener> listener = aListener;
+    nsresult rv = nsContentSecurityManager::doContentSecurityCheck(this, listener);
+    NS_ENSURE_SUCCESS(rv, rv);
+    return AsyncOpen(listener, nullptr);
+}
+
 nsresult nsNNTPProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer)
 {
   NS_ENSURE_ARG_POINTER(aURL);

mailnews/news/src/nsNNTPProtocol.h

@@ -146,6 +146,7 @@ public:
   NS_IMETHOD Cancel(nsresult status);  // handle stop button
   NS_IMETHOD GetContentType(nsACString &aContentType);
   NS_IMETHOD AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt);
+  NS_IMETHOD AsyncOpen2(nsIStreamListener *listener);
   NS_IMETHOD GetOriginalURI(nsIURI* *aURI);
   NS_IMETHOD SetOriginalURI(nsIURI* aURI);
 

mailnews/news/src/nsNntpMockChannel.cpp

@@ -10,6 +10,7 @@
 #include "nsNNTPProtocol.h"
 #include "nsNetUtil.h"
 #include "nsIInputStream.h"
+#include "nsContentSecurityManager.h"
 
 NS_IMPL_ISUPPORTS(nsNntpMockChannel, nsIChannel, nsIRequest)
 
@@ -272,6 +273,14 @@ NS_IMETHODIMP nsNntpMockChannel::Open(nsIInputStream **_retval)
   return NS_ImplementChannelOpen(this, _retval);
 }
 
+NS_IMETHODIMP nsNntpMockChannel::Open2(nsIInputStream **_retval)
+{
+  nsCOMPtr<nsIStreamListener> listener;
+  nsresult rv = nsContentSecurityManager::doContentSecurityCheck(this, listener);
+  NS_ENSURE_SUCCESS(rv, rv);
+  return Open(_retval);
+}
+
 NS_IMETHODIMP nsNntpMockChannel::AsyncOpen(nsIStreamListener *listener,
                                            nsISupports *ctxt)
 {
@@ -281,6 +290,14 @@ NS_IMETHODIMP nsNntpMockChannel::AsyncOpen(nsIStreamListener *listener,
   return NS_OK;
 }
 
+NS_IMETHODIMP nsNntpMockChannel::AsyncOpen2(nsIStreamListener *aListener)
+{
+    nsCOMPtr<nsIStreamListener> listener = aListener;
+    nsresult rv = nsContentSecurityManager::doContentSecurityCheck(this, listener);
+    NS_ENSURE_SUCCESS(rv, rv);
+    return AsyncOpen(listener, nullptr);
+}
+
 nsresult
 nsNntpMockChannel::AttachNNTPConnection(nsNNTPProtocol &protocol)
 {