X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fupdate.c;h=fc05e6f76e568f0d66ea07a92aa12d8935b14962;hb=065f76087713cbea23bf197195a4f5229665d654;hp=51d6ecb0f8a4e3c376a673cf1f894ed263e3dc6e;hpb=3e621f3fd9ed1d3e4488b5078c62ec00cc069124;p=vlc diff --git a/src/misc/update.c b/src/misc/update.c index 51d6ecb0f8..fc05e6f76e 100644 --- a/src/misc/update.c +++ b/src/misc/update.c @@ -35,6 +35,9 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#ifdef HAVE_SYS_STAT_H +# include +#endif #include #include @@ -53,6 +56,7 @@ #include #include "update.h" +#include "../libvlc.h" /***************************************************************************** * Misc defines @@ -844,6 +848,16 @@ static uint8_t *hash_sha1_from_file( const char *psz_file, gcry_md_write( hd, p_sig->specific.v4.hashed_data_len, 2 ); size_t i_len = scalar_number( p_sig->specific.v4.hashed_data_len, 2 ); gcry_md_write( hd, p_sig->specific.v4.hashed_data, i_len ); + + gcry_md_putc( hd, 0x04 ); + gcry_md_putc( hd, 0xFF ); + + i_len += 6; /* hashed data + 6 bytes header */ + + gcry_md_putc( hd, (i_len >> 24) & 0xff ); + gcry_md_putc( hd, (i_len >> 16) & 0xff ); + gcry_md_putc( hd, (i_len >> 8) & 0xff ); + gcry_md_putc( hd, (i_len) & 0xff ); } else { /* RFC 4880 only tells about versions 3 and 4 */ @@ -977,9 +991,9 @@ static uint8_t *key_sign_hash( public_key_t *p_pkey ) size_t i_len = strlen((char*)p_pkey->psz_username); - gcry_md_putc( hd, (i_len << 24) & 0xff ); - gcry_md_putc( hd, (i_len << 16) & 0xff ); - gcry_md_putc( hd, (i_len << 8) & 0xff ); + gcry_md_putc( hd, (i_len >> 24) & 0xff ); + gcry_md_putc( hd, (i_len >> 16) & 0xff ); + gcry_md_putc( hd, (i_len >> 8) & 0xff ); gcry_md_putc( hd, (i_len) & 0xff ); gcry_md_write( hd, p_pkey->psz_username, i_len ); @@ -999,14 +1013,14 @@ static uint8_t *key_sign_hash( public_key_t *p_pkey ) i_hashed_data_len += 6; /* hashed data + 6 bytes header */ - gcry_md_putc( hd, (i_hashed_data_len << 24) & 0xff); - gcry_md_putc( hd, (i_hashed_data_len << 16) &0xff ); - gcry_md_putc( hd, (i_hashed_data_len << 8) & 0xff ); + gcry_md_putc( hd, (i_hashed_data_len >> 24) & 0xff ); + gcry_md_putc( hd, (i_hashed_data_len >> 16) & 0xff ); + gcry_md_putc( hd, (i_hashed_data_len >> 8) & 0xff ); gcry_md_putc( hd, (i_hashed_data_len) & 0xff ); gcry_md_final( hd ); - uint8_t *p_tmp = gcry_md_read( hd, GCRY_MD_SHA1); + uint8_t *p_tmp = gcry_md_read( hd, GCRY_MD_SHA1 ); if( !p_tmp || p_tmp[0] != p_pkey->sig.hash_verification[0] || @@ -1068,21 +1082,20 @@ void update_Delete( update_t *p_update ) { assert( p_update ); - vlc_mutex_lock( &p_update->lock ); - if( p_update->p_check ) { assert( !p_update->p_download ); vlc_object_kill( p_update->p_check ); vlc_thread_join( p_update->p_check ); + vlc_object_release( p_update->p_check ); } else if( p_update->p_download ) { vlc_object_kill( p_update->p_download ); vlc_thread_join( p_update->p_download ); + vlc_object_release( p_update->p_download ); } - vlc_mutex_unlock( &p_update->lock ); vlc_mutex_destroy( &p_update->lock ); free( p_update->release.psz_url ); @@ -1309,9 +1322,9 @@ static bool GetUpdateFile( update_t *p_update ) i_len += 6; /* hashed data + 6 bytes header */ - gcry_md_putc( hd, (i_len << 24) & 0xff); - gcry_md_putc( hd, (i_len << 16) &0xff ); - gcry_md_putc( hd, (i_len << 8) & 0xff ); + gcry_md_putc( hd, (i_len >> 24) & 0xff ); + gcry_md_putc( hd, (i_len >> 16) & 0xff ); + gcry_md_putc( hd, (i_len >> 8) & 0xff ); gcry_md_putc( hd, (i_len) & 0xff ); } else @@ -1354,7 +1367,7 @@ error: return false; } -static void update_CheckReal( update_check_thread_t *p_uct ); +static void* update_CheckReal( vlc_object_t *p_this ); /** * Check for updates @@ -1368,8 +1381,9 @@ void update_Check( update_t *p_update, void (*pf_callback)( void*, bool ), void { assert( p_update ); - update_check_thread_t *p_uct = vlc_object_create( p_update->p_libvlc, - sizeof( update_check_thread_t ) ); + update_check_thread_t *p_uct = + vlc_custom_create( p_update->p_libvlc, sizeof( *p_uct ), + VLC_OBJECT_GENERIC, "update check" ); if( !p_uct ) return; p_uct->p_update = p_update; @@ -1378,12 +1392,16 @@ void update_Check( update_t *p_update, void (*pf_callback)( void*, bool ), void p_uct->p_data = p_data; vlc_thread_create( p_uct, "check for update", update_CheckReal, - VLC_THREAD_PRIORITY_LOW, false ); + VLC_THREAD_PRIORITY_LOW ); } -void update_CheckReal( update_check_thread_t *p_uct ) +void* update_CheckReal( vlc_object_t* p_this ) { + update_check_thread_t *p_uct = (update_check_thread_t *)p_this; bool b_ret; + int canc; + + canc = vlc_savecancel (); vlc_mutex_lock( &p_uct->p_update->lock ); EmptyRelease( p_uct->p_update ); @@ -1393,9 +1411,8 @@ void update_CheckReal( update_check_thread_t *p_uct ) if( p_uct->pf_callback ) (p_uct->pf_callback)( p_uct->p_data, b_ret ); - p_uct->p_update->p_check = NULL; - - vlc_object_release( p_uct ); + vlc_restorecancel (canc); + return NULL; } /** @@ -1404,14 +1421,32 @@ void update_CheckReal( update_check_thread_t *p_uct ) * \param p_update structure * \return true if we have to upgrade to the given version to be up to date */ +static bool is_strictly_greater( int * a, int * b, int n) +{ + if( n <= 0 ) return false; + if(a[0] > b[0] ) return true; + if(a[0] == b[0] ) return is_strictly_greater( a+1, b+1, n-1 ); + /* a[0] < b[0] */ return false; +} + bool update_NeedUpgrade( update_t *p_update ) { assert( p_update ); - return p_update->release.i_major < *PACKAGE_VERSION_MAJOR - '0' || - p_update->release.i_minor < *PACKAGE_VERSION_MINOR - '0' || - p_update->release.i_revision < *PACKAGE_VERSION_REVISION - '0' || - p_update->release.extra < *PACKAGE_VERSION_EXTRA; + int current_version[] = { + *PACKAGE_VERSION_MAJOR - '0', + *PACKAGE_VERSION_MINOR - '0', + *PACKAGE_VERSION_REVISION - '0', + *PACKAGE_VERSION_EXTRA + }; + int latest_version[] = { + p_update->release.i_major, + p_update->release.i_minor, + p_update->release.i_revision, + p_update->release.extra + }; + + return is_strictly_greater( latest_version, current_version, 4 ); } /** @@ -1425,46 +1460,58 @@ static char *size_str( long int l_size ) char *psz_tmp = NULL; int i_retval = 0; if( l_size >> 30 ) - i_retval = asprintf( &psz_tmp, "%.1f GB", (float)l_size/(1<<30) ); + i_retval = asprintf( &psz_tmp, _("%.1f GB"), (float)l_size/(1<<30) ); else if( l_size >> 20 ) - i_retval = asprintf( &psz_tmp, "%.1f MB", (float)l_size/(1<<20) ); + i_retval = asprintf( &psz_tmp, _("%.1f MB"), (float)l_size/(1<<20) ); else if( l_size >> 10 ) - i_retval = asprintf( &psz_tmp, "%.1f kB", (float)l_size/(1<<10) ); + i_retval = asprintf( &psz_tmp, _("%.1f kB"), (float)l_size/(1<<10) ); else - i_retval = asprintf( &psz_tmp, "%ld B", l_size ); + i_retval = asprintf( &psz_tmp, _("%ld B"), l_size ); return i_retval == -1 ? NULL : psz_tmp; } -static void update_DownloadReal( update_download_thread_t *p_udt ); +void update_WaitDownload( update_t *p_update ) +{ + if(p_update->p_download) + vlc_thread_join( p_update->p_download ); + vlc_object_release( p_update->p_download ); + p_update->p_download = NULL; +} + +static void* update_DownloadReal( vlc_object_t *p_this ); /** * Download the file given in the update_t * * \param p_update structure - * \param dir to store the download file + * \param destination to store the download file + * This can be an existing dir, a (non)existing target fullpath filename or + * NULL for the current working dir. * \return nothing */ -void update_Download( update_t *p_update, const char *psz_destdir ) +void update_Download( update_t *p_update, const char *destination ) { assert( p_update ); - update_download_thread_t *p_udt = vlc_object_create( p_update->p_libvlc, - sizeof( update_download_thread_t ) ); + update_download_thread_t *p_udt = + vlc_custom_create( p_update->p_libvlc, sizeof( *p_udt ), + VLC_OBJECT_GENERIC, "update download" ); if( !p_udt ) return; p_udt->p_update = p_update; p_update->p_download = p_udt; - p_udt->psz_destdir = psz_destdir ? strdup( psz_destdir ) : NULL; + p_udt->psz_destination = destination ? strdup( destination ) : NULL; vlc_thread_create( p_udt, "download update", update_DownloadReal, - VLC_THREAD_PRIORITY_LOW, false ); + VLC_THREAD_PRIORITY_LOW ); } -static void update_DownloadReal( update_download_thread_t *p_udt ) +static void* update_DownloadReal( vlc_object_t *p_this ) { - int i_progress = 0; + update_download_thread_t *p_udt = (update_download_thread_t *)p_this; + interaction_dialog_t *p_progress = 0; long int l_size; long int l_downloaded = 0; float f_progress; @@ -1475,12 +1522,17 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) char *psz_tmpdestfile = NULL; FILE *p_file = NULL; + struct stat p_stat; stream_t *p_stream = NULL; void* p_buffer = NULL; int i_read; + int canc; update_t *p_update = p_udt->p_update; - char *psz_destdir = p_udt->psz_destdir; + char *psz_destination = p_udt->psz_destination; + + msg_Dbg( p_udt, "Opening Stream '%s'", p_update->release.psz_url ); + canc = vlc_savecancel (); /* Open the stream */ p_stream = stream_UrlNew( p_udt, p_update->release.psz_url ); @@ -1497,37 +1549,55 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) psz_tmpdestfile = strrchr( p_update->release.psz_url, '/' ); if( !psz_tmpdestfile ) { - msg_Err( p_udt, "The URL %s is false formated", p_update->release.psz_url ); + msg_Err( p_udt, "The URL %s is badly formated", + p_update->release.psz_url ); goto end; } psz_tmpdestfile++; - if( asprintf( &psz_destfile, "%s%s", psz_destdir, psz_tmpdestfile ) == -1 ) - goto end; + + if( utf8_stat( psz_destination, &p_stat) == 0 && (p_stat.st_mode & S_IFDIR) ) + { + if( asprintf( &psz_destfile, "%s%c%s", psz_destination, DIR_SEP_CHAR, psz_tmpdestfile ) == -1 ) + goto end; + } + else if( psz_destination ) + psz_destfile = strdup( psz_destination ); + else + psz_destfile = strdup( psz_tmpdestfile ); p_file = utf8_fopen( psz_destfile, "w" ); if( !p_file ) { msg_Err( p_udt, "Failed to open %s for writing", psz_destfile ); + intf_UserFatal( p_udt, true, _("Saving file failed"), + _("Failed to open \"%s\" for writing"), + psz_destfile ); goto end; } /* Create a buffer and fill it with the downloaded file */ p_buffer = (void *)malloc( 1 << 10 ); if( !p_buffer ) + { + msg_Err( p_udt, "Can't malloc (1 << 10) bytes! download cancelled." ); goto end; + } + + msg_Dbg( p_udt, "Downloading Stream '%s'", p_update->release.psz_url ); psz_size = size_str( l_size ); - if( asprintf( &psz_status, "%s\nDownloading... O.O/%s %.1f%% done", - p_update->release.psz_url, psz_size, 0.0 ) != -1 ) + if( asprintf( &psz_status, _("%s\nDownloading... %s/%s %.1f%% done"), + p_update->release.psz_url, "0.0", psz_size, 0.0 ) != -1 ) { - i_progress = intf_UserProgress( p_udt, "Downloading ...", psz_status, 0.0, 0 ); + p_progress = intf_UserProgress( p_udt, _( "Downloading ..."), + psz_status, 0.0, 0 ); free( psz_status ); } vlc_object_lock( p_udt ); while( vlc_object_alive( p_udt ) && ( i_read = stream_Read( p_stream, p_buffer, 1 << 10 ) ) && - !intf_ProgressIsCancelled( p_udt, i_progress ) ) + !intf_ProgressIsCancelled( p_progress ) ) { vlc_object_unlock( p_udt ); if( fwrite( p_buffer, i_read, 1, p_file ) < 1 ) @@ -1540,11 +1610,11 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) psz_downloaded = size_str( l_downloaded ); f_progress = 100.0*(float)l_downloaded/(float)l_size; - if( asprintf( &psz_status, "%s\nDonwloading... %s/%s %.1f%% done", + if( asprintf( &psz_status, _( "%s\nDownloading... %s/%s %.1f%% done" ), p_update->release.psz_url, psz_downloaded, psz_size, f_progress ) != -1 ) { - intf_ProgressUpdate( p_udt, i_progress, psz_status, f_progress, 0 ); + intf_ProgressUpdate( p_progress, psz_status, f_progress, 0 ); free( psz_status ); } free( psz_downloaded ); @@ -1556,13 +1626,14 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) p_file = NULL; if( vlc_object_alive( p_udt ) && - !intf_ProgressIsCancelled( p_udt, i_progress ) ) + !intf_ProgressIsCancelled( p_progress ) ) { vlc_object_unlock( p_udt ); - if( asprintf( &psz_status, "%s\nDone %s (100.0%%)", + if( asprintf( &psz_status, _("%s\nDone %s (100.0%%)"), p_update->release.psz_url, psz_size ) != -1 ) { - intf_ProgressUpdate( p_udt, i_progress, psz_status, 100.0, 0 ); + intf_ProgressUpdate( p_progress, psz_status, 100.0, 0 ); + p_progress = NULL free( psz_status ); } } @@ -1579,9 +1650,9 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) { utf8_unlink( psz_destfile ); - intf_UserFatal( p_udt, true, _("File can not be verified"), + intf_UserFatal( p_udt, true, _("File could not be verified"), _("It was not possible to download a cryptographic signature for " - "downloaded file \"%s\", and so VLC deleted it."), + "the downloaded file \"%s\". Thus, it was deleted."), psz_destfile ); msg_Err( p_udt, "Couldn't download signature of downloaded file" ); goto end; @@ -1592,9 +1663,9 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) utf8_unlink( psz_destfile ); msg_Err( p_udt, "Invalid signature issuer" ); intf_UserFatal( p_udt, true, _("Invalid signature"), - _("The cryptographic signature for downloaded file \"%s\" was " - "invalid and couldn't be used to securely verify it, and so " - "VLC deleted it."), + _("The cryptographic signature for the downloaded file \"%s\" was " + "invalid and could not be used to securely verify it. Thus, the " + "file was deleted."), psz_destfile ); goto end; } @@ -1604,9 +1675,9 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) utf8_unlink( psz_destfile ); msg_Err( p_udt, "Invalid signature type" ); intf_UserFatal( p_udt, true, _("Invalid signature"), - _("The cryptographic signature for downloaded file \"%s\" was " - "invalid and couldn't be used to securely verify it, and so " - "VLC deleted it."), + _("The cryptographic signature for the downloaded file \"%s\" was " + "invalid and could not be used to securely verify it. Thus, the " + "file was deleted."), psz_destfile ); goto end; } @@ -1617,8 +1688,8 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) msg_Err( p_udt, "Unable to hash %s", psz_destfile ); utf8_unlink( psz_destfile ); intf_UserFatal( p_udt, true, _("File not verifiable"), - _("It was not possible to securely verify downloaded file \"%s\", " - "and so VLC deleted it."), + _("It was not possible to securely verify the downloaded file" + " \"%s\". Thus, it was deleted."), psz_destfile ); goto end; @@ -1629,7 +1700,7 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) { utf8_unlink( psz_destfile ); intf_UserFatal( p_udt, true, _("File corrupted"), - _("Downloaded file \"%s\" was corrupted, and so VLC deleted it."), + _("Downloaded file \"%s\" was corrupted. Thus, it was deleted."), psz_destfile ); msg_Err( p_udt, "Bad SHA1 hash for %s", psz_destfile ); free( p_hash ); @@ -1641,7 +1712,7 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) { utf8_unlink( psz_destfile ); intf_UserFatal( p_udt, true, _("File corrupted"), - _("Downloaded file \"%s\" was corrupted, and so VLC deleted it."), + _("Downloaded file \"%s\" was corrupted. Thus, it was deleted."), psz_destfile ); msg_Err( p_udt, "BAD SIGNATURE for %s", psz_destfile ); free( p_hash ); @@ -1652,18 +1723,24 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) free( p_hash ); end: + if( p_progress ) + { + intf_ProgressUpdate( p_progress, _("Cancelled"), 100.0, 0 ); + } if( p_stream ) stream_Delete( p_stream ); if( p_file ) fclose( p_file ); - free( psz_destdir ); free( psz_destfile ); free( p_buffer ); free( psz_size ); + free( p_udt->psz_destination ); p_udt->p_update->p_download = NULL; vlc_object_release( p_udt ); + vlc_restorecancel( canc ); + return NULL; } update_release_t *update_GetRelease( update_t *p_update ) @@ -1695,6 +1772,11 @@ bool update_NeedUpgrade( update_t *p_update ) return false; } +void update_WaitDownload( update_t *p_update ) +{ + (void)p_update; +} + void update_Download( update_t *p_update, const char *psz_destdir ) { (void)p_update; (void)psz_destdir;