Changeset 146763 in webkit


Ignore:
Timestamp:
Mar 25, 2013 6:39:41 AM (11 years ago)
Author:
mkwst@chromium.org
Message:

CSP 1.1: Rename SecurityPolicyViolationEvent::sourceURL to ::sourceFile.
https://bugs.webkit.org/show_bug.cgi?id=113033

Reviewed by Jochen Eisinger.

Source/WebCore:

Bringing our experimental implementation into line with the spec, which
has landed on the de facto standard name Gecko has been sending out for
years and years.

Spec: https://dvcs.w3.org/hg/content-security-policy/rev/e44f4003e158
Thread: http://lists.w3.org/Archives/Public/public-webappsec/2013Mar/0087.html

  • dom/SecurityPolicyViolationEvent.h:

(SecurityPolicyViolationEventInit):
(WebCore::SecurityPolicyViolationEvent::sourceFile):
(WebCore::SecurityPolicyViolationEvent::SecurityPolicyViolationEvent):
(SecurityPolicyViolationEvent):

  • dom/SecurityPolicyViolationEvent.idl:
  • page/ContentSecurityPolicy.cpp:

(WebCore::gatherSecurityPolicyViolationEventData):

s/sourceURL/sourceFile/

LayoutTests:

  • http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics-expected.txt:
  • http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics.html:
  • http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-expected.txt:
  • http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script-expected.txt:
  • http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script.html:
  • http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html:
  • http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt:
  • http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script-expected.txt:
  • http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script.html:
  • http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html:
Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r146762 r146763  
     12013-03-25  Mike West  <mkwst@chromium.org>
     2
     3        CSP 1.1: Rename SecurityPolicyViolationEvent::sourceURL to ::sourceFile.
     4        https://bugs.webkit.org/show_bug.cgi?id=113033
     5
     6        Reviewed by Jochen Eisinger.
     7
     8        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics-expected.txt:
     9        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics.html:
     10        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-expected.txt:
     11        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script-expected.txt:
     12        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script.html:
     13        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html:
     14        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt:
     15        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script-expected.txt:
     16        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script.html:
     17        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html:
     18
    1192013-03-25  Michelangelo De Simone  <michelangelo@webkit.org>
    220
  • trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics-expected.txt

    r146305 r146763  
    1313PASS window.e.effectiveDirective is "effectiveDirectiveValue"
    1414PASS window.e.originalPolicy is "originalPolicyValue"
    15 PASS window.e.sourceURL is "sourceURLValue"
     15PASS window.e.sourceFile is "sourceFileValue"
    1616PASS window.e.lineNumber is 1
    1717PASS successfullyParsed is true
  • trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics.html

    r146305 r146763  
    1616                'effectiveDirective': 'effectiveDirectiveValue',
    1717                'originalPolicy': 'originalPolicyValue',
    18                 'sourceURL': 'sourceURLValue',
     18                'sourceFile': 'sourceFileValue',
    1919                'lineNumber': 1
    2020            };
  • trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-expected.txt

    r146758 r146763  
    1313PASS window.e.effectiveDirective is "img-src"
    1414PASS window.e.originalPolicy is "img-src 'none'"
    15 PASS window.e.sourceURL is "http://127.0.0.1:8000/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html"
     15PASS window.e.sourceFile is "http://127.0.0.1:8000/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html"
    1616PASS window.e.lineNumber is 23
    1717PASS successfullyParsed is true
  • trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script-expected.txt

    r146758 r146763  
    1313PASS window.e.effectiveDirective is "img-src"
    1414PASS window.e.originalPolicy is "img-src 'none'"
    15 PASS window.e.sourceURL is "http://localhost:8000"
     15PASS window.e.sourceFile is "http://localhost:8000"
    1616PASS window.e.lineNumber is 3
    1717PASS successfullyParsed is true
  • trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script.html

    r146758 r146763  
    1515            'effectiveDirective': 'img-src',
    1616            'originalPolicy': 'img-src \'none\'',
    17             'sourceURL': 'http://localhost:8000',
     17            'sourceFile': 'http://localhost:8000',
    1818            'lineNumber': 3
    1919        };
  • trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html

    r146758 r146763  
    1515            'effectiveDirective': 'img-src',
    1616            'originalPolicy': 'img-src \'none\'',
    17             'sourceURL': document.location.toString(),
     17            'sourceFile': document.location.toString(),
    1818            'lineNumber': 23
    1919        };
  • trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt

    r146758 r146763  
    1313PASS window.e.effectiveDirective is "img-src"
    1414PASS window.e.originalPolicy is "img-src 'none'"
    15 PASS window.e.sourceURL is "http://127.0.0.1:8000/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html"
     15PASS window.e.sourceFile is "http://127.0.0.1:8000/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html"
    1616PASS window.e.lineNumber is 23
    1717PASS successfullyParsed is true
  • trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script-expected.txt

    r146758 r146763  
    1313PASS window.e.effectiveDirective is "img-src"
    1414PASS window.e.originalPolicy is "img-src 'none'"
    15 PASS window.e.sourceURL is "http://127.0.0.1:8000/security/contentSecurityPolicy/resources/inject-image.js"
     15PASS window.e.sourceFile is "http://127.0.0.1:8000/security/contentSecurityPolicy/resources/inject-image.js"
    1616PASS window.e.lineNumber is 3
    1717PASS successfullyParsed is true
  • trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script.html

    r146758 r146763  
    1515            'effectiveDirective': 'img-src',
    1616            'originalPolicy': 'img-src \'none\'',
    17             'sourceURL': 'http://127.0.0.1:8000/security/contentSecurityPolicy/resources/inject-image.js',
     17            'sourceFile': 'http://127.0.0.1:8000/security/contentSecurityPolicy/resources/inject-image.js',
    1818            'lineNumber': 3
    1919        };
  • trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html

    r146758 r146763  
    1515            'effectiveDirective': 'img-src',
    1616            'originalPolicy': 'img-src \'none\'',
    17             'sourceURL': document.location.toString(),
     17            'sourceFile': document.location.toString(),
    1818            'lineNumber': 23
    1919        };
  • trunk/Source/WebCore/ChangeLog

    r146762 r146763  
     12013-03-25  Mike West  <mkwst@chromium.org>
     2
     3        CSP 1.1: Rename SecurityPolicyViolationEvent::sourceURL to ::sourceFile.
     4        https://bugs.webkit.org/show_bug.cgi?id=113033
     5
     6        Reviewed by Jochen Eisinger.
     7
     8        Bringing our experimental implementation into line with the spec, which
     9        has landed on the de facto standard name Gecko has been sending out for
     10        years and years.
     11
     12        Spec: https://dvcs.w3.org/hg/content-security-policy/rev/e44f4003e158
     13        Thread: http://lists.w3.org/Archives/Public/public-webappsec/2013Mar/0087.html
     14
     15        * dom/SecurityPolicyViolationEvent.h:
     16        (SecurityPolicyViolationEventInit):
     17        (WebCore::SecurityPolicyViolationEvent::sourceFile):
     18        (WebCore::SecurityPolicyViolationEvent::SecurityPolicyViolationEvent):
     19        (SecurityPolicyViolationEvent):
     20        * dom/SecurityPolicyViolationEvent.idl:
     21        * page/ContentSecurityPolicy.cpp:
     22        (WebCore::gatherSecurityPolicyViolationEventData):
     23            s/sourceURL/sourceFile/
     24
    1252013-03-25  Michelangelo De Simone  <michelangelo@webkit.org>
    226
  • trunk/Source/WebCore/dom/SecurityPolicyViolationEvent.h

    r146305 r146763  
    4444    String effectiveDirective;
    4545    String originalPolicy;
    46     String sourceURL;
     46    String sourceFile;
    4747    int lineNumber;
    4848};
     
    6666    const String& effectiveDirective() const { return m_effectiveDirective; }
    6767    const String& originalPolicy() const { return m_originalPolicy; }
    68     const String& sourceURL() const { return m_sourceURL; }
     68    const String& sourceFile() const { return m_sourceFile; }
    6969    int lineNumber() const { return m_lineNumber; }
    7070
     
    8484        , m_effectiveDirective(initializer.effectiveDirective)
    8585        , m_originalPolicy(initializer.originalPolicy)
    86         , m_sourceURL(initializer.sourceURL)
     86        , m_sourceFile(initializer.sourceFile)
    8787        , m_lineNumber(initializer.lineNumber)
    8888    {
     
    9595    String m_effectiveDirective;
    9696    String m_originalPolicy;
    97     String m_sourceURL;
     97    String m_sourceFile;
    9898    int m_lineNumber;
    9999};
  • trunk/Source/WebCore/dom/SecurityPolicyViolationEvent.idl

    r146305 r146763  
    3333    [InitializedByEventConstructor] readonly attribute DOMString effectiveDirective;
    3434    [InitializedByEventConstructor] readonly attribute DOMString originalPolicy;
    35     [InitializedByEventConstructor] readonly attribute DOMString sourceURL;
     35    [InitializedByEventConstructor] readonly attribute DOMString sourceFile;
    3636    [InitializedByEventConstructor] readonly attribute long      lineNumber;
    3737};
  • trunk/Source/WebCore/page/ContentSecurityPolicy.cpp

    r146758 r146763  
    16911691    init.effectiveDirective = effectiveDirective;
    16921692    init.originalPolicy = header;
    1693     init.sourceURL = String();
     1693    init.sourceFile = String();
    16941694    init.lineNumber = 0;
    16951695
     
    17021702    if (callFrame.lineNumber()) {
    17031703        KURL source = KURL(ParsedURLString, callFrame.sourceURL());
    1704         init.sourceURL = stripURLForUseInReport(document, source);
     1704        init.sourceFile = stripURLForUseInReport(document, source);
    17051705        init.lineNumber = callFrame.lineNumber();
    17061706    }
Note: See TracChangeset for help on using the changeset viewer.