From f01d0d99569d84ed331bbd115422281d9c3aee40 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Tue, 18 Jun 2019 09:52:39 +0200
Subject: [PATCH] no-jira: don't send error page for 401/404 in mapper
dispatcher
---
.../olat/core/dispatcher/mapper/MapperDispatcher.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/core/dispatcher/mapper/MapperDispatcher.java b/src/main/java/org/olat/core/dispatcher/mapper/MapperDispatcher.java
index 7be47d5ebdd..ffe6d4d08b4 100644
--- a/src/main/java/org/olat/core/dispatcher/mapper/MapperDispatcher.java
+++ b/src/main/java/org/olat/core/dispatcher/mapper/MapperDispatcher.java
@@ -88,20 +88,21 @@ public class MapperDispatcher extends LogDelegator implements Dispatcher {
// e.g. non-cacheable: 23423
// e.g. cacheable: my.mapper.path
UserSession usess = CoreSpringFactory.getImpl(UserSessionManager.class).getUserSession(hreq);
- Mapper m = CoreSpringFactory.getImpl(MapperService.class).getMapperById(usess, smappath);
+ MapperService mapperService = CoreSpringFactory.getImpl(MapperService.class);
+ Mapper m = mapperService.getMapperById(usess, smappath);
if (m == null) {
//an anonymous mapper?
- m = CoreSpringFactory.getImpl(MapperService.class).getMapperById(null, smappath);
+ m = mapperService.getMapperById(null, smappath);
if(m == null) {
logWarn("Call to mapped resource, but mapper does not exist for path::" + smappath, null);
- DispatcherModule.sendNotFound(pathInfo, hres);
+ hres.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
}
}
String mod = slashPos > 0 ? subInfo.substring(slashPos) : "";
if (mod.indexOf("..") != -1) {
logWarn("Illegal mapper path::" + mod + " contains '..'", null);
- DispatcherModule.sendForbidden(pathInfo, hres);
+ hres.setStatus(HttpServletResponse.SC_FORBIDDEN);
return;
}
// /bla/blu.html
--
GitLab