beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Shell: Limit the access of processes spawned for autocompletion

Browse source 
This commit limits the autocomplete processes to effectively have
readonly access to the fs, and only enough pledges to get the dynamic
loader working.
This commit is contained in:
Ali Mohammad Pur 2022-03-25 01:19:48 +04:30 committed by Ali Mohammad Pur
parent 8233da3398
commit f12d81ddf5
Notes: sideshowbarker 2024-07-17 16:43:45 +09:00 
Author: https://github.com/alimpfard
Commit: https://github.com/SerenityOS/serenity/commit/f12d81ddf5
Pull-request: https://github.com/SerenityOS/serenity/pull/13212
2 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Userland/Shell/Shell.cpp
View file

@ -844,6 +844,14 @@ ErrorOr<RefPtr<Job>> Shell::run_command(const AST::Command& command)
void Shell::execute_process(Vector<const char*>&& argv)
{
#ifdef __serenity__
for (auto& promise : m_active_promises) {
pledge("exec", promise.data.exec_promises.characters());
for (auto& item : promise.data.unveils)
unveil(item.path.characters(), item.access.characters());
}
#endif
int rc = execvp(argv[0], const_cast<char* const*>(argv.data()));
if (rc < 0) {
auto parts = StringView { argv[0] }.split_view('/');
@ -1833,6 +1841,13 @@ ErrorOr<Vector<Line::CompletionSuggestion>> Shell::complete_via_program_itself(s
});
timer->start();
// Restrict the process to effectively readonly access to the FS.
auto scoped_promise = promise({
.exec_promises = "stdio rpath prot_exec no_error",
.unveils = {
{ "/", "rx" },
},
});
execute_node->for_each_entry(*this, [&](NonnullRefPtr<AST::Value> entry) -> IterationDecision {
auto result = entry->resolve_as_string(*this);
JsonParser parser(result);

36
Userland/Shell/Shell.h
View file

@ -159,6 +159,41 @@ public:
[[nodiscard]] Frame push_frame(String name);
void pop_frame();
struct Promise {
struct Data {
struct Unveil {
String path;
String access;
};
String exec_promises;
Vector<Unveil> unveils;
} data;
IntrusiveListNode<Promise> node;
using List = IntrusiveList<&Promise::node>;
};
struct ScopedPromise {
ScopedPromise(Promise::List& promises, Promise&& promise)
: promises(promises)
, promise(move(promise))
{
promises.append(this->promise);
}
~ScopedPromise()
{
promises.remove(promise);
}
Promise::List& promises;
Promise promise;
};
[[nodiscard]] ScopedPromise promise(Promise::Data data)
{
return { m_active_promises, { move(data), {} } };
}
enum class EscapeMode {
Bareword,
SingleQuotedString,
@ -362,6 +397,7 @@ private:
HashMap<String, ShellFunction> m_functions;
NonnullOwnPtrVector<LocalFrame> m_local_frames;
Promise::List m_active_promises;
NonnullRefPtrVector<AST::Redirection> m_global_redirections;
HashMap<String, String> m_aliases;