Changeset 239372 in webkit

Timestamp:

Dec 19, 2018, 12:00:27 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Merge parseAccessControlExposeHeadersAllowList into parseAccessControlAllowList
​https://bugs.webkit.org/show_bug.cgi?id=192288

Patch by Rob Buis <​rbuis@igalia.com> on 2018-12-19
Reviewed by Frédéric Wang.

Prefer return value to out parameter for parseAccessControlAllowList.

• loader/CrossOriginPreflightResultCache.cpp:

(WebCore::CrossOriginPreflightResultCacheItem::parse):

• platform/network/HTTPParsers.h:

(WebCore::parseAccessControlAllowList):

• platform/network/ResourceResponseBase.cpp:

(WebCore::ResourceResponseBase::filter):
(WebCore::ResourceResponseBase::sanitizeHTTPHeaderFieldsAccordingToTainting):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/CrossOriginPreflightResultCache.cpp (modified) (1 diff)
• platform/network/HTTPParsers.h (modified) (2 diffs)
• platform/network/ResourceResponseBase.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-19  Rob Buis  <rbuis@igalia.com>
+
+        Merge parseAccessControlExposeHeadersAllowList into parseAccessControlAllowList
+        https://bugs.webkit.org/show_bug.cgi?id=192288
+
+        Reviewed by Frédéric Wang.
+
+        Prefer return value to out parameter for parseAccessControlAllowList.
+
+        * loader/CrossOriginPreflightResultCache.cpp:
+        (WebCore::CrossOriginPreflightResultCacheItem::parse):
+        * platform/network/HTTPParsers.h:
+        (WebCore::parseAccessControlAllowList):
+        * platform/network/ResourceResponseBase.cpp:
+        (WebCore::ResourceResponseBase::filter):
+        (WebCore::ResourceResponseBase::sanitizeHTTPHeaderFieldsAccordingToTainting):
+
 2018-12-18  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp

@@ -55 +55 @@
 bool CrossOriginPreflightResultCacheItem::parse(const ResourceResponse& response)
 {
-    m_methods.clear();
-    parseAccessControlAllowList(response.httpHeaderField(HTTPHeaderName::AccessControlAllowMethods), m_methods);
-
-    m_headers.clear();
-    parseAccessControlAllowList<ASCIICaseInsensitiveHash>(response.httpHeaderField(HTTPHeaderName::AccessControlAllowHeaders), m_headers);
+    m_methods = parseAccessControlAllowList(response.httpHeaderField(HTTPHeaderName::AccessControlAllowMethods));
+    m_headers = parseAccessControlAllowList<ASCIICaseInsensitiveHash>(response.httpHeaderField(HTTPHeaderName::AccessControlAllowHeaders));
 
     Seconds expiryDelta = 0_s;

trunk/Source/WebCore/platform/network/HTTPParsers.h

@@ -150 +150 @@
 
 template<class HashType = DefaultHash<String>::Hash>
-void parseAccessControlAllowList(const String& string, HashSet<String, HashType>& set)
+HashSet<String, HashType> parseAccessControlAllowList(const String& string)
 {
+    HashSet<String, HashType> set;
     unsigned start = 0;
     size_t end;
@@ -161 +162 @@
     if (start != string.length())
         addToAccessControlAllowList(string, start, string.length() - 1, set);
+    return set;
 }
 

trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp

@@ -164 +164 @@
     filteredResponse.setType(Type::Cors);
 
-    HTTPHeaderSet accessControlExposeHeaderSet;
-    parseAccessControlAllowList(response.httpHeaderField(HTTPHeaderName::AccessControlExposeHeaders), accessControlExposeHeaderSet);
+    auto accessControlExposeHeaderSet = parseAccessControlAllowList<ASCIICaseInsensitiveHash>(response.httpHeaderField(HTTPHeaderName::AccessControlExposeHeaders));
     filteredResponse.m_httpHeaderFields.uncommonHeaders().removeAllMatching([&](auto& entry) {
         return !isCrossOriginSafeHeader(entry.key, accessControlExposeHeaderSet);
@@ -432 +431 @@
                 filteredHeaders.add(header.key, WTFMove(header.value));
         }
-        HTTPHeaderSet corsSafeHeaderSet;
-        parseAccessControlAllowList(httpHeaderField(HTTPHeaderName::AccessControlExposeHeaders), corsSafeHeaderSet);
+        auto corsSafeHeaderSet = parseAccessControlAllowList<ASCIICaseInsensitiveHash>(httpHeaderField(HTTPHeaderName::AccessControlExposeHeaders));
         for (auto& headerName : corsSafeHeaderSet) {
             if (!filteredHeaders.contains(headerName)) {