You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/01/14 23:29:32 UTC

isis git commit: ISIS-999 Add a service for logging session events (login, logout/expiration)

Repository: isis
Updated Branches:
  refs/heads/ISIS-999-log-session-data [created] f3f1514ff


ISIS-999 Add a service for logging session events (login, logout/expiration)

TODO: add javadoc


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f3f1514f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f3f1514f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f3f1514f

Branch: refs/heads/ISIS-999-log-session-data
Commit: f3f1514ff2fa4f3acca2dbb1e351de05d5633a43
Parents: 571bde0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jan 15 00:28:29 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jan 15 00:28:29 2015 +0200

----------------------------------------------------------------------
 .../wicket/AuthenticatedWebSessionForIsis.java  | 45 +++++++++++++++++++-
 .../services/session/SessionLoggingService.java | 44 +++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/f3f1514f/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index 03dcac7..c65a277 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -24,8 +24,11 @@ import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
+import java.util.concurrent.Callable;
 
+import org.apache.isis.applib.services.session.SessionLoggingService;
 import org.apache.wicket.Session;
 import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
 import org.apache.wicket.authroles.authorization.strategies.role.Roles;
@@ -43,6 +46,7 @@ import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
 import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
 import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
 import org.apache.isis.viewer.wicket.ui.pages.BookmarkedPagesModelProvider;
+import org.apache.wicket.request.cycle.RequestCycle;
 
 /**
  * Viewer-specific implementation of {@link AuthenticatedWebSession}, which
@@ -74,7 +78,25 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
         AuthenticationRequest authenticationRequest = new AuthenticationRequestPassword(username, password);
         authenticationRequest.setRoles(Arrays.asList(USER_ROLE));
         authenticationSession = getAuthenticationManager().authenticate(authenticationRequest);
-        return authenticationSession != null;
+        if (authenticationSession != null) {
+            log(SessionLoggingService.Type.LOGIN, username, SessionLoggingService.CausedBy.USER);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public void onInvalidate() {
+        super.onInvalidate();
+
+        SessionLoggingService.CausedBy causedBy = RequestCycle.get() != null
+                ? SessionLoggingService.CausedBy.USER
+                : SessionLoggingService.CausedBy.SESSION_EXPIRATION;
+
+        String userName = authenticationSession.getUserName();
+
+        log(SessionLoggingService.Type.LOGOUT, userName, causedBy);
     }
 
     @Override
@@ -125,5 +147,26 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
             cast.setAuthenticationSessionProvider(this);
         }
     }
+
+    private void log(final SessionLoggingService.Type type, final String username, final SessionLoggingService.CausedBy causedBy) {
+        final SessionLoggingService sessionLoggingService = getSessionLoggingService();
+        if (sessionLoggingService != null) {
+            IsisContext.doInSession(new Runnable() {
+                @Override
+                public void run() {
+                    sessionLoggingService.log(type, username, new Date(), causedBy);
+                }
+            });
+        }
+    }
+
+    protected SessionLoggingService getSessionLoggingService() {
+        return IsisContext.doInSession(new Callable<SessionLoggingService>() {
+            @Override
+            public SessionLoggingService call() throws Exception {
+                return IsisContext.getPersistenceSession().getServicesInjector().lookupService(SessionLoggingService.class);
+            }
+        });
+    }
     
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/f3f1514f/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java b/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
new file mode 100644
index 0000000..7f603ac
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
@@ -0,0 +1,44 @@
+package org.apache.isis.applib.services.session;
+
+import java.util.Date;
+
+import org.apache.isis.applib.annotation.Programmatic;
+
+/**
+ *
+ */
+public interface SessionLoggingService {
+
+    public enum Type {
+        LOGIN,
+        LOGOUT
+    }
+
+    public enum CausedBy {
+        USER,
+        SESSION_EXPIRATION
+    }
+
+    @Programmatic
+    void log(Type type, String username, Date date, CausedBy causedBy);
+
+
+    public static class Stderr implements SessionLoggingService {
+
+        @Override
+        public void log(Type type, String username, Date date, CausedBy causedBy) {
+            StringBuilder logMessage = new StringBuilder();
+            logMessage.append("User '").append(username).append("' has logged ");
+            if (type == Type.LOGIN) {
+                logMessage.append("in");
+            } else {
+                logMessage.append("out");
+            }
+            logMessage.append(" at '").append(date).append("'.");
+            if (causedBy == CausedBy.SESSION_EXPIRATION) {
+                logMessage.append("Cause: session expiration");
+            }
+            System.err.println(logMessage);
+        }
+    }
+}