Improve file setting stream handling

Author: JohnMcPMS

src/AppInstallerCLITests/Settings.cpp

@@ -297,7 +297,7 @@ TEST_CASE("SetAndReadSettingEncrypted", "[settings]")
     REQUIRE(value == settingValue);
 
     // Ensure that the data is encrypted
-    name.Type = Type::Standard;
+    name.Type = Type::StandardFile;
 
     Stream streamDirect{ name };
 

src/AppInstallerCommonCore/Public/AppInstallerRuntime.h

@@ -64,8 +64,8 @@ namespace AppInstaller::Runtime
         FontsUserInstallLocation,
         // The location where fonts are installed with machine scope.
         FontsMachineInstallLocation,
-        // The temporary file location; only valid when running packaged.
-        PackagedTemp,
+        // The location that standard type settings are stored in files.
+        StandardFileSettings,
         // Always one more than the last path; for being able to iterate paths in tests.
         Max
     };

src/AppInstallerCommonCore/Public/winget/Settings.h

@@ -36,14 +36,16 @@ namespace AppInstaller::Settings
     // Names should still be unique, as there is no guarantee made about types mapping to unique roots.
     enum class Type
     {
-        // A Standard setting stream has no special requirements.
+        // A Standard setting stream has no special requirements (limited to 8K contents and no embedded null characters).
         Standard,
         // A UserFile setting stream should be located in a file that is easily editable by the user.
         UserFile,
         // A settings stream that should not be modified except by admin privileges.
         Secure,
         // A settings stream that is encrypted. It does not require admin privileges to write to.
         Encrypted,
+        // A setting stream has should be stored in a file, removing the limitations of the Standard type.
+        StandardFile,
     };
 
     // Converts the Type enum to a string.

src/AppInstallerCommonCore/Runtime.cpp

@@ -22,6 +22,7 @@ namespace AppInstaller::Runtime
     {
         using namespace std::string_view_literals;
         constexpr std::string_view s_DefaultTempDirectory = "WinGet"sv;
+        constexpr std::string_view s_SettingsFile_Relative = "Settings"sv;
         constexpr std::string_view s_SecureSettings_Base = "Microsoft\\WinGet"sv;
         constexpr std::string_view s_SecureSettings_UserRelative = "settings"sv;
         constexpr std::string_view s_SecureSettings_Relative_Unpackaged = "win"sv;
@@ -288,9 +289,9 @@ namespace AppInstaller::Runtime
             result.Path.assign(appStorage.LocalFolder().Path().c_str());
             mayBeInProfilePath = true;
             break;
-        case PathName::PackagedTemp:
-            result.Path.assign(appStorage.TemporaryFolder().Path().c_str());
-            result.Path /= s_DefaultTempDirectory;
+        case PathName::StandardFileSettings:
+            result.Path.assign(appStorage.LocalFolder().Path().c_str());
+            result.Path /= s_SettingsFile_Relative;
             mayBeInProfilePath = true;
             break;
         case PathName::DefaultLogLocation:
@@ -399,7 +400,6 @@ namespace AppInstaller::Runtime
         switch (path)
         {
         case PathName::Temp:
-        case PathName::PackagedTemp:
         case PathName::DefaultLogLocation:
         {
             result.Path = GetPathToUserTemp(forDisplay);
@@ -419,6 +419,7 @@ namespace AppInstaller::Runtime
             result.Path /= GetRuntimePathStateName();
             break;
         case PathName::StandardSettings:
+        case PathName::StandardFileSettings:
         case PathName::UserFileSettings:
             result = Filesystem::GetPathDetailsFor(Filesystem::PathName::UnpackagedSettingsRoot, anonymize);
             result.Create = !forDisplay;

src/AppInstallerCommonCore/Settings.cpp

@@ -420,8 +420,8 @@ namespace AppInstaller::Settings
                         ApplicationDataSettingsContainer::GetRelativeContainer(
                             winrt::Windows::Storage::ApplicationData::Current().LocalSettings(), GetPathTo(PathName::StandardSettings)),
                         name);
-                case Type::Encrypted:
-                    return std::make_unique<FileSettingsContainer>(GetPathTo(PathName::PackagedTemp), name);
+                case Type::StandardFile:
+                    return std::make_unique<FileSettingsContainer>(GetPathTo(PathName::StandardFileSettings), name);
                 default:
                     THROW_HR(E_UNEXPECTED);
                 }
@@ -432,7 +432,7 @@ namespace AppInstaller::Settings
                 switch (type)
                 {
                 case Type::Standard:
-                case Type::Encrypted:
+                case Type::StandardFile:
                     return std::make_unique<FileSettingsContainer>(GetPathTo(PathName::StandardSettings), name);
                 default:
                     THROW_HR(E_UNEXPECTED);
@@ -459,7 +459,11 @@ namespace AppInstaller::Settings
 
             case Type::Encrypted:
                 // Encrypted settings add encryption on top of exchange semantics
-                return std::make_unique<EncryptedSettingsContainer>(GetRawSettingsContainer(Type::Encrypted, name), name);
+                return std::make_unique<EncryptedSettingsContainer>(GetRawSettingsContainer(Type::StandardFile, name), name);
+
+            case Type::StandardFile:
+                // Standard settings should use exchange semantics to prevent overwrites
+                return std::make_unique<ExchangeSettingsContainer>(GetRawSettingsContainer(type, name), name);
 
             default:
                 THROW_HR(E_UNEXPECTED);
@@ -484,6 +488,8 @@ namespace AppInstaller::Settings
             return "Secure"sv;
         case Type::Encrypted:
             return "Encrypted"sv;
+        case Type::StandardFile:
+            return "StandardFile"sv;
         default:
             THROW_HR(E_UNEXPECTED);
         }