Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1148544) for failures in test_user_agent_overrides.html

Browse Source 
Backed out changeset 5073d841f77d (bug 1148544)
Backed out changeset 64a2c41c6f20 (bug 1148544)

--HG--
extra : commitid : 3oP1hrXASC1
This commit is contained in:
Wes Kocher 2016-02-09 16:58:54 -08:00
parent 0a60ee6ebe
commit 807175f2a6
12 changed files with 139 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netwerk/base/nsILoadGroup.idl
View File

@ -58,7 +58,7 @@ interface nsILoadGroup : nsIRequest
* By the time this call ends, aRequest will have been removed from the
* loadgroup, even if this function throws an exception.
*/
void removeRequest(in nsIRequest aRequest,
void removeRequest(in nsIRequest aRequest,
in nsISupports aContext,
in nsresult aStatus);
@ -97,10 +97,4 @@ interface nsILoadGroup : nsIRequest
* the docShell has created the default request.)
*/
attribute nsLoadFlags defaultLoadFlags;
/**
* The cached user agent override created by UserAgentOverrides.jsm. Used
* for all sub-resource requests in the loadgroup.
*/
attribute ACString userAgentOverrideCache;
};

24
netwerk/base/nsLoadGroup.cpp
View File

@ -172,7 +172,7 @@ nsLoadGroup::GetName(nsACString &result)
result.Truncate();
return NS_OK;
}
return mDefaultLoadRequest->GetName(result);
}
@ -188,9 +188,9 @@ nsLoadGroup::GetStatus(nsresult *status)
{
if (NS_SUCCEEDED(mStatus) && mDefaultLoadRequest)
return mDefaultLoadRequest->GetStatus(status);
*status = mStatus;
return NS_OK;
return NS_OK;
}
static bool
@ -480,7 +480,7 @@ nsLoadGroup::AddRequest(nsIRequest *request, nsISupports* ctxt)
rv = MergeLoadFlags(request, flags);
}
if (NS_FAILED(rv)) return rv;
//
// Add the request to the list of active requests...
//
@ -810,24 +810,10 @@ nsLoadGroup::SetDefaultLoadFlags(uint32_t aFlags)
return NS_OK;
}
NS_IMETHODIMP
nsLoadGroup::GetUserAgentOverrideCache(nsACString & aUserAgentOverrideCache)
{
aUserAgentOverrideCache = mUserAgentOverrideCache;
return NS_OK;
}
NS_IMETHODIMP
nsLoadGroup::SetUserAgentOverrideCache(const nsACString & aUserAgentOverrideCache)
{
mUserAgentOverrideCache = aUserAgentOverrideCache;
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////
void
void
nsLoadGroup::TelemetryReport()
{
if (mDefaultLoadIsTimed) {

6
netwerk/base/nsLoadGroup.h
View File

@ -29,7 +29,7 @@ class nsLoadGroup : public nsILoadGroup,
{
public:
NS_DECL_AGGREGATED
////////////////////////////////////////////////////////////////////////////
// nsIRequest methods:
NS_DECL_NSIREQUEST
@ -79,7 +79,7 @@ protected:
nsWeakPtr mObserver;
nsWeakPtr mParentLoadGroup;
nsresult mStatus;
int32_t mPriority;
bool mIsCanceling;
@ -92,8 +92,6 @@ protected:
/* For nsPILoadGroupInternal */
uint32_t mTimedNonCachedRequestsUntilOnEndPageLoad;
nsCString mUserAgentOverrideCache;
};
#endif // nsLoadGroup_h__

35
netwerk/protocol/http/HttpBaseChannel.cpp
View File

@ -2464,41 +2464,6 @@ HttpBaseChannel::ShouldIntercept(nsIURI* aURI)
return shouldIntercept;
}
void
HttpBaseChannel::SetLoadGroupUserAgentOverride()
{
nsCOMPtr<nsIURI> uri;
GetURI(getter_AddRefs(uri));
nsAutoCString uriScheme;
if (uri) {
uri->GetScheme(uriScheme);
}
nsCOMPtr<nsILoadGroupChild> childLoadGroup = do_QueryInterface(mLoadGroup);
nsCOMPtr<nsILoadGroup> rootLoadGroup;
if (childLoadGroup) {
childLoadGroup->GetRootLoadGroup(getter_AddRefs(rootLoadGroup));
}
if (rootLoadGroup && !uriScheme.EqualsLiteral("file")) {
nsAutoCString ua;
if (nsContentUtils::IsNonSubresourceRequest(this)) {
gHttpHandler->OnUserAgentRequest(this);
GetRequestHeader(NS_LITERAL_CSTRING("User-Agent"), ua);
rootLoadGroup->SetUserAgentOverrideCache(ua);
} else {
GetRequestHeader(NS_LITERAL_CSTRING("User-Agent"), ua);
// Don't overwrite the UA if it is already set (eg by an XHR with explicit UA).
if (ua.IsEmpty()) {
rootLoadGroup->GetUserAgentOverrideCache(ua);
SetRequestHeader(NS_LITERAL_CSTRING("User-Agent"), ua, false);
}
}
} else {
// If the root loadgroup doesn't exist or if the channel's URI's scheme is "file",
// fall back on getting the UA override per channel.
gHttpHandler->OnUserAgentRequest(this);
}
}
//-----------------------------------------------------------------------------
// nsHttpChannel::nsITraceableChannel
//-----------------------------------------------------------------------------

2
netwerk/protocol/http/HttpBaseChannel.h
View File

@ -353,8 +353,6 @@ protected:
// for a possible synthesized response instead.
bool ShouldIntercept(nsIURI* aURI = nullptr);
void SetLoadGroupUserAgentOverride();
friend class PrivateBrowsingChannel<HttpBaseChannel>;
friend class InterceptFailedOnStop;

5
netwerk/protocol/http/HttpChannelChild.cpp
View File

@ -1805,12 +1805,9 @@ HttpChannelChild::AsyncOpen(nsIStreamListener *listener, nsISupports *aContext)
return NS_OK;
}
// Set user agent override from docshell
// Set user agent override
HttpBaseChannel::SetDocshellUserAgentOverride();
// Set user agent override from loadgroup
HttpBaseChannel::SetLoadGroupUserAgentOverride();
MOZ_ASSERT_IF(mPostRedirectChannelShouldUpgrade,
mPostRedirectChannelShouldIntercept);
bool shouldUpgrade = mPostRedirectChannelShouldUpgrade;

8
netwerk/protocol/http/UserAgentOverrides.jsm
View File

@ -46,9 +46,9 @@ this.UserAgentOverrides = {
Services.prefs.addObserver(PREF_OVERRIDES_ENABLED, buildOverrides, false);
try {
Services.obs.addObserver(HTTP_on_useragent_request, "http-on-useragent-request", false);
Services.obs.addObserver(HTTP_on_modify_request, "http-on-modify-request", false);
} catch (x) {
// The http-on-useragent-request notification is disallowed in content processes.
// The http-on-modify-request notification is disallowed in content processes.
}
UserAgentUpdates.init(function(overrides) {
@ -118,7 +118,7 @@ this.UserAgentOverrides = {
Services.prefs.removeObserver(PREF_OVERRIDES_ENABLED, buildOverrides);
Services.obs.removeObserver(HTTP_on_useragent_request, "http-on-useragent-request");
Services.obs.removeObserver(HTTP_on_modify_request, "http-on-modify-request");
},
receiveMessage: function(aMessage) {
@ -169,7 +169,7 @@ function buildOverrides() {
}
}
function HTTP_on_useragent_request(aSubject, aTopic, aData) {
function HTTP_on_modify_request(aSubject, aTopic, aData) {
let channel = aSubject.QueryInterface(Ci.nsIHttpChannel);
for (let callback of gOverrideFunctions) {

5
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -5178,11 +5178,6 @@ nsHttpChannel::BeginConnect()
// notify "http-on-modify-request" observers
CallOnModifyRequestObservers();
// If mLoadGroup is null, e10s is enabled and this will be handled by HttpChannelChild.
if (mLoadGroup) {
HttpBaseChannel::SetLoadGroupUserAgentOverride();
}
// Check to see if we should redirect this channel elsewhere by
// nsIHttpChannel.redirectTo API request
if (mAPIRedirectToURI) {

6
netwerk/protocol/http/nsHttpHandler.h
View File

@ -275,12 +275,6 @@ public:
NotifyObservers(chan, NS_HTTP_ON_MODIFY_REQUEST_TOPIC);
}
// Called by the channel and cached in the loadGroup
void OnUserAgentRequest(nsIHttpChannel *chan)
{
NotifyObservers(chan, NS_HTTP_ON_USERAGENT_REQUEST_TOPIC);
}
// Called by the channel once headers are available
void OnExamineResponse(nsIHttpChannel *chan)
{

9
netwerk/protocol/http/nsIHttpProtocolHandler.idl
View File

@ -113,14 +113,5 @@ interface nsIHttpProtocolHandler : nsIProxiedProtocolHandler
*/
#define NS_HTTP_ON_EXAMINE_CACHED_RESPONSE_TOPIC "http-on-examine-cached-response"
/**
* Before an HTTP request corresponding to a channel with the LOAD_DOCUMENT_URI
* flag is sent to the server, this observer topic is notified. The observer of
* this topic can then choose to modify the user agent for this request before
* the request is actually sent to the server. Additionally, the modified user
* agent will be propagated to sub-resource requests from the same load group.
*/
#define NS_HTTP_ON_USERAGENT_REQUEST_TOPIC "http-on-useragent-request"
%}

180
netwerk/test/mochitests/test_user_agent_overrides.html
View File

@ -29,79 +29,96 @@ const UA_PARTIAL_TO = UA_WHOLE_OVERRIDE;
const UA_PARTIAL_OVERRIDE = UA_PARTIAL_FROM + UA_PARTIAL_SEP + UA_PARTIAL_TO;
const UA_PARTIAL_EXPECTED = DEFAULT_UA.replace(new RegExp(UA_PARTIAL_FROM, 'g'), UA_PARTIAL_TO);
function testUATab(host, expected, sameQ, message, testNavQ, navSameQ, navMessage, callback) {
let url = location.pathname;
function getUA(host) {
var url = location.pathname;
url = host + url.slice(0, url.lastIndexOf('/')) + '/user_agent.sjs';
let uri = Services.io.newURI(url, null, null);
let tab = BrowserApp.addTab(uri.spec, { selected: true, parentId: BrowserApp.selectedTab.id });
let browser = tab.browser;
browser.addEventListener("load", function handle() {
ok(sameQ == (browser.contentDocument.body.innerHTML.indexOf(expected) != -1), message);
if(testNavQ) {
ok(navSameQ == (browser.contentWindow.navigator.userAgent.indexOf(expected) != -1), navMessage);
}
browser.removeEventListener("load", handle, true);
BrowserApp.closeTab(tab);
callback();
}, true);
}
function testUATabNoNav(host, expected, sameQ, message, callback) {
testUATab(host, expected, sameQ, message, false, true, '', callback);
var xhr = new XMLHttpRequest();
xhr.open('GET', url, false); // sync request
xhr.send();
is(xhr.status, 200, 'request failed');
is(typeof xhr.response, 'string', 'invalid response');
return xhr.response;
}
function testUA(options, callback) {
var [domain, override, test_hosts, expected] =
[options.domain, options.override, options.test_hosts, options.expected];
(function nextTest() {
let test_host = test_hosts.shift();
info('Overriding ' + domain + ' with ' + override);
info("Overriding " + domain + " with " + override + " for " + test_host);
function is_subdomain(host) {
var [test_domain] = host.slice(host.lastIndexOf('/') + 1).split(':', 1);
return test_domain === domain || test_domain.endsWith('.' + domain);
}
function is_subdomain(host) {
var [test_domain] = host.slice(host.lastIndexOf('/') + 1).split(':', 1);
return test_domain === domain || test_domain.endsWith('.' + domain);
}
var localhost = location.origin;
var overrideNavigator = is_subdomain(localhost);
var navigator_ua, test_ua = [];
var localhost = location.origin;
var overrideNavigator = is_subdomain(localhost);
var navigator_ua, test_ua;
// store UA before pref change, to be compared later
if (overrideNavigator) {
navigator_ua = navigator.userAgent;
}
test_hosts.forEach(function (test_host) {
test_ua.push(getUA(test_host));
});
// set the override pref to override the UA
SpecialPowers.pushPrefEnv({
set: [[PREF_OVERRIDES_BRANCH + domain, override]],
}, function () {
var ifr = document.createElement('IFRAME');
ifr.src = "about:blank";
if (overrideNavigator) {
navigator_ua = navigator.userAgent;
}
ifr.addEventListener('load', function() {
var nav = ifr.contentWindow.navigator;
let url = location.pathname;
url = test_host + url.slice(0, url.lastIndexOf('/')) + '/user_agent.sjs';
let uri = Services.io.newURI(url, null, null);
let tab = BrowserApp.addTab(uri.spec, { selected: true, parentId: BrowserApp.selectedTab.id });
let browser = tab.browser;
// check that the UA has changed after pref change
if (overrideNavigator) {
is(nav.userAgent, expected,
'Navigator UA not overridden at step ' + (++step));
} else {
is(nav.userAgent, DEFAULT_UA,
'Navigator UA should not be overridden at step ' + (++step));
}
browser.addEventListener("load", function handle() {
test_ua = browser.contentDocument.body.innerHTML;
browser.removeEventListener("load", handle, true);
BrowserApp.closeTab(tab);
SpecialPowers.pushPrefEnv({
set: [[PREF_OVERRIDES_BRANCH + domain, override]],
}, function () {
testUATab(test_host, expected, true, 'Header UA not overridden at step ' + (++step), true,
true, 'Navigator UA not overridden at step ' + (++step), function () {
// clear the override pref to undo overriding the UA
SpecialPowers.pushPrefEnv({
clear: [[PREF_OVERRIDES_BRANCH + domain]],
}, function () {
testUATabNoNav(test_host, test_ua, true, 'Header UA not restored at step ' + (++step), function() {
test_hosts.length ? nextTest() : callback();
});
});
});
test_hosts.forEach(function (test_host) {
is(getUA(test_host), expected,
'Header UA not overridden at step ' + (++step));
});
}, true);
})();
// clear the override pref to undo overriding the UA
SpecialPowers.pushPrefEnv({
clear: [[PREF_OVERRIDES_BRANCH + domain]],
}, function () {
var ifr = document.createElement('IFRAME');
ifr.src = "about:blank";
ifr.addEventListener('load', function() {
var nav = ifr.contentWindow.navigator;
// check that the UA has changed back
if (overrideNavigator) {
is(nav.userAgent, navigator_ua,
'Navigator UA not restored at step ' + (++step));
}
test_hosts.forEach(function (test_host, i) {
is(getUA(test_host), test_ua[i],
'Header UA not restored at step ' + (++step));
});
callback();
});
document.getElementById('content').appendChild(ifr);
});
}, false);
document.getElementById('content').appendChild(ifr);
});
}
var step = 0; // for logging
var tests = [
// should override both header and navigator.userAgent
@ -158,15 +175,16 @@ function testInactive(callback) {
[PREF_OVERRIDES_BRANCH + location.hostname, UA_WHOLE_OVERRIDE]
]
}, function () {
testUATab(location.origin, UA_WHOLE_OVERRIDE, false, 'Failed to disabled header UA override at step ' + (++step),
true, false, 'Failed to disable navigator UA override at step + ' + (++step), function () {
SpecialPowers.pushPrefEnv({
clear: [
[PREF_OVERRIDES_ENABLED],
[PREF_OVERRIDES_BRANCH + location.hostname]
]
}, callback);
});
isnot(navigator.userAgent, UA_WHOLE_OVERRIDE,
'Failed to disable navigator UA override');
isnot(getUA(location.origin), UA_WHOLE_OVERRIDE,
'Failed to disable header UA override');
SpecialPowers.pushPrefEnv({
clear: [
[PREF_OVERRIDES_ENABLED],
[PREF_OVERRIDES_BRANCH + location.hostname]
]
}, callback);
});
}
@ -188,22 +206,22 @@ function testPriority(callback) {
]
}, function () {
// should use first override at this point
testUATabNoNav(host, UA_WHOLE_EXPECTED, true, 'UA not overridden at step ' + (++step), function() {
// add a second override that should be used
is(getUA(host),
UA_WHOLE_EXPECTED, 'UA not overridden');
// add a second override that should be used
testUA({
domain: level2,
override: UA_PARTIAL_OVERRIDE,
test_hosts: [host],
expected: UA_PARTIAL_EXPECTED
}, function () {
// add a third override that should not be used
testUA({
domain: level2,
domain: level0,
override: UA_PARTIAL_OVERRIDE,
test_hosts: [host],
expected: UA_PARTIAL_EXPECTED
}, function () {
// add a third override that should not be used
testUA({
domain: level0,
override: UA_PARTIAL_OVERRIDE,
test_hosts: [host],
expected: UA_WHOLE_EXPECTED
}, tests.length ? nextTest : callback);
});
expected: UA_WHOLE_EXPECTED
}, tests.length ? nextTest : callback);
});
});
})();
@ -222,15 +240,9 @@ SpecialPowers.wrap(UserAgentOverrides).init();
SimpleTest.waitForExplicitFinish();
SimpleTest.requestCompleteLog();
SimpleTest.requestLongerTimeout(5);
info(SpecialPowers.Cc["@mozilla.org/dom/site-specific-user-agent;1"].number);
const Services = SpecialPowers.Cu.import("resource://gre/modules/Services.jsm").Services;
let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
let BrowserApp = chromeWin.BrowserApp;
testOverrides(function() {
testInactive(function() {
testPriority(SimpleTest.finish)

80
netwerk/test/mochitests/test_user_agent_updates.html
View File

@ -48,28 +48,6 @@ function getUA(host) {
return xhr.response;
}
function testUATab(host, expected, sameQ, message, testNavQ, navSameQ, navMessage, callback) {
let url = location.pathname;
url = host + url.slice(0, url.lastIndexOf('/')) + '/user_agent.sjs';
let uri = Services.io.newURI(url, null, null);
let tab = BrowserApp.addTab(uri.spec, { selected: true, parentId: BrowserApp.selectedTab.id });
let browser = tab.browser;
browser.addEventListener("load", function handle() {
ok(sameQ == (browser.contentDocument.body.innerHTML.indexOf(expected) != -1), message);
if(testNavQ) {
ok(navSameQ == (browser.contentWindow.navigator.userAgent.indexOf(expected) != -1), navMessage);
}
browser.removeEventListener("load", handle, true);
BrowserApp.closeTab(tab);
callback();
}, true);
}
function testUATabNoNav(host, expected, sameQ, message, callback) {
testUATab(host, expected, sameQ, message, false, true, '', callback);
}
const OVERRIDES = [
{
domain: 'example.org',
@ -142,25 +120,33 @@ function testDownload(callback) {
[PREF_UPDATES_TIMEOUT, 10000],
[PREF_UPDATES_INTERVAL, 1] // 1 second interval
]
}, setTimeout( function waitForUpdate() {
testUATabNoNav(location.origin, UA_OVERRIDE, true, 'Header UA not overridden', function() {
var updateTime = parseInt(getUA('http://example.org'));
todo(startTime <= updateTime, 'Update was before start time');
todo(updateTime <= Date.now(), 'Update was after present time');
}, function waitForUpdate() { setTimeout(function () {
var ifr = document.createElement('IFRAME');
ifr.src = "about:blank";
let overs = OVERRIDES;
(function nextOverride() {
val = overs.shift();
if (val.expected) {
testUATabNoNav(val.host, val.expected, true, 'Incorrect URL parameter: ' + val.override, function() {
overs.length ? nextOverride() : callback();
});
} else {
nextOverride();
}
})();
});
}, 2000));
ifr.addEventListener('load', function() {
var nav = ifr.contentWindow.navigator;
if (nav.userAgent !== UA_OVERRIDE) {
waitForUpdate();
return;
}
info('Overrode navigator UA');
is(getUA(location.origin), UA_OVERRIDE, 'Header UA not overridden');
var updateTime = parseInt(getUA('http://example.org'));
ok(startTime <= updateTime, 'Update was before start time');
ok(updateTime <= Date.now(), 'Update was after present time');
OVERRIDES.forEach(function (val) {
val.expected && is(getUA(val.host), val.expected,
'Incorrect URL parameter: ' + val.override);
});
callback();
}, false);
document.getElementById('content').appendChild(ifr);
}, 100); });
}
function testBadUpdate(callback) {
@ -218,11 +204,10 @@ function testProfileLoad(callback) {
setTimeout(waitForLoad, 100);
return;
}
testUATabNoNav(location.origin, UA_ALT_OVERRIDE, true, 'Did not apply saved override', function () {
saveFilePreviousSize = file.fileSize;
callback();
});
}, true);
is(getUA(location.origin), UA_ALT_OVERRIDE, 'Did not apply saved override');
saveFilePreviousSize = file.fileSize;
callback();
}, false);
document.getElementById('content').appendChild(ifr);
})();
@ -275,11 +260,6 @@ var FU = SpecialPowers.wrap(FileUtils);
SpecialPowers.Cu.import("resource://gre/modules/osfile.jsm", window);
var OSF = SpecialPowers.wrap(OS).File;
const Services = SpecialPowers.Cu.import("resource://gre/modules/Services.jsm").Services;
let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
let BrowserApp = chromeWin.BrowserApp;
// Load UserAgentOverrides.jsm after we load update timer manager
var UAO = null;