Source/core/fetch/CrossOriginAccessControl.h - Issue 149643003: Improve handling of CORS redirects for some resource loads.

Side by Side Diff: Source/core/fetch/CrossOriginAccessControl.h

Issue 149643003: Improve handling of CORS redirects for some resource loads. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Use canRequest() when checking redirect origin; remove redundant null checks. Created 6 years, 10 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

« no previous file with comments | « LayoutTests/http/tests/security/script-crossorigin-redirect-no-cors-expected.txt ('k') | Source/core/fetch/CrossOriginAccessControl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.	2 * Copyright (C) 2008 Apple 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	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

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

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 19 matching lines...) Expand all Loading...
30 #include "core/fetch/ResourceLoaderOptions.h"	30 #include "core/fetch/ResourceLoaderOptions.h"

31 #include "platform/network/ResourceRequest.h"	31 #include "platform/network/ResourceRequest.h"

32 #include "wtf/Forward.h"	32 #include "wtf/Forward.h"

33 #include "wtf/HashSet.h"	33 #include "wtf/HashSet.h"

34	34

35 namespace WebCore {	35 namespace WebCore {

36	36

37 typedef HashSet<String, CaseFoldingHash> HTTPHeaderSet;	37 typedef HashSet<String, CaseFoldingHash> HTTPHeaderSet;

38	38

39 class HTTPHeaderMap;	39 class HTTPHeaderMap;

	40 class Resource;

	41 struct ResourceLoaderOptions;

	42 class ResourceRequest;

40 class ResourceResponse;	43 class ResourceResponse;

41 class SecurityOrigin;	44 class SecurityOrigin;

42	45

43 enum AccessControlStatus {	46 enum AccessControlStatus {

44 NotSharableCrossOrigin,	47 NotSharableCrossOrigin,

45 SharableCrossOrigin	48 SharableCrossOrigin

46 };	49 };

47	50

	51 class CrossOriginAccessControl {

	52 public:

	53 static bool isLegalRedirectLocation(const KURL&, String& errorDescription);

	54 static bool handleRedirect(Resource, SecurityOrigin, ResourceRequest&, con st ResourceResponse&, ResourceLoaderOptions&, String&);

	55 };

	56

48 bool isSimpleCrossOriginAccessRequest(const String& method, const HTTPHeaderMap& );	57 bool isSimpleCrossOriginAccessRequest(const String& method, const HTTPHeaderMap& );

49 bool isOnAccessControlSimpleRequestMethodWhitelist(const String&);	58 bool isOnAccessControlSimpleRequestMethodWhitelist(const String&);

50 bool isOnAccessControlSimpleRequestHeaderWhitelist(const AtomicString& name, con st AtomicString& value);	59 bool isOnAccessControlSimpleRequestHeaderWhitelist(const AtomicString& name, con st AtomicString& value);

51 bool isOnAccessControlResponseHeaderWhitelist(const String&);	60 bool isOnAccessControlResponseHeaderWhitelist(const String&);

52	61

53 void updateRequestForAccessControl(ResourceRequest&, SecurityOrigin*, StoredCred entials);	62 void updateRequestForAccessControl(ResourceRequest&, SecurityOrigin*, StoredCred entials);

54 ResourceRequest createAccessControlPreflightRequest(const ResourceRequest&, Secu rityOrigin*);	63 ResourceRequest createAccessControlPreflightRequest(const ResourceRequest&, Secu rityOrigin*);

55	64

56 bool passesAccessControlCheck(const ResourceResponse&, StoredCredentials, Securi tyOrigin*, String& errorDescription);	65 bool passesAccessControlCheck(const ResourceResponse&, StoredCredentials, Securi tyOrigin*, String& errorDescription);

57 bool passesPreflightStatusCheck(const ResourceResponse&, String& errorDescriptio n);	66 bool passesPreflightStatusCheck(const ResourceResponse&, String& errorDescriptio n);

58 void parseAccessControlExposeHeadersAllowList(const String& headerValue, HTTPHea derSet&);	67 void parseAccessControlExposeHeadersAllowList(const String& headerValue, HTTPHea derSet&);

59	68

60 } // namespace WebCore	69 } // namespace WebCore

61	70

62 #endif // CrossOriginAccessControl_h	71 #endif // CrossOriginAccessControl_h

OLD	NEW