LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-28 13:43:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

NetworkSettings: Use helper script to write config

Browse Source 
This change allows us to not run the app with elevated privileges.

It uses the Escalator to call a helper and passes the settings as
JsonObject to it.
This commit is contained in:
Fabian Dellwing 2023-04-27 21:07:07 +02:00 committed by Andrew Kaster
parent 27297d2817
commit 24b1bdca27
Notes: sideshowbarker 2024-07-16 20:39:14 +09:00 
Author: https://github.com/fdellwing
Commit: https://github.com/SerenityOS/serenity/commit/24b1bdca27
Pull-request: https://github.com/SerenityOS/serenity/pull/18545
Reviewed-by: https://github.com/ADKaster
Reviewed-by: https://github.com/BenWiederhake
Reviewed-by: https://github.com/LucasChollet
Reviewed-by: https://github.com/kennethmyhra
Reviewed-by: https://github.com/trflynn89
3 changed files with 68 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Userland/Applications/NetworkSettings/NetworkSettingsWidget.cpp
View File

@ -1,16 +1,18 @@
/*
* Copyright (c) 2022, Maciej <sppmacd@pm.me>
* Copyright (c) 2023, Fabian Dellwing <fabian@dellwing.net>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "NetworkSettingsWidget.h"
#include <AK/DeprecatedString.h>
#include <AK/IPv4Address.h>
#include <AK/JsonObject.h>
#include <AK/JsonParser.h>
#include <Applications/NetworkSettings/NetworkSettingsGML.h>
#include <LibCore/Command.h>
#include <LibCore/System.h>
#include <LibGUI/CheckBox.h>
#include <LibGUI/ComboBox.h>
#include <LibGUI/ItemListModel.h>
@ -18,6 +20,7 @@
#include <LibGUI/Process.h>
#include <LibGUI/SpinBox.h>
#include <LibGUI/TextBox.h>
#include <unistd.h>
namespace NetworkSettings {
@ -134,27 +137,68 @@ void NetworkSettingsWidget::on_switch_enabled_or_dhcp()
void NetworkSettingsWidget::apply_settings()
{
auto config_file = Core::ConfigFile::open_for_system("Network", Core::ConfigFile::AllowWriting::Yes).release_value_but_fixme_should_propagate_errors();
for (auto const& adapter_data : m_network_adapters) {
auto netmask = IPv4Address::netmask_from_cidr(adapter_data.value.cidr).to_deprecated_string();
config_file->write_bool_entry(adapter_data.key, "Enabled", adapter_data.value.enabled);
config_file->write_bool_entry(adapter_data.key, "DHCP", adapter_data.value.dhcp);
if (adapter_data.value.enabled && !adapter_data.value.dhcp) {
if (!IPv4Address::from_string(adapter_data.value.ip_address).has_value()) {
GUI::MessageBox::show_error(window(), DeprecatedString::formatted("Invalid IPv4 address for adapter {}", adapter_data.key));
return;
}
if (!IPv4Address::from_string(adapter_data.value.default_gateway).has_value()) {
GUI::MessageBox::show_error(window(), DeprecatedString::formatted("Invalid IPv4 gateway for adapter {}", adapter_data.key));
return;
}
}
config_file->write_entry(adapter_data.key, "IPv4Address", adapter_data.value.ip_address);
config_file->write_entry(adapter_data.key, "IPv4Netmask", netmask);
config_file->write_entry(adapter_data.key, "IPv4Gateway", adapter_data.value.default_gateway);
auto result = apply_settings_impl();
if (result.is_error()) {
GUI::MessageBox::show_error(window(), result.release_error().string_literal());
return;
}
}
ErrorOr<void> NetworkSettingsWidget::apply_settings_impl()
{
auto maybe_json = TRY(create_settings_object());
if (!maybe_json.has_value() || maybe_json.value().is_empty())
return {};
auto json = maybe_json.release_value();
auto pipefds = TRY(Core::System::pipe2(O_CLOEXEC));
ScopeGuard guard_fd1 { [&] { close(pipefds[1]); } };
{
posix_spawn_file_actions_t file_actions;
posix_spawn_file_actions_init(&file_actions);
posix_spawn_file_actions_adddup2(&file_actions, pipefds[0], STDIN_FILENO);
ScopeGuard guard_fd0_and_file_actions { [&]() {
posix_spawn_file_actions_destroy(&file_actions);
close(pipefds[0]);
} };
char const* argv[] = { "/bin/Escalator", "-I", "-P", "To apply these changes please enter your password:", "/bin/network-settings", nullptr };
(void)TRY(Core::System::posix_spawn("/bin/Escalator"sv, &file_actions, nullptr, const_cast<char**>(argv), environ));
auto outfile = TRY(Core::File::adopt_fd(pipefds[1], Core::File::OpenMode::Write, Core::File::ShouldCloseFileDescriptor::No));
TRY(outfile->write_until_depleted(json.serialized<StringBuilder>().bytes()));
}
GUI::Process::spawn_or_show_error(window(), "/bin/NetworkServer"sv);
return {};
}
ErrorOr<Optional<JsonObject>> NetworkSettingsWidget::create_settings_object()
{
auto json = JsonObject();
for (auto const& adapter_data : m_network_adapters) {
auto netmask = TRY(IPv4Address::netmask_from_cidr(adapter_data.value.cidr).to_string());
if (adapter_data.value.enabled && !adapter_data.value.dhcp) {
if (!IPv4Address::from_string(adapter_data.value.ip_address).has_value()) {
GUI::MessageBox::show_error(window(), TRY(String::formatted("Invalid IPv4 address for adapter {}", adapter_data.key)));
return Optional<JsonObject> {};
}
if (!IPv4Address::from_string(adapter_data.value.default_gateway).has_value()) {
GUI::MessageBox::show_error(window(), TRY(String::formatted("Invalid IPv4 gateway for adapter {}", adapter_data.key)));
return Optional<JsonObject> {};
}
}
auto adapter = JsonObject();
adapter.set("Enabled", adapter_data.value.enabled);
adapter.set("DHCP", adapter_data.value.dhcp);
adapter.set("IPv4Address", adapter_data.value.ip_address);
adapter.set("IPv4Netmask", netmask.to_deprecated_string());
adapter.set("IPv4Gateway", adapter_data.value.default_gateway);
json.set(adapter_data.key, move(adapter));
}
return json;
}
void NetworkSettingsWidget::switch_adapter(DeprecatedString const& adapter)

2
Userland/Applications/NetworkSettings/NetworkSettingsWidget.h
View File

@ -32,6 +32,8 @@ private:
void on_switch_adapter(DeprecatedString const& adapter);
void on_switch_enabled_or_dhcp();
ErrorOr<void> apply_settings_impl();
ErrorOr<Optional<JsonObject>> create_settings_object();
HashMap<DeprecatedString, NetworkAdapterData> m_network_adapters;
Vector<DeprecatedString> m_adapter_names;

4
Userland/Applications/NetworkSettings/main.cpp
View File

@ -19,8 +19,8 @@ ErrorOr<int> serenity_main(Main::Arguments args)
{
TRY(Core::System::pledge("stdio rpath wpath cpath recvfd sendfd unix proc exec"));
TRY(Core::System::unveil("/bin/NetworkServer", "x"));
TRY(Core::System::unveil("/etc/Network.ini", "rwc"));
TRY(Core::System::unveil("/bin/Escalator", "x"));
TRY(Core::System::unveil("/etc/Network.ini", "r"));
TRY(Core::System::unveil("/sys/kernel/net/adapters", "r"));
TRY(Core::System::unveil("/res", "r"));
TRY(Core::System::unveil("/tmp/session/%sid/portal/clipboard", "rw"));