third_party/WebKit/Source/platform/exported/WebMixedContent.cpp - Issue 2198933003: Prevent mixed content iframes on back/forward.

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebMixedContent.cpp

Issue 2198933003: Prevent mixed content iframes on back/forward. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« third_party/WebKit/Source/core/loader/MixedContentChecker.cpp ('K') | « third_party/WebKit/Source/core/loader/MixedContentChecker.cpp ('k') | no next file » | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2016 Google Inc. All rights reserved.	2 * Copyright (C) 2016 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 case WebURLRequest::RequestContextEmbed:	54 case WebURLRequest::RequestContextEmbed:

55 case WebURLRequest::RequestContextEventSource:	55 case WebURLRequest::RequestContextEventSource:

56 case WebURLRequest::RequestContextFetch:	56 case WebURLRequest::RequestContextFetch:

57 case WebURLRequest::RequestContextFont:	57 case WebURLRequest::RequestContextFont:

58 case WebURLRequest::RequestContextForm:	58 case WebURLRequest::RequestContextForm:

59 case WebURLRequest::RequestContextFrame:	59 case WebURLRequest::RequestContextFrame:

60 case WebURLRequest::RequestContextHyperlink:	60 case WebURLRequest::RequestContextHyperlink:

61 case WebURLRequest::RequestContextIframe:	61 case WebURLRequest::RequestContextIframe:

62 case WebURLRequest::RequestContextImageSet:	62 case WebURLRequest::RequestContextImageSet:

63 case WebURLRequest::RequestContextImport:	63 case WebURLRequest::RequestContextImport:

	64 case WebURLRequest::RequestContextInternal:
	Charlie Reis 2016/08/01 23:39:16 Is this safe? Is this safe? Mike West 2016/08/02 07:41:51 I wouldn't have thought so, though it surprises me Show quoted text On 2016/08/01 at 23:39:16, Charlie Reis wrote: > Is this safe? I wouldn't have thought so, though it surprises me that all the tests pass. "Internal" was more or less a dumping ground for all the kinds of requests that got missed when we made an initial pass through the codebase to tag requests with contextual information. If we _can_ make this change, we should, as it's a safer default. Jochen likes to say "No test, no feature." I'm inclined to agree. :) I agree with your assessment of the rest. LGTM % logging cruft. :)
64 case WebURLRequest::RequestContextLocation:	65 case WebURLRequest::RequestContextLocation:

65 case WebURLRequest::RequestContextManifest:	66 case WebURLRequest::RequestContextManifest:

66 case WebURLRequest::RequestContextObject:	67 case WebURLRequest::RequestContextObject:

67 case WebURLRequest::RequestContextPing:	68 case WebURLRequest::RequestContextPing:

68 case WebURLRequest::RequestContextScript:	69 case WebURLRequest::RequestContextScript:

69 case WebURLRequest::RequestContextServiceWorker:	70 case WebURLRequest::RequestContextServiceWorker:

70 case WebURLRequest::RequestContextSharedWorker:	71 case WebURLRequest::RequestContextSharedWorker:

71 case WebURLRequest::RequestContextStyle:	72 case WebURLRequest::RequestContextStyle:

72 case WebURLRequest::RequestContextSubresource:	73 case WebURLRequest::RequestContextSubresource:

73 case WebURLRequest::RequestContextTrack:	74 case WebURLRequest::RequestContextTrack:

74 case WebURLRequest::RequestContextWorker:	75 case WebURLRequest::RequestContextWorker:

75 case WebURLRequest::RequestContextXMLHttpRequest:	76 case WebURLRequest::RequestContextXMLHttpRequest:

76 case WebURLRequest::RequestContextXSLT:	77 case WebURLRequest::RequestContextXSLT:

77 return ContextType::Blockable;	78 return ContextType::Blockable;

78	79

79 // FIXME: Contexts that we should block, but don't currently. https://crbug. com/388650	80 // FIXME: Contexts that we should block, but don't currently. https://crbug. com/388650

80 case WebURLRequest::RequestContextDownload:	81 case WebURLRequest::RequestContextDownload:

81 case WebURLRequest::RequestContextInternal:

82 case WebURLRequest::RequestContextPrefetch:	82 case WebURLRequest::RequestContextPrefetch:

83 return ContextType::ShouldBeBlockable;	83 return ContextType::ShouldBeBlockable;

84	84

85 case WebURLRequest::RequestContextUnspecified:	85 case WebURLRequest::RequestContextUnspecified:

86 NOTREACHED();	86 NOTREACHED();

87 }	87 }

88 NOTREACHED();	88 NOTREACHED();

89 return ContextType::Blockable;	89 return ContextType::Blockable;

90 }	90 }

91	91

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
160 case WebURLRequest::RequestContextXMLHttpRequest:	160 case WebURLRequest::RequestContextXMLHttpRequest:

161 return "XMLHttpRequest endpoint";	161 return "XMLHttpRequest endpoint";

162 case WebURLRequest::RequestContextXSLT:	162 case WebURLRequest::RequestContextXSLT:

163 return "XSLT";	163 return "XSLT";

164 }	164 }

165 NOTREACHED();	165 NOTREACHED();

166 return "resource";	166 return "resource";

167 }	167 }

168	168

169 } // namespace blink	169 } // namespace blink

OLD	NEW