Author: heiko.braun(a)jboss.com Date: 2008-10-06 15:52:30 -0400 (Mon, 06 Oct 2008) New Revision: 2492 Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/jboss-web.xml jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/web.xml jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/web.xml Log: Enforce BASIC auth for REST resources, re-using the jbpm-console JAAS domain Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java =================================================================== --- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java 2008-10-06 17:59:38 UTC (rev 2491) +++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java 2008-10-06 19:52:30 UTC (rev 2492) @@ -30,6 +30,8 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.servlet.http.HttpServletRequest; /** * REST server module for accessing process related data. @@ -41,8 +43,7 @@ { private ProcessDAO processDAO; - - + public ProcessManagement() { this.processDAO = DAOFactory.createProcessDefinitionDAO(); @@ -51,16 +52,25 @@ @GET @Path("definitions") @Produces("application/json") - public ProcessDefinitionWrapper getDefinitionsJSON() + public ProcessDefinitionWrapper getDefinitionsJSON( + @Context + HttpServletRequest request + ) { + System.out.println("Remote user: " + request.getRemoteUser()); return new ProcessDefinitionWrapper( processDAO.getAllProcessDefinitions() ); } @GET @Path("definitions/{id}/instances") @Produces("application/json") - public ProcessInstanceWrapper getInstancesJSON(@PathParam("id") long processId) - { + public ProcessInstanceWrapper getInstancesJSON( + @PathParam("id") + long processId, + @Context + HttpServletRequest request) + { + System.out.println("Remote user: " + request.getRemoteUser()); return new ProcessInstanceWrapper( processDAO.getInstanceByProcessDefinitionId(processId) ); } Modified: jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/jboss-web.xml 2008-10-06 17:59:38 UTC (rev 2491) +++ jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/jboss-web.xml 2008-10-06 19:52:30 UTC (rev 2492) @@ -6,7 +6,7 @@ <jboss-web> - <!--security-domain>java:/jaas/jbpm-console</security-domain--> + <security-domain>java:/jaas/jbpm-console</security-domain> <context-root>gwt-console-server</context-root> Modified: jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/web.xml =================================================================== --- jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/web.xml 2008-10-06 17:59:38 UTC (rev 2491) +++ jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/web.xml 2008-10-06 19:52:30 UTC (rev 2492) @@ -42,4 +42,27 @@ <url-pattern>/rs/*</url-pattern> </servlet-mapping> + <security-constraint> + <web-resource-collection> + <web-resource-name>Resteasy</web-resource-name> + <url-pattern>/rs/*</url-pattern> + </web-resource-collection> + <auth-constraint> + <role-name>admin</role-name> + <role-name>user</role-name> + </auth-constraint> + </security-constraint> + + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>GWT Console Server</realm-name> + </login-config> + + <security-role> + <role-name>admin</role-name> + </security-role> + <security-role> + <role-name>user</role-name> + </security-role> + </web-app> Modified: jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html =================================================================== --- jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html 2008-10-06 17:59:38 UTC (rev 2491) +++ jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html 2008-10-06 19:52:30 UTC (rev 2492) @@ -26,7 +26,7 @@ <tr> <td>GET</td> - <td><a href="/gwt-console-server/rs/process/1/instances">/rs/process/definitions/{id}/instances</a></td> + <td><a href="/gwt-console-server/rs/process/definitions/1/instances">/rs/process/definitions/{id}/instances</a></td> <td>A list of process instances for a given process definition</td> <td>application/json, text/html</td> </tr> Modified: jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/web.xml =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/web.xml 2008-10-06 17:59:38 UTC (rev 2491) +++ jbpm3/trunk/modules/gwt-console/war/src/main/webapp/WEB-INF/web.xml 2008-10-06 19:52:30 UTC (rev 2492) @@ -1,19 +1,20 @@ <!DOCTYPE web-app PUBLIC - "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd" > + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd" > <web-app> - <display-name>Archetype Created Web Application</display-name> - <servlet> - <servlet-name>HttpServlet</servlet-name> - <servlet-class>com.totsp.mavenplugin.gwt.sample.server.HttpServlet</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>HttpServlet</servlet-name> - <url-pattern>/HttpServlet</url-pattern> - </servlet-mapping> + <display-name>Archetype Created Web Application</display-name> + <servlet> + <servlet-name>HttpServlet</servlet-name> + <servlet-class>com.totsp.mavenplugin.gwt.sample.server.HttpServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>HttpServlet</servlet-name> + <url-pattern>/HttpServlet</url-pattern> + </servlet-mapping> - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> + <welcome-file-list> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + </web-app> \ No newline at end of file