Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Side by Side Diff: Source/core/loader/MixedContentChecker.h

Issue 311033003: Implementing mixed content for forms posting to insecure location from secure ones (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed the error when action attribute is empty. Created 6 years, 6 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 | « Source/core/loader/FormSubmission.cpp ('k') | Source/core/loader/MixedContentChecker.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 27 matching lines...) Expand all
38 class LocalFrame; 38 class LocalFrame;
39 class FrameLoaderClient; 39 class FrameLoaderClient;
40 class KURL; 40 class KURL;
41 class SecurityOrigin; 41 class SecurityOrigin;
42 42
43 class MixedContentChecker { 43 class MixedContentChecker {
44 WTF_MAKE_NONCOPYABLE(MixedContentChecker); 44 WTF_MAKE_NONCOPYABLE(MixedContentChecker);
45 public: 45 public:
46 MixedContentChecker(LocalFrame*); 46 MixedContentChecker(LocalFrame*);
47 47
48 bool canDisplayInsecureContent(SecurityOrigin*, const KURL&) const; 48 bool canDisplayInsecureContent(SecurityOrigin* securityOrigin, const KURL& u rl) const
49 {
50 return canDisplayInsecureContentInternal(securityOrigin, url, MixedConte ntChecker::Display);
51 }
52 bool canSubmitToInsecureForm(SecurityOrigin* securityOrigin, const KURL& url ) const
53 {
54 return canDisplayInsecureContentInternal(securityOrigin, url, MixedConte ntChecker::Submission);
55 }
56
49 bool canRunInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const 57 bool canRunInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
50 { 58 {
51 return canRunInsecureContentInternal(securityOrigin, url, false); 59 return canRunInsecureContentInternal(securityOrigin, url, MixedContentCh ecker::Execution);
52 } 60 }
53 bool canConnectInsecureWebSocket(SecurityOrigin* securityOrigin, const KURL& url) const 61 bool canConnectInsecureWebSocket(SecurityOrigin* securityOrigin, const KURL& url) const
54 { 62 {
55 return canRunInsecureContentInternal(securityOrigin, url, true); 63 return canRunInsecureContentInternal(securityOrigin, url, MixedContentCh ecker::WebSocket);
56 } 64 }
57 static bool isMixedContent(SecurityOrigin*, const KURL&); 65 static bool isMixedContent(SecurityOrigin*, const KURL&);
58 66
59 private: 67 private:
68 enum MixedContentType {
69 Display,
70 Execution,
71 WebSocket,
72 Submission
73 };
74
60 // FIXME: This should probably have a separate client from FrameLoader. 75 // FIXME: This should probably have a separate client from FrameLoader.
61 FrameLoaderClient* client() const; 76 FrameLoaderClient* client() const;
62 77
63 bool canRunInsecureContentInternal(SecurityOrigin*, const KURL&, bool isWebS ocket) const; 78 bool canDisplayInsecureContentInternal(SecurityOrigin*, const KURL&, const M ixedContentType) const;
64 79
65 void logWarning(bool allowed, const String& action, const KURL&) const; 80 bool canRunInsecureContentInternal(SecurityOrigin*, const KURL&, const Mixed ContentType) const;
81
82 void logWarning(bool allowed, const KURL& i, const MixedContentType) const;
66 83
67 LocalFrame* m_frame; 84 LocalFrame* m_frame;
68 }; 85 };
69 86
70 } // namespace WebCore 87 } // namespace WebCore
71 88
72 #endif // MixedContentChecker_h 89 #endif // MixedContentChecker_h
OLDNEW
« no previous file with comments | « Source/core/loader/FormSubmission.cpp ('k') | Source/core/loader/MixedContentChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698