Merge pull request #248 from microsoft/authdatacli

Accept PSK and SAE authentication data in CLI

Author: abeltrano

src/common/tools/cli/NetRemoteCli.cxx

@@ -116,11 +116,35 @@ NetRemoteCli::AddSubcommandWifiAccessPointsEnumerate(CLI::App* parent)
     return cliAppWifiAccessPointsEnumerate;
 }
 
+namespace detail
+{
+Ieee80211RsnaPassword
+ParseSaePasswordCliArgument(const std::string& saePasswordArg)
+{
+    Ieee80211RsnaPassword saePassword{};
+    // TODO: parse optional password id and peer mac address fields.
+    saePassword.Credential = saePasswordArg;
+
+    return saePassword;
+}
+} // namespace detail
+
 void
 NetRemoteCli::WifiAccessPointEnableCallback()
 {
     Ieee80211AccessPointConfiguration ieee80211AccessPointConfiguration{};
 
+    if (!std::empty(m_cliData->WifiAccessPointPskPassphrase)) {
+        auto& psk = ieee80211AccessPointConfiguration.AuthenticationData.Psk.emplace();
+        psk.Psk = m_cliData->WifiAccessPointPskPassphrase;
+    }
+
+    if (!std::empty(m_cliData->WifiAccessPointSaePasswords)) {
+        auto& sae = ieee80211AccessPointConfiguration.AuthenticationData.Sae.emplace();
+        sae.Passwords.resize(std::size(m_cliData->WifiAccessPointSaePasswords));
+        std::ranges::transform(m_cliData->WifiAccessPointSaePasswords, std::begin(sae.Passwords), detail::ParseSaePasswordCliArgument);
+    }
+
     if (!std::empty(m_cliData->WifiAccessPointSsid)) {
         ieee80211AccessPointConfiguration.Ssid = m_cliData->WifiAccessPointSsid;
     }
@@ -250,6 +274,8 @@ NetRemoteCli::AddSubcommandWifiAccessPointEnable(CLI::App* parent)
         ->transform(CLI::CheckedTransformer(detail::Ieee80211AuthenticationAlgorithmNames(), CLI::ignore_case));
     cliAppWifiAccessPointEnable->add_option("--akm,--akms,--akmSuite,--akmSuites,--keyManagement,--keyManagements", m_cliData->WifiAccessPointAkmSuites, "The AKM suites of the access point to enable")
         ->transform(CLI::CheckedTransformer(detail::Ieee80211AkmSuiteNames(), CLI::ignore_case));
+    cliAppWifiAccessPointEnable->add_option("--passphrase,--pskPassphrase", m_cliData->WifiAccessPointPskPassphrase, "The PSK passphrase of the access point to enable");
+    cliAppWifiAccessPointEnable->add_option("--sae,--password,--passwords,--saePassword,--saePasswords", m_cliData->WifiAccessPointSaePasswords, "The SAE passwords of the access point to enable");
     cliAppWifiAccessPointEnable->callback([this] {
         WifiAccessPointEnableCallback();
     });

src/common/tools/cli/NetRemoteCliHandlerOperations.cxx

@@ -345,6 +345,22 @@ NetRemoteCliHandlerOperations::WifiAccessPointEnable(std::string_view accessPoin
                 std::make_move_iterator(std::end(dot11FrequencyBands))
             };
         }
+
+        // Populate PSK authentication data if present.
+        if (ieee80211AccessPointConfiguration->AuthenticationData.Psk.has_value()) {
+            const auto& authenticationDataPsk = ieee80211AccessPointConfiguration->AuthenticationData.Psk.value();
+            auto dot11AuthenticationDataPsk = ToDot11AuthenticationDataPsk(authenticationDataPsk);
+
+            *dot11AccessPointConfiguration.mutable_authenticationdata()->mutable_psk() = std::move(dot11AuthenticationDataPsk);
+        }
+
+        // Populate SAE authentication data if present.
+        if (ieee80211AccessPointConfiguration->AuthenticationData.Sae.has_value()) {
+            const auto& authenticationDataSae = ieee80211AccessPointConfiguration->AuthenticationData.Sae.value();
+            auto dot11AuthenticationDataSae = ToDot11AuthenticationDataSae(authenticationDataSae);
+
+            *dot11AccessPointConfiguration.mutable_authenticationdata()->mutable_sae() = std::move(dot11AuthenticationDataSae);
+        }
     }
 
     auto status = m_connection->Client->WifiAccessPointEnable(&clientContext, request, &result);

src/common/tools/cli/include/microsoft/net/remote/NetRemoteCliData.hxx

@@ -8,6 +8,7 @@
 
 #include <microsoft/net/remote/protocol/NetRemoteProtocol.hxx>
 #include <microsoft/net/wifi/Ieee80211.hxx>
+#include <microsoft/net/wifi/Ieee80211Authentication.hxx>
 
 namespace Microsoft::Net::Remote
 {
@@ -24,10 +25,12 @@ struct NetRemoteCliData
 
     std::string WifiAccessPointId{};
     std::string WifiAccessPointSsid{};
-    Microsoft::Net::Wifi::Ieee80211PhyType WifiAccessPointPhyType{ Microsoft::Net::Wifi::Ieee80211PhyType::Unknown };
+    std::string WifiAccessPointPskPassphrase;
+    std::vector<std::string> WifiAccessPointSaePasswords{};
     std::vector<Microsoft::Net::Wifi::Ieee80211FrequencyBand> WifiAccessPointFrequencyBands{};
     std::vector<Microsoft::Net::Wifi::Ieee80211AuthenticationAlgorithm> WifiAccessPointAuthenticationAlgorithms{};
     std::vector<Microsoft::Net::Wifi::Ieee80211AkmSuite> WifiAccessPointAkmSuites{};
+    Microsoft::Net::Wifi::Ieee80211PhyType WifiAccessPointPhyType{ Microsoft::Net::Wifi::Ieee80211PhyType::Unknown };
 };
 } // namespace Microsoft::Net::Remote