Jahia · Janin-Michel-Mathias · Jan 30, 2025
diff --git a/src/main/java/org/jahia/modules/tools/JspPrecompileServlet.java b/src/main/java/org/jahia/modules/tools/JspPrecompileServlet.java
@@ -107,6 +107,7 @@ private void doWork(HttpServletRequest aRequest,
             out.println("</head>");
             out.println("<body>");
 
+            out.println("<div width=\"100%\" style=\"display: flex; justify-content: flex-end; margin: 20px; margin-right: 100px\"><a href='/cms/logout?redirect=/start'>Logout</a></div>");
             out.println("<h1>JSP compilation</h1>");
             out.print("<p>Found <strong>");
             out.print(foundJsps.size());

diff --git a/src/main/resources/actions.jsp b/src/main/resources/actions.jsp
@@ -16,6 +16,7 @@
     pageContext.setAttribute("actions", ServicesRegistry.getInstance().getJahiaTemplateManagerService().getActions().values());
 %>
 <body>
+<%@ include file="logout.jspf" %>
 <%@ include file="gotoIndex.jspf" %>
 
 <h1>Actions (${functions:length(actions)} found)</h1>

diff --git a/src/main/resources/benchmarks.jsp b/src/main/resources/benchmarks.jsp
@@ -71,6 +71,7 @@
     </style>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>System Benchmark Tool</h1>
 
 <p>

diff --git a/src/main/resources/cache.jsp b/src/main/resources/cache.jsp
@@ -36,6 +36,7 @@
     <title>Cache Management</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Cache Management</h1>
 <fieldset style="position: absolute; right: 20px;">
     <legend><strong>Settings</strong></legend>

diff --git a/src/main/resources/choicelistInitializersRenderers.jsp b/src/main/resources/choicelistInitializersRenderers.jsp
@@ -27,6 +27,7 @@
     int count = 0;
 %>
 <body>
+<%@ include file="logout.jspf" %>
 <%@ include file="gotoIndex.jspf" %>
 
 <h1>Choicelist initializers &amp; renderers</h1>

diff --git a/src/main/resources/ckeditorConfig.jsp b/src/main/resources/ckeditorConfig.jsp
@@ -61,6 +61,7 @@
         <title>CKEditor Custom Configuration</title>
     </head>
     <body>
+    <%@ include file="logout.jspf" %>
     <h1>CKEditor Custom Configuration</h1>
     <c:if test="${not empty param.config}">
         <%

diff --git a/src/main/resources/dbQuery.jsp b/src/main/resources/dbQuery.jsp
@@ -11,6 +11,7 @@
 <title>Jahia DB Query Tool</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Jahia DB Query Tool</h1>
 <c:set var="offset" value="${not empty param.offset ? param.offset : '0'}"/>
 <fieldset>

diff --git a/src/main/resources/definitionsBrowser.jsp b/src/main/resources/definitionsBrowser.jsp
@@ -108,6 +108,7 @@
     }
 %>
 <body id="dt_example">
+<%@ include file="logout.jspf" %>
 <%@ include file="gotoIndex.jspf" %>
 <div class="container-fluid">
     <table id="moduleTable" class="table table-striped compact" data-table="dataTable">

diff --git a/src/main/resources/docConverter.jsp b/src/main/resources/docConverter.jsp
@@ -12,6 +12,7 @@
 <title>Jahia Document Conversion Service</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Jahia Document Conversion Service</h1>
 <%
 DocumentConverterService service = (DocumentConverterService) SpringContextSingleton.getBean("DocumentConverterService");

diff --git a/src/main/resources/ehcache/ehcache_cj.jsp b/src/main/resources/ehcache/ehcache_cj.jsp
@@ -59,6 +59,7 @@
         pageContext.setAttribute("stats", new EhCacheStatisticsWrapper(cache.getStatistics()));
     %>
     <body id="dt_example" class="container-fluid">
+    <%@ include file="../logout.jspf" %>
     <a href="../index.jsp" title="back to the overview of caches">overview</a>&nbsp;
     <a href="?refresh&toolAccessToken=${toolAccessToken}">refresh</a>&nbsp;
     <a href="?flush=true&toolAccessToken=${toolAccessToken}"

diff --git a/src/main/resources/ehcache/ehcache_cj_dep.jsp b/src/main/resources/ehcache/ehcache_cj_dep.jsp
@@ -46,6 +46,7 @@
         pageContext.setAttribute("cache", cache);
     %>
     <body id="dt_example" class="container-fluid">
+    <%@ include file="../logout.jspf" %>
     <a href="../index.jsp" title="back to the overview of caches">overview</a>&nbsp;
     <a href="?flush=true&toolAccessToken=${toolAccessToken}"
        onclick="return confirm('This will flush the content of the cache. Would you like to continue?')"

diff --git a/src/main/resources/ehcache/ehcache_stats.jsp b/src/main/resources/ehcache/ehcache_stats.jsp
@@ -52,6 +52,7 @@
         pageContext.setAttribute("depstats", new EhCacheStatisticsWrapper(depCache.getStatistics()));
     %>
     <body id="dt_example" class="container-fluid">
+    <%@ include file="../logout.jspf" %>
     <a href="../index.jsp" title="back to the overview of caches">overview</a>&nbsp;
     <a href="?refresh&toolAccessToken=${toolAccessToken}">refresh</a>&nbsp;
     <a href="?flush=true&toolAccessToken=${toolAccessToken}"

diff --git a/src/main/resources/errorFileDumper.jsp b/src/main/resources/errorFileDumper.jsp
@@ -10,6 +10,7 @@
 <title>Error File Dumper</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Error File Dumper</h1>
 <c:if test="${not empty param.active}">
 <%

diff --git a/src/main/resources/groovyConsole.jsp b/src/main/resources/groovyConsole.jsp
@@ -29,6 +29,7 @@
     <title>Groovy Console</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Groovy Console&nbsp;<button data-src="#helpArea" data-fancybox><img src="<c:url value='/icons/help.png'/>" width="16" height="16" alt="help" title="Help"/></button>
 </h1>
 <%

diff --git a/src/main/resources/importPackageChecker.jsp b/src/main/resources/importPackageChecker.jsp
@@ -13,6 +13,7 @@
 </head>
 
 <body>
+<%@ include file="logout.jspf" %>
 <div>
     <h1>OSGI Import-Package checker</h1>
 

diff --git a/src/main/resources/index.jsp b/src/main/resources/index.jsp
@@ -34,6 +34,16 @@
     Since: <%= new java.util.Date(JahiaContextLoaderListener.getStartupTime()) %>
 </div>
 <table width="100%" border="0">
+    <tr>
+        <td width="50%">
+            <fieldset>
+                <legend>Logout</legend>
+                <ul>
+                    <li><a href='/cms/logout?redirect=/start'>Logout</a></li>
+                </ul>
+            </fieldset>
+        </td>
+    </tr>
     <tr>
         <td width="50%" valign="top">
 <fieldset>

diff --git a/src/main/resources/jcrBrowser.jsp b/src/main/resources/jcrBrowser.jsp
@@ -169,6 +169,7 @@
     </script>
 </head>
 <body>
+    <%@ include file="logout.jspf" %>
 <c:url var="mgrUrl" value="/engines/manager.jsp">
     <c:param name="selectedPaths" value="${currentNode.path}"/>
     <c:param name="workspace" value="${workspace}"/>

diff --git a/src/main/resources/jcrConsole.jsp b/src/main/resources/jcrConsole.jsp
@@ -31,6 +31,7 @@ Locale currentLocale = LanguageCodeConverters.languageCodeToLocale((String) page
 pageContext.setAttribute("locales", LanguageCodeConverters.getSortedLocaleList(Locale.ENGLISH));
 %>
 <body>
+<%@ include file="logout.jspf" %>
 <div class="${workspace}">
 <h1>JCR Console</h1>
 <%

diff --git a/src/main/resources/jcrExternalProviders.jsp b/src/main/resources/jcrExternalProviders.jsp
@@ -25,6 +25,7 @@
 %>
 
 <body>
+<%@ include file="logout.jspf" %>
 <h1>JCR Providers (${functions:length(providers)} found)</h1>
 <table border="1" cellspacing="0" cellpadding="5">
     <thead>

diff --git a/src/main/resources/jcrGc.jsp b/src/main/resources/jcrGc.jsp
@@ -12,6 +12,7 @@
 <title>JCR Data Store Garbage Collection</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>JCR Data Store Garbage Collection</h1>
 <c:if test="${param.gc == 'true'}">
 <% System.gc(); %>

diff --git a/src/main/resources/jcrIntegrityTools.jsp b/src/main/resources/jcrIntegrityTools.jsp
@@ -64,6 +64,7 @@
     </style>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>JCR Integrity Tools</h1>
 
 <p>

diff --git a/src/main/resources/jcrJarsCleanup.jsp b/src/main/resources/jcrJarsCleanup.jsp
@@ -70,6 +70,7 @@
     pageContext.setAttribute("result", result);
 %>
 <body>
+<%@ include file="logout.jspf" %>
 <div>
     <fieldset>
         <legend><strong>JCR bundles cleanup</strong></legend>

diff --git a/src/main/resources/jcrQuery.jsp b/src/main/resources/jcrQuery.jsp
@@ -66,6 +66,7 @@
     pageContext.setAttribute("locales", LanguageCodeConverters.getSortedLocaleList(Locale.ENGLISH));
 %>
 <body>
+<%@ include file="logout.jspf" %>
 <c:set var="switchToWorkspace" value="${workspace == 'default' ? 'live' : 'default'}"/>
 <fieldset>
     <legend>

diff --git a/src/main/resources/jcrQueryStats.jsp b/src/main/resources/jcrQueryStats.jsp
@@ -19,6 +19,7 @@
     <title>JCR Query statistics</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <%
 QueryStat queryStat = ((JahiaRepositoryImpl)((SpringJackrabbitRepository)JCRSessionFactory.getInstance().getDefaultProvider().getRepository()).getRepository()).getContext().getStatManager().getQueryStat();
 pageContext.setAttribute("queryStat", queryStat);

diff --git a/src/main/resources/jcrSessions.jsp b/src/main/resources/jcrSessions.jsp
@@ -15,6 +15,7 @@
     <title>JCR Sessions</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>JCR Sessions</h1>
 
 <p>There are currently <%= JCRSessionWrapper.getActiveSessionsObjects().size() %> open sessions.<br/>

diff --git a/src/main/resources/jcrVersionHistory.jsp b/src/main/resources/jcrVersionHistory.jsp
@@ -38,6 +38,7 @@ pageContext.setAttribute("orphanedCheckRunning", NodeVersionHistoryHelper.isChec
 pageContext.setAttribute("unusedCheckRunning", NodeVersionHistoryHelper.isCheckingUnused());
 %>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>JCR Version History Management</h1>
 <p>This tool aims to perform cleanup tasks on the version store, e.g. find version history for nodes that no longer exists and purge them or purge old versions for existing nodes.</p>
 <c:if test="${param.action == 'orphanedReport' || param.action == 'orphanedDelete'}">

diff --git a/src/main/resources/jobadmin.jsp b/src/main/resources/jobadmin.jsp
@@ -46,6 +46,7 @@ pageContext.setAttribute("scheduler", scheduler);
 <c:url var="imgOff" value="images/nav_plain_red.png"/>
 <c:set var="schedulerStatus" value="${scheduler.started ? (scheduler.inStandbyMode ? 'In standby mode' : 'Started') : 'Not started'}"/>
 <body>
+    <%@ include file="logout.jspf" %>
 	<h1>${ramScheduler ? 'RAM (in-memory) ' : ''}Job Administration</h1>
     <p>Scheduler status:
     <img src="${schedulerStatus == 'Started' ? imgOn : imgOff}" alt="${schedulerStatus}" title="${schedulerStatus}" height="16" width="16"/>

diff --git a/src/main/resources/karaf.jsp b/src/main/resources/karaf.jsp
@@ -13,6 +13,7 @@
     <title>Karaf command line</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Karaf command line</h1>
 
 <fieldset>

diff --git a/src/main/resources/log4jAdmin.jsp b/src/main/resources/log4jAdmin.jsp
@@ -252,6 +252,7 @@
     </style>
 </head>
 <body onload="javascript:document.logFilterForm.logNameFilter.focus();">
+<%@ include file="logout.jspf" %>
 <%@ include file="gotoIndex.jspf" %>
 
 <%

diff --git a/src/main/resources/logout.jspf b/src/main/resources/logout.jspf
@@ -0,0 +1,3 @@
+<div width="100%" style="display: flex; justify-content: flex-end; margin: 20px; margin-right: 100px">
+    <a href='/cms/logout?redirect=/start'>Logout</a>
+</div>
diff --git a/src/main/resources/maintenance.jsp b/src/main/resources/maintenance.jsp
@@ -51,6 +51,7 @@
 <% pageContext.setAttribute("fullReadOnlyModeController", ReadOnlyModeController.getInstance()); %>
 <% pageContext.setAttribute("settings", SettingsBean.getInstance()); %>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>System Maintenance</h1>
 <p><a href="maintenance.jsp" title="Refresh"><img src="<c:url value='/icons/refresh.png'/>" alt="Refresh" title="Refresh" height="16" width="16"/>&nbsp; Refresh status</a></p>
 <c:set var="modeLabel" value="${maintenance ? 'ON' : 'OFF'}"/>

diff --git a/src/main/resources/memoryInfo.jsp b/src/main/resources/memoryInfo.jsp
@@ -24,6 +24,7 @@ Heap dump performed into a file: <%= ErrorFileDumper.performHeapDump() %>
 </p>
 </c:if>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Memory Status at <%= new Date() %></h1>
 <%
 StringWriter s = new StringWriter();

diff --git a/src/main/resources/modules.jsp b/src/main/resources/modules.jsp
@@ -28,6 +28,7 @@
     </head>
 
     <body>
+        <%@ include file="logout.jspf" %>
         <div>
          <h1>Modules</h1>
 

diff --git a/src/main/resources/modulesBrowser.jsp b/src/main/resources/modulesBrowser.jsp
@@ -76,6 +76,7 @@
     }
 %>
 <body id="dt_example">
+<%@ include file="logout.jspf" %>
 <%@ include file="gotoIndex.jspf" %>
 <div class="container-fluid">
     <table id="moduleTable" class="table table-striped compact" data-table="dataTable">

diff --git a/src/main/resources/pwdEncrypt.jsp b/src/main/resources/pwdEncrypt.jsp
@@ -13,6 +13,7 @@
     <title>Password encryption</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Password encryption</h1>
 <c:if test="${not empty param.pwd}">
     <c:choose>

diff --git a/src/main/resources/render.jsp b/src/main/resources/render.jsp
@@ -9,6 +9,7 @@
     <title>Render chain debug</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Render chain debug</h1>
 <c:if test="${not empty param.active}">
     <%

diff --git a/src/main/resources/renderFilters.jsp b/src/main/resources/renderFilters.jsp
@@ -43,6 +43,7 @@
     pageContext.setAttribute("newline", "\n");
 %>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Render Filters (${functions:length(filters)} found)</h1>
 <table border="1" cellspacing="0" cellpadding="5">
     <thead>

diff --git a/src/main/resources/rules.jsp b/src/main/resources/rules.jsp
@@ -18,6 +18,7 @@
     <%@ include file="css.jspf" %>
 </head>
 <body>
+    <%@ include file="logout.jspf" %>
     <h1>Business Rules</h1>
     <p>
         Here is a list of all business rules, currently registered in the system.

diff --git a/src/main/resources/search.jsp b/src/main/resources/search.jsp
@@ -21,6 +21,7 @@
     <title>Search Engine Manager</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Search Engine Management</h1>
 <c:if test="${not empty param.action}">
 	<c:choose>

diff --git a/src/main/resources/support.jsp b/src/main/resources/support.jsp
@@ -31,6 +31,7 @@
 <title>Export Support Information</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Export Support Information</h1>
 <p>Allows you to export as a ZIP file useful support data about this Jahia instance.</p>
 <fieldset style="background-color:#dfe8f6;border-color:#c3dbee;color:#000">

diff --git a/src/main/resources/systemInfo.jsp b/src/main/resources/systemInfo.jsp
@@ -17,6 +17,7 @@ response.setHeader("Content-Disposition", "attachment; filename=\"system-info-"
 <title>System Status Information</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>System Status Information at <%= new Date() %></h1>
 <a href="?file=true&toolAccessToken=${toolAccessToken}" target="_blank">download as a file</a>
 <br/>

diff --git a/src/main/resources/textExtractor.jsp b/src/main/resources/textExtractor.jsp
@@ -34,6 +34,7 @@ if ("stopExtractionCheck".equals(request.getParameter("action"))) {
 pageContext.setAttribute("extractionCheckRunning", TextExtractionHelper.isCheckingExtractions());
 %>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Jahia Text Extraction Service</h1>
 <p>This tool aims to perform text extractions on documents in the repository and store it in the j:extractedText property. Another option allows to extract the text from a local file and immediately show the results.</p>
 

diff --git a/src/main/resources/threadDumpMgmt.jsp b/src/main/resources/threadDumpMgmt.jsp
@@ -13,6 +13,7 @@
 <title>Thread Dump Management</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>Thread Dump Management</h1>
 <c:if test="${empty param.threadDumpCount && (param.threadDump == 'sysout' || param.threadDump == 'file')}">
 <% pageContext.setAttribute("outputFile", ThreadMonitor.getInstance().dumpThreadInfo("sysout".equals(request.getParameter("threadDump")), "file".equals(request.getParameter("threadDump")))); %>

diff --git a/src/main/resources/wcagChecker.jsp b/src/main/resources/wcagChecker.jsp
@@ -10,6 +10,7 @@
 <title>WCAG Validator Service</title>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 <h1>WCAG Validator Service</h1>
 <form id="wcag" action="${pageContext.request.contextPath}/cms/wcag/validate" method="post">
 <p>Paste here the HTML text to be validated:</p>

diff --git a/src/main/resources/workflows.jsp b/src/main/resources/workflows.jsp
@@ -27,6 +27,7 @@
     <%@ include file="css.jspf" %>
 </head>
 <body>
+<%@ include file="logout.jspf" %>
 
 <%
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,6 +71,7 @@ @@
         </style>
     </head>
     <body>
+    <%@ include file="logout.jspf" %>
     <h1>System Benchmark Tool</h1>
     <p>
@@ Expand Down @@