Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 10:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1578991 - Skip Calling Sniffers in Case of NoSniff and JSON Mime r=ckerschb,dragana

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D45681

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Sebastian Streich 2019-09-24 12:26:22 +00:00
parent 64ed1642ed
commit b731ffbff3
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
netwerk/base/nsNetUtil.cpp
View File

@ -25,6 +25,7 @@
#include "nsFileStreams.h"
#include "nsHashKeys.h"
#include "nsHttp.h"
#include "nsMimeTypes.h"
#include "nsIAsyncStreamCopier.h"
#include "nsIAuthPrompt.h"
#include "nsIAuthPrompt2.h"
@ -2715,6 +2716,26 @@ void NS_SniffContent(const char* aSnifferType, nsIRequest* aRequest,
return;
}
// In case XCTO nosniff was present, we could just skip sniffing here
nsCOMPtr<nsIChannel> channel = do_QueryInterface(aRequest);
if (channel) {
nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo();
nsAutoCString currentContentType;
channel->GetContentType(currentContentType);
/* Bug 1571742
* We cannot skip snffing if the current MIME-Type is a JSON file.
* The JSON-Viewer relies on its own sniffer to determine, if it can render
* the page, so we need to make an exception if the Server provides a valid
* JSON-MIME.
*/
if (loadInfo->GetSkipContentSniffing() &&
!currentContentType.Equals(APPLICATION_JSON) &&
!currentContentType.Equals(APPLICATION_WEB_MANIFEST) &&
!currentContentType.Equals(TEXT_JSON)) {
aSniffedType.Truncate();
return;
}
}
nsCOMArray<nsIContentSniffer> sniffers;
cache->GetEntries(sniffers);
for (int32_t i = 0; i < sniffers.Count(); ++i) {
@ -2730,24 +2751,24 @@ void NS_SniffContent(const char* aSnifferType, nsIRequest* aRequest,
// If the Sniffers did not hit and NoSniff is set
// Check if we have any MIME Type at all or report an
// Error to the Console
nsCOMPtr<nsIHttpChannel> channel = do_QueryInterface(aRequest);
if (channel) {
nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo();
nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aRequest);
if (httpChannel) {
nsCOMPtr<nsILoadInfo> loadInfo = httpChannel->LoadInfo();
if (loadInfo->GetSkipContentSniffing()) {
nsAutoCString type;
channel->GetContentType(type);
httpChannel->GetContentType(type);
if (type.Equals(nsCString("application/x-unknown-content-type"))) {
nsCOMPtr<nsIURI> requestUri;
channel->GetURI(getter_AddRefs(requestUri));
httpChannel->GetURI(getter_AddRefs(requestUri));
nsAutoCString spec;
requestUri->GetSpec(spec);
if (spec.Length() > 50) {
spec.Truncate(50);
spec.AppendLiteral("...");
}
channel->LogMimeTypeMismatch(
httpChannel->LogMimeTypeMismatch(
nsCString("XTCOWithMIMEValueMissing"), false,
NS_ConvertUTF8toUTF16(spec),
// Type is not used in the Error Message but required