Bug 1626570 - Improve handling of copying arrays in netwerk/base/. r=valentin,necko-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D72346

Author: sigiesec

netwerk/base/BackgroundFileSaver.cpp

@@ -7,6 +7,7 @@
 #include "BackgroundFileSaver.h"
 
 #include "ScopedNSSTypes.h"
+#include "mozilla/ArrayAlgorithm.h"
 #include "mozilla/Casting.h"
 #include "mozilla/Logging.h"
 #include "mozilla/Telemetry.h"
@@ -257,7 +258,8 @@ BackgroundFileSaver::GetSignatureInfo(
     return NS_ERROR_NOT_AVAILABLE;
   }
   for (const auto& signatureChain : mSignatureInfo) {
-    aSignatureInfo.AppendElement(signatureChain);
+    aSignatureInfo.AppendElement(TransformIntoNewArray(
+        signatureChain, [](const auto& element) { return element.Clone(); }));
   }
   return NS_OK;
 }
@@ -825,7 +827,7 @@ nsresult BackgroundFileSaver::ExtractSignatureInfo(const nsAString& filePath) {
           nsTArray<uint8_t> cert;
           cert.AppendElements(certChainElement->pCertContext->pbCertEncoded,
                               certChainElement->pCertContext->cbCertEncoded);
-          certList.AppendElement(cert);
+          certList.AppendElement(std::move(cert));
         }
         if (extractionSuccess) {
           mSignatureInfo.AppendElement(std::move(certList));

netwerk/base/DashboardTypes.h

@@ -44,9 +44,9 @@ struct HttpConnInfo {
 
 struct HttpRetParams {
   nsCString host;
-  nsTArray<HttpConnInfo> active;
-  nsTArray<HttpConnInfo> idle;
-  nsTArray<HalfOpenSockets> halfOpens;
+  CopyableTArray<HttpConnInfo> active;
+  CopyableTArray<HttpConnInfo> idle;
+  CopyableTArray<HalfOpenSockets> halfOpens;
   uint32_t counter;
   uint16_t port;
   nsCString httpVersion;

netwerk/base/LoadInfo.cpp

@@ -235,9 +235,10 @@ LoadInfo::LoadInfo(
     }
 
     mInnerWindowID = aLoadingContext->OwnerDoc()->InnerWindowID();
-    mAncestorPrincipals = aLoadingContext->OwnerDoc()->AncestorPrincipals();
+    mAncestorPrincipals =
+        aLoadingContext->OwnerDoc()->AncestorPrincipals().Clone();
     mAncestorOuterWindowIDs =
-        aLoadingContext->OwnerDoc()->AncestorOuterWindowIDs();
+        aLoadingContext->OwnerDoc()->AncestorOuterWindowIDs().Clone();
     MOZ_DIAGNOSTIC_ASSERT(mAncestorPrincipals.Length() ==
                           mAncestorOuterWindowIDs.Length());
     mDocumentHasUserInteracted =
@@ -596,8 +597,8 @@ LoadInfo::LoadInfo(dom::CanonicalBrowsingContext* aBrowsingContext,
     ancestorOuterWindowIDs.AppendElement(ancestorWGP->OuterWindowId());
     ancestorBC = ancestorWGP->BrowsingContext();
   }
-  mAncestorPrincipals = ancestorPrincipals;
-  mAncestorOuterWindowIDs = ancestorOuterWindowIDs;
+  mAncestorPrincipals = std::move(ancestorPrincipals);
+  mAncestorOuterWindowIDs = std::move(ancestorOuterWindowIDs);
   MOZ_DIAGNOSTIC_ASSERT(mAncestorPrincipals.Length() ==
                         mAncestorOuterWindowIDs.Length());
 
@@ -759,11 +760,11 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
       mSendCSPViolationEvents(rhs.mSendCSPViolationEvents),
       mOriginAttributes(rhs.mOriginAttributes),
       mRedirectChainIncludingInternalRedirects(
-          rhs.mRedirectChainIncludingInternalRedirects),
-      mRedirectChain(rhs.mRedirectChain),
-      mAncestorPrincipals(rhs.mAncestorPrincipals),
-      mAncestorOuterWindowIDs(rhs.mAncestorOuterWindowIDs),
-      mCorsUnsafeHeaders(rhs.mCorsUnsafeHeaders),
+          rhs.mRedirectChainIncludingInternalRedirects.Clone()),
+      mRedirectChain(rhs.mRedirectChain.Clone()),
+      mAncestorPrincipals(rhs.mAncestorPrincipals.Clone()),
+      mAncestorOuterWindowIDs(rhs.mAncestorOuterWindowIDs.Clone()),
+      mCorsUnsafeHeaders(rhs.mCorsUnsafeHeaders.Clone()),
       mRequestBlockingReason(rhs.mRequestBlockingReason),
       mForcePreflight(rhs.mForcePreflight),
       mIsPreflight(rhs.mIsPreflight),
@@ -865,8 +866,8 @@ LoadInfo::LoadInfo(
       mSendCSPViolationEvents(aSendCSPViolationEvents),
       mOriginAttributes(aOriginAttributes),
       mAncestorPrincipals(std::move(aAncestorPrincipals)),
-      mAncestorOuterWindowIDs(aAncestorOuterWindowIDs),
-      mCorsUnsafeHeaders(aCorsUnsafeHeaders),
+      mAncestorOuterWindowIDs(aAncestorOuterWindowIDs.Clone()),
+      mCorsUnsafeHeaders(aCorsUnsafeHeaders.Clone()),
       mRequestBlockingReason(aRequestBlockingReason),
       mForcePreflight(aForcePreflight),
       mIsPreflight(aIsPreflight),
@@ -1561,7 +1562,7 @@ void LoadInfo::SetCorsPreflightInfo(const nsTArray<nsCString>& aHeaders,
                                     bool aForcePreflight) {
   MOZ_ASSERT(GetSecurityMode() == nsILoadInfo::SEC_REQUIRE_CORS_DATA_INHERITS);
   MOZ_ASSERT(!mInitialSecurityCheckDone);
-  mCorsUnsafeHeaders = aHeaders;
+  mCorsUnsafeHeaders = aHeaders.Clone();
   mForcePreflight = aForcePreflight;
 }
 

netwerk/base/PartiallySeekableInputStream.cpp

@@ -58,7 +58,7 @@ PartiallySeekableInputStream::PartiallySeekableInputStream(
       mWeakAsyncInputStream(nullptr),
       mWeakInputStreamLength(nullptr),
       mWeakAsyncInputStreamLength(nullptr),
-      mCachedBuffer(aClonedFrom->mCachedBuffer),
+      mCachedBuffer(aClonedFrom->mCachedBuffer.Clone()),
       mBufferSize(aClonedFrom->mBufferSize),
       mPos(aClonedFrom->mPos),
       mClosed(aClonedFrom->mClosed),

netwerk/base/SSLTokensCache.cpp

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "SSLTokensCache.h"
+#include "mozilla/ArrayAlgorithm.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Logging.h"
 #include "nsIOService.h"
@@ -36,6 +37,20 @@ class ExpirationComparator {
   }
 };
 
+SessionCacheInfo SessionCacheInfo::Clone() const {
+  SessionCacheInfo result;
+  result.mEVStatus = mEVStatus;
+  result.mCertificateTransparencyStatus = mCertificateTransparencyStatus;
+  result.mServerCertBytes = mServerCertBytes.Clone();
+  result.mSucceededCertChainBytes =
+      mSucceededCertChainBytes
+          ? Some(TransformIntoNewArray(
+                *mSucceededCertChainBytes,
+                [](const auto& element) { return element.Clone(); }))
+          : Nothing();
+  return result;
+}
+
 StaticRefPtr<SSLTokensCache> SSLTokensCache::gInstance;
 StaticMutex SSLTokensCache::sLock;
 
@@ -206,7 +221,11 @@ nsresult SSLTokensCache::Put(const nsACString& aKey, const uint8_t* aToken,
   rec->mSessionCacheInfo.mServerCertBytes = std::move(certBytes);
 
   rec->mSessionCacheInfo.mSucceededCertChainBytes =
-      std::move(succeededCertChainBytes);
+      succeededCertChainBytes
+          ? Some(TransformIntoNewArray(
+                *succeededCertChainBytes,
+                [](auto& element) { return nsTArray(std::move(element)); }))
+          : Nothing();
 
   if (isEV) {
     rec->mSessionCacheInfo.mEVStatus = psm::EVStatus::EV;
@@ -243,7 +262,7 @@ nsresult SSLTokensCache::Get(const nsACString& aKey,
 
   if (gInstance->mTokenCacheRecords.Get(aKey, &rec)) {
     if (rec->mToken.Length()) {
-      aToken = rec->mToken;
+      aToken = rec->mToken.Clone();
       return NS_OK;
     }
   }
@@ -268,7 +287,7 @@ bool SSLTokensCache::GetSessionCacheInfo(const nsACString& aKey,
   TokenCacheRecord* rec = nullptr;
 
   if (gInstance->mTokenCacheRecords.Get(aKey, &rec)) {
-    aResult = rec->mSessionCacheInfo;
+    aResult = rec->mSessionCacheInfo.Clone();
     return true;
   }
 

netwerk/base/SSLTokensCache.h

@@ -18,6 +18,8 @@ namespace mozilla {
 namespace net {
 
 struct SessionCacheInfo {
+  SessionCacheInfo Clone() const;
+
   psm::EVStatus mEVStatus = psm::EVStatus::NotEV;
   uint16_t mCertificateTransparencyStatus =
       nsITransportSecurityInfo::CERTIFICATE_TRANSPARENCY_NOT_APPLICABLE;

netwerk/base/nsMIMEInputStream.cpp

@@ -392,7 +392,7 @@ bool nsMIMEInputStream::Deserialize(
   const MIMEInputStreamParams& params = aParams.get_MIMEInputStreamParams();
   const Maybe<InputStreamParams>& wrappedParams = params.optionalStream();
 
-  mHeaders = params.headers();
+  mHeaders = params.headers().Clone();
   mStartedReading = params.startedReading();
 
   if (wrappedParams.isSome()) {

netwerk/base/nsSocketTransportService2.h

@@ -291,7 +291,7 @@ class nsSocketTransportService final : public nsPISocketTransportService,
   // <1> the less-or-equal port number of the range to remap
   // <2> the port number to remap to, when the given port number falls to the
   // range
-  typedef nsTArray<Tuple<uint16_t, uint16_t, uint16_t>> TPortRemapping;
+  typedef CopyableTArray<Tuple<uint16_t, uint16_t, uint16_t>> TPortRemapping;
   Maybe<TPortRemapping> mPortRemapping;
 
   // Called on the socket thread to apply the mapping build on the main thread