maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move window state, approvedCommandlines into user-state.json

Browse source 
This fixes the issue I had in the last commit. It's a little weird, but gets
  rid of the muckiness of layering. Things that are local to one elevation level
  won't pollute the other, and we don't need to worry about layering or where
  they came from. Just write shared state to `state.json`, and window state to
  `elevated-state`/`user-state`
This commit is contained in:
Mike Griese 2021-09-22 12:07:34 -05:00
parent 94c4cca176
commit 64d02f2b2b
2 changed files with 25 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/cascadia/TerminalSettingsModel/ApplicationState.cpp
View file

@ -13,6 +13,7 @@
static constexpr std::wstring_view stateFileName{ L"state.json" };
static constexpr std::wstring_view elevatedStateFileName{ L"elevated-state.json" };
static constexpr std::wstring_view unelevatedStateFileName{ L"user-state.json" };
static constexpr std::string_view TabLayoutKey{ "tabLayout" };
static constexpr std::string_view InitialPositionKey{ "initialPosition" };
@ -63,10 +64,10 @@ using namespace ::Microsoft::Terminal::Settings::Model;
namespace winrt::Microsoft::Terminal::Settings::Model::implementation
{
ApplicationState::ApplicationState(std::filesystem::path sharedPath,
std::filesystem::path elevatedPath) noexcept :
_sharedPath{ std::move(sharedPath) },
_elevatedPath{ std::move(elevatedPath) },
ApplicationState::ApplicationState(const std::filesystem::path& stateRoot) noexcept :
_sharedPath{ stateRoot / stateFileName },
_userPath{ stateRoot / unelevatedStateFileName },
_elevatedPath{ stateRoot / elevatedStateFileName },
_throttler{ std::chrono::seconds(1), [this]() { _write(); } }
{
_read();
@ -113,18 +114,15 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
FromJson(root, FileSource::Shared);
}
if (::Microsoft::Console::Utils::IsElevated())
if (const auto localData{ _readLocalContents().value_or(std::string{}) }; !localData.empty())
{
if (const auto elevatedData{ _readElevatedContents().value_or(std::string{}) }; !elevatedData.empty())
Json::Value root;
if (!reader->parse(localData.data(), localData.data() + localData.size(), &root, &errs))
{
Json::Value root;
if (!reader->parse(elevatedData.data(), elevatedData.data() + elevatedData.size(), &root, &errs))
{
throw winrt::hresult_error(WEB_E_INVALID_JSON_STRING, winrt::to_hstring(errs));
}
FromJson(root, FileSource::Local);
throw winrt::hresult_error(WEB_E_INVALID_JSON_STRING, winrt::to_hstring(errs));
}
FromJson(root, FileSource::Local);
}
}
CATCH_LOG()
@ -138,23 +136,16 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
{
Json::StreamWriterBuilder wbuilder;
if (::Microsoft::Console::Utils::IsElevated())
{
_writeSharedContents(Json::writeString(wbuilder, ToJson(FileSource::Shared)));
_writeElevatedContents(Json::writeString(wbuilder, ToJson(FileSource::Local)));
}
else
{
_writeSharedContents(Json::writeString(wbuilder, ToJson(FileSource::Shared | FileSource::Local)));
}
_writeSharedContents(Json::writeString(wbuilder, ToJson(FileSource::Shared)));
_writeLocalContents(Json::writeString(wbuilder, ToJson(FileSource::Local)));
}
CATCH_LOG()
// Returns the application-global ApplicationState object.
Microsoft::Terminal::Settings::Model::ApplicationState ApplicationState::SharedInstance()
{
static auto state = winrt::make_self<ApplicationState>(GetBaseSettingsPath() / stateFileName,
GetBaseSettingsPath() / elevatedStateFileName);
std::filesystem::path root{ GetBaseSettingsPath() };
static auto state = winrt::make_self<ApplicationState>(root);
return *state;
}
@ -216,9 +207,11 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
return ReadUTF8FileIfExists(_sharedPath);
}
std::optional<std::string> ApplicationState::_readElevatedContents() const
std::optional<std::string> ApplicationState::_readLocalContents() const
{
return ::Microsoft::Console::Utils::IsElevated() ? ReadUTF8FileIfExists(_elevatedPath, true) : std::nullopt;
return ::Microsoft::Console::Utils::IsElevated() ?
ReadUTF8FileIfExists(_elevatedPath, true) :
ReadUTF8FileIfExists(_userPath, false);
}
void ApplicationState::_writeSharedContents(const std::string_view content) const
@ -226,7 +219,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
WriteUTF8FileAtomic(_sharedPath, content);
}
void ApplicationState::_writeElevatedContents(const std::string_view content) const
void ApplicationState::_writeLocalContents(const std::string_view content) const
{
if (::Microsoft::Console::Utils::IsElevated())
{
@ -243,7 +236,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
}
else
{
// do nothing
WriteUTF8FileAtomic(_userPath, content);
}
}

8
src/cascadia/TerminalSettingsModel/ApplicationState.h
View file

@ -51,8 +51,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
{
static Microsoft::Terminal::Settings::Model::ApplicationState SharedInstance();
ApplicationState(std::filesystem::path sharedPath,
std::filesystem::path elevatedPath) noexcept;
ApplicationState(const std::filesystem::path& stateRoot) noexcept;
~ApplicationState();
// Methods
@ -79,6 +78,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
};
til::shared_mutex<state_t> _state;
std::filesystem::path _sharedPath;
std::filesystem::path _userPath;
std::filesystem::path _elevatedPath;
til::throttled_func_trailing<> _throttler;
@ -87,8 +87,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
std::optional<std::string> _readSharedContents() const;
void _writeSharedContents(const std::string_view content) const;
std::optional<std::string> _readElevatedContents() const;
void _writeElevatedContents(const std::string_view content) const;
std::optional<std::string> _readLocalContents() const;
void _writeLocalContents(const std::string_view content) const;
};
}