Changeset 185428 in webkit

Timestamp:

Jun 10, 2015, 1:47:15 PM (11 years ago)

Author:

Brent Fulgham

Message:

[WK2] Do not indicate Media Keys are present when they are not
​https://bugs.webkit.org/show_bug.cgi?id=145713
<rdar://problem/19752566>

Reviewed by Dean Jackson.

Correct the reporting of Media Key presence by checking for the actual
media key file, not just the directory. Sometimes the directory will exist
with no media key files (e.g., if a user navigates to the directory using
the Finder).

• UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::computeMediaKeyFile): Moved earlier in file so it could be used by
the 'mediaKeyOrigins' method.
(WebKit::WebsiteDataStore::mediaKeyOrigins): Only indicate we have a media key
origin if the folder actually contains the media key file.
(WebKit::WebsiteDataStore::removeMediaKeys): Use the existing 'computeMediaKeyFile',
rather than manually building the file from strings.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-10  Brent Fulgham  <bfulgham@apple.com>
+
+        [WK2] Do not indicate Media Keys are present when they are not
+        https://bugs.webkit.org/show_bug.cgi?id=145713
+        <rdar://problem/19752566>
+
+        Reviewed by Dean Jackson.
+
+        Correct the reporting of Media Key presence by checking for the actual
+        media key file, not just the directory. Sometimes the directory will exist
+        with no media key files (e.g., if a user navigates to the directory using
+        the Finder).
+
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::computeMediaKeyFile): Moved earlier in file so it could be used by
+        the 'mediaKeyOrigins' method.
+        (WebKit::WebsiteDataStore::mediaKeyOrigins): Only indicate we have a media key
+        origin if the folder actually contains the media key file.
+        (WebKit::WebsiteDataStore::removeMediaKeys): Use the existing 'computeMediaKeyFile',
+        rather than manually building the file from strings.
+
 2015-06-09  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -895 +895 @@
 #endif
 
+static String computeMediaKeyFile(const String& mediaKeyDirectory)
+{
+    return WebCore::pathByAppendingComponent(mediaKeyDirectory, "SecureStop.plist");
+}
+
 Vector<RefPtr<WebCore::SecurityOrigin>> WebsiteDataStore::mediaKeyOrigins(const String& mediaKeysStorageDirectory)
 {
@@ -902 +907 @@
 
     for (const auto& originPath : WebCore::listDirectory(mediaKeysStorageDirectory, "*")) {
+        auto mediaKeyFile = computeMediaKeyFile(originPath);
+        if (!WebCore::fileExists(mediaKeyFile))
+            continue;
+
         auto mediaKeyIdentifier = WebCore::pathGetFileName(originPath);
 
@@ -909 +918 @@
 
     return origins;
-}
-
-static String computeMediaKeyFile(const String& mediaKeyDirectory)
-{
-    return WebCore::pathByAppendingComponent(mediaKeyDirectory, "SecureStop.plist");
 }
 
@@ -941 +945 @@
     for (const auto& origin : origins) {
         auto mediaKeyDirectory = WebCore::pathByAppendingComponent(mediaKeysStorageDirectory, origin->databaseIdentifier());
-        auto mediaKeyFile = WebCore::pathByAppendingComponent(mediaKeyDirectory, "SecureStop.plist");
+        auto mediaKeyFile = computeMediaKeyFile(mediaKeyDirectory);
 
         WebCore::deleteFile(mediaKeyFile);