From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 30 Jan 2011 19:34:56 +0000 (+0000)
Subject: Make security UI more robust
X-Git-Tag: argeo-commons-2.1.30~1477
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=d685633924a5ee0328f5053b375564ca8fe969e6;p=lgpl%2Fargeo-commons.git

Make security UI more robust

git-svn-id: https://svn.argeo.org/commons/trunk@4099 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/security/eclipse/plugins/org.argeo.security.ui/META-INF/spring/commands.xml b/security/eclipse/plugins/org.argeo.security.ui/META-INF/spring/commands.xml
index 6c0421328..a89876ad1 100644
--- a/security/eclipse/plugins/org.argeo.security.ui/META-INF/spring/commands.xml
+++ b/security/eclipse/plugins/org.argeo.security.ui/META-INF/spring/commands.xml
@@ -16,4 +16,6 @@
 		scope="prototype">
 		<property name="securityService" ref="securityService" />
 	</bean>
+	<bean id="org.argeo.security.ui.refreshUsersList" class="org.argeo.security.ui.commands.RefreshUsersList"
+		scope="prototype" />
 </beans>
diff --git a/security/eclipse/plugins/org.argeo.security.ui/icons/refresh.png b/security/eclipse/plugins/org.argeo.security.ui/icons/refresh.png
new file mode 100644
index 000000000..bb3803b07
Binary files /dev/null and b/security/eclipse/plugins/org.argeo.security.ui/icons/refresh.png differ
diff --git a/security/eclipse/plugins/org.argeo.security.ui/plugin.xml b/security/eclipse/plugins/org.argeo.security.ui/plugin.xml
index 354c3215e..3a741cb09 100644
--- a/security/eclipse/plugins/org.argeo.security.ui/plugin.xml
+++ b/security/eclipse/plugins/org.argeo.security.ui/plugin.xml
@@ -100,6 +100,11 @@
             id="org.argeo.security.ui.openChangePasswordDialog"
             name="OpenChangePasswordDialog">
       </command>
+      <command
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            id="org.argeo.security.ui.refreshUsersList"
+            name="refreshUsersList">
+      </command>
     </extension>
      <extension
          point="org.eclipse.ui.menus">
@@ -120,6 +125,12 @@
                   label="Add User"
                   tooltip="Add new user">
             </command>
+            <command
+                  commandId="org.argeo.security.ui.refreshUsersList"
+                  icon="icons/refresh.png"
+                  label="Refresh"
+                  tooltip="Refresh user list">
+            </command>
         </menuContribution>
         <menuContribution
                 allPopups="false"
diff --git a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityPerspective.java b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityPerspective.java
index bf404ce6f..9187c7830 100644
--- a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityPerspective.java
+++ b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityPerspective.java
@@ -1,12 +1,24 @@
 package org.argeo.security.ui;
 
+import org.argeo.security.equinox.CurrentUser;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 
 public class SecurityPerspective implements IPerspectiveFactory {
+	private String adminRole = "ROLE_ADMIN";
 
 	public void createInitialLayout(IPageLayout layout) {
+		if (!CurrentUser.roles().contains(adminRole)) {
+			MessageDialog
+					.openError(Display.getCurrent().getActiveShell(),
+							"Forbidden",
+							"You are not allowed to access this resource.");
+			return;
+		}
+
 		String editorArea = layout.getEditorArea();
 		layout.setEditorAreaVisible(true);
 		layout.setFixed(false);
@@ -16,7 +28,11 @@ public class SecurityPerspective implements IPerspectiveFactory {
 
 		left.addView("org.argeo.security.ui.usersView");
 		left.addView("org.argeo.security.ui.rolesView");
-		//left.addView("org.argeo.security.ui.currentUserView");
+		// left.addView("org.argeo.security.ui.currentUserView");
+	}
+
+	public void setAdminRole(String adminRole) {
+		this.adminRole = adminRole;
 	}
 
 }
diff --git a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/RefreshUsersList.java b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/RefreshUsersList.java
new file mode 100644
index 000000000..a385eb995
--- /dev/null
+++ b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/RefreshUsersList.java
@@ -0,0 +1,20 @@
+package org.argeo.security.ui.commands;
+
+import org.argeo.security.ui.views.UsersView;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/** Refresh the main EBI list. */
+public class RefreshUsersList extends AbstractHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		UsersView view = (UsersView) HandlerUtil
+				.getActiveWorkbenchWindow(event).getActivePage()
+				.findView(UsersView.ID);
+		view.refresh();
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/SaveArgeoUser.java b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/SaveArgeoUser.java
index d28761989..7d817435e 100644
--- a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/SaveArgeoUser.java
+++ b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/SaveArgeoUser.java
@@ -3,6 +3,8 @@ package org.argeo.security.ui.commands;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.handlers.HandlerUtil;
@@ -21,7 +23,8 @@ public class SaveArgeoUser extends AbstractHandler {
 			IEditorPart editor = (IEditorPart) iwp;
 			editor.doSave(null);
 		} catch (Exception e) {
-			throw new ExecutionException("Cannot save user", e);
+			MessageDialog.openError(Display.getDefault().getActiveShell(),
+					"Error", "Cannot save user: " + e.getMessage());
 		}
 		return null;
 	}
diff --git a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java
index 7c0213704..1cc41783c 100644
--- a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java
+++ b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java
@@ -1,7 +1,5 @@
 package org.argeo.security.ui.editors;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.security.ArgeoSecurityService;
 import org.argeo.security.ArgeoUser;
@@ -15,8 +13,6 @@ import org.eclipse.ui.forms.editor.FormEditor;
 
 /** Editor for an Argeo user. */
 public class ArgeoUserEditor extends FormEditor {
-	private final static Log log = LogFactory.getLog(ArgeoUserEditor.class);
-
 	public final static String ID = "org.argeo.security.ui.argeoUserEditor";
 
 	private ArgeoUser user;
diff --git a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java
index 2887edaa6..ee63e24db 100644
--- a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java
+++ b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java
@@ -42,9 +42,9 @@ import org.eclipse.ui.forms.widgets.Section;
 public class DefaultUserMainPage extends FormPage {
 	final static String ID = "argeoUserEditor.mainPage";
 
+	private final static Log log = LogFactory.getLog(DefaultUserMainPage.class);
 	private final static Image ROLE_CHECKED = SecurityUiPlugin
 			.getImageDescriptor("icons/security.gif").createImage();
-	private final static Log log = LogFactory.getLog(ArgeoUserEditor.class);
 
 	private ArgeoUser user;
 	private SimpleUserNature simpleNature;
@@ -119,8 +119,8 @@ public class DefaultUserMainPage extends FormPage {
 				simpleNature.setEmail(email.getText());
 				simpleNature.setDescription(description.getText());
 				super.commit(onSave);
-				if (log.isDebugEnabled())
-					log.debug("General part committed");
+				if (log.isTraceEnabled())
+					log.trace("General part committed");
 			}
 		};
 		firstName.addModifyListener(new FormPartML(part));
@@ -146,8 +146,8 @@ public class DefaultUserMainPage extends FormPage {
 			public void commit(boolean onSave) {
 				// roles have already been modified in editing
 				super.commit(onSave);
-				if (log.isDebugEnabled())
-					log.debug("Role part committed");
+				if (log.isTraceEnabled())
+					log.trace("Role part committed");
 			}
 		};
 		getManagedForm().addPart(part);
diff --git a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/UsersView.java b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/UsersView.java
index 6aad5d06a..a00bbc285 100644
--- a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/UsersView.java
+++ b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/UsersView.java
@@ -34,6 +34,8 @@ import org.eclipse.ui.part.ViewPart;
 
 /** List all users. */
 public class UsersView extends ViewPart {
+	public final static String ID = "org.argeo.security.ui.usersView";
+
 	private TableViewer viewer;
 	private ArgeoSecurityService securityService;
 
@@ -80,6 +82,10 @@ public class UsersView extends ViewPart {
 		this.simpleNatureType = simpleNatureType;
 	}
 
+	public void refresh() {
+		viewer.refresh();
+	}
+
 	private class UsersContentProvider implements IStructuredContentProvider {
 
 		public Object[] getElements(Object inputElement) {
diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
index 1785357d5..edd7e2bf3 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
@@ -26,7 +26,6 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.security.ArgeoUser;
 import org.argeo.security.SimpleArgeoUser;
 import org.argeo.security.UserNature;
-import org.argeo.security.nature.SimpleUserNature;
 import org.springframework.security.Authentication;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java
index e97180351..d6ff69cc2 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java
@@ -72,7 +72,7 @@ public class DefaultSecurityService implements ArgeoSecurityService {
 	}
 
 	public void newUser(ArgeoUser user) {
-		user.getUserNatures().clear();
+//		user.getUserNatures().clear();
 		argeoSecurity.beforeCreate(user);
 		securityDao.create(user);
 	}