Implement headers attributes in ForeignFetchResponse

third_party/WebKit/Source/modules/serviceworkers/ForeignFetchRespondWithObserver.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/serviceworkers/ForeignFetchRespondWithObserver.h"
 
+#include "core/fetch/CrossOriginAccessControl.h"
 #include "modules/serviceworkers/ForeignFetchResponse.h"
 
 namespace blink {
 
 ForeignFetchRespondWithObserver* ForeignFetchRespondWithObserver::create(ExecutionContext* context, int eventID, const KURL& requestURL, WebURLRequest::FetchRequestMode requestMode, WebURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext, PassRefPtr<SecurityOrigin> requestOrigin)
 {
     return new ForeignFetchRespondWithObserver(context, eventID, requestURL, requestMode, frameType, requestContext, requestOrigin);
 }
 
 void ForeignFetchRespondWithObserver::responseWasFulfilled(const ScriptValue& value)
@@ skipping 20 matching lines @@
 
         // If response isn't already opaque, make it opaque.
         if (!isOpaque) {
             FetchResponseData* opaqueData = internalResponse->createOpaqueFilteredResponse();
             response = Response::create(getExecutionContext(), opaqueData);
         }
     } else if (m_requestOrigin->toString() != foreignFetchResponse.origin()) {
         responseWasRejected(WebServiceWorkerResponseErrorForeignFetchMismatchedOrigin);
         return;
     } else if (!isOpaque) {
-        // TODO(mek): Handle |headers| response attribute, and properly filter response.
+        HTTPHeaderSet headers;
+        if (foreignFetchResponse.hasHeaders()) {
+            for (const String& header : foreignFetchResponse.headers())
+                headers.add(header);
+            if (response->response()->getType() == FetchResponseData::CORSType) {
+                const HTTPHeaderSet& existingHeaders = response->response()->corsExposedHeaderNames();
+                HTTPHeaderSet headersToRemove;
+                for (HTTPHeaderSet::iterator it = headers.begin(); it != headers.end(); ++it) {
+                    if (!existingHeaders.contains(*it))
+                        headersToRemove.add(*it);
+                }
+                headers.removeAll(headersToRemove);
+            }
+        }
+        FetchResponseData* responseData = internalResponse->createCORSFilteredResponse(headers);
+        response = Response::create(getExecutionContext(), responseData);
     }
 
     RespondWithObserver::responseWasFulfilled(ScriptValue::from(value.getScriptState(), response));
 }
 
 ForeignFetchRespondWithObserver::ForeignFetchRespondWithObserver(ExecutionContext* context, int eventID, const KURL& requestURL, WebURLRequest::FetchRequestMode requestMode, WebURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext, PassRefPtr<SecurityOrigin> requestOrigin)
     : RespondWithObserver(context, eventID, requestURL, requestMode, frameType, requestContext)
     , m_requestOrigin(requestOrigin)
 {
 }
 
 } // namespace blink