Changeset 47684 in webkit


Ignore:
Timestamp:
Aug 22, 2009 9:24:09 PM (15 years ago)
Author:
abarth@webkit.org
Message:

2009-08-22 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Don't let local files access web URLs
​https://bugs.webkit.org/show_bug.cgi?id=28480

  • Misc/WebKitVersionChecks.m:
  • WebView/WebPreferences.mm: (+[WebPreferences initialize]):

2009-08-22 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Don't let local files access web URLs
​https://bugs.webkit.org/show_bug.cgi?id=28480

  • Api/qwebsettings.cpp: (QWebSettings::QWebSettings):

2009-08-22 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Don't let local files access web URLs
​https://bugs.webkit.org/show_bug.cgi?id=28480

  • WebPreferences.cpp: (WebPreferences::initializeDefaultSettings):

2009-08-22 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Don't let local files access web URLs
​https://bugs.webkit.org/show_bug.cgi?id=28480

A bunch of our LayoutTests rely on our old behavior, so we explicitly
grant local files universal access during testing. Mainly, these tests
involve making XMLHttpRequests for data URLs.

  • DumpRenderTree/mac/DumpRenderTree.mm: (resetDefaultsToConsistentValues):
  • DumpRenderTree/qt/DumpRenderTree.cpp: (WebCore::WebPage::WebPage):
  • DumpRenderTree/win/DumpRenderTree.cpp: (resetDefaultsToConsistentValues):
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/mac/ChangeLog

    r47657 r47684  
     12009-08-22  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Don't let local files access web URLs
     6        https://bugs.webkit.org/show_bug.cgi?id=28480
     7
     8        * Misc/WebKitVersionChecks.m:
     9        * WebView/WebPreferences.mm:
     10        (+[WebPreferences initialize]):
     11
    1122009-08-21  Anders Carlsson  <andersca@apple.com>
    213

  • trunk/WebKit/mac/Misc/WebKitVersionChecks.h

    r45376 r47684  
    5555#define WEBKIT_FIRST_VERSION_WITHOUT_CONTENT_SNIFFING_FOR_FILE_URLS 0x02120A00 // 530.10.0
    5656#define WEBKIT_FIRST_VERSION_WITHOUT_LINK_ELEMENT_TEXT_CSS_QUIRK 0x02130200 // 531.2.0
     57#define WEBKIT_FIRST_VERSION_WITHOUT_UNIVERSAL_ACCESS_FROM_FILE_URLS 0x02140000 // 532.0.0
    5758
    5859#ifdef __cplusplus

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

    r47039 r47684  
    295295+ (void)initialize
    296296{
     297    id universalAccessFromFileURLs = [NSNumber numberWithBool:NO];
     298    if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITHOUT_UNIVERSAL_ACCESS_FROM_FILE_URLS))
     299        universalAccessFromFileURLs = [NSNumber numberWithBool:YES];
     300
    297301    NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
    298302        @"Times",                       WebKitStandardFontPreferenceKey,
    … …  
    316320        [NSNumber numberWithBool:YES],  WebKitJavaScriptEnabledPreferenceKey,
    317321        [NSNumber numberWithBool:YES],  WebKitWebSecurityEnabledPreferenceKey,
    318         [NSNumber numberWithBool:YES],  WebKitAllowUniversalAccessFromFileURLsPreferenceKey,
     322        universalAccessFromFileURLs,    WebKitAllowUniversalAccessFromFileURLsPreferenceKey,
    319323        [NSNumber numberWithBool:YES],  WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey,
    320324        [NSNumber numberWithBool:YES],  WebKitPluginsEnabledPreferenceKey,

  • trunk/WebKit/qt/Api/qwebsettings.cpp

    r47424 r47684  
    362362    d->attributes.insert(QWebSettings::OfflineWebApplicationCacheEnabled, true);
    363363    d->attributes.insert(QWebSettings::LocalStorageEnabled, false);
    364     d->attributes.insert(QWebSettings::LocalContentCanAccessRemoteUrls, true);
     364    d->attributes.insert(QWebSettings::LocalContentCanAccessRemoteUrls, false);
    365365    d->offlineStorageDefaultQuota = 5 * 1024 * 1024;
    366366}

  • trunk/WebKit/qt/ChangeLog

    r47552 r47684  
     12009-08-22  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Don't let local files access web URLs
     6        https://bugs.webkit.org/show_bug.cgi?id=28480
     7
     8        * Api/qwebsettings.cpp:
     9        (QWebSettings::QWebSettings):
     10
    1112009-08-19  Aaron Boodman  <aa@chromium.org>
    212

  • trunk/WebKit/win/ChangeLog

    r47594 r47684  
     12009-08-22  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Don't let local files access web URLs
     6        https://bugs.webkit.org/show_bug.cgi?id=28480
     7
     8        * WebPreferences.cpp:
     9        (WebPreferences::initializeDefaultSettings):
     10
    1112009-08-20  Brian Weinstein  <bweinstein@apple.com>
    212

  • trunk/WebKit/win/WebPreferences.cpp

    r47039 r47684  
    205205    CFDictionaryAddValue(defaults, CFSTR(WebKitJavaScriptEnabledPreferenceKey), kCFBooleanTrue);
    206206    CFDictionaryAddValue(defaults, CFSTR(WebKitWebSecurityEnabledPreferenceKey), kCFBooleanTrue);
    207     CFDictionaryAddValue(defaults, CFSTR(WebKitAllowUniversalAccessFromFileURLsPreferenceKey), kCFBooleanTrue);
     207    CFDictionaryAddValue(defaults, CFSTR(WebKitAllowUniversalAccessFromFileURLsPreferenceKey), kCFBooleanFalse);
    208208    CFDictionaryAddValue(defaults, CFSTR(WebKitXSSAuditorEnabledPreferenceKey), kCFBooleanTrue);
    209209    CFDictionaryAddValue(defaults, CFSTR(WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey), kCFBooleanTrue);

  • trunk/WebKitTools/ChangeLog

    r47677 r47684  
     12009-08-22  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Don't let local files access web URLs
     6        https://bugs.webkit.org/show_bug.cgi?id=28480
     7
     8        A bunch of our LayoutTests rely on our old behavior, so we explicitly
     9        grant local files universal access during testing.  Mainly, these tests
     10        involve making XMLHttpRequests for data URLs.
     11
     12        * DumpRenderTree/mac/DumpRenderTree.mm:
     13        (resetDefaultsToConsistentValues):
     14        * DumpRenderTree/qt/DumpRenderTree.cpp:
     15        (WebCore::WebPage::WebPage):
     16        * DumpRenderTree/win/DumpRenderTree.cpp:
     17        (resetDefaultsToConsistentValues):
     18
    1192009-08-22  Mark Rowe  <mrowe@apple.com>
    220

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

    r47548 r47684  
    389389    WebPreferences *preferences = [WebPreferences standardPreferences];
    390390
     391    [preferences setAllowUniversalAccessFromFileURLs:YES];
    391392    [preferences setStandardFontFamily:@"Times"];
    392393    [preferences setFixedFontFamily:@"Courier"];

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

    r47548 r47684  
    111111    settings()->setAttribute(QWebSettings::PluginsEnabled, true);
    112112    settings()->setAttribute(QWebSettings::LocalStorageEnabled, true);
     113    settings()->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, true);
     114
    113115    connect(this, SIGNAL(geometryChangeRequested(const QRect &)),
    114116            this, SLOT(setViewGeometry(const QRect & )));

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

    r47320 r47684  
    710710    COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
    711711    if (prefsPrivate) {
     712        prefsPrivate->setAllowUniversalAccessFromFileURLs(TRUE);
    712713        prefsPrivate->setAuthorAndUserStylesEnabled(TRUE);
    713714        prefsPrivate->setDeveloperExtrasEnabled(FALSE);
Note: See TracChangeset for help on using the changeset viewer.