Unreviewed, rolling out r239727.

[WebKit-https.git] / Source / WebCore / loader / CrossOriginPreflightResultCache.cpp

diff --git a/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp b/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp
index c7da85e..5d6e201 100644 (file)
--- a/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp
+++ b/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp
@@ -36,84 +36,35 @@
 
 namespace WebCore {
 
-using namespace std::literals::chrono_literals;
-
 // These values are at the discretion of the user agent.
-static const auto defaultPreflightCacheTimeout = 5s;
-static const auto maxPreflightCacheTimeout = 600s; // Should be short enough to minimize the risk of using a poisoned cache after switching to a secure network.
+static const auto defaultPreflightCacheTimeout = 5_s;
+static const auto maxPreflightCacheTimeout = 600_s; // Should be short enough to minimize the risk of using a poisoned cache after switching to a secure network.
 
 CrossOriginPreflightResultCache::CrossOriginPreflightResultCache()
 {
 }
 
-static bool parseAccessControlMaxAge(const String& string, std::chrono::seconds& expiryDelta)
+static bool parseAccessControlMaxAge(const String& string, Seconds& expiryDelta)
 {
     // FIXME: this will not do the correct thing for a number starting with a '+'
     bool ok = false;
-    expiryDelta = std::chrono::seconds(string.toUIntStrict(&ok));
+    expiryDelta = Seconds(static_cast<double>(string.toUIntStrict(&ok)));
     return ok;
 }
 
-template<class HashType>
-static void addToAccessControlAllowList(const String& string, unsigned start, unsigned end, HashSet<String, HashType>& set)
-{
-    StringImpl* stringImpl = string.impl();
-    if (!stringImpl)
-        return;
-
-    // Skip white space from start.
-    while (start <= end && isSpaceOrNewline((*stringImpl)[start]))
-        ++start;
-
-    // only white space
-    if (start > end) 
-        return;
-
-    // Skip white space from end.
-    while (end && isSpaceOrNewline((*stringImpl)[end]))
-        --end;
-
-    set.add(string.substring(start, end - start + 1));
-}
-
-template<class HashType>
-static bool parseAccessControlAllowList(const String& string, HashSet<String, HashType>& set)
+bool CrossOriginPreflightResultCacheItem::parse(const ResourceResponse& response)
 {
-    unsigned start = 0;
-    size_t end;
-    while ((end = string.find(',', start)) != notFound) {
-        if (start != end)
-            addToAccessControlAllowList(string, start, end - 1, set);
-        start = end + 1;
-    }
-    if (start != string.length())
-        addToAccessControlAllowList(string, start, string.length() - 1, set);
-
-    return true;
-}
-
-bool CrossOriginPreflightResultCacheItem::parse(const ResourceResponse& response, String& errorDescription)
-{
-    m_methods.clear();
-    if (!parseAccessControlAllowList(response.httpHeaderField(HTTPHeaderName::AccessControlAllowMethods), m_methods)) {
-        errorDescription = "Cannot parse Access-Control-Allow-Methods response header field.";
-        return false;
-    }
-
-    m_headers.clear();
-    if (!parseAccessControlAllowList(response.httpHeaderField(HTTPHeaderName::AccessControlAllowHeaders), m_headers)) {
-        errorDescription = "Cannot parse Access-Control-Allow-Headers response header field.";
-        return false;
-    }
+    m_methods = parseAccessControlAllowList(response.httpHeaderField(HTTPHeaderName::AccessControlAllowMethods));
+    m_headers = parseAccessControlAllowList<ASCIICaseInsensitiveHash>(response.httpHeaderField(HTTPHeaderName::AccessControlAllowHeaders));
 
-    std::chrono::seconds expiryDelta;
+    Seconds expiryDelta = 0_s;
     if (parseAccessControlMaxAge(response.httpHeaderField(HTTPHeaderName::AccessControlMaxAge), expiryDelta)) {
         if (expiryDelta > maxPreflightCacheTimeout)
             expiryDelta = maxPreflightCacheTimeout;
     } else
         expiryDelta = defaultPreflightCacheTimeout;
 
-    m_absoluteExpiryTime = std::chrono::steady_clock::now() + expiryDelta;
+    m_absoluteExpiryTime = MonotonicTime::now() + expiryDelta;
     return true;
 }
 
@@ -139,12 +90,12 @@ bool CrossOriginPreflightResultCacheItem::allowsCrossOriginHeaders(const HTTPHea
     return true;
 }
 
-bool CrossOriginPreflightResultCacheItem::allowsRequest(StoredCredentials includeCredentials, const String& method, const HTTPHeaderMap& requestHeaders) const
+bool CrossOriginPreflightResultCacheItem::allowsRequest(StoredCredentialsPolicy storedCredentialsPolicy, const String& method, const HTTPHeaderMap& requestHeaders) const
 {
     String ignoredExplanation;
-    if (m_absoluteExpiryTime < std::chrono::steady_clock::now())
+    if (m_absoluteExpiryTime < MonotonicTime::now())
         return false;
-    if (includeCredentials == AllowStoredCredentials && m_credentials == DoNotAllowStoredCredentials)
+    if (storedCredentialsPolicy == StoredCredentialsPolicy::Use && m_storedCredentialsPolicy == StoredCredentialsPolicy::DoNotUse)
         return false;
     if (!allowsCrossOriginMethod(method, ignoredExplanation))
         return false;
@@ -167,21 +118,21 @@ void CrossOriginPreflightResultCache::appendEntry(const String& origin, const UR
     m_preflightHashMap.set(std::make_pair(origin, url), WTFMove(preflightResult));
 }
 
-bool CrossOriginPreflightResultCache::canSkipPreflight(const String& origin, const URL& url, StoredCredentials includeCredentials, const String& method, const HTTPHeaderMap& requestHeaders)
+bool CrossOriginPreflightResultCache::canSkipPreflight(const String& origin, const URL& url, StoredCredentialsPolicy storedCredentialsPolicy, const String& method, const HTTPHeaderMap& requestHeaders)
 {
     ASSERT(isMainThread());
     auto it = m_preflightHashMap.find(std::make_pair(origin, url));
     if (it == m_preflightHashMap.end())
         return false;
 
-    if (it->value->allowsRequest(includeCredentials, method, requestHeaders))
+    if (it->value->allowsRequest(storedCredentialsPolicy, method, requestHeaders))
         return true;
 
     m_preflightHashMap.remove(it);
     return false;
 }
 
-void CrossOriginPreflightResultCache::empty()
+void CrossOriginPreflightResultCache::clear()
 {
     ASSERT(isMainThread());
     m_preflightHashMap.clear();