Project

General

Profile

« Previous | Next » 

Revision b4f92706

Added by Katja Luther about 13 years ago

Bugfixing

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/permission/CdmPermission.java
1 1 
package eu.etaxonomy.cdm.permission;
2 2 

  		




  3
  
  
    
import java.security.acl.Permission;


  		




  4
  3
  
    

  		




  5
  4
  
    
public enum CdmPermission {


  		




  6
  5
  
    
	CREATE, READ, DELETE, EDIT, PUBLISH, ANNOTATE , CHECKANNOTATION;


  		




  7
  6
  
    
	


  		




  8
  
  
    
	


  		




  9
  
  
    
	


  		




  10
  
  
    
	


  		




  11
  7
  
    
}


  		




  12
  8
  
    

  		




  13
  9
  
    

  		












  

    
      cdmlib-model/src/main/java/eu/etaxonomy/cdm/permission/CdmPermissionEvaluator.java
    
  





  36
  36
  
    
		if (firstPoint == -1){


  		




  37
  37
  
    
			className = CdmPermissionClass.valueOf(authority);


  		




  38
  38
  
    
		}else{


  		




  39
  
  
    
			className = CdmPermissionClass.valueOf(authority.substring(0, firstPoint));


  		




  
  39
  
    
			className = CdmPermissionClass.valueOf((authority.substring(0, firstPoint)));


  		




  40
  40
  
    
			int bracket = authority.indexOf("{");


  		




  41
  41
  
    
			if (bracket == -1){


  		




  42
  42
  
    
				permissionString = authority.substring(firstPoint+1);


  		




  ......




  68
  68
  
    
		


  		




  69
  69
  
    
		AuthorityPermission evalPermission = new AuthorityPermission(targetDomainObject.getClass().getSimpleName().toUpperCase(), CdmPermission.valueOf(permissionString), ((CdmBase)targetDomainObject).getUuid());


  		




  70
  70
  
    
		


  		




  71
  
  
    
		


  		




  
  71
  
    
		return evalPermission(groupAuthorities, evalPermission, (CdmBase)targetDomainObject);


  		




  72
  72
  
    
				


  		




  73
  73
  
    
		// TODO Auto-generated method stub


  		




  74
  
  
    
		return false;


  		




  
  74
  
    
		//return false;


  		




  75
  75
  
    
	}


  		




  76
  76
  
    

  		




  77
  77
  
    
	private TaxonNode findTargetUuidInTree(UUID targetUuid, TaxonNode node){


  		












  

    
      cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/UserServiceImplTest.java
    
  





  97
  97
  
    
		


  		




  98
  98
  
    
		


  		




  99
  99
  
    
		expectedRoles = new HashSet<GrantedAuthority>();


  		




  100
  
  
    
		GrantedAuthorityImpl publish = GrantedAuthorityImpl.NewInstance();


  		




  101
  
  
    
		publish.setAuthority("Publish");


  		




  102
  
  
    
		publish.setUuid(UUID.fromString("441a3c40-0c84-11de-8c30-0800200c9a66"));


  		




  103
  
  
    
		publish.setCreated(new DateTime(2009,2,3,17,52,26,0));


  		




  
  100
  
    
		


  		




  104
  101
  
    
		GrantedAuthorityImpl edit = GrantedAuthorityImpl.NewInstance();


  		




  105
  
  
    
		edit.setAuthority("User.Edit");


  		




  
  102
  
    
		edit.setAuthority("USER.Edit");


  		




  106
  103
  
    
		edit.setUuid(UUID.fromString("14788361-1a7e-4eed-b22f-fd90a0b424ac"));


  		




  107
  104
  
    
		edit.setCreated(new DateTime(2009,2,3,17,52,26,0));


  		




  108
  105
  
    
		GrantedAuthorityImpl annotate = GrantedAuthorityImpl.NewInstance();


  		




  109
  
  
    
		annotate.setAuthority("User.Create");


  		




  
  106
  
    
		annotate.setAuthority("USER.Create");


  		




  110
  107
  
    
		annotate.setUuid(UUID.fromString("fa56073c-0ffd-4384-b459-b2f07e35b689"));


  		




  111
  108
  
    
		annotate.setCreated(new DateTime(2009,2,3,17,52,26,0));


  		




  112
  109
  
    
		GrantedAuthorityImpl checkAnnotation = GrantedAuthorityImpl.NewInstance();


  		




  113
  
  
    
		checkAnnotation.setAuthority("User.Delete");


  		




  
  110
  
    
		checkAnnotation.setAuthority("USER.Delete");


  		




  114
  111
  
    
		checkAnnotation.setUuid(UUID.fromString("e5354c0e-657b-4b4d-bb2f-791612199711"));


  		




  115
  112
  
    
		checkAnnotation.setCreated(new DateTime(2009,2,3,17,52,26,0));


  		




  116
  
  
    
		expectedRoles.add(publish);


  		




  
  113
  
    
		


  		




  117
  114
  
    
		expectedRoles.add(edit);


  		




  118
  115
  
    
		expectedRoles.add(annotate);


  		




  119
  116
  
    
		expectedRoles.add(checkAnnotation);


  		




  ......




  137
  134
  
    
	public void testCreateUser() {


  		




  138
  135
  
    
		


  		




  139
  136
  
    
		


  		




  
  137
  
    
		


  		




  140
  138
  
    
		String username = "user2";


  		




  141
  139
  
    
		String password = "password";


  		




  142
  140
  
    
		User user = User.NewInstance(username, password);


  		




  ......




  175
  173
  
    
	


  		




  176
  174
  
    
	


  		




  177
  175
  
    
	GrantedAuthorityImpl userAdminEdit = GrantedAuthorityImpl.NewInstance();


  		




  178
  
  
    
	userAdminEdit.setAuthority("User.edit");


  		




  
  176
  
    
	userAdminEdit.setAuthority("USER.edit");


  		




  179
  177
  
    
	GrantedAuthorityImpl userAdminCreate = GrantedAuthorityImpl.NewInstance();


  		




  180
  
  
    
	userAdminCreate.setAuthority("User.create");


  		




  
  178
  
    
	userAdminCreate.setAuthority("USER.create");


  		




  181
  179
  
    
	GrantedAuthorityImpl userAdminDelete = GrantedAuthorityImpl.NewInstance();


  		




  182
  
  
    
	userAdminDelete.setAuthority("User.delete");


  		




  
  180
  
    
	userAdminDelete.setAuthority("USER.delete");


  		




  183
  181
  
    
	List<GrantedAuthority> list = new ArrayList<GrantedAuthority>();


  		




  184
  182
  
    
	list.add(userAdminEdit);


  		




  185
  183
  
    
	list.add(userAdminDelete);


  		












Also available in:  Unified diff