Add wslc login, wslc logout, and wslc push commands for registry authentication

localization/strings/en-US/Resources.resw

@@ -2281,6 +2281,12 @@ For privacy information about this product please visit https://aka.ms/privacy.<
   <data name="WSLCCLI_ImagePullLongDesc" xml:space="preserve">
     <value>Pulls images.</value>
   </data>
+  <data name="WSLCCLI_ImagePushDesc" xml:space="preserve">
+    <value>Upload an image to a registry.</value>
+  </data>
+  <data name="WSLCCLI_ImagePushLongDesc" xml:space="preserve">
+    <value>Upload an image to a registry.</value>
+  </data>
   <data name="WSLCCLI_ImageRemoveDesc" xml:space="preserve">
     <value>Remove images.</value>
   </data>
@@ -2293,6 +2299,67 @@ For privacy information about this product please visit https://aka.ms/privacy.<
   <data name="WSLCCLI_ImageSaveLongDesc" xml:space="preserve">
     <value>Saves images.</value>
   </data>
+  <data name="WSLCCLI_LoginDesc" xml:space="preserve">
+    <value>Log in to a registry.</value>
+  </data>
+  <data name="WSLCCLI_LoginLongDesc" xml:space="preserve">
+    <value>Log in to a registry. If no server is specified, the default is defined by the session.</value>
+  </data>
+  <data name="WSLCCLI_LogoutDesc" xml:space="preserve">
+    <value>Log out from a registry.</value>
+  </data>
+  <data name="WSLCCLI_LogoutLongDesc" xml:space="preserve">
+    <value>Log out from a registry. If no server is specified, the default is defined by the session.</value>
+  </data>
+  <data name="WSLCCLI_LoginSucceeded" xml:space="preserve">
+    <value>Login Succeeded</value>
+  </data>
+  <data name="WSLCCLI_LogoutSucceeded" xml:space="preserve">
+    <value>Removing login credentials for {}</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
+  <data name="WSLCCLI_LogoutNotFound" xml:space="preserve">
+    <value>Not logged in to {}</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
+  <data name="WSLCCLI_CredentialFileCorrupt" xml:space="preserve">
+    <value>Failed to parse credentials file '{}': the file may be corrupted.</value>
+    <comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
+  <data name="WSLCCLI_LoginServerArgDescription" xml:space="preserve">
+    <value>Server</value>
+  </data>
+  <data name="WSLCCLI_LoginUsernameArgDescription" xml:space="preserve">
+    <value>Username</value>
+  </data>
+  <data name="WSLCCLI_LoginPasswordArgDescription" xml:space="preserve">
+    <value>Password or Personal Access Token (PAT)</value>
+    <comment>{Locked="PAT"}Acronym should not be translated</comment>
+  </data>
+  <data name="WSLCCLI_LoginPasswordStdinArgDescription" xml:space="preserve">
+    <value>Take the Password or Personal Access Token (PAT) from stdin</value>
+    <comment>{Locked="PAT"}{Locked="stdin"}Technical terms should not be translated</comment>
+  </data>
+  <data name="WSLCCLI_LoginPasswordAndStdinMutuallyExclusive" xml:space="preserve">
+    <value>--password and --password-stdin are mutually exclusive</value>
+    <comment>{Locked="--password "}{Locked="--password-stdin "}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
+  <data name="WSLCCLI_LoginPasswordStdinRequiresUsername" xml:space="preserve">
+    <value>Must provide --username with --password-stdin</value>
+    <comment>{Locked="--username "}{Locked="--password-stdin"}Command line arguments, file names and string inserts should not be translated</comment>
+  </data>
+  <data name="WSLCCLI_LoginUsernamePrompt" xml:space="preserve">
+    <value>Username: </value>
+  </data>
+  <data name="WSLCCLI_LoginPasswordPrompt" xml:space="preserve">
+    <value>Password: </value>
+  </data>
+  <data name="WSLCCLI_RegistryCommandDesc" xml:space="preserve">
+    <value>Manage registry credentials.</value>
+  </data>
+  <data name="WSLCCLI_RegistryCommandLongDesc" xml:space="preserve">
+    <value>Manage registry credentials, including logging in and out of container registries.</value>
+  </data>
   <data name="WSLCCLI_ImageTagDesc" xml:space="preserve">
     <value>Tag an image.</value>
   </data>

src/windows/WslcSDK/wslcsdk.h

@@ -564,4 +564,4 @@ typedef __callback void(CALLBACK* WslcInstallCallback)(_In_ WslcComponentFlags c
 
 STDAPI WslcInstallWithDependencies(_In_opt_ WslcInstallCallback progressCallback, _In_opt_ PVOID context);
 
-EXTERN_C_END
+EXTERN_C_END

src/windows/common/WSLCContainerLauncher.cpp

@@ -11,7 +11,6 @@ Module Name:
     This file contains the implementation for WSLCContainerLauncher.
 
 --*/
-
 #include "precomp.h"
 #include "WSLCContainerLauncher.h"
 

src/windows/common/WSLCUserSettings.cpp

@@ -49,7 +49,10 @@ static constexpr std::string_view s_DefaultSettingsTemplate =
     "  # Default path for session storage. By default, storage is per-session under:\n"
     "  #   %LocalAppData%\\wslc\\sessions\\wslc-cli        (standard sessions)\n"
     "  #   %LocalAppData%\\wslc\\sessions\\wslc-cli-admin (elevated sessions)\n"
-    "  # defaultStoragePath: \"\"\n";
+    "  # defaultStoragePath: \"\"\n"
+    "\n"
+    "# Credential storage backend: \"wincred\" or \"file\" (default: wincred)\n"
+    "# credentialStore: wincred\n";
 
 // Validate individual setting specializations
 namespace details {
@@ -123,6 +126,20 @@ namespace details {
         return value;
     }
 
+    WSLC_VALIDATE_SETTING(CredentialStore)
+    {
+        if (value == "wincred")
+        {
+            return CredentialStoreType::WinCred;
+        }
+        if (value == "file")
+        {
+            return CredentialStoreType::File;
+        }
+
+        return std::nullopt;
+    }
+
 #undef WSLC_VALIDATE_SETTING
 
 } // namespace details

src/windows/common/WSLCUserSettings.h

@@ -42,6 +42,7 @@ enum class Setting : size_t
     SessionNetworkingMode,
     SessionHostFileShareMode,
     SessionDnsTunneling,
+    CredentialStore,
 
     Max
 };
@@ -52,6 +53,12 @@ enum class HostFileShareMode
     VirtioFs
 };
 
+enum class CredentialStoreType
+{
+    WinCred,
+    File
+};
+
 namespace details {
 
     template <Setting S>
@@ -83,6 +90,7 @@ namespace details {
     DEFINE_SETTING_MAPPING(SessionNetworkingMode,    std::string, WSLCNetworkingMode, WSLCNetworkingModeVirtioProxy, "session.networkingMode")
     DEFINE_SETTING_MAPPING(SessionHostFileShareMode, std::string, HostFileShareMode,  HostFileShareMode::VirtioFs,   "session.hostFileShareMode")
     DEFINE_SETTING_MAPPING(SessionDnsTunneling,      bool,        bool,               true,                          "session.dnsTunneling")
+    DEFINE_SETTING_MAPPING(CredentialStore,            std::string, CredentialStoreType, CredentialStoreType::WinCred,  "credentialStore")
 
 #undef DEFINE_SETTING_MAPPING
     // clang-format on

src/windows/wslc/CMakeLists.txt

@@ -14,7 +14,10 @@ target_include_directories(wslclib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${WSLC_SUB
 target_link_libraries(wslclib
                       ${COMMON_LINK_LIBRARIES}
                       yaml-cpp
-                      common)
+                      common
+                      advapi32
+                      crypt32)
+
 
 target_precompile_headers(wslclib REUSE_FROM common)
 set_target_properties(wslclib PROPERTIES FOLDER windows)

src/windows/wslc/arguments/ArgumentDefinitions.h

@@ -64,13 +64,16 @@ _(NoCache,        "no-cache",            NO_ALIAS,          Kind::Flag,        L
 _(NoPrune,        "no-prune",            NO_ALIAS,          Kind::Flag,        Localization::WSLCCLI_NoPruneArgDescription()) \
 _(NoTrunc,        "no-trunc",            NO_ALIAS,          Kind::Flag,        Localization::WSLCCLI_NoTruncArgDescription()) \
 _(Output,         "output",              L"o",              Kind::Value,       Localization::WSLCCLI_OutputArgDescription()) \
+_(Password,       "password",            L"p",              Kind::Value,       Localization::WSLCCLI_LoginPasswordArgDescription()) \
+_(PasswordStdin,  "password-stdin",      NO_ALIAS,          Kind::Flag,        Localization::WSLCCLI_LoginPasswordStdinArgDescription()) \
 _(Path,           "path",                NO_ALIAS,          Kind::Positional,  Localization::WSLCCLI_PathArgDescription()) \
 /*_(Progress,       "progress",            NO_ALIAS,          Kind::Value,       Localization::WSLCCLI_ProgressArgDescription())*/ \
 _(Publish,        "publish",             L"p",              Kind::Value,       Localization::WSLCCLI_PublishArgDescription()) \
 /*_(Pull,           "pull",                NO_ALIAS,          Kind::Value,       Localization::WSLCCLI_PullArgDescription())*/ \
 _(Quiet,          "quiet",               L"q",              Kind::Flag,        Localization::WSLCCLI_QuietArgDescription()) \
 _(Remove,         "rm",                  NO_ALIAS,          Kind::Flag,        Localization::WSLCCLI_RemoveArgDescription()) \
 /*_(Scheme,         "scheme",              NO_ALIAS,          Kind::Value,       Localization::WSLCCLI_SchemeArgDescription())*/ \
+_(Server,         "server",              NO_ALIAS,          Kind::Positional,  Localization::WSLCCLI_LoginServerArgDescription()) \
 _(Session,        "session",             NO_ALIAS,          Kind::Value,       Localization::WSLCCLI_SessionIdArgDescription()) \
 _(SessionId,      "session-id",          NO_ALIAS,          Kind::Positional,  Localization::WSLCCLI_SessionIdPositionalArgDescription()) \
 _(StoragePath,    "storage-path",        NO_ALIAS,          Kind::Positional,  L"Path to the session storage directory") \
@@ -82,6 +85,7 @@ _(Time,           "time",                L"t",              Kind::Value,       L
 _(TMPFS,          "tmpfs",               NO_ALIAS,          Kind::Value,       Localization::WSLCCLI_TMPFSArgDescription()) \
 _(TTY,            "tty",                 L"t",              Kind::Flag,        Localization::WSLCCLI_TTYArgDescription()) \
 _(User,           "user",                L"u",              Kind::Value,       Localization::WSLCCLI_UserArgDescription()) \
+_(Username,       "username",            L"u",              Kind::Value,       Localization::WSLCCLI_LoginUsernameArgDescription()) \
 _(Verbose,        "verbose",             NO_ALIAS,          Kind::Flag,        Localization::WSLCCLI_VerboseArgDescription()) \
 _(Version,        "version",             L"v",              Kind::Flag,        Localization::WSLCCLI_VersionArgDescription()) \
 /*_(Virtual,        "virtualization",      NO_ALIAS,          Kind::Value,       Localization::WSLCCLI_VirtualArgDescription())*/ \

src/windows/wslc/commands/ImageCommand.cpp

@@ -28,6 +28,7 @@ std::vector<std::unique_ptr<Command>> ImageCommand::GetCommands() const
     commands.push_back(std::make_unique<ImageListCommand>(FullName()));
     commands.push_back(std::make_unique<ImageLoadCommand>(FullName()));
     commands.push_back(std::make_unique<ImagePullCommand>(FullName()));
+    commands.push_back(std::make_unique<ImagePushCommand>(FullName()));
     commands.push_back(std::make_unique<ImageSaveCommand>(FullName()));
     commands.push_back(std::make_unique<ImageTagCommand>(FullName()));
     return commands;

src/windows/wslc/commands/ImageCommand.h

@@ -146,6 +146,21 @@ struct ImagePullCommand final : public Command
     void ExecuteInternal(CLIExecutionContext& context) const override;
 };
 
+// Push Command
+struct ImagePushCommand final : public Command
+{
+    constexpr static std::wstring_view CommandName = L"push";
+    ImagePushCommand(const std::wstring& parent) : Command(CommandName, parent)
+    {
+    }
+    std::vector<Argument> GetArguments() const override;
+    std::wstring ShortDescription() const override;
+    std::wstring LongDescription() const override;
+
+protected:
+    void ExecuteInternal(CLIExecutionContext& context) const override;
+};
+
 // Save Command
 struct ImageSaveCommand final : public Command
 {

src/windows/wslc/commands/ImagePushCommand.cpp

@@ -0,0 +1,51 @@
+/*++
+
+Copyright (c) Microsoft. All rights reserved.
+
+Module Name:
+
+    ImagePushCommand.cpp
+
+Abstract:
+
+    Implementation of the image push command.
+
+--*/
+
+#include "ImageCommand.h"
+#include "CLIExecutionContext.h"
+#include "ImageTasks.h"
+#include "SessionTasks.h"
+#include "Task.h"
+
+using namespace wsl::windows::wslc::execution;
+using namespace wsl::windows::wslc::task;
+using namespace wsl::shared;
+
+namespace wsl::windows::wslc {
+// Image Push Command
+std::vector<Argument> ImagePushCommand::GetArguments() const
+{
+    return {
+        Argument::Create(ArgType::ImageId, true),
+        Argument::Create(ArgType::Session),
+    };
+}
+
+std::wstring ImagePushCommand::ShortDescription() const
+{
+    return Localization::WSLCCLI_ImagePushDesc();
+}
+
+std::wstring ImagePushCommand::LongDescription() const
+{
+    return Localization::WSLCCLI_ImagePushLongDesc();
+}
+
+void ImagePushCommand::ExecuteInternal(CLIExecutionContext& context) const
+{
+    context              //
+        << CreateSession //
+        << PushImage;
+}
+} // namespace wsl::windows::wslc