Add psk length checks in API impl with tests.

Author: abeltrano

src/common/service/NetRemoteService.cxx

@@ -751,6 +751,12 @@ NetRemoteService::WifiAccessPointSetAuthenticationDataImpl(std::string_view acce
                 wifiOperationStatus.set_message("No PSK passphrase provided (empty)");
                 return wifiOperationStatus;
             }
+            const auto pskPassphraseSize = std::size(pskPassphrase);
+            if (pskPassphraseSize < Ieee80211RsnaPskPassphraseLengthMinimum || pskPassphraseSize > Ieee80211RsnaPskPassphraseLengthMaximum) {
+                wifiOperationStatus.set_code(WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeInvalidParameter);
+                wifiOperationStatus.set_message(std::format("Invalid PSK passphrase size '{}' provided (expected {} to {} characters)", pskPassphraseSize, Ieee80211RsnaPskPassphraseLengthMinimum, Ieee80211RsnaPskPassphraseLengthMaximum));
+                return wifiOperationStatus;
+            }
         } else if (psk.has_value()) {
             const auto& pskValue = psk.value();
             if (!pskValue.has_hex() && !pskValue.has_raw()) {
@@ -769,7 +775,7 @@ NetRemoteService::WifiAccessPointSetAuthenticationDataImpl(std::string_view acce
                 const auto& pskRaw = pskValue.raw();
                 if (std::size(pskRaw) != Ieee80211RsnaPskLength) {
                     wifiOperationStatus.set_code(WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeInvalidParameter);
-                    wifiOperationStatus.set_message(std::format("Invalid PSK raw value provided (not {} bytes)", Ieee80211RsnaPskLength));
+                    wifiOperationStatus.set_message(std::format("Invalid PSK raw value size '{}' provided (expected {} bytes)", std::size(pskRaw), Ieee80211RsnaPskLength));
                     return wifiOperationStatus;
                 }
             }

tests/unit/TestNetRemoteServiceClient.cxx

@@ -180,6 +180,90 @@ TEST_CASE("WifiAccessPointEnable API", "[basic][rpc][client][remote]")
         REQUIRE(result.status().code() == WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeAccessPointInvalid);
     }
 
+    SECTION("Fails with psk too short")
+    {
+        const auto pskPassphraseTooShort = std::string(Ieee80211RsnaPskPassphraseLengthMinimum - 1, 'a');
+
+        Dot11AccessPointConfiguration apConfiguration{};
+        *apConfiguration.mutable_authenticationdata()->mutable_psk()->mutable_psk()->mutable_passphrase() = pskPassphraseTooShort;
+
+        WifiAccessPointEnableRequest request{};
+        request.set_accesspointid(InterfaceName1);
+        *request.mutable_configuration() = std::move(apConfiguration);
+
+        WifiAccessPointEnableResult result{};
+        grpc::ClientContext clientContext{};
+
+        auto status = client->WifiAccessPointEnable(&clientContext, request, &result);
+        REQUIRE(status.ok());
+        REQUIRE(result.accesspointid() == request.accesspointid());
+        REQUIRE(result.has_status());
+        REQUIRE(result.status().code() == WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeInvalidParameter);
+    }
+
+    SECTION("Fails with psk too long")
+    {
+        const auto pskPassphraseTooShort = std::string(Ieee80211RsnaPskPassphraseLengthMaximum + 1, 'a');
+
+        Dot11AccessPointConfiguration apConfiguration{};
+        *apConfiguration.mutable_authenticationdata()->mutable_psk()->mutable_psk()->mutable_passphrase() = pskPassphraseTooShort;
+
+        WifiAccessPointEnableRequest request{};
+        request.set_accesspointid(InterfaceName1);
+        *request.mutable_configuration() = std::move(apConfiguration);
+
+        WifiAccessPointEnableResult result{};
+        grpc::ClientContext clientContext{};
+
+        auto status = client->WifiAccessPointEnable(&clientContext, request, &result);
+        REQUIRE(status.ok());
+        REQUIRE(result.accesspointid() == request.accesspointid());
+        REQUIRE(result.has_status());
+        REQUIRE(result.status().code() == WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeInvalidParameter);
+    }
+
+    SECTION("Succeeds with psk minimum length")
+    {
+        const auto pskPassphraseMinimum = std::string(Ieee80211RsnaPskPassphraseLengthMinimum, 'a');
+
+        Dot11AccessPointConfiguration apConfiguration{};
+        *apConfiguration.mutable_authenticationdata()->mutable_psk()->mutable_psk()->mutable_passphrase() = pskPassphraseMinimum;
+
+        WifiAccessPointEnableRequest request{};
+        request.set_accesspointid(InterfaceName1);
+        *request.mutable_configuration() = std::move(apConfiguration);
+
+        WifiAccessPointEnableResult result{};
+        grpc::ClientContext clientContext{};
+
+        auto status = client->WifiAccessPointEnable(&clientContext, request, &result);
+        REQUIRE(status.ok());
+        REQUIRE(result.accesspointid() == request.accesspointid());
+        REQUIRE(result.has_status());
+        REQUIRE(result.status().code() == WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeSucceeded);
+    }
+
+    SECTION("Succeeds with psk maximum length")
+    {
+        const auto pskPassphraseMaximum = std::string(Ieee80211RsnaPskPassphraseLengthMaximum, 'a');
+
+        Dot11AccessPointConfiguration apConfiguration{};
+        *apConfiguration.mutable_authenticationdata()->mutable_psk()->mutable_psk()->mutable_passphrase() = pskPassphraseMaximum;
+
+        WifiAccessPointEnableRequest request{};
+        request.set_accesspointid(InterfaceName1);
+        *request.mutable_configuration() = std::move(apConfiguration);
+
+        WifiAccessPointEnableResult result{};
+        grpc::ClientContext clientContext{};
+
+        auto status = client->WifiAccessPointEnable(&clientContext, request, &result);
+        REQUIRE(status.ok());
+        REQUIRE(result.accesspointid() == request.accesspointid());
+        REQUIRE(result.has_status());
+        REQUIRE(result.status().code() == WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeSucceeded);
+    }
+
     SECTION("Succeeds without access point configuration if already configured")
     {
         Dot11CipherSuiteConfiguration dot11CipherSuiteConfigurationWpa1{};