Changeset 10239

Timestamp:

Feb 20, 2010, 3:57:05 PM (13 years ago)

Author:

charles

Message:

(trunk) #2938 "crash when adding a torrent by URL from an ftp source over RPC" -- fixed in trunk for 1.91

Location:

trunk/libtransmission

Files:

• announcer.c (modified) (1 diff)
• makemeta.c (modified) (1 diff)
• metainfo.c (modified) (2 diffs)
• torrent.c (modified) (1 diff)
• utils-test.c (modified) (2 diffs)
• utils.c (modified) (5 diffs)
• utils.h (modified) (1 diff)
• web.c (modified) (2 diffs)

trunk/libtransmission/announcer.c

@@ -134 +134 @@
     char * host = NULL;
     char * ret;
-    tr_httpParseURL( url, strlen( url ), &host, &port, NULL );
+    tr_urlParse( url, strlen( url ), NULL, &host, &port, NULL );
     ret = tr_strdup_printf( "%s:%d", ( host ? host : "invalid" ), port );
     tr_free( host );

trunk/libtransmission/makemeta.c

@@ -381 +381 @@
     /* allow an empty set, but if URLs *are* listed, verify them. #814, #971 */
     for( i = 0; i < builder->trackerCount && !builder->result; ++i ) {
-        if( !tr_httpIsValidURL( builder->trackers[i].announce ) ) {
+        if( !tr_urlIsValidTracker( builder->trackers[i].announce ) ) {
             tr_strlcpy( builder->errfile, builder->trackers[i].announce,
                        sizeof( builder->errfile ) );

trunk/libtransmission/metainfo.c

@@ -289 +289 @@
                 {
                     char * url = tr_strstrip( tr_strdup( str ) );
-                    if( tr_httpIsValidURL( url ) )
+                    if( tr_urlIsValidTracker( url ) )
                     {
                         tr_tracker_info * t = trackers + trackerCount;
@@ -321 +321 @@
     {
         char * url = tr_strstrip( tr_strdup( str ) );
-        if( tr_httpIsValidURL( url ) )
+        if( tr_urlIsValidTracker( url ) )
         {
             trackers = tr_new0( tr_tracker_info, 1 );

trunk/libtransmission/torrent.c

@@ -2087 +2087 @@
     /* look for bad URLs */
     for( i=0; ok && i<trackerCount; ++i )
-        if( !tr_httpIsValidURL( trackers[i].announce ) )
+        if( !tr_urlIsValidTracker( trackers[i].announce ) )
             ok = FALSE;
 

trunk/libtransmission/utils-test.c

@@ -325 +325 @@
 {
     int port;
+    char * scheme;
     char * host;
     char * path;
@@ -331 +332 @@
 
     url = "http://www.some-tracker.org/some/path";
-    check( !tr_httpParseURL( url, -1, &host, &port, &path ) )
+    check( !tr_urlParse( url, -1, &scheme, &host, &port, &path ) )
+    check( !strcmp( scheme, "http" ) )
     check( !strcmp( host, "www.some-tracker.org" ) )
     check( !strcmp( path, "/some/path" ) )
     check( port == 80 )
+    tr_free( scheme );
     tr_free( path );
     tr_free( host );
 
     url = "http://www.some-tracker.org:80/some/path";
-    check( !tr_httpParseURL( url, -1, &host, &port, &path ) )
+    check( !tr_urlParse( url, -1, &scheme, &host, &port, &path ) )
+    check( !strcmp( scheme, "http" ) )
     check( !strcmp( host, "www.some-tracker.org" ) )
     check( !strcmp( path, "/some/path" ) )
     check( port == 80 )
+    tr_free( scheme );
     tr_free( path );
     tr_free( host );

trunk/libtransmission/utils.c

@@ -914 +914 @@
 ***/
 
-tr_bool
-tr_httpIsValidURL( const char * url )
+static tr_bool
+isValidURLChars( const char * url )
 {
     const char * c;
@@ -934 +934 @@
             return FALSE;
 
-    return tr_httpParseURL( url, -1, NULL, NULL, NULL ) == 0;
-}
-
-tr_bool tr_addressIsIP( const char * address )
+    return TRUE;
+}
+
+/** @brief return TRUE if the url is a http or https url that Transmission understands */
+tr_bool
+tr_urlIsValidTracker( const char * url )
+{
+    tr_bool valid;
+    char * scheme = NULL;
+
+    valid = isValidURLChars( url ) 
+         && !tr_urlParse( url, -1, &scheme, NULL, NULL, NULL )
+         && ( scheme != NULL )
+         && ( !strcmp(scheme,"http") || !strcmp(scheme,"https") );
+
+    tr_free( scheme );
+    return valid;
+}
+
+/** @brief return TRUE if the url is a http or https or ftp or sftp url that Transmission understands */
+tr_bool
+tr_urlIsValid( const char * url )
+{
+    tr_bool valid;
+    char * scheme = NULL;
+
+    valid = isValidURLChars( url ) 
+         && !tr_urlParse( url, -1, &scheme, NULL, NULL, NULL )
+         && ( scheme != NULL )
+         && ( !strcmp(scheme,"http") || !strcmp(scheme,"https") || !strcmp(scheme,"ftp") || !strcmp(scheme,"sftp") );
+
+    tr_free( scheme );
+    return valid;
+}
+
+tr_bool
+tr_addressIsIP( const char * address )
 {
     tr_address tempAddr;
@@ -944 +977 @@
 
 int
-tr_httpParseURL( const char * url_in,
-                 int          len,
-                 char **      setme_host,
-                 int *        setme_port,
-                 char **      setme_path )
+tr_urlParse( const char * url_in,
+             int          len,
+             char **      setme_protocol,
+             char **      setme_host,
+             int *        setme_port,
+             char **      setme_path )
 {
     int          err;
@@ -985 +1019 @@
     }
 
-    err = !host || !path || !protocol
-          || ( strcmp( protocol, "http" ) && strcmp( protocol, "https" ) );
+    err = !host || !path || !protocol;
 
     if( !err && !port )
     {
+        if( !strcmp( protocol, "ftp" ) ) port = 21;
+        if( !strcmp( protocol, "sftp" ) ) port = 22;
         if( !strcmp( protocol, "http" ) ) port = 80;
         if( !strcmp( protocol, "https" ) ) port = 443;
@@ -996 +1031 @@
     if( !err )
     {
+        if( setme_protocol ) *setme_protocol = tr_strdup( protocol );
+
         if( setme_host ){ ( (char*)host )[-3] = ':'; *setme_host =
                               tr_strdup( host ); }

trunk/libtransmission/utils.h

@@ -437 +437 @@
 void tr_hex_to_sha1( uint8_t * out, const char * hex ) TR_GNUC_NONNULL(1,2);
 
-
-/** @brief return TRUE if the url is a http, https, or ftp url that Transmission understands */
-tr_bool tr_httpIsValidURL( const char * url ) TR_GNUC_NONNULL(1);
-
 /** @brief convenience function to determine if an address is an IP address (IPv4 or IPv6) */
 tr_bool tr_addressIsIP( const char * address );
 
+/** @brief return TRUE if the url is a http or https url that Transmission understands */
+tr_bool tr_urlIsValidTracker( const char * url ) TR_GNUC_NONNULL(1);
+
+/** @brief return TRUE if the url is a [ http, https, ftp, ftps ] url that Transmission understands */
+tr_bool tr_urlIsValid( const char * url ) TR_GNUC_NONNULL(1);
+
 /** @brief parse a URL into its component parts
     @return zero on success or an error number if an error occurred */
-int  tr_httpParseURL( const char * url,
-                      int          url_len,
-                      char      ** setme_host,
-                      int        * setme_port,
-                      char      ** setme_path ) TR_GNUC_NONNULL(1);
+int  tr_urlParse( const char * url,
+                  int          url_len,
+                  char      ** setme_scheme,
+                  char      ** setme_host,
+                  int        * setme_port,
+                  char      ** setme_path ) TR_GNUC_NONNULL(1);
 
 

trunk/libtransmission/web.c

@@ -208 +208 @@
 dns_cache_set_fail( struct tr_web_task * task, const char * host )
 {
-    if( task->session->web != NULL )
+    if( ( task->session->web != NULL ) && ( host != NULL ) )
     {
         struct dns_cache_item * item;
@@ -464 +464 @@
     assert( task->resolved_host == NULL );
 
-    if( !tr_httpParseURL( task->url, -1, &host, &port, NULL ) )
+    if( !tr_urlParse( task->url, -1, NULL, &host, &port, NULL ) )
     {
         task->port = port;