mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtspsrc: Don't replace 404 errors with "no auth protocol found"

Browse source 
When getting a "404 Not Found" response from the DESCRIBE request, the
source produced a "No supported authentication protocol was found" error
instead of passing on the 404, which was confusing.

Only produce this error message when we're handling a response of "401
Unauthorized" without a compatible WWW-Authenticate header.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3414>
This commit is contained in:
Jan Alexander Steffens (heftig) 2022-11-15 11:56:35 +01:00 committed by GStreamer Marge Bot
parent 261290d1e6
commit 1d7c936db0
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c
View file

@ -6436,21 +6436,21 @@ gst_rtsp_auth_method_to_string (GstRTSPAuthMethod method)
*
* At the moment, for Basic auth, we just do a minimal check and don't
* even parse out the realm */
static void
static gboolean
gst_rtspsrc_parse_auth_hdr (GstRTSPMessage * response,
GstRTSPAuthMethod * methods, GstRTSPConnection * conn, gboolean * stale)
{
GstRTSPAuthCredential **credentials, **credential;
g_return_if_fail (response != NULL);
g_return_if_fail (methods != NULL);
g_return_if_fail (stale != NULL);
g_return_val_if_fail (response != NULL, FALSE);
g_return_val_if_fail (methods != NULL, FALSE);
g_return_val_if_fail (stale != NULL, FALSE);
credentials =
gst_rtsp_message_parse_auth_credentials (response,
GST_RTSP_HDR_WWW_AUTHENTICATE);
if (!credentials)
return;
return FALSE;
credential = credentials;
while (*credential) {
@ -6478,6 +6478,8 @@ gst_rtspsrc_parse_auth_hdr (GstRTSPMessage * response,
}
gst_rtsp_auth_credentials_free (credentials);
return TRUE;
}
/**
@ -6506,10 +6508,14 @@ gst_rtspsrc_setup_auth (GstRTSPSrc * src, GstRTSPMessage * response)
GstRTSPConnection *conn;
gboolean stale = FALSE;
g_return_val_if_fail (response != NULL, FALSE);
conn = src->conninfo.connection;
/* Identify the available auth methods and see if any are supported */
gst_rtspsrc_parse_auth_hdr (response, &avail_methods, conn, &stale);
/* Identify the available auth methods and see if any are supported. If no
* headers were found, propagate the HTTP error. */
if (!gst_rtspsrc_parse_auth_hdr (response, &avail_methods, conn, &stale))
goto propagate_error;
if (avail_methods == GST_RTSP_AUTH_NONE)
goto no_auth_available;
@ -6541,9 +6547,10 @@ gst_rtspsrc_setup_auth (GstRTSPSrc * src, GstRTSPMessage * response)
* already, request a username and passwd from the application via some kind
* of credentials request message */
/* If we don't have a username and passwd at this point, bail out. */
/* If we don't have a username and passwd at this point, bail out and
* propagate the normal NOT_AUTHORIZED error. */
if (user == NULL || pass == NULL)
goto no_user_pass;
goto propagate_error;
/* Try to configure for each available authentication method, strongest to
* weakest */
@ -6576,10 +6583,11 @@ no_auth_available:
("No supported authentication protocol was found"));
return FALSE;
}
no_user_pass:
propagate_error:
{
/* We don't fire an error message, we just return FALSE and let the
* normal NOT_AUTHORIZED error be propagated */
* normal error be propagated */
return FALSE;
}
}