summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Michael Brummer <jan.brummer@tabos.org>2023-03-17 10:33:11 -0400
committerJan-Michael Brummer <jan.brummer@tabos.org>2023-03-27 16:31:58 +0200
commit7f19836b39ab8b14da1b2e2d2bbae9b357090741 (patch)
tree9868f513f37cfec68a029480dd5f897b26295c07
parentf5d530c0badcce82b718b66e7ef0cfe251350b54 (diff)
downloadlibproxy-git-7f19836b39ab8b14da1b2e2d2bbae9b357090741.tar.gz
Handle invalid GNOME configuration (#89)
Fixes: https://github.com/janbrummer/libproxy2/issues/88 Co-authored-by: Jan-Michael Brummer <jan-michael.brummer1@volkswagen.de>
-rw-r--r--src/backend/plugins/config-gnome/config-gnome.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/backend/plugins/config-gnome/config-gnome.c b/src/backend/plugins/config-gnome/config-gnome.c
index e8a58ab..a41f54d 100644
--- a/src/backend/plugins/config-gnome/config-gnome.c
+++ b/src/backend/plugins/config-gnome/config-gnome.c
@@ -148,7 +148,7 @@ store_response (GStrvBuilder *builder,
char *username,
char *password)
{
- if (type && host && port != 0) {
+ if (type && host && strlen (type) > 0 && strlen (host) > 0 && port != 0) {
g_autoptr (GString) tmp = g_string_new (type);
g_string_append (tmp, "://");
@@ -223,6 +223,17 @@ px_config_gnome_get_config (PxConfig *config,
username,
password);
}
+
+ if ((((GPtrArray *)builder)->len == 0) && (g_strcmp0 (scheme, "http") != 0)) {
+ g_autofree char *host = g_settings_get_string (self->http_proxy_settings, "host");
+ store_response (builder,
+ "http",
+ host,
+ g_settings_get_int (self->http_proxy_settings, "port"),
+ auth,
+ username,
+ password);
+ }
}
}