WebFonts: Send credentials for same origin requests

Source/core/css/CSSFontFaceSrcValue.cpp

 /*
  * Copyright (C) 2007, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 55 matching lines @@
         result.append(')');
     }
     return result.toString();
 }
 
 bool CSSFontFaceSrcValue::hasFailedOrCanceledSubresources() const
 {
     return m_fetched && m_fetched->loadFailedOrCanceled();
 }
 
-static bool shouldSetCrossOriginAccessControl(const KURL& resource)
+static void setCrossOriginAccessControl(FetchRequest& request, SecurityOrigin* securityOrigin)
 {
     // Local fonts are accessible from file: URLs even when
     // allowFileAccessFromFileURLs is false.
-    if (resource.isLocalFile())
-        return false;
-    return true;
+    if (request.url().isLocalFile())
+        return;
+
+    StoredCredentials allowCredentials = DoNotAllowStoredCredentials;
+    bool sameOriginRequest = securityOrigin->canRequestNoSuborigin(request.url());
+    // Include credentials for same origin requests (and assume that
+    // redirects out of origin will be handled per Fetch spec.)
+    if (sameOriginRequest)
+        allowCredentials = AllowStoredCredentials;
+    request.setCrossOriginAccessControl(securityOrigin, allowCredentials, ClientDidNotRequestCredentials);
 }
 
 FontResource* CSSFontFaceSrcValue::fetch(Document* document)
 {
     if (!m_fetched) {
         FetchRequest request(ResourceRequest(document->completeURL(m_resource)), FetchInitiatorTypeNames::css);
         request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy);
         SecurityOrigin* securityOrigin = document->securityOrigin();
-        if (shouldSetCrossOriginAccessControl(request.url()))
-            request.setCrossOriginAccessControl(securityOrigin, DoNotAllowStoredCredentials);
+        setCrossOriginAccessControl(request, securityOrigin);
         request.mutableResourceRequest().setHTTPReferrer(SecurityPolicy::generateReferrer(m_referrer.referrerPolicy, request.url(), m_referrer.referrer));
         m_fetched = FontResource::fetch(request, document->fetcher());
     } else {
         // FIXME: CSSFontFaceSrcValue::fetch is invoked when @font-face rule
         // is processed by StyleResolver / StyleEngine.
         restoreCachedResourceIfNeeded(document);
     }
     return m_fetched.get();
 }
 
@@ skipping 12 matching lines @@
         m_fetched->lastResourceRequest().url(), MixedContentChecker::SendReport);
     document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFetcher::ResourceLoadingFromCache);
 }
 
 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const
 {
     return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resource == other.m_resource;
 }
 
 }