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

Side by Side Diff: Source/core/html/parser/HTMLViewSourceParser.cpp

Issue 301813002: Highlight relfected XSS vectors in view-source page. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update descriptive text in test cases. 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/parser/HTMLViewSourceParser.h ('k') | no next file » | 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) 2010 Google, Inc. All Rights Reserved. 2 * Copyright (C) 2010 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 12 matching lines...) Expand all
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/HTMLViewSourceParser.h" 27 #include "core/html/parser/HTMLViewSourceParser.h"
28 28
29 #include "core/dom/DOMImplementation.h" 29 #include "core/dom/DOMImplementation.h"
30 #include "core/html/parser/HTMLParserIdioms.h" 30 #include "core/html/parser/HTMLParserIdioms.h"
31 #include "core/html/parser/HTMLParserOptions.h" 31 #include "core/html/parser/HTMLParserOptions.h"
32 #include "core/html/parser/HTMLToken.h" 32 #include "core/html/parser/HTMLToken.h"
33 #include "core/html/parser/XSSAuditorDelegate.h"
33 34
34 namespace WebCore { 35 namespace WebCore {
35 36
36 HTMLViewSourceParser::HTMLViewSourceParser(HTMLViewSourceDocument& document, con st String& mimeType) 37 HTMLViewSourceParser::HTMLViewSourceParser(HTMLViewSourceDocument& document, con st String& mimeType)
37 : DecodedDataDocumentParser(document) 38 : DecodedDataDocumentParser(document)
38 , m_tokenizer(HTMLTokenizer::create(HTMLParserOptions(&document))) 39 , m_tokenizer(HTMLTokenizer::create(HTMLParserOptions(&document)))
39 { 40 {
40 if (mimeType != "text/html" && !DOMImplementation::isXMLMIMEType(mimeType)) 41 if (mimeType != "text/html" && !DOMImplementation::isXMLMIMEType(mimeType))
41 m_tokenizer->setState(HTMLTokenizer::PLAINTEXTState); 42 m_tokenizer->setState(HTMLTokenizer::PLAINTEXTState);
42 } 43 }
43 44
44 void HTMLViewSourceParser::pumpTokenizer() 45 void HTMLViewSourceParser::pumpTokenizer()
45 { 46 {
47 m_xssAuditor.init(document(), 0);
48
46 while (true) { 49 while (true) {
47 m_sourceTracker.start(m_input.current(), m_tokenizer.get(), m_token); 50 m_sourceTracker.start(m_input.current(), m_tokenizer.get(), m_token);
48 if (!m_tokenizer->nextToken(m_input.current(), m_token)) 51 if (!m_tokenizer->nextToken(m_input.current(), m_token))
49 return; 52 return;
50 m_sourceTracker.end(m_input.current(), m_tokenizer.get(), m_token); 53 m_sourceTracker.end(m_input.current(), m_tokenizer.get(), m_token);
51 54
52 document()->addSource(m_sourceTracker.sourceForToken(m_token), m_token); 55 OwnPtr<XSSInfo> xssInfo = m_xssAuditor.filterToken(FilterTokenRequest(m_ token, m_sourceTracker, m_tokenizer->shouldAllowCDATA()));
56 HTMLViewSourceDocument::SourceAnnotation annotation = xssInfo ? HTMLView SourceDocument::AnnotateSourceAsXSS : HTMLViewSourceDocument::AnnotateSourceAsSa fe;
57 document()->addSource(m_sourceTracker.sourceForToken(m_token), m_token, annotation);
53 58
54 // FIXME: The tokenizer should do this work for us. 59 // FIXME: The tokenizer should do this work for us.
55 if (m_token.type() == HTMLToken::StartTag) 60 if (m_token.type() == HTMLToken::StartTag)
56 m_tokenizer->updateStateFor(attemptStaticStringCreation(m_token.name (), Likely8Bit)); 61 m_tokenizer->updateStateFor(attemptStaticStringCreation(m_token.name (), Likely8Bit));
57 m_token.clear(); 62 m_token.clear();
58 } 63 }
59 } 64 }
60 65
61 void HTMLViewSourceParser::append(PassRefPtr<StringImpl> input) 66 void HTMLViewSourceParser::append(PassRefPtr<StringImpl> input)
62 { 67 {
63 m_input.appendToEnd(String(input)); 68 m_input.appendToEnd(String(input));
64 pumpTokenizer(); 69 pumpTokenizer();
65 } 70 }
66 71
67 void HTMLViewSourceParser::finish() 72 void HTMLViewSourceParser::finish()
68 { 73 {
69 if (!m_input.haveSeenEndOfFile()) 74 if (!m_input.haveSeenEndOfFile())
70 m_input.markEndOfFile(); 75 m_input.markEndOfFile();
71 pumpTokenizer(); 76 pumpTokenizer();
72 document()->finishedParsing(); 77 document()->finishedParsing();
73 } 78 }
74 79
75 } 80 }
OLDNEW
« no previous file with comments | « Source/core/html/parser/HTMLViewSourceParser.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698