Author: ito
Date: Wed Nov 17 15:48:34 2010
New Revision: 1036083
URL: http://svn.apache.org/viewvc?rev=1036083&view=rev
Log:
CLEREZZA-359: LoginListener Interface implemented in usermanager, referenced in
CookieLogin.java
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security/src/main/java/org/apache/clerezza/platform/security/auth/LoginListener.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginListener.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java?rev=1036083&r1=1036082&r2=1036083&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java
Wed Nov 17 15:48:34 2010
@@ -25,7 +25,10 @@ import java.security.AccessControlContex
import java.security.AccessController;
import java.security.Principal;
import java.security.PrivilegedAction;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import javax.security.auth.Subject;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.FormParam;
@@ -49,6 +52,7 @@ import org.osgi.service.component.Compon
import org.apache.clerezza.jaxrs.utils.RedirectUtil;
import org.apache.clerezza.jaxrs.utils.TrailingSlash;
import org.apache.clerezza.platform.security.auth.AuthenticationChecker;
+import org.apache.clerezza.platform.security.auth.LoginListener;
import org.apache.clerezza.platform.security.auth.NoSuchAgent;
import org.apache.clerezza.platform.security.auth.cookie.onotology.LOGIN;
import org.apache.clerezza.platform.typerendering.RenderletManager;
@@ -65,6 +69,8 @@ import org.apache.clerezza.web.fileserve
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.felix.scr.annotations.Service;
import org.osgi.framework.Bundle;
import org.wymiwyg.commons.util.Base64;
@@ -77,6 +83,10 @@ import org.wymiwyg.wrhapi.HandlerExcepti
*/
@Component
@Service(Object.class)
+...@reference(name="loginListener",
+ cardinality=ReferenceCardinality.OPTIONAL_MULTIPLE,
+ policy=ReferencePolicy.DYNAMIC,
+ referenceInterface=LoginListener.class)
@Property(name = "javax.ws.rs", boolValue = true)
@Path("/login")
public class CookieLogin {
@@ -87,6 +97,7 @@ public class CookieLogin {
public static final String AUTH_COOKIE_NAME = "auth";
private final Logger logger =
LoggerFactory.getLogger(CookieLogin.class);
private FileServer fileServer;
+ private final Set<LoginListener> loginListenerSet =
Collections.synchronizedSet(new HashSet<LoginListener>());
@Reference
private RenderletManager renderletManager;
@@ -180,7 +191,14 @@ public class CookieLogin {
"Username name or password are
wrong");
try {
if
(authenticationChecker.authenticate(userName,password)) {
-
+ Set<LoginListener>
tempLoginListenerSet = null;
+ synchronized(loginListenerSet) {
+ tempLoginListenerSet =
new HashSet<LoginListener>(loginListenerSet);
+ }
+ for (Iterator<LoginListener> it
= tempLoginListenerSet.iterator(); it.hasNext();) {
+ LoginListener listener
= it.next();
+
listener.userLoggedIn(userName);
+ }
ResponseBuilder responseBuilder
= Response.fromResponse(
RedirectUtil.createSeeOtherResponse(
referer, uriInfo));
@@ -227,4 +245,22 @@ public class CookieLogin {
public PathNode getStaticFile(@PathParam("path") String path) {
return fileServer.getNode(path);
}
+
+ /**
+ * Registers a <code>LoginListener</code>
+ *
+ * @param listener the listener to be registered
+ */
+ protected void bindLoginListener(LoginListener listener) {
+ loginListenerSet.add(listener);
+ }
+
+ /**
+ * Unregisters a <code>LoginListener</code>
+ *
+ * @param listener the listener to be unregistered
+ */
+ protected void unbindLoginListener(LoginListener listener) {
+ loginListenerSet.remove(listener);
+ }
}
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security/src/main/java/org/apache/clerezza/platform/security/auth/LoginListener.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security/src/main/java/org/apache/clerezza/platform/security/auth/LoginListener.java?rev=1036083&view=auto
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security/src/main/java/org/apache/clerezza/platform/security/auth/LoginListener.java
(added)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security/src/main/java/org/apache/clerezza/platform/security/auth/LoginListener.java
Wed Nov 17 15:48:34 2010
@@ -0,0 +1,35 @@
+/*
+2 * Licensed to the Apache Software Foundation (ASF) under one
+3 * or more contributor license agreements. See the NOTICE file
+4 * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.clerezza.platform.security.auth;
+
+/**
+ * A Service interface whose implementations will be notified when a user has
+ * successfully logged in.
+ *
+ * @author tio
+ */
+public interface LoginListener {
+
+ /**
+ * Notifies when a user is logged in successfully.
+ *
+ * @param userName of the user who has successfully logged in
+ */
+ public void userLoggedIn(String userName);
+}
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginListener.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginListener.java?rev=1036083&view=auto
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginListener.java
(added)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginListener.java
Wed Nov 17 15:48:34 2010
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.clerezza.platform.usermanager;
+
+import java.util.Date;
+import java.util.concurrent.locks.Lock;
+import org.apache.clerezza.platform.security.auth.LoginListener;
+import org.apache.clerezza.platform.usermanager.UserManager;
+import org.apache.clerezza.rdf.core.LiteralFactory;
+import org.apache.clerezza.rdf.ontologies.PLATFORM;
+import org.apache.clerezza.rdf.utils.GraphNode;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+
+/**
+ * Updates last login time stamp from the user who has successfully logged in.
+ *
+ *
+ * @author tio
+ */
+...@component(enabled=true, immediate=true)
+...@service(LoginListener.class)
+public class UserLoginListener implements LoginListener{
+
+ @Reference
+ UserManager userManager;
+
+ @Override
+ public void userLoggedIn(String userName) {
+ GraphNode userNode =
userManager.getUserInSystemGraph(userName);
+ Lock l = userNode.writeLock();
+ l.lock();
+ try {
+ userNode.deleteProperties(PLATFORM.lastLogin);
+ userNode.addProperty(PLATFORM.lastLogin,
LiteralFactory.getInstance().createTypedLiteral(new Date()));
+ } finally {
+ l.unlock();
+ }
+ }
+
+}
