Skip to content

JSPWIKI-1253 displays the last login timestamp and date, #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

JSPWIKI-1253 displays the last login timestamp and date, #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4473ef7
JSPWIKI-1253 displays the last login timestamp and date, which are pe…
spyhunter99 Nov 30, 2025
5e3e5b0
should fix the unit test
spyhunter99 Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,16 @@ Licensed to the Apache Software Foundation (ASF) under one
import jakarta.servlet.http.HttpSession;
import java.security.Principal;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.auth.user.DefaultUserProfile;
import org.apache.wiki.auth.user.UserProfile;


/**
Expand Down Expand Up @@ -201,8 +206,34 @@ public boolean login( final HttpServletRequest request ) throws WikiSecurityExce
fireEvent( WikiSecurityEvent.LOGIN_ANONYMOUS, getLoginPrincipal( principals ), session, request );
return true;
}
} else {
//attempt to get the user profile

try {
UserManager mgr = m_engine.getManager(UserManager.class);
UserProfile profile = mgr.getUserDatabase().findByLoginName(session.getLoginPrincipal().getName());
if (request.getSession().getAttribute("LOGINTIMESTAMPSET") == null) {
request.getSession().setAttribute("LOGINTIMESTAMPSET", "true");
String lastLoginAt = (String) profile.getAttributes().get("CURRENT_LOGIN_TIMESTAMP");
String oldIp = (String) profile.getAttributes().get("CURRENT_LOGIN_IP");
if (lastLoginAt != null) {
profile.getAttributes().put("PREVIOUS_LOGIN_TIMESTAMP", lastLoginAt);
}
if (oldIp != null) {
profile.getAttributes().put("PREVIOUS_LOGIN_IP", oldIp);
}
profile.getAttributes().put("CURRENT_LOGIN_IP", request.getRemoteAddr());
profile.getAttributes().put("CURRENT_LOGIN_TIMESTAMP", new Date().toString());
Copy link
Contributor Author

@spyhunter99 spyhunter99 Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's probably better to have this localized

try {
mgr.setUserProfile(new WikiContext(m_engine, request, ""), profile);
} catch (WikiException ex) {
LOG.warn("failed to persist last login from for " + profile.getLoginName(), ex);
}
}
} catch (Exception ex) {
LOG.debug(ex.getMessage(), ex);
}
}

// If by some unusual turn of events the Anonymous login module doesn't work, login failed!
return false;
}
Expand Down
1 change: 1 addition & 0 deletions jspwiki-main/src/main/resources/templates/default.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ fav.nomenu=Please make a {0}
fav.greet.anonymous=G’day (anonymous guest)
fav.greet.asserted=G’day, {0} (not logged in)
fav.greet.authenticated=G’day, {0} (authenticated)
fav.greet.lastLogin=Last login at {0} from {1}
fav.aggregatewiki.title=Aggregate the RSS feed of the entire wiki
fav.productstatus.updateAvailable=A software update is available.
fav.productstatus.unknown=Unable to check for product updates.
Expand Down
1 change: 1 addition & 0 deletions jspwiki-main/src/main/resources/templates/default_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,3 +748,4 @@ fav.productstatus.updateToDate=Die Software ist auf dem neuesten Stand.
attach.add.maxUpload=Maximale Uploadgr\u00f6\u00dfe:
notification.auditlog.subject=[0] Pr\u00fcfalarm
notification.auditlog.content=Klasse: [0]\nEreignisname: [1]\nTypbeschreibung: [2]\nWann: [3]\nEreignisdetails: [4]\nHeader und Verbindungsdetails: [5]
fav.greet.lastLogin=Letzter Login um {0} von {1}
1 change: 1 addition & 0 deletions jspwiki-main/src/main/resources/templates/default_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,3 +707,4 @@ attach.add.maxUpload=Tama\u00f1o m\u00e1ximo de carga:
javascript.preview.zone = Zona de previsualizaci\u00f3n
notification.auditlog.subject=[0] Alerta de auditor\u00eda
notification.auditlog.content=Clase: [0]\nNombre del evento: [1]\nDescripci\u00f3n del tipo: [2]\n\nCu\u00e1ndo: [3]\nDetalles del evento: [4]\nEncabezados y detalles de conexi\u00f3n: [5]
fav.greet.lastLogin=\u00daltimo inicio de sesi\u00f3n a las {0} desde {1}
1 change: 1 addition & 0 deletions jspwiki-main/src/main/resources/templates/default_fi.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,3 +713,4 @@ notification.auditlog.content=Luokka: [0]\nTapahtuman nimi: [1]\nTyypin kuvaus:
fav.productstatus.updateAvailable=Ohjelmistop\u00e4ivitys on saatavilla.
fav.productstatus.unknown=Tuotep\u00e4ivitysten tarkistaminen ep\u00e4onnistui.
fav.productstatus.updateToDate=Ohjelmisto on ajan tasalla.
fav.greet.lastLogin=Viimeisin kirjautuminen klo {0} osoitteesta {1}
1 change: 1 addition & 0 deletions jspwiki-main/src/main/resources/templates/default_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,3 +754,4 @@ notification.auditlog.content=Classe\u00a0: [0]\nNom de l\u2019\u00e9v\u00e9neme
fav.productstatus.updateAvailable=Une mise \u00e0 jour logicielle est disponible.
fav.productstatus.unknown=Impossible de v\u00e9rifier les mises \u00e0 jour du produit.
fav.productstatus.updateToDate=Le logiciel est \u00e0 jour.
fav.greet.lastLogin=Derni\u00e8re connexion \u00e0 {0} depuis {1}
1 change: 1 addition & 0 deletions jspwiki-main/src/main/resources/templates/default_it.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,3 +742,4 @@ notification.auditlog.content=Classe: [0]\nNome evento: [1]\nDescrizione tipo: [
fav.productstatus.updateAvailable=\u00c8 disponibile un aggiornamento software.
fav.productstatus.unknown=Impossibile verificare la presenza di aggiornamenti del prodotto.
fav.productstatus.updateToDate=Il software \u00e8 aggiornato.
fav.greet.lastLogin=Ultimo accesso alle {0} da {1}
1 change: 1 addition & 0 deletions jspwiki-main/src/main/resources/templates/default_nl.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,3 +743,4 @@ notification.auditlog.content=Klasse: [0]\nGebeurtenisnaam: [1]\nTypebeschrijvin
fav.productstatus.updateAvailable=Er is een software-update beschikbaar.
fav.productstatus.unknown=Er kan niet worden gecontroleerd op productupdates.
fav.productstatus.updateToDate=De software is up-to-date.
fav.greet.lastLogin=Laatste login om {0} vanaf {1}
1 change: 1 addition & 0 deletions jspwiki-main/src/main/resources/templates/default_pt_BR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,3 +688,4 @@ notification.auditlog.content=Classe: [0]\nNome do evento: [1]\nDescri\u00e7\u00
fav.productstatus.updateAvailable=Uma atualiza\u00e7\u00e3o de software est\u00e1 dispon\u00edvel.
fav.productstatus.unknown=N\u00e3o foi poss\u00edvel verificar se h\u00e1 atualiza\u00e7\u00f5es do produto.
fav.productstatus.updateToDate=O software est\u00e1 atualizado.
fav.greet.lastLogin=\u00daltimo login em {0} de {1}
1 change: 1 addition & 0 deletions jspwiki-main/src/main/resources/templates/default_ru.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,3 +728,4 @@ notification.auditlog.content=\u041a\u043b\u0430\u0441\u0441: [0]\n\u041d\u0430\
fav.productstatus.updateAvailable=\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u043d\u043e\u0433\u043e \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u044f.
fav.productstatus.unknown=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u043d\u0430\u043b\u0438\u0447\u0438\u0435 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0439 \u043f\u0440\u043e\u0434\u0443\u043a\u0442\u0430.
fav.productstatus.updateToDate=\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u043d\u043e\u0435 \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u0435 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u043e.
fav.greet.lastLogin=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0432\u0445\u043e\u0434 \u0432 {0} \u0438\u0437 {1}
1 change: 1 addition & 0 deletions jspwiki-main/src/main/resources/templates/default_zh_CN.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,3 +729,4 @@ notification.auditlog.content=\u7c7b\u522b\uff1a[0]\n\n\u4e8b\u4ef6\u540d\u79f0\
fav.productstatus.updateAvailable=\u8f6f\u4ef6\u66f4\u65b0\u53ef\u7528\u3002
fav.productstatus.unknown=\u65e0\u6cd5\u68c0\u67e5\u4ea7\u54c1\u66f4\u65b0\u3002
fav.productstatus.updateToDate=\u8f6f\u4ef6\u5df2\u66f4\u65b0\u81f3\u6700\u65b0\u7248\u672c\u3002
fav.greet.lastLogin=\u4e0a\u6b21\u767b\u5f55\u65f6\u95f4\u4e3a {0}\uff0c\u6765\u81ea {1}
4 changes: 2 additions & 2 deletions jspwiki-main/src/test/java/org/apache/wiki/auth/user/XMLUserDatabaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void testAttributes() throws Exception {
UserProfile profile = m_db.findByEmail( "janne@ecyrd.com" );

Map< String, Serializable > attributes = profile.getAttributes();
Assertions.assertEquals( 2, attributes.size() );
Assertions.assertTrue( attributes.size() >= 2 );
Assertions.assertTrue( attributes.containsKey( "attribute1" ) );
Assertions.assertTrue( attributes.containsKey( "attribute2" ) );
Assertions.assertEquals( "some random value", attributes.get( "attribute1" ) );
Expand All @@ -93,7 +93,7 @@ public void testAttributes() throws Exception {
// Retrieve the profile again and make sure our values got saved
profile = m_db.findByEmail( "janne@ecyrd.com" );
attributes = profile.getAttributes();
Assertions.assertEquals( 3, attributes.size() );
Assertions.assertTrue( attributes.size() >= 3 );
Assertions.assertTrue( attributes.containsKey( "attribute1" ) );
Assertions.assertTrue( attributes.containsKey( "attribute2" ) );
Assertions.assertTrue( attributes.containsKey( "attribute the third" ) );
Expand Down
28 changes: 28 additions & 0 deletions jspwiki-war/src/main/webapp/templates/default/UserBox.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
--%>

<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@page import="org.apache.wiki.auth.user.UserProfile"%>
<%@page import="org.apache.wiki.auth.UserManager"%>
<%@ taglib prefix="c" uri="jakarta.tags.core" %>
<%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
Expand All @@ -27,6 +29,16 @@
<fmt:setBundle basename="templates.default"/>
<%
Context c = Context.findContext(pageContext);
UserManager mgr = c.getEngine().getManager(UserManager.class);
UserProfile profile = mgr.getUserProfile(c.getWikiSession());
String lastLoginAt=null;
String lastLoginFrom=null;
if (profile!=null) {
lastLoginAt = (String) profile.getAttributes().get("PREVIOUS_LOGIN_TIMESTAMP");
lastLoginFrom = (String) profile.getAttributes().get("PREVIOUS_LOGIN_IP");
}


%>
<c:set var="redirect"><%= c.getEngine().encodeName(c.getName()) %></c:set>
<c:set var="username"><wiki:UserName /></c:set>
Expand Down Expand Up @@ -60,6 +72,7 @@
</wiki:UserCheck>

</li>

<wiki:UserCheck status="admin">
<li> <%
ProductUpdateChecker checker = ProductUpdateChecker.getInstance();
Expand Down Expand Up @@ -151,6 +164,21 @@
<h4><fmt:message key="actions.logout"/></h4>
<p><fmt:message key='actions.confirmlogout'/></p>
</div>
<%
if (lastLoginAt!=null && lastLoginFrom!=null) {
%>
<div class="content">
<fmt:message key="fav.greet.lastLogin">
<fmt:param><%=lastLoginAt%></fmt:param>
<fmt:param><%=lastLoginFrom%></fmt:param>
</fmt:message>

</div>
<%
}
%>


</wiki:UserCheck>
</li>
</ul>
Expand Down
Loading