Backed out 2 changesets (bug 1758468) for causing web midi related mochitest failures. CLOSED TREE

Backed out changeset cfba299e5067 (bug 1758468)
Backed out changeset c0eb987d0f76 (bug 1758468)

Author: CosminSabou

dom/base/nsContentUtils.cpp

@@ -269,7 +269,6 @@
 #include "nsIContentSecurityPolicy.h"
 #include "nsIContentSink.h"
 #include "nsIContentViewer.h"
-#include "nsICryptoHMAC.h"
 #include "nsIDOMWindowUtils.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
@@ -290,7 +289,6 @@
 #include "nsIInputStream.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsIKeyModule.h"
 #include "nsILoadContext.h"
 #include "nsILoadGroup.h"
 #include "nsILoadInfo.h"
@@ -10626,48 +10624,6 @@ nsCString nsContentUtils::TruncatedURLForDisplay(nsIURI* aURL, size_t aMaxLen) {
   return spec;
 }
 
-/* static */
-nsresult nsContentUtils::AnonymizeId(nsAString& aId,
-                                     const nsACString& aOriginKey,
-                                     OriginFormat aFormat) {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  nsresult rv;
-  nsCOMPtr<nsIKeyObjectFactory> factory =
-      do_GetService("@mozilla.org/security/keyobjectfactory;1", &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCString rawKey;
-  if (aFormat == OriginFormat::Base64) {
-    rv = Base64Decode(aOriginKey, rawKey);
-    NS_ENSURE_SUCCESS(rv, rv);
-  } else {
-    rawKey = aOriginKey;
-  }
-
-  nsCOMPtr<nsIKeyObject> key;
-  rv = factory->KeyFromString(nsIKeyObject::HMAC, rawKey, getter_AddRefs(key));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<nsICryptoHMAC> hasher =
-      do_CreateInstance(NS_CRYPTO_HMAC_CONTRACTID, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = hasher->Init(nsICryptoHMAC::SHA256, key);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  NS_ConvertUTF16toUTF8 id(aId);
-  rv = hasher->Update(reinterpret_cast<const uint8_t*>(id.get()), id.Length());
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCString mac;
-  rv = hasher->Finish(true, mac);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  CopyUTF8toUTF16(mac, aId);
-  return NS_OK;
-}
-
 namespace mozilla {
 std::ostream& operator<<(std::ostream& aOut,
                          const PreventDefaultResult aPreventDefaultResult) {

dom/base/nsContentUtils.h

@@ -3318,18 +3318,6 @@ class nsContentUtils {
    */
   static nsCString TruncatedURLForDisplay(nsIURI* aURL, size_t aMaxLen = 128);
 
-  /**
-   * Anonymize the given id by hashing it with the provided origin. The
-   * resulting id will have the same length as the one that was passed in.
-   */
-  enum class OriginFormat {
-    Base64,
-    Plain,
-  };
-
-  static nsresult AnonymizeId(nsAString& aId, const nsACString& aOriginKey,
-                              OriginFormat aFormat = OriginFormat::Base64);
-
  private:
   static bool InitializeEventTable();
 

dom/media/MediaManager.cpp

@@ -2870,7 +2870,7 @@ RefPtr<LocalDeviceSetPromise> MediaManager::AnonymizeDevices(
             RefPtr anonymized = new LocalMediaDeviceSetRefCnt();
             for (const RefPtr<MediaDevice>& device : *rawDevices) {
               nsString id = device->mRawID;
-              nsContentUtils::AnonymizeId(id, aOriginKey);
+              AnonymizeId(id, aOriginKey);
 
               nsString groupId = device->mRawGroupID;
               // Use window id to salt group id in order to make it session
@@ -2879,7 +2879,7 @@ RefPtr<LocalDeviceSetPromise> MediaManager::AnonymizeDevices(
               // against the spec.  Furthermore, since device ids are the same
               // after a browser restart the fingerprint is not bigger.
               groupId.AppendInt(windowId);
-              nsContentUtils::AnonymizeId(groupId, aOriginKey);
+              AnonymizeId(groupId, aOriginKey);
 
               nsString name = device->mRawName;
               if (name.Find(u"AirPods"_ns) != -1) {
@@ -2899,6 +2899,52 @@ RefPtr<LocalDeviceSetPromise> MediaManager::AnonymizeDevices(
           });
 }
 
+/* static */
+nsresult MediaManager::AnonymizeId(nsAString& aId,
+                                   const nsACString& aOriginKey) {
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsresult rv;
+  nsCOMPtr<nsIKeyObjectFactory> factory =
+      do_GetService("@mozilla.org/security/keyobjectfactory;1", &rv);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  nsCString rawKey;
+  rv = Base64Decode(aOriginKey, rawKey);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  nsCOMPtr<nsIKeyObject> key;
+  rv = factory->KeyFromString(nsIKeyObject::HMAC, rawKey, getter_AddRefs(key));
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  nsCOMPtr<nsICryptoHMAC> hasher =
+      do_CreateInstance(NS_CRYPTO_HMAC_CONTRACTID, &rv);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = hasher->Init(nsICryptoHMAC::SHA256, key);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  NS_ConvertUTF16toUTF8 id(aId);
+  rv = hasher->Update(reinterpret_cast<const uint8_t*>(id.get()), id.Length());
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  nsCString mac;
+  rv = hasher->Finish(true, mac);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  CopyUTF8toUTF16(mac, aId);
+  return NS_OK;
+}
+
 RefPtr<LocalDeviceSetPromise> MediaManager::EnumerateDevicesImpl(
     nsPIDOMWindowInner* aWindow, MediaSourceEnum aVideoInputType,
     MediaSourceEnum aAudioInputType, EnumerationFlags aFlags) {

dom/media/MediaManager.h

@@ -300,6 +300,7 @@ class MediaManager final : public nsIMediaManagerService,
 
  private:
   static nsresult GenerateUUID(nsAString& aResult);
+  static nsresult AnonymizeId(nsAString& aId, const nsACString& aOriginKey);
 
  public:
   /**

dom/midi/MIDIAccess.cpp

@@ -89,14 +89,12 @@ void MIDIAccess::FireConnectionEvent(MIDIPort* aPort) {
   aPort->GetId(id);
   ErrorResult rv;
   if (aPort->State() == MIDIPortDeviceState::Disconnected) {
-    if (aPort->Type() == MIDIPortType::Input && mInputMap->Has(id)) {
-      MIDIInputMap_Binding::MaplikeHelpers::Delete(mInputMap, aPort->StableId(),
-                                                   rv);
-      mInputMap->Remove(id);
-    } else if (aPort->Type() == MIDIPortType::Output && mOutputMap->Has(id)) {
-      MIDIOutputMap_Binding::MaplikeHelpers::Delete(mOutputMap,
-                                                    aPort->StableId(), rv);
-      mOutputMap->Remove(id);
+    if (aPort->Type() == MIDIPortType::Input &&
+        MIDIInputMap_Binding::MaplikeHelpers::Has(mInputMap, id, rv)) {
+      MIDIInputMap_Binding::MaplikeHelpers::Delete(mInputMap, id, rv);
+    } else if (aPort->Type() == MIDIPortType::Output &&
+               MIDIOutputMap_Binding::MaplikeHelpers::Has(mOutputMap, id, rv)) {
+      MIDIOutputMap_Binding::MaplikeHelpers::Delete(mOutputMap, id, rv);
     }
     // Check to make sure Has()/Delete() calls haven't failed.
     if (NS_WARN_IF(rv.Failed())) {
@@ -108,31 +106,31 @@ void MIDIAccess::FireConnectionEvent(MIDIPort* aPort) {
     // this means a port that was disconnected has been reconnected, with the
     // port owner holding the object during that time, and we should add that
     // port object to our maps again.
-    if (aPort->Type() == MIDIPortType::Input && !mInputMap->Has(id)) {
+    if (aPort->Type() == MIDIPortType::Input &&
+        !MIDIInputMap_Binding::MaplikeHelpers::Has(mInputMap, id, rv)) {
       if (NS_WARN_IF(rv.Failed())) {
         LOG("Input port not found");
         return;
       }
       MIDIInputMap_Binding::MaplikeHelpers::Set(
-          mInputMap, aPort->StableId(), *(static_cast<MIDIInput*>(aPort)), rv);
+          mInputMap, id, *(static_cast<MIDIInput*>(aPort)), rv);
       if (NS_WARN_IF(rv.Failed())) {
         LOG("Map Set failed for input port");
         return;
       }
-      mInputMap->Insert(id, aPort);
-    } else if (aPort->Type() == MIDIPortType::Output && mOutputMap->Has(id)) {
+    } else if (aPort->Type() == MIDIPortType::Output &&
+               !MIDIOutputMap_Binding::MaplikeHelpers::Has(mOutputMap, id,
+                                                           rv)) {
       if (NS_WARN_IF(rv.Failed())) {
         LOG("Output port not found");
         return;
       }
       MIDIOutputMap_Binding::MaplikeHelpers::Set(
-          mOutputMap, aPort->StableId(), *(static_cast<MIDIOutput*>(aPort)),
-          rv);
+          mOutputMap, id, *(static_cast<MIDIOutput*>(aPort)), rv);
       if (NS_WARN_IF(rv.Failed())) {
         LOG("Map set failed for output port");
         return;
       }
-      mOutputMap->Insert(id, aPort);
     }
   }
   RefPtr<MIDIConnectionEvent> event =
@@ -146,7 +144,9 @@ void MIDIAccess::MaybeCreateMIDIPort(const MIDIPortInfo& aInfo,
   MIDIPortType type = static_cast<MIDIPortType>(aInfo.type());
   RefPtr<MIDIPort> port;
   if (type == MIDIPortType::Input) {
-    if (mInputMap->Has(id) || NS_WARN_IF(aRv.Failed())) {
+    bool hasPort =
+        MIDIInputMap_Binding::MaplikeHelpers::Has(mInputMap, id, aRv);
+    if (hasPort || NS_WARN_IF(aRv.Failed())) {
       // We already have the port in our map.
       return;
     }
@@ -157,15 +157,15 @@ void MIDIAccess::MaybeCreateMIDIPort(const MIDIPortInfo& aInfo,
       return;
     }
     MIDIInputMap_Binding::MaplikeHelpers::Set(
-        mInputMap, port->StableId(), *(static_cast<MIDIInput*>(port.get())),
-        aRv);
+        mInputMap, id, *(static_cast<MIDIInput*>(port.get())), aRv);
     if (NS_WARN_IF(aRv.Failed())) {
       LOG("Coudld't set input port in map");
       return;
     }
-    mInputMap->Insert(id, port);
   } else if (type == MIDIPortType::Output) {
-    if (mOutputMap->Has(id) || NS_WARN_IF(aRv.Failed())) {
+    bool hasPort =
+        MIDIOutputMap_Binding::MaplikeHelpers::Has(mOutputMap, id, aRv);
+    if (hasPort || NS_WARN_IF(aRv.Failed())) {
       // We already have the port in our map.
       return;
     }
@@ -176,13 +176,11 @@ void MIDIAccess::MaybeCreateMIDIPort(const MIDIPortInfo& aInfo,
       return;
     }
     MIDIOutputMap_Binding::MaplikeHelpers::Set(
-        mOutputMap, port->StableId(), *(static_cast<MIDIOutput*>(port.get())),
-        aRv);
+        mOutputMap, id, *(static_cast<MIDIOutput*>(port.get())), aRv);
     if (NS_WARN_IF(aRv.Failed())) {
       LOG("Coudld't set output port in map");
       return;
     }
-    mOutputMap->Insert(id, port);
   } else {
     // If we hit this, then we have some port that is neither input nor output.
     // That is bad.

dom/midi/MIDIInputMap.h

@@ -7,9 +7,7 @@
 #ifndef mozilla_dom_MIDIInputMap_h
 #define mozilla_dom_MIDIInputMap_h
 
-#include "mozilla/dom/MIDIPort.h"
 #include "nsCOMPtr.h"
-#include "nsTHashMap.h"
 #include "nsWrapperCache.h"
 
 class nsPIDOMWindowInner;
@@ -29,15 +27,9 @@ class MIDIInputMap final : public nsISupports, public nsWrapperCache {
   explicit MIDIInputMap(nsPIDOMWindowInner* aParent);
   JSObject* WrapObject(JSContext* aCx,
                        JS::Handle<JSObject*> aGivenProto) override;
-  bool Has(nsAString& aId) { return mPorts.Get(aId) != nullptr; }
-  void Insert(nsAString& aId, RefPtr<MIDIPort> aPort) {
-    mPorts.InsertOrUpdate(aId, aPort);
-  }
-  void Remove(nsAString& aId) { mPorts.Remove(aId); }
 
  private:
   ~MIDIInputMap() = default;
-  nsTHashMap<nsString, RefPtr<MIDIPort>> mPorts;
   nsCOMPtr<nsPIDOMWindowInner> mParent;
 };
 

dom/midi/MIDIOutputMap.h

@@ -7,9 +7,7 @@
 #ifndef mozilla_dom_MIDIOutputMap_h
 #define mozilla_dom_MIDIOutputMap_h
 
-#include "mozilla/dom/MIDIPort.h"
 #include "nsCOMPtr.h"
-#include "nsTHashMap.h"
 #include "nsWrapperCache.h"
 
 class nsPIDOMWindowInner;
@@ -32,15 +30,9 @@ class MIDIOutputMap final : public nsISupports, public nsWrapperCache {
 
   JSObject* WrapObject(JSContext* aCx,
                        JS::Handle<JSObject*> aGivenProto) override;
-  bool Has(nsAString& aId) { return mPorts.Get(aId) != nullptr; }
-  void Insert(nsAString& aId, RefPtr<MIDIPort> aPort) {
-    mPorts.InsertOrUpdate(aId, aPort);
-  }
-  void Remove(nsAString& aId) { mPorts.Remove(aId); }
 
  private:
   ~MIDIOutputMap() = default;
-  nsTHashMap<nsString, RefPtr<MIDIPort>> mPorts;
   nsCOMPtr<nsPIDOMWindowInner> mParent;
 };
 

dom/midi/MIDIPort.cpp

@@ -14,7 +14,6 @@
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/Unused.h"
-#include "nsContentUtils.h"
 #include "nsISupportsImpl.h"  // for MOZ_COUNT_CTOR, MOZ_COUNT_DTOR
 #include "MIDILog.h"
 
@@ -64,17 +63,8 @@ MIDIPort::~MIDIPort() {
 }
 
 bool MIDIPort::Initialize(const MIDIPortInfo& aPortInfo, bool aSysexEnabled) {
-  nsIURI* uri = GetDocumentIfCurrent()->GetDocumentURI();
-  nsAutoCString origin;
-  nsresult rv = nsContentUtils::GetASCIIOrigin(uri, origin);
-  if (NS_FAILED(rv)) {
-    return false;
-  }
   RefPtr<MIDIPortChild> port =
       new MIDIPortChild(aPortInfo, aSysexEnabled, this);
-  if (NS_FAILED(port->GenerateStableId(origin))) {
-    return false;
-  }
   PBackgroundChild* b = BackgroundChild::GetForCurrentThread();
   MOZ_ASSERT(b,
              "Should always have a valid BackgroundChild when creating a port "
@@ -101,7 +91,7 @@ void MIDIPort::UnsetIPCPort() {
 
 void MIDIPort::GetId(nsString& aRetVal) const {
   MOZ_ASSERT(mPort);
-  aRetVal = mPort->StableId();
+  aRetVal = mPort->MIDIPortInterface::Id();
 }
 
 void MIDIPort::GetManufacturer(nsString& aRetVal) const {
@@ -262,6 +252,4 @@ void MIDIPort::DontKeepAliveOnStatechange() {
   }
 }
 
-const nsString& MIDIPort::StableId() { return mPort->StableId(); }
-
 }  // namespace mozilla::dom

dom/midi/MIDIPort.h

@@ -73,7 +73,6 @@ class MIDIPort : public DOMEventTargetHelper,
   IMPL_EVENT_HANDLER(statechange)
 
   void DisconnectFromOwner() override;
-  const nsString& StableId();
 
  protected:
   // IPC Actor corresponding to this class

dom/midi/MIDIPortChild.cpp

@@ -7,7 +7,6 @@
 #include "mozilla/dom/MIDIPortChild.h"
 #include "mozilla/dom/MIDIPort.h"
 #include "mozilla/dom/MIDIPortInterface.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -56,19 +55,3 @@ void MIDIPortChild::SetActorAlive() {
   mActorWasAlive = true;
   AddRef();
 }
-
-nsresult MIDIPortChild::GenerateStableId(const nsACString& aOrigin) {
-  const size_t kIdLength = 64;
-  mStableId.SetCapacity(kIdLength);
-  mStableId.Append(Name());
-  mStableId.Append(Manufacturer());
-  mStableId.Append(Version());
-  // Extend to at least 64 characters
-  while (mStableId.Length() < kIdLength) {
-    mStableId.Append(' ');
-  }
-  nsContentUtils::AnonymizeId(mStableId, aOrigin,
-                              nsContentUtils::OriginFormat::Plain);
-  mStableId.Truncate(kIdLength);
-  return NS_OK;
-}