Skip to content

Commit 733a2fa

Browse files
committed
[JENKINS-73804] Replace intimidating rage.svg with friendly shrug.svg on 404 pages
1 parent 396f78b commit 733a2fa

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,4 @@ node_modules/
7777

7878
# Generated JavaScript Bundles
7979
war/src/main/webapp/jsbundles/
80+
apache-maven-3.9.6-bin.tar.gz

core/src/main/java/jenkins/security/ResourceDomainFilter.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,16 @@
4949
public class ResourceDomainFilter implements HttpServletFilter {
5050

5151
private static final Logger LOGGER = Logger.getLogger(ResourceDomainFilter.class.getName());
52-
53-
private static final Set<String> ALLOWED_PATHS = new HashSet<>(Arrays.asList("/" + ResourceDomainRootAction.URL, "/favicon.ico", "/favicon.svg", "/apple-touch-icon.png", "/mask-icon.svg", "/robots.txt", "/images/rage.svg"));
52+
private static final Set<String> ALLOWED_PATHS = new HashSet<>(Arrays.asList(
53+
"/" + ResourceDomainRootAction.URL,
54+
"/favicon.ico",
55+
"/favicon.svg",
56+
"/apple-touch-icon.png",
57+
"/mask-icon.svg",
58+
"/robots.txt",
59+
"/images/rage.svg",
60+
"/images/shrug.svg"
61+
));
5462
public static final String ERROR_RESPONSE = "Jenkins serves only static files on this domain.";
5563

5664
@Override

core/src/main/resources/jenkins/model/Jenkins/_404.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ THE SOFTWARE.
3434
<l:header />
3535
<l:main-panel>
3636
<h1 style="text-align: center">
37-
<img src="${imagesURL}/rage.svg" height="179" width="154"/>
37+
<img src="${imagesURL}/shrug.svg" height="179" width="154" alt="${%Page Not Found}"/>
3838
<span style="font-size:50px"><st:nbsp/>${%Oops!}</span>
3939
</h1>
4040
<div id="error-description" style="text-align: center">

core/src/main/resources/jenkins/model/Jenkins/_404_simple.jelly

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ THE SOFTWARE.
4848
</head>
4949
<body style="font-family: system-ui, sans-serif">
5050
<h1 style="text-align: center">
51-
<img src="${imagesURL}/rage.svg" height="179" width="154" style="vertical-align: middle"/>
52-
<span style="font-size:50px"><st:nbsp/>${%Oops!}</span>
51+
<img src="${imagesURL}/shrug.svg" height="179" width="154" alt="${%Page Not Found}"/> <span style="font-size:50px"><st:nbsp/>${%Oops!}</span>
5352
</h1>
5453
<div style="text-align: center">
5554
<h2>${%title(jakarta.servlet.error.message?:'Not Found')}</h2>

war/src/main/webapp/images/shrug.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)