1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
|
From: Kan-Ru Chen <kanru@kanru.info>
Date: Sat, 23 Aug 2025 21:24:07 +0900
Subject: nss-tlsd: migrate to libsoup-3.0
---
meson.build | 2 +-
nss-tlsd.c | 59 +++++++++++++++++++++++++----------------------------------
2 files changed, 26 insertions(+), 35 deletions(-)
diff --git a/meson.build b/meson.build
index 376a824..480b134 100644
--- a/meson.build
+++ b/meson.build
@@ -60,7 +60,7 @@ nss_tlsd = executable('nss-tlsd',
dependency('glib-2.0', version: '>=2.44'),
dependency('gio-2.0'),
dependency('gio-unix-2.0'),
- dependency('libsoup-2.4'),
+ dependency('libsoup-3.0'),
],
install: true,
install_dir: get_option('sbindir'))
diff --git a/nss-tlsd.c b/nss-tlsd.c
index f76d453..5f4d1e1 100644
--- a/nss-tlsd.c
+++ b/nss-tlsd.c
@@ -71,7 +71,7 @@ struct nss_tls_session {
static SoupSession *soup = NULL;
static struct {
- SoupURI *uri;
+ GUri *uri;
gchar *url;
const gchar *domain;
enum nss_tls_methods method;
@@ -154,7 +154,7 @@ add_to_cache (const struct nss_tls_req *req, struct nss_tls_res *res)
}
key = g_strdup (req->name);
- val = g_memdup (res, sizeof (*res));
+ val = g_memdup2 (res, sizeof (*res));
g_hash_table_insert (cache, key, val);
g_debug ("Caching %s until %"G_GINT64_FORMAT, req->name, res->expiry);
@@ -353,20 +353,21 @@ resolve_domain (struct nss_tls_session *session)
flags = soup_message_get_flags (session->message);
soup_message_set_flags (session->message, flags | SOUP_MESSAGE_IDEMPOTENT);
- if (method == NSS_TLS_METHOD_POST) {
- soup_message_set_request (session->message,
- "application/dns-message",
- SOUP_MEMORY_TAKE,
- (const char *)buf,
- (gsize)len);
- }
-
- soup_message_headers_append (session->message->request_headers,
+ soup_message_headers_append (soup_message_get_request_headers (session->message),
"Accept",
"application/dns-message");
+ if (method == NSS_TLS_METHOD_POST) {
+ GBytes *bytes = g_bytes_new_take (buf, (gsize)len);
+ soup_message_set_request_body_from_bytes (session->message,
+ "application/dns-message",
+ bytes);
+ g_bytes_unref (bytes);
+ }
+
soup_session_send_async (soup,
session->message,
+ G_PRIORITY_DEFAULT,
NULL,
on_response,
session);
@@ -611,15 +612,15 @@ on_response (GObject *source_object,
goto cleanup;
}
- if (!SOUP_STATUS_IS_SUCCESSFUL (session->message->status_code)) {
+ if (!SOUP_STATUS_IS_SUCCESSFUL (soup_message_get_status (session->message))) {
g_warning ("Failed to query %s: HTTP %d",
session->request.name,
- session->message->status_code);
+ soup_message_get_status (session->message));
goto cleanup;
}
type = soup_message_headers_get_content_type (
- session->message->response_headers,
+ soup_message_get_response_headers (session->message),
NULL
);
if (type && strcmp (type, "application/dns-message")) {
@@ -813,7 +814,7 @@ update_cfg (const gboolean root)
parse_cfg (root);
for (i = 0; i < pnresolvers; ++i) {
- soup_uri_free (resolvers[i].uri);
+ g_uri_unref (resolvers[i].uri);
g_free (resolvers[i].url);
}
@@ -895,8 +896,8 @@ add_resolver (const char *addr)
} else {
resolvers[nresolvers].url = g_strconcat ("https://", addr, "/dns-query", NULL);
}
- resolvers[nresolvers].uri = soup_uri_new (resolvers[nresolvers].url);
- resolvers[nresolvers].domain = soup_uri_get_host (resolvers[nresolvers].uri);
+ resolvers[nresolvers].uri = g_uri_parse (resolvers[nresolvers].url, G_URI_FLAGS_NONE, NULL);
+ resolvers[nresolvers].domain = g_uri_get_host (resolvers[nresolvers].uri);
resolvers[nresolvers].method = NSS_TLS_METHOD_POST;
++nresolvers;
@@ -992,7 +993,6 @@ static
void
parse_cfg (const gboolean root)
{
- GValue val = G_VALUE_INIT;
const gchar *dirs[3] = {NULL, NULL, NULL};
g_autofree gchar *user_dir = NULL;
gchar **list, **p;
@@ -1065,7 +1065,7 @@ parse_cfg (const gboolean root)
++plus;
}
- resolvers[nresolvers].uri = soup_uri_new (*p);
+ resolvers[nresolvers].uri = g_uri_parse (*p, G_URI_FLAGS_NONE, NULL);
if (!resolvers[nresolvers].uri) {
g_warning ("Bad resolver: %s", *p);
g_free (*p);
@@ -1073,7 +1073,7 @@ parse_cfg (const gboolean root)
}
resolvers[nresolvers].url = *p;
- resolvers[nresolvers].domain = soup_uri_get_host (resolvers[nresolvers].uri);
+ resolvers[nresolvers].domain = g_uri_get_host (resolvers[nresolvers].uri);
resolvers[nresolvers].method = NSS_TLS_METHOD_POST;
if (plus) {
@@ -1096,13 +1096,6 @@ parsed:
g_warning ("Disabling deterministic server choice may harm privacy");
}
- if (nresolvers > 0) {
- g_value_init (&val, G_TYPE_INT);
- g_value_set_int (&val, MAX_CONNS_PER_RESOLVER * nresolvers);
-
- g_object_set_property (G_OBJECT (soup), SOUP_SESSION_MAX_CONNS, &val);
- }
-
if (path) {
watch_cfg (path, root);
}
@@ -1225,15 +1218,13 @@ main (int argc,
g_free (dir);
}
- soup = soup_session_new_with_options (SOUP_SESSION_TIMEOUT,
- NSS_TLS_TIMEOUT,
- SOUP_SESSION_IDLE_TIMEOUT,
- NSS_TLS_TIMEOUT,
- SOUP_SESSION_MAX_CONNS_PER_HOST,
+ soup = soup_session_new_with_options ("max-conns-per-host",
MAX_CONNS_PER_RESOLVER,
+ "timeout",
+ NSS_TLS_TIMEOUT,
NULL);
#ifdef NSS_TLS_DEBUG
- logger = soup_logger_new (SOUP_LOGGER_LOG_BODY, 128);
+ logger = soup_logger_new (SOUP_LOGGER_LOG_BODY);
soup_session_add_feature (soup, SOUP_SESSION_FEATURE (logger));
#endif
@@ -1271,7 +1262,7 @@ main (int argc,
g_main_loop_run (loop);
for (i = 0; i < nresolvers; ++i) {
- soup_uri_free (resolvers[i].uri);
+ g_uri_unref (resolvers[i].uri);
g_free (resolvers[i].url);
}
|
