X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Finternal%2FCurrentUser.java;h=f9eff6ff92084d191c140c90d21322b05824be02;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=638eb03a59e14c3b209f8f4a7ce257f6f7c5c761;hpb=2f510fb09e18bc3d3e902c8131d0037763c5f279;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/internal/CurrentUser.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/internal/CurrentUser.java
index 638eb03a5..f9eff6ff9 100644
--- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/internal/CurrentUser.java
+++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/internal/CurrentUser.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed 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.argeo.security.ui.internal;
 
 import java.security.AccessController;
@@ -12,6 +27,10 @@ import org.argeo.ArgeoException;
 import org.springframework.security.Authentication;
 import org.springframework.security.GrantedAuthority;
 
+/**
+ * Retrieves information about the current user. Not an API, can change without
+ * notice.
+ */
 public class CurrentUser {
 	public final static String getUsername() {
 		Subject subject = getSubject();
@@ -23,22 +42,29 @@ public class CurrentUser {
 	}
 
 	public final static Set<String> roles() {
-		Principal principal = getSubject().getPrincipals(Authentication.class)
-				.iterator().next();
-		Authentication authentication = (Authentication) principal;
 		Set<String> roles = Collections.synchronizedSet(new HashSet<String>());
+		Authentication authentication = getAuthentication();
 		for (GrantedAuthority ga : authentication.getAuthorities()) {
 			roles.add(ga.getAuthority());
 		}
 		return Collections.unmodifiableSet(roles);
 	}
 
-	public final static Subject getSubject() {
+	public final static Authentication getAuthentication() {
+		Set<Authentication> authens = getSubject().getPrincipals(
+				Authentication.class);
+		if (authens != null && !authens.isEmpty()) {
+			Principal principal = authens.iterator().next();
+			Authentication authentication = (Authentication) principal;
+			return authentication;
+		}
+		throw new ArgeoException("No authentication found");
+	}
 
+	public final static Subject getSubject() {
 		Subject subject = Subject.getSubject(AccessController.getContext());
 		if (subject == null)
 			throw new ArgeoException("Not authenticated.");
 		return subject;
-
 	}
 }