Commit a8fbd809 authored by chiaming2000's avatar chiaming2000
Browse files

Java simulator: set error code to StatusCode.INVALID_REQUEST if 

Domain/Permission validation failed.  

Test cases are updated also to reflect the above changes.
parent 86976e8a

kinetic-simulator/src/main/java/com/seagate/kinetic/simulator/internal/SecurityHandler.java

+3 −3
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public abstract class SecurityHandler { 
                if (domain.hasOffset() && domain.getOffset() < 0) {

                    // Negative offsets are not allowed

                    respond.getCommandBuilder().getStatusBuilder()

                    .setCode(StatusCode.INTERNAL_ERROR);

                    .setCode(StatusCode.INVALID_REQUEST);

                    respond.getCommandBuilder()

                    .getStatusBuilder()

                    .setStatusMessage(
@@ -107,7 +107,7 @@ public abstract class SecurityHandler { 
                List<Permission> roleOfList = domain.getPermissionList();

                if (null == roleOfList || roleOfList.isEmpty()) {

                    respond.getCommandBuilder().getStatusBuilder()

                    .setCode(StatusCode.INTERNAL_ERROR);

                    .setCode(StatusCode.INVALID_REQUEST);

                    respond.getCommandBuilder().getStatusBuilder()

                    .setStatusMessage("No role set in acl");

                    return currentMap;
@@ -116,7 +116,7 @@ public abstract class SecurityHandler { 
                for (Permission role : roleOfList) {

                    if (!RoleUtil.isValid(role)) {

                        respond.getCommandBuilder().getStatusBuilder()

                        .setCode(StatusCode.INTERNAL_ERROR);

                        .setCode(StatusCode.INVALID_REQUEST);

                        respond.getCommandBuilder()

                        .getStatusBuilder()

                        .setStatusMessage(

kinetic-test/src/test/java/com/seagate/kinetic/adminAPI/KineticAdminTest.java

+1 −1
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ public class KineticAdminTest extends IntegrationTestCase { 
            @SuppressWarnings("unused")

            Message response = getAdminClient().configureSecurityPolicy(request);

        } catch (KineticException ke) {

            assertEquals(Status.StatusCode.INTERNAL_ERROR, ke.getResponseMessage().getMessage().getCommand()

            assertEquals(Status.StatusCode.INVALID_REQUEST, ke.getResponseMessage().getMessage().getCommand()

                .getStatus().getCode());

        }

    }

kinetic-test/src/test/java/com/seagate/kinetic/simulator/client/admin/SecurityPersistTest.java

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ public class SecurityPersistTest extends IntegrationTestCase { 
        Message response = (Message) this.getClient().request(km).getMessage();

        } catch (KineticException ke) {

            assertTrue(ke.getResponseMessage().getMessage().getCommand().getStatus().getCode()

                    .equals(Status.StatusCode.INTERNAL_ERROR));

                    .equals(Status.StatusCode.INVALID_REQUEST));

            //assertTrue(response.getCommand().getStatus().getStatusMessage()

            //        .equals("No role set in acl"));

        } finally {
@@ -449,7 +449,7 @@ public class SecurityPersistTest extends IntegrationTestCase { 
        } catch (KineticException ke) {      

            assertTrue(ke.getResponseMessage().getMessage().getCommand()

                    .getStatus().getCode()

                    .equals(Status.StatusCode.INTERNAL_ERROR));

                    .equals(Status.StatusCode.INVALID_REQUEST));

            // assertTrue(response.getCommand().getStatus().getStatusMessage()

            // .startsWith("Role is invalid in acl"));

        } finally {