From 35799b3ea9f7345c9e283925442982ffa534bb33 Mon Sep 17 00:00:00 2001 From: "gavin%gavinsharp.com" Date: Tue, 3 Jul 2007 16:49:07 +0000 Subject: [PATCH] Bug 380932: land netError page for malware URIs, patch by Johnathan Nightingale , r=biesi, ui+r=beltzner git-svn-id: svn://10.0.0.236/trunk@229252 18797224-902f-48f8-a5cc-f745e15eee43 --- .../en-US/chrome/overrides/netError.dtd | 6 +++ .../docshell/resources/content/netError.xhtml | 40 +++++++++++++++++- mozilla/dom/locales/en-US/chrome/netError.dtd | 6 +++ .../global/icons/blacklist_favicon.png | Bin 0 -> 705 bytes .../global/icons/blacklist_large.png | Bin 0 -> 7013 bytes .../toolkit/themes/pinstripe/global/jar.mn | 2 + .../themes/pinstripe/global/netError.css | 21 +++++++++ .../global/icons/blacklist_favicon.png | Bin 0 -> 705 bytes .../global/icons/blacklist_large.png | Bin 0 -> 7013 bytes .../toolkit/themes/winstripe/global/jar.mn | 2 + .../themes/winstripe/global/netError.css | 20 +++++++++ 11 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 mozilla/toolkit/themes/pinstripe/global/icons/blacklist_favicon.png create mode 100644 mozilla/toolkit/themes/pinstripe/global/icons/blacklist_large.png create mode 100644 mozilla/toolkit/themes/winstripe/global/icons/blacklist_favicon.png create mode 100644 mozilla/toolkit/themes/winstripe/global/icons/blacklist_large.png diff --git a/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd b/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd index abbcca2616d..2d2c2300685 100644 --- a/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd +++ b/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd @@ -134,3 +134,9 @@ that &brandShortName; is permitted to access the Web. "> + + + +Attack sites try to install programs that steal private information, use your computer to attack others, or damage your system.

+

You should not visit this site.

+"> diff --git a/mozilla/docshell/resources/content/netError.xhtml b/mozilla/docshell/resources/content/netError.xhtml index 684ecd364f3..fa8b75cd03d 100644 --- a/mozilla/docshell/resources/content/netError.xhtml +++ b/mozilla/docshell/resources/content/netError.xhtml @@ -38,6 +38,7 @@ - William R. Price - Henrik Skupin - Jeff Walden + - Johnathan Nightingale - - 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 @@ -57,12 +58,16 @@ &loadError.label; - - + @@ -168,6 +202,7 @@

&proxyConnectFailure.title;

&contentEncodingError.title;

&nssFailure2.title;

+

&malwareBlocked.title;

&generic.longDesc;
@@ -187,6 +222,7 @@
&proxyConnectFailure.longDesc;
&contentEncodingError.longDesc;
&nssFailure2.longDesc;
+
&malwareBlocked.longDesc;
diff --git a/mozilla/dom/locales/en-US/chrome/netError.dtd b/mozilla/dom/locales/en-US/chrome/netError.dtd index a5dca5eb656..5f3e27612b0 100644 --- a/mozilla/dom/locales/en-US/chrome/netError.dtd +++ b/mozilla/dom/locales/en-US/chrome/netError.dtd @@ -53,3 +53,9 @@ The page you are trying to view can not be shown because the authenticity of the received data could not be verified.

  • Please contact the web site owners to inform them of this problem.
"> + + + +Attack sites try to install programs that steal private information, use your computer to attack others, or damage your system.

+

You should not visit this site.

+"> diff --git a/mozilla/toolkit/themes/pinstripe/global/icons/blacklist_favicon.png b/mozilla/toolkit/themes/pinstripe/global/icons/blacklist_favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..2558067d9d412055ff44a3cedd5da98d672868e0 GIT binary patch literal 705 zcmV;y0zUnTP)gn0f;~fCanhPMk{q=abbVJi)nPDJ0t!9w$@)#*Zcvk?(E9AcuNG4Er%_d!S@MxA8xl9_wXJ?Gpv0!!<|)5m2Sh81hALpwSXLhyEl6xE&m zgVz`9#RXuV0Im?SxO(Fjve(y<%jY4qM7P<*pw+^UZ^xMQx^;QqjhqG&T+jDsct`bd(hBKFfqnWrLvi;#XAT* zLx=!~YpPL^IwlCbfJi*#)(S8qlWCuRb?ItTym@%POeL>2ig%G%NkhdHZ4IS~Knf0E zO5leG{izBYS{#1tIe6S>%tGzUQYlZpT`DT(L=vP38q*Mc(#4)xHvLL<2JhBtjXyRcqB0Rx nD0;^(K3SJN6L8@<{}x~XC=(iX4f+Ps00000NkvXXu0mjfzqvFl literal 0 HcmV?d00001 diff --git a/mozilla/toolkit/themes/pinstripe/global/icons/blacklist_large.png b/mozilla/toolkit/themes/pinstripe/global/icons/blacklist_large.png new file mode 100644 index 0000000000000000000000000000000000000000..51b2e06263c2ee32ec7008c76987595bc204b4cb GIT binary patch literal 7013 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 DfdPh$ literal 0 HcmV?d00001 diff --git a/mozilla/toolkit/themes/pinstripe/global/jar.mn b/mozilla/toolkit/themes/pinstripe/global/jar.mn index d74c5768378..0c854ec00ec 100644 --- a/mozilla/toolkit/themes/pinstripe/global/jar.mn +++ b/mozilla/toolkit/themes/pinstripe/global/jar.mn @@ -113,6 +113,8 @@ classic.jar: + skin/classic/global/icons/alert-question.gif (icons/alert-question.gif) + skin/classic/global/icons/autocomplete-dropmarker.png (icons/autocomplete-dropmarker.png) + skin/classic/global/icons/autoscroll.png (icons/autoscroll.png) ++ skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png) ++ skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png) + skin/classic/global/icons/chevron.png (icons/chevron.png) + skin/classic/global/icons/close.gif (icons/close.gif) + skin/classic/global/icons/closetab-active.png (icons/closetab-active.png) diff --git a/mozilla/toolkit/themes/pinstripe/global/netError.css b/mozilla/toolkit/themes/pinstripe/global/netError.css index 2e74b83bd38..9b48be72afc 100644 --- a/mozilla/toolkit/themes/pinstripe/global/netError.css +++ b/mozilla/toolkit/themes/pinstripe/global/netError.css @@ -103,3 +103,24 @@ body[dir="rtl"] #brand { #errorContainer { display: none; } + +/* Custom styling for 'blacklist' error class */ +:root.blacklist #errorTitle, :root.blacklist #errorLongContent, +:root.blacklist #errorShortDesc, :root.blacklist #errorLongDesc { + background-color: #722; /* Dark red */ + color: white; +} + +:root.blacklist #errorPageContainer { + background-image: url("chrome://global/skin/icons/blacklist_large.png"); + background-color: #722; +} + +:root.blacklist { + background: #333; +} + +:root.blacklist #errorTryAgain { + display: none; +} + diff --git a/mozilla/toolkit/themes/winstripe/global/icons/blacklist_favicon.png b/mozilla/toolkit/themes/winstripe/global/icons/blacklist_favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..2558067d9d412055ff44a3cedd5da98d672868e0 GIT binary patch literal 705 zcmV;y0zUnTP)gn0f;~fCanhPMk{q=abbVJi)nPDJ0t!9w$@)#*Zcvk?(E9AcuNG4Er%_d!S@MxA8xl9_wXJ?Gpv0!!<|)5m2Sh81hALpwSXLhyEl6xE&m zgVz`9#RXuV0Im?SxO(Fjve(y<%jY4qM7P<*pw+^UZ^xMQx^;QqjhqG&T+jDsct`bd(hBKFfqnWrLvi;#XAT* zLx=!~YpPL^IwlCbfJi*#)(S8qlWCuRb?ItTym@%POeL>2ig%G%NkhdHZ4IS~Knf0E zO5leG{izBYS{#1tIe6S>%tGzUQYlZpT`DT(L=vP38q*Mc(#4)xHvLL<2JhBtjXyRcqB0Rx nD0;^(K3SJN6L8@<{}x~XC=(iX4f+Ps00000NkvXXu0mjfzqvFl literal 0 HcmV?d00001 diff --git a/mozilla/toolkit/themes/winstripe/global/icons/blacklist_large.png b/mozilla/toolkit/themes/winstripe/global/icons/blacklist_large.png new file mode 100644 index 0000000000000000000000000000000000000000..51b2e06263c2ee32ec7008c76987595bc204b4cb GIT binary patch literal 7013 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 DfdPh$ literal 0 HcmV?d00001 diff --git a/mozilla/toolkit/themes/winstripe/global/jar.mn b/mozilla/toolkit/themes/winstripe/global/jar.mn index 066f2c77000..5fb5f980a3f 100644 --- a/mozilla/toolkit/themes/winstripe/global/jar.mn +++ b/mozilla/toolkit/themes/winstripe/global/jar.mn @@ -75,6 +75,8 @@ classic.jar: skin/classic/global/icons/autocomplete-dropmark-bkgnd-mid-top.png (icons/autocomplete-dropmark-bkgnd-mid-top.png) skin/classic/global/icons/autocomplete-dropmark-bkgnd-mid-bottom.png (icons/autocomplete-dropmark-bkgnd-mid-bottom.png) skin/classic/global/icons/autoscroll.png (icons/autoscroll.png) + skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png) + skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png) skin/classic/global/icons/Close.gif (icons/Close.gif) skin/classic/global/icons/close.png (icons/close.png) skin/classic/global/icons/alltabs.png (icons/alltabs.png) diff --git a/mozilla/toolkit/themes/winstripe/global/netError.css b/mozilla/toolkit/themes/winstripe/global/netError.css index 2e74b83bd38..413993f48ce 100644 --- a/mozilla/toolkit/themes/winstripe/global/netError.css +++ b/mozilla/toolkit/themes/winstripe/global/netError.css @@ -103,3 +103,23 @@ body[dir="rtl"] #brand { #errorContainer { display: none; } + +/* Custom styling for 'blacklist' error class */ +:root.blacklist #errorTitle, :root.blacklist #errorLongContent, +:root.blacklist #errorShortDesc, :root.blacklist #errorLongDesc { + background-color: #722; /* Dark red */ + color: white; +} + +:root.blacklist #errorPageContainer { + background-image: url("chrome://global/skin/icons/blacklist_large.png"); + background-color: #722; +} + +:root.blacklist { + background: #333; +} + +:root.blacklist #errorTryAgain { + display: none; +}