"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( N_("HTTP input") )
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 )
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" )
set_callbacks( Open, Close )
vlc_module_end ()
};
/* */
-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 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_CreateGetInteger( 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 */
bool b_forward_cookies = var_CreateGetBool( p_access, "http-forward-cookies" );
- vlc_array_t * saved_cookies = b_forward_cookies ? (cookies ?: vlc_array_new()) : NULL;
+ vlc_array_t * saved_cookies = b_forward_cookies ? (cookies ? cookies : vlc_array_new()) : NULL;
/* Set up p_access */
STANDARD_READ_ACCESS_INIT;
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 = true;
{
char *buf;
int i;
- i=asprintf(&buf, "%s://%s", p_access->psz_access, p_access->psz_path);
+ i=asprintf(&buf, "%s://%s", psz_access, p_access->psz_path);
if (i >= 0)
{
msg_Dbg(p_access, "asking libproxy about url '%s'", buf);
p_sys->auth.psz_realm );
if( psz_login != NULL && psz_password != NULL )
{
- msg_Dbg( p_access, "retrying with user=%s, pwd=%s",
- psz_login,
-#if 1
- "yeah right, like we're going to print a password."
-#else
- psz_password
-#endif
- );
+ 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 );
{
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;
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 )
}
/* 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" ) )
{
/* 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" );
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 )
{
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 );
}
}
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 )
+ {
+ free( psz_meta );
return VLC_EGENERIC;
+ }
psz_meta[i_read] = '\0'; /* Just in case */
strcmp( p_sys->psz_icy_title, &p[1] ) )
{
free( p_sys->psz_icy_title );
- p_sys->psz_icy_title = EnsureUTF8( 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 );
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" );
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" );
/* 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" );
}
/* 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;
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 )
else if( !strcasecmp( psz, "Icy-Name" ) )
{
free( p_sys->psz_icy_name );
- p_sys->psz_icy_name = EnsureUTF8( 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 = true; /* be on the safeside. set it here as well. */
else if( !strcasecmp( psz, "Icy-Genre" ) )
{
free( p_sys->psz_icy_genre );
- p_sys->psz_icy_genre = EnsureUTF8( 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 ) )
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 ?: "";
+ const char *psz_username = p_url->psz_username ? p_url->psz_username : "";
+ const char *psz_password = p_url->psz_password ? p_url->psz_password : "";
char *psz_HA1 = NULL;
char *psz_HA2 = NULL;
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 ?: "";
+ const char *psz_username = p_url->psz_username ? p_url->psz_username : "";
+ const char *psz_password = p_url->psz_password ? p_url->psz_password : "";
if( p_auth->psz_nonce )
{
psz_username,
p_auth->psz_realm,
p_auth->psz_nonce,
- p_url->psz_path ?: "/",
+ p_url->psz_path ? p_url->psz_path : "/",
psz_response,
/* Optional parameters */
p_auth->psz_algorithm ? "algorithm=\"" : "",
- p_auth->psz_algorithm ?: "",
+ p_auth->psz_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_cnonce : "",
p_auth->psz_cnonce ? "\", " : "",
p_auth->psz_opaque ? "opaque=\"" : "",
- p_auth->psz_opaque ?: "",
+ p_auth->psz_opaque ? p_auth->psz_opaque : "",
p_auth->psz_opaque ? "\", " : "",
p_auth->psz_qop ? "qop=\"" : "",
- p_auth->psz_qop ?: "",
+ p_auth->psz_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,
projects / vlc / blobdiff