[PDI-12814] - Need to prohibit empty names when adding new users or r…

…oles

- refactor UserRoleDelegate: replace manual duplication by introducing a common method
- prohibit creating users and roles with same names for DB and EE repositories
- for KettleDatabaseRepositorySecurityProvider prohibit outright to call saveUserInfo() for updating data
- add tests

engine/src/org/pentaho/di/repository/RepositorySecurityUserValidator.java

@@ -42,5 +42,5 @@ public interface RepositorySecurityUserValidator extends RepositorySecurityManag
    *
    * @param user user's info
    */
-  void normalizeUserInfo(IUser user);
+  void normalizeUserInfo( IUser user );
 }

engine/src/org/pentaho/di/repository/kdr/KettleDatabaseRepositorySecurityProvider.java

@@ -91,11 +91,33 @@ public IUser loadUserInfo( String login ) throws KettleException {
     return userDelegate.loadUserInfo( new UserInfo(), login );
   }
 
+  /**
+   * This method creates new user after all validations have been done. For updating user's data please use {@linkplain
+   * #updateUser(IUser)}.
+   *
+   * @param userInfo user's info
+   * @throws KettleException
+   * @throws IllegalArgumentException if {@code userInfo.getObjectId() != null}
+   */
   public void saveUserInfo( IUser userInfo ) throws KettleException {
     normalizeUserInfo( userInfo );
     if ( !validateUserInfo( userInfo ) ) {
       throw new KettleException( "Empty name is not allowed" );
     }
+
+    if ( userInfo.getObjectId() != null ) {
+      throw new IllegalArgumentException( "Use updateUser() for updating" );
+    }
+
+    String userLogin = userInfo.getLogin();
+    ObjectId exactMatch = userDelegate.getUserID( userLogin );
+    if ( exactMatch != null ) {
+      // found the corresponding record in db, prohibit creation!
+      throw new KettleException(
+        "Cannot create a user with name [" + userLogin + "] because another one already exists: [" + userLogin
+          + "]. Please try different name." );
+    }
+
     userDelegate.saveUserInfo( userInfo );
   }
 

engine/test-src/org/pentaho/di/repository/kdr/KettleDatabaseRepositorySecurityProviderTest.java

@@ -28,12 +28,12 @@
 import org.mockito.ArgumentCaptor;
 import org.pentaho.di.core.KettleEnvironment;
 import org.pentaho.di.core.exception.KettleException;
+import org.pentaho.di.repository.StringObjectId;
 import org.pentaho.di.repository.UserInfo;
 import org.pentaho.di.repository.kdr.delegates.KettleDatabaseRepositoryUserDelegate;
 
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;
 
 /**
  * @author Andrey Khayrutdinov
@@ -57,21 +57,45 @@ public void setUp() {
       new KettleDatabaseRepositorySecurityProvider( repository, new KettleDatabaseRepositoryMeta(), new UserInfo() );
   }
 
+
+  @Test( expected = KettleException.class )
+  public void saveUserInfo_NormalizesInfo_FailsIfStillBreaches() throws Exception {
+    provider.saveUserInfo( new UserInfo( "    " ) );
+  }
+
+  @Test( expected = KettleException.class )
+  public void saveUserInfo_CheckDuplication_FailsIfFoundSame() throws Exception {
+    testSaveUserInfo_Passes( "login", "login", "login" );
+  }
+
+
+  @Test
+  public void saveUserInfo_CheckDuplication_PassesIfFoundDifferenceInCase() throws Exception {
+    testSaveUserInfo_Passes( "login", "login", "LOGIN" );
+  }
+
   @Test
   public void saveUserInfo_NormalizesInfo_PassesIfNoViolations() throws Exception {
-    UserInfo info = new UserInfo( "login    " );
+    testSaveUserInfo_Passes( "login    ", "login" );
+  }
 
-    ArgumentCaptor<UserInfo> captor = ArgumentCaptor.forClass( UserInfo.class );
-    provider.saveUserInfo( info );
-    verify( repository.userDelegate ).saveUserInfo( captor.capture() );
+  @Test
+  public void saveUserInfo_CheckDuplication_PassesIfFoundNothing() throws Exception {
+    testSaveUserInfo_Passes( "login", "login" );
+  }
 
-    info = captor.getValue();
-    assertEquals( "Spaces should be trimmed", "login", info.getLogin() );
+  private void testSaveUserInfo_Passes( String login, String expectedLogin ) throws Exception {
+    testSaveUserInfo_Passes( login, expectedLogin, "prefix_" + login );
   }
 
-  @Test( expected = KettleException.class )
-  public void saveUserInfo_NormalizesInfo_FailsIfStillBreaches() throws Exception {
-    UserInfo info = new UserInfo( "    " );
-    provider.saveUserInfo( info );
+  private void testSaveUserInfo_Passes( String login, String expectedLogin, String existing ) throws Exception {
+    doReturn( new StringObjectId( existing ) ).when( repository.userDelegate ).getUserID( eq( existing ) );
+
+    provider.saveUserInfo( new UserInfo( login ) );
+
+    ArgumentCaptor<UserInfo> captor = ArgumentCaptor.forClass( UserInfo.class );
+    verify( repository.userDelegate ).saveUserInfo( captor.capture() );
+
+    assertEquals( "UserInfo should be passed", expectedLogin, captor.getValue().getLogin() );
   }
 }