Commit fc64dc35 authored by Scott Vokes's avatar Scott Vokes
Browse files

Finish renaming and misc cleanup after merge.

parent c6edae53

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ UTILITY = kinetic-c-util 
UTIL_DIR = ./src/utility

UTIL_EXEC = $(BIN_DIR)/$(UTILITY)

UTIL_OBJ = $(OUT_DIR)/main.o

UTIL_LDFLAGS += -lm $(KINETIC_LIB) -L${OPENSSL_PATH}/lib -lssl -lcrypto -lpthread -ljson-c

UTIL_LDFLAGS += -lm $(KINETIC_LIB) -L${OUT_DIR} -L${OPENSSL_PATH}/lib -lssl -lcrypto -lpthread -ljson-c



$(UTIL_OBJ): $(UTIL_DIR)/main.c

	$(CC) -c -o $@ $< $(CFLAGS) -I$(PUB_INC) -I$(UTIL_DIR)

src/lib/kinetic_operation.c

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ KineticStatus KineticOperation_SetACLCallback(KineticOperation* const operation, 
{

    KINETIC_ASSERT(operation != NULL);

    KINETIC_ASSERT(operation->connection != NULL);

    LOGF3("SecurityCallback, with operation (0x%0llX) on connection (0x%0llX), status %d",

    LOGF3("SetACLCallback, with operation (0x%0llX) on connection (0x%0llX), status %d",

        operation, operation->connection, status);

    

    return status;

test/system/test_system_security.c

+2 −2
Original line number Diff line number Diff line
@@ -91,11 +91,11 @@ void test_Secure_should_set_ACL_and_only_be_able_to_executed_permitted_operation 


    /* Erase on identity 2 --> Permission Denied! */



    // Set the erase PIN to something non-empty

    // Leave the erase PIN empty so other erase tests won't fail.

    static char OldPinData[4];

    static char NewPinData[4];

    static ByteArray OldPin, NewPin;

    strcpy(NewPinData, "123");

    strcpy(NewPinData, "");

    OldPin = ByteArray_Create(OldPinData, 0);

    NewPin = ByteArray_Create(NewPinData, strlen(NewPinData));

    status = KineticAdminClient_SetErasePin(Fixture.adminSession,

test/unit/test_kinetic_admin_client_security.c

+5 −5
Original line number Diff line number Diff line
@@ -59,15 +59,15 @@ void tearDown(void) 
    KineticLogger_Close();

}



void test_KineticAdminClient_Security_should_reject_an_invalid_ACL_path(void)

void test_KineticAdminClient_SetACL_should_reject_an_invalid_ACL_path(void)

{

    Session.connection = &Connection;



    KineticStatus status = KineticAdminClient_Security(&Session, NULL);

    KineticStatus status = KineticAdminClient_SetACL(&Session, NULL);

    TEST_ASSERT_EQUAL(KINETIC_STATUS_INVALID_REQUEST, status);

}



void test_KineticAdminClient_Security_should_set_an_ACL(void)

void test_KineticAdminClient_SetACL_should_set_an_ACL(void)

{

    Session.connection = &Connection;

    KineticOperation operation;
@@ -76,10 +76,10 @@ void test_KineticAdminClient_Security_should_set_an_ACL(void) 


    acl_of_file_ExpectAndReturn(ACL_path, &ACLs, ACL_OK);

    KineticAllocator_NewOperation_ExpectAndReturn(&Connection, &operation);

    KineticOperation_BuildSecurity_Expect(&operation, ACLs);

    KineticOperation_BuildSetACL_Expect(&operation, ACLs);

    KineticController_ExecuteOperation_ExpectAndReturn(&operation, NULL, KINETIC_STATUS_SUCCESS);



    KineticStatus status = KineticAdminClient_Security(&Session, ACL_path);

    KineticStatus status = KineticAdminClient_SetACL(&Session, ACL_path);

    TEST_ASSERT_EQUAL(KINETIC_STATUS_SUCCESS, status);

}

test/unit/test_kinetic_operation.c

+3 −3
Original line number Diff line number Diff line
@@ -790,14 +790,14 @@ void test_KineticOperation_BuildSetClusterVersion_should_build_a_SET_CLUSTER_VER 
    TEST_ASSERT_EQUAL_PTR(&KineticOperation_SetClusterVersionCallback, Operation.callback);

}



void test_KineticOperation_BuildSecurity_should_build_a_SECURITY_operation(void)

void test_KineticOperation_BuildSetACL_should_build_a_SECURITY_operation(void)

{

    struct ACL ACLs = {

        .ACL_count = 1,

        .ACL_ceil = 1,

        .ACLs = NULL,

    };

    KineticOperation_BuildSecurity(&Operation, &ACLs);

    KineticOperation_BuildSetACL(&Operation, &ACLs);



    TEST_ASSERT_EQUAL(KINETIC_PROTO_COMMAND_MESSAGE_TYPE_SECURITY,

        Request.message.command.header->messageType);
@@ -811,7 +811,7 @@ void test_KineticOperation_BuildSecurity_should_build_a_SECURITY_operation(void) 


    TEST_ASSERT_EQUAL_PTR(Request.command->body->security->acl, ACLs.ACLs);



    TEST_ASSERT_EQUAL_PTR(&KineticOperation_SecurityCallback, Operation.callback);

    TEST_ASSERT_EQUAL_PTR(&KineticOperation_SetACLCallback, Operation.callback);

    TEST_ASSERT_FALSE(Operation.valueEnabled);

    TEST_ASSERT_FALSE(Operation.sendValue);

    TEST_ASSERT_NULL(Operation.response);