Author: chathura
Date: Mon Dec 3 06:07:53 2007
New Revision: 10437
Log:
Integrating permission handling stuff to the UI.
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AuthorizationAction.java
trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
Mon Dec 3 06:07:53 2007
@@ -21,6 +21,7 @@
import org.wso2.registry.Registry;
import org.wso2.registry.Resource;
import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.ActionConstants;
import org.wso2.registry.web.UIConstants;
import org.wso2.registry.web.actions.*;
import org.wso2.registry.web.ActionInvoker;
@@ -124,8 +125,13 @@
} else if (command.equals("/tag")) {
+ String path = (String)
request.getSession().getAttribute(UIConstants.PATH_ATTR);
+ if (path == null) {
+ path = RegistryConstants.ROOT_PATH;
+ }
+
AddTagAction addTagAction = new AddTagAction();
- addTagAction.setPath(request.getParameter("resourcePath"));
+ addTagAction.setPath(path);
addTagAction.setTag(request.getParameter("tag"));
try {
@@ -133,12 +139,28 @@
} catch (Exception e) {
e.printStackTrace();
}
+
+ forwardToResources(request, response, path);
+
+ } else if (command.equals("/authorize")) {
String path = (String)
request.getSession().getAttribute(UIConstants.PATH_ATTR);
if (path == null) {
path = RegistryConstants.ROOT_PATH;
}
-
+
+ AuthorizationAction authorizationAction = new
AuthorizationAction();
+ authorizationAction.setPathToAuthorize(path);
+
authorizationAction.setUserToAuthorize(request.getParameter("userToAuthorize"));
+
authorizationAction.setActionToAuthorize(request.getParameter("actionToAuthorize"));
+
authorizationAction.setPermissionType(request.getParameter("permissionType"));
+
+ try {
+ authorizationAction.execute(request);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
forwardToResources(request, response, path);
}
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AuthorizationAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AuthorizationAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/AuthorizationAction.java
Mon Dec 3 06:07:53 2007
@@ -20,6 +20,8 @@
import org.wso2.registry.secure.RegistryUserManager;
import org.wso2.registry.ActionConstants;
+import javax.servlet.http.HttpServletRequest;
+
public class AuthorizationAction extends AbstractRegistryAction {
private String pathToAuthorize;
@@ -28,8 +30,10 @@
private String actionToAuthorize;
private String permissionType;
- public String execute() throws Exception {
+ public String execute(HttpServletRequest request) throws Exception {
+ setRequest(request);
+
SecureRegistry secureRegistry = (SecureRegistry) getRegistry();
RegistryUserManager userManager = secureRegistry.getUserManager();
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp Mon Dec
3 06:07:53 2007
@@ -1,13 +1,26 @@
+<%@ page import="org.wso2.registry.web.actions.ResourceDetailsAction" %>
+<%@ page import="org.wso2.registry.web.UIConstants" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="org.wso2.registry.web.actions.utils.Permission" %>
<a href="#" class="add-permisions">Add Permission</a>
+
+<%
+ ResourceDetailsAction resource = (ResourceDetailsAction)
request.getSession().getAttribute(UIConstants.RESOURCE_BEAN);
+%>
<table width="100%" border="0" cellpadding="5" cellspacing="0"
bgcolor="#ECECEC">
<tr>
- <form action="Authorization.action" theme="simple" method="post">
+ <form action="/wso2registry/system/authorize" theme="simple"
method="post">
<input type="hidden" name="pathToAuthorize" value="%{path}"/>
<td>User</td>
<td>
<select name="userToAuthorize">
- <option>user1</option>
- <option>user2</option>
+ <%
+ Iterator iUsers =
resource.getUserNames().iterator();
+ while (iUsers.hasNext()) {
+ String regUser = (String) iUsers.next();
+ %>
+ <option value="<%=regUser%>"><%=regUser%></option>
+ <% } %>
</select>
</td>
@@ -46,17 +59,22 @@
<th align="center">Deny</th>
</tr>
- <s:iterator value="userPermissions">
+ <%
+ Iterator iUserPermissions =
resource.getUserPermissions().iterator();
+ while (iUserPermissions.hasNext()) {
+ Permission permission = (Permission)
iUserPermissions.next();
+ %>
+
<tr>
- <td><s:property value="userName"/></td>
- <td width="100"><input type="checkbox" name="readAllow"
value="readAllow"/></td>
- <td width="100"><input type="checkbox" name="readDeny"
value="readDeny"/></td>
- <td width="100"><input type="checkbox" name="writeAllow"
value="writeAllow"/></td>
- <td width="100"><input type="checkbox" name="writeDeny"
value="writeDeny"/></td>
- <td width="100"><input type="checkbox" name="deleteAllow"
value="deleteAllow"/></td>
- <td width="100"><input type="checkbox" name="deleteDeny"
value="deleteDeny"/></td>
+ <td><%=permission.getUserName()%></td>
+ <td width="100"><input type="checkbox" name="readAllow" <%
if (permission.isReadAllow()) { %> checked <% } %>/></td>
+ <td width="100"><input type="checkbox" name="readDeny" <%
if (permission.isReadDeny()) { %> checked <% } %>/></td>
+ <td width="100"><input type="checkbox" name="writeAllow"
<% if (permission.isWriteAllow()) { %> checked <% } %>/></td>
+ <td width="100"><input type="checkbox" name="writeDeny" <%
if (permission.isWriteDeny()) { %> checked <% } %>/></td>
+ <td width="100"><input type="checkbox" name="deleteAllow"
<% if (permission.isDeleteAllow()) { %> checked <% } %>/></td>
+ <td width="100"><input type="checkbox" name="deleteDeny"
<% if (permission.isDeleteDeny()) { %> checked <% } %>/></td>
</tr>
- </s:iterator>
+ <% } %>
<tr>
<td> </td>
<td> </td>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
