From: <wt...@ke...> - 2008-05-08 14:58:50
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: wtay Date: Thu May 08 2008 14:46:42 UTC Log message: Patch by: Wouter Cloetens <zombie at e2big dot org> * gst-libs/gst/rtsp/Makefile.am: * gst-libs/gst/rtsp/gstrtspconnection.c: (gst_rtsp_connection_create), (md5_digest_to_hex_string), (auth_digest_compute_hex_urp), (auth_digest_compute_response), (add_auth_header), (gst_rtsp_connection_free), (gst_rtsp_connection_set_auth), (str_case_hash), (str_case_equal), (gst_rtsp_connection_set_auth_param), (gst_rtsp_connection_clear_auth_params): * gst-libs/gst/rtsp/gstrtspconnection.h: Add Digest authorization support for RTSP connections. See #532065. * gst-libs/gst/rtsp/md5.c: * gst-libs/gst/rtsp/md5.h: Yeap, another md5 implementation until we can depend on a glib that has support for it. Modified files: . : ChangeLog gst-libs/gst/rtsp: Makefile.am gstrtspconnection.c gstrtspconnection.h Added files: gst-libs/gst/rtsp: md5.c md5.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.3911&r2=1.3912 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtsp/Makefile.am.diff?r1=1.4&r2=1.5 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtsp/gstrtspconnection.c.diff?r1=1.17&r2=1.18 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtsp/gstrtspconnection.h.diff?r1=1.4&r2=1.5 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtsp/md5.c?rev=1.1&content-type=text/vnd.viewcvs-markup http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtsp/md5.h?rev=1.1&content-type=text/vnd.viewcvs-markup ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.3911 retrieving revision 1.3912 diff -u -d -r1.3911 -r1.3912 --- ChangeLog 8 May 2008 06:20:40 -0000 1.3911 +++ ChangeLog 8 May 2008 14:46:25 -0000 1.3912 @@ -1,3 +1,23 @@ +2008-05-08 Wim Taymans <wim...@co...> + + Patch by: Wouter Cloetens <zombie at e2big dot org> + * gst-libs/gst/rtsp/Makefile.am: + * gst-libs/gst/rtsp/gstrtspconnection.c: + (gst_rtsp_connection_create), (md5_digest_to_hex_string), + (auth_digest_compute_hex_urp), (auth_digest_compute_response), + (add_auth_header), (gst_rtsp_connection_free), + (gst_rtsp_connection_set_auth), (str_case_hash), (str_case_equal), + (gst_rtsp_connection_set_auth_param), + (gst_rtsp_connection_clear_auth_params): + * gst-libs/gst/rtsp/gstrtspconnection.h: + Add Digest authorization support for RTSP connections. See #532065. + * gst-libs/gst/rtsp/md5.c: + * gst-libs/gst/rtsp/md5.h: + Yeap, another md5 implementation until we can depend on a glib that has + support for it. 2008-05-08 Sebastian Dröge <sl...@ci...> Patch by: Sjoerd Simons <sjoerd at luon dot net> Index: Makefile.am RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/rtsp/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.am 12 Jan 2008 23:08:28 -0000 1.4 +++ Makefile.am 8 May 2008 14:46:27 -0000 1.5 @@ -24,10 +24,11 @@ gstrtspmessage.c \ gstrtsprange.c \ gstrtsptransport.c \ - gstrtspurl.c + gstrtspurl.c \ + md5.c nodist_libgstrtsp_@GST_MAJORMINOR@_la_SOURCES = $(built_sources) -nodist_libgstrtspinclude_HEADERS = gstrtsp-enumtypes.h +nodist_libgstrtspinclude_HEADERS = gstrtsp-enumtypes.h md5.h noinst_HEADERS = gstrtsp.h Index: gstrtspconnection.c RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/rtsp/gstrtspconnection.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- gstrtspconnection.c 24 Mar 2008 16:40:08 -0000 1.17 +++ gstrtspconnection.c 8 May 2008 14:46:27 -0000 1.18 @@ -92,6 +92,7 @@ #include "gstrtspconnection.h" #include "gstrtspbase64.h" +#include "md5.h" #ifdef G_OS_WIN32 #define FIONREAD_TYPE gulong @@ -161,6 +162,7 @@ newconn->auth_method = GST_RTSP_AUTH_NONE; newconn->username = NULL; newconn->passwd = NULL; + newconn->auth_params = NULL; *conn = newconn; @@ -320,6 +322,65 @@ } static void +md5_digest_to_hex_string (unsigned char digest[16], char string[33]) +{ + static const char hexdigits[] = "0123456789abcdef"; + int i; + for (i = 0; i < 16; i++) { + string[i * 2] = hexdigits[(digest[i] >> 4) & 0x0f]; + string[i * 2 + 1] = hexdigits[digest[i] & 0x0f]; + } + string[32] = 0; +} +static void +auth_digest_compute_hex_urp (const gchar * username, + const gchar * realm, const gchar * password, gchar hex_urp[33]) + struct MD5Context md5_context; + unsigned char digest[16]; + MD5Init (&md5_context); + MD5Update (&md5_context, username, strlen (username)); + MD5Update (&md5_context, ":", 1); + MD5Update (&md5_context, realm, strlen (realm)); + MD5Update (&md5_context, password, strlen (password)); + MD5Final (digest, &md5_context); + md5_digest_to_hex_string (digest, hex_urp); +auth_digest_compute_response (const gchar * method, + const gchar * uri, const gchar * hex_a1, const gchar * nonce, + gchar response[33]) + char hex_a2[33]; + /* compute A2 */ + MD5Update (&md5_context, method, strlen (method)); + MD5Update (&md5_context, uri, strlen (uri)); + md5_digest_to_hex_string (digest, hex_a2); + /* compute KD */ + MD5Update (&md5_context, hex_a1, strlen (hex_a1)); + MD5Update (&md5_context, nonce, strlen (nonce)); + MD5Update (&md5_context, hex_a2, 32); + md5_digest_to_hex_string (digest, response); add_auth_header (GstRTSPConnection * conn, GstRTSPMessage * message) { switch (conn->auth_method) { @@ -338,6 +399,50 @@ g_free (auth_string); break; } + case GST_RTSP_AUTH_DIGEST:{ + gchar response[33], hex_urp[33]; + gchar *auth_string, *auth_string2; + gchar *realm; + gchar *nonce; + gchar *opaque; + const gchar *uri; + const gchar *method; + /* we need to have some params set */ + if (conn->auth_params == NULL) + break; + /* we need the realm and nonce */ + realm = (gchar *) g_hash_table_lookup (conn->auth_params, "realm"); + nonce = (gchar *) g_hash_table_lookup (conn->auth_params, "nonce"); + if (realm == NULL || nonce == NULL) + auth_digest_compute_hex_urp (conn->username, realm, conn->passwd, + hex_urp); + method = gst_rtsp_method_as_text (message->type_data.request.method); + uri = message->type_data.request.uri; + /* Assume no qop, algorithm=md5, stale=false */ + /* For algorithm MD5, a1 = urp. */ + auth_digest_compute_response (method, uri, hex_urp, nonce, response); + auth_string = g_strdup_printf ("Digest username=\"%s\", " + "realm=\"%s\", nonce=\"%s\", uri=\"%s\", response=\"%s\"", + conn->username, realm, nonce, uri, response); + opaque = (gchar *) g_hash_table_lookup (conn->auth_params, "opaque"); + if (opaque) { + auth_string2 = g_strdup_printf ("%s, opaque=\"%s\"", auth_string, + opaque); + g_free (auth_string); + auth_string = auth_string2; + } + gst_rtsp_message_add_header (message, GST_RTSP_HDR_AUTHORIZATION, + auth_string); + g_free (auth_string); + break; + } default: /* Nothing to do */ @@ -1142,6 +1247,7 @@ g_timer_destroy (conn->timer); g_free (conn->username); g_free (conn->passwd); + gst_rtsp_connection_clear_auth_params (conn); g_free (conn); return res; @@ -1317,9 +1423,9 @@ gst_rtsp_connection_set_auth (GstRTSPConnection * conn, GstRTSPAuthMethod method, const gchar * user, const gchar * pass) - /* Digest isn't implemented yet */ - if (method == GST_RTSP_AUTH_DIGEST) - return GST_RTSP_ENOTIMPL; + if (method == GST_RTSP_AUTH_DIGEST && ((user == NULL || pass == NULL) + || g_strrstr (user, ":") != NULL)) + return GST_RTSP_EINVAL; /* Make sure the username and passwd are being set for authentication */ if (method == GST_RTSP_AUTH_NONE && (user == NULL || pass == NULL)) @@ -1338,3 +1444,84 @@ return GST_RTSP_OK; +/** + * str_case_hash: + * @key: ASCII string to hash + * + * Hashes @key in a case-insensitive manner. + * Return value: the hash code. + **/ +static guint +str_case_hash (gconstpointer key) + const char *p = key; + guint h = g_ascii_toupper (*p); + if (h) + for (p += 1; *p != '\0'; p++) + h = (h << 5) - h + g_ascii_toupper (*p); + return h; + * str_case_equal: + * @v1: an ASCII string + * @v2: another ASCII string + * Compares @v1 and @v2 in a case-insensitive manner + * Return value: %TRUE if they are equal (modulo case) +static gboolean +str_case_equal (gconstpointer v1, gconstpointer v2) + const char *string1 = v1; + const char *string2 = v2; + return g_ascii_strcasecmp (string1, string2) == 0; + * gst_rtsp_connection_set_auth_param: + * @conn: a #GstRTSPConnection + * @param: authentication directive + * @value: value + * Setup @conn with authentication directives. This is not necesary for + * methods #GST_RTSP_AUTH_NONE and #GST_RTSP_AUTH_BASIC. For + * #GST_RTSP_AUTH_DIGEST, directives should be taken from the digest challenge + * in the WWW-Authenticate response header and can include realm, domain, + * nonce, opaque, stale, algorithm, qop as per RFC2617. + * + * Since: 0.10.20 + */ +void +gst_rtsp_connection_set_auth_param (GstRTSPConnection * conn, + const gchar * param, const gchar * value) + if (conn->auth_params == NULL) { + conn->auth_params = + g_hash_table_new_full (str_case_hash, str_case_equal, g_free, g_free); + g_hash_table_insert (conn->auth_params, g_strdup (param), g_strdup (value)); + * gst_rtsp_connection_clear_auth_params: + * Clear the list of authentication directives stored in @conn. +gst_rtsp_connection_clear_auth_params (GstRTSPConnection * conn) + if (conn->auth_params != NULL) { + g_hash_table_destroy (conn->auth_params); + conn->auth_params = NULL; Index: gstrtspconnection.h RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/rtsp/gstrtspconnection.h,v --- gstrtspconnection.h 28 Feb 2008 09:50:52 -0000 1.4 +++ gstrtspconnection.h 8 May 2008 14:46:27 -0000 1.5 @@ -79,6 +79,7 @@ GstRTSPAuthMethod auth_method; gchar *username; gchar *passwd; + GHashTable *auth_params; }; /* opening/closing a connection */ @@ -114,6 +115,11 @@ GstRTSPResult gst_rtsp_connection_set_auth (GstRTSPConnection *conn, GstRTSPAuthMethod method, const gchar *user, const gchar *pass); +void gst_rtsp_connection_set_auth_param (GstRTSPConnection *conn, + const gchar * param, + const gchar *value); +void gst_rtsp_connection_clear_auth_params (GstRTSPConnection *conn); G_END_DECLS #endif /* __GST_RTSP_CONNECTION_H__ */ --- NEW FILE: md5.c --- /* * This code implements the MD5 message-digest algorithm. * The algorithm is due to Ron Rivest. This code was * written by Colin Plumb in 1993, no copyright is claimed. * This code is in the public domain; do with it what you wish. * * Equivalent code is available from RSA Data Security, Inc. * This code has been tested against that, and is equivalent, * except that you don't need to include two pages of legalese * with every copy. * To compute the message digest of a chunk of bytes, declare an * MD5Context structure, pass it to MD5Init, call MD5Update as * needed on buffers full of bytes, and then call MD5Final, which * will fill a supplied 16-byte array with the digest. */ /* Brutally hacked by John Walker back from ANSI C to K&R (no prototypes) to maintain the tradition that Netfone will compile with Sun's original "cc". */ #include <string.h> /* for memcpy() */ #include <glib.h> #include "md5.h" #if G_BYTE_ORDER == G_BIG_ENDIAN #define HIGHFIRST #endif #ifndef HIGHFIRST #define byteReverse(buf, len) /* Nothing */ #else * Note: this code is harmless on little-endian machines. void byteReverse (buf, longs) unsigned char *buf; unsigned longs; { uint32 t; do { t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 | ((unsigned) buf[1] << 8 | buf[0]); *(uint32 *) buf = t; buf += 4; } while (--longs); } * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious * initialization constants. MD5Init (ctx) struct MD5Context *ctx; ctx->buf[0] = 0x67452301; ctx->buf[1] = 0xefcdab89; ctx->buf[2] = 0x98badcfe; ctx->buf[3] = 0x10325476; ctx->bits[0] = 0; ctx->bits[1] = 0; * Update context to reflect the concatenation of another buffer full * of bytes. MD5Update (ctx, buf, len) const char *buf; unsigned len; /* Update bitcount */ t = ctx->bits[0]; if ((ctx->bits[0] = t + ((uint32) len << 3)) < t) ctx->bits[1]++; /* Carry from low to high */ ctx->bits[1] += len >> 29; t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */ /* Handle any leading odd-sized chunks */ if (t) { unsigned char *p = (unsigned char *) ctx->in + t; t = 64 - t; if (len < t) { memcpy (p, buf, len); return; } memcpy (p, buf, t); byteReverse (ctx->in, 16); MD5Transform (ctx->buf, (uint32 *) ctx->in); buf += t; len -= t; } /* Process data in 64-byte chunks */ while (len >= 64) { memcpy (ctx->in, buf, 64); buf += 64; len -= 64; /* Handle any remaining bytes of data. */ memcpy (ctx->in, buf, len); * Final wrapup - pad to 64-byte boundary with the bit pattern * 1 0* (64-bit count of bits processed, MSB-first) MD5Final (digest, ctx) unsigned char digest[16]; unsigned count; unsigned char *p; /* Compute number of bytes mod 64 */ count = (ctx->bits[0] >> 3) & 0x3F; /* Set the first char of padding to 0x80. This is safe since there is always at least one byte free */ p = ctx->in + count; *p++ = 0x80; /* Bytes of padding needed to make 64 bytes */ count = 64 - 1 - count; /* Pad out to 56 mod 64 */ if (count < 8) { /* Two lots of padding: Pad the first block to 64 bytes */ memset (p, 0, count); /* Now fill the next block with 56 bytes */ memset (ctx->in, 0, 56); } else { /* Pad block to 56 bytes */ memset (p, 0, count - 8); byteReverse (ctx->in, 14); /* Append length in bits and transform */ ((uint32 *) ctx->in)[14] = ctx->bits[0]; ((uint32 *) ctx->in)[15] = ctx->bits[1]; MD5Transform (ctx->buf, (uint32 *) ctx->in); byteReverse ((unsigned char *) ctx->buf, 4); memcpy (digest, ctx->buf, 16); memset (ctx, 0, sizeof (ctx)); /* In case it's sensitive */ /* The four core functions - F1 is optimized somewhat */ /* #define F1(x, y, z) (x & y | ~x & z) */ #define F1(x, y, z) (z ^ (x & (y ^ z))) #define F2(x, y, z) F1(z, x, y) #define F3(x, y, z) (x ^ y ^ z) #define F4(x, y, z) (y ^ (x | ~z)) /* This is the central step in the MD5 algorithm. */ #define MD5STEP(f, w, x, y, z, data, s) \ ( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x ) * The core of the MD5 algorithm, this alters an existing MD5 hash to * reflect the addition of 16 longwords of new data. MD5Update blocks * the data and converts bytes into longwords for this routine. MD5Transform (buf, in) uint32 buf[4]; uint32 in[16]; register uint32 a, b, c, d; a = buf[0]; b = buf[1]; c = buf[2]; d = buf[3]; MD5STEP (F1, a, b, c, d, in[0] + 0xd76aa478, 7); MD5STEP (F1, d, a, b, c, in[1] + 0xe8c7b756, 12); MD5STEP (F1, c, d, a, b, in[2] + 0x242070db, 17); MD5STEP (F1, b, c, d, a, in[3] + 0xc1bdceee, 22); MD5STEP (F1, a, b, c, d, in[4] + 0xf57c0faf, 7); MD5STEP (F1, d, a, b, c, in[5] + 0x4787c62a, 12); MD5STEP (F1, c, d, a, b, in[6] + 0xa8304613, 17); MD5STEP (F1, b, c, d, a, in[7] + 0xfd469501, 22); MD5STEP (F1, a, b, c, d, in[8] + 0x698098d8, 7); MD5STEP (F1, d, a, b, c, in[9] + 0x8b44f7af, 12); MD5STEP (F1, c, d, a, b, in[10] + 0xffff5bb1, 17); MD5STEP (F1, b, c, d, a, in[11] + 0x895cd7be, 22); MD5STEP (F1, a, b, c, d, in[12] + 0x6b901122, 7); MD5STEP (F1, d, a, b, c, in[13] + 0xfd987193, 12); MD5STEP (F1, c, d, a, b, in[14] + 0xa679438e, 17); MD5STEP (F1, b, c, d, a, in[15] + 0x49b40821, 22); MD5STEP (F2, a, b, c, d, in[1] + 0xf61e2562, 5); MD5STEP (F2, d, a, b, c, in[6] + 0xc040b340, 9); MD5STEP (F2, c, d, a, b, in[11] + 0x265e5a51, 14); MD5STEP (F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); MD5STEP (F2, a, b, c, d, in[5] + 0xd62f105d, 5); MD5STEP (F2, d, a, b, c, in[10] + 0x02441453, 9); MD5STEP (F2, c, d, a, b, in[15] + 0xd8a1e681, 14); MD5STEP (F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); MD5STEP (F2, a, b, c, d, in[9] + 0x21e1cde6, 5); MD5STEP (F2, d, a, b, c, in[14] + 0xc33707d6, 9); MD5STEP (F2, c, d, a, b, in[3] + 0xf4d50d87, 14); MD5STEP (F2, b, c, d, a, in[8] + 0x455a14ed, 20); MD5STEP (F2, a, b, c, d, in[13] + 0xa9e3e905, 5); MD5STEP (F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); MD5STEP (F2, c, d, a, b, in[7] + 0x676f02d9, 14); MD5STEP (F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); MD5STEP (F3, a, b, c, d, in[5] + 0xfffa3942, 4); MD5STEP (F3, d, a, b, c, in[8] + 0x8771f681, 11); MD5STEP (F3, c, d, a, b, in[11] + 0x6d9d6122, 16); MD5STEP (F3, b, c, d, a, in[14] + 0xfde5380c, 23); MD5STEP (F3, a, b, c, d, in[1] + 0xa4beea44, 4); MD5STEP (F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); MD5STEP (F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); MD5STEP (F3, b, c, d, a, in[10] + 0xbebfbc70, 23); MD5STEP (F3, a, b, c, d, in[13] + 0x289b7ec6, 4); MD5STEP (F3, d, a, b, c, in[0] + 0xeaa127fa, 11); MD5STEP (F3, c, d, a, b, in[3] + 0xd4ef3085, 16); MD5STEP (F3, b, c, d, a, in[6] + 0x04881d05, 23); MD5STEP (F3, a, b, c, d, in[9] + 0xd9d4d039, 4); MD5STEP (F3, d, a, b, c, in[12] + 0xe6db99e5, 11); MD5STEP (F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); MD5STEP (F3, b, c, d, a, in[2] + 0xc4ac5665, 23); MD5STEP (F4, a, b, c, d, in[0] + 0xf4292244, 6); MD5STEP (F4, d, a, b, c, in[7] + 0x432aff97, 10); MD5STEP (F4, c, d, a, b, in[14] + 0xab9423a7, 15); MD5STEP (F4, b, c, d, a, in[5] + 0xfc93a039, 21); MD5STEP (F4, a, b, c, d, in[12] + 0x655b59c3, 6); MD5STEP (F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); MD5STEP (F4, c, d, a, b, in[10] + 0xffeff47d, 15); MD5STEP (F4, b, c, d, a, in[1] + 0x85845dd1, 21); MD5STEP (F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); MD5STEP (F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); MD5STEP (F4, c, d, a, b, in[6] + 0xa3014314, 15); MD5STEP (F4, b, c, d, a, in[13] + 0x4e0811a1, 21); MD5STEP (F4, a, b, c, d, in[4] + 0xf7537e82, 6); MD5STEP (F4, d, a, b, c, in[11] + 0xbd3af235, 10); MD5STEP (F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); MD5STEP (F4, b, c, d, a, in[9] + 0xeb86d391, 21); buf[0] += a; buf[1] += b; buf[2] += c; buf[3] += d; --- NEW FILE: md5.h --- #ifndef MD5_H #define MD5_H #include "_stdint.h" #ifndef uint32 typedef uint32_t uint32; struct MD5Context uint32 buf[4]; uint32 bits[2]; unsigned char in[64]; }; extern void MD5Init (struct MD5Context *ctx); extern void MD5Update (struct MD5Context *ctx, const char *buf, unsigned len); extern void MD5Final (unsigned char digest[16], struct MD5Context *ctx); extern void MD5Transform (uint32 buf[4], uint32 in[16]); * This is needed to make RSAREF happy on some MS-DOS compilers. typedef struct MD5Context MD5_CTX; #endif /* !MD5_H */ |