Changeset 87708 in webkit


Ignore:
Timestamp:
May 30, 2011 9:03:56 PM (13 years ago)
Author:
dbates@webkit.org
Message:

2011-05-30 Daniel Bates <​dbates@webkit.org>

Reviewed by Adam Barth.

Rename XSSFilter to XSSAuditor
​https://bugs.webkit.org/show_bug.cgi?id=61718

Currently we use the names XSSFilter and XSSAuditor throughout the project.
Instead, we should choose one name for consistency.

No functionality was changed. So, no new tests.

  • XSSAuditor: Copied from PerformanceTests/XSSFilter.
  • XSSFilter: Removed.
  • XSSFilter/large-post-many-events.html: Removed.
  • XSSFilter/large-post-many-inline-scripts-and-events.html: Removed.
  • XSSFilter/resources: Removed.
  • XSSFilter/resources/target-for-large-post-many-inline-scripts-and-events.html: Removed.

2011-05-30 Daniel Bates <​dbates@webkit.org>

Reviewed by Adam Barth.

Rename XSSFilter to XSSAuditor
​https://bugs.webkit.org/show_bug.cgi?id=61718

Currently we use the names XSSFilter and XSSAuditor throughout the project.
Instead, we should choose one name for consistency.

No functionality was changed. So, no new tests.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • html/parser/HTMLDocumentParser.cpp: (WebCore::HTMLDocumentParser::HTMLDocumentParser): (WebCore::HTMLDocumentParser::pumpTokenizer):
  • html/parser/HTMLDocumentParser.h:
  • html/parser/XSSAuditor.cpp: Copied from Source/WebCore/html/parser/XSSFilter.cpp. (WebCore::XSSAuditor::XSSAuditor): (WebCore::XSSAuditor::init): (WebCore::XSSAuditor::filterToken): (WebCore::XSSAuditor::filterTokenInitial): (WebCore::XSSAuditor::filterTokenAfterScriptStartTag): (WebCore::XSSAuditor::filterScriptToken): (WebCore::XSSAuditor::filterObjectToken): (WebCore::XSSAuditor::filterParamToken): (WebCore::XSSAuditor::filterEmbedToken): (WebCore::XSSAuditor::filterAppletToken): (WebCore::XSSAuditor::filterIframeToken): (WebCore::XSSAuditor::filterMetaToken): (WebCore::XSSAuditor::filterBaseToken): (WebCore::XSSAuditor::filterFormToken): (WebCore::XSSAuditor::eraseDangerousAttributesIfInjected): (WebCore::XSSAuditor::eraseAttributeIfInjected): (WebCore::XSSAuditor::snippetForRange): (WebCore::XSSAuditor::snippetForAttribute): (WebCore::XSSAuditor::isContainedInRequest): (WebCore::XSSAuditor::isSameOriginResource):
  • html/parser/XSSAuditor.h: Copied from Source/WebCore/html/parser/XSSFilter.h.
  • html/parser/XSSFilter.cpp: Removed.
  • html/parser/XSSFilter.h: Removed.
Location:
trunk
Files:
10 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/PerformanceTests/ChangeLog

    r81960 r87708  
     12011-05-30  Daniel Bates  <dbates@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Rename XSSFilter to XSSAuditor
     6        https://bugs.webkit.org/show_bug.cgi?id=61718
     7
     8        Currently we use the names XSSFilter and XSSAuditor throughout the project.
     9        Instead, we should choose one name for consistency.
     10
     11        No functionality was changed. So, no new tests.
     12
     13        * XSSAuditor: Copied from PerformanceTests/XSSFilter.
     14        * XSSFilter: Removed.
     15        * XSSFilter/large-post-many-events.html: Removed.
     16        * XSSFilter/large-post-many-inline-scripts-and-events.html: Removed.
     17        * XSSFilter/resources: Removed.
     18        * XSSFilter/resources/target-for-large-post-many-inline-scripts-and-events.html: Removed.
     19
    1202011-03-25  Leo Yang  <leo.yang@torchmobile.com.cn>
    221

  • trunk/Source/WebCore/CMakeLists.txt

    r87370 r87708  
    882882    html/parser/TextDocumentParser.cpp
    883883    html/parser/TextViewSourceParser.cpp
    884     html/parser/XSSFilter.cpp
     884    html/parser/XSSAuditor.cpp
    885885
    886886    html/shadow/ElementWithPseudoId.cpp

  • trunk/Source/WebCore/ChangeLog

    r87707 r87708  
     12011-05-30  Daniel Bates  <dbates@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Rename XSSFilter to XSSAuditor
     6        https://bugs.webkit.org/show_bug.cgi?id=61718
     7
     8        Currently we use the names XSSFilter and XSSAuditor throughout the project.
     9        Instead, we should choose one name for consistency.
     10
     11        No functionality was changed. So, no new tests.
     12
     13        * CMakeLists.txt:
     14        * GNUmakefile.list.am:
     15        * WebCore.gypi:
     16        * WebCore.pro:
     17        * WebCore.vcproj/WebCore.vcproj:
     18        * WebCore.xcodeproj/project.pbxproj:
     19        * html/parser/HTMLDocumentParser.cpp:
     20        (WebCore::HTMLDocumentParser::HTMLDocumentParser):
     21        (WebCore::HTMLDocumentParser::pumpTokenizer):
     22        * html/parser/HTMLDocumentParser.h:
     23        * html/parser/XSSAuditor.cpp: Copied from Source/WebCore/html/parser/XSSFilter.cpp.
     24        (WebCore::XSSAuditor::XSSAuditor):
     25        (WebCore::XSSAuditor::init):
     26        (WebCore::XSSAuditor::filterToken):
     27        (WebCore::XSSAuditor::filterTokenInitial):
     28        (WebCore::XSSAuditor::filterTokenAfterScriptStartTag):
     29        (WebCore::XSSAuditor::filterScriptToken):
     30        (WebCore::XSSAuditor::filterObjectToken):
     31        (WebCore::XSSAuditor::filterParamToken):
     32        (WebCore::XSSAuditor::filterEmbedToken):
     33        (WebCore::XSSAuditor::filterAppletToken):
     34        (WebCore::XSSAuditor::filterIframeToken):
     35        (WebCore::XSSAuditor::filterMetaToken):
     36        (WebCore::XSSAuditor::filterBaseToken):
     37        (WebCore::XSSAuditor::filterFormToken):
     38        (WebCore::XSSAuditor::eraseDangerousAttributesIfInjected):
     39        (WebCore::XSSAuditor::eraseAttributeIfInjected):
     40        (WebCore::XSSAuditor::snippetForRange):
     41        (WebCore::XSSAuditor::snippetForAttribute):
     42        (WebCore::XSSAuditor::isContainedInRequest):
     43        (WebCore::XSSAuditor::isSameOriginResource):
     44        * html/parser/XSSAuditor.h: Copied from Source/WebCore/html/parser/XSSFilter.h.
     45        * html/parser/XSSFilter.cpp: Removed.
     46        * html/parser/XSSFilter.h: Removed.
     47
    1482011-05-30  No'am Rosenthal  <noam.rosenthal@nokia.com>
    249

  • trunk/Source/WebCore/GNUmakefile.list.am

    r87370 r87708  
    18391839        Source/WebCore/html/parser/TextViewSourceParser.cpp \
    18401840        Source/WebCore/html/parser/TextViewSourceParser.h \
    1841         Source/WebCore/html/parser/XSSFilter.cpp \
    1842         Source/WebCore/html/parser/XSSFilter.h \
     1841        Source/WebCore/html/parser/XSSAuditor.cpp \
     1842        Source/WebCore/html/parser/XSSAuditor.h \
    18431843        Source/WebCore/html/shadow/ElementWithPseudoId.cpp \
    18441844        Source/WebCore/html/shadow/ElementWithPseudoId.h \

  • trunk/Source/WebCore/WebCore.gypi

    r87399 r87708  
    31863186            'html/parser/TextViewSourceParser.cpp',
    31873187            'html/parser/TextViewSourceParser.h',
    3188             'html/parser/XSSFilter.cpp',
    3189             'html/parser/XSSFilter.h',
     3188            'html/parser/XSSAuditor.cpp',
     3189            'html/parser/XSSAuditor.h',
    31903190            'html/shadow/ElementWithPseudoId.cpp',
    31913191            'html/shadow/ElementWithPseudoId.h',

  • trunk/Source/WebCore/WebCore.pro

    r87370 r87708  
    799799    html/parser/TextDocumentParser.cpp \
    800800    html/parser/TextViewSourceParser.cpp \
    801     html/parser/XSSFilter.cpp \
     801    html/parser/XSSAuditor.cpp \
    802802    html/shadow/ElementWithPseudoId.cpp \
    803803    html/shadow/DetailsMarkerControl.cpp \
    … …  
    17481748    html/parser/HTMLTreeBuilder.h \
    17491749    html/parser/HTMLViewSourceParser.h \
    1750     html/parser/XSSFilter.h \
     1750    html/parser/XSSAuditor.h \
    17511751    html/shadow/MediaControlElements.h \
    17521752    html/shadow/DetailsMarkerControl.h \

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r87399 r87708  
    5719857198                                </File>
    5719957199                                <File
    57200                                         RelativePath="..\html\parser\XSSFilter.cpp"
    57201                                         >
    57202                                 </File>
    57203                                 <File
    57204                                         RelativePath="..\html\parser\XSSFilter.h"
     57200                                        RelativePath="..\html\parser\XSSAuditor.cpp"
     57201                                        >
     57202                                </File>
     57203                                <File
     57204                                        RelativePath="..\html\parser\XSSAuditor.h"
    5720557205                                        >
    5720657206                                </File>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r87370 r87708  
    31203120                977E2DCD12F0E28300C13379 /* HTMLSourceTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 977E2DCB12F0E28300C13379 /* HTMLSourceTracker.cpp */; };
    31213121                977E2DCE12F0E28300C13379 /* HTMLSourceTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 977E2DCC12F0E28300C13379 /* HTMLSourceTracker.h */; };
    3122                 977E2E0E12F0FC9C00C13379 /* XSSFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 977E2E0B12F0FC9C00C13379 /* XSSFilter.cpp */; };
    3123                 977E2E0F12F0FC9C00C13379 /* XSSFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 977E2E0C12F0FC9C00C13379 /* XSSFilter.h */; };
     3122                977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 977E2E0B12F0FC9C00C13379 /* XSSAuditor.cpp */; };
     3123                977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */ = {isa = PBXBuildFile; fileRef = 977E2E0C12F0FC9C00C13379 /* XSSAuditor.h */; };
    31243124                979F43D31075E44A0000F83B /* NavigationScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 979F43D11075E44A0000F83B /* NavigationScheduler.cpp */; };
    31253125                979F43D41075E44A0000F83B /* NavigationScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 979F43D21075E44A0000F83B /* NavigationScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    96839683                977E2DCB12F0E28300C13379 /* HTMLSourceTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTMLSourceTracker.cpp; path = parser/HTMLSourceTracker.cpp; sourceTree = "<group>"; };
    96849684                977E2DCC12F0E28300C13379 /* HTMLSourceTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLSourceTracker.h; path = parser/HTMLSourceTracker.h; sourceTree = "<group>"; };
    9685                 977E2E0B12F0FC9C00C13379 /* XSSFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XSSFilter.cpp; path = parser/XSSFilter.cpp; sourceTree = "<group>"; };
    9686                 977E2E0C12F0FC9C00C13379 /* XSSFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XSSFilter.h; path = parser/XSSFilter.h; sourceTree = "<group>"; };
     9685                977E2E0B12F0FC9C00C13379 /* XSSAuditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XSSAuditor.cpp; path = parser/XSSAuditor.cpp; sourceTree = "<group>"; };
     9686                977E2E0C12F0FC9C00C13379 /* XSSAuditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XSSAuditor.h; path = parser/XSSAuditor.h; sourceTree = "<group>"; };
    96879687                979F43D11075E44A0000F83B /* NavigationScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigationScheduler.cpp; sourceTree = "<group>"; };
    96889688                979F43D21075E44A0000F83B /* NavigationScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationScheduler.h; sourceTree = "<group>"; };
    … …  
    1628616286                                97BC84A212370DC7000C6161 /* TextViewSourceParser.cpp */,
    1628716287                                97BC84A312370DC8000C6161 /* TextViewSourceParser.h */,
    16288                                 977E2E0B12F0FC9C00C13379 /* XSSFilter.cpp */,
    16289                                 977E2E0C12F0FC9C00C13379 /* XSSFilter.h */,
     16288                                977E2E0B12F0FC9C00C13379 /* XSSAuditor.cpp */,
     16289                                977E2E0C12F0FC9C00C13379 /* XSSAuditor.h */,
    1629016290                        );
    1629116291                        name = parser;
    … …  
    2299922999                                93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */,
    2300023000                                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
    23001                                 977E2E0F12F0FC9C00C13379 /* XSSFilter.h in Headers */,
     23001                                977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */,
    2300223002                                FD537353137B651800008DCE /* ZeroPole.h in Headers */,
    2300323003                                B12D233F13560282002A28D4 /* ExclusiveTrackList.h in Headers */,
    … …  
    2569525695                                93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */,
    2569625696                                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
    25697                                 977E2E0E12F0FC9C00C13379 /* XSSFilter.cpp in Sources */,
     25697                                977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */,
    2569825698                                FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
    2569925699                                B12D233E13560282002A28D4 /* ExclusiveTrackList.cpp in Sources */,

  • trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp

    r84811 r87708  
    8181    , m_treeBuilder(HTMLTreeBuilder::create(this, document, reportErrors, usePreHTML5ParserQuirks(document)))
    8282    , m_parserScheduler(HTMLParserScheduler::create(this))
    83     , m_xssFilter(this)
     83    , m_xssAuditor(this)
    8484    , m_endWasDelayed(false)
    8585    , m_pumpSessionNestingLevel(0)
    … …  
    9393    , m_tokenizer(HTMLTokenizer::create(usePreHTML5ParserQuirks(fragment->document())))
    9494    , m_treeBuilder(HTMLTreeBuilder::create(this, fragment, contextElement, scriptingPermission, usePreHTML5ParserQuirks(fragment->document())))
    95     , m_xssFilter(this)
     95    , m_xssAuditor(this)
    9696    , m_endWasDelayed(false)
    9797    , m_pumpSessionNestingLevel(0)
    … …  
    271271            // We do not XSS filter innerHTML, which means we (intentionally) fail
    272272            // http/tests/security/xssAuditor/dom-write-innerHTML.html
    273             m_xssFilter.filterToken(m_token);
     273            m_xssAuditor.filterToken(m_token);
    274274        }
    275275

  • trunk/Source/WebCore/html/parser/HTMLDocumentParser.h

    r82631 r87708  
    3636#include "SegmentedString.h"
    3737#include "Timer.h"
    38 #include "XSSFilter.h"
     38#include "XSSAuditor.h"
    3939#include <wtf/OwnPtr.h>
    4040
    … …  
    152152    OwnPtr<HTMLParserScheduler> m_parserScheduler;
    153153    HTMLSourceTracker m_sourceTracker;
    154     XSSFilter m_xssFilter;
     154    XSSAuditor m_xssAuditor;
    155155
    156156    bool m_endWasDelayed;

  • trunk/Source/WebCore/html/parser/XSSAuditor.cpp

    r87707 r87708  
    2525
    2626#include "config.h"
    27 #include "XSSFilter.h"
     27#include "XSSAuditor.h"
    2828
    2929#include "Console.h"
    … …  
    128128}
    129129
    130 XSSFilter::XSSFilter(HTMLDocumentParser* parser)
     130XSSAuditor::XSSAuditor(HTMLDocumentParser* parser)
    131131    : m_parser(parser)
    132132    , m_isEnabled(false)
    … …  
    143143}
    144144
    145 void XSSFilter::init()
     145void XSSAuditor::init()
    146146{
    147147    const size_t miniumLengthForSuffixTree = 512; // FIXME: Tune this parameter.
    … …  
    155155   
    156156    // In theory, the Document could have detached from the Frame after the
    157     // XSSFilter was constructed.
     157    // XSSAuditor was constructed.
    158158    if (!m_parser->document()->frame()) {
    159159        m_isEnabled = false;
    … …  
    192192}
    193193
    194 void XSSFilter::filterToken(HTMLToken& token)
     194void XSSAuditor::filterToken(HTMLToken& token)
    195195{
    196196    if (m_state == Uninitialized) {
    … …  
    231231}
    232232
    233 bool XSSFilter::filterTokenInitial(HTMLToken& token)
     233bool XSSAuditor::filterTokenInitial(HTMLToken& token)
    234234{
    235235    ASSERT(m_state == Initial);
    … …  
    262262}
    263263
    264 bool XSSFilter::filterTokenAfterScriptStartTag(HTMLToken& token)
     264bool XSSAuditor::filterTokenAfterScriptStartTag(HTMLToken& token)
    265265{
    266266    ASSERT(m_state == AfterScriptStartTag);
    … …  
    284284}
    285285
    286 bool XSSFilter::filterScriptToken(HTMLToken& token)
     286bool XSSAuditor::filterScriptToken(HTMLToken& token)
    287287{
    288288    ASSERT(m_state == Initial);
    … …  
    298298}
    299299
    300 bool XSSFilter::filterObjectToken(HTMLToken& token)
     300bool XSSAuditor::filterObjectToken(HTMLToken& token)
    301301{
    302302    ASSERT(m_state == Initial);
    … …  
    313313}
    314314
    315 bool XSSFilter::filterParamToken(HTMLToken& token)
     315bool XSSAuditor::filterParamToken(HTMLToken& token)
    316316{
    317317    ASSERT(m_state == Initial);
    … …  
    332332}
    333333
    334 bool XSSFilter::filterEmbedToken(HTMLToken& token)
     334bool XSSAuditor::filterEmbedToken(HTMLToken& token)
    335335{
    336336    ASSERT(m_state == Initial);
    … …  
    346346}
    347347
    348 bool XSSFilter::filterAppletToken(HTMLToken& token)
     348bool XSSAuditor::filterAppletToken(HTMLToken& token)
    349349{
    350350    ASSERT(m_state == Initial);
    … …  
    360360}
    361361
    362 bool XSSFilter::filterIframeToken(HTMLToken& token)
     362bool XSSAuditor::filterIframeToken(HTMLToken& token)
    363363{
    364364    ASSERT(m_state == Initial);
    … …  
    369369}
    370370
    371 bool XSSFilter::filterMetaToken(HTMLToken& token)
     371bool XSSAuditor::filterMetaToken(HTMLToken& token)
    372372{
    373373    ASSERT(m_state == Initial);
    … …  
    378378}
    379379
    380 bool XSSFilter::filterBaseToken(HTMLToken& token)
     380bool XSSAuditor::filterBaseToken(HTMLToken& token)
    381381{
    382382    ASSERT(m_state == Initial);
    … …  
    387387}
    388388
    389 bool XSSFilter::filterFormToken(HTMLToken& token)
     389bool XSSAuditor::filterFormToken(HTMLToken& token)
    390390{
    391391    ASSERT(m_state == Initial);
    … …  
    396396}
    397397
    398 bool XSSFilter::eraseDangerousAttributesIfInjected(HTMLToken& token)
     398bool XSSAuditor::eraseDangerousAttributesIfInjected(HTMLToken& token)
    399399{
    400400    DEFINE_STATIC_LOCAL(String, safeJavaScriptURL, ("javascript:void(0)"));
    … …  
    417417}
    418418
    419 bool XSSFilter::eraseAttributeIfInjected(HTMLToken& token, const QualifiedName& attributeName, const String& replacementValue)
     419bool XSSAuditor::eraseAttributeIfInjected(HTMLToken& token, const QualifiedName& attributeName, const String& replacementValue)
    420420{
    421421    size_t indexOfAttribute;
    … …  
    436436}
    437437
    438 String XSSFilter::snippetForRange(const HTMLToken& token, int start, int end)
     438String XSSAuditor::snippetForRange(const HTMLToken& token, int start, int end)
    439439{
    440440    // FIXME: There's an extra allocation here that we could save by
    … …  
    443443}
    444444
    445 String XSSFilter::snippetForAttribute(const HTMLToken& token, const HTMLToken::Attribute& attribute)
     445String XSSAuditor::snippetForAttribute(const HTMLToken& token, const HTMLToken::Attribute& attribute)
    446446{
    447447    // FIXME: We should grab one character before the name also.
    … …  
    452452}
    453453
    454 bool XSSFilter::isContainedInRequest(const String& snippet)
     454bool XSSAuditor::isContainedInRequest(const String& snippet)
    455455{
    456456    ASSERT(!snippet.isEmpty());
    … …  
    464464}
    465465
    466 bool XSSFilter::isSameOriginResource(const String& url)
     466bool XSSAuditor::isSameOriginResource(const String& url)
    467467{
    468468    // If the resource is loaded from the same URL as the enclosing page, it's

  • trunk/Source/WebCore/html/parser/XSSAuditor.h

    r87707 r87708  
    2424 */
    2525
    26 #ifndef XSSFilter_h
    27 #define XSSFilter_h
     26#ifndef XSSAuditor_h
     27#define XSSAuditor_h
    2828
    2929#include "HTMLToken.h"
    … …  
    3535class HTMLDocumentParser;
    3636
    37 class XSSFilter {
    38     WTF_MAKE_NONCOPYABLE(XSSFilter);
     37class XSSAuditor {
     38    WTF_MAKE_NONCOPYABLE(XSSAuditor);
    3939public:
    40     explicit XSSFilter(HTMLDocumentParser*);
     40    explicit XSSAuditor(HTMLDocumentParser*);
    4141
    4242    void filterToken(HTMLToken&);
Note: See TracChangeset for help on using the changeset viewer.