| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google, Inc. All Rights Reserved. | 2 * Copyright (C) 2013 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 * 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/html/parser/XSSAuditorDelegate.h" | 27 #include "core/html/parser/XSSAuditorDelegate.h" |
| 28 | 28 |
| 29 #include "core/dom/Document.h" | 29 #include "core/dom/Document.h" |
| 30 #include "core/frame/FrameProtector.h" |
| 30 #include "core/frame/LocalFrame.h" | 31 #include "core/frame/LocalFrame.h" |
| 31 #include "core/inspector/ConsoleMessage.h" | 32 #include "core/inspector/ConsoleMessage.h" |
| 32 #include "core/loader/DocumentLoader.h" | 33 #include "core/loader/DocumentLoader.h" |
| 33 #include "core/loader/FrameLoader.h" | 34 #include "core/loader/FrameLoader.h" |
| 34 #include "core/loader/FrameLoaderClient.h" | 35 #include "core/loader/FrameLoaderClient.h" |
| 35 #include "core/loader/PingLoader.h" | 36 #include "core/loader/PingLoader.h" |
| 36 #include "platform/JSONValues.h" | 37 #include "platform/JSONValues.h" |
| 37 #include "platform/network/FormData.h" | 38 #include "platform/network/FormData.h" |
| 38 #include "platform/weborigin/SecurityOrigin.h" | 39 #include "platform/weborigin/SecurityOrigin.h" |
| 39 #include "wtf/text/StringBuilder.h" | 40 #include "wtf/text/StringBuilder.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 return FormData::create(reportObject->toJSONString().utf8().data()); | 101 return FormData::create(reportObject->toJSONString().utf8().data()); |
| 101 } | 102 } |
| 102 | 103 |
| 103 void XSSAuditorDelegate::didBlockScript(const XSSInfo& xssInfo) | 104 void XSSAuditorDelegate::didBlockScript(const XSSInfo& xssInfo) |
| 104 { | 105 { |
| 105 ASSERT(isMainThread()); | 106 ASSERT(isMainThread()); |
| 106 | 107 |
| 107 m_document->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorM
essageLevel, xssInfo.buildConsoleError())); | 108 m_document->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorM
essageLevel, xssInfo.buildConsoleError())); |
| 108 | 109 |
| 109 // stopAllLoaders can detach the LocalFrame, so protect it. | 110 // stopAllLoaders can detach the LocalFrame, so protect it. |
| 110 RefPtr<LocalFrame> protect(m_document->frame()); | 111 FrameProtector protect(m_document->frame()); |
| 111 FrameLoader& frameLoader = m_document->frame()->loader(); | 112 FrameLoader& frameLoader = m_document->frame()->loader(); |
| 112 if (xssInfo.m_didBlockEntirePage) | 113 if (xssInfo.m_didBlockEntirePage) |
| 113 frameLoader.stopAllLoaders(); | 114 frameLoader.stopAllLoaders(); |
| 114 | 115 |
| 115 if (!m_didSendNotifications) { | 116 if (!m_didSendNotifications) { |
| 116 m_didSendNotifications = true; | 117 m_didSendNotifications = true; |
| 117 | 118 |
| 118 frameLoader.client()->didDetectXSS(m_document->url(), xssInfo.m_didBlock
EntirePage); | 119 frameLoader.client()->didDetectXSS(m_document->url(), xssInfo.m_didBlock
EntirePage); |
| 119 | 120 |
| 120 if (!m_reportURL.isEmpty()) | 121 if (!m_reportURL.isEmpty()) |
| 121 PingLoader::sendViolationReport(m_document->frame(), m_reportURL, ge
nerateViolationReport(xssInfo), PingLoader::XSSAuditorViolationReport); | 122 PingLoader::sendViolationReport(m_document->frame(), m_reportURL, ge
nerateViolationReport(xssInfo), PingLoader::XSSAuditorViolationReport); |
| 122 } | 123 } |
| 123 | 124 |
| 124 if (xssInfo.m_didBlockEntirePage) | 125 if (xssInfo.m_didBlockEntirePage) |
| 125 m_document->frame()->navigationScheduler().schedulePageBlock(m_document,
Referrer()); | 126 m_document->frame()->navigationScheduler().schedulePageBlock(m_document,
Referrer()); |
| 126 } | 127 } |
| 127 | 128 |
| 128 } // namespace blink | 129 } // namespace blink |
| OLD | NEW |