зеркало из https://github.com/mozilla/gecko-dev.git
Backout 78533a4ef62e to 4fe11fc40572 (bug 1369862) for incorrect bug number on P1 r=me
This commit is contained in:
Ben Kelly
Родитель
8b4b0d6f7a
Коммит
88167e3b71
|
|
@ -28,7 +28,6 @@
|
|||
#include "ServiceWorkerManager.h"
|
||||
|
||||
#include "mozilla/ErrorResult.h"
|
||||
#include "mozilla/LoadInfo.h"
|
||||
#include "mozilla/Preferences.h"
|
||||
#include "mozilla/dom/BodyUtil.h"
|
||||
#include "mozilla/dom/DOMException.h"
|
||||
|
|
@ -230,8 +229,7 @@ public:
|
|||
mChannel->SynthesizeHeader(entries[i].mName, entries[i].mValue);
|
||||
}
|
||||
|
||||
auto castLoadInfo = static_cast<LoadInfo*>(loadInfo.get());
|
||||
castLoadInfo->SynthesizeServiceWorkerTainting(mInternalResponse->GetTainting());
|
||||
loadInfo->MaybeIncreaseTainting(mInternalResponse->GetTainting());
|
||||
|
||||
rv = mChannel->FinishSynthesizedResponse(mResponseURLSpec);
|
||||
if (NS_WARN_IF(NS_FAILED(rv))) {
|
||||
|
|
|
|||
|
|
@ -277,10 +277,10 @@ fetch('http://example.com/opaque-no-cors', { mode: "no-cors" })
|
|||
expectAsyncResult();
|
||||
fetch('http://example.com/cors-for-no-cors', { mode: "no-cors" })
|
||||
.then(function(res) {
|
||||
my_ok(res.type == "cors", "synthesize CORS response should result in outer CORS response");
|
||||
my_ok(res.type == "opaque", "intercepted non-opaque response for no-cors request should resolve to opaque response.");
|
||||
finish();
|
||||
}, function(e) {
|
||||
my_ok(false, "cors-for-no-cors request should not reject");
|
||||
my_ok(false, "intercepted non-opaque response for no-cors request should resolve to opaque response. It should not fail.");
|
||||
finish();
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -952,13 +952,6 @@ LoadInfo::MaybeIncreaseTainting(uint32_t aTainting)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
void
|
||||
LoadInfo::SynthesizeServiceWorkerTainting(LoadTainting aTainting)
|
||||
{
|
||||
MOZ_DIAGNOSTIC_ASSERT(aTainting <= LoadTainting::Opaque);
|
||||
mTainting = aTainting;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
LoadInfo::GetIsTopLevelLoad(bool *aResult)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -74,14 +74,6 @@ public:
|
|||
// when a separate request is made with the same security properties.
|
||||
already_AddRefed<nsILoadInfo> CloneForNewRequest() const;
|
||||
|
||||
// The service worker and fetch specifications require returning the
|
||||
// exact tainting level of the Response passed to FetchEvent.respondWith().
|
||||
// This method allows us to override the tainting level in that case.
|
||||
//
|
||||
// NOTE: This should not be used outside of service worker code! Use
|
||||
// nsILoadInfo::MaybeIncreaseTainting() instead.
|
||||
void SynthesizeServiceWorkerTainting(LoadTainting aTainting);
|
||||
|
||||
void SetIsPreflight();
|
||||
void SetUpgradeInsecureRequests();
|
||||
|
||||
|
|
|
|||
|
|
@ -12,3 +12,58 @@
|
|||
if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
|
||||
if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"omit" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"same-origin" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"no-cors" credentials:"include" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"omit" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"same-origin" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=omit&" mode:"cors" credentials:"include" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"no-cors" credentials:"omit" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"no-cors" credentials:"same-origin" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"no-cors" credentials:"include" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"cors" credentials:"omit" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"cors" credentials:"same-origin" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fweb-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3F&mode=same-origin&credentials=same-origin&" mode:"cors" credentials:"include" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"no-cors" credentials:"omit" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"no-cors" credentials:"same-origin" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3D*&mode=cors&credentials=omit&" mode:"no-cors" credentials:"include" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"no-cors" credentials:"omit" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"no-cors" credentials:"same-origin" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
[fetching url:"https://www1.web-platform.test:8443/?url=https%3A%2F%2Fwww1.web-platform.test%3A8443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FACAOrigin%3Dhttps%3A%2F%2Fweb-platform.test%3A8443%26ACACredentials%3Dtrue&mode=cors&credentials=include&" mode:"no-cors" credentials:"include" should succeed.]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче