Changeset 5f9a5f7ccf3c9e630d4f098ab9aa90dff0dc56d2

Timestamp:

17/06/05 14:43:46 (3 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1119012226 +0000

git-parent:

[d026e61f6d21944e1e064830316f92ab87823ea3]

git-author:

Christophe Massiot <massiot@videolan.org> 1119012226 +0000

Message:

• modules/control/http.c: Added support for .hosts files detailing hosts
  allowed to connect. The format is :
  192.168.0.0/24
  172.16.12.42/32
  
• src/misc/net.c: New function net_CheckIP to check that an IP is in a
  given range.
  
• OTHERS: Changed prototypes to allow for two new arguments for the
  hosts list.
  

Files:

• include/network.h (modified) (1 diff)
• include/vlc_httpd.h (modified) (3 diffs)
• modules/access_output/http.c (modified) (1 diff)
• modules/control/http.c (modified) (4 diffs)
• modules/misc/rtsp.c (modified) (2 diffs)
• modules/stream_out/rtp.c (modified) (3 diffs)
• src/misc/httpd.c (modified) (13 diffs)
• src/misc/net.c (modified) (1 diff)

include/network.h

@@ -314 +314 @@
-#define net_vaPrintf(a,b,c,d,e) __net_vaPrintf(VLC_OBJECT(a),b,c,d,e)
-VLC_EXPORT( int, __net_vaPrintf, ( vlc_object_t *p_this, int fd, v_socket_t *, const char *psz_fmt, va_list args ) );
+
+#define net_CheckIP(a,b,c,d) __net_CheckIP(VLC_OBJECT(a),b,c,d)
+VLC_EXPORT( int, __net_CheckIP, ( vlc_object_t *p_this, char *psz_ip, char **ppsz_hosts, int i_hosts ) );
-
-/* Portable network names/addresses resolution layer */

include/vlc_httpd.h

@@ -120 +120 @@
-
-/* register a new url */
-
-
+, char **ppsz_hosts, int i_hosts
+, char **ppsz_hosts, int i_hosts
-/* register callback on a url */
-VLC_EXPORT( int,            httpd_UrlCatch, ( httpd_url_t *, int i_msg, httpd_callback_t, httpd_callback_sys_t * ) );
@@ -134 +134 @@
-/* High level */
-
-
+char **ppsz_hosts, int i_hosts, 
-VLC_EXPORT( void,           httpd_FileDelete, ( httpd_file_t * ) );
-
@@ -142 +142 @@
-
-
-
+, char **ppsz_hosts, int i_hosts
-VLC_EXPORT( void,             httpd_StreamDelete, ( httpd_stream_t * ) );
-VLC_EXPORT( int,              httpd_StreamHeader, ( httpd_stream_t *, uint8_t *p_data, int i_data ) );

modules/access_output/http.c

@@ -256 +256 @@
-    p_sys->p_httpd_stream =
-        httpd_StreamNew( p_sys->p_httpd_host, psz_file_name, psz_mime,
-
+, NULL, 0
-    if( psz_user ) free( psz_user );
-    if( psz_pwd ) free( psz_pwd );

modules/control/http.c

@@ -523 +523 @@
-    char          *user = NULL;
-    char          *password = NULL;
+    char          **ppsz_hosts = NULL;
+    int           i_hosts = 0;
+
+    int           i;
-
-#ifdef HAVE_SYS_STAT_H
@@ -571 +575 @@
-
-        fclose( file );
+    }
+
+    sprintf( dir, "%s/.hosts", psz_dir );
+    if( ( file = fopen( dir, "r" ) ) != NULL )
+    {
+        char line[1024];
+        int  i_size;
+
+        msg_Dbg( p_intf, "find .hosts in dir=%s", psz_dir );
+
+        while( !feof( file ) )
+        {
+            fgets( line, 1023, file );
+            i_size = strlen(line);
+            if( i_size > 0 && line[0] != '#' )
+            {
+                while( i_size > 0 && ( line[i_size-1] == '\n' ||
+                       line[i_size-1] == '\r' ) )
+                {
+                    i_size--;
+                }
+                if( !i_size ) continue;
+
+                line[i_size] = '\0';
+
+                msg_Dbg( p_intf, "restricted to %s (read=%d)",
+                         line, i_size );
+                TAB_APPEND( i_hosts, ppsz_hosts, strdup( line ) );
+            }
+        }
+
+        fclose( file );
+
+        if( net_CheckIP( p_intf, "0.0.0.0", ppsz_hosts, i_hosts ) < 0 )
+        {
+            msg_Err( p_intf, ".hosts file is invalid in dir=%s", psz_dir );
+        }
-    }
-
@@ -612 +653 @@
-                                       f->name,
-                                       f->b_html ? p_sys->psz_html_type : NULL,
-
+ ppsz_hosts, i_hosts,
-                                       HttpCallback, f );
-
@@ -653 +694 @@
-    {
-        free( password );
+    }
+    for( i = 0; i < i_hosts; i++ )
+    {
+        TAB_REMOVE( i_hosts, ppsz_hosts, ppsz_hosts[0] );
-    }
-

modules/misc/rtsp.c

@@ -277 +277 @@
-    asprintf( &p_media->psz_rtsp_path, "%s%s", p_sys->psz_path, psz_name );
-    p_media->p_rtsp_url =
-
+
+
-
-    if( !p_media->p_rtsp_url )
@@ -453 +454 @@
-
-    p_es->p_rtsp_url =
-
+
+
-
-    if( !p_es->p_rtsp_url )

modules/stream_out/rtp.c

@@ -1033 +1033 @@
-        sprintf( psz_urlc, "%s/trackid=%d", p_sys->psz_rtsp_path, p_sys->i_es );
-        fprintf( stderr, "rtsp: adding %s\n", psz_urlc );
-
+, NULL, 0
-
-        if( id->p_rtsp_url )
@@ -1297 +1297 @@
-                                             url->psz_path ? url->psz_path : "/",
-                                             "application/sdp",
-
+ NULL, 0,
-                                             HttpCallback, (void*)p_sys );
-    }
@@ -1395 +1395 @@
-             url->psz_host,  url->i_port > 0 ? url->i_port : 554, p_sys->psz_rtsp_path );
-
-
+, NULL, 0
-    if( p_sys->p_rtsp_url == 0 )
-    {

src/misc/httpd.c

@@ -238 +238 @@
-    char    *psz_user;
-    char    *psz_password;
+    char    **ppsz_hosts;
+    int     i_hosts;
-
-    struct
@@ -490 +492 @@
-                             char *psz_url, char *psz_mime,
-                             char *psz_user, char *psz_password,
+                             char **ppsz_hosts, int i_hosts,
-                             httpd_file_callback_t pf_fill,
-                             httpd_file_sys_t *p_sys )
@@ -496 +499 @@
-
-    if( ( file->url = httpd_UrlNewUnique( host, psz_url, psz_user,
-
+
+
-    {
-        free( file );
@@ -587 +591 @@
-    httpd_redirect_t *rdir = malloc( sizeof( httpd_redirect_t ) );
-
-
+
+
-    {
-        free( rdir );
@@ -762 +767 @@
-httpd_stream_t *httpd_StreamNew( httpd_host_t *host,
-                                 char *psz_url, char *psz_mime,
-
+
+
-{
-    httpd_stream_t *stream = malloc( sizeof( httpd_stream_t ) );
-
-    if( ( stream->url = httpd_UrlNewUnique( host, psz_url, psz_user,
-
+
+
-    {
-        free( stream );
@@ -1091 +1098 @@
-static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, char *psz_url,
-                                         char *psz_user, char *psz_password,
+                                         char **ppsz_hosts, int i_hosts,
-                                         vlc_bool_t b_check )
-{
@@ -1118 +1126 @@
-    url->psz_user = strdup( psz_user ? psz_user : "" );
-    url->psz_password = strdup( psz_password ? psz_password : "" );
+    url->i_hosts = 0;
+    url->ppsz_hosts = NULL;
+    for( i = 0; i < i_hosts; i++ )
+    {
+        TAB_APPEND( url->i_hosts, url->ppsz_hosts, strdup(ppsz_hosts[i]) );
+    }
-    for( i = 0; i < HTTPD_MSG_MAX; i++ )
-    {
@@ -1131 +1145 @@
-
-httpd_url_t *httpd_UrlNew( httpd_host_t *host, char *psz_url,
-
+
+
-{
-    return httpd_UrlNewPrivate( host, psz_url, psz_user,
-
+ppsz_hosts, i_hosts, 
-}
-
-httpd_url_t *httpd_UrlNewUnique( httpd_host_t *host, char *psz_url,
-
+
+
-{
-    return httpd_UrlNewPrivate( host, psz_url, psz_user,
-
+ppsz_hosts, i_hosts, 
-}
-
@@ -1170 +1186 @@
-    free( url->psz_user );
-    free( url->psz_password );
+    for( i = 0; i < url->i_hosts; i++ )
+    {
+        TAB_REMOVE( url->i_hosts, url->ppsz_hosts, url->ppsz_hosts[0] );
+    }
-
-    for( i = 0; i < host->i_client; i++ )
@@ -2074 +2094 @@
-                {
-                    vlc_bool_t b_auth_failed = VLC_FALSE;
+                    vlc_bool_t b_hosts_failed = VLC_FALSE;
-                    int i;
-
@@ -2085 +2106 @@
-                            if( url->catch[i_msg].cb )
-                            {
+                                if( answer && url->i_hosts )
+                                {
+                                    char *ip = httpd_ClientIP( cl );
+                                    if( ip != NULL )
+                                    {
+                                        if( net_CheckIP( host, ip,
+                                                         url->ppsz_hosts,
+                                                         url->i_hosts ) <= 0 )
+                                        {
+                                            b_hosts_failed = VLC_TRUE;
+                                            free( ip );
+                                            break;
+                                        }
+                                        free( ip );
+                                    }
+                                }
+
-                                if( answer && ( *url->psz_user || *url->psz_password ) )
-                                {
@@ -2143 +2181 @@
-                        p = answer->p_body = malloc( 1000 + strlen(query->psz_url) );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        {
-                            answer->i_status = 401;
@@ -2355 +2409 @@
-                        msg_Dbg( host, "new connection (%s)",
-                                ip != NULL ? ip : "unknown" );
-
+ 
-                            free( ip );
-                    }

src/misc/net.c

@@ -1172 +1172 @@
-    return VLC_SUCCESS;
-}
+
+/*****************************************************************************
+ * __net_CheckIP
+ *****************************************************************************
+ * Check that a given IP is within a set of IP/netmask.
+ *****************************************************************************/
+int __net_CheckIP( vlc_object_t *p_this, char *psz_ip, char **ppsz_hosts,
+                   int i_hosts )
+{
+    struct in_addr ip;
+    int i;
+
+    if( !inet_aton( psz_ip, &ip ) )
+    {
+        return VLC_EGENERIC;
+    }
+
+    for( i = 0; i < i_hosts; i++ )
+    {
+        struct in_addr base, mask;
+        char *psz_host = strdup( ppsz_hosts[i] );
+        char *p = strchr( psz_host, '/' );
+
+        if( p != NULL )
+        {
+            int i_mask;
+            *p++ = '\0';
+            i_mask = atoi(p);
+            if( i_mask < 0 || i_mask > 32 )
+            {
+                msg_Err( p_this, "invalid netmask %s", p );
+                mask.s_addr = INADDR_NONE;
+            }
+            else if( i_mask == 0 )
+                mask.s_addr = INADDR_ANY;
+            else
+                mask.s_addr = htons( ntohs(INADDR_NONE) << (32 - i_mask) );
+        }
+        else
+            mask.s_addr = INADDR_NONE;
+
+        if( !inet_aton( psz_host, &base ) )
+        {
+            msg_Err( p_this, "invalid base address %s", psz_host );
+            free( psz_host );
+            continue;
+        }
+        free( psz_host );
+
+        if( !((ip.s_addr ^ base.s_addr) & mask.s_addr) )
+            return VLC_TRUE;
+    }
+
+    return VLC_FALSE;
+}
+