(#814) require a valid announce URL when creating torrents

gtk/makemeta-ui.c

@@ -92,12 +92,12 @@ refresh_cb ( gpointer user_data )
     {
         if( ui->builder->failed )
         {
-            const char * reason = ui->builder->abortFlag
-                ? _("Torrent creation cancelled")
-                : _("Torrent creation failed");
-
+            char * reason = ui->builder->abortFlag
+                ? g_strdup( _( "Torrent creation cancelled" ) )
+                : g_strdup_printf( _( "Torrent creation failed: %s" ), ui->builder->error );
             gtk_progress_bar_set_text( p, reason );
             gtk_progress_bar_set_fraction( p, 0 );
+            g_free( reason );
         }
         else
         {

libtransmission/makemeta.c

@@ -205,7 +205,8 @@ getHashInfo ( tr_metainfo_builder * b )
     totalRemain = b->totalSize;
     fp = fopen( b->files[fileIndex].filename, "rb" );
     if( !fp ) {
-        tr_err( _( "Couldn't open \"%s\": %s" ), b->files[fileIndex].filename, tr_strerror( errno ) );
+        snprintf( b->error, sizeof( b->error ), _( "Couldn't open \"%s\": %s" ), b->files[fileIndex].filename, tr_strerror( errno ) );
+        tr_err( "%s", b->error );
         tr_free( ret );
         b->failed = 1;
         return NULL;
@@ -234,7 +235,10 @@ getHashInfo ( tr_metainfo_builder * b )
                 if( ++fileIndex < b->fileCount ) {
                     fp = fopen( b->files[fileIndex].filename, "rb" );
                     if( !fp ) {
-                        tr_err( _( "Couldn't open \"%s\": %s" ), b->files[fileIndex].filename, tr_strerror( errno ) );
+                        snprintf( b->error, sizeof( b->error ),
+                                  _( "Couldn't open \"%s\": %s" ),
+                                  b->files[fileIndex].filename, tr_strerror( errno ) ); 
+                        tr_err( "%s", b->error );
                         tr_free( ret );
                         b->failed = 1;
                         return NULL;
@@ -249,6 +253,7 @@ getHashInfo ( tr_metainfo_builder * b )
         walk += SHA_DIGEST_LENGTH;
 
         if( b->abortFlag ) {
+            snprintf( b->error, sizeof( b->error ), _( "Torrent creation cancelled" ) );
             b->failed = 1;
             break;
         }
@@ -366,7 +371,8 @@ makeInfoDict ( tr_benc              * dict,
     tr_bencInitInt( val, builder->isPrivate ? 1 : 0 );
 }
 
-static void tr_realMakeMetaInfo ( tr_metainfo_builder * builder )
+static void
+tr_realMakeMetaInfo ( tr_metainfo_builder * builder )
 {
     int n = 5;
     tr_benc top, *val;
@@ -377,25 +383,34 @@ static void tr_realMakeMetaInfo ( tr_metainfo_builder * builder )
 
     val = tr_bencDictAdd( &top, "announce" );
     tr_bencInitStrDup( val, builder->announce );
-    
-    if( builder->comment && *builder->comment ) {
-        val = tr_bencDictAdd( &top, "comment" );
-        tr_bencInitStrDup( val, builder->comment );
+    if( tr_httpParseUrl( builder->announce, -1, NULL, NULL, NULL ) )
+    {
+        snprintf( builder->error, sizeof( builder->error ), _( "Invalid announce URL" ) );
+        tr_err( "%s", builder->error );
+        builder->failed = 1;
     }
+    
+    if( !builder->failed && !builder->abortFlag )
+    {
+        if( builder->comment && *builder->comment ) {
+            val = tr_bencDictAdd( &top, "comment" );
+            tr_bencInitStrDup( val, builder->comment );
+        }
 
-    val = tr_bencDictAdd( &top, "created by" );
-    tr_bencInitStrDup( val, TR_NAME "/" LONG_VERSION_STRING );
+        val = tr_bencDictAdd( &top, "created by" );
+        tr_bencInitStrDup( val, TR_NAME "/" LONG_VERSION_STRING );
 
-    val = tr_bencDictAdd( &top, "creation date" );
-    tr_bencInitInt( val, time(0) );
+        val = tr_bencDictAdd( &top, "creation date" );
+        tr_bencInitInt( val, time(0) );
 
-    val = tr_bencDictAdd( &top, "encoding" );
-    tr_bencInitStrDup( val, "UTF-8" );
+        val = tr_bencDictAdd( &top, "encoding" );
+        tr_bencInitStrDup( val, "UTF-8" );
 
-    val = tr_bencDictAdd( &top, "info" );
-    tr_bencInit( val, TYPE_DICT );
-    tr_bencDictReserve( val, 666 );
-    makeInfoDict( val, builder );
+        val = tr_bencDictAdd( &top, "info" );
+        tr_bencInit( val, TYPE_DICT );
+        tr_bencDictReserve( val, 666 );
+        makeInfoDict( val, builder );
+    }
 
     /* save the file */
     if ( !builder->failed && !builder->abortFlag ) {
@@ -403,12 +418,17 @@ static void tr_realMakeMetaInfo ( tr_metainfo_builder * builder )
         char * pch = tr_bencSave( &top, &n );
         FILE * fp = fopen( builder->outputFile, "wb+" );
         nmemb = n;
-        if( fp == NULL )
+        if( fp == NULL ) {
+            snprintf( builder->error, sizeof( builder->error ), _( "Couldn't open \"%s\": %s" ), builder->outputFile, tr_strerror( errno ) );
+            tr_err( "%s", builder->error );
             builder->failed = 1;
-        else if( fwrite( pch, 1, nmemb, fp ) != nmemb )
+        } else if( fwrite( pch, 1, nmemb, fp ) != nmemb ) {
+            snprintf( builder->error, sizeof( builder->error ), _( "Couldn't save file \"%s\": %s" ), builder->outputFile, tr_strerror( errno ) );
+            tr_err( "%s", builder->error ); 
             builder->failed = 1;
+            fclose( fp );
+        }
         tr_free( pch );
-        fclose( fp );
     }
 
     /* cleanup */

libtransmission/makemeta.h

@@ -58,6 +58,7 @@ typedef struct tr_metainfo_builder
     int abortFlag;
     int isDone;
     int failed; /* only meaningful if isDone is set */
+    char error[1024]; /* only meaningful if failed is set */
 
     /**
     ***  This is an implementation detail.

libtransmission/metainfo.c

@@ -32,8 +32,6 @@
 #include <sys/stat.h>
 #include <unistd.h> /* unlink, stat */
 
-#include <miniupnp/miniwget.h> /* parseURL */
-
 #include "transmission.h"
 #include "bencode.h"
 #include "crypto.h" /* tr_sha1 */
@@ -42,30 +40,6 @@
 #include "trcompat.h" /* strlcpy */
 #include "utils.h"
 
-
-static int
-tr_httpParseUrl( const char * url_in, int len,
-                 char ** setme_host, int * setme_port, char ** setme_path )
-{
-    char * url = tr_strndup( url_in, len );
-    char * path;
-    char host[4096+1];
-    unsigned short port;
-    int success;
-
-    success = parseURL( url, host, &port, &path );
-
-    if( success ) {
-        *setme_host = tr_strdup( host );
-        *setme_port = port;
-        *setme_path = tr_strdup( path );
-    }
-
-    tr_free( url );
-
-    return !success;
-}
-
 /***********************************************************************
  * Local prototypes
  **********************************************************************/

libtransmission/utils.c

@@ -43,6 +43,8 @@
     #include <kernel/OS.h>
 #endif
 
+#include <miniupnp/miniwget.h> /* parseURL */
+
 #include "transmission.h"
 #include "trcompat.h"
 #include "utils.h"
@@ -973,3 +975,33 @@ tr_sha1_to_hex( char * out, const uint8_t * sha1 )
     }
     *out = '\0';
 }
+
+/***
+****
+***/
+
+int
+tr_httpParseUrl( const char * url_in, int len,
+                 char ** setme_host,
+                 int * setme_port,
+                 char ** setme_path )
+{
+    char * url = tr_strndup( url_in, len );
+    char * path;
+    char host[4096+1];
+    unsigned short port;
+    int success;
+
+    success = parseURL( url, host, &port, &path );
+
+    if( success ) {
+        if( setme_host ) *setme_host = tr_strdup( host );
+        if( setme_port ) *setme_port = port;
+        if( setme_path ) *setme_path = tr_strdup( path );
+    }
+
+    tr_free( url );
+
+    return !success;
+}
+

libtransmission/utils.h

@@ -162,6 +162,14 @@ int tr_compareUint32( uint32_t a, uint32_t b );
 
 void tr_sha1_to_hex( char * out, const uint8_t * sha1 );
 
+
+int tr_httpParseUrl( const char * url,
+                     int          url_len,
+                     char     ** setme_host,
+                     int       * setme_port,
+                     char     ** setme_path );
+
+
 /***
 ****
 ***/