*
* 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 <stdlib.h>
-
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "vlc_playlist.h"
-#include "vlc_meta.h"
-#include "network.h"
-#include "vlc_tls.h"
+
+#include <vlc_access.h>
+
+#include <vlc_interface.h>
+#include <vlc_meta.h>
+#include <vlc_network.h>
+#include <vlc_url.h>
+#include <vlc_tls.h>
+#include <vlc_strings.h>
+#include <vlc_input.h>
+
+#ifdef HAVE_ZLIB_H
+# include <zlib.h>
+#endif
/*****************************************************************************
* Module descriptor
#define PROXY_TEXT N_("HTTP proxy")
#define PROXY_LONGTEXT N_( \
- "You can specify an HTTP proxy to use. It must be of the form " \
+ "HTTP proxy to be used It must be of the form " \
"http://[user[:pass]@]myproxy.mydomain:myport/ ; " \
"if empty, the http_proxy environment variable will be tried." )
#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 millisecond units." )
+ "Caching value for HTTP streams. This " \
+ "value should be set in milliseconds." )
#define AGENT_TEXT N_("HTTP user agent")
-#define AGENT_LONGTEXT N_("Allows you to modify the user agent that will be " \
+#define AGENT_LONGTEXT N_("User agent that will be " \
"used for the connection.")
#define RECONNECT_TEXT N_("Auto re-connect")
-#define RECONNECT_LONGTEXT N_("Will automatically attempt a re-connection " \
- "in case it was untimely closed.")
+#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_("Enable this option to read a file that is " \
- "being constantly updated (for example, a JPG file on a server)")
+#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( _("HTTP input") );
set_capability( "access2", 0 );
- set_shortname( _( "HTTP/HTTPS" ) );
+ set_shortname( _( "HTTP(S)" ) );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT,
- AGENT_LONGTEXT, VLC_FALSE );
+ AGENT_LONGTEXT, VLC_TRUE );
add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT,
RECONNECT_LONGTEXT, VLC_TRUE );
add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT,
CONTINUOUS_LONGTEXT, VLC_TRUE );
- add_suppressed_string("http-user");
- add_suppressed_string("http-pwd");
+ add_bool( "http-forward-cookies", 0, NULL, FORWARD_COOKIES_TEXT,
+ FORWARD_COOKIES_LONGTEXT, VLC_TRUE );
+ add_obsolete_string("http-user");
+ add_obsolete_string("http-pwd");
add_shortcut( "http" );
add_shortcut( "https" );
add_shortcut( "unsv" );
+ add_shortcut( "itpc" ); /* iTunes Podcast */
set_callbacks( Open, Close );
vlc_module_end();
/* */
int i_code;
- char *psz_protocol;
+ const char *psz_protocol;
int i_version;
char *psz_mime;
vlc_bool_t b_mms;
vlc_bool_t b_icecast;
vlc_bool_t b_ssl;
+#ifdef HAVE_ZLIB_H
+ vlc_bool_t b_compressed;
+ struct
+ {
+ z_stream stream;
+ uint8_t *p_buffer;
+ } inflate;
+#endif
vlc_bool_t b_chunked;
int64_t i_chunk;
vlc_bool_t b_reconnect;
vlc_bool_t b_continuous;
vlc_bool_t b_pace_control;
+
+ vlc_array_t * cookies;
};
/* */
-static int Read( access_t *, uint8_t *, int );
+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 );
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 );
+
/*****************************************************************************
* Open:
*****************************************************************************/
static int Open( vlc_object_t *p_this )
+{
+ return OpenWithCookies( p_this, 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 */
+ vlc_bool_t b_forward_cookies = var_CreateGetBool( p_access, "http-forward-cookies" );
+ vlc_array_t * saved_cookies = b_forward_cookies ? (cookies ?: vlc_array_new()) : NULL;
/* Set up p_access */
- p_access->pf_read = Read;
- p_access->pf_block = NULL;
- p_access->pf_control = Control;
- p_access->pf_seek = Seek;
- p_access->info.i_update = 0;
- p_access->info.i_size = 0;
- p_access->info.i_pos = 0;
- p_access->info.b_eof = VLC_FALSE;
- p_access->info.i_title = 0;
- p_access->info.i_seekpoint = 0;
- p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
- memset( p_sys, 0, sizeof( access_sys_t ) );
+ STANDARD_READ_ACCESS_INIT;
+#ifdef HAVE_ZLIB_H
+ p_access->pf_read = ReadCompressed;
+#endif
p_sys->fd = -1;
p_sys->b_proxy = VLC_FALSE;
p_sys->i_version = 1;
p_sys->psz_user_agent = NULL;
p_sys->b_pace_control = VLC_TRUE;
p_sys->b_ssl = VLC_FALSE;
+#ifdef HAVE_ZLIB_H
+ p_sys->b_compressed = VLC_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->psz_icy_title = NULL;
p_sys->i_remaining = 0;
+ p_sys->cookies = saved_cookies;
+
/* Parse URI - remove spaces */
p = psz = strdup( p_access->psz_path );
while( (p = strchr( p, ' ' )) != NULL )
p_sys->b_reconnect = var_CreateGetBool( p_access, "http-reconnect" );
p_sys->b_continuous = var_CreateGetBool( p_access, "http-continuous" );
+connect:
/* Connect */
- if( Connect( p_access, 0 ) )
+ switch( Connect( p_access, 0 ) )
{
- /* Retry with http 1.0 */
- p_sys->i_version = 0;
+ case -1:
+ goto error;
+
+ 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 = VLC_FALSE;
- if( p_access->b_die ||
- Connect( p_access, 0 ) )
+ if( p_access->b_die || Connect( p_access, 0 ) )
+ goto error;
+
+#ifdef DEBUG
+ case 0:
+ break;
+
+ default:
+ msg_Err( p_access, "You should not be here" );
+ abort();
+#endif
+ }
+
+ if( p_sys->i_code == 401 )
+ {
+ char *psz_login = NULL; char *psz_password = NULL;
+ int i_ret;
+ msg_Dbg( p_access, "authentication failed" );
+ i_ret = intf_UserLoginPassword( p_access, _("HTTP authentication"),
+ _("Please enter a valid login name and a password."),
+ &psz_login, &psz_password );
+ if( i_ret == DIALOG_OK_YES )
+ {
+ msg_Dbg( p_access, "retrying with user=%s, pwd=%s",
+ psz_login, psz_password );
+ if( psz_login ) p_sys->url.psz_username = strdup( psz_login );
+ if( psz_password ) p_sys->url.psz_password = strdup( psz_password );
+ if( psz_login ) free( psz_login );
+ if( psz_password ) free( psz_password );
+ goto connect;
+ }
+ else
{
+ if( psz_login ) free( psz_login );
+ if( psz_password ) free( psz_password );
goto error;
}
}
p_sys->i_code == 303 || p_sys->i_code == 307 ) &&
p_sys->psz_location && *p_sys->psz_location )
{
- playlist_t * p_playlist;
- input_item_t *p_input_item;
-
msg_Dbg( p_access, "redirection to %s", p_sys->psz_location );
+ printf("redirection to %s", p_sys->psz_location );
+
/* Do not accept redirection outside of HTTP works */
if( strncmp( p_sys->psz_location, "http", 4 )
msg_Err( p_access, "insecure redirection ignored" );
goto error;
}
-
- p_playlist = vlc_object_find( p_access, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist )
- {
- msg_Err( p_access, "redirection failed: can't find playlist" );
- goto error;
- }
-
- /* Change the uri */
- vlc_mutex_lock( &p_playlist->object_lock );
- p_input_item = &p_playlist->status.p_item->input;
- vlc_mutex_lock( &p_input_item->lock );
- free( p_input_item->psz_uri );
free( p_access->psz_path );
- p_input_item->psz_uri = strdup( p_sys->psz_location );
p_access->psz_path = strdup( p_sys->psz_location );
- vlc_mutex_unlock( &p_input_item->lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
-
/* Clean up current Open() run */
vlc_UrlClean( &p_sys->url );
vlc_UrlClean( &p_sys->proxy );
- if( p_sys->psz_mime ) free( p_sys->psz_mime );
- if( p_sys->psz_pragma ) free( p_sys->psz_pragma );
- if( p_sys->psz_location ) free( p_sys->psz_location );
- if( p_sys->psz_user_agent ) free( p_sys->psz_user_agent );
+ 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 Open( p_this );
+ return OpenWithCookies( p_this, cookies );
}
if( p_sys->b_mms )
{
- msg_Dbg( p_access, "This is actually a live mms server, BAIL" );
+ msg_Dbg( p_access, "this is actually a live mms server, BAIL" );
goto error;
}
/* Grrrr! detect ultravox server and force NSV demuxer */
p_access->psz_demux = strdup( "nsv" );
}
+ else if( !strcmp( p_access->psz_access, "itpc" ) )
+ {
+ p_access->psz_demux = strdup( "podcast" );
+ }
+ else if( p_sys->psz_mime &&
+ !strncasecmp( p_sys->psz_mime, "application/xspf+xml", 20 ) &&
+ ( memchr( " ;\t", p_sys->psz_mime[20], 4 ) != NULL ) )
+ p_access->psz_demux = strdup( "xspf-open" );
if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" );
error:
vlc_UrlClean( &p_sys->url );
vlc_UrlClean( &p_sys->proxy );
- if( p_sys->psz_mime ) free( p_sys->psz_mime );
- if( p_sys->psz_pragma ) free( p_sys->psz_pragma );
- if( p_sys->psz_location ) free( p_sys->psz_location );
- if( p_sys->psz_user_agent ) free( p_sys->psz_user_agent );
+ 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 );
vlc_UrlClean( &p_sys->url );
vlc_UrlClean( &p_sys->proxy );
- if( p_sys->psz_mime ) free( p_sys->psz_mime );
- if( p_sys->psz_pragma ) free( p_sys->psz_pragma );
- if( p_sys->psz_location ) free( p_sys->psz_location );
+ free( p_sys->psz_mime );
+ free( p_sys->psz_pragma );
+ free( p_sys->psz_location );
- if( p_sys->psz_icy_name ) free( p_sys->psz_icy_name );
- if( p_sys->psz_icy_genre ) free( p_sys->psz_icy_genre );
- if( p_sys->psz_icy_title ) free( p_sys->psz_icy_title );
+ free( p_sys->psz_icy_name );
+ free( p_sys->psz_icy_genre );
+ free( p_sys->psz_icy_title );
- if( p_sys->psz_user_agent ) free( p_sys->psz_user_agent );
+ free( p_sys->psz_user_agent );
Disconnect( p_access );
+
+ if( p_sys->cookies )
+ {
+ int i;
+ for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ )
+ free(vlc_array_item_at_index( p_sys->cookies, i ));
+ vlc_array_destroy( p_sys->cookies );
+ }
+
+#ifdef HAVE_ZLIB_H
+ inflateEnd( &p_sys->inflate.stream );
+ free( p_sys->inflate.p_buffer );
+#endif
+
free( p_sys );
}
* p_buffer. Return the actual number of bytes read
*****************************************************************************/
static int ReadICYMeta( access_t *p_access );
-static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
+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;
/* read the chunk header */
if( psz == NULL )
{
+ /* fatal error - end of file */
msg_Dbg( p_access, "failed reading chunk-header line" );
- return -1;
+ return 0;
}
p_sys->i_chunk = strtoll( psz, NULL, 16 );
free( psz );
}
}
- if( p_sys->b_continuous && i_len > p_sys->i_remaining )
+ if( p_sys->b_continuous && (ssize_t)i_len > p_sys->i_remaining )
{
/* Only ask for the remaining length */
int i_new_len = p_sys->i_remaining;
return VLC_SUCCESS;
i_read = buffer << 4;
- msg_Dbg( p_access, "ICY meta size=%u", i_read);
+ /* 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,
psz_meta[i_read] = '\0'; /* Just in case */
- msg_Dbg( p_access, "icy-meta=%s", psz_meta );
+ /* msg_Dbg( p_access, "icy-meta=%s", psz_meta ); */
/* Now parse the meta */
/* Look for StreamTitle= */
p += strlen( "StreamTitle=" );
if( *p == '\'' || *p == '"' )
{
- char *psz = strchr( &p[1], p[0] );
+ char closing[] = { p[0], ';', '\0' };
+ char *psz = strstr( &p[1], closing );
if( !psz )
psz = strchr( &p[1], ';' );
if( psz ) *psz = '\0';
}
- if( p_sys->psz_icy_title ) free( p_sys->psz_icy_title );
-
- p_sys->psz_icy_title = strdup( &p[1] );
+ if( !p_sys->psz_icy_title ||
+ strcmp( p_sys->psz_icy_title, &p[1] ) )
+ {
+ if( p_sys->psz_icy_title )
+ free( p_sys->psz_icy_title );
+ p_sys->psz_icy_title = strdup( &p[1] );
+ p_access->info.i_update |= INPUT_UPDATE_META;
- p_access->info.i_update |= INPUT_UPDATE_META;
+ msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title );
+ }
}
-
free( psz_meta );
- msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title );
-
return VLC_SUCCESS;
}
+#ifdef HAVE_ZLIB_H
+static ssize_t ReadCompressed( access_t *p_access, uint8_t *p_buffer,
+ size_t i_len )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+
+ if( p_sys->b_compressed )
+ {
+ int i_ret;
+
+ if( !p_sys->inflate.p_buffer )
+ p_sys->inflate.p_buffer = malloc( 256 * 1024 );
+
+ if( p_sys->inflate.stream.avail_in == 0 )
+ {
+ ssize_t i_read = Read( p_access, p_sys->inflate.p_buffer + p_sys->inflate.stream.avail_in, 256 * 1024 );
+ if( i_read <= 0 ) return i_read;
+ p_sys->inflate.stream.next_in = p_sys->inflate.p_buffer;
+ p_sys->inflate.stream.avail_in = i_read;
+ }
+
+ p_sys->inflate.stream.avail_out = i_len;
+ p_sys->inflate.stream.next_out = p_buffer;
+
+ i_ret = inflate( &p_sys->inflate.stream, Z_SYNC_FLUSH );
+ msg_Warn( p_access, "inflate return value: %d, %s", i_ret, p_sys->inflate.stream.msg );
+
+ return i_len - p_sys->inflate.stream.avail_out;
+ }
+ else
+ {
+ return Read( p_access, p_buffer, i_len );
+ }
+}
+#endif
+
/*****************************************************************************
* Seek: close and re-open a connection at the right place
*****************************************************************************/
vlc_bool_t *pb_bool;
int *pi_int;
int64_t *pi_64;
- vlc_meta_t **pp_meta;
+ vlc_meta_t *p_meta;
switch( i_query )
{
break;
case ACCESS_GET_META:
- pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
- *pp_meta = vlc_meta_New();
- msg_Dbg( p_access, "GET META %s %s %s",
- p_sys->psz_icy_name, p_sys->psz_icy_genre, p_sys->psz_icy_title );
+ p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
+
if( p_sys->psz_icy_name )
- vlc_meta_Add( *pp_meta, VLC_META_TITLE,
- 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_Add( *pp_meta, VLC_META_GENRE,
- 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_Add( *pp_meta, VLC_META_NOW_PLAYING,
- 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:
vlc_url_t srv = p_sys->b_proxy ? p_sys->proxy : p_sys->url;
/* Clean info */
- if( p_sys->psz_location ) free( p_sys->psz_location );
- if( p_sys->psz_mime ) free( p_sys->psz_mime );
- if( p_sys->psz_pragma ) free( p_sys->psz_pragma );
+ free( p_sys->psz_location );
+ free( p_sys->psz_mime );
+ free( p_sys->psz_pragma );
- if( p_sys->psz_icy_genre ) free( p_sys->psz_icy_genre );
- if( p_sys->psz_icy_name ) free( p_sys->psz_icy_name );
- if( p_sys->psz_icy_title ) free( p_sys->psz_icy_title );
+ free( p_sys->psz_icy_genre );
+ free( p_sys->psz_icy_name );
+ free( p_sys->psz_icy_title );
p_sys->psz_location = NULL;
/* Open connection */
- p_sys->fd = net_OpenTCP( p_access, srv.psz_host, srv.i_port );
- if( p_sys->fd < 0 )
+ p_sys->fd = net_ConnectTCP( p_access, srv.psz_host, srv.i_port );
+ if( p_sys->fd == -1 )
{
msg_Err( p_access, "cannot connect to %s:%d", srv.psz_host, srv.i_port );
- return VLC_EGENERIC;
+ return -1;
}
/* Initialize TLS/SSL session */
{
/* CONNECT is not in HTTP/1.0 */
Disconnect( p_access );
- return VLC_EGENERIC;
+ return -1;
}
net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
{
msg_Err( p_access, "cannot establish HTTP/TLS tunnel" );
Disconnect( p_access );
- return VLC_EGENERIC;
+ return -1;
}
sscanf( psz, "HTTP/%*u.%*u %3u", &i_status );
{
msg_Err( p_access, "HTTP/TLS tunnel through proxy denied" );
Disconnect( p_access );
- return VLC_EGENERIC;
+ return -1;
}
do
{
msg_Err( p_access, "HTTP proxy connection failed" );
Disconnect( p_access );
- return VLC_EGENERIC;
+ return -1;
}
if( *psz == '\0' )
{
msg_Err( p_access, "cannot establish HTTP/TLS session" );
Disconnect( p_access );
- return VLC_EGENERIC;
+ return -1;
}
p_sys->p_vs = &p_sys->p_tls->sock;
}
- return Request( p_access, i_tell );
+ return Request( p_access, i_tell ) ? -2 : 0;
}
}
else
{
- char *psz_path = p_sys->url.psz_path;
+ const char *psz_path = p_sys->url.psz_path;
if( !psz_path || !*psz_path )
{
psz_path = "/";
"Range: bytes="I64Fd"-\r\n", i_tell );
}
+ /* Cookies */
+ if( p_sys->cookies )
+ {
+ int i;
+ for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ )
+ {
+ const char * cookie = vlc_array_item_at_index( p_sys->cookies, i );
+ char * psz_cookie_content = cookie_get_content( cookie );
+ char * psz_cookie_domain = cookie_get_domain( cookie );
+
+ assert( psz_cookie_content );
+
+ /* FIXME: This is clearly not conforming to the rfc */
+ vlc_bool_t is_in_right_domain = (!psz_cookie_domain || strstr( p_sys->url.psz_host, psz_cookie_domain ));
+
+ if( is_in_right_domain )
+ {
+ msg_Dbg( p_access, "Sending Cookie %s", psz_cookie_content );
+ if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Cookie: %s\r\n", psz_cookie_content ) < 0 )
+ msg_Err( p_access, "failed to send Cookie" );
+ }
+ free( psz_cookie_content );
+ free( psz_cookie_domain );
+ }
+ }
+
/* Authentication */
- if( p_sys->url.psz_username && *p_sys->url.psz_username )
+ if( p_sys->url.psz_username || p_sys->url.psz_password )
{
- char *buf;
+ char buf[strlen( p_sys->url.psz_username ?: "" )
+ + strlen( p_sys->url.psz_password ?: "" ) + 2];
char *b64;
- asprintf( &buf, "%s:%s", p_sys->url.psz_username,
- p_sys->url.psz_password ? p_sys->url.psz_password : "" );
-
+ snprintf( buf, sizeof( buf ), "%s:%s", p_sys->url.psz_username ?: "",
+ p_sys->url.psz_password ?: "" );
b64 = vlc_b64_encode( buf );
- free( buf );
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
- "Authorization: Basic %s\r\n", b64 );
- free( b64 );
+ if( b64 != NULL )
+ {
+ net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
+ "Authorization: Basic %s\r\n", b64 );
+ free( b64 );
+ }
}
/* Proxy Authentication */
- if( p_sys->proxy.psz_username && *p_sys->proxy.psz_username )
+ if( p_sys->proxy.psz_username || p_sys->proxy.psz_password )
{
- char *buf;
+ char buf[strlen( p_sys->proxy.psz_username ?: "" )
+ + strlen( p_sys->proxy.psz_password ?: "" )];
char *b64;
- asprintf( &buf, "%s:%s", p_sys->proxy.psz_username,
- p_sys->proxy.psz_password ? p_sys->proxy.psz_password : "" );
-
+ snprintf( buf, sizeof( buf ), "%s:%s", p_sys->proxy.psz_username ?: "",
+ p_sys->proxy.psz_password ?: "" );
b64 = vlc_b64_encode( buf );
- free( buf );
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
- "Proxy-Authorization: Basic %s\r\n", b64 );
- free( b64 );
+ if( b64 != NULL)
+ {
+ net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
+ "Proxy-Authorization: Basic %s\r\n", b64 );
+ free( b64 );
+ }
}
/* ICY meta data request */
net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Icy-MetaData: 1\r\n" );
- if( p_sys->b_continuous && p_sys->i_version == 1 )
+ if( p_sys->b_continuous )
{
net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs,
- "Connection: keep-alive\r\n" );
+ "Connection: Keep-Alive\r\n" );
}
- else
+ else if( p_sys->i_version == 1 )
{
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
+ net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs,
"Connection: Close\r\n");
- p_sys->b_continuous = VLC_FALSE;
}
if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "\r\n" ) < 0 )
{
p_sys->b_seekable = VLC_FALSE;
}
- if( p_sys->i_code != 206 )
+ if( p_sys->i_code != 206 && p_sys->i_code != 401 )
{
p_sys->b_seekable = VLC_FALSE;
}
- if( p_sys->i_code >= 400 )
+ /* Authentication error - We'll have to display the dialog */
+ if( p_sys->i_code == 401 )
+ {
+
+ }
+ /* Other fatal error */
+ else if( p_sys->i_code >= 400 )
{
msg_Err( p_access, "error: %s", psz );
free( psz );
if( p_sys->b_continuous )
{
p_access->info.i_size = -1;
- msg_Dbg( p_access, "this frame size="I64Fd, atoll(p ) );
+ msg_Dbg( p_access, "this frame size=%lld", atoll(p ) );
p_sys->i_remaining = atoll( p );
}
else
}
else if( !strcasecmp( psz, "Location" ) )
{
+ char * psz_new_loc;
+
+ /* This does not follow RFC 2068, but yet if the url is not absolute,
+ * handle it as everyone does. */
+ if( p[0] == '/' )
+ {
+ const char *psz_http_ext = p_sys->b_ssl ? "s" : "" ;
+
+ if( p_sys->url.i_port == ( p_sys->b_ssl ? 443 : 80 ) )
+ {
+ if( asprintf(&psz_new_loc, "http%s://%s%s", psz_http_ext,
+ p_sys->url.psz_host, p) < 0 )
+ goto error;
+ }
+ else
+ {
+ 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 );
+ }
+
if( p_sys->psz_location ) free( p_sys->psz_location );
- p_sys->psz_location = strdup( p );
+ p_sys->psz_location = psz_new_loc;
}
else if( !strcasecmp( psz, "Content-Type" ) )
{
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 = VLC_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" ) )
!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 );
}
free( psz );
net_Close(p_sys->fd);
p_sys->fd = -1;
}
-
+
+}
+
+/*****************************************************************************
+ * 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++;
+ }
+ return NULL;
}
+
+/* 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;
+
+ if( !cookie )
+ return;
+
+ char * cookie_name = cookie_get_name( cookie );
+
+ /* Don't send invalid cookies */
+ if( !cookie_name )
+ return;
+
+ char * cookie_domain = cookie_get_domain( cookie );
+ for( i = 0; i < vlc_array_count( cookies ); i++ )
+ {
+ char * current_cookie = vlc_array_item_at_index( cookies, i );
+ char * current_cookie_name = cookie_get_name( current_cookie );
+ char * current_cookie_domain = cookie_get_domain( current_cookie );
+
+ assert( current_cookie_name );
+
+ vlc_bool_t is_domain_matching = ( cookie_domain && current_cookie_domain &&
+ !strcmp( cookie_domain, current_cookie_domain ) );
+
+ if( is_domain_matching && !strcmp( cookie_name, current_cookie_name ) )
+ {
+ /* Remove previous value for this cookie */
+ free( current_cookie );
+ vlc_array_remove( cookies, i );
+
+ /* Clean */
+ free( 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 );
+}
+