X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fhttp.c;h=398c38b0d7ef16075571a3af06564913251cb49a;hb=2e6b98b531998094cb0138cf77dadcf9d3a4c66f;hp=f052d246ee3a87b842ca3146efc602bf93754167;hpb=d58211076fb937d2374ef4191ec1252004d86d1f;p=vlc diff --git a/modules/access/http.c b/modules/access/http.c index f052d246ee..398c38b0d7 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -123,9 +123,10 @@ vlc_module_begin () add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ) change_safe() - add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT, - AGENT_LONGTEXT, true ) + add_string( "http-user-agent", PACKAGE_NAME"/"PACKAGE_VERSION, NULL, + AGENT_TEXT, AGENT_LONGTEXT, true ) change_safe() + change_need_restart() add_bool( "http-reconnect", false, NULL, RECONNECT_TEXT, RECONNECT_LONGTEXT, true ) add_bool( "http-continuous", false, NULL, CONTINUOUS_TEXT, @@ -141,11 +142,8 @@ vlc_module_begin () #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 () @@ -247,7 +245,7 @@ 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 ); + var_InheritInteger( p_access, "http-max-redirect" ), NULL ); } /** @@ -269,7 +267,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access, 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 */ @@ -320,7 +318,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access, 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 ); @@ -344,11 +342,18 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access, p_sys->url.i_port = 80; } - /* Do user agent */ - p_sys->psz_user_agent = var_CreateGetString( p_access, "http-user-agent" ); + /* Determine the HTTP user agent */ + /* See RFC2616 §2.2 token definition and §3.8 user-agent header */ + p_sys->psz_user_agent = var_InheritString( p_access, "http-user-agent" ); + for( char *p = p_sys->psz_user_agent; *p; p++ ) + { + uint8_t c = *p; + if( c < 32 || strchr( "()<>@,;:\\\"[]?={}", c ) ) + *p = '_'; /* remove potentially harmful characters */ + } /* Check proxy */ - psz = var_CreateGetNonEmptyString( p_access, "http-proxy" ); + psz = var_InheritString( p_access, "http-proxy" ); if( psz ) { p_sys->b_proxy = true; @@ -363,7 +368,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access, { 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); @@ -391,7 +396,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access, #elif defined( WIN32 ) else { - if( var_CreateGetBool( p_access, "http-use-IE-proxy" ) ) + if( var_InheritBool( p_access, "http-use-IE-proxy" ) ) { /* Try to get the proxy server address from Windows internet settings using registry. */ HKEY h_key; @@ -419,7 +424,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access, { /* 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 + or "ftp=address1:port1;http=address2:port2 ..." depending of the confirguration. */ char *psz_proxy; psz_proxy = strstr( psz_key, "http=" ); @@ -449,7 +454,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access, "in registry." ); } } -#elif HAVE_GETENV +#elif defined( HAVE_GETENV ) else { psz = getenv( "http_proxy" ); @@ -463,7 +468,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access, 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; } @@ -481,8 +486,9 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access, } } - 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, @@ -493,8 +499,8 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access, 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 */ @@ -580,8 +586,8 @@ connect: 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 ); @@ -761,14 +767,16 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) return 0; } - if( p_sys->b_has_size && - i_len + p_access->info.i_pos > p_access->info.i_size ) + if( p_sys->b_has_size ) { - if( ( i_len = p_access->info.i_size - p_access->info.i_pos ) == 0 ) - { - p_access->info.b_eof = true; - return 0; - } + /* Remaining bytes in the file */ + uint64_t remainder = p_access->info.i_size - p_access->info.i_pos; + if( remainder < i_len ) + i_len = remainder; + + /* Remaining bytes in the response */ + if( p_sys->i_remaining < i_len ) + i_len = p_sys->i_remaining; } if( p_sys->b_chunked ) @@ -801,19 +809,14 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) } if( i_len > p_sys->i_chunk ) - { i_len = p_sys->i_chunk; - } - } - else if( p_sys->b_has_size && i_len > p_sys->i_remaining) { - /* Only ask for the remaining length */ - i_len = p_sys->i_remaining; - if(i_len == 0) { - p_access->info.b_eof = true; - return 0; - } } + if( i_len == 0 ) + { + p_access->info.b_eof = true; + return 0; + } if( p_sys->i_icy_meta > 0 && p_access->info.i_pos-p_sys->i_icy_offset > 0 ) { @@ -836,8 +839,6 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) if( i_read > 0 ) { - p_access->info.i_pos += i_read; - if( p_sys->b_chunked ) { p_sys->i_chunk -= i_read; @@ -849,7 +850,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) } } } - else if( i_read <= 0 ) + else { /* * I very much doubt that this will work. @@ -877,18 +878,26 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) 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 ) + if( i_read <= 0 ) + { p_access->info.b_eof = true; - if( i_read < 0 ) - p_sys->b_error = true; + if( i_read < 0 ) + p_sys->b_error = true; + return 0; + } } + assert( i_read >= 0 ); + p_access->info.i_pos += i_read; if( p_sys->b_has_size ) { - assert( i_read <= p_sys->i_remaining ); + 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; } @@ -1065,7 +1074,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) /* */ case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); - *pi_64 = (int64_t)var_GetInteger( p_access, "http-caching" ) * 1000; + *pi_64 = var_GetInteger( p_access, "http-caching" ) * 1000; break; /* */ @@ -1164,7 +1173,7 @@ static int Connect( access_t *p_access, uint64_t i_tell ) return -1; } - net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, + net_Printf( p_access, p_sys->fd, NULL, "CONNECT %s:%d HTTP/1.%d\r\nHost: %s:%d\r\n\r\n", p_sys->url.psz_host, p_sys->url.i_port, p_sys->i_version, @@ -1240,14 +1249,14 @@ static int Request( access_t *p_access, uint64_t i_tell ) { if( p_sys->url.psz_path ) { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, + net_Printf( p_access, p_sys->fd, NULL, "GET http://%s:%d%s HTTP/1.%d\r\n", p_sys->url.psz_host, p_sys->url.i_port, p_sys->url.psz_path, p_sys->i_version ); } else { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, + net_Printf( p_access, p_sys->fd, NULL, "GET http://%s:%d/ HTTP/1.%d\r\n", p_sys->url.psz_host, p_sys->url.i_port, p_sys->i_version ); @@ -1262,27 +1271,29 @@ static int Request( access_t *p_access, uint64_t i_tell ) } if( p_sys->url.i_port != (pvs ? 443 : 80) ) { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + net_Printf( p_access, p_sys->fd, pvs, "GET %s HTTP/1.%d\r\nHost: %s:%d\r\n", psz_path, p_sys->i_version, p_sys->url.psz_host, p_sys->url.i_port ); } else { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + net_Printf( p_access, p_sys->fd, pvs, "GET %s HTTP/1.%d\r\nHost: %s\r\n", psz_path, p_sys->i_version, p_sys->url.psz_host ); } } /* User Agent */ - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "User-Agent: %s\r\n", + net_Printf( p_access, p_sys->fd, pvs, + "User-Agent: %s\r\n", p_sys->psz_user_agent ); /* Offset */ if( p_sys->i_version == 1 && ! p_sys->b_continuous ) { p_sys->b_persist = true; - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + 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 */ @@ -1303,7 +1314,7 @@ static int Request( access_t *p_access, uint64_t i_tell ) if( is_in_right_domain ) { msg_Dbg( p_access, "Sending Cookie %s", psz_cookie_content ); - if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Cookie: %s\r\n", psz_cookie_content ) < 0 ) + if( net_Printf( p_access, p_sys->fd, pvs, "Cookie: %s\r\n", psz_cookie_content ) < 0 ) msg_Err( p_access, "failed to send Cookie" ); } free( psz_cookie_content ); @@ -1320,10 +1331,10 @@ static int Request( access_t *p_access, uint64_t i_tell ) AuthReply( p_access, "Proxy-", &p_sys->proxy, &p_sys->proxy_auth ); /* ICY meta data request */ - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Icy-MetaData: 1\r\n" ); + net_Printf( p_access, p_sys->fd, pvs, "Icy-MetaData: 1\r\n" ); - if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "\r\n" ) < 0 ) + if( net_Printf( p_access, p_sys->fd, pvs, "\r\n" ) < 0 ) { msg_Err( p_access, "failed to send request" ); Disconnect( p_access ); @@ -1426,6 +1437,7 @@ static int Request( access_t *p_access, uint64_t i_tell ) sscanf(p,"bytes %"SCNu64"-%"SCNu64"/%"SCNu64,&i_ntell,&i_nend,&i_nsize); if(i_nend > i_ntell ) { p_access->info.i_pos = i_ntell; + p_sys->i_icy_offset = i_ntell; p_sys->i_remaining = i_nend+1-i_ntell; int64_t i_size = (i_nsize > i_nend) ? i_nsize : (i_nend + 1); if(i_size > p_access->info.i_size) { @@ -1764,7 +1776,7 @@ static void AuthReply( access_t *p_access, const char *psz_prefix, if ( psz_value == NULL ) return; - net_Printf( VLC_OBJECT(p_access), p_sys->fd, p_sys->p_vs, + net_Printf( p_access, p_sys->fd, p_sys->p_vs, "%sAuthorization: %s\r\n", psz_prefix, psz_value ); free( psz_value ); }