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 |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "core/dom/Document.h" | 28 #include "core/dom/Document.h" |
29 #include "core/frame/LocalFrame.h" | 29 #include "core/frame/LocalFrame.h" |
30 #include "core/inspector/ConsoleMessage.h" | 30 #include "core/inspector/ConsoleMessage.h" |
31 #include "core/loader/DocumentLoader.h" | 31 #include "core/loader/DocumentLoader.h" |
32 #include "core/loader/FrameLoader.h" | 32 #include "core/loader/FrameLoader.h" |
33 #include "core/loader/FrameLoaderClient.h" | 33 #include "core/loader/FrameLoaderClient.h" |
34 #include "core/loader/NavigationScheduler.h" | 34 #include "core/loader/NavigationScheduler.h" |
35 #include "core/loader/PingLoader.h" | 35 #include "core/loader/PingLoader.h" |
36 #include "platform/json/JSONValues.h" | 36 #include "platform/json/JSONValues.h" |
37 #include "platform/network/EncodedFormData.h" | 37 #include "platform/network/EncodedFormData.h" |
| 38 #include "platform/network/ResourceError.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" |
40 | 41 |
41 namespace blink { | 42 namespace blink { |
42 | 43 |
43 String XSSInfo::buildConsoleError() const { | 44 String XSSInfo::buildConsoleError() const { |
44 StringBuilder message; | 45 StringBuilder message; |
45 message.append("The XSS Auditor "); | 46 message.append("The XSS Auditor "); |
46 message.append(m_didBlockEntirePage ? "blocked access to" | 47 message.append(m_didBlockEntirePage ? "blocked access to" |
47 : "refused to execute a script in"); | 48 : "refused to execute a script in"); |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 | 120 |
120 frameLoader.client()->didDetectXSS(m_document->url(), | 121 frameLoader.client()->didDetectXSS(m_document->url(), |
121 xssInfo.m_didBlockEntirePage); | 122 xssInfo.m_didBlockEntirePage); |
122 | 123 |
123 if (!m_reportURL.isEmpty()) | 124 if (!m_reportURL.isEmpty()) |
124 PingLoader::sendViolationReport(m_document->frame(), m_reportURL, | 125 PingLoader::sendViolationReport(m_document->frame(), m_reportURL, |
125 generateViolationReport(xssInfo), | 126 generateViolationReport(xssInfo), |
126 PingLoader::XSSAuditorViolationReport); | 127 PingLoader::XSSAuditorViolationReport); |
127 } | 128 } |
128 | 129 |
129 if (xssInfo.m_didBlockEntirePage) | 130 if (xssInfo.m_didBlockEntirePage) { |
130 m_document->frame()->navigationScheduler().schedulePageBlock(m_document); | 131 m_document->frame()->navigationScheduler().schedulePageBlock( |
| 132 m_document, ResourceError::BLOCKED_BY_XSS_AUDITOR); |
| 133 } |
131 } | 134 } |
132 | 135 |
133 } // namespace blink | 136 } // namespace blink |
OLD | NEW |