Skip to content

Do not block on request input#31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EddyTheCo merged 3 commits into from
Apr 16, 2026
Merged

Do not block on request input #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae3cd5b
gagent: Do not block when requesting input
EddyTheCo Apr 15, 2026
a34598e
gconnman_manager: Do not lock services more than needed
EddyTheCo Apr 16, 2026
895478f
gconnman_manager: Fix parsing fields memory leak
EddyTheCo Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/amarula/dbus/connman/gagent.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class Connman;
class Agent {
GDBusNodeInfo *node_info_;
guint registration_id_{0};
GDBusConnection *connection_{nullptr};
DBus *dbus_;
std::string path_{"/net/amarula/gconnman/agent"};

explicit Agent(DBus *dbus, const std::string &path = std::string());
Expand Down
47 changes: 37 additions & 10 deletions src/dbus/gconnman_agent.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,7 @@ static constexpr const char *INTROSPECTION_XML =
" </interface>"
"</node>";

Agent::Agent(DBus *dbus, const std::string &path)
: connection_{dbus->connection()} {
Agent::Agent(DBus *dbus, const std::string &path) : dbus_{dbus} {
if (!path.empty()) {
path_ = path;
}
Expand DownExpand Up@@ -61,7 +60,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
GError *err = nullptr;

data->self->registration_id_ = g_dbus_connection_register_object(
data->self->connection_, data->self->path_.c_str(),
data->self->dbus_->connection(), data->self->path_.c_str(),
*(data->self->node_info_->interfaces), &INTERFACE_VTABLE,
data->self, nullptr, &err);

Expand DownExpand Up@@ -94,7 +93,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
}
}
Agent::~Agent() {
g_dbus_connection_unregister_object(connection_, registration_id_);
g_dbus_connection_unregister_object(dbus_->connection(), registration_id_);
g_dbus_node_info_unref(node_info_);
}

Expand All@@ -120,17 +119,45 @@ void Agent::dispatch_method_call(GDBusMethodInvocation *invocation,
GVariant *child_fields = g_variant_get_child_value(parameters, 1);

service = g_variant_get_string(child_service, nullptr);
std::string service_str(service);
fields = g_variant_ref(child_fields);

g_variant_unref(child_service);
g_variant_unref(child_fields);

auto *result = request_input_cb_(service, fields);

GVariant *tuple = g_variant_new_tuple(&result, 1);

g_dbus_method_invocation_return_value(invocation, tuple);
g_variant_unref(fields);
g_object_ref(invocation);

std::thread([ctx = dbus_->context(), callback = request_input_cb_,
invocation, service_str = std::move(service_str),
fields]() {
GVariant *result = callback(service_str.c_str(), fields);
g_variant_unref(fields);

struct Data {
GDBusMethodInvocation *invocation;
GVariant *result;
};

auto data = std::make_unique<Data>(
Data{.invocation = invocation, .result = result});

g_main_context_invoke_full(
ctx, G_PRIORITY_DEFAULT,
[](gpointer user_data) -> gboolean {
auto *data = static_cast<Data *>(user_data);

GVariant *tuple = g_variant_new_tuple(&data->result, 1);
g_dbus_method_invocation_return_value(data->invocation,
tuple);

return G_SOURCE_REMOVE;
},
data.release(),
[](gpointer user_data) {
std::unique_ptr<Data> data(static_cast<Data *>(user_data));
g_object_unref(data->invocation);
});
}).detach();
Comment thread
EddyTheCo marked this conversation as resolved.
return;
}

Expand Down
46 changes: 33 additions & 13 deletions src/dbus/gconnman_manager.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,22 +89,30 @@ void Manager::process_services_changed(
void Manager::setup_agent() {
agent_->set_request_input_handler([this](const gchar* service_path,
GVariant* fields) -> GVariant* {
std::lock_guard<std::mutex> const lock(mtx_);
GVariantBuilder builder;
g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
auto service_it = std::ranges::find_if(
services_, [&service_path](const auto& service) {
return service->objPath() == service_path;
});

if (service_it != services_.end()) {
std::shared_ptr<Service> found_service;
{
std::lock_guard<std::mutex> const lock(mtx_);
auto service_it = std::ranges::find_if(
services_, [&service_path](const auto& service) {
return service->objPath() == service_path;
});
if (service_it != services_.end()) {
found_service = *service_it;
}
}

if (found_service) {
auto* parsed_fields = parse_fields(fields);
auto input_requested = classify_input(parsed_fields);
g_ptr_array_unref(parsed_fields);
switch (input_requested) {
case InputType::InputWpA2Passphrase:
if (request_input_passphrase_cb_ != nullptr) {
const auto passphrase =
request_input_passphrase_cb_(*service_it);
request_input_passphrase_cb_(found_service);
g_variant_builder_add(
&builder, "{sv}", "Passphrase",
g_variant_new_string(passphrase.second.c_str()));
Expand All@@ -113,7 +121,7 @@ void Manager::setup_agent() {
case InputType::InputWpA2PassphraseWpsAlternative:
if (request_input_passphrase_cb_ != nullptr) {
const auto passphrase =
request_input_passphrase_cb_(*service_it);
request_input_passphrase_cb_(found_service);

g_variant_builder_add(
&builder, "{sv}",
Expand All@@ -123,8 +131,8 @@ void Manager::setup_agent() {
break;
case InputType::InputHiddenNetworkName:
if (request_input_hidden_network_name_cb_ != nullptr) {
const auto name =
request_input_hidden_network_name_cb_(*service_it);
const auto name = request_input_hidden_network_name_cb_(
found_service);

GVariant* value = nullptr;
if (name.first) {
Expand All@@ -144,7 +152,7 @@ void Manager::setup_agent() {
case InputType::InputWpaEnterprise:
if (request_input_wpa_enterprise_cb_ != nullptr) {
const auto identity_password =
request_input_wpa_enterprise_cb_(*service_it);
request_input_wpa_enterprise_cb_(found_service);

g_variant_builder_add(
&builder, "{sv}", "Identity",
Expand DownExpand Up@@ -173,7 +181,7 @@ void Manager::setup_agent() {
case InputType::InputWispr:
if (request_input_wispr_enabled_cb_ != nullptr) {
const auto user_password =
request_input_wispr_enabled_cb_(*service_it);
request_input_wispr_enabled_cb_(found_service);

g_variant_builder_add(
&builder, "{sv}", "Username",
Expand DownExpand Up@@ -387,8 +395,20 @@ using FieldDescription = struct {
gchar* requirement;
};

static void field_description_free(gpointer data) {
auto* desc = static_cast<FieldDescription*>(data);
if (desc == nullptr) {
return;
}

g_free(desc->field_name);
g_free(desc->type);
g_free(desc->requirement);
g_free(desc);
}

auto Manager::parse_fields(GVariant* fields) -> GPtrArray* {
GPtrArray* array = g_ptr_array_new_with_free_func(g_free);
GPtrArray* array = g_ptr_array_new_with_free_func(field_description_free);

GVariantIter iter;
const gchar* field_name = nullptr;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Do not block on request input by EddyTheCo · Pull Request #31 · amarula/libcppconnman · GitHub
Skip to content
Do not block on request input#31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EddyTheCo
merged 3 commits into

from

Apr 16, 2026
 Merged


Do not block on request input
#31
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ae3cd5b

gagent: Do not block when requesting input


EddyTheCo Apr 15, 2026
a34598e

gconnman_manager: Do not lock services more than needed


EddyTheCo Apr 16, 2026
895478f

gconnman_manager: Fix parsing fields memory leak


EddyTheCo Apr 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class Connman;
class Agent {
 GDBusNodeInfo *node_info_;
 guint registration_id_{0};
GDBusConnection *connection_{nullptr};
DBus *dbus_;
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(DBus *dbus, const std::string &path = std::string());
Expand Down

47 changes: 37 additions & 10 deletions
src/dbus/gconnman_agent.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,7 @@ static constexpr const char *INTROSPECTION_XML =
 " </interface>"
 "</node>";

Agent::Agent(DBus *dbus, const std::string &path)
 : connection_{dbus->connection()} {
Agent::Agent(DBus *dbus, const std::string &path) : dbus_{dbus} {
 if (!path.empty()) {
 path_ = path;
 }
Expand DownExpand Up@@ -61,7 +60,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 GError *err = nullptr;

 data->self->registration_id_ = g_dbus_connection_register_object(
 data->self->connection_, data->self->path_.c_str(),
 data->self->dbus_->connection(), data->self->path_.c_str(),
 *(data->self->node_info_->interfaces), &INTERFACE_VTABLE,
 data->self, nullptr, &err);

Expand DownExpand Up@@ -94,7 +93,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 }
}
Agent::~Agent() {
 g_dbus_connection_unregister_object(connection_, registration_id_);
 g_dbus_connection_unregister_object(dbus_->connection(), registration_id_);
 g_dbus_node_info_unref(node_info_);
}

Expand All@@ -120,17 +119,45 @@ void Agent::dispatch_method_call(GDBusMethodInvocation *invocation,
 GVariant *child_fields = g_variant_get_child_value(parameters, 1);

 service = g_variant_get_string(child_service, nullptr);
 std::string service_str(service);
 fields = g_variant_ref(child_fields);

 g_variant_unref(child_service);
 g_variant_unref(child_fields);

 auto *result = request_input_cb_(service, fields);

 GVariant *tuple = g_variant_new_tuple(&result, 1);

 g_dbus_method_invocation_return_value(invocation, tuple);
 g_variant_unref(fields);
 g_object_ref(invocation);

 std::thread([ctx = dbus_->context(), callback = request_input_cb_,
 invocation, service_str = std::move(service_str),
 fields]() {
 GVariant *result = callback(service_str.c_str(), fields);
 g_variant_unref(fields);

 struct Data {
 GDBusMethodInvocation *invocation;
 GVariant *result;
 };

 auto data = std::make_unique<Data>(
 Data{.invocation = invocation, .result = result});

 g_main_context_invoke_full(
 ctx, G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto *data = static_cast<Data *>(user_data);

 GVariant *tuple = g_variant_new_tuple(&data->result, 1);
 g_dbus_method_invocation_return_value(data->invocation,
 tuple);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data *>(user_data));
 g_object_unref(data->invocation);
 });
 }).detach();
Comment thread
EddyTheCo marked this conversation as resolved.

 return;
 }

Expand Down

46 changes: 33 additions & 13 deletions
src/dbus/gconnman_manager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,22 +89,30 @@ void Manager::process_services_changed(
void Manager::setup_agent() {
 agent_->set_request_input_handler([this](const gchar* service_path,
 GVariant* fields) -> GVariant* {
 std::lock_guard<std::mutex> const lock(mtx_);
 GVariantBuilder builder;
 g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });

 if (service_it != services_.end()) {
 std::shared_ptr<Service> found_service;
 {
 std::lock_guard<std::mutex> const lock(mtx_);
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });
 if (service_it != services_.end()) {
 found_service = *service_it;
 }
 }

 if (found_service) {
 auto* parsed_fields = parse_fields(fields);
 auto input_requested = classify_input(parsed_fields);
 g_ptr_array_unref(parsed_fields);
 switch (input_requested) {
 case InputType::InputWpA2Passphrase:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);
 g_variant_builder_add(
 &builder, "{sv}", "Passphrase",
 g_variant_new_string(passphrase.second.c_str()));
Expand All@@ -113,7 +121,7 @@ void Manager::setup_agent() {
 case InputType::InputWpA2PassphraseWpsAlternative:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}",
Expand All@@ -123,8 +131,8 @@ void Manager::setup_agent() {
 break;
 case InputType::InputHiddenNetworkName:
 if (request_input_hidden_network_name_cb_ != nullptr) {
 const auto name =
request_input_hidden_network_name_cb_(*service_it);
 const auto name = request_input_hidden_network_name_cb_(
found_service);

 GVariant* value = nullptr;
 if (name.first) {
Expand All@@ -144,7 +152,7 @@ void Manager::setup_agent() {
 case InputType::InputWpaEnterprise:
 if (request_input_wpa_enterprise_cb_ != nullptr) {
 const auto identity_password =
 request_input_wpa_enterprise_cb_(*service_it);
 request_input_wpa_enterprise_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Identity",
Expand DownExpand Up@@ -173,7 +181,7 @@ void Manager::setup_agent() {
 case InputType::InputWispr:
 if (request_input_wispr_enabled_cb_ != nullptr) {
 const auto user_password =
 request_input_wispr_enabled_cb_(*service_it);
 request_input_wispr_enabled_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Username",
Expand DownExpand Up@@ -387,8 +395,20 @@ using FieldDescription = struct {
 gchar* requirement;
};

static void field_description_free(gpointer data) {
 auto* desc = static_cast<FieldDescription*>(data);
 if (desc == nullptr) {
 return;
 }

 g_free(desc->field_name);
 g_free(desc->type);
 g_free(desc->requirement);
 g_free(desc);
}

auto Manager::parse_fields(GVariant* fields) -> GPtrArray* {
 GPtrArray* array = g_ptr_array_new_with_free_func(g_free);
 GPtrArray* array = g_ptr_array_new_with_free_func(field_description_free);

 GVariantIter iter;
 const gchar* field_name = nullptr;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Do not block on request input by EddyTheCo · Pull Request #31 · amarula/libcppconnman · GitHub
Skip to content
Do not block on request input#31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EddyTheCo
merged 3 commits into

from

Apr 16, 2026
 Merged


Do not block on request input
#31
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ae3cd5b

gagent: Do not block when requesting input


EddyTheCo Apr 15, 2026
a34598e

gconnman_manager: Do not lock services more than needed


EddyTheCo Apr 16, 2026
895478f

gconnman_manager: Fix parsing fields memory leak


EddyTheCo Apr 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class Connman;
class Agent {
 GDBusNodeInfo *node_info_;
 guint registration_id_{0};
GDBusConnection *connection_{nullptr};
DBus *dbus_;
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(DBus *dbus, const std::string &path = std::string());
Expand Down

47 changes: 37 additions & 10 deletions
src/dbus/gconnman_agent.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,7 @@ static constexpr const char *INTROSPECTION_XML =
 " </interface>"
 "</node>";

Agent::Agent(DBus *dbus, const std::string &path)
 : connection_{dbus->connection()} {
Agent::Agent(DBus *dbus, const std::string &path) : dbus_{dbus} {
 if (!path.empty()) {
 path_ = path;
 }
Expand DownExpand Up@@ -61,7 +60,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 GError *err = nullptr;

 data->self->registration_id_ = g_dbus_connection_register_object(
 data->self->connection_, data->self->path_.c_str(),
 data->self->dbus_->connection(), data->self->path_.c_str(),
 *(data->self->node_info_->interfaces), &INTERFACE_VTABLE,
 data->self, nullptr, &err);

Expand DownExpand Up@@ -94,7 +93,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 }
}
Agent::~Agent() {
 g_dbus_connection_unregister_object(connection_, registration_id_);
 g_dbus_connection_unregister_object(dbus_->connection(), registration_id_);
 g_dbus_node_info_unref(node_info_);
}

Expand All@@ -120,17 +119,45 @@ void Agent::dispatch_method_call(GDBusMethodInvocation *invocation,
 GVariant *child_fields = g_variant_get_child_value(parameters, 1);

 service = g_variant_get_string(child_service, nullptr);
 std::string service_str(service);
 fields = g_variant_ref(child_fields);

 g_variant_unref(child_service);
 g_variant_unref(child_fields);

 auto *result = request_input_cb_(service, fields);

 GVariant *tuple = g_variant_new_tuple(&result, 1);

 g_dbus_method_invocation_return_value(invocation, tuple);
 g_variant_unref(fields);
 g_object_ref(invocation);

 std::thread([ctx = dbus_->context(), callback = request_input_cb_,
 invocation, service_str = std::move(service_str),
 fields]() {
 GVariant *result = callback(service_str.c_str(), fields);
 g_variant_unref(fields);

 struct Data {
 GDBusMethodInvocation *invocation;
 GVariant *result;
 };

 auto data = std::make_unique<Data>(
 Data{.invocation = invocation, .result = result});

 g_main_context_invoke_full(
 ctx, G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto *data = static_cast<Data *>(user_data);

 GVariant *tuple = g_variant_new_tuple(&data->result, 1);
 g_dbus_method_invocation_return_value(data->invocation,
 tuple);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data *>(user_data));
 g_object_unref(data->invocation);
 });
 }).detach();
Comment thread
EddyTheCo marked this conversation as resolved.

 return;
 }

Expand Down

46 changes: 33 additions & 13 deletions
src/dbus/gconnman_manager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,22 +89,30 @@ void Manager::process_services_changed(
void Manager::setup_agent() {
 agent_->set_request_input_handler([this](const gchar* service_path,
 GVariant* fields) -> GVariant* {
 std::lock_guard<std::mutex> const lock(mtx_);
 GVariantBuilder builder;
 g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });

 if (service_it != services_.end()) {
 std::shared_ptr<Service> found_service;
 {
 std::lock_guard<std::mutex> const lock(mtx_);
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });
 if (service_it != services_.end()) {
 found_service = *service_it;
 }
 }

 if (found_service) {
 auto* parsed_fields = parse_fields(fields);
 auto input_requested = classify_input(parsed_fields);
 g_ptr_array_unref(parsed_fields);
 switch (input_requested) {
 case InputType::InputWpA2Passphrase:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);
 g_variant_builder_add(
 &builder, "{sv}", "Passphrase",
 g_variant_new_string(passphrase.second.c_str()));
Expand All@@ -113,7 +121,7 @@ void Manager::setup_agent() {
 case InputType::InputWpA2PassphraseWpsAlternative:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}",
Expand All@@ -123,8 +131,8 @@ void Manager::setup_agent() {
 break;
 case InputType::InputHiddenNetworkName:
 if (request_input_hidden_network_name_cb_ != nullptr) {
 const auto name =
request_input_hidden_network_name_cb_(*service_it);
 const auto name = request_input_hidden_network_name_cb_(
found_service);

 GVariant* value = nullptr;
 if (name.first) {
Expand All@@ -144,7 +152,7 @@ void Manager::setup_agent() {
 case InputType::InputWpaEnterprise:
 if (request_input_wpa_enterprise_cb_ != nullptr) {
 const auto identity_password =
 request_input_wpa_enterprise_cb_(*service_it);
 request_input_wpa_enterprise_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Identity",
Expand DownExpand Up@@ -173,7 +181,7 @@ void Manager::setup_agent() {
 case InputType::InputWispr:
 if (request_input_wispr_enabled_cb_ != nullptr) {
 const auto user_password =
 request_input_wispr_enabled_cb_(*service_it);
 request_input_wispr_enabled_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Username",
Expand DownExpand Up@@ -387,8 +395,20 @@ using FieldDescription = struct {
 gchar* requirement;
};

static void field_description_free(gpointer data) {
 auto* desc = static_cast<FieldDescription*>(data);
 if (desc == nullptr) {
 return;
 }

 g_free(desc->field_name);
 g_free(desc->type);
 g_free(desc->requirement);
 g_free(desc);
}

auto Manager::parse_fields(GVariant* fields) -> GPtrArray* {
 GPtrArray* array = g_ptr_array_new_with_free_func(g_free);
 GPtrArray* array = g_ptr_array_new_with_free_func(field_description_free);

 GVariantIter iter;
 const gchar* field_name = nullptr;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Do not block on request input by EddyTheCo · Pull Request #31 · amarula/libcppconnman · GitHub
Skip to content
Do not block on request input#31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EddyTheCo
merged 3 commits into

from

Apr 16, 2026
 Merged


Do not block on request input
#31
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ae3cd5b

gagent: Do not block when requesting input


EddyTheCo Apr 15, 2026
a34598e

gconnman_manager: Do not lock services more than needed


EddyTheCo Apr 16, 2026
895478f

gconnman_manager: Fix parsing fields memory leak


EddyTheCo Apr 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class Connman;
class Agent {
 GDBusNodeInfo *node_info_;
 guint registration_id_{0};
GDBusConnection *connection_{nullptr};
DBus *dbus_;
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(DBus *dbus, const std::string &path = std::string());
Expand Down

47 changes: 37 additions & 10 deletions
src/dbus/gconnman_agent.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,7 @@ static constexpr const char *INTROSPECTION_XML =
 " </interface>"
 "</node>";

Agent::Agent(DBus *dbus, const std::string &path)
 : connection_{dbus->connection()} {
Agent::Agent(DBus *dbus, const std::string &path) : dbus_{dbus} {
 if (!path.empty()) {
 path_ = path;
 }
Expand DownExpand Up@@ -61,7 +60,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 GError *err = nullptr;

 data->self->registration_id_ = g_dbus_connection_register_object(
 data->self->connection_, data->self->path_.c_str(),
 data->self->dbus_->connection(), data->self->path_.c_str(),
 *(data->self->node_info_->interfaces), &INTERFACE_VTABLE,
 data->self, nullptr, &err);

Expand DownExpand Up@@ -94,7 +93,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 }
}
Agent::~Agent() {
 g_dbus_connection_unregister_object(connection_, registration_id_);
 g_dbus_connection_unregister_object(dbus_->connection(), registration_id_);
 g_dbus_node_info_unref(node_info_);
}

Expand All@@ -120,17 +119,45 @@ void Agent::dispatch_method_call(GDBusMethodInvocation *invocation,
 GVariant *child_fields = g_variant_get_child_value(parameters, 1);

 service = g_variant_get_string(child_service, nullptr);
 std::string service_str(service);
 fields = g_variant_ref(child_fields);

 g_variant_unref(child_service);
 g_variant_unref(child_fields);

 auto *result = request_input_cb_(service, fields);

 GVariant *tuple = g_variant_new_tuple(&result, 1);

 g_dbus_method_invocation_return_value(invocation, tuple);
 g_variant_unref(fields);
 g_object_ref(invocation);

 std::thread([ctx = dbus_->context(), callback = request_input_cb_,
 invocation, service_str = std::move(service_str),
 fields]() {
 GVariant *result = callback(service_str.c_str(), fields);
 g_variant_unref(fields);

 struct Data {
 GDBusMethodInvocation *invocation;
 GVariant *result;
 };

 auto data = std::make_unique<Data>(
 Data{.invocation = invocation, .result = result});

 g_main_context_invoke_full(
 ctx, G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto *data = static_cast<Data *>(user_data);

 GVariant *tuple = g_variant_new_tuple(&data->result, 1);
 g_dbus_method_invocation_return_value(data->invocation,
 tuple);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data *>(user_data));
 g_object_unref(data->invocation);
 });
 }).detach();
Comment thread
EddyTheCo marked this conversation as resolved.

 return;
 }

Expand Down

46 changes: 33 additions & 13 deletions
src/dbus/gconnman_manager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,22 +89,30 @@ void Manager::process_services_changed(
void Manager::setup_agent() {
 agent_->set_request_input_handler([this](const gchar* service_path,
 GVariant* fields) -> GVariant* {
 std::lock_guard<std::mutex> const lock(mtx_);
 GVariantBuilder builder;
 g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });

 if (service_it != services_.end()) {
 std::shared_ptr<Service> found_service;
 {
 std::lock_guard<std::mutex> const lock(mtx_);
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });
 if (service_it != services_.end()) {
 found_service = *service_it;
 }
 }

 if (found_service) {
 auto* parsed_fields = parse_fields(fields);
 auto input_requested = classify_input(parsed_fields);
 g_ptr_array_unref(parsed_fields);
 switch (input_requested) {
 case InputType::InputWpA2Passphrase:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);
 g_variant_builder_add(
 &builder, "{sv}", "Passphrase",
 g_variant_new_string(passphrase.second.c_str()));
Expand All@@ -113,7 +121,7 @@ void Manager::setup_agent() {
 case InputType::InputWpA2PassphraseWpsAlternative:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}",
Expand All@@ -123,8 +131,8 @@ void Manager::setup_agent() {
 break;
 case InputType::InputHiddenNetworkName:
 if (request_input_hidden_network_name_cb_ != nullptr) {
 const auto name =
request_input_hidden_network_name_cb_(*service_it);
 const auto name = request_input_hidden_network_name_cb_(
found_service);

 GVariant* value = nullptr;
 if (name.first) {
Expand All@@ -144,7 +152,7 @@ void Manager::setup_agent() {
 case InputType::InputWpaEnterprise:
 if (request_input_wpa_enterprise_cb_ != nullptr) {
 const auto identity_password =
 request_input_wpa_enterprise_cb_(*service_it);
 request_input_wpa_enterprise_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Identity",
Expand DownExpand Up@@ -173,7 +181,7 @@ void Manager::setup_agent() {
 case InputType::InputWispr:
 if (request_input_wispr_enabled_cb_ != nullptr) {
 const auto user_password =
 request_input_wispr_enabled_cb_(*service_it);
 request_input_wispr_enabled_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Username",
Expand DownExpand Up@@ -387,8 +395,20 @@ using FieldDescription = struct {
 gchar* requirement;
};

static void field_description_free(gpointer data) {
 auto* desc = static_cast<FieldDescription*>(data);
 if (desc == nullptr) {
 return;
 }

 g_free(desc->field_name);
 g_free(desc->type);
 g_free(desc->requirement);
 g_free(desc);
}

auto Manager::parse_fields(GVariant* fields) -> GPtrArray* {
 GPtrArray* array = g_ptr_array_new_with_free_func(g_free);
 GPtrArray* array = g_ptr_array_new_with_free_func(field_description_free);

 GVariantIter iter;
 const gchar* field_name = nullptr;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Do not block on request input by EddyTheCo · Pull Request #31 · amarula/libcppconnman · GitHub
Skip to content
Do not block on request input#31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EddyTheCo
merged 3 commits into

from

Apr 16, 2026
 Merged


Do not block on request input
#31
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ae3cd5b

gagent: Do not block when requesting input


EddyTheCo Apr 15, 2026
a34598e

gconnman_manager: Do not lock services more than needed


EddyTheCo Apr 16, 2026
895478f

gconnman_manager: Fix parsing fields memory leak


EddyTheCo Apr 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class Connman;
class Agent {
 GDBusNodeInfo *node_info_;
 guint registration_id_{0};
GDBusConnection *connection_{nullptr};
DBus *dbus_;
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(DBus *dbus, const std::string &path = std::string());
Expand Down

47 changes: 37 additions & 10 deletions
src/dbus/gconnman_agent.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,7 @@ static constexpr const char *INTROSPECTION_XML =
 " </interface>"
 "</node>";

Agent::Agent(DBus *dbus, const std::string &path)
 : connection_{dbus->connection()} {
Agent::Agent(DBus *dbus, const std::string &path) : dbus_{dbus} {
 if (!path.empty()) {
 path_ = path;
 }
Expand DownExpand Up@@ -61,7 +60,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 GError *err = nullptr;

 data->self->registration_id_ = g_dbus_connection_register_object(
 data->self->connection_, data->self->path_.c_str(),
 data->self->dbus_->connection(), data->self->path_.c_str(),
 *(data->self->node_info_->interfaces), &INTERFACE_VTABLE,
 data->self, nullptr, &err);

Expand DownExpand Up@@ -94,7 +93,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 }
}
Agent::~Agent() {
 g_dbus_connection_unregister_object(connection_, registration_id_);
 g_dbus_connection_unregister_object(dbus_->connection(), registration_id_);
 g_dbus_node_info_unref(node_info_);
}

Expand All@@ -120,17 +119,45 @@ void Agent::dispatch_method_call(GDBusMethodInvocation *invocation,
 GVariant *child_fields = g_variant_get_child_value(parameters, 1);

 service = g_variant_get_string(child_service, nullptr);
 std::string service_str(service);
 fields = g_variant_ref(child_fields);

 g_variant_unref(child_service);
 g_variant_unref(child_fields);

 auto *result = request_input_cb_(service, fields);

 GVariant *tuple = g_variant_new_tuple(&result, 1);

 g_dbus_method_invocation_return_value(invocation, tuple);
 g_variant_unref(fields);
 g_object_ref(invocation);

 std::thread([ctx = dbus_->context(), callback = request_input_cb_,
 invocation, service_str = std::move(service_str),
 fields]() {
 GVariant *result = callback(service_str.c_str(), fields);
 g_variant_unref(fields);

 struct Data {
 GDBusMethodInvocation *invocation;
 GVariant *result;
 };

 auto data = std::make_unique<Data>(
 Data{.invocation = invocation, .result = result});

 g_main_context_invoke_full(
 ctx, G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto *data = static_cast<Data *>(user_data);

 GVariant *tuple = g_variant_new_tuple(&data->result, 1);
 g_dbus_method_invocation_return_value(data->invocation,
 tuple);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data *>(user_data));
 g_object_unref(data->invocation);
 });
 }).detach();
Comment thread
EddyTheCo marked this conversation as resolved.

 return;
 }

Expand Down

46 changes: 33 additions & 13 deletions
src/dbus/gconnman_manager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,22 +89,30 @@ void Manager::process_services_changed(
void Manager::setup_agent() {
 agent_->set_request_input_handler([this](const gchar* service_path,
 GVariant* fields) -> GVariant* {
 std::lock_guard<std::mutex> const lock(mtx_);
 GVariantBuilder builder;
 g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });

 if (service_it != services_.end()) {
 std::shared_ptr<Service> found_service;
 {
 std::lock_guard<std::mutex> const lock(mtx_);
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });
 if (service_it != services_.end()) {
 found_service = *service_it;
 }
 }

 if (found_service) {
 auto* parsed_fields = parse_fields(fields);
 auto input_requested = classify_input(parsed_fields);
 g_ptr_array_unref(parsed_fields);
 switch (input_requested) {
 case InputType::InputWpA2Passphrase:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);
 g_variant_builder_add(
 &builder, "{sv}", "Passphrase",
 g_variant_new_string(passphrase.second.c_str()));
Expand All@@ -113,7 +121,7 @@ void Manager::setup_agent() {
 case InputType::InputWpA2PassphraseWpsAlternative:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}",
Expand All@@ -123,8 +131,8 @@ void Manager::setup_agent() {
 break;
 case InputType::InputHiddenNetworkName:
 if (request_input_hidden_network_name_cb_ != nullptr) {
 const auto name =
request_input_hidden_network_name_cb_(*service_it);
 const auto name = request_input_hidden_network_name_cb_(
found_service);

 GVariant* value = nullptr;
 if (name.first) {
Expand All@@ -144,7 +152,7 @@ void Manager::setup_agent() {
 case InputType::InputWpaEnterprise:
 if (request_input_wpa_enterprise_cb_ != nullptr) {
 const auto identity_password =
 request_input_wpa_enterprise_cb_(*service_it);
 request_input_wpa_enterprise_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Identity",
Expand DownExpand Up@@ -173,7 +181,7 @@ void Manager::setup_agent() {
 case InputType::InputWispr:
 if (request_input_wispr_enabled_cb_ != nullptr) {
 const auto user_password =
 request_input_wispr_enabled_cb_(*service_it);
 request_input_wispr_enabled_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Username",
Expand DownExpand Up@@ -387,8 +395,20 @@ using FieldDescription = struct {
 gchar* requirement;
};

static void field_description_free(gpointer data) {
 auto* desc = static_cast<FieldDescription*>(data);
 if (desc == nullptr) {
 return;
 }

 g_free(desc->field_name);
 g_free(desc->type);
 g_free(desc->requirement);
 g_free(desc);
}

auto Manager::parse_fields(GVariant* fields) -> GPtrArray* {
 GPtrArray* array = g_ptr_array_new_with_free_func(g_free);
 GPtrArray* array = g_ptr_array_new_with_free_func(field_description_free);

 GVariantIter iter;
 const gchar* field_name = nullptr;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Do not block on request input by EddyTheCo · Pull Request #31 · amarula/libcppconnman · GitHub
Skip to content
Do not block on request input#31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EddyTheCo
merged 3 commits into

from

Apr 16, 2026
 Merged


Do not block on request input
#31
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ae3cd5b

gagent: Do not block when requesting input


EddyTheCo Apr 15, 2026
a34598e

gconnman_manager: Do not lock services more than needed


EddyTheCo Apr 16, 2026
895478f

gconnman_manager: Fix parsing fields memory leak


EddyTheCo Apr 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class Connman;
class Agent {
 GDBusNodeInfo *node_info_;
 guint registration_id_{0};
GDBusConnection *connection_{nullptr};
DBus *dbus_;
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(DBus *dbus, const std::string &path = std::string());
Expand Down

47 changes: 37 additions & 10 deletions
src/dbus/gconnman_agent.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,7 @@ static constexpr const char *INTROSPECTION_XML =
 " </interface>"
 "</node>";

Agent::Agent(DBus *dbus, const std::string &path)
 : connection_{dbus->connection()} {
Agent::Agent(DBus *dbus, const std::string &path) : dbus_{dbus} {
 if (!path.empty()) {
 path_ = path;
 }
Expand DownExpand Up@@ -61,7 +60,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 GError *err = nullptr;

 data->self->registration_id_ = g_dbus_connection_register_object(
 data->self->connection_, data->self->path_.c_str(),
 data->self->dbus_->connection(), data->self->path_.c_str(),
 *(data->self->node_info_->interfaces), &INTERFACE_VTABLE,
 data->self, nullptr, &err);

Expand DownExpand Up@@ -94,7 +93,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 }
}
Agent::~Agent() {
 g_dbus_connection_unregister_object(connection_, registration_id_);
 g_dbus_connection_unregister_object(dbus_->connection(), registration_id_);
 g_dbus_node_info_unref(node_info_);
}

Expand All@@ -120,17 +119,45 @@ void Agent::dispatch_method_call(GDBusMethodInvocation *invocation,
 GVariant *child_fields = g_variant_get_child_value(parameters, 1);

 service = g_variant_get_string(child_service, nullptr);
 std::string service_str(service);
 fields = g_variant_ref(child_fields);

 g_variant_unref(child_service);
 g_variant_unref(child_fields);

 auto *result = request_input_cb_(service, fields);

 GVariant *tuple = g_variant_new_tuple(&result, 1);

 g_dbus_method_invocation_return_value(invocation, tuple);
 g_variant_unref(fields);
 g_object_ref(invocation);

 std::thread([ctx = dbus_->context(), callback = request_input_cb_,
 invocation, service_str = std::move(service_str),
 fields]() {
 GVariant *result = callback(service_str.c_str(), fields);
 g_variant_unref(fields);

 struct Data {
 GDBusMethodInvocation *invocation;
 GVariant *result;
 };

 auto data = std::make_unique<Data>(
 Data{.invocation = invocation, .result = result});

 g_main_context_invoke_full(
 ctx, G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto *data = static_cast<Data *>(user_data);

 GVariant *tuple = g_variant_new_tuple(&data->result, 1);
 g_dbus_method_invocation_return_value(data->invocation,
 tuple);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data *>(user_data));
 g_object_unref(data->invocation);
 });
 }).detach();
Comment thread
EddyTheCo marked this conversation as resolved.

 return;
 }

Expand Down

46 changes: 33 additions & 13 deletions
src/dbus/gconnman_manager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,22 +89,30 @@ void Manager::process_services_changed(
void Manager::setup_agent() {
 agent_->set_request_input_handler([this](const gchar* service_path,
 GVariant* fields) -> GVariant* {
 std::lock_guard<std::mutex> const lock(mtx_);
 GVariantBuilder builder;
 g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });

 if (service_it != services_.end()) {
 std::shared_ptr<Service> found_service;
 {
 std::lock_guard<std::mutex> const lock(mtx_);
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });
 if (service_it != services_.end()) {
 found_service = *service_it;
 }
 }

 if (found_service) {
 auto* parsed_fields = parse_fields(fields);
 auto input_requested = classify_input(parsed_fields);
 g_ptr_array_unref(parsed_fields);
 switch (input_requested) {
 case InputType::InputWpA2Passphrase:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);
 g_variant_builder_add(
 &builder, "{sv}", "Passphrase",
 g_variant_new_string(passphrase.second.c_str()));
Expand All@@ -113,7 +121,7 @@ void Manager::setup_agent() {
 case InputType::InputWpA2PassphraseWpsAlternative:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}",
Expand All@@ -123,8 +131,8 @@ void Manager::setup_agent() {
 break;
 case InputType::InputHiddenNetworkName:
 if (request_input_hidden_network_name_cb_ != nullptr) {
 const auto name =
request_input_hidden_network_name_cb_(*service_it);
 const auto name = request_input_hidden_network_name_cb_(
found_service);

 GVariant* value = nullptr;
 if (name.first) {
Expand All@@ -144,7 +152,7 @@ void Manager::setup_agent() {
 case InputType::InputWpaEnterprise:
 if (request_input_wpa_enterprise_cb_ != nullptr) {
 const auto identity_password =
 request_input_wpa_enterprise_cb_(*service_it);
 request_input_wpa_enterprise_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Identity",
Expand DownExpand Up@@ -173,7 +181,7 @@ void Manager::setup_agent() {
 case InputType::InputWispr:
 if (request_input_wispr_enabled_cb_ != nullptr) {
 const auto user_password =
 request_input_wispr_enabled_cb_(*service_it);
 request_input_wispr_enabled_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Username",
Expand DownExpand Up@@ -387,8 +395,20 @@ using FieldDescription = struct {
 gchar* requirement;
};

static void field_description_free(gpointer data) {
 auto* desc = static_cast<FieldDescription*>(data);
 if (desc == nullptr) {
 return;
 }

 g_free(desc->field_name);
 g_free(desc->type);
 g_free(desc->requirement);
 g_free(desc);
}

auto Manager::parse_fields(GVariant* fields) -> GPtrArray* {
 GPtrArray* array = g_ptr_array_new_with_free_func(g_free);
 GPtrArray* array = g_ptr_array_new_with_free_func(field_description_free);

 GVariantIter iter;
 const gchar* field_name = nullptr;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Do not block on request input by EddyTheCo · Pull Request #31 · amarula/libcppconnman · GitHub
Skip to content
Do not block on request input#31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EddyTheCo
merged 3 commits into

from

Apr 16, 2026
 Merged


Do not block on request input
#31
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ae3cd5b

gagent: Do not block when requesting input


EddyTheCo Apr 15, 2026
a34598e

gconnman_manager: Do not lock services more than needed


EddyTheCo Apr 16, 2026
895478f

gconnman_manager: Fix parsing fields memory leak


EddyTheCo Apr 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class Connman;
class Agent {
 GDBusNodeInfo *node_info_;
 guint registration_id_{0};
GDBusConnection *connection_{nullptr};
DBus *dbus_;
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(DBus *dbus, const std::string &path = std::string());
Expand Down

47 changes: 37 additions & 10 deletions
src/dbus/gconnman_agent.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,7 @@ static constexpr const char *INTROSPECTION_XML =
 " </interface>"
 "</node>";

Agent::Agent(DBus *dbus, const std::string &path)
 : connection_{dbus->connection()} {
Agent::Agent(DBus *dbus, const std::string &path) : dbus_{dbus} {
 if (!path.empty()) {
 path_ = path;
 }
Expand DownExpand Up@@ -61,7 +60,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 GError *err = nullptr;

 data->self->registration_id_ = g_dbus_connection_register_object(
 data->self->connection_, data->self->path_.c_str(),
 data->self->dbus_->connection(), data->self->path_.c_str(),
 *(data->self->node_info_->interfaces), &INTERFACE_VTABLE,
 data->self, nullptr, &err);

Expand DownExpand Up@@ -94,7 +93,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 }
}
Agent::~Agent() {
 g_dbus_connection_unregister_object(connection_, registration_id_);
 g_dbus_connection_unregister_object(dbus_->connection(), registration_id_);
 g_dbus_node_info_unref(node_info_);
}

Expand All@@ -120,17 +119,45 @@ void Agent::dispatch_method_call(GDBusMethodInvocation *invocation,
 GVariant *child_fields = g_variant_get_child_value(parameters, 1);

 service = g_variant_get_string(child_service, nullptr);
 std::string service_str(service);
 fields = g_variant_ref(child_fields);

 g_variant_unref(child_service);
 g_variant_unref(child_fields);

 auto *result = request_input_cb_(service, fields);

 GVariant *tuple = g_variant_new_tuple(&result, 1);

 g_dbus_method_invocation_return_value(invocation, tuple);
 g_variant_unref(fields);
 g_object_ref(invocation);

 std::thread([ctx = dbus_->context(), callback = request_input_cb_,
 invocation, service_str = std::move(service_str),
 fields]() {
 GVariant *result = callback(service_str.c_str(), fields);
 g_variant_unref(fields);

 struct Data {
 GDBusMethodInvocation *invocation;
 GVariant *result;
 };

 auto data = std::make_unique<Data>(
 Data{.invocation = invocation, .result = result});

 g_main_context_invoke_full(
 ctx, G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto *data = static_cast<Data *>(user_data);

 GVariant *tuple = g_variant_new_tuple(&data->result, 1);
 g_dbus_method_invocation_return_value(data->invocation,
 tuple);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data *>(user_data));
 g_object_unref(data->invocation);
 });
 }).detach();
Comment thread
EddyTheCo marked this conversation as resolved.

 return;
 }

Expand Down

46 changes: 33 additions & 13 deletions
src/dbus/gconnman_manager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,22 +89,30 @@ void Manager::process_services_changed(
void Manager::setup_agent() {
 agent_->set_request_input_handler([this](const gchar* service_path,
 GVariant* fields) -> GVariant* {
 std::lock_guard<std::mutex> const lock(mtx_);
 GVariantBuilder builder;
 g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });

 if (service_it != services_.end()) {
 std::shared_ptr<Service> found_service;
 {
 std::lock_guard<std::mutex> const lock(mtx_);
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });
 if (service_it != services_.end()) {
 found_service = *service_it;
 }
 }

 if (found_service) {
 auto* parsed_fields = parse_fields(fields);
 auto input_requested = classify_input(parsed_fields);
 g_ptr_array_unref(parsed_fields);
 switch (input_requested) {
 case InputType::InputWpA2Passphrase:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);
 g_variant_builder_add(
 &builder, "{sv}", "Passphrase",
 g_variant_new_string(passphrase.second.c_str()));
Expand All@@ -113,7 +121,7 @@ void Manager::setup_agent() {
 case InputType::InputWpA2PassphraseWpsAlternative:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}",
Expand All@@ -123,8 +131,8 @@ void Manager::setup_agent() {
 break;
 case InputType::InputHiddenNetworkName:
 if (request_input_hidden_network_name_cb_ != nullptr) {
 const auto name =
request_input_hidden_network_name_cb_(*service_it);
 const auto name = request_input_hidden_network_name_cb_(
found_service);

 GVariant* value = nullptr;
 if (name.first) {
Expand All@@ -144,7 +152,7 @@ void Manager::setup_agent() {
 case InputType::InputWpaEnterprise:
 if (request_input_wpa_enterprise_cb_ != nullptr) {
 const auto identity_password =
 request_input_wpa_enterprise_cb_(*service_it);
 request_input_wpa_enterprise_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Identity",
Expand DownExpand Up@@ -173,7 +181,7 @@ void Manager::setup_agent() {
 case InputType::InputWispr:
 if (request_input_wispr_enabled_cb_ != nullptr) {
 const auto user_password =
 request_input_wispr_enabled_cb_(*service_it);
 request_input_wispr_enabled_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Username",
Expand DownExpand Up@@ -387,8 +395,20 @@ using FieldDescription = struct {
 gchar* requirement;
};

static void field_description_free(gpointer data) {
 auto* desc = static_cast<FieldDescription*>(data);
 if (desc == nullptr) {
 return;
 }

 g_free(desc->field_name);
 g_free(desc->type);
 g_free(desc->requirement);
 g_free(desc);
}

auto Manager::parse_fields(GVariant* fields) -> GPtrArray* {
 GPtrArray* array = g_ptr_array_new_with_free_func(g_free);
 GPtrArray* array = g_ptr_array_new_with_free_func(field_description_free);

 GVariantIter iter;
 const gchar* field_name = nullptr;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Do not block on request input by EddyTheCo · Pull Request #31 · amarula/libcppconnman · GitHub
Skip to content
Do not block on request input#31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

EddyTheCo
merged 3 commits into

from

Apr 16, 2026
 Merged


Do not block on request input
#31
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ae3cd5b

gagent: Do not block when requesting input


EddyTheCo Apr 15, 2026
a34598e

gconnman_manager: Do not lock services more than needed


EddyTheCo Apr 16, 2026
895478f

gconnman_manager: Fix parsing fields memory leak


EddyTheCo Apr 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
include/amarula/dbus/connman/gagent.hpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class Connman;
class Agent {
 GDBusNodeInfo *node_info_;
 guint registration_id_{0};
GDBusConnection *connection_{nullptr};
DBus *dbus_;
 std::string path_{"/net/amarula/gconnman/agent"};

 explicit Agent(DBus *dbus, const std::string &path = std::string());
Expand Down

47 changes: 37 additions & 10 deletions
src/dbus/gconnman_agent.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,7 @@ static constexpr const char *INTROSPECTION_XML =
 " </interface>"
 "</node>";

Agent::Agent(DBus *dbus, const std::string &path)
 : connection_{dbus->connection()} {
Agent::Agent(DBus *dbus, const std::string &path) : dbus_{dbus} {
 if (!path.empty()) {
 path_ = path;
 }
Expand DownExpand Up@@ -61,7 +60,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 GError *err = nullptr;

 data->self->registration_id_ = g_dbus_connection_register_object(
 data->self->connection_, data->self->path_.c_str(),
 data->self->dbus_->connection(), data->self->path_.c_str(),
 *(data->self->node_info_->interfaces), &INTERFACE_VTABLE,
 data->self, nullptr, &err);

Expand DownExpand Up@@ -94,7 +93,7 @@ Agent::Agent(DBus *dbus, const std::string &path)
 }
}
Agent::~Agent() {
 g_dbus_connection_unregister_object(connection_, registration_id_);
 g_dbus_connection_unregister_object(dbus_->connection(), registration_id_);
 g_dbus_node_info_unref(node_info_);
}

Expand All@@ -120,17 +119,45 @@ void Agent::dispatch_method_call(GDBusMethodInvocation *invocation,
 GVariant *child_fields = g_variant_get_child_value(parameters, 1);

 service = g_variant_get_string(child_service, nullptr);
 std::string service_str(service);
 fields = g_variant_ref(child_fields);

 g_variant_unref(child_service);
 g_variant_unref(child_fields);

 auto *result = request_input_cb_(service, fields);

 GVariant *tuple = g_variant_new_tuple(&result, 1);

 g_dbus_method_invocation_return_value(invocation, tuple);
 g_variant_unref(fields);
 g_object_ref(invocation);

 std::thread([ctx = dbus_->context(), callback = request_input_cb_,
 invocation, service_str = std::move(service_str),
 fields]() {
 GVariant *result = callback(service_str.c_str(), fields);
 g_variant_unref(fields);

 struct Data {
 GDBusMethodInvocation *invocation;
 GVariant *result;
 };

 auto data = std::make_unique<Data>(
 Data{.invocation = invocation, .result = result});

 g_main_context_invoke_full(
 ctx, G_PRIORITY_DEFAULT,
 [](gpointer user_data) -> gboolean {
 auto *data = static_cast<Data *>(user_data);

 GVariant *tuple = g_variant_new_tuple(&data->result, 1);
 g_dbus_method_invocation_return_value(data->invocation,
 tuple);

 return G_SOURCE_REMOVE;
 },
 data.release(),
 [](gpointer user_data) {
 std::unique_ptr<Data> data(static_cast<Data *>(user_data));
 g_object_unref(data->invocation);
 });
 }).detach();
Comment thread
EddyTheCo marked this conversation as resolved.

 return;
 }

Expand Down

46 changes: 33 additions & 13 deletions
src/dbus/gconnman_manager.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,22 +89,30 @@ void Manager::process_services_changed(
void Manager::setup_agent() {
 agent_->set_request_input_handler([this](const gchar* service_path,
 GVariant* fields) -> GVariant* {
 std::lock_guard<std::mutex> const lock(mtx_);
 GVariantBuilder builder;
 g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });

 if (service_it != services_.end()) {
 std::shared_ptr<Service> found_service;
 {
 std::lock_guard<std::mutex> const lock(mtx_);
 auto service_it = std::ranges::find_if(
 services_, [&service_path](const auto& service) {
 return service->objPath() == service_path;
 });
 if (service_it != services_.end()) {
 found_service = *service_it;
 }
 }

 if (found_service) {
 auto* parsed_fields = parse_fields(fields);
 auto input_requested = classify_input(parsed_fields);
 g_ptr_array_unref(parsed_fields);
 switch (input_requested) {
 case InputType::InputWpA2Passphrase:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);
 g_variant_builder_add(
 &builder, "{sv}", "Passphrase",
 g_variant_new_string(passphrase.second.c_str()));
Expand All@@ -113,7 +121,7 @@ void Manager::setup_agent() {
 case InputType::InputWpA2PassphraseWpsAlternative:
 if (request_input_passphrase_cb_ != nullptr) {
 const auto passphrase =
 request_input_passphrase_cb_(*service_it);
 request_input_passphrase_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}",
Expand All@@ -123,8 +131,8 @@ void Manager::setup_agent() {
 break;
 case InputType::InputHiddenNetworkName:
 if (request_input_hidden_network_name_cb_ != nullptr) {
 const auto name =
request_input_hidden_network_name_cb_(*service_it);
 const auto name = request_input_hidden_network_name_cb_(
found_service);

 GVariant* value = nullptr;
 if (name.first) {
Expand All@@ -144,7 +152,7 @@ void Manager::setup_agent() {
 case InputType::InputWpaEnterprise:
 if (request_input_wpa_enterprise_cb_ != nullptr) {
 const auto identity_password =
 request_input_wpa_enterprise_cb_(*service_it);
 request_input_wpa_enterprise_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Identity",
Expand DownExpand Up@@ -173,7 +181,7 @@ void Manager::setup_agent() {
 case InputType::InputWispr:
 if (request_input_wispr_enabled_cb_ != nullptr) {
 const auto user_password =
 request_input_wispr_enabled_cb_(*service_it);
 request_input_wispr_enabled_cb_(found_service);

 g_variant_builder_add(
 &builder, "{sv}", "Username",
Expand DownExpand Up@@ -387,8 +395,20 @@ using FieldDescription = struct {
 gchar* requirement;
};

static void field_description_free(gpointer data) {
 auto* desc = static_cast<FieldDescription*>(data);
 if (desc == nullptr) {
 return;
 }

 g_free(desc->field_name);
 g_free(desc->type);
 g_free(desc->requirement);
 g_free(desc);
}

auto Manager::parse_fields(GVariant* fields) -> GPtrArray* {
 GPtrArray* array = g_ptr_array_new_with_free_func(g_free);
 GPtrArray* array = g_ptr_array_new_with_free_func(field_description_free);

 GVariantIter iter;
 const gchar* field_name = nullptr;
Expand Down
Loading