Changeset 57535 in webkit


Ignore:
Timestamp:
Apr 13, 2010 3:15:24 PM (14 years ago)
Author:
timothy@apple.com
Message:

Rename SecurityOrigin::whiteListAccessFromOrigin to addOriginAccessWhitelistEntry.
And SecurityOrigin::resetOriginAccessWhiteLists to resetOriginAccessWhitelists.

SecurityOrigin needs a way to remove individual OriginAccessEntries
​https://bugs.webkit.org/show_bug.cgi?id=37449

Reviewed by Dave Hyatt.

WebCore:

  • WebCore.base.exp:
  • page/SecurityOrigin.cpp:

(WebCore::SecurityOrigin::addOriginAccessWhitelistEntry):
(WebCore::SecurityOrigin::resetOriginAccessWhitelists):

  • page/SecurityOrigin.h:

WebKit/chromium:

  • src/WebSecurityPolicy.cpp:

(WebKit::WebSecurityPolicy::whiteListAccessFromOrigin):
(WebKit::WebSecurityPolicy::resetOriginAccessWhiteLists):

WebKit/gtk:

  • webkit/webkitprivate.cpp:

(webkit_white_list_access_from_origin):
(webkit_reset_origin_access_white_lists):

WebKit/mac:

  • WebView/WebView.mm:

(+[WebView _addOriginAccessWhitelistEntryWithSourceOrigin:destinationProtocol:destinationHost:allowDestinationSubdomains:]):
(+[WebView _resetOriginAccessWhitelists]):

  • WebView/WebViewPrivate.h:

WebKit/qt:

  • WebCoreSupport/DumpRenderTreeSupportQt.cpp:

(DumpRenderTreeSupportQt::whiteListAccessFromOrigin):
(DumpRenderTreeSupportQt::resetOriginAccessWhiteLists):

WebKit/win:

  • Interfaces/IWebViewPrivate.idl:
  • WebView.cpp:

(WebView::addOriginAccessWhitelistEntry):
(WebView::resetOriginAccessWhitelists):

  • WebView.h:

WebKitTools:

  • DumpRenderTree/LayoutTestController.cpp:

(addOriginAccessWhitelistEntryCallback):
(LayoutTestController::staticFunctions):

  • DumpRenderTree/LayoutTestController.h:
  • DumpRenderTree/chromium/LayoutTestController.cpp:

(LayoutTestController::LayoutTestController):
(LayoutTestController::addOriginAccessWhitelistEntry):

  • DumpRenderTree/chromium/LayoutTestController.h:
  • DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:

(LayoutTestController::addOriginAccessWhitelistEntry):

  • DumpRenderTree/mac/DumpRenderTree.mm:

(resetWebViewToConsistentStateBeforeTesting):

  • DumpRenderTree/mac/LayoutTestControllerMac.mm:

(LayoutTestController::addOriginAccessWhitelistEntry):

  • DumpRenderTree/qt/LayoutTestControllerQt.cpp:

(LayoutTestController::addOriginAccessWhitelistEntry):

  • DumpRenderTree/qt/LayoutTestControllerQt.h:
  • DumpRenderTree/win/DumpRenderTree.cpp:

(resetWebViewToConsistentStateBeforeTesting):

  • DumpRenderTree/win/LayoutTestControllerWin.cpp:

(LayoutTestController::addOriginAccessWhitelistEntry):

  • DumpRenderTree/wx/LayoutTestControllerWx.cpp:

(LayoutTestController::addOriginAccessWhitelistEntry):

LayoutTests:

  • http/tests/security/local-image-from-remote-whitelisted-expected.txt:
  • http/tests/security/local-image-from-remote-whitelisted.html:
  • http/tests/xmlhttprequest/origin-whitelisting-all.html:
  • http/tests/xmlhttprequest/origin-whitelisting-exact-match.html:
  • http/tests/xmlhttprequest/origin-whitelisting-https.html:
  • http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains.html:
  • http/tests/xmlhttprequest/origin-whitelisting-ip-addresses.html:
  • http/tests/xmlhttprequest/origin-whitelisting-subdomains.html:
Location:
trunk
Files:
39 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r57534 r57535  
     12010-04-13  Timothy Hatcher  <timothy@apple.com>
     2
     3        Rename LayoutTestController.whiteListAccessFromOrigin to addOriginAccessWhitelistEntry.
     4
     5        SecurityOrigin needs a way to remove individual OriginAccessEntries
     6        https://bugs.webkit.org/show_bug.cgi?id=37449
     7
     8        Reviewed by Dave Hyatt.
     9
     10        * http/tests/security/local-image-from-remote-whitelisted-expected.txt:
     11        * http/tests/security/local-image-from-remote-whitelisted.html:
     12        * http/tests/xmlhttprequest/origin-whitelisting-all.html:
     13        * http/tests/xmlhttprequest/origin-whitelisting-exact-match.html:
     14        * http/tests/xmlhttprequest/origin-whitelisting-https.html:
     15        * http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains.html:
     16        * http/tests/xmlhttprequest/origin-whitelisting-ip-addresses.html:
     17        * http/tests/xmlhttprequest/origin-whitelisting-subdomains.html:
     18
    1192010-04-13  John Gregg  <johnnyg@google.com>
    220

  • trunk/LayoutTests/http/tests/security/local-image-from-remote-whitelisted-expected.txt

    r57238 r57535  
    11
    2 This test is to see if a remote file can include a local image when the access has been white listed using whiteListAccessFromOrigin.
     2This test is to see if a remote file can include a local image when the access has been white listed using addOriginAccessWhitelistEntry.
    33
    44Test Passed. Local image loaded remotely.

  • trunk/LayoutTests/http/tests/security/local-image-from-remote-whitelisted.html

    r57238 r57535  
    66
    77layoutTestController.dumpAsText();
    8 layoutTestController.whiteListAccessFromOrigin('http://127.0.0.1:8000', 'file', '', true);
     8layoutTestController.addOriginAccessWhitelistEntry('http://127.0.0.1:8000', 'file', '', true);
    99
    1010var localImageLocation = layoutTestController.pathToLocalResource('file:///tmp/LayoutTests/http/tests/security/resources/compass.jpg');
    … …  
    2525
    2626<p>This test is to see if a remote file can include a local image when the
    27 access has been white listed using whiteListAccessFromOrigin.
     27access has been white listed using addOriginAccessWhitelistEntry.
    2828
    2929<p id=result>Test has not run.

  • trunk/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-all.html

    r47548 r57535  
    55layoutTestController.dumpAsText();
    66layoutTestController.waitUntilDone();
    7 layoutTestController.whiteListAccessFromOrigin("http://127.0.0.1:8000", "http", "", true);
    8 layoutTestController.whiteListAccessFromOrigin("http://localhost:8000", "http", "", true);
     7layoutTestController.addOriginAccessWhitelistEntry("http://127.0.0.1:8000", "http", "", true);
     8layoutTestController.addOriginAccessWhitelistEntry("http://localhost:8000", "http", "", true);
    99
    1010function log(message)

  • trunk/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-exact-match.html

    r47548 r57535  
    55layoutTestController.dumpAsText();
    66layoutTestController.waitUntilDone();
    7 layoutTestController.whiteListAccessFromOrigin("http://127.0.0.1:8000", "http", "localhost", false);
     7layoutTestController.addOriginAccessWhitelistEntry("http://127.0.0.1:8000", "http", "localhost", false);
    88
    99function log(message)

  • trunk/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-https.html

    r47548 r57535  
    55layoutTestController.dumpAsText();
    66layoutTestController.waitUntilDone();
    7 layoutTestController.whiteListAccessFromOrigin("http://127.0.0.1:8000", "https", "localhost", false);
     7layoutTestController.addOriginAccessWhitelistEntry("http://127.0.0.1:8000", "https", "localhost", false);
    88
    99function log(message)

  • trunk/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains.html

    r47548 r57535  
    44layoutTestController.dumpAsText();
    55layoutTestController.waitUntilDone();
    6 layoutTestController.whiteListAccessFromOrigin("http://localhost:8000", "http", "*.0.0.1", true);
     6layoutTestController.addOriginAccessWhitelistEntry("http://localhost:8000", "http", "*.0.0.1", true);
    77
    88function log(message)

  • trunk/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses.html

    r47548 r57535  
    44layoutTestController.dumpAsText();
    55layoutTestController.waitUntilDone();
    6 layoutTestController.whiteListAccessFromOrigin("http://localhost:8000", "http", "127.0.0.1", false);
     6layoutTestController.addOriginAccessWhitelistEntry("http://localhost:8000", "http", "127.0.0.1", false);
    77
    88function log(message)

  • trunk/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-subdomains.html

    r47548 r57535  
    55layoutTestController.dumpAsText();
    66layoutTestController.waitUntilDone();
    7 layoutTestController.whiteListAccessFromOrigin("http://127.0.0.1:8000", "http", "localhost", true);
     7layoutTestController.addOriginAccessWhitelistEntry("http://127.0.0.1:8000", "http", "localhost", true);
    88
    99function log(message)

  • trunk/WebCore/ChangeLog

    r57533 r57535  
     12010-04-13  Timothy Hatcher  <timothy@apple.com>
     2
     3        Rename SecurityOrigin::whiteListAccessFromOrigin to addOriginAccessWhitelistEntry.
     4        And SecurityOrigin::resetOriginAccessWhiteLists to resetOriginAccessWhitelists.
     5
     6        SecurityOrigin needs a way to remove individual OriginAccessEntries
     7        https://bugs.webkit.org/show_bug.cgi?id=37449
     8
     9        Reviewed by Dave Hyatt.
     10
     11        * WebCore.base.exp:
     12        * page/SecurityOrigin.cpp:
     13        (WebCore::SecurityOrigin::addOriginAccessWhitelistEntry):
     14        (WebCore::SecurityOrigin::resetOriginAccessWhitelists):
     15        * page/SecurityOrigin.h:
     16
    1172010-04-13  Geoffrey Garen  <ggaren@apple.com>
    218

  • trunk/WebCore/WebCore.base.exp

    r57469 r57535  
    313313__ZN7WebCore14SecurityOrigin24registerURLSchemeAsLocalERKNS_6StringE
    314314__ZN7WebCore14SecurityOrigin25registerURLSchemeAsSecureERKNS_6StringE
    315 __ZN7WebCore14SecurityOrigin25whiteListAccessFromOriginERKS0_RKNS_6StringES5_b
    316 __ZN7WebCore14SecurityOrigin27resetOriginAccessWhiteListsEv
     315__ZN7WebCore14SecurityOrigin29addOriginAccessWhitelistEntryERKS0_RKNS_6StringES5_b
     316__ZN7WebCore14SecurityOrigin27resetOriginAccessWhitelistsEv
    317317__ZN7WebCore14SecurityOrigin40setDomainRelaxationForbiddenForURLSchemeEbRKNS_6StringE
    318318__ZN7WebCore14SecurityOrigin6createERKNS_4KURLEi

  • trunk/WebCore/page/SecurityOrigin.cpp

    r57238 r57535  
    650650}
    651651
    652 void SecurityOrigin::whiteListAccessFromOrigin(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomains, bool allowDestinationSubdomains)
     652void SecurityOrigin::addOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomains, bool allowDestinationSubdomains)
    653653{
    654654    ASSERT(isMainThread());
    … …  
    666666}
    667667
    668 void SecurityOrigin::resetOriginAccessWhiteLists()
     668void SecurityOrigin::resetOriginAccessWhitelists()
    669669{
    670670    ASSERT(isMainThread());

  • trunk/WebCore/page/SecurityOrigin.h

    r57238 r57535  
    195195    static bool shouldTreatURLSchemeAsNoAccess(const String&);
    196196
    197     static void whiteListAccessFromOrigin(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomains, bool allowDestinationSubdomains);
    198     static void resetOriginAccessWhiteLists();
     197    static void addOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomains, bool allowDestinationSubdomains);
     198    static void resetOriginAccessWhitelists();
    199199
    200200private:

  • trunk/WebKit/chromium/ChangeLog

    r57529 r57535  
     12010-04-13  Timothy Hatcher  <timothy@apple.com>
     2
     3        Rename SecurityOrigin::whiteListAccessFromOrigin to addOriginAccessWhitelistEntry.
     4        And SecurityOrigin::resetOriginAccessWhiteLists to resetOriginAccessWhitelists.
     5
     6        SecurityOrigin needs a way to remove individual OriginAccessEntries
     7        https://bugs.webkit.org/show_bug.cgi?id=37449
     8
     9        Reviewed by Dave Hyatt.
     10
     11        * src/WebSecurityPolicy.cpp:
     12        (WebKit::WebSecurityPolicy::whiteListAccessFromOrigin):
     13        (WebKit::WebSecurityPolicy::resetOriginAccessWhiteLists):
     14
    1152010-04-13  Mikhail Naganov  <mnaganov@chromium.org>
    216

  • trunk/WebKit/chromium/src/WebSecurityPolicy.cpp

    r55335 r57535  
    6262    bool allowDestinationSubdomains)
    6363{
    64     SecurityOrigin::whiteListAccessFromOrigin(
     64    SecurityOrigin::addOriginAccessWhitelistEntry(
    6565        *SecurityOrigin::create(sourceOrigin), destinationProtocol,
    6666        destinationHost, allowDestinationSubdomains);
    … …  
    6969void WebSecurityPolicy::resetOriginAccessWhiteLists()
    7070{
    71     SecurityOrigin::resetOriginAccessWhiteLists();
     71    SecurityOrigin::resetOriginAccessWhitelists();
    7272}
    7373

  • trunk/WebKit/gtk/ChangeLog

    r57469 r57535  
     12010-04-13  Timothy Hatcher  <timothy@apple.com>
     2
     3        Rename SecurityOrigin::whiteListAccessFromOrigin to addOriginAccessWhitelistEntry.
     4        And SecurityOrigin::resetOriginAccessWhiteLists to resetOriginAccessWhitelists.
     5
     6        SecurityOrigin needs a way to remove individual OriginAccessEntries
     7        https://bugs.webkit.org/show_bug.cgi?id=37449
     8
     9        Reviewed by Dave Hyatt.
     10
     11        * webkit/webkitprivate.cpp:
     12        (webkit_white_list_access_from_origin):
     13        (webkit_reset_origin_access_white_lists):
     14
    1152010-04-11  Sheriff Bot  <webkit.review.bot@gmail.com>
    216

  • trunk/WebKit/gtk/webkit/webkitprivate.cpp

    r56387 r57535  
    294294void webkit_white_list_access_from_origin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains)
    295295{
    296     SecurityOrigin::whiteListAccessFromOrigin(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
     296    SecurityOrigin::addOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
    297297}
    298298
    299299void webkit_reset_origin_access_white_lists()
    300300{
    301     SecurityOrigin::resetOriginAccessWhiteLists();
    302 }
     301    SecurityOrigin::resetOriginAccessWhitelists();
     302}

  • trunk/WebKit/mac/ChangeLog

    r57469 r57535  
     12010-04-13  Timothy Hatcher  <timothy@apple.com>
     2
     3        Rename SecurityOrigin::whiteListAccessFromOrigin to addOriginAccessWhitelistEntry.
     4        And SecurityOrigin::resetOriginAccessWhiteLists to resetOriginAccessWhitelists.
     5
     6        SecurityOrigin needs a way to remove individual OriginAccessEntries
     7        https://bugs.webkit.org/show_bug.cgi?id=37449
     8
     9        Reviewed by Dave Hyatt.
     10
     11        * WebView/WebView.mm:
     12        (+[WebView _addOriginAccessWhitelistEntryWithSourceOrigin:destinationProtocol:destinationHost:allowDestinationSubdomains:]):
     13        (+[WebView _resetOriginAccessWhitelists]):
     14        * WebView/WebViewPrivate.h:
     15
    1162010-04-11  Sheriff Bot  <webkit.review.bot@gmail.com>
    217

  • trunk/WebKit/mac/WebView/WebView.mm

    r57292 r57535  
    22482248}
    22492249
    2250 + (void)_whiteListAccessFromOrigin:(NSString *)sourceOrigin destinationProtocol:(NSString *)destinationProtocol destinationHost:(NSString *)destinationHost allowDestinationSubdomains:(BOOL)allowDestinationSubdomains
    2251 {
    2252     SecurityOrigin::whiteListAccessFromOrigin(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
    2253 }
    2254 
    2255 +(void)_resetOriginAccessWhiteLists
    2256 {
    2257     SecurityOrigin::resetOriginAccessWhiteLists();
     2250+ (void)_addOriginAccessWhitelistEntryWithSourceOrigin:(NSString *)sourceOrigin destinationProtocol:(NSString *)destinationProtocol destinationHost:(NSString *)destinationHost allowDestinationSubdomains:(BOOL)allowDestinationSubdomains
     2251{
     2252    SecurityOrigin::addOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
     2253}
     2254
     2255+(void)_resetOriginAccessWhitelists
     2256{
     2257    SecurityOrigin::resetOriginAccessWhitelists();
    22582258}
    22592259

  • trunk/WebKit/mac/WebView/WebViewPrivate.h

    r57292 r57535  
    490490// - destinationHost: The host to grant access to.
    491491// - allowDestinationSubdomains: If host is a domain, setting this to YES will whitelist host and all its subdomains, recursively.
    492 + (void)_whiteListAccessFromOrigin:(NSString *)sourceOrigin destinationProtocol:(NSString *)destinationProtocol destinationHost:(NSString *)destinationHost allowDestinationSubdomains:(BOOL)allowDestinationSubdomains;
    493 
    494 // Removes all white list entries created with _whiteListAccessFromOrigin.
    495 + (void)_resetOriginAccessWhiteLists;
     492+ (void)_addOriginAccessWhitelistEntryWithSourceOrigin:(NSString *)sourceOrigin destinationProtocol:(NSString *)destinationProtocol destinationHost:(NSString *)destinationHost allowDestinationSubdomains:(BOOL)allowDestinationSubdomains;
     493
     494// Removes all white list entries created with _addOriginAccessWhitelistEntryWithSourceOrigin.
     495+ (void)_resetOriginAccessWhitelists;
    496496
    497497+ (void)_addUserScriptToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist injectionTime:(WebUserScriptInjectionTime)injectionTime;

  • trunk/WebKit/qt/ChangeLog

    r57469 r57535  
     12010-04-13  Timothy Hatcher  <timothy@apple.com>
     2
     3        Rename SecurityOrigin::whiteListAccessFromOrigin to addOriginAccessWhitelistEntry.
     4        And SecurityOrigin::resetOriginAccessWhiteLists to resetOriginAccessWhitelists.
     5
     6        SecurityOrigin needs a way to remove individual OriginAccessEntries
     7        https://bugs.webkit.org/show_bug.cgi?id=37449
     8
     9        Reviewed by Dave Hyatt.
     10
     11        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     12        (DumpRenderTreeSupportQt::whiteListAccessFromOrigin):
     13        (DumpRenderTreeSupportQt::resetOriginAccessWhiteLists):
     14
    1152010-04-11  Sheriff Bot  <webkit.review.bot@gmail.com>
    216

  • trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r57433 r57535  
    317317void DumpRenderTreeSupportQt::whiteListAccessFromOrigin(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains)
    318318{
    319     SecurityOrigin::whiteListAccessFromOrigin(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
     319    SecurityOrigin::addOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(sourceOrigin), destinationProtocol, destinationHost, allowDestinationSubdomains);
    320320}
    321321
    322322void DumpRenderTreeSupportQt::resetOriginAccessWhiteLists()
    323323{
    324     SecurityOrigin::resetOriginAccessWhiteLists();
     324    SecurityOrigin::resetOriginAccessWhitelists();
    325325}
    326326

  • trunk/WebKit/win/ChangeLog

    r57469 r57535  
     12010-04-13  Timothy Hatcher  <timothy@apple.com>
     2
     3        Rename SecurityOrigin::whiteListAccessFromOrigin to addOriginAccessWhitelistEntry.
     4        And SecurityOrigin::resetOriginAccessWhiteLists to resetOriginAccessWhitelists.
     5
     6        SecurityOrigin needs a way to remove individual OriginAccessEntries
     7        https://bugs.webkit.org/show_bug.cgi?id=37449
     8
     9        Reviewed by Dave Hyatt.
     10
     11        * Interfaces/IWebViewPrivate.idl:
     12        * WebView.cpp:
     13        (WebView::addOriginAccessWhitelistEntry):
     14        (WebView::resetOriginAccessWhitelists):
     15        * WebView.h:
     16
    1172010-04-11  Sheriff Bot  <webkit.review.bot@gmail.com>
    218

  • trunk/WebKit/win/Interfaces/IWebViewPrivate.idl

    r55408 r57535  
    208208    // - destinationHost: The host to grant access to.
    209209    // - allowDestinationSubdomains: If host is a domain, setting this to YES will whitelist host and all its subdomains, recursively.
    210     HRESULT whiteListAccessFromOrigin([in] BSTR sourceOrigin, [in] BSTR destinationProtocol, [in] BSTR destinationHost, [in] BOOL allowDestinationSubdomains);
    211 
    212     // Removes all white list entries created with whiteListAccessFromOrigin.
    213     HRESULT resetOriginAccessWhiteLists();
     210    HRESULT addOriginAccessWhitelistEntry([in] BSTR sourceOrigin, [in] BSTR destinationProtocol, [in] BSTR destinationHost, [in] BOOL allowDestinationSubdomains);
     211
     212    // Removes all white list entries created with addOriginAccessWhitelistEntry.
     213    HRESULT resetOriginAccessWhitelists();
    214214
    215215    HRESULT setHistoryDelegate([in] IWebHistoryDelegate* historyDelegate);

  • trunk/WebKit/win/WebView.cpp

    r57302 r57535  
    60356035}
    60366036
    6037 HRESULT WebView::whiteListAccessFromOrigin(BSTR sourceOrigin, BSTR destinationProtocol, BSTR destinationHost, BOOL allowDestinationSubdomains)
    6038 {
    6039     SecurityOrigin::whiteListAccessFromOrigin(*SecurityOrigin::createFromString(String(sourceOrigin, SysStringLen(sourceOrigin))), String(destinationProtocol, SysStringLen(destinationProtocol)), String(destinationHost, SysStringLen(destinationHost)), allowDestinationSubdomains);
    6040     return S_OK;
    6041 }
    6042 
    6043 HRESULT WebView::resetOriginAccessWhiteLists()
    6044 {
    6045     SecurityOrigin::resetOriginAccessWhiteLists();
     6037HRESULT WebView::addOriginAccessWhitelistEntry(BSTR sourceOrigin, BSTR destinationProtocol, BSTR destinationHost, BOOL allowDestinationSubdomains)
     6038{
     6039    SecurityOrigin::addOriginAccessWhitelistEntry(*SecurityOrigin::createFromString(String(sourceOrigin, SysStringLen(sourceOrigin))), String(destinationProtocol, SysStringLen(destinationProtocol)), String(destinationHost, SysStringLen(destinationHost)), allowDestinationSubdomains);
     6040    return S_OK;
     6041}
     6042
     6043HRESULT WebView::resetOriginAccessWhitelists()
     6044{
     6045    SecurityOrigin::resetOriginAccessWhitelists();
    60466046    return S_OK;
    60476047}

  • trunk/WebKit/win/WebView.h

    r55592 r57535  
    762762    virtual HRESULT STDMETHODCALLTYPE invalidateBackingStore(const RECT*);
    763763
    764     virtual HRESULT STDMETHODCALLTYPE whiteListAccessFromOrigin(BSTR sourceOrigin, BSTR destinationProtocol, BSTR destinationHost, BOOL allowDestinationSubdomains);
    765     virtual HRESULT STDMETHODCALLTYPE resetOriginAccessWhiteLists();
    766 
     764    virtual HRESULT STDMETHODCALLTYPE addOriginAccessWhitelistEntry(BSTR sourceOrigin, BSTR destinationProtocol, BSTR destinationHost, BOOL allowDestinationSubdomains);
     765    virtual HRESULT STDMETHODCALLTYPE resetOriginAccessWhitelists();
    767766
    768767    virtual HRESULT STDMETHODCALLTYPE setHistoryDelegate(IWebHistoryDelegate* historyDelegate);

  • trunk/WebKitTools/ChangeLog

    r57532 r57535  
     12010-04-13  Timothy Hatcher  <timothy@apple.com>
     2
     3        Rename SecurityOrigin::whiteListAccessFromOrigin to addOriginAccessWhitelistEntry.
     4        And LayoutTestController.whiteListAccessFromOrigin to addOriginAccessWhitelistEntry.
     5        And SecurityOrigin::resetOriginAccessWhiteLists to resetOriginAccessWhitelists.
     6
     7        SecurityOrigin needs a way to remove individual OriginAccessEntries
     8        https://bugs.webkit.org/show_bug.cgi?id=37449
     9
     10        Reviewed by Dave Hyatt.
     11
     12        * DumpRenderTree/LayoutTestController.cpp:
     13        (addOriginAccessWhitelistEntryCallback):
     14        (LayoutTestController::staticFunctions):
     15        * DumpRenderTree/LayoutTestController.h:
     16        * DumpRenderTree/chromium/LayoutTestController.cpp:
     17        (LayoutTestController::LayoutTestController):
     18        (LayoutTestController::addOriginAccessWhitelistEntry):
     19        * DumpRenderTree/chromium/LayoutTestController.h:
     20        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
     21        (LayoutTestController::addOriginAccessWhitelistEntry):
     22        * DumpRenderTree/mac/DumpRenderTree.mm:
     23        (resetWebViewToConsistentStateBeforeTesting):
     24        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
     25        (LayoutTestController::addOriginAccessWhitelistEntry):
     26        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     27        (LayoutTestController::addOriginAccessWhitelistEntry):
     28        * DumpRenderTree/qt/LayoutTestControllerQt.h:
     29        * DumpRenderTree/win/DumpRenderTree.cpp:
     30        (resetWebViewToConsistentStateBeforeTesting):
     31        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
     32        (LayoutTestController::addOriginAccessWhitelistEntry):
     33        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
     34        (LayoutTestController::addOriginAccessWhitelistEntry):
     35
    1362010-04-13  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    237

  • trunk/WebKitTools/DumpRenderTree/LayoutTestController.cpp

    r57292 r57535  
    12751275}
    12761276
    1277 static JSValueRef whiteListAccessFromOriginCallback(JSContextRef context, JSObjectRef, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
     1277static JSValueRef addOriginAccessWhitelistEntryCallback(JSContextRef context, JSObjectRef, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    12781278{
    12791279    if (argumentCount != 4)
    … …  
    12891289
    12901290    LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
    1291     controller->whiteListAccessFromOrigin(sourceOrigin.get(), destinationProtocol.get(), destinationHost.get(), allowDestinationSubdomains);
     1291    controller->addOriginAccessWhitelistEntry(sourceOrigin.get(), destinationProtocol.get(), destinationHost.get(), allowDestinationSubdomains);
    12921292    return JSValueMakeUndefined(context);
    12931293}
    … …  
    15511551        { "waitUntilDone", waitUntilDoneCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    15521552        { "windowCount", windowCountCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    1553         { "whiteListAccessFromOrigin", whiteListAccessFromOriginCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
     1553        { "addOriginAccessWhitelistEntry", addOriginAccessWhitelistEntryCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    15541554        { "setScrollbarPolicy", setScrollbarPolicyCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    15551555        { 0, 0, 0 }

  • trunk/WebKitTools/DumpRenderTree/LayoutTestController.h

    r57292 r57535  
    226226    unsigned numberOfActiveAnimations() const;
    227227
    228     void whiteListAccessFromOrigin(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains);
     228    void addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains);
    229229
    230230    void addUserScript(JSStringRef source, bool runAtStart);

  • trunk/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp

    r57188 r57535  
    109109    bindMethod("setWillSendRequestReturnsNullOnRedirect", &LayoutTestController::setWillSendRequestReturnsNullOnRedirect);
    110110    bindMethod("setWillSendRequestReturnsNull", &LayoutTestController::setWillSendRequestReturnsNull);
    111     bindMethod("whiteListAccessFromOrigin", &LayoutTestController::whiteListAccessFromOrigin);
     111    bindMethod("addOriginAccessWhitelistEntry", &LayoutTestController::addOriginAccessWhitelistEntry);
    112112    bindMethod("clearAllDatabases", &LayoutTestController::clearAllDatabases);
    113113    bindMethod("setDatabaseQuota", &LayoutTestController::setDatabaseQuota);
    … …  
    10251025}
    10261026
    1027 void LayoutTestController::whiteListAccessFromOrigin(const CppArgumentList& arguments, CppVariant* result)
     1027void LayoutTestController::addOriginAccessWhitelistEntry(const CppArgumentList& arguments, CppVariant* result)
    10281028{
    10291029    result->setNull();

  • trunk/WebKitTools/DumpRenderTree/chromium/LayoutTestController.h

    r56612 r57535  
    228228    void fallbackMethod(const CppArgumentList&, CppVariant*);
    229229
    230     // Allows layout tests to call SecurityOrigin::whiteListAccessFromOrigin().
    231     void whiteListAccessFromOrigin(const CppArgumentList&, CppVariant*);
     230    // Allows layout tests to call SecurityOrigin::addOriginAccessWhitelistEntry().
     231    void addOriginAccessWhitelistEntry(const CppArgumentList&, CppVariant*);
    232232
    233233    // Clears all databases.

  • trunk/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

    r57339 r57535  
    256256}
    257257
    258 void LayoutTestController::whiteListAccessFromOrigin(JSStringRef sourceOrigin, JSStringRef protocol, JSStringRef host, bool includeSubdomains)
     258void LayoutTestController::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef protocol, JSStringRef host, bool includeSubdomains)
    259259{
    260260    gchar* sourceOriginGChar = JSStringCopyUTF8CString(sourceOrigin);

  • trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

    r57328 r57535  
    11711171
    11721172    [WebView _setUsesTestModeFocusRingColor:YES];
    1173     [WebView _resetOriginAccessWhiteLists];
     1173    [WebView _resetOriginAccessWhitelists];
    11741174}
    11751175

  • trunk/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm

    r57292 r57535  
    563563}
    564564
    565 void LayoutTestController::whiteListAccessFromOrigin(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
     565void LayoutTestController::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
    566566{
    567567    RetainPtr<CFStringRef> sourceOriginCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, sourceOrigin));
    … …  
    571571    RetainPtr<CFStringRef> hostCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, destinationHost));
    572572    NSString *destinationHostNS = (NSString *)hostCF.get();
    573     [WebView _whiteListAccessFromOrigin:sourceOriginNS destinationProtocol:destinationProtocolNS destinationHost:destinationHostNS allowDestinationSubdomains:allowDestinationSubdomains];
     573    [WebView _addOriginAccessWhitelistEntryWithSourceOrigin:sourceOriginNS destinationProtocol:destinationProtocolNS destinationHost:destinationHostNS allowDestinationSubdomains:allowDestinationSubdomains];
    574574}
    575575

  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

    r57449 r57535  
    476476}
    477477
    478 void LayoutTestController::whiteListAccessFromOrigin(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains)
     478void LayoutTestController::addOriginAccessWhitelistEntry(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains)
    479479{
    480480    DumpRenderTreeSupportQt::whiteListAccessFromOrigin(sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains);

  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

    r57449 r57535  
    154154    unsigned numberOfActiveAnimations() const;
    155155
    156     void whiteListAccessFromOrigin(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);
     156    void addOriginAccessWhitelistEntry(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);
    157157
    158158    void dispatchPendingLoadRequests();

  • trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp

    r56718 r57535  
    843843
    844844    webViewPrivate->clearMainFrameName();
    845     webViewPrivate->resetOriginAccessWhiteLists();
     845    webViewPrivate->resetOriginAccessWhitelists();
    846846
    847847    BSTR groupName;

  • trunk/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp

    r57339 r57535  
    984984}
    985985
    986 void LayoutTestController::whiteListAccessFromOrigin(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
     986void LayoutTestController::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
    987987{
    988988    COMPtr<IWebViewPrivate> webView;
    … …  
    990990        return;
    991991
    992     webView->whiteListAccessFromOrigin(bstrT(sourceOrigin).GetBSTR(), bstrT(destinationProtocol).GetBSTR(), bstrT(destinationHost).GetBSTR(), allowDestinationSubdomains);
     992    webView->addOriginAccessWhitelistEntry(bstrT(sourceOrigin).GetBSTR(), bstrT(destinationProtocol).GetBSTR(), bstrT(destinationHost).GetBSTR(), allowDestinationSubdomains);
    993993}
    994994

  • trunk/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp

    r57376 r57535  
    361361}
    362362
    363 void LayoutTestController::whiteListAccessFromOrigin(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
     363void LayoutTestController::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
    364364{
    365365
Note: See TracChangeset for help on using the changeset viewer.