| OLD | NEW |
| 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 | 39 |
| 40 namespace WebCore { | 40 namespace WebCore { |
| 41 | 41 |
| 42 MixedContentChecker::MixedContentChecker(Frame* frame) | 42 MixedContentChecker::MixedContentChecker(Frame* frame) |
| 43 : m_frame(frame) | 43 : m_frame(frame) |
| 44 { | 44 { |
| 45 } | 45 } |
| 46 | 46 |
| 47 FrameLoaderClient* MixedContentChecker::client() const | 47 FrameLoaderClient* MixedContentChecker::client() const |
| 48 { | 48 { |
| 49 return m_frame->loader()->client(); | 49 return m_frame->loader().client(); |
| 50 } | 50 } |
| 51 | 51 |
| 52 // static | 52 // static |
| 53 bool MixedContentChecker::isMixedContent(SecurityOrigin* securityOrigin, const K
URL& url) | 53 bool MixedContentChecker::isMixedContent(SecurityOrigin* securityOrigin, const K
URL& url) |
| 54 { | 54 { |
| 55 if (securityOrigin->protocol() != "https") | 55 if (securityOrigin->protocol() != "https") |
| 56 return false; // We only care about HTTPS security origins. | 56 return false; // We only care about HTTPS security origins. |
| 57 | 57 |
| 58 // We're in a secure context, so |url| is mixed content if it's insecure. | 58 // We're in a secure context, so |url| is mixed content if it's insecure. |
| 59 return !SecurityOrigin::isSecure(url); | 59 return !SecurityOrigin::isSecure(url); |
| (...skipping 30 matching lines...) Expand all Loading... |
| 90 } | 90 } |
| 91 | 91 |
| 92 void MixedContentChecker::logWarning(bool allowed, const String& action, const K
URL& target) const | 92 void MixedContentChecker::logWarning(bool allowed, const String& action, const K
URL& target) const |
| 93 { | 93 { |
| 94 String message = String(allowed ? "" : "[blocked] ") + "The page at '" + m_f
rame->document()->url().elidedString() + "' was loaded over HTTPS, but " + actio
n + " insecure content from '" + target.elidedString() + "': this content should
also be loaded over HTTPS.\n"; | 94 String message = String(allowed ? "" : "[blocked] ") + "The page at '" + m_f
rame->document()->url().elidedString() + "' was loaded over HTTPS, but " + actio
n + " insecure content from '" + target.elidedString() + "': this content should
also be loaded over HTTPS.\n"; |
| 95 MessageLevel messageLevel = allowed ? WarningMessageLevel : ErrorMessageLeve
l; | 95 MessageLevel messageLevel = allowed ? WarningMessageLevel : ErrorMessageLeve
l; |
| 96 m_frame->document()->addConsoleMessage(SecurityMessageSource, messageLevel,
message); | 96 m_frame->document()->addConsoleMessage(SecurityMessageSource, messageLevel,
message); |
| 97 } | 97 } |
| 98 | 98 |
| 99 } // namespace WebCore | 99 } // namespace WebCore |
| OLD | NEW |