Apply meta tag referrer policy for preloaded requests

Source/core/html/parser/HTMLPreloadScanner.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Torch Mobile, Inc. http://www.torchmobile.com/
  * Copyright (C) 2010 Google 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.
@@ skipping 155 matching lines @@
         if (match(m_tagImpl, sourceTag) && m_matchedMediaAttribute && pictureData.sourceURL.isEmpty()) {
             pictureData.sourceURL = m_srcsetImageCandidate.toString();
             pictureData.sourceSizeSet = m_sourceSizeSet;
             pictureData.sourceSize = m_sourceSize;
             pictureData.picked = true;
         } else if (match(m_tagImpl, imgTag) && !pictureData.sourceURL.isEmpty()) {
             setUrlToLoad(pictureData.sourceURL, AllowURLReplacement);
         }
     }
 
-    PassOwnPtr<PreloadRequest> createPreloadRequest(const KURL& predictedBaseURL, const SegmentedString& source, const ClientHintsPreferences& clientHintsPreferences, const PictureData& pictureData)
+    PassOwnPtr<PreloadRequest> createPreloadRequest(const KURL& predictedBaseURL, const SegmentedString& source, const ClientHintsPreferences& clientHintsPreferences, const PictureData& pictureData, const ReferrerPolicy& referrerPolicy)
     {
         PreloadRequest::RequestType requestType = PreloadRequest::RequestTypePreload;
         if (shouldPreconnect())
             requestType = PreloadRequest::RequestTypePreconnect;
         else if (!shouldPreload() || !m_matchedMediaAttribute)
             return nullptr;
 
         TextPosition position = TextPosition(source.currentLine(), source.currentColumn());
         FetchRequest::ResourceWidth resourceWidth;
         float sourceSize = m_sourceSize;
         bool sourceSizeSet = m_sourceSizeSet;
         if (pictureData.picked) {
             sourceSizeSet = pictureData.sourceSizeSet;
             sourceSize = pictureData.sourceSize;
         }
         if (sourceSizeSet) {
             resourceWidth.width = sourceSize;
             resourceWidth.isSet = true;
         }
 
-        OwnPtr<PreloadRequest> request = PreloadRequest::create(initiatorFor(m_tagImpl), position, m_urlToLoad, predictedBaseURL, resourceType(), resourceWidth, clientHintsPreferences, requestType);
+        OwnPtr<PreloadRequest> request = PreloadRequest::create(initiatorFor(m_tagImpl), position, m_urlToLoad, predictedBaseURL, resourceType(), referrerPolicy, resourceWidth, clientHintsPreferences, requestType);
         if (isCORSEnabled())
             request->setCrossOriginEnabled(allowStoredCredentials());
         request->setCharset(charset());
         request->setDefer(m_defer);
         return request.release();
     }
 
 private:
     template<typename NameType>
     void processScriptAttribute(const NameType& attributeName, const String& attributeValue)
@@ skipping 258 matching lines @@
         return;
     ViewportDescription description(ViewportDescription::ViewportMeta);
     HTMLMetaElement::getViewportDescriptionFromContentAttribute(attributeValue, description, nullptr, documentParameters->viewportMetaZeroValuesQuirk);
     FloatSize initialViewport(documentParameters->mediaValues->viewportHeight(), documentParameters->mediaValues->viewportWidth());
     PageScaleConstraints constraints = description.resolve(initialViewport, documentParameters->defaultViewportMinWidth);
     MediaValuesCached* cachedMediaValues = static_cast<MediaValuesCached*>(documentParameters->mediaValues.get());
     cachedMediaValues->setViewportHeight(constraints.layoutSize.height());
     cachedMediaValues->setViewportWidth(constraints.layoutSize.width());
 }
 
-template<typename Token>
+template <typename Token>
 void TokenPreloadScanner::scanCommon(const Token& token, const SegmentedString& source, PreloadRequestStream& requests)
 {
     if (!m_documentParameters->doHtmlPreloadScanning)
         return;
 
     // Disable preload for documents with AppCache.
     if (m_isAppCacheEnabled)
         return;
 
     // http://crbug.com/434230 Disable preload for documents with CSP <meta> tags
@@ skipping 60 matching lines @@
                 }
                 return;
             }
             const typename Token::Attribute* nameAttribute = token.getAttributeItem(nameAttr);
             if (nameAttribute && equalIgnoringCase(String(nameAttribute->value), "viewport")) {
                 const typename Token::Attribute* contentAttribute = token.getAttributeItem(contentAttr);
                 if (contentAttribute)
                     handleMetaViewport(String(contentAttribute->value), m_documentParameters.get());
                 return;
             }
+            if (nameAttribute && equalIgnoringCase(String(nameAttribute->value), "referrer")) {
+                const typename Token::Attribute* contentAttribute = token.getAttributeItem(contentAttr);
+                if (contentAttribute) {
+                    const String contentAttributeValue(contentAttribute->value);
+                    if (contentAttributeValue.isEmpty() || contentAttributeValue.isNull() || !SecurityPolicy::referrerPolicyFromString(contentAttributeValue, &m_documentParameters->referrerPolicy)) {
+                        m_documentParameters->referrerPolicy = ReferrerPolicyDefault;
+                    }
+                    m_cssScanner.setReferrerPolicy(m_documentParameters->referrerPolicy);

[Yoav Weiss, 2015/07/15 08:14:47]

Could you split that part into a helper function? e.g. "handleReferrer"

Optional: We could also DRY the code even more by merging "referrer" and
"viewport" logic.

[estark, 2015/07/15 21:58:56]

Done.

+                }
+            }
         }
 
         if (match(tagImpl, pictureTag)) {
             m_inPicture = true;
             m_pictureData = PictureData();
             return;
         }
 
         StartTagScanner scanner(tagImpl, m_documentParameters->mediaValues);
         scanner.processAttributes(token.attributes());
         if (m_inPicture)
             scanner.handlePictureSourceURL(m_pictureData);
-        OwnPtr<PreloadRequest> request = scanner.createPreloadRequest(m_predictedBaseElementURL, source, m_clientHintsPreferences, m_pictureData);
+        OwnPtr<PreloadRequest> request = scanner.createPreloadRequest(m_predictedBaseElementURL, source, m_clientHintsPreferences, m_pictureData, m_documentParameters->referrerPolicy);
         if (request)
             requests.append(request.release());
         return;
     }
     default: {
         return;
     }
     }
 }
 
@@ skipping 50 matching lines @@
     ASSERT(document);
     doHtmlPreloadScanning = !document->settings() || document->settings()->doHtmlPreloadScanning();
     if (givenMediaValues)
         mediaValues = givenMediaValues;
     else
         mediaValues = MediaValuesCached::create(*document);
     ASSERT(mediaValues->isSafeToSendToAnotherThread());
     defaultViewportMinWidth = document->viewportDefaultMinWidth();
     viewportMetaZeroValuesQuirk = document->settings() && document->settings()->viewportMetaZeroValuesQuirk();
     viewportMetaEnabled = document->settings() && document->settings()->viewportMetaEnabled();
+    referrerPolicy = ReferrerPolicyDefault;
 }
 
 }