X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fhttp.c;h=398c38b0d7ef16075571a3af06564913251cb49a;hb=a869d39dc6f521e7bcb74bb8c359f37ce1582535;hp=a06340590fe6501adb74cdbd800e01d81481fdc5;hpb=dff434365d951b38be69859dc8c3b210c82e019f;p=vlc diff --git a/modules/access/http.c b/modules/access/http.c index a06340590f..398c38b0d7 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 @@ -30,24 +31,37 @@ # include "config.h" #endif -#include +#include +#include #include -#include +#include #include #include #include #include #include +#include #include #include +#include #ifdef HAVE_ZLIB_H # include #endif +#include + +#ifdef HAVE_LIBPROXY +# include +#endif + +#ifdef WIN32 +# include +#endif + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -57,9 +71,13 @@ static void Close( vlc_object_t * ); #define PROXY_TEXT N_("HTTP proxy") #define PROXY_LONGTEXT N_( \ "HTTP proxy to be used It must be of the form " \ - "http://[user[:pass]@]myproxy.mydomain:myport/ ; " \ + "http://[user@]myproxy.mydomain:myport/ ; " \ "if empty, the http_proxy environment variable will be tried." ) +#define PROXY_PASS_TEXT N_("HTTP proxy password") +#define PROXY_PASS_LONGTEXT N_( \ + "If your HTTP proxy requires a password, set it here." ) + #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ "Caching value for HTTP streams. This " \ @@ -81,58 +99,62 @@ static void Close( vlc_object_t * ); "types of HTTP streams." ) #define FORWARD_COOKIES_TEXT N_("Forward Cookies") -#define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies Across http redirections ") +#define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies across http redirections.") + +#define MAX_REDIRECT_TEXT N_("Max number of redirection") +#define MAX_REDIRECT_LONGTEXT N_("Limit the number of redirection to follow.") -vlc_module_begin(); - set_description( _("HTTP input") ); - set_capability( "access2", 0 ); - set_shortname( _( "HTTP(S)" ) ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +#define USE_IE_PROXY_TEXT N_("Use Internet Explorer entered HTTP proxy server") +#define USE_IE_PROXY_LONGTEXT N_("Use Internet Explorer entered HTTP proxy " \ + "server for all URL. Don't take into account bypasses settings and auto " \ + "configuration scripts.") + +vlc_module_begin () + set_description( N_("HTTP input") ) + set_capability( "access", 0 ) + set_shortname( N_( "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_password( "http-proxy-pwd", NULL, NULL, + PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false ) add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); - add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT, - AGENT_LONGTEXT, VLC_TRUE ); - add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT, - RECONNECT_LONGTEXT, VLC_TRUE ); - add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT, - CONTINUOUS_LONGTEXT, VLC_TRUE ); - add_bool( "http-forward-cookies", 0, NULL, FORWARD_COOKIES_TEXT, - FORWARD_COOKIES_LONGTEXT, VLC_TRUE ); - add_obsolete_string("http-user"); - add_obsolete_string("http-pwd"); - add_shortcut( "http" ); - add_shortcut( "https" ); - add_shortcut( "unsv" ); - add_shortcut( "itpc" ); /* iTunes Podcast */ - set_callbacks( Open, Close ); -vlc_module_end(); + CACHING_TEXT, CACHING_LONGTEXT, true ) + change_safe() + add_string( "http-user-agent", PACKAGE_NAME"/"PACKAGE_VERSION, NULL, + AGENT_TEXT, AGENT_LONGTEXT, true ) + change_safe() + change_need_restart() + add_bool( "http-reconnect", false, NULL, RECONNECT_TEXT, + RECONNECT_LONGTEXT, true ) + add_bool( "http-continuous", false, NULL, CONTINUOUS_TEXT, + CONTINUOUS_LONGTEXT, true ) + change_safe() + add_bool( "http-forward-cookies", true, NULL, FORWARD_COOKIES_TEXT, + FORWARD_COOKIES_LONGTEXT, true ) + add_integer( "http-max-redirect", 5, NULL, MAX_REDIRECT_TEXT, + MAX_REDIRECT_LONGTEXT, true ) +#ifdef WIN32 + add_bool( "http-use-IE-proxy", false, NULL, USE_IE_PROXY_TEXT, + USE_IE_PROXY_LONGTEXT, true ) +#endif + add_obsolete_string("http-user") + add_obsolete_string("http-pwd") + /* 'itpc' = iTunes Podcast */ + add_shortcut( "http", "https", "unsv", "itpc", "icyx" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes *****************************************************************************/ -/* RFC 2617: Basic and Digest Access Authentification */ -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; + bool b_error; tls_session_t *p_tls; v_socket_t *p_vs; @@ -142,9 +164,10 @@ struct access_sys_t http_auth_t auth; /* Proxy */ - vlc_bool_t b_proxy; + bool b_proxy; vlc_url_t proxy; http_auth_t proxy_auth; + char *psz_proxy_passbuf; /* */ int i_code; @@ -154,11 +177,11 @@ 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 - vlc_bool_t b_compressed; + bool b_compressed; struct { z_stream stream; @@ -166,36 +189,41 @@ struct access_sys_t } inflate; #endif - vlc_bool_t b_chunked; + bool b_chunked; int64_t i_chunk; int i_icy_meta; + uint64_t i_icy_offset; char *psz_icy_name; char *psz_icy_genre; char *psz_icy_title; - int i_remaining; + uint64_t 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; + bool b_persist; + bool b_has_size; vlc_array_t * cookies; }; /* */ -static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ); +static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access, + int i_nb_redirect, int i_max_redirect, + 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 Seek( access_t *, uint64_t ); static int Control( access_t *, int, va_list ); /* */ -static int Connect( access_t *, int64_t ); -static int Request( access_t *p_access, int64_t i_tell ); +static int Connect( access_t *, uint64_t ); +static int Request( access_t *p_access, uint64_t i_tell ); static void Disconnect( access_t * ); /* Small Cookie utilities. Cookies support is partial. */ @@ -205,30 +233,42 @@ 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 OpenWithCookies( p_this, NULL ); + access_t *p_access = (access_t*)p_this; + return OpenWithCookies( p_this, p_access->psz_access, 0, + var_InheritInteger( p_access, "http-max-redirect" ), NULL ); } -static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) +/** + * Open the given url using the given cookies + * @param p_this: the vlc object + * @psz_access: the acces to use (http, https, ...) (this value must be used + * instead of p_access->psz_access) + * @i_nb_redirect: the number of redirection already done + * @i_max_redirect: limit to the number of redirection to follow + * @cookies: the available cookies + * @return vlc error codes + */ +static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access, + int i_nb_redirect, int i_max_redirect, + vlc_array_t *cookies ) { access_t *p_access = (access_t*)p_this; access_sys_t *p_sys; char *psz, *p; + /* Only forward an store cookies if the corresponding option is activated */ - vlc_bool_t b_forward_cookies = var_CreateGetBool( p_access, "http-forward-cookies" ); - vlc_array_t * saved_cookies = b_forward_cookies ? (cookies ?: vlc_array_new()) : NULL; + bool b_forward_cookies = var_InheritBool( p_access, "http-forward-cookies" ); + vlc_array_t * saved_cookies = b_forward_cookies ? (cookies ? cookies : vlc_array_new()) : NULL; /* Set up p_access */ STANDARD_READ_ACCESS_INIT; @@ -236,19 +276,20 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) p_access->pf_read = ReadCompressed; #endif p_sys->fd = -1; - p_sys->b_proxy = VLC_FALSE; + p_sys->b_proxy = false; + p_sys->psz_proxy_passbuf = NULL; 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 = VLC_FALSE; + 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", @@ -260,15 +301,24 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) p_sys->p_tls = NULL; p_sys->p_vs = NULL; p_sys->i_icy_meta = 0; + p_sys->i_icy_offset = 0; p_sys->psz_icy_name = NULL; p_sys->psz_icy_genre = NULL; p_sys->psz_icy_title = NULL; p_sys->i_remaining = 0; + p_sys->b_persist = false; + p_sys->b_has_size = false; + p_access->info.i_size = 0; + p_access->info.i_pos = 0; + p_access->info.b_eof = false; p_sys->cookies = saved_cookies; + http_auth_Init( &p_sys->auth ); + http_auth_Init( &p_sys->proxy_auth ); + /* Parse URI - remove spaces */ - p = psz = strdup( p_access->psz_path ); + p = psz = strdup( p_access->psz_location ); while( (p = strchr( p, ' ' )) != NULL ) *p = '+'; vlc_UrlParse( &p_sys->url, psz, 0 ); @@ -279,10 +329,10 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) msg_Warn( p_access, "invalid host" ); goto error; } - if( !strncmp( p_access->psz_access, "https", 5 ) ) + if( !strncmp( 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; } @@ -292,28 +342,136 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) p_sys->url.i_port = 80; } - /* Do user agent */ - p_sys->psz_user_agent = var_CreateGetString( p_access, "http-user-agent" ); + /* Determine the HTTP user agent */ + /* See RFC2616 §2.2 token definition and §3.8 user-agent header */ + p_sys->psz_user_agent = var_InheritString( p_access, "http-user-agent" ); + for( char *p = p_sys->psz_user_agent; *p; p++ ) + { + uint8_t c = *p; + if( c < 32 || strchr( "()<>@,;:\\\"[]?={}", c ) ) + *p = '_'; /* remove potentially harmful characters */ + } /* Check proxy */ - psz = var_CreateGetString( p_access, "http-proxy" ); - if( *psz ) + psz = var_InheritString( p_access, "http-proxy" ); + if( psz ) { - p_sys->b_proxy = VLC_TRUE; + p_sys->b_proxy = true; vlc_UrlParse( &p_sys->proxy, psz, 0 ); + free( psz ); + } +#ifdef HAVE_LIBPROXY + else + { + pxProxyFactory *pf = px_proxy_factory_new(); + if (pf) + { + char *buf; + int i; + i=asprintf(&buf, "%s://%s", psz_access, p_access->psz_location); + if (i >= 0) + { + msg_Dbg(p_access, "asking libproxy about url '%s'", buf); + char **proxies = px_proxy_factory_get_proxies(pf, buf); + if (proxies[0]) + { + msg_Dbg(p_access, "libproxy suggest to use '%s'", proxies[0]); + if(strcmp(proxies[0],"direct://") != 0) + { + p_sys->b_proxy = true; + vlc_UrlParse( &p_sys->proxy, proxies[0], 0); + } + } + for(i=0;proxies[i];i++) free(proxies[i]); + free(proxies); + free(buf); + } + px_proxy_factory_free(pf); + } + else + { + msg_Err(p_access, "Allocating memory for libproxy failed"); + } + } +#elif defined( WIN32 ) + else + { + if( var_InheritBool( p_access, "http-use-IE-proxy" ) ) + { + /* Try to get the proxy server address from Windows internet settings using registry. */ + HKEY h_key; + /* Open the key */ + if( RegOpenKeyEx( HKEY_CURRENT_USER, "Software\\Microsoft" \ + "\\Windows\\CurrentVersion\\Internet Settings", + 0, KEY_READ, &h_key ) == ERROR_SUCCESS ) + { + DWORD i_dataReadSize = 4; /* sizeof( DWORD ); */ + DWORD proxyEnable = 0; + /* Get the proxy enable value */ + if( RegQueryValueEx( h_key, "ProxyEnable", NULL, NULL, + (char *)&proxyEnable, &i_dataReadSize ) + == ERROR_SUCCESS ) + { + if( proxyEnable ) + { + /* Proxy is enable */ + char psz_key[256]; + i_dataReadSize = 256; + if( RegQueryValueEx( h_key, "ProxyServer", + NULL, NULL, psz_key, + &i_dataReadSize ) + == ERROR_SUCCESS ) + { + /* Get the proxy URL : + Proxy server value in the registry can be something like "address:port" + or "ftp=address1:port1;http=address2:port2 ..." depending of the + confirguration. */ + char *psz_proxy; + psz_proxy = strstr( psz_key, "http=" ); + if( psz_proxy != NULL ) + { + psz_proxy += strlen( "http=" ); + char *psz_endUrl = strchr( psz_proxy, ';' ); + if( psz_endUrl != NULL ) + *psz_endUrl = '\0'; + } + else + psz_proxy = psz_key; + /* Set proxy enable for this connection. */ + p_sys->b_proxy = true; + vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 ); + } + msg_Warn( p_access, "Couldn't read in registry " \ + "the proxy server address." ); + } + } + else + msg_Warn( p_access, "Couldn't read in registry if the " \ + "proxy is enable or not." ); + } + else + msg_Warn( p_access, "Couldn't open internet settings key " \ + "in registry." ); + } } -#ifdef HAVE_GETENV +#elif defined( HAVE_GETENV ) else { - char *psz_proxy = getenv( "http_proxy" ); - if( psz_proxy && *psz_proxy ) + psz = getenv( "http_proxy" ); + if( psz ) { - p_sys->b_proxy = VLC_TRUE; - vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 ); + p_sys->b_proxy = true; + vlc_UrlParse( &p_sys->proxy, psz, 0 ); } } #endif - free( psz ); + + if( psz ) /* No, this is NOT a use-after-free error */ + { + psz = var_InheritString( p_access, "http-proxy-pwd" ); + if( psz ) + p_sys->proxy.psz_password = p_sys->psz_proxy_passbuf = psz; + } if( p_sys->b_proxy ) { @@ -328,8 +486,9 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) } } - msg_Dbg( p_access, "http: server='%s' port=%d file='%s", - p_sys->url.psz_host, p_sys->url.i_port, p_sys->url.psz_path ); + msg_Dbg( p_access, "http: server='%s' port=%d file='%s'", + p_sys->url.psz_host, p_sys->url.i_port, + p_sys->url.psz_path != NULL ? p_sys->url.psz_path : "" ); if( p_sys->b_proxy ) { msg_Dbg( p_access, " proxy %s:%d", p_sys->proxy.psz_host, @@ -337,12 +496,11 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) } if( p_sys->url.psz_username && *p_sys->url.psz_username ) { - msg_Dbg( p_access, " user='%s', pwd='%s'", - p_sys->url.psz_username, p_sys->url.psz_password ); + msg_Dbg( p_access, " user='%s'", p_sys->url.psz_username ); } - p_sys->b_reconnect = var_CreateGetBool( p_access, "http-reconnect" ); - p_sys->b_continuous = var_CreateGetBool( p_access, "http-continuous" ); + p_sys->b_reconnect = var_InheritBool( p_access, "http-reconnect" ); + p_sys->b_continuous = var_InheritBool( p_access, "http-continuous" ); connect: /* Connect */ @@ -355,9 +513,9 @@ 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 ) ) + if( !vlc_object_alive (p_access) || Connect( p_access, 0 ) ) goto error; #ifndef NDEBUG @@ -372,30 +530,26 @@ connect: if( p_sys->i_code == 401 ) { - char *psz_login = NULL; char *psz_password = NULL; - char psz_msg[250]; - int i_ret; + char *psz_login, *psz_password; /* FIXME ? */ if( p_sys->url.psz_username && p_sys->url.psz_password && p_sys->auth.psz_nonce && p_sys->auth.i_nonce == 0 ) { + Disconnect( p_access ); 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"), - psz_msg, &psz_login, &psz_password ); - if( i_ret == DIALOG_OK_YES ) + p_sys->auth.psz_realm ); + dialog_Login( p_access, &psz_login, &psz_password, + _("HTTP authentication"), + _("Please enter a valid login name and a password for realm %s."), + p_sys->auth.psz_realm ); + if( psz_login != NULL && psz_password != NULL ) { - 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 ); - free( psz_login ); - free( psz_password ); + msg_Dbg( p_access, "retrying with user=%s", psz_login ); + p_sys->url.psz_username = psz_login; + p_sys->url.psz_password = psz_password; + Disconnect( p_access ); goto connect; } else @@ -412,21 +566,34 @@ connect: { msg_Dbg( p_access, "redirection to %s", p_sys->psz_location ); + /* Check the number of redirection already done */ + if( i_nb_redirect >= i_max_redirect ) + { + msg_Err( p_access, "Too many redirection: break potential infinite" + "loop" ); + goto error; + } + + /* Do not accept redirection outside of HTTP works */ - if( strncmp( p_sys->psz_location, "http", 4 ) - || ( ( p_sys->psz_location[4] != ':' ) /* HTTP */ - && strncmp( p_sys->psz_location + 4, "s:", 2 ) /* HTTP/SSL */ ) ) + const char *psz_protocol; + if( !strncmp( p_sys->psz_location, "http:", 5 ) ) + psz_protocol = "http"; + else if( !strncmp( p_sys->psz_location, "https:", 6 ) ) + psz_protocol = "https"; + else { msg_Err( p_access, "insecure redirection ignored" ); goto error; } - free( p_access->psz_path ); - p_access->psz_path = strdup( p_sys->psz_location ); + free( p_access->psz_location ); + p_access->psz_location = strdup( p_sys->psz_location ); /* Clean up current Open() run */ vlc_UrlClean( &p_sys->url ); - AuthReset( &p_sys->auth ); + http_auth_Reset( &p_sys->auth ); vlc_UrlClean( &p_sys->proxy ); - AuthReset( &p_sys->proxy_auth ); + free( p_sys->psz_proxy_passbuf ); + http_auth_Reset( &p_sys->proxy_auth ); free( p_sys->psz_mime ); free( p_sys->psz_pragma ); free( p_sys->psz_location ); @@ -434,10 +601,14 @@ connect: Disconnect( p_access ); cookies = p_sys->cookies; +#ifdef HAVE_ZLIB_H + inflateEnd( &p_sys->inflate.stream ); +#endif free( p_sys ); /* Do new Open() run with new data */ - return OpenWithCookies( p_this, cookies ); + return OpenWithCookies( p_this, psz_protocol, i_nb_redirect + 1, + i_max_redirect, cookies ); } if( p_sys->b_mms ) @@ -452,12 +623,21 @@ connect: { if( !strcasecmp( p_sys->psz_mime, "video/nsv" ) || !strcasecmp( p_sys->psz_mime, "video/nsa" ) ) + { + free( p_access->psz_demux ); p_access->psz_demux = strdup( "nsv" ); + } else if( !strcasecmp( p_sys->psz_mime, "audio/aac" ) || !strcasecmp( p_sys->psz_mime, "audio/aacp" ) ) + { + free( p_access->psz_demux ); p_access->psz_demux = strdup( "m4a" ); + } else if( !strcasecmp( p_sys->psz_mime, "audio/mpeg" ) ) + { + free( p_access->psz_demux ); p_access->psz_demux = strdup( "mp3" ); + } msg_Info( p_access, "Raw-audio server found, %s demuxer selected", p_access->psz_demux ); @@ -465,31 +645,37 @@ 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 ) { - /* Shoutcast */ - p_access->psz_demux = strdup( "mp3" ); + free( p_access->psz_demux ); + /* Shoutcast */ + p_access->psz_demux = strdup( "mp3" ); } /* else probably Ogg Vorbis */ } - else if( !strcasecmp( p_access->psz_access, "unsv" ) && + else if( !strcasecmp( psz_access, "unsv" ) && p_sys->psz_mime && !strcasecmp( p_sys->psz_mime, "misc/ultravox" ) ) { + free( p_access->psz_demux ); /* Grrrr! detect ultravox server and force NSV demuxer */ p_access->psz_demux = strdup( "nsv" ); } - else if( !strcmp( p_access->psz_access, "itpc" ) ) + else if( !strcmp( psz_access, "itpc" ) ) { + free( p_access->psz_demux ); p_access->psz_demux = strdup( "podcast" ); } else if( p_sys->psz_mime && !strncasecmp( p_sys->psz_mime, "application/xspf+xml", 20 ) && ( memchr( " ;\t", p_sys->psz_mime[20], 4 ) != NULL ) ) + { + free( p_access->psz_demux ); p_access->psz_demux = strdup( "xspf-open" ); + } if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" ); @@ -501,12 +687,25 @@ connect: error: vlc_UrlClean( &p_sys->url ); vlc_UrlClean( &p_sys->proxy ); + free( p_sys->psz_proxy_passbuf ); free( p_sys->psz_mime ); free( p_sys->psz_pragma ); free( p_sys->psz_location ); free( p_sys->psz_user_agent ); Disconnect( p_access ); + + 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 ); +#endif free( p_sys ); return VLC_EGENERIC; } @@ -520,9 +719,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 ); + http_auth_Reset( &p_sys->auth ); vlc_UrlClean( &p_sys->proxy ); - AuthReset( &p_sys->proxy_auth ); + http_auth_Reset( &p_sys->proxy_auth ); free( p_sys->psz_mime ); free( p_sys->psz_pragma ); @@ -562,33 +761,35 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) access_sys_t *p_sys = p_access->p_sys; int i_read; - if( p_sys->fd < 0 ) + if( p_sys->fd == -1 ) { - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; return 0; } - if( p_access->info.i_size > 0 && - i_len + p_access->info.i_pos > p_access->info.i_size ) + if( p_sys->b_has_size ) { - if( ( i_len = p_access->info.i_size - p_access->info.i_pos ) == 0 ) - { - p_access->info.b_eof = VLC_TRUE; - return 0; - } + /* Remaining bytes in the file */ + uint64_t remainder = p_access->info.i_size - p_access->info.i_pos; + if( remainder < i_len ) + i_len = remainder; + + /* Remaining bytes in the response */ + if( p_sys->i_remaining < i_len ) + i_len = p_sys->i_remaining; } if( p_sys->b_chunked ) { if( p_sys->i_chunk < 0 ) { - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; return 0; } if( p_sys->i_chunk <= 0 ) { - char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, p_sys->p_vs ); + char *psz = net_Gets( p_access, p_sys->fd, p_sys->p_vs ); /* read the chunk header */ if( psz == NULL ) { @@ -602,40 +803,31 @@ 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; } } if( i_len > p_sys->i_chunk ) - { i_len = p_sys->i_chunk; - } } - if( p_sys->b_continuous && (ssize_t)i_len > p_sys->i_remaining ) + if( i_len == 0 ) { - /* Only ask for the remaining length */ - int i_new_len = p_sys->i_remaining; - if( i_new_len == 0 ) - { - Request( p_access, 0 ); - i_read = Read( p_access, p_buffer, i_len ); - return i_read; - } - i_len = i_new_len; + p_access->info.b_eof = true; + return 0; } - if( p_sys->i_icy_meta > 0 && p_access->info.i_pos > 0 ) + if( p_sys->i_icy_meta > 0 && p_access->info.i_pos-p_sys->i_icy_offset > 0 ) { int64_t i_next = p_sys->i_icy_meta - - p_access->info.i_pos % p_sys->i_icy_meta; + (p_access->info.i_pos - p_sys->i_icy_offset ) % p_sys->i_icy_meta; if( i_next == p_sys->i_icy_meta ) { if( ReadICYMeta( p_access ) ) { - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; return -1; } } @@ -643,24 +835,22 @@ 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 ) { - p_access->info.i_pos += i_read; - if( p_sys->b_chunked ) { p_sys->i_chunk -= i_read; if( p_sys->i_chunk <= 0 ) { /* read the empty line */ - char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, p_sys->p_vs ); + char *psz = net_Gets( p_access, p_sys->fd, p_sys->p_vs ); free( psz ); } } } - else if( i_read == 0 ) + else { /* * I very much doubt that this will work. @@ -671,12 +861,12 @@ 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 ) + if( p_sys->b_reconnect && vlc_object_alive( p_access ) ) { msg_Dbg( p_access, "got disconnected, trying to reconnect" ); if( Connect( p_access, p_access->info.i_pos ) ) @@ -685,17 +875,29 @@ 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; + + return i_read; } } - if( i_read == 0 ) p_access->info.b_eof = VLC_TRUE; + if( i_read <= 0 ) + { + p_access->info.b_eof = true; + if( i_read < 0 ) + p_sys->b_error = true; + return 0; + } } - if( p_sys->b_continuous ) + assert( i_read >= 0 ); + p_access->info.i_pos += i_read; + if( p_sys->b_has_size ) { + assert( p_access->info.i_pos <= p_access->info.i_size ); + assert( (unsigned)i_read <= p_sys->i_remaining ); p_sys->i_remaining -= i_read; } @@ -712,7 +914,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 ) @@ -723,8 +925,11 @@ 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 ) + { + free( psz_meta ); return VLC_EGENERIC; + } psz_meta[i_read] = '\0'; /* Just in case */ @@ -755,7 +960,10 @@ static int ReadICYMeta( access_t *p_access ) strcmp( p_sys->psz_icy_title, &p[1] ) ) { free( p_sys->psz_icy_title ); - p_sys->psz_icy_title = strdup( &p[1] ); + char *psz_tmp = strdup( &p[1] ); + p_sys->psz_icy_title = EnsureUTF8( psz_tmp ); + if( !p_sys->psz_icy_title ) + free( psz_tmp ); p_access->info.i_update |= INPUT_UPDATE_META; msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title ); @@ -805,16 +1013,27 @@ static ssize_t ReadCompressed( access_t *p_access, uint8_t *p_buffer, /***************************************************************************** * Seek: close and re-open a connection at the right place *****************************************************************************/ -static int Seek( access_t *p_access, int64_t i_pos ) +static int Seek( access_t *p_access, uint64_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( p_access->info.i_size + && i_pos >= p_access->info.i_size ) { + msg_Err( p_access, "seek to far" ); + int retval = Seek( p_access, p_access->info.i_size - 1 ); + if( retval == VLC_SUCCESS ) { + uint8_t p_buffer[2]; + Read( p_access, p_buffer, 1); + p_access->info.b_eof = false; + } + return retval; + } 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; @@ -826,42 +1045,36 @@ 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; - int *pi_int; - int64_t *pi_64; - vlc_meta_t *p_meta; + bool *pb_bool; + int64_t *pi_64; + vlc_meta_t *p_meta; switch( i_query ) { /* */ 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; /* */ - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = 0; - break; - case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); - *pi_64 = (int64_t)var_GetInteger( p_access, "http-caching" ) * 1000; + *pi_64 = var_GetInteger( p_access, "http-caching" ) * 1000; break; /* */ @@ -901,7 +1114,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) /***************************************************************************** * Connect: *****************************************************************************/ -static int Connect( access_t *p_access, int64_t i_tell ) +static int Connect( access_t *p_access, uint64_t i_tell ) { access_sys_t *p_sys = p_access->p_sys; vlc_url_t srv = p_sys->b_proxy ? p_sys->proxy : p_sys->url; @@ -919,29 +1132,33 @@ 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->i_icy_offset = i_tell; p_sys->psz_icy_name = NULL; p_sys->psz_icy_genre = NULL; p_sys->psz_icy_title = NULL; - + p_sys->i_remaining = 0; + p_sys->b_persist = false; + p_sys->b_has_size = false; 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 */ + assert( p_sys->fd == -1 ); /* No open sockets (leaking fds is BAD) */ p_sys->fd = net_ConnectTCP( p_access, srv.psz_host, srv.i_port ); if( p_sys->fd == -1 ) { msg_Err( p_access, "cannot connect to %s:%d", srv.psz_host, srv.i_port ); return -1; } + setsockopt (p_sys->fd, SOL_SOCKET, SO_KEEPALIVE, &(int){ 1 }, sizeof (int)); /* 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 ) @@ -956,13 +1173,13 @@ static int Connect( access_t *p_access, int64_t i_tell ) return -1; } - net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, + net_Printf( p_access, p_sys->fd, NULL, "CONNECT %s:%d HTTP/1.%d\r\nHost: %s:%d\r\n\r\n", p_sys->url.psz_host, p_sys->url.i_port, p_sys->i_version, p_sys->url.psz_host, p_sys->url.i_port); - psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL ); + psz = net_Gets( p_access, p_sys->fd, NULL ); if( psz == NULL ) { msg_Err( p_access, "cannot establish HTTP/TLS tunnel" ); @@ -982,7 +1199,7 @@ static int Connect( access_t *p_access, int64_t i_tell ) do { - psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL ); + psz = net_Gets( p_access, p_sys->fd, NULL ); if( psz == NULL ) { msg_Err( p_access, "HTTP proxy connection failed" ); @@ -995,7 +1212,7 @@ static int Connect( access_t *p_access, int64_t i_tell ) free( psz ); - if( p_access->b_die || p_access->b_error ) + if( !vlc_object_alive (p_access) || p_sys->b_error ) { Disconnect( p_access ); return -1; @@ -1006,7 +1223,7 @@ static int Connect( access_t *p_access, int64_t i_tell ) /* TLS/SSL handshake */ p_sys->p_tls = tls_ClientCreate( VLC_OBJECT(p_access), p_sys->fd, - srv.psz_host ); + p_sys->url.psz_host ); if( p_sys->p_tls == NULL ) { msg_Err( p_access, "cannot establish HTTP/TLS session" ); @@ -1020,24 +1237,26 @@ static int Connect( access_t *p_access, int64_t i_tell ) } -static int Request( access_t *p_access, int64_t i_tell ) +static int Request( access_t *p_access, uint64_t i_tell ) { access_sys_t *p_sys = p_access->p_sys; char *psz ; v_socket_t *pvs = p_sys->p_vs; + p_sys->b_persist = false; + p_sys->i_remaining = 0; if( p_sys->b_proxy ) { if( p_sys->url.psz_path ) { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, + net_Printf( p_access, p_sys->fd, NULL, "GET http://%s:%d%s HTTP/1.%d\r\n", p_sys->url.psz_host, p_sys->url.i_port, p_sys->url.psz_path, p_sys->i_version ); } else { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, + net_Printf( p_access, p_sys->fd, NULL, "GET http://%s:%d/ HTTP/1.%d\r\n", p_sys->url.psz_host, p_sys->url.i_port, p_sys->i_version ); @@ -1052,26 +1271,29 @@ static int Request( access_t *p_access, int64_t i_tell ) } if( p_sys->url.i_port != (pvs ? 443 : 80) ) { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + net_Printf( p_access, p_sys->fd, pvs, "GET %s HTTP/1.%d\r\nHost: %s:%d\r\n", psz_path, p_sys->i_version, p_sys->url.psz_host, p_sys->url.i_port ); } else { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + net_Printf( p_access, p_sys->fd, pvs, "GET %s HTTP/1.%d\r\nHost: %s\r\n", psz_path, p_sys->i_version, p_sys->url.psz_host ); } } /* User Agent */ - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "User-Agent: %s\r\n", + net_Printf( p_access, p_sys->fd, pvs, + "User-Agent: %s\r\n", p_sys->psz_user_agent ); /* Offset */ - if( p_sys->i_version == 1 ) + if( p_sys->i_version == 1 && ! p_sys->b_continuous ) { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, - "Range: bytes="I64Fd"-\r\n", i_tell ); + p_sys->b_persist = true; + net_Printf( p_access, p_sys->fd, pvs, + "Range: bytes=%"PRIu64"-\r\n", i_tell ); + net_Printf( p_access, p_sys->fd, pvs, "Connection: close\r\n" ); } /* Cookies */ @@ -1087,12 +1309,12 @@ static int Request( access_t *p_access, int64_t i_tell ) assert( psz_cookie_content ); /* FIXME: This is clearly not conforming to the rfc */ - vlc_bool_t is_in_right_domain = (!psz_cookie_domain || strstr( p_sys->url.psz_host, psz_cookie_domain )); + bool is_in_right_domain = (!psz_cookie_domain || strstr( p_sys->url.psz_host, psz_cookie_domain )); 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 ) + if( net_Printf( 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 ); @@ -1109,21 +1331,10 @@ static int Request( access_t *p_access, int64_t i_tell ) 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" ); - + net_Printf( p_access, p_sys->fd, pvs, "Icy-MetaData: 1\r\n" ); - if( p_sys->b_continuous ) - { - net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs, - "Connection: Keep-Alive\r\n" ); - } - else if( p_sys->i_version == 1 ) - { - net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs, - "Connection: Close\r\n"); - } - if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "\r\n" ) < 0 ) + if( net_Printf( p_access, p_sys->fd, pvs, "\r\n" ) < 0 ) { msg_Err( p_access, "failed to send request" ); Disconnect( p_access ); @@ -1131,7 +1342,7 @@ static int Request( access_t *p_access, int64_t i_tell ) } /* Read Answer */ - if( ( psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, pvs ) ) == NULL ) + if( ( psz = net_Gets( p_access, p_sys->fd, pvs ) ) == NULL ) { msg_Err( p_access, "failed to read answer" ); goto error; @@ -1145,7 +1356,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 { @@ -1157,11 +1368,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 ) @@ -1179,7 +1390,7 @@ static int Request( access_t *p_access, int64_t i_tell ) for( ;; ) { - char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, pvs ); + char *psz = net_Gets( p_access, p_sys->fd, pvs ); char *p; if( psz == NULL ) @@ -1188,7 +1399,7 @@ static int Request( access_t *p_access, int64_t i_tell ) goto error; } - if( p_access->b_die || p_access->b_error ) + if( !vlc_object_alive (p_access) || p_sys->b_error ) { free( psz ); goto error; @@ -1212,16 +1423,37 @@ static int Request( access_t *p_access, int64_t i_tell ) if( !strcasecmp( psz, "Content-Length" ) ) { - if( p_sys->b_continuous ) - { - p_access->info.i_size = -1; - msg_Dbg( p_access, "this frame size=%lld", atoll(p ) ); - p_sys->i_remaining = atoll( p ); + uint64_t i_size = i_tell + (p_sys->i_remaining = (uint64_t)atoll( p )); + if(i_size > p_access->info.i_size) { + p_sys->b_has_size = true; + p_access->info.i_size = i_size; } - 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, "this frame size=%"PRIu64, p_sys->i_remaining ); + } + else if( !strcasecmp( psz, "Content-Range" ) ) { + uint64_t i_ntell = i_tell; + uint64_t i_nend = (p_access->info.i_size > 0)?(p_access->info.i_size - 1):i_tell; + uint64_t i_nsize = p_access->info.i_size; + sscanf(p,"bytes %"SCNu64"-%"SCNu64"/%"SCNu64,&i_ntell,&i_nend,&i_nsize); + if(i_nend > i_ntell ) { + p_access->info.i_pos = i_ntell; + p_sys->i_icy_offset = i_ntell; + p_sys->i_remaining = i_nend+1-i_ntell; + int64_t i_size = (i_nsize > i_nend) ? i_nsize : (i_nend + 1); + if(i_size > p_access->info.i_size) { + p_sys->b_has_size = true; + p_access->info.i_size = i_size; + } + msg_Dbg( p_access, "stream size=%"PRIu64",pos=%"PRIu64",remaining=%"PRIu64, + i_nsize, i_ntell, p_sys->i_remaining); + } + } + else if( !strcasecmp( psz, "Connection" ) ) { + msg_Dbg( p_access, "Connection: %s",p ); + int i = -1; + sscanf(p, "close%n",&i); + if( i >= 0 ) { + p_sys->b_persist = false; } } else if( !strcasecmp( psz, "Location" ) ) @@ -1264,17 +1496,19 @@ static int Request( access_t *p_access, int64_t i_tell ) else if( !strcasecmp( psz, "Content-Encoding" ) ) { msg_Dbg( p_access, "Content-Encoding: %s", p ); - if( strcasecmp( p, "identity" ) ) + if( !strcasecmp( p, "identity" ) ) + ; #ifdef HAVE_ZLIB_H - p_sys->b_compressed = VLC_TRUE; -#else - msg_Warn( p_access, "Compressed content not supported. Rebuild with zlib support." ); + else if( !strcasecmp( p, "gzip" ) || !strcasecmp( p, "deflate" ) ) + p_sys->b_compressed = true; #endif + else + msg_Warn( p_access, "Unknown content coding: %s", p ); } else if( !strcasecmp( psz, "Pragma" ) ) { if( !strcasecmp( psz, "Pragma: features" ) ) - p_sys->b_mms = VLC_TRUE; + 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 ); @@ -1292,9 +1526,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" ) ) @@ -1302,7 +1536,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" ) ) @@ -1311,23 +1545,31 @@ static int Request( access_t *p_access, int64_t i_tell ) p_sys->i_icy_meta = atoi( p ); if( p_sys->i_icy_meta < 0 ) p_sys->i_icy_meta = 0; + if( p_sys->i_icy_meta > 0 ) + p_sys->b_icecast = true; msg_Warn( p_access, "ICY metaint=%d", p_sys->i_icy_meta ); } else if( !strcasecmp( psz, "Icy-Name" ) ) { free( p_sys->psz_icy_name ); - p_sys->psz_icy_name = strdup( p ); + char *psz_tmp = strdup( p ); + p_sys->psz_icy_name = EnsureUTF8( psz_tmp ); + if( !p_sys->psz_icy_name ) + free( psz_tmp ); 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" ) ) { free( p_sys->psz_icy_genre ); - p_sys->psz_icy_genre = strdup( p ); + char *psz_tmp = strdup( p ); + p_sys->psz_icy_genre = EnsureUTF8( psz_tmp ); + if( !p_sys->psz_icy_genre ) + free( psz_tmp ); msg_Dbg( p_access, "Icy-Genre: %s", p_sys->psz_icy_genre ); } else if( !strncasecmp( psz, "Icy-Notice", 10 ) ) @@ -1353,12 +1595,14 @@ static int Request( access_t *p_access, int64_t i_tell ) else if( !strcasecmp( psz, "www-authenticate" ) ) { msg_Dbg( p_access, "Authentication header: %s", p ); - AuthParseHeader( p_access, p, &p_sys->auth ); + http_auth_ParseWwwAuthenticateHeader( VLC_OBJECT(p_access), + &p_sys->auth, p ); } else if( !strcasecmp( psz, "proxy-authenticate" ) ) { msg_Dbg( p_access, "Proxy authentication header: %s", p ); - AuthParseHeader( p_access, p, &p_sys->proxy_auth ); + http_auth_ParseWwwAuthenticateHeader( VLC_OBJECT(p_access), + &p_sys->proxy_auth, p ); } else if( !strcasecmp( psz, "authentication-info" ) ) { @@ -1375,6 +1619,12 @@ static int Request( access_t *p_access, int64_t i_tell ) free( psz ); } + /* We close the stream for zero length data, unless of course the + * server has already promised to do this for us. + */ + if( p_sys->b_has_size && p_sys->i_remaining == 0 && p_sys->b_persist ) { + Disconnect( p_access ); + } return VLC_SUCCESS; error: @@ -1485,7 +1735,7 @@ static void cookie_append( vlc_array_t * cookies, char * cookie ) assert( current_cookie_name ); - vlc_bool_t is_domain_matching = ( cookie_domain && current_cookie_domain && + 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 ) ) @@ -1507,384 +1757,37 @@ static void cookie_append( vlc_array_t * cookies, char * cookie ) vlc_array_append( cookies, cookie ); } + /***************************************************************************** - * "RFC 2617: Basic and Digest Access Authentification" header parsing + * HTTP authentication *****************************************************************************/ -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 ); + char *psz_value; + + psz_value = + http_auth_FormatAuthorizationHeader( VLC_OBJECT(p_access), p_auth, + "GET", p_url->psz_path, + p_url->psz_username, + p_url->psz_password ); + if ( psz_value == NULL ) + return; - if( b64 != NULL ) - { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, - "%sAuthorization: Basic %s\r\n", psz_prefix, b64 ); - free( b64 ); - } - } + net_Printf( p_access, p_sys->fd, p_sys->p_vs, + "%sAuthorization: %s\r\n", psz_prefix, psz_value ); + free( psz_value ); } 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 ); + return + http_auth_ParseAuthenticationInfoHeader( VLC_OBJECT(p_access), p_auth, + psz_header, "", + p_url->psz_path, + p_url->psz_username, + p_url->psz_password ); }