74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
From fbad64abe28a96f591a30e3a5d3189c10172a414 Mon Sep 17 00:00:00 2001
|
|
From: Adam Williamson <awilliam@redhat.com>
|
|
Date: Tue, 30 Aug 2022 10:03:57 -0700
|
|
Subject: [PATCH 1/2] rest_proxy_call_sync: bail out if no payload
|
|
|
|
goa-daemon is crashing on suspend/resume with a traceback that
|
|
points here: it calls rest_proxy_call_sync, that calls
|
|
_rest_proxy_send_message, assumes it gets a `payload` back,
|
|
and calls `finish_call` with it. However, it's not actually
|
|
guaranteed that `_rest_proxy_send_message` will return a payload
|
|
(a `GBytes`). There are three ways it can return `NULL` instead:
|
|
if it's passed a wrong proxy or message, or - when built against
|
|
libsoup3 - if there is an error sending the message (it passes
|
|
through the return value of `soup_session_send_and_read`, and
|
|
that's documented to be `NULL` on error).
|
|
|
|
If `payload` comes back `NULL`, let's just return `FALSE`, like
|
|
we do if there's a problem with the call or message.
|
|
|
|
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
|
---
|
|
rest/rest-proxy-call.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/rest/rest-proxy-call.c b/rest/rest-proxy-call.c
|
|
index 851b397..07b8b49 100644
|
|
--- a/rest/rest-proxy-call.c
|
|
+++ b/rest/rest-proxy-call.c
|
|
@@ -1428,6 +1428,8 @@ rest_proxy_call_sync (RestProxyCall *call,
|
|
return FALSE;
|
|
|
|
payload = _rest_proxy_send_message (priv->proxy, message, priv->cancellable, error_out);
|
|
+ if (!payload)
|
|
+ return FALSE;
|
|
|
|
ret = finish_call (call, message, payload, error_out);
|
|
|
|
--
|
|
GitLab
|
|
|
|
|
|
From 8049048a0f7d52b3f4101c7123797fed099d4cc8 Mon Sep 17 00:00:00 2001
|
|
From: Adam Williamson <awilliam@redhat.com>
|
|
Date: Tue, 30 Aug 2022 10:59:01 -0700
|
|
Subject: [PATCH 2/2] Handle some potential problems in parsing oauth2 access
|
|
tokens
|
|
|
|
It's possible for `_rest_proxy_send_message` to return `NULL`,
|
|
which would mean the `payload` here would be `NULL`. If so,
|
|
we're not going to be able to do anything, so we should just
|
|
bail out.
|
|
|
|
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
|
---
|
|
rest/rest-oauth2-proxy.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/rest/rest-oauth2-proxy.c b/rest/rest-oauth2-proxy.c
|
|
index 9511f97..7d5780d 100644
|
|
--- a/rest/rest-oauth2-proxy.c
|
|
+++ b/rest/rest-oauth2-proxy.c
|
|
@@ -70,6 +70,8 @@ rest_oauth2_proxy_parse_access_token (RestOAuth2Proxy *self,
|
|
gint created_at;
|
|
|
|
g_return_if_fail (REST_IS_OAUTH2_PROXY (self));
|
|
+ if (!payload)
|
|
+ return;
|
|
|
|
data = g_bytes_get_data (payload, &size);
|
|
|
|
--
|
|
GitLab
|
|
|