X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fhttp.c;h=9d501a7820275c772a2fc306fd17aed9d659544d;hb=500cb6f49cf3dec6f5f54cfc8286b0b40381610f;hp=8959ddd3853d2a8d6e1cb9dd9b20e709acfda1ef;hpb=7927407718cd086287677da115fa9567935a489a;p=vlc diff --git a/modules/access/http.c b/modules/access/http.c index 8959ddd385..9d501a7820 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -1,12 +1,13 @@ /***************************************************************************** * http.c: HTTP input module ***************************************************************************** - * Copyright (C) 2001-2005 the VideoLAN team + * Copyright (C) 2001-2008 the VideoLAN team * $Id$ * * Authors: Laurent Aimar * Christophe Massiot * Rémi Denis-Courmont + * Antoine Cellerier * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +27,10 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include @@ -38,6 +43,11 @@ #include #include #include +#include + +#ifdef HAVE_ZLIB_H +# include +#endif /***************************************************************************** * Module descriptor @@ -71,23 +81,28 @@ static void Close( vlc_object_t * ); "You should not globally enable this option as it will break all other " \ "types of HTTP streams." ) +#define FORWARD_COOKIES_TEXT N_("Forward Cookies") +#define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies Across http redirections ") + vlc_module_begin(); set_description( _("HTTP input") ); - set_capability( "access2", 0 ); + set_capability( "access", 0 ); set_shortname( _( "HTTP(S)" ) ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS ); add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT, - VLC_FALSE ); + false ); add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); + CACHING_TEXT, CACHING_LONGTEXT, true ); add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT, - AGENT_LONGTEXT, VLC_TRUE ); + AGENT_LONGTEXT, true ); add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT, - RECONNECT_LONGTEXT, VLC_TRUE ); + RECONNECT_LONGTEXT, true ); add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT, - CONTINUOUS_LONGTEXT, VLC_TRUE ); + CONTINUOUS_LONGTEXT, true ); + add_bool( "http-forward-cookies", 0, NULL, FORWARD_COOKIES_TEXT, + FORWARD_COOKIES_LONGTEXT, true ); add_obsolete_string("http-user"); add_obsolete_string("http-pwd"); add_shortcut( "http" ); @@ -100,6 +115,22 @@ vlc_module_end(); /***************************************************************************** * Local prototypes *****************************************************************************/ + +/* RFC 2617: Basic and Digest Access Authentication */ +typedef struct http_auth_t +{ + char *psz_realm; + char *psz_domain; + char *psz_nonce; + char *psz_opaque; + char *psz_stale; + char *psz_algorithm; + char *psz_qop; + int i_nonce; + char *psz_cnonce; + char *psz_HA1; /* stored H(A1) value if algorithm = "MD5-sess" */ +} http_auth_t; + struct access_sys_t { int fd; @@ -109,10 +140,12 @@ struct access_sys_t /* From uri */ vlc_url_t url; char *psz_user_agent; + http_auth_t auth; /* Proxy */ - vlc_bool_t b_proxy; + bool b_proxy; vlc_url_t proxy; + http_auth_t proxy_auth; /* */ int i_code; @@ -122,11 +155,19 @@ struct access_sys_t char *psz_mime; char *psz_pragma; char *psz_location; - vlc_bool_t b_mms; - vlc_bool_t b_icecast; - vlc_bool_t b_ssl; + bool b_mms; + bool b_icecast; + bool b_ssl; +#ifdef HAVE_ZLIB_H + bool b_compressed; + struct + { + z_stream stream; + uint8_t *p_buffer; + } inflate; +#endif - vlc_bool_t b_chunked; + bool b_chunked; int64_t i_chunk; int i_icy_meta; @@ -136,19 +177,20 @@ struct access_sys_t int i_remaining; - vlc_bool_t b_seekable; - vlc_bool_t b_reconnect; - vlc_bool_t b_continuous; - vlc_bool_t b_pace_control; - + bool b_seekable; + bool b_reconnect; + bool b_continuous; + bool b_pace_control; + vlc_array_t * cookies; }; /* */ -static int OpenWithRedirectionStatus( vlc_object_t *p_this, vlc_bool_t b_is_from_redirection ); +static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ); /* */ static ssize_t Read( access_t *, uint8_t *, size_t ); +static ssize_t ReadCompressed( access_t *, uint8_t *, size_t ); static int Seek( access_t *, int64_t ); static int Control( access_t *, int, va_list ); @@ -163,36 +205,59 @@ static char * cookie_get_domain( const char * cookie ); static char * cookie_get_name( const char * cookie ); static void cookie_append( vlc_array_t * cookies, char * cookie ); + +static void AuthParseHeader( access_t *p_access, const char *psz_header, + http_auth_t *p_auth ); +static void AuthReply( access_t *p_acces, const char *psz_prefix, + vlc_url_t *p_url, http_auth_t *p_auth ); +static int AuthCheckReply( access_t *p_access, const char *psz_header, + vlc_url_t *p_url, http_auth_t *p_auth ); +static void AuthReset( http_auth_t *p_auth ); + /***************************************************************************** * Open: *****************************************************************************/ static int Open( vlc_object_t *p_this ) { - return OpenWithRedirectionStatus( p_this, VLC_FALSE ); + return OpenWithCookies( p_this, NULL ); } -static int OpenWithRedirectionStatus( vlc_object_t *p_this, vlc_bool_t b_is_from_redirection ) +static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) { access_t *p_access = (access_t*)p_this; access_sys_t *p_sys; char *psz, *p; - - vlc_array_t * saved_cookies = b_is_from_redirection ? p_access->p_sys->cookies : vlc_array_new(); + /* Only forward an store cookies if the corresponding option is activated */ + bool b_forward_cookies = var_CreateGetBool( p_access, "http-forward-cookies" ); + vlc_array_t * saved_cookies = b_forward_cookies ? (cookies ?: vlc_array_new()) : NULL; /* Set up p_access */ STANDARD_READ_ACCESS_INIT; +#ifdef HAVE_ZLIB_H + p_access->pf_read = ReadCompressed; +#endif p_sys->fd = -1; - p_sys->b_proxy = VLC_FALSE; + p_sys->b_proxy = false; p_sys->i_version = 1; - p_sys->b_seekable = VLC_TRUE; + p_sys->b_seekable = true; p_sys->psz_mime = NULL; p_sys->psz_pragma = NULL; - p_sys->b_mms = VLC_FALSE; - p_sys->b_icecast = VLC_FALSE; + p_sys->b_mms = false; + p_sys->b_icecast = false; p_sys->psz_location = NULL; p_sys->psz_user_agent = NULL; - p_sys->b_pace_control = VLC_TRUE; - p_sys->b_ssl = VLC_FALSE; + p_sys->b_pace_control = true; + p_sys->b_ssl = false; +#ifdef HAVE_ZLIB_H + p_sys->b_compressed = false; + /* 15 is the max windowBits, +32 to enable optional gzip decoding */ + if( inflateInit2( &p_sys->inflate.stream, 32+15 ) != Z_OK ) + msg_Warn( p_access, "Error during zlib initialisation: %s", + p_sys->inflate.stream.msg ); + if( zlibCompileFlags() & (1<<17) ) + msg_Warn( p_access, "Your zlib was compiled without gzip support." ); + p_sys->inflate.p_buffer = NULL; +#endif p_sys->p_tls = NULL; p_sys->p_vs = NULL; p_sys->i_icy_meta = 0; @@ -200,6 +265,7 @@ static int OpenWithRedirectionStatus( vlc_object_t *p_this, vlc_bool_t b_is_from p_sys->psz_icy_genre = NULL; p_sys->psz_icy_title = NULL; p_sys->i_remaining = 0; + p_sys->cookies = saved_cookies; /* Parse URI - remove spaces */ @@ -217,7 +283,7 @@ static int OpenWithRedirectionStatus( vlc_object_t *p_this, vlc_bool_t b_is_from if( !strncmp( p_access->psz_access, "https", 5 ) ) { /* HTTP over SSL */ - p_sys->b_ssl = VLC_TRUE; + p_sys->b_ssl = true; if( p_sys->url.i_port <= 0 ) p_sys->url.i_port = 443; } @@ -234,7 +300,7 @@ static int OpenWithRedirectionStatus( vlc_object_t *p_this, vlc_bool_t b_is_from psz = var_CreateGetString( p_access, "http-proxy" ); if( *psz ) { - p_sys->b_proxy = VLC_TRUE; + p_sys->b_proxy = true; vlc_UrlParse( &p_sys->proxy, psz, 0 ); } #ifdef HAVE_GETENV @@ -243,7 +309,7 @@ static int OpenWithRedirectionStatus( vlc_object_t *p_this, vlc_bool_t b_is_from char *psz_proxy = getenv( "http_proxy" ); if( psz_proxy && *psz_proxy ) { - p_sys->b_proxy = VLC_TRUE; + p_sys->b_proxy = true; vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 ); } } @@ -290,12 +356,12 @@ connect: /* Retry with http 1.0 */ msg_Dbg( p_access, "switching to HTTP version 1.0" ); p_sys->i_version = 0; - p_sys->b_seekable = VLC_FALSE; + p_sys->b_seekable = false; if( p_access->b_die || Connect( p_access, 0 ) ) goto error; -#ifdef DEBUG +#ifndef NDEBUG case 0: break; @@ -308,25 +374,35 @@ connect: if( p_sys->i_code == 401 ) { char *psz_login = NULL; char *psz_password = NULL; + char psz_msg[250]; int i_ret; - msg_Dbg( p_access, "authentication failed" ); + /* FIXME ? */ + if( p_sys->url.psz_username && p_sys->url.psz_password && + p_sys->auth.psz_nonce && p_sys->auth.i_nonce == 0 ) + { + goto connect; + } + snprintf( psz_msg, 250, + _("Please enter a valid login name and a password for realm %s."), + p_sys->auth.psz_realm ); + msg_Dbg( p_access, "authentication failed for realm %s", + p_sys->auth.psz_realm ); i_ret = intf_UserLoginPassword( p_access, _("HTTP authentication"), - _("Please enter a valid login name and a password."), - &psz_login, &psz_password ); + psz_msg, &psz_login, &psz_password ); if( i_ret == DIALOG_OK_YES ) { msg_Dbg( p_access, "retrying with user=%s, pwd=%s", psz_login, psz_password ); if( psz_login ) p_sys->url.psz_username = strdup( psz_login ); if( psz_password ) p_sys->url.psz_password = strdup( psz_password ); - if( psz_login ) free( psz_login ); - if( psz_password ) free( psz_password ); + free( psz_login ); + free( psz_password ); goto connect; } else { - if( psz_login ) free( psz_login ); - if( psz_password ) free( psz_password ); + free( psz_login ); + free( psz_password ); goto error; } } @@ -336,8 +412,6 @@ connect: p_sys->psz_location && *p_sys->psz_location ) { msg_Dbg( p_access, "redirection to %s", p_sys->psz_location ); - printf("redirection to %s", p_sys->psz_location ); - /* Do not accept redirection outside of HTTP works */ if( strncmp( p_sys->psz_location, "http", 4 ) @@ -351,17 +425,20 @@ connect: p_access->psz_path = strdup( p_sys->psz_location ); /* Clean up current Open() run */ vlc_UrlClean( &p_sys->url ); + AuthReset( &p_sys->auth ); vlc_UrlClean( &p_sys->proxy ); + AuthReset( &p_sys->proxy_auth ); free( p_sys->psz_mime ); free( p_sys->psz_pragma ); free( p_sys->psz_location ); free( p_sys->psz_user_agent ); Disconnect( p_access ); + cookies = p_sys->cookies; free( p_sys ); /* Do new Open() run with new data */ - return OpenWithRedirectionStatus( p_this, VLC_TRUE ); + return OpenWithCookies( p_this, cookies ); } if( p_sys->b_mms ) @@ -389,7 +466,7 @@ connect: #if 0 /* Doesn't work really well because of the pre-buffering in * shoutcast servers (the buffer content will be sent as fast as * possible). */ - p_sys->b_pace_control = VLC_FALSE; + p_sys->b_pace_control = false; #endif } else if( !p_sys->psz_mime ) @@ -444,7 +521,9 @@ static void Close( vlc_object_t *p_this ) access_sys_t *p_sys = p_access->p_sys; vlc_UrlClean( &p_sys->url ); + AuthReset( &p_sys->auth ); vlc_UrlClean( &p_sys->proxy ); + AuthReset( &p_sys->proxy_auth ); free( p_sys->psz_mime ); free( p_sys->psz_pragma ); @@ -458,10 +537,18 @@ static void Close( vlc_object_t *p_this ) Disconnect( p_access ); - int i; - for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ ) - free(vlc_array_item_at_index( p_sys->cookies, i )); - vlc_array_destroy( p_sys->cookies ); + if( p_sys->cookies ) + { + int i; + for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ ) + free(vlc_array_item_at_index( p_sys->cookies, i )); + vlc_array_destroy( p_sys->cookies ); + } + +#ifdef HAVE_ZLIB_H + inflateEnd( &p_sys->inflate.stream ); + free( p_sys->inflate.p_buffer ); +#endif free( p_sys ); } @@ -478,7 +565,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) if( p_sys->fd < 0 ) { - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; return 0; } @@ -487,7 +574,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { if( ( i_len = p_access->info.i_size - p_access->info.i_pos ) == 0 ) { - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; return 0; } } @@ -496,7 +583,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { if( p_sys->i_chunk < 0 ) { - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; return 0; } @@ -516,7 +603,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) if( p_sys->i_chunk <= 0 ) /* eof */ { p_sys->i_chunk = -1; - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; return 0; } } @@ -527,7 +614,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) } } - if( p_sys->b_continuous && i_len > p_sys->i_remaining ) + if( p_sys->b_continuous && (ssize_t)i_len > p_sys->i_remaining ) { /* Only ask for the remaining length */ int i_new_len = p_sys->i_remaining; @@ -549,7 +636,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { if( ReadICYMeta( p_access ) ) { - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; return -1; } } @@ -557,7 +644,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) i_len = i_next; } - i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, p_buffer, i_len, VLC_FALSE ); + i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, p_buffer, i_len, false ); if( i_read > 0 ) { @@ -570,7 +657,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { /* read the empty line */ char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, p_sys->p_vs ); - if( psz ) free( psz ); + free( psz ); } } } @@ -585,9 +672,9 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) if( p_sys->b_continuous ) { Request( p_access, 0 ); - p_sys->b_continuous = VLC_FALSE; + p_sys->b_continuous = false; i_read = Read( p_access, p_buffer, i_len ); - p_sys->b_continuous = VLC_TRUE; + p_sys->b_continuous = true; } Disconnect( p_access ); if( p_sys->b_reconnect ) @@ -599,13 +686,13 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) } else { - p_sys->b_reconnect = VLC_FALSE; + p_sys->b_reconnect = false; i_read = Read( p_access, p_buffer, i_len ); - p_sys->b_reconnect = VLC_TRUE; + p_sys->b_reconnect = true; } } - if( i_read == 0 ) p_access->info.b_eof = VLC_TRUE; + if( i_read == 0 ) p_access->info.b_eof = true; } if( p_sys->b_continuous ) @@ -626,7 +713,7 @@ static int ReadICYMeta( access_t *p_access ) /* Read meta data length */ i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, &buffer, 1, - VLC_TRUE ); + true ); if( i_read <= 0 ) return VLC_EGENERIC; if( buffer == 0 ) @@ -637,7 +724,7 @@ static int ReadICYMeta( access_t *p_access ) psz_meta = malloc( i_read + 1 ); if( net_Read( p_access, p_sys->fd, p_sys->p_vs, - (uint8_t *)psz_meta, i_read, VLC_TRUE ) != i_read ) + (uint8_t *)psz_meta, i_read, true ) != i_read ) return VLC_EGENERIC; psz_meta[i_read] = '\0'; /* Just in case */ @@ -668,8 +755,7 @@ static int ReadICYMeta( access_t *p_access ) if( !p_sys->psz_icy_title || strcmp( p_sys->psz_icy_title, &p[1] ) ) { - if( p_sys->psz_icy_title ) - free( p_sys->psz_icy_title ); + free( p_sys->psz_icy_title ); p_sys->psz_icy_title = strdup( &p[1] ); p_access->info.i_update |= INPUT_UPDATE_META; @@ -681,19 +767,55 @@ static int ReadICYMeta( access_t *p_access ) return VLC_SUCCESS; } +#ifdef HAVE_ZLIB_H +static ssize_t ReadCompressed( access_t *p_access, uint8_t *p_buffer, + size_t i_len ) +{ + access_sys_t *p_sys = p_access->p_sys; + + if( p_sys->b_compressed ) + { + int i_ret; + + if( !p_sys->inflate.p_buffer ) + p_sys->inflate.p_buffer = malloc( 256 * 1024 ); + + if( p_sys->inflate.stream.avail_in == 0 ) + { + ssize_t i_read = Read( p_access, p_sys->inflate.p_buffer + p_sys->inflate.stream.avail_in, 256 * 1024 ); + if( i_read <= 0 ) return i_read; + p_sys->inflate.stream.next_in = p_sys->inflate.p_buffer; + p_sys->inflate.stream.avail_in = i_read; + } + + p_sys->inflate.stream.avail_out = i_len; + p_sys->inflate.stream.next_out = p_buffer; + + i_ret = inflate( &p_sys->inflate.stream, Z_SYNC_FLUSH ); + msg_Warn( p_access, "inflate return value: %d, %s", i_ret, p_sys->inflate.stream.msg ); + + return i_len - p_sys->inflate.stream.avail_out; + } + else + { + return Read( p_access, p_buffer, i_len ); + } +} +#endif + /***************************************************************************** * Seek: close and re-open a connection at the right place *****************************************************************************/ static int Seek( access_t *p_access, int64_t i_pos ) { - msg_Dbg( p_access, "trying to seek to "I64Fd, i_pos ); + msg_Dbg( p_access, "trying to seek to %"PRId64, i_pos ); Disconnect( p_access ); if( Connect( p_access, i_pos ) ) { msg_Err( p_access, "seek failed" ); - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; return VLC_EGENERIC; } return VLC_SUCCESS; @@ -705,7 +827,7 @@ static int Seek( access_t *p_access, int64_t i_pos ) static int Control( access_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; - vlc_bool_t *pb_bool; + bool *pb_bool; int *pi_int; int64_t *pi_64; vlc_meta_t *p_meta; @@ -714,22 +836,22 @@ static int Control( access_t *p_access, int i_query, va_list args ) { /* */ case ACCESS_CAN_SEEK: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + pb_bool = (bool*)va_arg( args, bool* ); *pb_bool = p_sys->b_seekable; break; case ACCESS_CAN_FASTSEEK: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_FALSE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; break; case ACCESS_CAN_PAUSE: case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + pb_bool = (bool*)va_arg( args, bool* ); #if 0 /* Disable for now until we have a clock synchro algo * which works with something else than MPEG over UDP */ *pb_bool = p_sys->b_pace_control; #endif - *pb_bool = VLC_TRUE; + *pb_bool = true; break; /* */ @@ -798,8 +920,8 @@ static int Connect( access_t *p_access, int64_t i_tell ) p_sys->psz_location = NULL; p_sys->psz_mime = NULL; p_sys->psz_pragma = NULL; - p_sys->b_mms = VLC_FALSE; - p_sys->b_chunked = VLC_FALSE; + p_sys->b_mms = false; + p_sys->b_chunked = false; p_sys->i_chunk = 0; p_sys->i_icy_meta = 0; p_sys->psz_icy_name = NULL; @@ -808,7 +930,7 @@ static int Connect( access_t *p_access, int64_t i_tell ) p_access->info.i_size = 0; p_access->info.i_pos = i_tell; - p_access->info.b_eof = VLC_FALSE; + p_access->info.b_eof = false; /* Open connection */ @@ -820,7 +942,7 @@ static int Connect( access_t *p_access, int64_t i_tell ) } /* Initialize TLS/SSL session */ - if( p_sys->b_ssl == VLC_TRUE ) + if( p_sys->b_ssl == true ) { /* CONNECT to establish TLS tunnel through HTTP proxy */ if( p_sys->b_proxy ) @@ -873,6 +995,12 @@ static int Connect( access_t *p_access, int64_t i_tell ) i_status = 0; free( psz ); + + if( p_access->b_die || p_access->b_error ) + { + Disconnect( p_access ); + return -1; + } } while( i_status ); } @@ -923,7 +1051,7 @@ static int Request( access_t *p_access, int64_t i_tell ) { psz_path = "/"; } - if( p_sys->url.i_port != 80) + if( p_sys->url.i_port != (pvs ? 443 : 80) ) { net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "GET %s HTTP/1.%d\r\nHost: %s:%d\r\n", @@ -944,66 +1072,42 @@ static int Request( access_t *p_access, int64_t i_tell ) if( p_sys->i_version == 1 ) { net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, - "Range: bytes="I64Fd"-\r\n", i_tell ); + "Range: bytes=%"PRId64"-\r\n", i_tell ); } /* Cookies */ - int i; - for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ ) - { - const char * cookie = vlc_array_item_at_index( p_sys->cookies, i ); - char * psz_cookie_content = cookie_get_content( cookie ); - char * psz_cookie_domain = cookie_get_domain( cookie ); - if( psz_cookie_content && - /* Check to see if we are in the right domain */ - ( !psz_cookie_domain || strstr( p_sys->url.psz_host, psz_cookie_domain )) - ) + if( p_sys->cookies ) + { + int i; + for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ ) { - msg_Dbg( p_access, "Sending Cookie %s", psz_cookie_content ); - if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Cookie: %s\r\n", psz_cookie_content ) < 0 ) - msg_Err( p_access, "failed to send Cookie" ); - } - free( psz_cookie_content ); - free( psz_cookie_domain ); - } + const char * cookie = vlc_array_item_at_index( p_sys->cookies, i ); + char * psz_cookie_content = cookie_get_content( cookie ); + char * psz_cookie_domain = cookie_get_domain( cookie ); - /* Authentication */ - if( p_sys->url.psz_username || p_sys->url.psz_password ) - { - char buf[strlen( p_sys->url.psz_username ?: "" ) - + strlen( p_sys->url.psz_password ?: "" ) + 2]; - char *b64; + assert( psz_cookie_content ); - snprintf( buf, sizeof( buf ), "%s:%s", p_sys->url.psz_username ?: "", - p_sys->url.psz_password ?: "" ); - b64 = vlc_b64_encode( buf ); + /* FIXME: This is clearly not conforming to the rfc */ + bool is_in_right_domain = (!psz_cookie_domain || strstr( p_sys->url.psz_host, psz_cookie_domain )); - if( b64 != NULL ) - { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, - "Authorization: Basic %s\r\n", b64 ); - free( b64 ); + if( is_in_right_domain ) + { + msg_Dbg( p_access, "Sending Cookie %s", psz_cookie_content ); + if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Cookie: %s\r\n", psz_cookie_content ) < 0 ) + msg_Err( p_access, "failed to send Cookie" ); + } + free( psz_cookie_content ); + free( psz_cookie_domain ); } } + /* Authentication */ + if( p_sys->url.psz_username || p_sys->url.psz_password ) + AuthReply( p_access, "", &p_sys->url, &p_sys->auth ); + /* Proxy Authentication */ if( p_sys->proxy.psz_username || p_sys->proxy.psz_password ) - { - char buf[strlen( p_sys->proxy.psz_username ?: "" ) - + strlen( p_sys->proxy.psz_password ?: "" )]; - char *b64; - - snprintf( buf, sizeof( buf ), "%s:%s", p_sys->proxy.psz_username ?: "", - p_sys->proxy.psz_password ?: "" ); - b64 = vlc_b64_encode( buf ); - - if( b64 != NULL) - { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, - "Proxy-Authorization: Basic %s\r\n", b64 ); - free( b64 ); - } - } + AuthReply( p_access, "Proxy-", &p_sys->proxy, &p_sys->proxy_auth ); /* ICY meta data request */ net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Icy-MetaData: 1\r\n" ); @@ -1042,7 +1146,7 @@ static int Request( access_t *p_access, int64_t i_tell ) { p_sys->psz_protocol = "ICY"; p_sys->i_code = atoi( &psz[4] ); - p_sys->b_reconnect = VLC_TRUE; + p_sys->b_reconnect = true; } else { @@ -1054,11 +1158,11 @@ static int Request( access_t *p_access, int64_t i_tell ) p_sys->psz_protocol, p_sys->i_code ); if( !strcmp( p_sys->psz_protocol, "ICY" ) ) { - p_sys->b_seekable = VLC_FALSE; + p_sys->b_seekable = false; } if( p_sys->i_code != 206 && p_sys->i_code != 401 ) { - p_sys->b_seekable = VLC_FALSE; + p_sys->b_seekable = false; } /* Authentication error - We'll have to display the dialog */ if( p_sys->i_code == 401 ) @@ -1085,6 +1189,12 @@ static int Request( access_t *p_access, int64_t i_tell ) goto error; } + if( p_access->b_die || p_access->b_error ) + { + free( psz ); + goto error; + } + /* msg_Dbg( p_input, "Line=%s", psz ); */ if( *psz == '\0' ) { @@ -1092,7 +1202,6 @@ static int Request( access_t *p_access, int64_t i_tell ) break; } - if( ( p = strchr( psz, ':' ) ) == NULL ) { msg_Err( p_access, "malformed header line: %s", psz ); @@ -1113,7 +1222,7 @@ static int Request( access_t *p_access, int64_t i_tell ) else { p_access->info.i_size = i_tell + atoll( p ); - msg_Dbg( p_access, "stream size="I64Fd, p_access->info.i_size ); + msg_Dbg( p_access, "stream size=%"PRId64, p_access->info.i_size ); } } else if( !strcasecmp( psz, "Location" ) ) @@ -1128,13 +1237,15 @@ static int Request( access_t *p_access, int64_t i_tell ) if( p_sys->url.i_port == ( p_sys->b_ssl ? 443 : 80 ) ) { - asprintf(&psz_new_loc, "http%s://%s%s", psz_http_ext, - p_sys->url.psz_host, p); + if( asprintf(&psz_new_loc, "http%s://%s%s", psz_http_ext, + p_sys->url.psz_host, p) < 0 ) + goto error; } else { - asprintf(&psz_new_loc, "http%s://%s:%d%s", psz_http_ext, - p_sys->url.psz_host, p_sys->url.i_port, p); + if( asprintf(&psz_new_loc, "http%s://%s:%d%s", psz_http_ext, + p_sys->url.psz_host, p_sys->url.i_port, p) < 0 ) + goto error; } } else @@ -1142,20 +1253,30 @@ static int Request( access_t *p_access, int64_t i_tell ) psz_new_loc = strdup( p ); } - if( p_sys->psz_location ) free( p_sys->psz_location ); + free( p_sys->psz_location ); p_sys->psz_location = psz_new_loc; } else if( !strcasecmp( psz, "Content-Type" ) ) { - if( p_sys->psz_mime ) free( p_sys->psz_mime ); + free( p_sys->psz_mime ); p_sys->psz_mime = strdup( p ); msg_Dbg( p_access, "Content-Type: %s", p_sys->psz_mime ); } + else if( !strcasecmp( psz, "Content-Encoding" ) ) + { + msg_Dbg( p_access, "Content-Encoding: %s", p ); + if( strcasecmp( p, "identity" ) ) +#ifdef HAVE_ZLIB_H + p_sys->b_compressed = true; +#else + msg_Warn( p_access, "Compressed content not supported. Rebuild with zlib support." ); +#endif + } else if( !strcasecmp( psz, "Pragma" ) ) { if( !strcasecmp( psz, "Pragma: features" ) ) - p_sys->b_mms = VLC_TRUE; - if( p_sys->psz_pragma ) free( p_sys->psz_pragma ); + p_sys->b_mms = true; + free( p_sys->psz_pragma ); p_sys->psz_pragma = strdup( p ); msg_Dbg( p_access, "Pragma: %s", p_sys->psz_pragma ); } @@ -1172,9 +1293,9 @@ static int Request( access_t *p_access, int64_t i_tell ) /* Let live 365 streams (nanocaster) piggyback on the icecast * routine. They look very similar */ - p_sys->b_reconnect = VLC_TRUE; - p_sys->b_pace_control = VLC_FALSE; - p_sys->b_icecast = VLC_TRUE; + p_sys->b_reconnect = true; + p_sys->b_pace_control = false; + p_sys->b_icecast = true; } } else if( !strcasecmp( psz, "Transfer-Encoding" ) ) @@ -1182,7 +1303,7 @@ static int Request( access_t *p_access, int64_t i_tell ) msg_Dbg( p_access, "Transfer-Encoding: %s", p ); if( !strncasecmp( p, "chunked", 7 ) ) { - p_sys->b_chunked = VLC_TRUE; + p_sys->b_chunked = true; } } else if( !strcasecmp( psz, "Icy-MetaInt" ) ) @@ -1196,17 +1317,17 @@ static int Request( access_t *p_access, int64_t i_tell ) } else if( !strcasecmp( psz, "Icy-Name" ) ) { - if( p_sys->psz_icy_name ) free( p_sys->psz_icy_name ); + free( p_sys->psz_icy_name ); p_sys->psz_icy_name = strdup( p ); msg_Dbg( p_access, "Icy-Name: %s", p_sys->psz_icy_name ); - p_sys->b_icecast = VLC_TRUE; /* be on the safeside. set it here as well. */ - p_sys->b_reconnect = VLC_TRUE; - p_sys->b_pace_control = VLC_FALSE; + p_sys->b_icecast = true; /* be on the safeside. set it here as well. */ + p_sys->b_reconnect = true; + p_sys->b_pace_control = false; } else if( !strcasecmp( psz, "Icy-Genre" ) ) { - if( p_sys->psz_icy_genre ) free( p_sys->psz_icy_genre ); + free( p_sys->psz_icy_genre ); p_sys->psz_icy_genre = strdup( p ); msg_Dbg( p_access, "Icy-Genre: %s", p_sys->psz_icy_genre ); } @@ -1219,10 +1340,38 @@ static int Request( access_t *p_access, int64_t i_tell ) !strncasecmp( psz, "x-audiocast", 11 ) ) { msg_Dbg( p_access, "Meta-Info: %s: %s", psz, p ); - } else if( !strcasecmp( psz, "Set-Cookie" ) ) + } + else if( !strcasecmp( psz, "Set-Cookie" ) ) + { + if( p_sys->cookies ) + { + msg_Dbg( p_access, "Accepting Cookie: %s", p ); + cookie_append( p_sys->cookies, strdup(p) ); + } + else + msg_Dbg( p_access, "We have a Cookie we won't remember: %s", p ); + } + else if( !strcasecmp( psz, "www-authenticate" ) ) { - msg_Dbg( p_access, "Accepting Cookie: %s", p ); - cookie_append( p_sys->cookies, strdup(p) ); + msg_Dbg( p_access, "Authentication header: %s", p ); + AuthParseHeader( p_access, p, &p_sys->auth ); + } + else if( !strcasecmp( psz, "proxy-authenticate" ) ) + { + msg_Dbg( p_access, "Proxy authentication header: %s", p ); + AuthParseHeader( p_access, p, &p_sys->proxy_auth ); + } + else if( !strcasecmp( psz, "authentication-info" ) ) + { + msg_Dbg( p_access, "Authentication Info header: %s", p ); + if( AuthCheckReply( p_access, p, &p_sys->url, &p_sys->auth ) ) + goto error; + } + else if( !strcasecmp( psz, "proxy-authentication-info" ) ) + { + msg_Dbg( p_access, "Proxy Authentication Info header: %s", p ); + if( AuthCheckReply( p_access, p, &p_sys->proxy, &p_sys->proxy_auth ) ) + goto error; } free( psz ); @@ -1318,23 +1467,35 @@ static char * cookie_get_name( const char * cookie ) static void cookie_append( vlc_array_t * cookies, char * cookie ) { int i; + + if( !cookie ) + return; + char * cookie_name = cookie_get_name( cookie ); + + /* Don't send invalid cookies */ + if( !cookie_name ) + return; + char * cookie_domain = cookie_get_domain( cookie ); for( i = 0; i < vlc_array_count( cookies ); i++ ) { char * current_cookie = vlc_array_item_at_index( cookies, i ); char * current_cookie_name = cookie_get_name( current_cookie ); char * current_cookie_domain = cookie_get_domain( current_cookie ); - if(!strcmp( cookie_name, current_cookie_name ) && - !strcmp( cookie_domain, current_cookie_domain )) + + assert( current_cookie_name ); + + bool is_domain_matching = ( cookie_domain && current_cookie_domain && + !strcmp( cookie_domain, current_cookie_domain ) ); + + if( is_domain_matching && !strcmp( cookie_name, current_cookie_name ) ) { /* Remove previous value for this cookie */ free( current_cookie ); vlc_array_remove( cookies, i ); /* Clean */ - free( cookie_name ); - free( cookie_domain ); free( current_cookie_name ); free( current_cookie_domain ); break; @@ -1347,3 +1508,384 @@ static void cookie_append( vlc_array_t * cookies, char * cookie ) vlc_array_append( cookies, cookie ); } +/***************************************************************************** + * "RFC 2617: Basic and Digest Access Authentication" header parsing + *****************************************************************************/ +static char *AuthGetParam( const char *psz_header, const char *psz_param ) +{ + char psz_what[strlen(psz_param)+3]; + sprintf( psz_what, "%s=\"", psz_param ); + psz_header = strstr( psz_header, psz_what ); + if( psz_header ) + { + const char *psz_end; + psz_header += strlen( psz_what ); + psz_end = strchr( psz_header, '"' ); + if( !psz_end ) /* Invalid since we should have a closing quote */ + return strdup( psz_header ); + return strndup( psz_header, psz_end - psz_header ); + } + else + { + return NULL; + } +} + +static char *AuthGetParamNoQuotes( const char *psz_header, const char *psz_param ) +{ + char psz_what[strlen(psz_param)+2]; + sprintf( psz_what, "%s=", psz_param ); + psz_header = strstr( psz_header, psz_what ); + if( psz_header ) + { + const char *psz_end; + psz_header += strlen( psz_what ); + psz_end = strchr( psz_header, ',' ); + /* XXX: Do we need to filter out trailing space between the value and + * the comma/end of line? */ + if( !psz_end ) /* Can be valid if this is the last parameter */ + return strdup( psz_header ); + return strndup( psz_header, psz_end - psz_header ); + } + else + { + return NULL; + } +} + +static void AuthParseHeader( access_t *p_access, const char *psz_header, + http_auth_t *p_auth ) +{ + /* FIXME: multiple auth methods can be listed (comma seperated) */ + + /* 2 Basic Authentication Scheme */ + if( !strncasecmp( psz_header, "Basic ", strlen( "Basic " ) ) ) + { + msg_Dbg( p_access, "Using Basic Authentication" ); + psz_header += strlen( "Basic " ); + p_auth->psz_realm = AuthGetParam( psz_header, "realm" ); + if( !p_auth->psz_realm ) + msg_Warn( p_access, "Basic Authentication: " + "Mandatory 'realm' parameter is missing" ); + } + /* 3 Digest Access Authentication Scheme */ + else if( !strncasecmp( psz_header, "Digest ", strlen( "Digest " ) ) ) + { + msg_Dbg( p_access, "Using Digest Access Authentication" ); + if( p_auth->psz_nonce ) return; /* FIXME */ + psz_header += strlen( "Digest " ); + p_auth->psz_realm = AuthGetParam( psz_header, "realm" ); + p_auth->psz_domain = AuthGetParam( psz_header, "domain" ); + p_auth->psz_nonce = AuthGetParam( psz_header, "nonce" ); + p_auth->psz_opaque = AuthGetParam( psz_header, "opaque" ); + p_auth->psz_stale = AuthGetParamNoQuotes( psz_header, "stale" ); + p_auth->psz_algorithm = AuthGetParamNoQuotes( psz_header, "algorithm" ); + p_auth->psz_qop = AuthGetParam( psz_header, "qop" ); + p_auth->i_nonce = 0; + /* printf("realm: |%s|\ndomain: |%s|\nnonce: |%s|\nopaque: |%s|\n" + "stale: |%s|\nalgorithm: |%s|\nqop: |%s|\n", + p_auth->psz_realm,p_auth->psz_domain,p_auth->psz_nonce, + p_auth->psz_opaque,p_auth->psz_stale,p_auth->psz_algorithm, + p_auth->psz_qop); */ + if( !p_auth->psz_realm ) + msg_Warn( p_access, "Digest Access Authentication: " + "Mandatory 'realm' parameter is missing" ); + if( !p_auth->psz_nonce ) + msg_Warn( p_access, "Digest Access Authentication: " + "Mandatory 'nonce' parameter is missing" ); + if( p_auth->psz_qop ) /* FIXME: parse the qop list */ + { + char *psz_tmp = strchr( p_auth->psz_qop, ',' ); + if( psz_tmp ) *psz_tmp = '\0'; + } + } + else + { + const char *psz_end = strchr( psz_header, ' ' ); + if( psz_end ) + msg_Warn( p_access, "Unknown authentication scheme: '%*s'", + psz_end - psz_header, psz_header ); + else + msg_Warn( p_access, "Unknown authentication scheme: '%s'", + psz_header ); + } +} + +static char *AuthDigest( access_t *p_access, vlc_url_t *p_url, + http_auth_t *p_auth, const char *psz_method ) +{ + (void)p_access; + const char *psz_username = p_url->psz_username ?: ""; + const char *psz_password = p_url->psz_password ?: ""; + + char *psz_HA1 = NULL; + char *psz_HA2 = NULL; + char *psz_response = NULL; + struct md5_s md5; + + /* H(A1) */ + if( p_auth->psz_HA1 ) + { + psz_HA1 = strdup( p_auth->psz_HA1 ); + if( !psz_HA1 ) goto error; + } + else + { + InitMD5( &md5 ); + AddMD5( &md5, psz_username, strlen( psz_username ) ); + AddMD5( &md5, ":", 1 ); + AddMD5( &md5, p_auth->psz_realm, strlen( p_auth->psz_realm ) ); + AddMD5( &md5, ":", 1 ); + AddMD5( &md5, psz_password, strlen( psz_password ) ); + EndMD5( &md5 ); + + psz_HA1 = psz_md5_hash( &md5 ); + if( !psz_HA1 ) goto error; + + if( p_auth->psz_algorithm + && !strcmp( p_auth->psz_algorithm, "MD5-sess" ) ) + { + InitMD5( &md5 ); + AddMD5( &md5, psz_HA1, 32 ); + free( psz_HA1 ); + AddMD5( &md5, ":", 1 ); + AddMD5( &md5, p_auth->psz_nonce, strlen( p_auth->psz_nonce ) ); + AddMD5( &md5, ":", 1 ); + AddMD5( &md5, p_auth->psz_cnonce, strlen( p_auth->psz_cnonce ) ); + EndMD5( &md5 ); + + psz_HA1 = psz_md5_hash( &md5 ); + if( !psz_HA1 ) goto error; + p_auth->psz_HA1 = strdup( psz_HA1 ); + if( !p_auth->psz_HA1 ) goto error; + } + } + + /* H(A2) */ + InitMD5( &md5 ); + if( *psz_method ) + AddMD5( &md5, psz_method, strlen( psz_method ) ); + AddMD5( &md5, ":", 1 ); + if( p_url->psz_path ) + AddMD5( &md5, p_url->psz_path, strlen( p_url->psz_path ) ); + else + AddMD5( &md5, "/", 1 ); + if( p_auth->psz_qop && !strcmp( p_auth->psz_qop, "auth-int" ) ) + { + char *psz_ent; + struct md5_s ent; + InitMD5( &ent ); + AddMD5( &ent, "", 0 ); /* XXX: entity-body. should be ok for GET */ + EndMD5( &ent ); + psz_ent = psz_md5_hash( &ent ); + if( !psz_ent ) goto error; + AddMD5( &md5, ":", 1 ); + AddMD5( &md5, psz_ent, 32 ); + free( psz_ent ); + } + EndMD5( &md5 ); + psz_HA2 = psz_md5_hash( &md5 ); + if( !psz_HA2 ) goto error; + + /* Request digest */ + InitMD5( &md5 ); + AddMD5( &md5, psz_HA1, 32 ); + AddMD5( &md5, ":", 1 ); + AddMD5( &md5, p_auth->psz_nonce, strlen( p_auth->psz_nonce ) ); + AddMD5( &md5, ":", 1 ); + if( p_auth->psz_qop + && ( !strcmp( p_auth->psz_qop, "auth" ) + || !strcmp( p_auth->psz_qop, "auth-int" ) ) ) + { + char psz_inonce[9]; + snprintf( psz_inonce, 9, "%08x", p_auth->i_nonce ); + AddMD5( &md5, psz_inonce, 8 ); + AddMD5( &md5, ":", 1 ); + AddMD5( &md5, p_auth->psz_cnonce, strlen( p_auth->psz_cnonce ) ); + AddMD5( &md5, ":", 1 ); + AddMD5( &md5, p_auth->psz_qop, strlen( p_auth->psz_qop ) ); + AddMD5( &md5, ":", 1 ); + } + AddMD5( &md5, psz_HA2, 32 ); + EndMD5( &md5 ); + psz_response = psz_md5_hash( &md5 ); + + error: + free( psz_HA1 ); + free( psz_HA2 ); + return psz_response; +} + + +static void AuthReply( access_t *p_access, const char *psz_prefix, + vlc_url_t *p_url, http_auth_t *p_auth ) +{ + access_sys_t *p_sys = p_access->p_sys; + v_socket_t *pvs = p_sys->p_vs; + + const char *psz_username = p_url->psz_username ?: ""; + const char *psz_password = p_url->psz_password ?: ""; + + if( p_auth->psz_nonce ) + { + /* Digest Access Authentication */ + char *psz_response; + + if( p_auth->psz_algorithm + && strcmp( p_auth->psz_algorithm, "MD5" ) + && strcmp( p_auth->psz_algorithm, "MD5-sess" ) ) + { + msg_Err( p_access, "Digest Access Authentication: " + "Unknown algorithm '%s'", p_auth->psz_algorithm ); + return; + } + + if( p_auth->psz_qop || !p_auth->psz_cnonce ) + { + /* FIXME: needs to be really random to prevent man in the middle + * attacks */ + free( p_auth->psz_cnonce ); + p_auth->psz_cnonce = strdup( "Some random string FIXME" ); + } + p_auth->i_nonce ++; + + psz_response = AuthDigest( p_access, p_url, p_auth, "GET" ); + if( !psz_response ) return; + + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + "%sAuthorization: Digest " + /* Mandatory parameters */ + "username=\"%s\", " + "realm=\"%s\", " + "nonce=\"%s\", " + "uri=\"%s\", " + "response=\"%s\", " + /* Optional parameters */ + "%s%s%s" /* algorithm */ + "%s%s%s" /* cnonce */ + "%s%s%s" /* opaque */ + "%s%s%s" /* message qop */ + "%s%08x%s" /* nonce count */ + "\r\n", + /* Mandatory parameters */ + psz_prefix, + psz_username, + p_auth->psz_realm, + p_auth->psz_nonce, + p_url->psz_path ?: "/", + psz_response, + /* Optional parameters */ + p_auth->psz_algorithm ? "algorithm=\"" : "", + p_auth->psz_algorithm ?: "", + p_auth->psz_algorithm ? "\", " : "", + p_auth->psz_cnonce ? "cnonce=\"" : "", + p_auth->psz_cnonce ?: "", + p_auth->psz_cnonce ? "\", " : "", + p_auth->psz_opaque ? "opaque=\"" : "", + p_auth->psz_opaque ?: "", + p_auth->psz_opaque ? "\", " : "", + p_auth->psz_qop ? "qop=\"" : "", + p_auth->psz_qop ?: "", + p_auth->psz_qop ? "\", " : "", + p_auth->i_nonce ? "nc=\"" : "uglyhack=\"", /* Will be parsed as an unhandled extension */ + p_auth->i_nonce, + p_auth->i_nonce ? "\"" : "\"" + ); + + free( psz_response ); + } + else + { + /* Basic Access Authentication */ + char buf[strlen( psz_username ) + strlen( psz_password ) + 2]; + char *b64; + + snprintf( buf, sizeof( buf ), "%s:%s", psz_username, psz_password ); + b64 = vlc_b64_encode( buf ); + + if( b64 != NULL ) + { + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + "%sAuthorization: Basic %s\r\n", psz_prefix, b64 ); + free( b64 ); + } + } +} + +static int AuthCheckReply( access_t *p_access, const char *psz_header, + vlc_url_t *p_url, http_auth_t *p_auth ) +{ + int i_ret = VLC_EGENERIC; + char *psz_nextnonce = AuthGetParam( psz_header, "nextnonce" ); + char *psz_qop = AuthGetParamNoQuotes( psz_header, "qop" ); + char *psz_rspauth = AuthGetParam( psz_header, "rspauth" ); + char *psz_cnonce = AuthGetParam( psz_header, "cnonce" ); + char *psz_nc = AuthGetParamNoQuotes( psz_header, "nc" ); + + if( psz_cnonce ) + { + char *psz_digest; + + if( strcmp( psz_cnonce, p_auth->psz_cnonce ) ) + { + msg_Err( p_access, "HTTP Digest Access Authentication: server replied with a different client nonce value." ); + goto error; + } + + if( psz_nc ) + { + int i_nonce; + i_nonce = strtol( psz_nc, NULL, 16 ); + if( i_nonce != p_auth->i_nonce ) + { + msg_Err( p_access, "HTTP Digest Access Authentication: server replied with a different nonce count value." ); + goto error; + } + } + + if( psz_qop && p_auth->psz_qop && strcmp( psz_qop, p_auth->psz_qop ) ) + msg_Warn( p_access, "HTTP Digest Access Authentication: server replied using a different 'quality of protection' option" ); + + /* All the clear text values match, let's now check the response + * digest */ + psz_digest = AuthDigest( p_access, p_url, p_auth, "" ); + if( strcmp( psz_digest, psz_rspauth ) ) + { + msg_Err( p_access, "HTTP Digest Access Authentication: server replied with an invalid response digest (expected value: %s).", psz_digest ); + free( psz_digest ); + goto error; + } + free( psz_digest ); + } + + if( psz_nextnonce ) + { + free( p_auth->psz_nonce ); + p_auth->psz_nonce = psz_nextnonce; + psz_nextnonce = NULL; + } + + i_ret = VLC_SUCCESS; + error: + free( psz_nextnonce ); + free( psz_qop ); + free( psz_rspauth ); + free( psz_cnonce ); + free( psz_nc ); + + return i_ret; +} + +static void AuthReset( http_auth_t *p_auth ) +{ + FREENULL( p_auth->psz_realm ); + FREENULL( p_auth->psz_domain ); + FREENULL( p_auth->psz_nonce ); + FREENULL( p_auth->psz_opaque ); + FREENULL( p_auth->psz_stale ); + FREENULL( p_auth->psz_algorithm ); + FREENULL( p_auth->psz_qop ); + p_auth->i_nonce = 0; + FREENULL( p_auth->psz_cnonce ); + FREENULL( p_auth->psz_HA1 ); +}