X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui.rap%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Frap%2FSecureEntryPoint.java;fp=security%2Fplugins%2Forg.argeo.security.ui.rap%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Frap%2FSecureEntryPoint.java;h=8e377e09998ccdc1ec0f4f468e6d622dc201f01c;hb=118878eb12c8e142da7648cae3880754b34798b2;hp=4d85cc869318d78cd8d7eae7e54ea897919fcab8;hpb=528580a33f630f79c61caa1378b581cc13b2b8ed;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java
index 4d85cc869..8e377e099 100644
--- a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java
+++ b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java
@@ -7,6 +7,7 @@ import javax.security.auth.login.LoginException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.ArgeoException;
 import org.eclipse.equinox.security.auth.ILoginContext;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.rwt.RWT;
@@ -51,37 +52,60 @@ public class SecureEntryPoint implements IEntryPoint {
 		final ILoginContext loginContext = SecureRapActivator
 				.createLoginContext();
 		Subject subject = null;
-		tryLogin: while (subject == null) {
+		tryLogin: while (subject == null && !display.isDisposed()) {
 			try {
 				loginContext.login();
 				subject = loginContext.getSubject();
 			} catch (LoginException e) {
-				if (e.getCause() != null) {
-					Throwable firstCause = e.getCause();
-					// log.error("Cause", firstCause);
-					if (firstCause instanceof LoginException
-							&& firstCause.getCause() != null) {
-						Throwable secondCause = firstCause.getCause();
-						if (secondCause instanceof BadCredentialsException) {
-							MessageDialog.openInformation(
-									display.getActiveShell(),
-									"Bad Credentials",
-									"Your credentials are incorrect");
-							// retry login
-							continue tryLogin;
-						} else if (secondCause instanceof ThreadDeath) {
-							// rethrow thread death caused by dialog UI timeout
-							throw (ThreadDeath) secondCause;
-						}
-
-					} else if (firstCause instanceof ThreadDeath) {
-						throw (ThreadDeath) firstCause;
-					}
+				BadCredentialsException bce = wasCausedByBadCredentials(e);
+				if (bce != null) {
+					MessageDialog.openInformation(display.getActiveShell(),
+							"Bad Credentials", bce.getMessage());
+					// retry login
+					continue tryLogin;
+				}
+
+				// check thread death
+				ThreadDeath td = wasCausedByThreadDeath(e);
+				if (td != null) {
+					display.dispose();
+					throw td;
+				}
+
+				// if (e.getCause() != null) {
+				// Throwable firstCause = e.getCause();
+				// // log.error("Cause", firstCause);
+				// if (firstCause instanceof LoginException
+				// && firstCause.getCause() != null) {
+				// Throwable secondCause = firstCause.getCause();
+				// if (secondCause instanceof BadCredentialsException) {
+				// MessageDialog.openInformation(
+				// display.getActiveShell(),
+				// "Bad Credentials",
+				// "Your credentials are incorrect");
+				// // retry login
+				// continue tryLogin;
+				// } else if (secondCause instanceof ThreadDeath) {
+				// // rethrow thread death caused by dialog UI timeout
+				// throw (ThreadDeath) secondCause;
+				// }
+				//
+				// } else if (firstCause instanceof ThreadDeath) {
+				// throw (ThreadDeath) firstCause;
+				// }
+				// }
+
+				if (!display.isDisposed()) {
+					org.argeo.eclipse.ui.Error.show(
+							"Unexpected exception during authentication", e);
+					// this was not just bad credentials or death thread
+					RWT.getRequest().getSession().setMaxInactiveInterval(1);
+					display.dispose();
+					return -1;
+				} else {
+					throw new ArgeoException(
+							"Unexpected exception during authentication", e);
 				}
-				// this was not just bad credentials returns
-				RWT.getRequest().getSession().setMaxInactiveInterval(1);
-				display.dispose();
-				return -1;
 			}
 		}
 
@@ -99,13 +123,6 @@ public class SecureEntryPoint implements IEntryPoint {
 			public void run() {
 				log.debug("Display disposed");
 				logout(loginContext, username);
-				// invalidate session
-				//RWT.getRequest().getSession().setMaxInactiveInterval(1);
-				try {
-					Thread.sleep(2000);
-				} catch (InterruptedException e1) {
-					// silent
-				}
 			}
 		});
 
@@ -121,6 +138,31 @@ public class SecureEntryPoint implements IEntryPoint {
 		return processReturnCode(returnCode);
 	}
 
+	/** Recursively look for {@link BadCredentialsException} in the root causes. */
+	private BadCredentialsException wasCausedByBadCredentials(Throwable t) {
+		if (t instanceof BadCredentialsException)
+			return (BadCredentialsException) t;
+
+		if (t.getCause() != null)
+			return wasCausedByBadCredentials(t.getCause());
+		else
+			return null;
+	}
+
+	/**
+	 * If there is a {@link ThreadDeath} in the root causes, rethrow it
+	 * (important for RAP cleaning mechanism)
+	 */
+	protected ThreadDeath wasCausedByThreadDeath(Throwable t) {
+		if (t instanceof ThreadDeath)
+			return (ThreadDeath) t;
+
+		if (t.getCause() != null)
+			return wasCausedByThreadDeath(t.getCause());
+		else
+			return null;
+	}
+
 	protected void logout(ILoginContext secureContext, String username) {
 		try {
 			secureContext.logout();