Albirew/resurrect-pages-isup-edition
Albirew/resurrect-pages-isup-edition
1
1
Fork 0
Code Issues Pull requests Activity

Do not "override" netError.xml -- rather, "overlay" it with DOM manipulation.

Browse source 
Closes #454
This commit is contained in:
Anthony Lieuallen 2011-01-17 04:26:58 +00:00
parent b77ad7d552
commit 0430736ce2
3 changed files with 68 additions and 415 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
chrome.manifest
View file

@ -2,7 +2,6 @@ content resurrect content/ contentaccessible=yes
skin resurrect classic/1.0 skin/
overlay chrome://browser/content/browser.xul chrome://resurrect/content/resurrect-overlay.xul
override chrome://global/content/netError.xhtml chrome://resurrect/content/netError.xhtml
style chrome://global/content/customizeToolbar.xul chrome://resurrect/skin/resurrect-overlay.css
locale resurrect ca-AD locale/ca-AD/

455
content/netError.xhtml
View file

@ -1,421 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html [
<!ENTITY % htmlDTD
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"DTD/xhtml1-strict.dtd">
%htmlDTD;
<!ENTITY % netErrorDTD
SYSTEM "chrome://global/locale/netError.dtd">
%netErrorDTD;
<!ENTITY % globalDTD
SYSTEM "chrome://global/locale/global.dtd">
%globalDTD;
<!ENTITY % dialogOverlayDTD
SYSTEM "chrome://global/locale/dialogOverlay.dtd">
%dialogOverlayDTD;
<!ENTITY % resurrectDTD
SYSTEM "chrome://resurrect/locale/overlay.dtd">
%resurrectDTD;
]>
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is mozilla.org code.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Adam Lock <adamlock@netscape.com>
- William R. Price <wrprice@alumni.rice.edu>
- Henrik Skupin <mozilla@hskupin.info>
- Jeff Walden <jwalden+code@mit.edu>
- Johnathan Nightingale <johnath@mozilla.com>
- Ehsan Akhgari <ehsan.akhgari@gmail.com>
- Anthony Lieuallen <arantius@gmail.com>
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the LGPL or the GPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<!DOCTYPE html SYSTEM "chrome://resurrect/locale/overlay.dtd">
<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
>
<head>
<title>&loadError.label;</title>
<link rel="stylesheet" href="chrome://resurrect/skin/netError.css" type="text/css" media="all" />
<link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
<!-- If the location of the favicon is changed here, the FAVICON_ERRORPAGE_URL symbol in
toolkit/components/places/src/nsFaviconService.h should be updated. -->
<link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
<script type="application/x-javascript"><![CDATA[
// Error url MUST be formatted like this:
// moz-neterror:page?e=error&u=url&d=desc
//
// or optionally, to specify an alternate CSS class to allow for
// custom styling and favicon:
//
// moz-neterror:page?e=error&u=url&s=classname&d=desc
// Note that this file uses document.documentURI to get
// the URL (with the format from above). This is because
// document.location.href gets the current URI off the docshell,
// which is the URL displayed in the location bar, i.e.
// the URI that the user attempted to load.
function getErrorCode()
{
var url = document.documentURI;
var error = url.search(/e\=/);
var duffUrl = url.search(/\&u\=/);
return decodeURIComponent(url.slice(error + 2, duffUrl));
}
function getCSSClass()
{
var url = document.documentURI;
var matches = url.match(/s\=([^&]+)\&/);
// s is optional, if no match just return nothing
if (!matches || matches.length < 2)
return "";
// parenthetical match is the second entry
return decodeURIComponent(matches[1]);
}
function getDescription()
{
var url = document.documentURI;
var desc = url.search(/d\=/);
// desc == -1 if not found; if so, return an empty string
// instead of what would turn out to be portions of the URI
if (desc == -1)
return "";
return decodeURIComponent(url.slice(desc + 2));
}
function retryThis(buttonEl)
{
// Session history has the URL of the page that failed
// to load, not the one of the error page. So, just call
// reload(), which will also repost POST data correctly.
try {
location.reload();
} catch (e) {
// We probably tried to reload a URI that caused an exception to
// occur; e.g. a non-existent file.
}
buttonEl.disabled = true;
}
function initPage()
{
var err = getErrorCode();
// if it's an unknown error or there's no title or description
// defined, get the generic message
var errTitle = document.getElementById("et_" + err);
var errDesc = document.getElementById("ed_" + err);
if (!errTitle || !errDesc)
{
errTitle = document.getElementById("et_generic");
errDesc = document.getElementById("ed_generic");
}
var title = document.getElementById("errorTitleText");
if (title)
{
title.parentNode.replaceChild(errTitle, title);
// change id to the replaced child's id so styling works
errTitle.id = "errorTitleText";
}
var sd = document.getElementById("errorShortDescText");
if (sd)
sd.textContent = getDescription();
var ld = document.getElementById("errorLongDesc");
if (ld)
{
ld.parentNode.replaceChild(errDesc, ld);
// change id to the replaced child's id so styling works
errDesc.id = "errorLongDesc";
}
// remove undisplayed errors to avoid bug 39098
var errContainer = document.getElementById("errorContainer");
errContainer.parentNode.removeChild(errContainer);
var className = getCSSClass();
if (className && className != "expertBadCert") {
// Associate a CSS class with the root of the page, if one was passed in,
// to allow custom styling.
// Not "expertBadCert" though, don't want to deal with the favicon
document.documentElement.className = className;
// Also, if they specified a CSS class, they must supply their own
// favicon. In order to trigger the browser to repaint though, we
// need to remove/add the link element.
var favicon = document.getElementById("favicon");
var faviconParent = favicon.parentNode;
faviconParent.removeChild(favicon);
favicon.setAttribute("href", "chrome://global/skin/icons/" + className + "_favicon.png");
faviconParent.appendChild(favicon);
}
if (className == "expertBadCert") {
showSecuritySection();
}
if (err == "nssBadCert") {
// Remove the "Try again" button for security exceptions, since it's
// almost certainly useless.
document.getElementById("errorTryAgain").style.display = "none";
document.getElementById("errorPageContainer").setAttribute("class", "certerror");
addDomainErrorLink();
// Also, remove resurrect buttons, they're not likely to help either.
document.body.className='';
}
else {
// Remove the override block for non-certificate errors. CSS-hiding
// isn't good enough here, because of bug 39098
var secOverride = document.getElementById("securityOverrideDiv");
secOverride.parentNode.removeChild(secOverride);
}
}
function showSecuritySection() {
// Swap link out, content in
document.getElementById('securityOverrideContent').style.display = '';
document.getElementById('securityOverrideLink').style.display = 'none';
}
/* In the case of SSL error pages about domain mismatch, see if
we can hyperlink the user to the correct site. We don't want
to do this generically since it allows MitM attacks to redirect
users to a site under attacker control, but in certain cases
it is safe (and helpful!) to do so. Bug 402210
*/
function addDomainErrorLink() {
// Rather than textContent, we need to treat description as HTML
var sd = document.getElementById("errorShortDescText");
if (sd)
sd.innerHTML = getDescription();
var link = document.getElementById('cert_domain_link');
if (!link)
return;
var okHost = link.getAttribute("title");
var thisHost = document.location.hostname;
var proto = document.location.protocol;
// If okHost is a wildcard domain ("*.example.com") let's
// use "www" instead. "*.example.com" isn't going to
// get anyone anywhere useful. bug 432491
okHost = okHost.replace(/^\*\./, "www.");
/* case #1:
* example.com uses an invalid security certificate.
*
* The certificate is only valid for www.example.com
*
* Make sure to include the "." ahead of thisHost so that
* a MitM attack on paypal.com doesn't hyperlink to "notpaypal.com"
*
* We'd normally just use a RegExp here except that we lack a
* library function to escape them properly (bug 248062), and
* domain names are famous for having '.' characters in them,
* which would allow spurious and possibly hostile matches.
*/
if (endsWith(okHost, "." + thisHost))
link.href = proto + okHost;
/* case #2:
* browser.garage.maemo.org uses an invalid security certificate.
*
* The certificate is only valid for garage.maemo.org
*/
if (endsWith(thisHost, "." + okHost))
link.href = proto + okHost;
}
function endsWith(haystack, needle) {
return haystack.slice(-needle.length) == needle;
}
]]></script>
</head>
<body dir="&locale.dir;" class="resurrect">
<!-- ERROR ITEM CONTAINER (removed during loading to avoid bug 39098) -->
<div id="errorContainer">
<div id="errorTitlesContainer">
<h1 id="et_generic">&generic.title;</h1>
<h1 id="et_dnsNotFound">&dnsNotFound.title;</h1>
<h1 id="et_fileNotFound">&fileNotFound.title;</h1>
<h1 id="et_malformedURI">&malformedURI.title;</h1>
<h1 id="et_protocolNotFound">&protocolNotFound.title;</h1>
<h1 id="et_connectionFailure">&connectionFailure.title;</h1>
<h1 id="et_netTimeout">&netTimeout.title;</h1>
<h1 id="et_redirectLoop">&redirectLoop.title;</h1>
<h1 id="et_unknownSocketType">&unknownSocketType.title;</h1>
<h1 id="et_netReset">&netReset.title;</h1>
<h1 id="et_netOffline">&netOffline.title;</h1>
<h1 id="et_netInterrupt">&netInterrupt.title;</h1>
<h1 id="et_deniedPortAccess">&deniedPortAccess.title;</h1>
<h1 id="et_proxyResolveFailure">&proxyResolveFailure.title;</h1>
<h1 id="et_proxyConnectFailure">&proxyConnectFailure.title;</h1>
<h1 id="et_contentEncodingError">&contentEncodingError.title;</h1>
<h1 id="et_unsafeContentType">&unsafeContentType.title;</h1>
<h1 id="et_nssFailure2">&nssFailure2.title;</h1>
<h1 id="et_nssBadCert">&nssBadCert.title;</h1>
<h1 id="et_malwareBlocked">&malwareBlocked.title;</h1>
</div>
<div id="errorDescriptionsContainer">
<div id="ed_generic">&generic.longDesc;</div>
<div id="ed_dnsNotFound">&dnsNotFound.longDesc;</div>
<div id="ed_fileNotFound">&fileNotFound.longDesc;</div>
<div id="ed_malformedURI">&malformedURI.longDesc;</div>
<div id="ed_protocolNotFound">&protocolNotFound.longDesc;</div>
<div id="ed_connectionFailure">&connectionFailure.longDesc;</div>
<div id="ed_netTimeout">&netTimeout.longDesc;</div>
<div id="ed_redirectLoop">&redirectLoop.longDesc;</div>
<div id="ed_unknownSocketType">&unknownSocketType.longDesc;</div>
<div id="ed_netReset">&netReset.longDesc;</div>
<div id="ed_netOffline">&netOffline.longDesc;</div>
<div id="ed_netInterrupt">&netInterrupt.longDesc;</div>
<div id="ed_deniedPortAccess">&deniedPortAccess.longDesc;</div>
<div id="ed_proxyResolveFailure">&proxyResolveFailure.longDesc;</div>
<div id="ed_proxyConnectFailure">&proxyConnectFailure.longDesc;</div>
<div id="ed_contentEncodingError">&contentEncodingError.longDesc;</div>
<div id="ed_unsafeContentType">&unsafeContentType.longDesc;</div>
<div id="ed_nssFailure2">&nssFailure2.longDesc;</div>
<div id="ed_nssBadCert">&nssBadCert.longDesc2;</div>
<div id="ed_malwareBlocked">&malwareBlocked.longDesc;</div>
</div>
</div>
<!-- PAGE CONTAINER (for styling purposes only) -->
<div id="errorPageContainer">
<!-- Error Title -->
<div id="errorTitle">
<h1 id="errorTitleText" />
</div>
<!-- LONG CONTENT (the section most likely to require scrolling) -->
<div id="errorLongContent">
<!-- Short Description -->
<div id="errorShortDesc">
<p id="errorShortDescText" />
</div>
<!-- Long Description (Note: See netError.dtd for used XHTML tags) -->
<div id="errorLongDesc" />
<!-- Override section - For ssl errors only. Removed on init for other
error types. -->
<div id="securityOverrideDiv">
<a id="securityOverrideLink" href="javascript:showSecuritySection();" >&securityOverride.linkText;</a>
<div id="securityOverrideContent" style="display: none;">&securityOverride.warningText;</div>
</div>
</div>
<!-- Retry Button -->
<xul:button id="errorTryAgain" label="&retry.label;" oncommand="retryThis(this);" />
<fieldset id='resurrect'>
<!-- fake elements so getElementById() doesn't die -->
<div id='targetTab' style='display: none;'></div>
<div id='targetWin' style='display: none;'></div>
<legend>
<img src='chrome://resurrect/skin/tb-icon-small.png' />
&resurrect.thispage;
</legend>
<xul:button
value='coralcdn' label=' &resurrect.coralcdn;'
image='chrome://resurrect/skin/cacheicons/coralcdn.png'
/>
<xul:button
value='google' label=' &resurrect.google;'
image='chrome://resurrect/skin/cacheicons/google.png'
/>
<xul:button
value='googletext' label=' &resurrect.google;&resurrect.textonly;'
image='chrome://resurrect/skin/cacheicons/google.png'
/>
<xul:button
value='yahoo' label=' &resurrect.yahoo;'
image='chrome://resurrect/skin/cacheicons/yahoo.png'
/>
<xul:button
value='archive' label=' &resurrect.archive;'
image='chrome://resurrect/skin/cacheicons/archive.png'
/>
<xul:button
value='bing' label=' &resurrect.bing;'
image='chrome://resurrect/skin/cacheicons/bing.png'
/>
<xul:button
value='gigablast' label=' &resurrect.gigablast;'
image='chrome://resurrect/skin/cacheicons/gigablast.png'
/>
<xul:button
value='webcitation' label=' &resurrect.webcitation;'
image='chrome://resurrect/skin/cacheicons/webcitation.png'
/>
</fieldset>
</div>
<!--
- Note: It is important to run the script this way, instead of using
- an onload handler. This is because error pages are loaded as
- LOAD_BACKGROUND, which means that onload handlers will not be executed.
-->
<script type="application/x-javascript">initPage();</script>
<body class="resurrect">
<fieldset id='resurrect'>
<!-- fake elements so getElementById() doesn't die -->
<div id='targetTab' style='display: none;'></div>
<div id='targetWin' style='display: none;'></div>
<legend>
<img src='chrome://resurrect/skin/tb-icon-small.png' />
&resurrect.thispage;
</legend>
<xul:button
value='coralcdn' label=' &resurrect.coralcdn;'
image='chrome://resurrect/skin/cacheicons/coralcdn.png'
/>
<xul:button
value='google' label=' &resurrect.google;'
image='chrome://resurrect/skin/cacheicons/google.png'
/>
<xul:button
value='googletext' label=' &resurrect.google;&resurrect.textonly;'
image='chrome://resurrect/skin/cacheicons/google.png'
/>
<xul:button
value='yahoo' label=' &resurrect.yahoo;'
image='chrome://resurrect/skin/cacheicons/yahoo.png'
/>
<xul:button
value='archive' label=' &resurrect.archive;'
image='chrome://resurrect/skin/cacheicons/archive.png'
/>
<xul:button
value='bing' label=' &resurrect.bing;'
image='chrome://resurrect/skin/cacheicons/bing.png'
/>
<xul:button
value='gigablast' label=' &resurrect.gigablast;'
image='chrome://resurrect/skin/cacheicons/gigablast.png'
/>
<xul:button
value='webcitation' label=' &resurrect.webcitation;'
image='chrome://resurrect/skin/cacheicons/webcitation.png'
/>
</fieldset>
</body>
</html>

27
content/resurrect.js
View file

@ -11,7 +11,7 @@ var resurrect={
.addEventListener('popupshowing', resurrect.toggleContextItems, false);
window.document.getElementById('appcontent').addEventListener(
'DOMContentLoaded', resurrect.attachClickEvent, false
'DOMContentLoaded', resurrect.contentDomLoad, false
);
},
@ -29,11 +29,34 @@ var resurrect={
.setAttribute('hidden', !gContextMenu.onLink);
},
attachClickEvent:function(event) {
contentDomLoad:function(event) {
var contentDoc=event.target;
var contentWin=contentDoc.defaultView;
if (contentDoc.documentURI.match(/^about:neterror/)) {
// Inject our content...
var xhr = new XMLHttpRequest();
xhr.open('GET', 'chrome://resurrect/content/netError.xhtml', false);
xhr.send(null);
var resurrectFieldset = xhr.responseXML.getElementById('resurrect');
var newFieldset = contentDoc.adoptNode(resurrectFieldset);
var container = contentDoc.getElementById('errorPageContainer');
container.appendChild(newFieldset);
// ...including the CSS.
var link = contentDoc.createElement('link');
link.setAttribute('rel', 'stylesheet');
link.setAttribute('href', 'chrome://resurrect/skin/netError.css');
link.setAttribute('type', 'text/css');
link.setAttribute('media', 'all');
contentDoc.getElementsByTagName('head')[0].appendChild(link);
// Add the className that enables it, only when appropriate.
contentDoc.location.href =
'javascript:if ("nssBadCert" != getErrorCode()) {'
+ 'document.body.className += " resurrect";'
+ '}; void(0)';
// Add event listener.
contentDoc.getElementById('resurrect').addEventListener(
'click', resurrect.clickedHtml, false
);