X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fhttp.c;h=80bcc132d2d9220b8c7d800e334ff069100c0856;hb=fa4bde0b26a6c7a2a617362ea0b17144686e39fe;hp=cefda1c5363592b28f7862918ebce2db8d158604;hpb=b0baadae11e30328b8085e3fd7442a4407038d85;p=vlc diff --git a/modules/access/http.c b/modules/access/http.c index cefda1c536..dec0de8022 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -1,10 +1,13 @@ /***************************************************************************** - * http.c: HTTP access plug-in + * http.c: HTTP input module ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: http.c,v 1.42 2003/08/01 09:45:34 sam Exp $ + * Copyright (C) 2001-2008 the VideoLAN team + * $Id$ * - * Authors: Christophe Massiot + * 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 @@ -18,863 +21,1971 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include - -#ifdef HAVE_ERRNO_H -# include -#endif -#ifdef HAVE_FCNTL_H -# include +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#ifdef HAVE_SYS_TIME_H -# include -#endif +#include +#include -#ifdef HAVE_UNISTD_H -# include -#endif -#if defined( UNDER_CE ) -# include -#elif defined( WIN32 ) -# include -# include -# ifndef IN_MULTICAST -# define IN_MULTICAST(a) IN_CLASSD(a) -# endif -#else -# include -#endif +#include -#include "vlc_playlist.h" -#include "network.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); +#ifdef HAVE_ZLIB_H +# include +#endif -static void Seek ( input_thread_t *, off_t ); -static ssize_t Read ( input_thread_t *, byte_t *, size_t ); +#include +#ifdef HAVE_LIBPROXY +# include +#endif /***************************************************************************** * Module descriptor *****************************************************************************/ -#define PROXY_TEXT N_("Specify an HTTP proxy") +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); + +#define PROXY_TEXT N_("HTTP proxy") #define PROXY_LONGTEXT N_( \ - "Specify an HTTP proxy to use. It must be in the form " \ - "http://myproxy.mydomain:myport. If none is specified, the HTTP_PROXY " \ - "environment variable will be tried." ) + "HTTP proxy to be used It must be of the form " \ + "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_( \ - "Allows you to modify the default caching value for http streams. This " \ - "value should be set in miliseconds units." ) - -vlc_module_begin(); - add_category_hint( N_("http"), NULL, VLC_FALSE ); - add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT, VLC_FALSE ); - add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); - add_string( "http-user", NULL, NULL, "HTTP user name", "HTTP user name for Basic Authentification", VLC_FALSE ); - add_string( "http-pwd", NULL , NULL, "HTTP password", "HTTP password for Basic Authentification", VLC_FALSE ); - set_description( _("HTTP input") ); - set_capability( "access", 0 ); - add_shortcut( "http" ); - add_shortcut( "http4" ); - add_shortcut( "http6" ); - set_callbacks( Open, Close ); -vlc_module_end(); + "Caching value for HTTP streams. This " \ + "value should be set in milliseconds." ) + +#define AGENT_TEXT N_("HTTP user agent") +#define AGENT_LONGTEXT N_("User agent that will be " \ + "used for the connection.") + +#define RECONNECT_TEXT N_("Auto re-connect") +#define RECONNECT_LONGTEXT N_( \ + "Automatically try to reconnect to the stream in case of a sudden " \ + "disconnect." ) + +#define CONTINUOUS_TEXT N_("Continuous stream") +#define CONTINUOUS_LONGTEXT N_("Read a file that is " \ + "being constantly updated (for example, a JPG file on a server). " \ + "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( 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, + 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, true ) + add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT, + AGENT_LONGTEXT, true ) + add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT, + RECONNECT_LONGTEXT, true ) + add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT, + CONTINUOUS_LONGTEXT, true ) + add_bool( "http-forward-cookies", true, NULL, FORWARD_COOKIES_TEXT, + FORWARD_COOKIES_LONGTEXT, 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 () /***************************************************************************** - * _input_socket_t: private access plug-in data, modified to add private - * fields + * Local prototypes *****************************************************************************/ -#define MAX_ANSWER_SIZE 1024 -#define MAX_QUERY_SIZE 1024 -typedef struct _input_socket_s +/* RFC 2617: Basic and Digest Access Authentication */ +typedef struct http_auth_t { - input_socket_t _socket; + 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; + tls_session_t *p_tls; + v_socket_t *p_vs; + + /* From uri */ + vlc_url_t url; + char *psz_user_agent; + http_auth_t auth; + + /* Proxy */ + bool b_proxy; + vlc_url_t proxy; + http_auth_t proxy_auth; + char *psz_proxy_passbuf; + + /* */ + int i_code; + const char *psz_protocol; + int i_version; + + char *psz_mime; + char *psz_pragma; + char *psz_location; + 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 + + bool b_chunked; + int64_t i_chunk; + + int i_icy_meta; + int64_t i_icy_offset; + char *psz_icy_name; + char *psz_icy_genre; + char *psz_icy_title; + + int64_t i_remaining; + + bool b_seekable; + bool b_reconnect; + bool b_continuous; + bool b_pace_control; + bool b_persist; + + vlc_array_t * cookies; +}; + +/* */ +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 ); - char * psz_network; - network_socket_t socket_desc; - char psz_buffer[MAX_QUERY_SIZE]; - char psz_auth_string[MAX_QUERY_SIZE]; - char * psz_name; -} _input_socket_t; +/* */ +static int Connect( access_t *, int64_t ); +static int Request( access_t *p_access, int64_t i_tell ); +static void Disconnect( access_t * ); + +/* Small Cookie utilities. Cookies support is partial. */ +static char * cookie_get_content( const char * cookie ); +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 ); /***************************************************************************** - * HTTPConnect: connect to the server and seek to i_tell + * Open: *****************************************************************************/ -static int HTTPConnect( input_thread_t * p_input, off_t i_tell ) +static int Open( vlc_object_t *p_this ) { - char psz_buffer[MAX_QUERY_SIZE]; - _input_socket_t * p_access_data; - module_t * p_network; - char * psz_parser, * psz_value, * psz_answer; - byte_t * p_bytes; - int i_code, i_ret, i, i_size; - - enum { HTTP_PROTOCOL, ICY_PROTOCOL } i_protocol; + return OpenWithCookies( p_this, NULL ); +} - /* Find an appropriate network module */ - p_access_data = (_input_socket_t *)p_input->p_access_data; - p_input->p_private = (void*) &p_access_data->socket_desc; - p_network = module_Need( p_input, "network", p_access_data->psz_network ); - if( p_network == NULL ) +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; + /* 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 = false; + p_sys->psz_proxy_passbuf = NULL; + p_sys->i_version = 1; + p_sys->b_seekable = true; + p_sys->psz_mime = NULL; + p_sys->psz_pragma = NULL; + 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 = 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; + 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_access->info.i_size = -1; + p_access->info.i_pos = 0; + p_access->info.b_eof = false; + + p_sys->cookies = saved_cookies; + + /* Parse URI - remove spaces */ + p = psz = strdup( p_access->psz_path ); + while( (p = strchr( p, ' ' )) != NULL ) + *p = '+'; + vlc_UrlParse( &p_sys->url, psz, 0 ); + free( psz ); + + if( p_sys->url.psz_host == NULL || *p_sys->url.psz_host == '\0' ) { - return VLC_ENOMOD; + msg_Warn( p_access, "invalid host" ); + goto error; + } + if( !strncmp( p_access->psz_access, "https", 5 ) ) + { + /* HTTP over SSL */ + p_sys->b_ssl = true; + if( p_sys->url.i_port <= 0 ) + p_sys->url.i_port = 443; + } + else + { + if( p_sys->url.i_port <= 0 ) + p_sys->url.i_port = 80; } - module_Unneed( p_input, p_network ); - - p_access_data->_socket.i_handle = p_access_data->socket_desc.i_handle; -# define HTTP_USERAGENT "User-Agent: " COPYRIGHT_MESSAGE "\r\n" -# define HTTP_END "\r\n" + /* Do user agent */ + p_sys->psz_user_agent = var_CreateGetString( p_access, "http-user-agent" ); - /* Build the query string */ - if ( p_input->stream.b_seekable ) + /* Check proxy */ + psz = var_CreateGetNonEmptyString( p_access, "http-proxy" ); + if( psz ) { - snprintf( psz_buffer, MAX_QUERY_SIZE, - "%s" - "Range: bytes="I64Fd"-\r\n" - HTTP_USERAGENT - "%s" - HTTP_END, - p_access_data->psz_buffer, i_tell, p_access_data->psz_auth_string ); + p_sys->b_proxy = true; + vlc_UrlParse( &p_sys->proxy, psz, 0 ); + free( psz ); } +#ifdef HAVE_LIBPROXY else { - snprintf( psz_buffer, MAX_QUERY_SIZE, - "%s" - HTTP_USERAGENT - "%s" - HTTP_END, - p_access_data->psz_buffer, p_access_data->psz_auth_string ); + pxProxyFactory *pf = px_proxy_factory_new(); + if (pf) + { + char *buf; + int i; + i=asprintf(&buf, "%s://%s", p_access->psz_access, p_access->psz_path); + 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"); + } } - psz_buffer[MAX_QUERY_SIZE - 1] = '\0'; - - /* Send GET query */ - i_ret = send( p_access_data->_socket.i_handle, - psz_buffer, strlen( psz_buffer ), 0 ); - if( i_ret == -1 ) +#elif HAVE_GETENV + else { -#ifdef HAVE_ERRNO_H - msg_Err( p_input, "cannot send request (%s)", strerror(errno) ); -#else - msg_Err( p_input, "cannot send request" ); + psz = getenv( "http_proxy" ); + if( psz ) + { + p_sys->b_proxy = true; + vlc_UrlParse( &p_sys->proxy, psz, 0 ); + } + } #endif - Close( VLC_OBJECT(p_input) ); - return VLC_EGENERIC; + if( psz ) /* No, this is NOT a use-after-free error */ + { + psz = var_CreateGetNonEmptyString( p_access, "http-proxy-pwd" ); + if( psz ) + p_sys->proxy.psz_password = p_sys->psz_proxy_passbuf = psz; } - /* Prepare the input thread for reading. */ - p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE; - - /* FIXME: we shouldn't have to do that ! It's UGLY but mandatory because - * input_FillBuffer assumes p_input->pf_read exists */ - p_input->pf_read = Read; - - while( !input_FillBuffer( p_input ) ) + if( p_sys->b_proxy ) { - if( p_input->b_die || p_input->b_error ) + if( p_sys->proxy.psz_host == NULL || *p_sys->proxy.psz_host == '\0' ) { - Close( VLC_OBJECT(p_input) ); - return VLC_EGENERIC; + msg_Warn( p_access, "invalid proxy host" ); + goto error; + } + if( p_sys->proxy.i_port <= 0 ) + { + p_sys->proxy.i_port = 80; } } - /* Get the HTTP returncode */ - i_size = input_Peek( p_input, &p_bytes, MAX_ANSWER_SIZE ); - psz_parser = (char *)p_bytes; - - if( i_size <= 0 ) + 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 ); + if( p_sys->b_proxy ) { - msg_Err( p_input, "not enough data" ); - Close( VLC_OBJECT(p_input) ); - return VLC_EGENERIC; + msg_Dbg( p_access, " proxy %s:%d", p_sys->proxy.psz_host, + p_sys->proxy.i_port ); + } + if( p_sys->url.psz_username && *p_sys->url.psz_username ) + { + msg_Dbg( p_access, " user='%s'", p_sys->url.psz_username ); } - /* Guess the protocol */ - if( ( ( (size_t)i_size >= strlen("HTTP/1.x") ) && - !strncmp( psz_parser, "HTTP/1.", strlen("HTTP/1.") ) ) ) + p_sys->b_reconnect = var_CreateGetBool( p_access, "http-reconnect" ); + p_sys->b_continuous = var_CreateGetBool( p_access, "http-continuous" ); + +connect: + /* Connect */ + switch( Connect( p_access, 0 ) ) { - i_protocol = HTTP_PROTOCOL; + case -1: + goto error; - psz_parser += strlen("HTTP/1.x"); - i_size -= strlen("HTTP/1.x"); + case -2: + /* Retry with http 1.0 */ + msg_Dbg( p_access, "switching to HTTP version 1.0" ); + p_sys->i_version = 0; + p_sys->b_seekable = false; + + if( !vlc_object_alive (p_access) || Connect( p_access, 0 ) ) + goto error; + +#ifndef NDEBUG + case 0: + break; + + default: + msg_Err( p_access, "You should not be here" ); + abort(); +#endif } - else if( ( (size_t)i_size >= strlen("ICY") && - !strncmp( psz_parser, "ICY", strlen("ICY") ) ) ) + + if( p_sys->i_code == 401 ) { - i_protocol = ICY_PROTOCOL; - if( !p_input->psz_demux || !*p_input->psz_demux ) + char *psz_login = NULL, *psz_password = NULL; + char psz_msg[250]; + int i_ret; + /* 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 ) + { + 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 ); + Disconnect( p_access ); + goto connect; + } + else { - msg_Info( p_input, "ICY server found, mp3 demuxer selected" ); - p_input->psz_demux = "mp3"; // FIXME strdup ? + free( psz_login ); + free( psz_password ); + goto error; } + } - psz_parser += strlen("ICY"); - i_size -= strlen("ICY"); + if( ( p_sys->i_code == 301 || p_sys->i_code == 302 || + p_sys->i_code == 303 || p_sys->i_code == 307 ) && + p_sys->psz_location && *p_sys->psz_location ) + { + msg_Dbg( p_access, "redirection to %s", p_sys->psz_location ); + + /* 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 */ ) ) + { + msg_Err( p_access, "insecure redirection ignored" ); + goto error; + } + free( p_access->psz_path ); + 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 ); + free( p_sys->psz_proxy_passbuf ); + 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 OpenWithCookies( p_this, cookies ); } - else + + if( p_sys->b_mms ) { - msg_Err( p_input, "invalid HTTP reply '%s'", psz_parser ); - return VLC_EGENERIC; + msg_Dbg( p_access, "this is actually a live mms server, BAIL" ); + goto error; } - /* Check the HTTP return code */ - i_code = atoi( (char*)psz_parser ); - msg_Dbg( p_input, "%s server replied: %i", - i_protocol == HTTP_PROTOCOL ? "HTTP" : "ICY", i_code ); - psz_parser += 4; - i_size -= 4; + if( !strcmp( p_sys->psz_protocol, "ICY" ) || p_sys->b_icecast ) + { + if( p_sys->psz_mime && strcasecmp( p_sys->psz_mime, "application/ogg" ) ) + { + 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 ); - /* Find the end of the line */ - for ( i = 0; (i < i_size -1) && ((psz_parser[i] != '\r') || - (psz_parser[i+1] != '\n')); i++ ) +#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 = false; +#endif + } + else if( !p_sys->psz_mime ) + { + free( p_access->psz_demux ); + /* Shoutcast */ + p_access->psz_demux = strdup( "mp3" ); + } + /* else probably Ogg Vorbis */ + } + else if( !strcasecmp( p_access->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" ); } - - /* Check we actually parsed something */ - if ( i+1 == i_size && psz_parser[i+1] != '\n' ) + else if( !strcmp( p_access->psz_access, "itpc" ) ) { - msg_Err( p_input, "stream not compliant with HTTP/1.x" ); - return VLC_EGENERIC; + free( p_access->psz_demux ); + p_access->psz_demux = strdup( "podcast" ); } - - /* Store the line we just parsed and skip it */ - psz_answer = strndup( psz_parser, i ); - if( !psz_answer ) + else if( p_sys->psz_mime && + !strncasecmp( p_sys->psz_mime, "application/xspf+xml", 20 ) && + ( memchr( " ;\t", p_sys->psz_mime[20], 4 ) != NULL ) ) { - return VLC_ENOMEM; + free( p_access->psz_demux ); + p_access->psz_demux = strdup( "xspf-open" ); } - p_input->p_current_data = psz_parser + i + 2; + if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" ); + + /* PTS delay */ + var_Create( p_access, "http-caching", VLC_VAR_INTEGER |VLC_VAR_DOINHERIT ); + + return VLC_SUCCESS; + +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 ); + free( p_sys ); + return VLC_EGENERIC; +} + +/***************************************************************************** + * Close: + *****************************************************************************/ +static void Close( vlc_object_t *p_this ) +{ + access_t *p_access = (access_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 ); + free( p_sys->psz_location ); + + free( p_sys->psz_icy_name ); + free( p_sys->psz_icy_genre ); + free( p_sys->psz_icy_title ); + + free( p_sys->psz_user_agent ); + + Disconnect( p_access ); - /* Parse remaining headers */ - for ( ; ; ) + if( p_sys->cookies ) { - char psz_line[MAX_ANSWER_SIZE]; + 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 ); +} + +/***************************************************************************** + * Read: Read up to i_len bytes from the http connection and place in + * p_buffer. Return the actual number of bytes read + *****************************************************************************/ +static int ReadICYMeta( access_t *p_access ); +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; - i_size = input_Peek( p_input, &p_bytes, MAX_ANSWER_SIZE ); - psz_parser = (char *)p_bytes; + if( p_sys->fd == -1 ) + { + p_access->info.b_eof = true; + return 0; + } - if( i_size <= 0 ) + if( p_access->info.i_size >= 0 && + i_len + p_access->info.i_pos > p_access->info.i_size ) + { + if( ( i_len = p_access->info.i_size - p_access->info.i_pos ) == 0 ) { - msg_Err( p_input, "not enough data" ); - Close( VLC_OBJECT(p_input) ); - free( psz_answer ); - return VLC_EGENERIC; + p_access->info.b_eof = true; + return 0; } + } - /* Copy one line to psz_line */ - i = 0; - while( i_size && psz_parser[i] != '\r' - && psz_parser[i + 1] != '\n' ) + if( p_sys->b_chunked ) + { + if( p_sys->i_chunk < 0 ) { - psz_line[i] = psz_parser[i]; - i++; - i_size--; + p_access->info.b_eof = true; + return 0; } - p_input->p_current_data = psz_parser + i + 2; - if( !i ) + + if( p_sys->i_chunk <= 0 ) { - break; /* End of headers */ + char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, p_sys->p_vs ); + /* read the chunk header */ + if( psz == NULL ) + { + /* fatal error - end of file */ + msg_Dbg( p_access, "failed reading chunk-header line" ); + return 0; + } + p_sys->i_chunk = strtoll( psz, NULL, 16 ); + free( psz ); + + if( p_sys->i_chunk <= 0 ) /* eof */ + { + p_sys->i_chunk = -1; + p_access->info.b_eof = true; + return 0; + } } - psz_line[i] = '\0'; - psz_parser = strchr( psz_line, ':' ); - if ( !psz_parser ) + + if( i_len > p_sys->i_chunk ) { - msg_Err( p_input, "malformed header line: %s", psz_line ); - free( psz_answer ); - return VLC_EGENERIC; + i_len = p_sys->i_chunk; } - psz_parser[0] = '\0'; - psz_parser++; - while ( *psz_parser == ' ' || *psz_parser == '\t' ) - { - psz_parser++; + } + else if( p_access->info.i_size != -1 && (int64_t)i_len > p_sys->i_remaining) { + /* Only ask for the remaining length */ + i_len = (size_t)p_sys->i_remaining; + if(i_len == 0) { + p_access->info.b_eof = true; + return 0; } - psz_value = psz_parser; + } - if( !strcasecmp( psz_line, "Content-Length" ) ) - { - off_t i_size = 0; -#ifdef HAVE_ATOLL - i_size = i_tell + atoll( psz_value ); -#else - int sign = 1; - if( *psz_value == '-' ) sign = -1; - while( *psz_value >= '0' && *psz_value <= '9' ) + 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_offset ) % p_sys->i_icy_meta; + + if( i_next == p_sys->i_icy_meta ) + { + if( ReadICYMeta( p_access ) ) { - i_size = i_size * 10 + *psz_value++ - '0'; + p_access->info.b_eof = true; + return -1; } - i_size = i_tell + ( i_size * sign ); -#endif - msg_Dbg( p_input, "stream size is "I64Fd, i_size ); + } + if( i_len > i_next ) + i_len = i_next; + } + + 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; - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.p_selected_area->i_size = i_size; - vlc_mutex_unlock( &p_input->stream.stream_lock ); + 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 ); + free( psz ); + } + } + } + else if( i_read == 0 ) + { + /* + * I very much doubt that this will work. + * If i_read == 0, the connection *IS* dead, so the only + * sensible thing to do is Disconnect() and then retry. + * Otherwise, I got recv() completely wrong. -- Courmisch + */ + if( p_sys->b_continuous ) + { + Request( p_access, 0 ); + p_sys->b_continuous = false; + i_read = Read( p_access, p_buffer, i_len ); + p_sys->b_continuous = true; } - /* Redirection support */ - else if( ( i_code == 301 || i_code == 302 || - i_code == 303 || i_code == 307 ) - && !strcasecmp( psz_line, "location" ) ) + Disconnect( p_access ); + if( p_sys->b_reconnect ) { - playlist_t * p_playlist = (playlist_t *) vlc_object_find( - p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT ); - if( !p_playlist ) + msg_Dbg( p_access, "got disconnected, trying to reconnect" ); + if( Connect( p_access, p_access->info.i_pos ) ) + { + msg_Dbg( p_access, "reconnection failed" ); + } + else { - msg_Err( p_input, "redirection failed: can't find playlist" ); - free( psz_answer ); - return VLC_EGENERIC; + p_sys->b_reconnect = false; + i_read = Read( p_access, p_buffer, i_len ); + p_sys->b_reconnect = true; } - msg_Dbg( p_input, "%i %s: redirected to %s", - i_code, psz_answer, psz_value ); - p_playlist->pp_items[p_playlist->i_index]->b_autodeletion - = VLC_TRUE; - playlist_Add( p_playlist, psz_value, NULL, 0, - PLAYLIST_INSERT | PLAYLIST_GO, - p_playlist->i_index + 1 ); - vlc_object_release( p_playlist ); } - /* TODO: parse other headers here */ + if( i_read == 0 ) p_access->info.b_eof = true; } - /* Something went wrong */ - if ( i_code >= 400 ) + if( p_access->info.i_size != -1 ) { - msg_Err( p_input, "%i %s", i_code, psz_answer ); - p_input->p_current_data = psz_parser + i_size; - free( psz_answer ); - return VLC_EGENERIC; + p_sys->i_remaining -= i_read; } - free( psz_answer ); + return i_read; +} - /* Set final stream properties */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( i_protocol == ICY_PROTOCOL ) - { - p_input->stream.b_seekable = VLC_FALSE; - } - else +static int ReadICYMeta( access_t *p_access ) +{ + access_sys_t *p_sys = p_access->p_sys; + + uint8_t buffer; + char *p, *psz_meta; + int i_read; + + /* Read meta data length */ + i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, &buffer, 1, + true ); + if( i_read <= 0 ) + return VLC_EGENERIC; + if( buffer == 0 ) + return VLC_SUCCESS; + + i_read = buffer << 4; + /* msg_Dbg( p_access, "ICY meta size=%u", i_read); */ + + psz_meta = malloc( i_read + 1 ); + if( net_Read( p_access, p_sys->fd, p_sys->p_vs, + (uint8_t *)psz_meta, i_read, true ) != i_read ) + return VLC_EGENERIC; + + psz_meta[i_read] = '\0'; /* Just in case */ + + /* msg_Dbg( p_access, "icy-meta=%s", psz_meta ); */ + + /* Now parse the meta */ + /* Look for StreamTitle= */ + p = strcasestr( (char *)psz_meta, "StreamTitle=" ); + if( p ) { - p_input->stream.b_seekable = VLC_TRUE; + p += strlen( "StreamTitle=" ); + if( *p == '\'' || *p == '"' ) + { + char closing[] = { p[0], ';', '\0' }; + char *psz = strstr( &p[1], closing ); + if( !psz ) + psz = strchr( &p[1], ';' ); + + if( psz ) *psz = '\0'; + } + else + { + char *psz = strchr( &p[1], ';' ); + if( psz ) *psz = '\0'; + } + + if( !p_sys->psz_icy_title || + strcmp( p_sys->psz_icy_title, &p[1] ) ) + { + free( p_sys->psz_icy_title ); + p_sys->psz_icy_title = EnsureUTF8( strdup( &p[1] )); + p_access->info.i_update |= INPUT_UPDATE_META; + + msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title ); + } } + free( psz_meta ); - if( p_input->stream.p_selected_area->i_size ) + 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 ) { - p_input->stream.p_selected_area->i_tell = i_tell; + 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 { - p_input->stream.b_seekable = VLC_FALSE; + return Read( p_access, p_buffer, i_len ); } - if( i_code != 206 ) +} +#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 %"PRId64, i_pos ); + + Disconnect( p_access ); + + if( p_access->info.i_size + && (uint64_t)i_pos >= (uint64_t)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 ) ) { - p_input->stream.b_seekable = VLC_FALSE; + msg_Err( p_access, "seek failed" ); + p_access->info.b_eof = true; + return VLC_EGENERIC; } - p_input->stream.b_changed = VLC_TRUE; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - return VLC_SUCCESS; } /***************************************************************************** - * Encode a string in base64 - * Code borrowed from Rafael Steil + * Control: *****************************************************************************/ -void encodeblock( unsigned char in[3], unsigned char out[4], int len ) +static int Control( access_t *p_access, int i_query, va_list args ) { - static const char cb64[] - = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - out[0] = cb64[ in[0] >> 2 ]; - out[1] = cb64[ ((in[0] & 0x03) << 4) | ((in[1] & 0xf0) >> 4) ]; - out[2] = (unsigned char) (len > 1 ? cb64[ ((in[1] & 0x0f) << 2) | ((in[2] & 0xc0) >> 6) ] : '='); - out[3] = (unsigned char) (len > 2 ? cb64[ in[2] & 0x3f ] : '='); + access_sys_t *p_sys = p_access->p_sys; + bool *pb_bool; + int64_t *pi_64; + vlc_meta_t *p_meta; + + switch( i_query ) + { + /* */ + case ACCESS_CAN_SEEK: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = p_sys->b_seekable; + break; + case ACCESS_CAN_FASTSEEK: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; + break; + case ACCESS_CAN_PAUSE: + case ACCESS_CAN_CONTROL_PACE: + 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 = true; + 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; + break; + + /* */ + case ACCESS_SET_PAUSE_STATE: + break; + + case ACCESS_GET_META: + p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* ); + + if( p_sys->psz_icy_name ) + vlc_meta_Set( p_meta, vlc_meta_Title, p_sys->psz_icy_name ); + if( p_sys->psz_icy_genre ) + vlc_meta_Set( p_meta, vlc_meta_Genre, p_sys->psz_icy_genre ); + if( p_sys->psz_icy_title ) + vlc_meta_Set( p_meta, vlc_meta_NowPlaying, p_sys->psz_icy_title ); + break; + + case ACCESS_GET_CONTENT_TYPE: + *va_arg( args, char ** ) = + p_sys->psz_mime ? strdup( p_sys->psz_mime ) : NULL; + break; + + case ACCESS_GET_TITLE_INFO: + case ACCESS_SET_TITLE: + case ACCESS_SET_SEEKPOINT: + case ACCESS_SET_PRIVATE_ID_STATE: + return VLC_EGENERIC; + + default: + msg_Warn( p_access, "unimplemented query in control" ); + return VLC_EGENERIC; + + } + return VLC_SUCCESS; } -char *str_base64_encode(char *psz_str, input_thread_t *p_input ) +/***************************************************************************** + * Connect: + *****************************************************************************/ +static int Connect( access_t *p_access, int64_t i_tell ) { - unsigned char in[3], out[4]; - unsigned int i, len, blocksout = 0, linesize = strlen(psz_str); - char *psz_tmp = psz_str; - char *psz_result = (char *)malloc( linesize / 3 * 4 + 5 ); - - if( !psz_result ) + access_sys_t *p_sys = p_access->p_sys; + vlc_url_t srv = p_sys->b_proxy ? p_sys->proxy : p_sys->url; + + /* Clean info */ + free( p_sys->psz_location ); + free( p_sys->psz_mime ); + free( p_sys->psz_pragma ); + + free( p_sys->psz_icy_genre ); + free( p_sys->psz_icy_name ); + free( p_sys->psz_icy_title ); + + + p_sys->psz_location = NULL; + p_sys->psz_mime = NULL; + p_sys->psz_pragma = NULL; + 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_access->info.i_size = -1; + p_access->info.i_pos = i_tell; + 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_input, "out of memory" ); - return NULL; + msg_Err( p_access, "cannot connect to %s:%d", srv.psz_host, srv.i_port ); + return -1; } - while( *psz_tmp ) + /* Initialize TLS/SSL session */ + if( p_sys->b_ssl == true ) { - len = 0; - - for( i = 0; i < 3; i++ ) + /* CONNECT to establish TLS tunnel through HTTP proxy */ + if( p_sys->b_proxy ) { - in[i] = (unsigned char)*psz_tmp; + char *psz; + unsigned i_status = 0; - if (*psz_tmp) - len++; - else - in[i] = 0; - - psz_tmp++; - } + if( p_sys->i_version == 0 ) + { + /* CONNECT is not in HTTP/1.0 */ + Disconnect( p_access ); + return -1; + } - if( len ) - { - encodeblock( in, out, len ); + net_Printf( VLC_OBJECT(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); - for( i = 0; i < 4; i++ ) + psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL ); + if( psz == NULL ) { - psz_result[blocksout++] = out[i]; + msg_Err( p_access, "cannot establish HTTP/TLS tunnel" ); + Disconnect( p_access ); + return -1; } - } - } - psz_result[blocksout] = '\0'; - return psz_result; -} + sscanf( psz, "HTTP/%*u.%*u %3u", &i_status ); + free( psz ); -/***************************************************************************** - * Open: parse URL and open the remote file at the beginning - *****************************************************************************/ -static int Open( vlc_object_t *p_this ) -{ - input_thread_t * p_input = (input_thread_t *)p_this; - _input_socket_t * p_access_data; - char * psz_name = strdup(p_input->psz_name); - char * psz_parser = psz_name, * psz_auth_parser; - char * psz_server_addr = ""; - char * psz_server_port = ""; - char * psz_path = ""; - char * psz_proxy, *psz_proxy_orig; - char * psz_user = NULL, *psz_pwd = NULL; - int i_server_port = 0; - vlc_value_t val; + if( ( i_status / 100 ) != 2 ) + { + msg_Err( p_access, "HTTP/TLS tunnel through proxy denied" ); + Disconnect( p_access ); + return -1; + } - p_access_data = malloc( sizeof(_input_socket_t) ); - p_input->p_access_data = (access_sys_t *)p_access_data; - if( p_access_data == NULL ) - { - msg_Err( p_input, "out of memory" ); - free(psz_name); - return VLC_ENOMEM; - } + do + { + psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL ); + if( psz == NULL ) + { + msg_Err( p_access, "HTTP proxy connection failed" ); + Disconnect( p_access ); + return -1; + } - p_access_data->psz_name = psz_name; - p_access_data->psz_network = ""; - memset(p_access_data->psz_auth_string, 0, MAX_QUERY_SIZE); + if( *psz == '\0' ) + i_status = 0; - var_Create( p_input, "ipv4", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_input, "ipv4", &val ); - if( val.i_int ) - { - p_access_data->psz_network = "ipv4"; - } - var_Create( p_input, "ipv6", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_input, "ipv6", &val ); - if( val.i_int ) - { - p_access_data->psz_network = "ipv6"; - } - if( *p_input->psz_access ) - { - /* Find out which shortcut was used */ - if( !strncmp( p_input->psz_access, "http6", 6 ) ) - { - p_access_data->psz_network = "ipv6"; + free( psz ); + + if( !vlc_object_alive (p_access) || p_access->b_error ) + { + Disconnect( p_access ); + return -1; + } + } + while( i_status ); } - else if( !strncmp( p_input->psz_access, "http4", 6 ) ) + + /* TLS/SSL handshake */ + p_sys->p_tls = tls_ClientCreate( VLC_OBJECT(p_access), p_sys->fd, + srv.psz_host ); + if( p_sys->p_tls == NULL ) { - p_access_data->psz_network = "ipv4"; + msg_Err( p_access, "cannot establish HTTP/TLS session" ); + Disconnect( p_access ); + return -1; } + p_sys->p_vs = &p_sys->p_tls->sock; } - /* Parse psz_name syntax : - * //[user:password]@[:][/] */ + return Request( p_access, i_tell ) ? -2 : 0; +} - while( *psz_parser == '/' ) - { - psz_parser++; - } - psz_auth_parser = psz_parser; +static int Request( access_t *p_access, int64_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; - while ( *psz_auth_parser != '@' && *psz_auth_parser != '\0' ) + p_sys->i_remaining = 0; + if( p_sys->b_proxy ) { - psz_auth_parser++; + if( p_sys->url.psz_path ) + { + net_Printf( VLC_OBJECT(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, + "GET http://%s:%d/ HTTP/1.%d\r\n", + p_sys->url.psz_host, p_sys->url.i_port, + p_sys->i_version ); + } } - if ( *psz_auth_parser == '@' ) + else { - psz_user = psz_parser; - while ( *psz_parser != ':' && psz_parser < psz_auth_parser ) + const char *psz_path = p_sys->url.psz_path; + if( !psz_path || !*psz_path ) { - psz_parser++; + psz_path = "/"; } - if ( psz_parser != psz_auth_parser ) + if( p_sys->url.i_port != (pvs ? 443 : 80) ) { - *psz_parser = '\0'; - psz_pwd = psz_parser + 1; + net_Printf( VLC_OBJECT(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 { - psz_pwd = ""; + net_Printf( VLC_OBJECT(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 ); } - *psz_auth_parser = '\0'; - psz_parser = psz_auth_parser + 1; + } + /* User Agent */ + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "User-Agent: %s\r\n", + p_sys->psz_user_agent ); + /* Offset */ + if( p_sys->i_version == 1 && ! p_sys->b_continuous ) + { + p_sys->b_persist = true; + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + "Range: bytes=%"PRIu64"-\r\n", i_tell ); } - psz_server_addr = psz_parser; - - while( *psz_parser && *psz_parser != ':' && *psz_parser != '/' ) + /* Cookies */ + if( p_sys->cookies ) { - if( *psz_parser == '[' ) + int i; + for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ ) { - /* IPv6 address */ - while( *psz_parser && *psz_parser != ']' ) + 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 ); + + assert( psz_cookie_content ); + + /* 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( is_in_right_domain ) { - psz_parser++; + 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 ); } - psz_parser++; } - if ( *psz_parser == ':' ) - { - *psz_parser = '\0'; - psz_parser++; - psz_server_port = psz_parser; + /* Authentication */ + if( p_sys->url.psz_username || p_sys->url.psz_password ) + AuthReply( p_access, "", &p_sys->url, &p_sys->auth ); - while( *psz_parser && *psz_parser != '/' ) - { - psz_parser++; - } - } + /* Proxy Authentication */ + if( p_sys->proxy.psz_username || p_sys->proxy.psz_password ) + 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" ); - if( *psz_parser == '/' ) + + if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "\r\n" ) < 0 ) { - *psz_parser = '\0'; - psz_parser++; - psz_path = psz_parser; + msg_Err( p_access, "failed to send request" ); + Disconnect( p_access ); + return VLC_EGENERIC; } - /* Convert port format */ - if( *psz_server_port ) + /* Read Answer */ + if( ( psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, pvs ) ) == NULL ) { - i_server_port = strtol( psz_server_port, &psz_parser, 10 ); - if( *psz_parser ) - { - msg_Err( p_input, "cannot parse server port near %s", psz_parser ); - free( p_input->p_access_data ); - free( psz_name ); - return VLC_EGENERIC; - } + msg_Err( p_access, "failed to read answer" ); + goto error; } - - if( i_server_port == 0 ) + if( !strncmp( psz, "HTTP/1.", 7 ) ) { - i_server_port = 80; + p_sys->psz_protocol = "HTTP"; + p_sys->i_code = atoi( &psz[9] ); } - - if( !*psz_server_addr ) + else if( !strncmp( psz, "ICY", 3 ) ) { - msg_Err( p_input, "no server given" ); - free( p_input->p_access_data ); - free( psz_name ); - return VLC_EGENERIC; + p_sys->psz_protocol = "ICY"; + p_sys->i_code = atoi( &psz[4] ); + p_sys->b_reconnect = true; } - - /* Handle autehtification */ - - if ( psz_user == NULL ) + else { - var_Create( p_input, "http-user", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Get( p_input, "http-user", &val ); - psz_user = val.psz_string; - - var_Create( p_input, "http-pwd", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Get( p_input, "http-pwd", &val ); - psz_pwd = val.psz_string; + msg_Err( p_access, "invalid HTTP reply '%s'", psz ); + free( psz ); + goto error; } - - if (psz_user != NULL) + msg_Dbg( p_access, "protocol '%s' answer code %d", + p_sys->psz_protocol, p_sys->i_code ); + if( !strcmp( p_sys->psz_protocol, "ICY" ) ) + { + p_sys->b_seekable = false; + } + if( p_sys->i_code != 206 && p_sys->i_code != 401 ) { - char psz_user_pwd[MAX_QUERY_SIZE]; - msg_Dbg( p_input, "authenticating, user=%s, password=%s", - psz_user, psz_pwd ); - snprintf( psz_user_pwd, MAX_QUERY_SIZE, "%s:%s", psz_user, psz_pwd ); - snprintf( p_access_data->psz_auth_string, MAX_QUERY_SIZE, - "Authorization: Basic %s\r\n", - str_base64_encode( psz_user_pwd, p_input ) ); + p_sys->b_seekable = false; } + /* Authentication error - We'll have to display the dialog */ + if( p_sys->i_code == 401 ) + { - /* Check proxy config variable */ - var_Create( p_input, "http-proxy", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Get( p_input, "http-proxy", &val ); - psz_proxy_orig = val.psz_string; - if( psz_proxy_orig == NULL ) + } + /* Other fatal error */ + else if( p_sys->i_code >= 400 ) { - /* Check proxy environment variable */ - psz_proxy_orig = getenv( "http_proxy" ); - if( psz_proxy_orig != NULL ) - { - psz_proxy_orig = strdup( psz_proxy_orig ); - } + msg_Err( p_access, "error: %s", psz ); + free( psz ); + goto error; } + free( psz ); - psz_proxy = psz_proxy_orig; - if( psz_proxy != NULL && *psz_proxy ) + for( ;; ) { - /* http://myproxy.mydomain:myport/ */ - int i_proxy_port = 0; + char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, pvs ); + char *p; - /* Skip the protocol name */ - while( *psz_proxy && *psz_proxy != ':' ) + if( psz == NULL ) { - psz_proxy++; + msg_Err( p_access, "failed to read answer" ); + goto error; } - /* Skip the "://" part */ - while( *psz_proxy && (*psz_proxy == ':' || *psz_proxy == '/') ) + if( !vlc_object_alive (p_access) || p_access->b_error ) { - psz_proxy++; + free( psz ); + goto error; } - /* Found a proxy name */ - if( *psz_proxy ) + /* msg_Dbg( p_input, "Line=%s", psz ); */ + if( *psz == '\0' ) { - char *psz_port = psz_proxy; + free( psz ); + break; + } - /* Skip the hostname part */ - while( *psz_port && *psz_port != ':' && *psz_port != '/' ) - { - psz_port++; + if( ( p = strchr( psz, ':' ) ) == NULL ) + { + msg_Err( p_access, "malformed header line: %s", psz ); + free( psz ); + goto error; + } + *p++ = '\0'; + while( *p == ' ' ) p++; + + if( !strcasecmp( psz, "Content-Length" ) ) + { + int64_t i_size = i_tell + (p_sys->i_remaining = atoll( p )); + if(i_size > p_access->info.i_size) { + p_access->info.i_size = i_size; } + msg_Dbg( p_access, "this frame size=%"PRId64, p_sys->i_remaining ); + } + else if( !strcasecmp( psz, "Content-Range" ) ) { + int64_t i_ntell = i_tell; + int64_t i_nend = (p_access->info.i_size > 0)?(p_access->info.i_size - 1):i_tell; + int64_t i_nsize = p_access->info.i_size; + sscanf(p,"bytes %"PRId64"-%"PRId64"/%"PRId64,&i_ntell,&i_nend,&i_nsize); + if(i_nend > i_ntell ) { + p_access->info.i_pos = 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_access->info.i_size = i_size; + } + msg_Dbg( p_access, "stream size=%"PRId64",pos=%"PRId64",remaining=%"PRId64,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" ) ) + { + char * psz_new_loc; - /* Found a port name */ - if( *psz_port ) + /* This does not follow RFC 2068, but yet if the url is not absolute, + * handle it as everyone does. */ + if( p[0] == '/' ) { - char * psz_junk; - - /* Replace ':' with '\0' */ - *psz_port = '\0'; - psz_port++; + const char *psz_http_ext = p_sys->b_ssl ? "s" : "" ; - psz_junk = psz_port; - while( *psz_junk && *psz_junk != '/' ) + if( p_sys->url.i_port == ( p_sys->b_ssl ? 443 : 80 ) ) { - psz_junk++; + if( asprintf(&psz_new_loc, "http%s://%s%s", psz_http_ext, + p_sys->url.psz_host, p) < 0 ) + goto error; } - - if( *psz_junk ) - { - *psz_junk = '\0'; - } - - if( *psz_port != '\0' ) + else { - i_proxy_port = atoi( psz_port ); + 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 + { + psz_new_loc = strdup( p ); + } - psz_proxy = strdup( psz_proxy ); + free( p_sys->psz_location ); + p_sys->psz_location = psz_new_loc; + } + else if( !strcasecmp( psz, "Content-Type" ) ) + { + 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 = true; + free( p_sys->psz_pragma ); + p_sys->psz_pragma = strdup( p ); + msg_Dbg( p_access, "Pragma: %s", p_sys->psz_pragma ); + } + else if( !strcasecmp( psz, "Server" ) ) + { + msg_Dbg( p_access, "Server: %s", p ); + if( !strncasecmp( p, "Icecast", 7 ) || + !strncasecmp( p, "Nanocaster", 10 ) ) + { + /* Remember if this is Icecast + * we need to force demux in this case without breaking + * autodetection */ - msg_Dbg( p_input, "using HTTP proxy server=%s port=%d", - psz_proxy, i_proxy_port ); + /* Let live 365 streams (nanocaster) piggyback on the icecast + * routine. They look very similar */ + + p_sys->b_reconnect = true; + p_sys->b_pace_control = false; + p_sys->b_icecast = true; + } } - else + else if( !strcasecmp( psz, "Transfer-Encoding" ) ) { - msg_Err( p_input, "HTTP proxy %s is invalid!", psz_proxy_orig ); - free( p_input->p_access_data ); - free( psz_name ); - if( psz_proxy_orig ) free( psz_proxy_orig ); - return VLC_EGENERIC; + msg_Dbg( p_access, "Transfer-Encoding: %s", p ); + if( !strncasecmp( p, "chunked", 7 ) ) + { + p_sys->b_chunked = true; + } + } + else if( !strcasecmp( psz, "Icy-MetaInt" ) ) + { + msg_Dbg( p_access, "Icy-MetaInt: %s", p ); + 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 = EnsureUTF8( strdup( p )); + msg_Dbg( p_access, "Icy-Name: %s", p_sys->psz_icy_name ); + + 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 = EnsureUTF8( strdup( p )); + msg_Dbg( p_access, "Icy-Genre: %s", p_sys->psz_icy_genre ); + } + else if( !strncasecmp( psz, "Icy-Notice", 10 ) ) + { + msg_Dbg( p_access, "Icy-Notice: %s", p ); + } + else if( !strncasecmp( psz, "icy-", 4 ) || + !strncasecmp( psz, "ice-", 4 ) || + !strncasecmp( psz, "x-audiocast", 11 ) ) + { + msg_Dbg( p_access, "Meta-Info: %s: %s", psz, p ); + } + 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, "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; } - if( psz_proxy_orig ) free( psz_proxy_orig ); + 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_access->info.i_size != -1 && p_sys->i_remaining == 0 && p_sys->b_persist ) { + Disconnect( p_access ); + } + return VLC_SUCCESS; + +error: + Disconnect( p_access ); + return VLC_EGENERIC; +} - p_access_data->socket_desc.psz_server_addr = psz_proxy; - p_access_data->socket_desc.i_server_port = i_proxy_port; - p_access_data->socket_desc.i_type = NETWORK_TCP; - p_access_data->socket_desc.i_ttl = 0; +/***************************************************************************** + * Disconnect: + *****************************************************************************/ +static void Disconnect( access_t *p_access ) +{ + access_sys_t *p_sys = p_access->p_sys; - snprintf( p_access_data->psz_buffer, MAX_QUERY_SIZE, - "GET http://%s:%d/%s HTTP/1.0\r\n", - psz_server_addr, i_server_port, psz_path ); + if( p_sys->p_tls != NULL) + { + tls_ClientDelete( p_sys->p_tls ); + p_sys->p_tls = NULL; + p_sys->p_vs = NULL; } - else + if( p_sys->fd != -1) { - /* No proxy, direct connection. */ - p_access_data->socket_desc.i_type = NETWORK_TCP; - p_access_data->socket_desc.psz_server_addr = psz_server_addr; - p_access_data->socket_desc.i_server_port = i_server_port; - p_access_data->socket_desc.i_ttl = 0; + net_Close(p_sys->fd); + p_sys->fd = -1; + } + +} - snprintf( p_access_data->psz_buffer, MAX_QUERY_SIZE, - "GET /%s HTTP/1.1\r\nHost: %s\r\n", - psz_path, psz_server_addr ); +/***************************************************************************** + * Cookies (FIXME: we may want to rewrite that using a nice structure to hold + * them) (FIXME: only support the "domain=" param) + *****************************************************************************/ + +/* Get the NAME=VALUE part of the Cookie */ +static char * cookie_get_content( const char * cookie ) +{ + char * ret = strdup( cookie ); + if( !ret ) return NULL; + char * str = ret; + /* Look for a ';' */ + while( *str && *str != ';' ) str++; + /* Replace it by a end-char */ + if( *str == ';' ) *str = 0; + return ret; +} + +/* Get the domain where the cookie is stored */ +static char * cookie_get_domain( const char * cookie ) +{ + const char * str = cookie; + static const char domain[] = "domain="; + if( !str ) + return NULL; + /* Look for a ';' */ + while( *str ) + { + if( !strncmp( str, domain, sizeof(domain) - 1 /* minus \0 */ ) ) + { + str += sizeof(domain) - 1 /* minus \0 */; + char * ret = strdup( str ); + /* Now remove the next ';' if present */ + char * ret_iter = ret; + while( *ret_iter && *ret_iter != ';' ) ret_iter++; + if( *ret_iter == ';' ) + *ret_iter = 0; + return ret; + } + /* Go to next ';' field */ + while( *str && *str != ';' ) str++; + if( *str == ';' ) str++; + /* skip blank */ + while( *str && *str == ' ' ) str++; } - p_access_data->psz_buffer[MAX_QUERY_SIZE - 1] = '\0'; + return NULL; +} - msg_Dbg( p_input, "opening server=%s port=%d path=%s", - psz_server_addr, i_server_port, psz_path ); +/* Get NAME in the NAME=VALUE field */ +static char * cookie_get_name( const char * cookie ) +{ + char * ret = cookie_get_content( cookie ); /* NAME=VALUE */ + if( !ret ) return NULL; + char * str = ret; + while( *str && *str != '=' ) str++; + *str = 0; + return ret; +} + +/* Add a cookie in cookies, checking to see how it should be added */ +static void cookie_append( vlc_array_t * cookies, char * cookie ) +{ + int i; - p_input->pf_read = Read; - p_input->pf_set_program = input_SetProgram; - p_input->pf_set_area = NULL; - p_input->pf_seek = Seek; + if( !cookie ) + return; - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.b_pace_control = VLC_TRUE; - p_input->stream.b_seekable = VLC_TRUE; - p_input->stream.p_selected_area->i_tell = 0; - p_input->stream.p_selected_area->i_size = 0; - p_input->stream.i_method = INPUT_METHOD_NETWORK; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - p_input->i_mtu = 0; + char * cookie_name = cookie_get_name( cookie ); - if( HTTPConnect( p_input, 0 ) ) + /* 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++ ) { - /* Request failed, try again with HTTP/1.0 */ - char * psz_pos = strstr( p_access_data->psz_buffer, "HTTP/1.1" ); + 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 ); + + assert( current_cookie_name ); - if( !psz_pos ) + 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 ) ) { - return VLC_EGENERIC; + /* Remove previous value for this cookie */ + free( current_cookie ); + vlc_array_remove( cookies, i ); + + /* Clean */ + free( current_cookie_name ); + free( current_cookie_domain ); + break; } + free( current_cookie_name ); + free( current_cookie_domain ); + } + free( cookie_name ); + free( cookie_domain ); + 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; + } +} - p_input->stream.b_seekable = VLC_FALSE; - psz_pos[7] = '0'; - if( HTTPConnect( p_input, 0 ) ) +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 */ { - free( p_input->p_access_data ); - free( psz_name ); - return VLC_EGENERIC; + 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'", + (int)(psz_end - psz_header), psz_header ); + else + msg_Warn( p_access, "Unknown authentication scheme: '%s'", + psz_header ); + } +} - /* Update default_pts to a suitable value for http access */ +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 ?: ""; - var_Create( p_input, "http-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_input, "http-caching", &val ); - p_input->i_pts_delay = val.i_int * 1000; + char *psz_HA1 = NULL; + char *psz_HA2 = NULL; + char *psz_response = NULL; + struct md5_s md5; - return VLC_SUCCESS; + /* 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; } -/***************************************************************************** - * Close: free unused data structures - *****************************************************************************/ -static void Close( vlc_object_t *p_this ) + +static void AuthReply( access_t *p_access, const char *psz_prefix, + vlc_url_t *p_url, http_auth_t *p_auth ) { - input_thread_t * p_input = (input_thread_t *)p_this; - int i_handle = ((network_socket_t *)p_input->p_access_data)->i_handle; - _input_socket_t * p_access_data = - (_input_socket_t *)p_input->p_access_data; + access_sys_t *p_sys = p_access->p_sys; + v_socket_t *pvs = p_sys->p_vs; - free( p_access_data->psz_name ); + const char *psz_username = p_url->psz_username ?: ""; + const char *psz_password = p_url->psz_password ?: ""; - msg_Info( p_input, "closing HTTP target `%s'", p_input->psz_source ); + if( p_auth->psz_nonce ) + { + /* Digest Access Authentication */ + char *psz_response; -#if defined( WIN32 ) || defined( UNDER_CE ) - closesocket( i_handle ); -#else - close( i_handle ); -#endif + 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; + } - free( p_access_data ); -} + 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; -/***************************************************************************** - * Seek: close and re-open a connection at the right place - *****************************************************************************/ -static void Seek( input_thread_t * p_input, off_t i_pos ) -{ - _input_socket_t *p_access_data = (_input_socket_t*)p_input->p_access_data; -#if defined( WIN32 ) || defined( UNDER_CE ) - closesocket( p_access_data->_socket.i_handle ); -#else - close( p_access_data->_socket.i_handle ); -#endif - msg_Dbg( p_input, "seeking to position "I64Fd, i_pos ); - HTTPConnect( p_input, i_pos ); + 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 ); + } + } } -/***************************************************************************** - * Read: Read up to i_len bytes from the http connection and place in - * p_buffer. Return the actual number of bytes read - *****************************************************************************/ -static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) +static int AuthCheckReply( access_t *p_access, const char *psz_header, + vlc_url_t *p_url, http_auth_t *p_auth ) { - input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data; - struct timeval timeout; - fd_set fds; - ssize_t i_recv; - int i_ret; - - /* Initialize file descriptor set */ - FD_ZERO( &fds ); - FD_SET( p_access_data->i_handle, &fds ); - - /* We'll wait 0.5 second if nothing happens */ - timeout.tv_sec = 0; - timeout.tv_usec = 500000; - - /* Find if some data is available */ - while( (i_ret = select( p_access_data->i_handle + 1, &fds, - NULL, NULL, &timeout )) == 0 -#ifdef HAVE_ERRNO_H - || (i_ret < 0 && errno == EINTR) -#endif - ) + 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 ) { - FD_ZERO( &fds ); - FD_SET( p_access_data->i_handle, &fds ); - timeout.tv_sec = 0; - timeout.tv_usec = 500000; + char *psz_digest; - if( p_input->b_die || p_input->b_error ) + if( strcmp( psz_cnonce, p_auth->psz_cnonce ) ) { - return 0; + 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( i_ret < 0 ) + if( psz_nextnonce ) { - msg_Err( p_input, "network select error" ); - return -1; + free( p_auth->psz_nonce ); + p_auth->psz_nonce = psz_nextnonce; + psz_nextnonce = NULL; } - i_recv = recv( p_access_data->i_handle, p_buffer, i_len, 0 ); + i_ret = VLC_SUCCESS; + error: + free( psz_nextnonce ); + free( psz_qop ); + free( psz_rspauth ); + free( psz_cnonce ); + free( psz_nc ); - if( i_recv < 0 ) - { -#ifdef HAVE_ERRNO_H - msg_Err( p_input, "recv failed (%s)", strerror(errno) ); -#else - msg_Err( p_input, "recv failed" ); -#endif - } + return i_ret; +} - return i_recv; +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 ); }