Menu
▾
▴
[Drawbridge-developers] SF.net SVN: drawbridge: [47] trunk/drawbridge
|
From: <ac...@us...> - 2008-04-23 00:48:53
|
Revision: 47
http://drawbridge.svn.sourceforge.net/drawbridge/?rev=47&view=rev
Author: acresse
Date: 2008-04-22 17:48:51 -0700 (Tue, 22 Apr 2008)
Log Message:
-----------
how you like them permissions?
Modified Paths:
--------------
trunk/drawbridge/WebContent/js/drawbridge.js
trunk/drawbridge/src/java/net/sf/drawbridge/domain/SecureDrawbridgeService.java
trunk/drawbridge/src/java/net/sf/drawbridge/vo/Permission.java
trunk/drawbridge/src/test/net/sf/drawbridge/domain/SecureDrawbridgeServiceTest.java
Added Paths:
-----------
trunk/drawbridge/WebContent/WEB-INF/jsp/permissions/
trunk/drawbridge/WebContent/WEB-INF/jsp/permissions/manage.jsp
trunk/drawbridge/src/java/net/sf/drawbridge/controller/permissions/
trunk/drawbridge/src/java/net/sf/drawbridge/controller/permissions/ManagePermissionsController.java
Added: trunk/drawbridge/WebContent/WEB-INF/jsp/permissions/manage.jsp
===================================================================
--- trunk/drawbridge/WebContent/WEB-INF/jsp/permissions/manage.jsp (rev 0)
+++ trunk/drawbridge/WebContent/WEB-INF/jsp/permissions/manage.jsp 2008-04-23 00:48:51 UTC (rev 47)
@@ -0,0 +1,94 @@
+<%--
+This file is part of DrawBridge.
+Copyright 2008 Adam Cresse
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 2 as published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation,Inc.,51 Franklin Street,Fifth Floor, Boston, MA 02110-1301, USA.
+--%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="display" uri="http://displaytag.sf.net"%>
+<%@page import="net.sf.drawbridge.vo.Permission"%>
+<%@ include file="../header.jsp" %>
+<script language="JavaScript" src="js/drawbridge.js" />
+
+<div id="instructions">
+Please choose a group to continue.
+</div>
+<br>
+<form action="AddOrEditPermissionsSubmit.do" method="post">
+<table cellspacing="10">
+ <tr valign="top">
+ <td>
+ Group:
+ <select id="groupSelect" name="groupId" onchange="handleGroupChange()">
+ <option>Select a Group</option>
+ <c:forEach items="${groupList}" var="group">
+ <option value="<c:out value="${group.id}"/>" ><c:out value="${group.groupName}"/></option>
+ </c:forEach>
+ </select>
+ <br>
+ <div id="databaseDiv" style="visibility: hidden">
+ Database:
+ <select id="databaseSelect" name="databaseId" onchange="handleDatabaseChange()">
+ <option>Select a Database</option>
+ <c:forEach items="${databaseList}" var="database">
+ <option value="<c:out value="${database.id}"/>" ><c:out value="${database.name}"/></option>
+ </c:forEach>
+ </select>
+ </div>
+ <div id="runAsDiv" style="visibility: hidden">
+ Run-as Account:
+ <select id="runAsSelect" name="runAsId" onchange="handleRunAsChange()">
+ <option>Select an Account</option>
+ <option>Select an Account</option>
+ <%--
+ <c:forEach items="${runAsList}" var="runAs">
+ <option value="<c:out value="${runAs.id}"/>" ><c:out value="${runAs.userName}"/></option>
+ </c:forEach>
+ --%>
+ </select>
+ </div>
+ <div id="submitDiv" style="visibility: hidden">
+ <input type="Submit" value="Update Permissions"/>
+ </div>
+ </td>
+ <td>
+ <div id="systemDiv" style="visibility: hidden">
+ System Permissions:<br>
+ <ul>
+ <c:forEach items="${systemPermissionList}" var="permission">
+ <input type="checkbox" value="<c:out value="${permission.id}"/>" ><c:out value="${permission.name}"/><br/>
+ </c:forEach>
+ </ul>
+ </div>
+ </td>
+ <td>
+ <div id="permissionsDiv" style="visibility: hidden">
+ Run-as Account Permissions:<br>
+ <ul>
+ <c:forEach items="${runAsPermissionList}" var="permission">
+ <input type="checkbox" value="<c:out value="${permission.id}"/>" ><c:out value="${permission.name}"/><br/>
+ </c:forEach>
+ </ul>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="right">
+ </td>
+ </tr>
+</table>
+</form>
+
+<%@ include file="../footer.jsp" %>
\ No newline at end of file
Modified: trunk/drawbridge/WebContent/js/drawbridge.js
===================================================================
--- trunk/drawbridge/WebContent/js/drawbridge.js 2008-04-22 02:06:41 UTC (rev 46)
+++ trunk/drawbridge/WebContent/js/drawbridge.js 2008-04-23 00:48:51 UTC (rev 47)
@@ -1,3 +1,38 @@
function confirmDelete(type, name){
return window.confirm('Are you sure you want to delete '+type+': '+name+"?");
}
+
+function handleGroupChange(){
+ isFirst=isFirstSelected('groupSelect');
+ setVisibility('systemDiv',isFirst);
+ setVisibility('databaseDiv',isFirst);
+ setVisibility('submitDiv',isFirst);
+ if(isFirst){
+ setVisibility('runAsDiv',false);
+ setVisibility('permissionsDiv',false);
+ }
+}
+
+function handleDatabaseChange(){
+ isFirst=isFirstSelected('databaseSelect');
+ setVisibility('runAsDiv',isFirst);
+ if(isFirst){
+ setVisibility('permissionsDiv',false);
+ }
+}
+
+function handleRunAsChange(){
+ isFirst=isFirstSelected('runAsSelect');
+ setVisibility('permissionsDiv',isFirst);
+}
+
+function isFirstSelected(id){
+ select=document.getElementById(id);
+ index=select.selectedIndex;
+ return index!=0;
+}
+
+function setVisibility(id, isVisible){
+ div=document.getElementById(id);
+ div.style.visibility=isVisible?'visible':'hidden';
+}
Added: trunk/drawbridge/src/java/net/sf/drawbridge/controller/permissions/ManagePermissionsController.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/controller/permissions/ManagePermissionsController.java (rev 0)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/controller/permissions/ManagePermissionsController.java 2008-04-23 00:48:51 UTC (rev 47)
@@ -0,0 +1,46 @@
+package net.sf.drawbridge.controller.permissions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.drawbridge.controller.AbstractDrawbridgeController;
+import net.sf.drawbridge.vo.Permission;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+public class ManagePermissionsController extends AbstractDrawbridgeController {
+
+ @RequestMapping(value="/ManagePermissions.do")
+ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
+ ModelAndView mav=new ModelAndView("permissions/manage");
+ mav.addObject("groupList", drawbridgeService.listGroups());
+ mav.addObject("databaseList", drawbridgeService.listDatabases());
+
+ List<Permission> systemPermissionList=new ArrayList<Permission>();
+ systemPermissionList.add(Permission.SYSTEM_USER_MANAGE);
+ systemPermissionList.add(Permission.SYSTEM_USER_GRANT);
+ systemPermissionList.add(Permission.SYSTEM_DATABASE_MANAGE);
+ systemPermissionList.add(Permission.SYSTEM_DATABASE_GRANT);
+ mav.addObject("systemPermissionList", systemPermissionList);
+
+ List<Permission> runAsPermissionList=new ArrayList<Permission>();
+ runAsPermissionList.add(Permission.RUNAS_JOB_SUBMIT);
+ runAsPermissionList.add(Permission.RUNAS_JOB_RUN);
+ runAsPermissionList.add(Permission.RUNAS_JOB_REVIEW);
+ runAsPermissionList.add(Permission.RUNAS_JOB_APPROVE);
+ runAsPermissionList.add(Permission.RUNAS_JOB_DELETE);
+ runAsPermissionList.add(Permission.RUNAS_JOB_ACTIVATE);
+ runAsPermissionList.add(Permission.RUNAS_JOB_NO_REVIEW_NEEDED);
+ runAsPermissionList.add(Permission.RUNAS_JOB_NO_APPROVAL_NEEDED);
+ mav.addObject("runAsPermissionList", runAsPermissionList);
+
+ return mav;
+ }
+
+}
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/domain/SecureDrawbridgeService.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/domain/SecureDrawbridgeService.java 2008-04-22 02:06:41 UTC (rev 46)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/domain/SecureDrawbridgeService.java 2008-04-23 00:48:51 UTC (rev 47)
@@ -34,73 +34,73 @@
}
public void addUser(User user, ExecutionContext context) {
- if(checkPermission(context, Permission.SYSTEM_USER_ADD)){
+ if(checkPermission(context, Permission.SYSTEM_USER_MANAGE)){
insecureService.addUser(user, context);
}
}
public void updateUser(User newUser, ExecutionContext context) {
- if(checkPermission(context, Permission.SYSTEM_USER_EDIT)){
+ if(checkPermission(context, Permission.SYSTEM_USER_MANAGE)){
insecureService.updateUser(newUser, context);
}
}
public void deleteUser(Integer userId, ExecutionContext context) {
- if(checkPermission(context, Permission.SYSTEM_USER_DELETE)){
+ if(checkPermission(context, Permission.SYSTEM_USER_MANAGE)){
insecureService.deleteUser(userId, context);
}
}
public void addGroup(Group group, ExecutionContext context) {
- if(checkPermission(context, Permission.SYSTEM_GROUP_ADD)){
+ if(checkPermission(context, Permission.SYSTEM_USER_MANAGE)){
insecureService.addGroup(group, context);
}
}
public void updateGroup(Group newGroup, ExecutionContext context) {
- if(checkPermission(context, Permission.SYSTEM_GROUP_EDIT)){
+ if(checkPermission(context, Permission.SYSTEM_USER_MANAGE)){
insecureService.updateGroup(newGroup, context);
}
}
public void deleteGroup(Integer groupId, ExecutionContext context) {
- if(checkPermission(context, Permission.SYSTEM_GROUP_DELETE)){
+ if(checkPermission(context, Permission.SYSTEM_USER_MANAGE)){
insecureService.deleteGroup(groupId, context);
}
}
public void addDriver(Driver driver, ExecutionContext context) {
- if(checkPermission(context, Permission.SYSTEM_DRIVER_ADD)){
+ if(checkPermission(context, Permission.SYSTEM_DATABASE_MANAGE)){
insecureService.addDriver(driver, context);
}
}
public void updateDriver(Driver newDriver, ExecutionContext context) {
- if(checkPermission(context, Permission.SYSTEM_DRIVER_EDIT)){
+ if(checkPermission(context, Permission.SYSTEM_DATABASE_MANAGE)){
insecureService.updateDriver(newDriver, context);
}
}
public void deleteDriver(Integer driverId, ExecutionContext context) {
- if(checkPermission(context, Permission.SYSTEM_DRIVER_DELETE)){
+ if(checkPermission(context, Permission.SYSTEM_DATABASE_MANAGE)){
insecureService.deleteDriver(driverId, context);
}
}
public void addDatabase(Database database, ExecutionContext context) {
- if(checkPermission(context, Permission.SYSTEM_DATABASE_ADD)){
+ if(checkPermission(context, Permission.SYSTEM_DATABASE_MANAGE)){
insecureService.addDatabase(database, context);
}
}
public void updateDatabase(Database newDatabase, ExecutionContext context) {
- if(checkPermission(context, Permission.SYSTEM_DATABASE_EDIT)){
+ if(checkPermission(context, Permission.SYSTEM_DATABASE_MANAGE)){
insecureService.updateDatabase(newDatabase, context);
}
}
public void deleteDatabase(Integer databaseId, ExecutionContext context) {
- if(checkPermission(context, Permission.SYSTEM_DATABASE_DELETE)){
+ if(checkPermission(context, Permission.SYSTEM_DATABASE_MANAGE)){
insecureService.deleteDatabase(databaseId, context);
}
}
Modified: trunk/drawbridge/src/java/net/sf/drawbridge/vo/Permission.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/vo/Permission.java 2008-04-22 02:06:41 UTC (rev 46)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/vo/Permission.java 2008-04-23 00:48:51 UTC (rev 47)
@@ -1,40 +1,22 @@
package net.sf.drawbridge.vo;
+
public enum Permission {
+
+ SYSTEM_USER_MANAGE(1,"User Setup",'S'),
+ SYSTEM_DATABASE_MANAGE(2,"Database Setup",'S'),
+ SYSTEM_USER_GRANT(3,"Grant User Setup",'S'),
+ SYSTEM_DATABASE_GRANT(4,"Grant Database Setup",'S'),
- SYSTEM_USER_ADD(1,"ADD USER",'S'),//
- SYSTEM_USER_EDIT(2,"EDIT USER",'S'),//
- SYSTEM_USER_DELETE(3,"DELETE USER",'S'),//
- SYSTEM_GROUP_ADD(4,"ADD GROUP",'S'),//
- SYSTEM_GROUP_EDIT(5,"EDIT GROUP",'S'),//
- SYSTEM_GROUP_DELETE(6,"DELETE GROUP",'S'),//
- SYSTEM_USER_GROUP_ADD(7,"ADD USER TO GROUP",'S'),
- SYSTEM_USER_GROUP_DELETE(8,"REMOVE USER FROM GROUP",'S'),
- SYSTEM_DRIVER_ADD(9,"ADD DRIVER",'S'),//
- SYSTEM_DRIVER_EDIT(10,"EDIT DRIVER",'S'),//
- SYSTEM_DRIVER_DELETE(11,"DELETE DRIVER",'S'),//
- SYSTEM_DATABASE_ADD(12,"ADD DATABASE",'S'),//
- SYSTEM_DATABASE_EDIT(13,"EDIT DATABASE",'S'),//
- SYSTEM_DATABASE_DELETE(14,"DELETE DATABASE",'S'),//
- SYSTEM_GRANT(15,"GRANT PERMISSIONS FOR SYSTEM",'S'),
+ RUNAS_JOB_SUBMIT(101,"Submit Job",'R'),
+ RUNAS_JOB_REVIEW(102,"Review Job",'R'),
+ RUNAS_JOB_APPROVE(103,"Approve Job",'R'),
+ RUNAS_JOB_DELETE(104,"Delete Job",'R'),
+ RUNAS_JOB_ACTIVATE(105,"Start/Stop Job",'R'),
+ RUNAS_JOB_RUN(106,"Run Job",'R'),
+ RUNAS_JOB_NO_REVIEW_NEEDED(107,"No Review Needed",'R'),
+ RUNAS_JOB_NO_APPROVAL_NEEDED(108,"No Approval Needed",'R');
- DATABASE_RUNAS_ADD(100,"ADD RUN-AS USER FOR DATABASE",'D'),
- DATABASE_RUNAS_EDIT(101,"EDIT RUN-AS USER FOR DATABASE",'D'),
- DATABASE_RUNAS_DELETE(102,"DELETE RUN-AS USER FOR DATABASE",'D'),
- DATABASE_GRANT(103,"GRANT PERMISSIONS FOR DATABASE",'D'),
-
- RUNAS_JOB_SUBMIT(200,"SUBMIT JOB FOR RUN-AS",'R'),
- RUNAS_JOB_REVIEW(201,"REVIEW JOB FOR RUN-AS",'R'),
- RUNAS_JOB_APPROVE(202,"APPROVE JOB FOR RUN-AS",'R'),
- RUNAS_JOB_DELETE_UNAPPROVED(203,"DELETE UNAPPROVED JOB FOR RUN-AS",'R'),
- RUNAS_JOB_DELETE_APPROVED(204,"DELETE APPROVED JOB FOR RUN-AS",'R'),
- RUNAS_JOB_DEACTIVATE(205,"DEACTIVATE APPROVED JOB FOR RUN-AS",'R'),
- RUNAS_JOB_ACTIVATE(206,"ACTIVATE APPROVED JOB FOR RUN-AS",'R'),
- RUNAS_JOB_RUN(207,"RUN APPROVED JOB FOR RUN-AS",'R'),
- RUNAS_JOB_NO_REVIEW_NEEDED(208,"DOES NOT REQUIRE REVIEW FOR RUN-AS",'R'),
- RUNAS_JOB_NO_APPROVAL_NEEDED(209,"DOES NOT REQUIRE APPROVAL FOR RUN-AS",'R'),
- RUNAS_GRANT(210,"GRANT PERMISSIONS FOR RUN-AS",'R');
-
private Integer id;
private String name;
private Character type;
@@ -63,5 +45,5 @@
append(name).append(", ")
.append(type).append("]").toString();
}
-
+
}
Modified: trunk/drawbridge/src/test/net/sf/drawbridge/domain/SecureDrawbridgeServiceTest.java
===================================================================
--- trunk/drawbridge/src/test/net/sf/drawbridge/domain/SecureDrawbridgeServiceTest.java 2008-04-22 02:06:41 UTC (rev 46)
+++ trunk/drawbridge/src/test/net/sf/drawbridge/domain/SecureDrawbridgeServiceTest.java 2008-04-23 00:48:51 UTC (rev 47)
@@ -24,11 +24,11 @@
private static ExecutionContext context=new ExecutionContext(1,1,1);
public void testCheckPermissionsForAddUser() {
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_ADD)).will(returnValue(true));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_MANAGE)).will(returnValue(true));
mockInsecureService.expects(once()).method("addUser").with(eq(user),eq(context));
target.addUser(user, context);
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_ADD)).will(returnValue(false));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_MANAGE)).will(returnValue(false));
mockInsecureService.expects(never()).method("addUser").with(eq(user),eq(context));
try {
target.addUser(user, context);
@@ -37,11 +37,11 @@
}
public void testCheckPermissionsForUpdateUser() {
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_EDIT)).will(returnValue(true));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_MANAGE)).will(returnValue(true));
mockInsecureService.expects(once()).method("updateUser").with(eq(user),eq(context));
target.updateUser(user, context);
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_EDIT)).will(returnValue(false));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_MANAGE)).will(returnValue(false));
mockInsecureService.expects(never()).method("updateUser").with(eq(user),eq(context));
try{
target.updateUser(user, context);
@@ -50,11 +50,11 @@
}
public void testCheckPermissionsForDeleteUser() {
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_DELETE)).will(returnValue(true));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_MANAGE)).will(returnValue(true));
mockInsecureService.expects(once()).method("deleteUser").with(eq(1),eq(context));
target.deleteUser(1, context);
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_DELETE)).will(returnValue(false));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_MANAGE)).will(returnValue(false));
mockInsecureService.expects(never()).method("deleteUser").with(eq(1),eq(context));
try{
target.deleteUser(1, context);
@@ -63,11 +63,11 @@
}
public void testCheckPermissionsForAddGroup() {
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_GROUP_ADD)).will(returnValue(true));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_MANAGE)).will(returnValue(true));
mockInsecureService.expects(once()).method("addGroup").with(eq(group),eq(context));
target.addGroup(group, context);
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_GROUP_ADD)).will(returnValue(false));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_MANAGE)).will(returnValue(false));
mockInsecureService.expects(never()).method("addGroup").with(eq(group),eq(context));
try{
target.addGroup(group, context);
@@ -76,11 +76,11 @@
}
public void testCheckPermissionsForUpdateGroup() {
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_GROUP_EDIT)).will(returnValue(true));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_MANAGE)).will(returnValue(true));
mockInsecureService.expects(once()).method("updateGroup").with(eq(group),eq(context));
target.updateGroup(group, context);
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_GROUP_EDIT)).will(returnValue(false));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_MANAGE)).will(returnValue(false));
mockInsecureService.expects(never()).method("updateGroup").with(eq(group),eq(context));
try{
target.updateGroup(group, context);
@@ -89,11 +89,11 @@
}
public void testCheckPermissionsForDeleteGroup() {
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_GROUP_DELETE)).will(returnValue(true));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_MANAGE)).will(returnValue(true));
mockInsecureService.expects(once()).method("deleteGroup").with(eq(1),eq(context));
target.deleteGroup(1, context);
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_GROUP_DELETE)).will(returnValue(false));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_USER_MANAGE)).will(returnValue(false));
mockInsecureService.expects(never()).method("deleteGroup").with(eq(1),eq(context));
try{
target.deleteGroup(1, context);
@@ -102,11 +102,11 @@
}
public void testCheckPermissionsForAddDriver() {
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DRIVER_ADD)).will(returnValue(true));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_MANAGE)).will(returnValue(true));
mockInsecureService.expects(once()).method("addDriver").with(eq(driver),eq(context));
target.addDriver(driver, context);
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DRIVER_ADD)).will(returnValue(false));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_MANAGE)).will(returnValue(false));
mockInsecureService.expects(never()).method("addDriver").with(eq(driver),eq(context));
try{
target.addDriver(driver, context);
@@ -115,11 +115,11 @@
}
public void testCheckPermissionsForUpdateDriver() {
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DRIVER_EDIT)).will(returnValue(true));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_MANAGE)).will(returnValue(true));
mockInsecureService.expects(once()).method("updateDriver").with(eq(driver),eq(context));
target.updateDriver(driver, context);
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DRIVER_EDIT)).will(returnValue(false));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_MANAGE)).will(returnValue(false));
mockInsecureService.expects(never()).method("updateDriver").with(eq(driver),eq(context));
try{
target.updateDriver(driver, context);
@@ -128,11 +128,11 @@
}
public void testCheckPermissionsForDeleteDriver() {
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DRIVER_DELETE)).will(returnValue(true));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_MANAGE)).will(returnValue(true));
mockInsecureService.expects(once()).method("deleteDriver").with(eq(1),eq(context));
target.deleteDriver(1, context);
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DRIVER_DELETE)).will(returnValue(false));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_MANAGE)).will(returnValue(false));
mockInsecureService.expects(never()).method("deleteDriver").with(eq(1),eq(context));
try{
target.deleteDriver(1, context);
@@ -141,11 +141,11 @@
}
public void testCheckPermissionsForAddDatabase() {
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_ADD)).will(returnValue(true));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_MANAGE)).will(returnValue(true));
mockInsecureService.expects(once()).method("addDatabase").with(eq(database),eq(context));
target.addDatabase(database, context);
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_ADD)).will(returnValue(false));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_MANAGE)).will(returnValue(false));
mockInsecureService.expects(never()).method("addDatabase").with(eq(database),eq(context));
try{
target.addDatabase(database, context);
@@ -154,11 +154,11 @@
}
public void testCheckPermissionsForUpdateDatabase() {
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_EDIT)).will(returnValue(true));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_MANAGE)).will(returnValue(true));
mockInsecureService.expects(once()).method("updateDatabase").with(eq(database),eq(context));
target.updateDatabase(database, context);
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_EDIT)).will(returnValue(false));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_MANAGE)).will(returnValue(false));
mockInsecureService.expects(never()).method("updateDatabase").with(eq(database),eq(context));
try{
target.updateDatabase(database, context);
@@ -167,11 +167,11 @@
}
public void testCheckPermissionsForDeleteDatabase() {
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_DELETE)).will(returnValue(true));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_MANAGE)).will(returnValue(true));
mockInsecureService.expects(once()).method("deleteDatabase").with(eq(1),eq(context));
target.deleteDatabase(1, context);
- mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_DELETE)).will(returnValue(false));
+ mockSecurityService.expects(once()).method("hasPermission").with(eq(context),eq(Permission.SYSTEM_DATABASE_MANAGE)).will(returnValue(false));
mockInsecureService.expects(never()).method("deleteDatabase").with(eq(1),eq(context));
try{
target.deleteDatabase(1, context);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
