#endif
#include <assert.h>
+#include <limits.h>
#ifdef HAVE_LIBPROXY
# include <proxy.h>
#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 " \
- "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 " \
#define FORWARD_COOKIES_TEXT N_("Forward Cookies")
#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.")
+#define REFERER_TEXT N_("HTTP referer value")
+#define REFERER_LONGTEXT N_("Customize the HTTP referer, simulating a previous document")
-#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.")
+#define UA_TEXT N_("User Agent")
+#define UA_LONGTEXT N_("You can use a custom User agent or use a known one")
vlc_module_begin ()
set_description( N_("HTTP input") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
- add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT,
+ add_string( "http-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
false )
- add_password( "http-proxy-pwd", NULL, NULL,
+ add_password( "http-proxy-pwd", 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-referrer", NULL, REFERER_TEXT, REFERER_LONGTEXT, false )
change_safe()
- add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT,
- AGENT_LONGTEXT, true )
+ add_string( "http-user-agent", NULL, UA_TEXT, UA_LONGTEXT, false )
change_safe()
- add_bool( "http-reconnect", false, NULL, RECONNECT_TEXT,
+ change_private()
+ add_bool( "http-reconnect", false, RECONNECT_TEXT,
RECONNECT_LONGTEXT, true )
- add_bool( "http-continuous", false, NULL, CONTINUOUS_TEXT,
+ add_bool( "http-continuous", false, CONTINUOUS_TEXT,
CONTINUOUS_LONGTEXT, true )
change_safe()
- add_bool( "http-forward-cookies", true, NULL, FORWARD_COOKIES_TEXT,
+ add_bool( "http-forward-cookies", true, 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")
- add_shortcut( "http" )
- add_shortcut( "https" )
- add_shortcut( "unsv" )
- add_shortcut( "itpc" ) /* iTunes Podcast */
- add_shortcut( "icyx" )
+ /* 'itpc' = iTunes Podcast */
+ add_shortcut( "http", "https", "unsv", "itpc", "icyx" )
set_callbacks( Open, Close )
vlc_module_end ()
{
int fd;
bool b_error;
- tls_session_t *p_tls;
- v_socket_t *p_vs;
+ vlc_tls_t *p_tls;
+ v_socket_t *p_vs;
/* From uri */
vlc_url_t url;
char *psz_user_agent;
+ char *psz_referrer;
http_auth_t auth;
/* Proxy */
/* */
static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
- int i_nb_redirect, int i_max_redirect,
- vlc_array_t *cookies );
+ unsigned i_redirect, vlc_array_t *cookies );
/* */
static ssize_t Read( access_t *, uint8_t *, size_t );
static int Open( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
- return OpenWithCookies( p_this, p_access->psz_access, 0,
- var_CreateGetInteger( p_access, "http-max-redirect" ), NULL );
+ return OpenWithCookies( p_this, p_access->psz_access, 5, NULL );
}
/**
* @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
+ * @i_redirect: number of redirections remaining
* @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 )
+ unsigned i_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 */
- bool b_forward_cookies = var_CreateGetBool( p_access, "http-forward-cookies" );
+ 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 */
p_sys->b_icecast = false;
p_sys->psz_location = NULL;
p_sys->psz_user_agent = NULL;
+ p_sys->psz_referrer = NULL;
p_sys->b_pace_control = true;
p_sys->b_ssl = false;
#ifdef HAVE_ZLIB_H
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 );
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 and comment definition, and §3.8 and
+ * §14.43 user-agent header */
+ p_sys->psz_user_agent = var_InheritString( p_access, "http-user-agent" );
+ if (p_sys->psz_user_agent)
+ {
+ unsigned comment_level = 0;
+ for( char *p = p_sys->psz_user_agent; *p; p++ )
+ {
+ uint8_t c = *p;
+ if (comment_level == 0)
+ {
+ if( c < 32 || strchr( ")<>@,;:\\\"[]?={}", c ) )
+ *p = '_'; /* remove potentially harmful characters */
+ }
+ else
+ {
+ if (c == ')')
+ comment_level--;
+ else if( c < 32 && strchr( "\t\r\n", c ) == NULL)
+ *p = '_'; /* remove potentially harmful characters */
+ }
+ if (c == '(')
+ {
+ if (comment_level == UINT_MAX)
+ break;
+ comment_level++;
+ }
+ }
+ /* truncate evil unclosed comments */
+ if (comment_level > 0)
+ {
+ char *p = strchr(p_sys->psz_user_agent, '(');
+ *p = '\0';
+ }
+ }
+
+ /* HTTP referrer */
+ p_sys->psz_referrer = var_InheritString( p_access, "http-referrer" );
/* Check proxy */
- psz = var_CreateGetNonEmptyString( p_access, "http-proxy" );
+ psz = var_InheritString( p_access, "http-proxy" );
if( psz )
{
p_sys->b_proxy = true;
{
char *buf;
int i;
- i=asprintf(&buf, "%s://%s", psz_access, p_access->psz_path);
+ i=asprintf(&buf, "%s://%s", psz_access, p_access->psz_location);
if (i >= 0)
{
msg_Dbg(p_access, "asking libproxy about url '%s'", buf);
#elif defined( WIN32 )
else
{
- if( var_CreateGetBool( 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 )
{
- /* 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 len = sizeof( DWORD );
+ BYTE proxyEnable;
+
+ /* Get the proxy enable value */
+ if( RegQueryValueEx( h_key, "ProxyEnable", NULL, NULL,
+ &proxyEnable, &len ) == ERROR_SUCCESS
+ && proxyEnable )
{
- 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 )
+ /* Proxy is enabled */
+ /* 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. */
+ unsigned char key[256];
+
+ len = sizeof( key );
+ if( RegQueryValueEx( h_key, "ProxyServer", NULL, NULL,
+ key, &len ) == ERROR_SUCCESS )
{
- if( proxyEnable )
+ /* FIXME: This is lame. The string should be tokenized. */
+#warning FIXME.
+ char *psz_proxy = strstr( (char *)key, "http=" );
+ if( psz_proxy != NULL )
{
- /* 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=adress1:port1;http=adress2: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." );
+ psz_proxy += 5;
+ char *end = strchr( psz_proxy, ';' );
+ if( end != NULL )
+ *end = '\0';
}
+ else
+ psz_proxy = (char *)key;
+ /* Set proxy enable for this connection. */
+ p_sys->b_proxy = true;
+ vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
}
- 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." );
+ msg_Dbg( p_access, "HTTP proxy disabled (MSIE)" );
}
}
-#elif HAVE_GETENV
+#else
else
{
psz = getenv( "http_proxy" );
if( psz ) /* No, this is NOT a use-after-free error */
{
- psz = var_CreateGetNonEmptyString( p_access, "http-proxy-pwd" );
+ psz = var_InheritString( p_access, "http-proxy-pwd" );
if( psz )
p_sys->proxy.psz_password = p_sys->psz_proxy_passbuf = psz;
}
}
}
- 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,
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 */
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
+ assert(0);
}
if( p_sys->i_code == 401 )
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 )
+ if( i_redirect == 0 )
{
msg_Err( p_access, "Too many redirection: break potential infinite"
"loop" );
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 );
http_auth_Reset( &p_sys->auth );
free( p_sys->psz_pragma );
free( p_sys->psz_location );
free( p_sys->psz_user_agent );
+ free( p_sys->psz_referrer );
Disconnect( p_access );
cookies = p_sys->cookies;
free( p_sys );
/* Do new Open() run with new data */
- return OpenWithCookies( p_this, psz_protocol, i_nb_redirect + 1,
- i_max_redirect, cookies );
+ return OpenWithCookies( p_this, psz_protocol, i_redirect - 1,
+ cookies );
}
if( p_sys->b_mms )
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:
free( p_sys->psz_pragma );
free( p_sys->psz_location );
free( p_sys->psz_user_agent );
+ free( p_sys->psz_referrer );
Disconnect( p_access );
free( p_sys->psz_icy_title );
free( p_sys->psz_user_agent );
+ free( p_sys->psz_referrer );
Disconnect( p_access );
int i_read;
if( p_sys->fd == -1 )
- {
- p_access->info.b_eof = true;
- return 0;
- }
+ goto fatal;
if( p_sys->b_has_size )
{
if( p_sys->b_chunked )
{
if( p_sys->i_chunk < 0 )
- {
- p_access->info.b_eof = true;
- return 0;
- }
+ goto fatal;
if( p_sys->i_chunk <= 0 )
{
if( p_sys->i_chunk <= 0 ) /* eof */
{
p_sys->i_chunk = -1;
- p_access->info.b_eof = true;
- return 0;
+ goto fatal;
}
}
}
if( i_len == 0 )
- {
- p_access->info.b_eof = true;
- return 0;
- }
+ goto fatal;
if( p_sys->i_icy_meta > 0 && p_access->info.i_pos-p_sys->i_icy_offset > 0 )
{
if( i_next == p_sys->i_icy_meta )
{
if( ReadICYMeta( p_access ) )
- {
- p_access->info.b_eof = true;
- return -1;
- }
+ goto fatal;
}
if( i_len > i_next )
i_len = i_next;
p_sys->b_reconnect = false;
i_read = Read( p_access, p_buffer, i_len );
p_sys->b_reconnect = true;
+
+ return i_read;
}
}
if( i_read <= 0 )
{
- p_access->info.b_eof = true;
if( i_read < 0 )
p_sys->b_error = true;
- return 0;
+ goto fatal;
}
}
assert( i_read >= 0 );
+ p_access->info.i_pos += i_read;
if( p_sys->b_has_size )
{
- p_access->info.i_pos += i_read;
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;
}
return i_read;
+
+fatal:
+ p_access->info.b_eof = true;
+ return 0;
}
static int ReadICYMeta( access_t *p_access )
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 );
+ ssize_t i_read = Read( p_access, p_sys->inflate.p_buffer, 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;
/* */
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 = INT64_C(1000)
+ * var_InheritInteger( p_access, "network-caching" );
break;
/* */
setsockopt (p_sys->fd, SOL_SOCKET, SO_KEEPALIVE, &(int){ 1 }, sizeof (int));
/* Initialize TLS/SSL session */
- if( p_sys->b_ssl == true )
+ if( p_sys->b_ssl )
{
/* CONNECT to establish TLS tunnel through HTTP proxy */
if( p_sys->b_proxy )
}
/* TLS/SSL handshake */
- p_sys->p_tls = tls_ClientCreate( VLC_OBJECT(p_access), p_sys->fd,
- p_sys->url.psz_host );
+ p_sys->p_tls = vlc_tls_ClientCreate( VLC_OBJECT(p_access), p_sys->fd,
+ p_sys->url.psz_host );
if( p_sys->p_tls == NULL )
{
msg_Err( p_access, "cannot establish HTTP/TLS session" );
}
}
/* User Agent */
- net_Printf( 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 );
+ /* Referrer */
+ if (p_sys->psz_referrer)
+ {
+ net_Printf( p_access, p_sys->fd, pvs,
+ "Referer: %s\r\n",
+ p_sys->psz_referrer);
+ }
/* Offset */
if( p_sys->i_version == 1 && ! p_sys->b_continuous )
{
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 */
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);
+ uint64_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;
if( p_sys->p_tls != NULL)
{
- tls_ClientDelete( p_sys->p_tls );
+ vlc_tls_ClientDelete( p_sys->p_tls );
p_sys->p_tls = NULL;
p_sys->p_vs = NULL;
}
projects / vlc / blobdiff