add WH_TEST_SKIP and authentication skipping when server does not support auth

Author: JacobBarthelmeh

test/wh_test_auth.c

@@ -576,6 +576,11 @@ int whTest_AuthLogin(whClientContext* client)
     WH_TEST_RETURN_ON_FAIL(
         _whTest_Auth_LoginOp(client, WH_AUTH_METHOD_PIN, TEST_ADMIN_USERNAME,
                              "wrong", 5, &server_rc, &user_id));
+    if (server_rc == WH_AUTH_NOT_ENABLED) {
+        WH_TEST_PRINT("Server does not support authentication, skipping "
+            "authentication tests\n");
+        return WH_AUTH_NOT_ENABLED;
+    }
     WH_TEST_ASSERT_RETURN(server_rc == WH_AUTH_LOGIN_FAILED ||
                           server_rc != WH_ERROR_OK);
     WH_TEST_ASSERT_RETURN(user_id == WH_USER_ID_INVALID);
@@ -1165,11 +1170,35 @@ int whTest_AuthRequestAuthorization(whClientContext* client)
     return WH_TEST_SUCCESS;
 }
 
+
+static int CheckServerSupportsAuth(whClientContext* client_ctx)
+{
+    int32_t server_rc;
+    whUserId user_id;
+    int isSupported = 0;
+
+    WH_TEST_RETURN_ON_FAIL(wh_Client_AuthLogin(client_ctx, WH_AUTH_METHOD_PIN,
+        TEST_ADMIN_USERNAME, TEST_ADMIN_PIN, strlen(TEST_ADMIN_PIN), &server_rc,
+        &user_id));
+    if (server_rc != WH_AUTH_NOT_ENABLED) {
+        WH_TEST_RETURN_ON_FAIL(wh_Client_AuthLogout(client_ctx, user_id,
+            &server_rc));
+        isSupported = 1;
+    }
+    return isSupported;
+}
+
 /* Main Test Function */
 int whTest_AuthTest(whClientContext* client_ctx)
 {
     WH_TEST_PRINT("Testing authentication functionality...\n");
 
+    if (!CheckServerSupportsAuth(client_ctx)) {
+        WH_TEST_PRINT("Server does not support authentication, skipping "
+            "authentication tests\n");
+        return WH_TEST_SKIP;
+    }
+
     WH_TEST_PRINT("Running auth bad-args tests...\n");
     WH_TEST_RETURN_ON_FAIL(_whTest_Auth_BadArgs());
     WH_TEST_PRINT("Running auth message bad-args tests...\n");

test/wh_test_common.h

@@ -33,6 +33,7 @@
 
 #define WH_TEST_FAIL (-1)
 #define WH_TEST_SUCCESS (0)
+#define WH_TEST_SKIP (1)
 #define WH_TEST_DEFAULT_CLIENT_ID (1)
 
 /* Test-specific print macro that always prints (replacement for printf in tests)
@@ -75,7 +76,7 @@
 #define WH_TEST_RETURN_ON_FAIL(call)                 \
     do {                                             \
         int ret = (call);                            \
-        if (ret != 0) {                              \
+        if (ret != WH_TEST_SUCCESS && ret != WH_TEST_SKIP) { \
             WH_ERROR_PRINT(#call ": ret=%d\n", ret); \
             return ret;                              \
         }                                            \

test/wh_test_crypto.c

@@ -5757,10 +5757,12 @@ int whTest_CryptoClientConfig(whClientConfig* config)
 
     if (ret == 0) {
 #ifdef WOLFHSM_CFG_ENABLE_AUTHENTICATION
+        int serverRc;
+
         /* Attempt log in as an admin user for the rest of the tests */
         WH_TEST_RETURN_ON_FAIL(wh_Client_AuthLogin(client, WH_AUTH_METHOD_PIN,
             TEST_ADMIN_USERNAME, TEST_ADMIN_PIN, strlen(TEST_ADMIN_PIN),
-            NULL, NULL));
+            &serverRc, NULL));
 #endif /* WOLFHSM_CFG_ENABLE_AUTHENTICATION */
     }