Skip to content

V
vlc-2-2
Commit f478936f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

httpd: remove ACL support 

Lua was the only remaining user of ACL instead of (login/)password.
This is now fixed, so there is no need to clutter the httpd core.
parent 6a7c3718
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 51 deletions
include/vlc_httpd.h
View file @ f478936f
...@@ -112,11 +112,11 @@ VLC_API char* httpd_ServerIP( const httpd_client_t *cl, char *, int * ); ...@@ -112,11 +112,11 @@ VLC_API char* httpd_ServerIP( const httpd_client_t *cl, char *, int * );
/* High level */ /* High level */
VLC_API httpd_file_t * httpd_FileNew( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill, httpd_file_sys_t * ) VLC_USED; VLC_API httpd_file_t * httpd_FileNew( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, httpd_file_callback_t pf_fill, httpd_file_sys_t * ) VLC_USED;
VLC_API httpd_file_sys_t * httpd_FileDelete( httpd_file_t * ); VLC_API httpd_file_sys_t * httpd_FileDelete( httpd_file_t * );
VLC_API httpd_handler_t * httpd_HandlerNew( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl, httpd_handler_callback_t pf_fill, httpd_handler_sys_t * ) VLC_USED; VLC_API httpd_handler_t * httpd_HandlerNew( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, httpd_handler_callback_t pf_fill, httpd_handler_sys_t * ) VLC_USED;
VLC_API httpd_handler_sys_t * httpd_HandlerDelete( httpd_handler_t * ); VLC_API httpd_handler_sys_t * httpd_HandlerDelete( httpd_handler_t * );
......
modules/lua/libs/httpd.c
View file @ f478936f
...@@ -163,7 +163,7 @@ static int vlclua_httpd_handler_new( lua_State * L ) ...@@ -163,7 +163,7 @@ static int vlclua_httpd_handler_new( lua_State * L )
* the callback's stack. */ * the callback's stack. */
lua_xmove( L, p_sys->L, 2 ); lua_xmove( L, p_sys->L, 2 );
httpd_handler_t *p_handler = httpd_HandlerNew( httpd_handler_t *p_handler = httpd_HandlerNew(
*pp_host, psz_url, psz_user, psz_password, NULL, *pp_host, psz_url, psz_user, psz_password,
vlclua_httpd_handler_callback, p_sys ); vlclua_httpd_handler_callback, p_sys );
if( !p_handler ) if( !p_handler )
{ {
...@@ -251,7 +251,7 @@ static int vlclua_httpd_file_new( lua_State *L ) ...@@ -251,7 +251,7 @@ static int vlclua_httpd_file_new( lua_State *L )
p_sys->ref = luaL_ref( L, LUA_REGISTRYINDEX ); /* pops the object too */ p_sys->ref = luaL_ref( L, LUA_REGISTRYINDEX ); /* pops the object too */
lua_xmove( L, p_sys->L, 2 ); lua_xmove( L, p_sys->L, 2 );
httpd_file_t *p_file = httpd_FileNew( *pp_host, psz_url, psz_mime, httpd_file_t *p_file = httpd_FileNew( *pp_host, psz_url, psz_mime,
psz_user, psz_password, NULL, psz_user, psz_password,
vlclua_httpd_file_callback, p_sys ); vlclua_httpd_file_callback, p_sys );
if( !p_file ) if( !p_file )
{ {
......
modules/stream_out/rtp.c
View file @ f478936f
...@@ -1364,7 +1364,7 @@ static int HttpSetup( sout_stream_t *p_stream, const vlc_url_t *url) ...@@ -1364,7 +1364,7 @@ static int HttpSetup( sout_stream_t *p_stream, const vlc_url_t *url)
p_sys->p_httpd_file = httpd_FileNew( p_sys->p_httpd_host, p_sys->p_httpd_file = httpd_FileNew( p_sys->p_httpd_host,
url->psz_path ? url->psz_path : "/", url->psz_path ? url->psz_path : "/",
"application/sdp", "application/sdp",
NULL, NULL, NULL, NULL, NULL,
HttpCallback, (void*)p_sys ); HttpCallback, (void*)p_sys );
} }
if( p_sys->p_httpd_file == NULL ) if( p_sys->p_httpd_file == NULL )
......
src/missing.c
View file @ f478936f
...@@ -59,12 +59,11 @@ httpd_file_sys_t *httpd_FileDelete (httpd_file_t *file) ...@@ -59,12 +59,11 @@ httpd_file_sys_t *httpd_FileDelete (httpd_file_t *file)
httpd_file_t *httpd_FileNew (httpd_host_t *host, httpd_file_t *httpd_FileNew (httpd_host_t *host,
const char *url, const char *content_type, const char *url, const char *content_type,
const char *login, const char *password, const char *login, const char *password,
const vlc_acl_t *acl,
httpd_file_callback_t cb, httpd_file_sys_t *data) httpd_file_callback_t cb, httpd_file_sys_t *data)
{ {
(void) host; (void) host;
(void) url; (void) content_type; (void) url; (void) content_type;
(void) login; (void) password; (void) acl; (void) login; (void) password;
(void) cb; (void) data; (void) cb; (void) data;
assert (0); assert (0);
} }
...@@ -77,12 +76,11 @@ httpd_handler_sys_t *httpd_HandlerDelete (httpd_handler_t *handler) ...@@ -77,12 +76,11 @@ httpd_handler_sys_t *httpd_HandlerDelete (httpd_handler_t *handler)
httpd_handler_t *httpd_HandlerNew (httpd_host_t *host, const char *url, httpd_handler_t *httpd_HandlerNew (httpd_host_t *host, const char *url,
const char *login, const char *password, const char *login, const char *password,
const vlc_acl_t *acl,
httpd_handler_callback_t cb, httpd_handler_callback_t cb,
httpd_handler_sys_t *data) httpd_handler_sys_t *data)
{ {
(void) host; (void) url; (void) host; (void) url;
(void) login; (void) password; (void) acl; (void) login; (void) password;
(void) cb; (void) data; (void) cb; (void) data;
assert (0); assert (0);
} }
......
src/network/httpd.c
View file @ f478936f
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include <vlc_network.h> #include <vlc_network.h>
#include <vlc_tls.h> #include <vlc_tls.h>
#include <vlc_acl.h>
#include <vlc_strings.h> #include <vlc_strings.h>
#include <vlc_rand.h> #include <vlc_rand.h>
#include <vlc_charset.h> #include <vlc_charset.h>
...@@ -68,9 +67,6 @@ ...@@ -68,9 +67,6 @@
#endif #endif
static void httpd_ClientClean( httpd_client_t *cl ); static void httpd_ClientClean( httpd_client_t *cl );
static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *, const char *,
const char *, const char *,
const vlc_acl_t * );
/* each host run in his own thread */ /* each host run in his own thread */
struct httpd_host_t struct httpd_host_t
...@@ -113,7 +109,6 @@ struct httpd_url_t ...@@ -113,7 +109,6 @@ struct httpd_url_t
char *psz_url; char *psz_url;
char *psz_user; char *psz_user;
char *psz_password; char *psz_password;
vlc_acl_t *p_acl;
struct struct
{ {
...@@ -445,13 +440,12 @@ httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, ...@@ -445,13 +440,12 @@ httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl,
httpd_file_t *httpd_FileNew( httpd_host_t *host, httpd_file_t *httpd_FileNew( httpd_host_t *host,
const char *psz_url, const char *psz_mime, const char *psz_url, const char *psz_mime,
const char *psz_user, const char *psz_password, const char *psz_user, const char *psz_password,
const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill, httpd_file_callback_t pf_fill,
httpd_file_sys_t *p_sys ) httpd_file_sys_t *p_sys )
{ {
httpd_file_t *file = xmalloc( sizeof( httpd_file_t ) ); httpd_file_t *file = xmalloc( sizeof( httpd_file_t ) );
file->url = httpd_UrlNewPrivate( host, psz_url, psz_user, psz_password, file->url = httpd_UrlNew( host, psz_url, psz_user, psz_password );
p_acl );
if( file->url == NULL ) if( file->url == NULL )
{ {
free( file ); free( file );
...@@ -592,14 +586,12 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, ...@@ -592,14 +586,12 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl,
httpd_handler_t *httpd_HandlerNew( httpd_host_t *host, const char *psz_url, httpd_handler_t *httpd_HandlerNew( httpd_host_t *host, const char *psz_url,
const char *psz_user, const char *psz_user,
const char *psz_password, const char *psz_password,
const vlc_acl_t *p_acl,
httpd_handler_callback_t pf_fill, httpd_handler_callback_t pf_fill,
httpd_handler_sys_t *p_sys ) httpd_handler_sys_t *p_sys )
{ {
httpd_handler_t *handler = xmalloc( sizeof( httpd_handler_t ) ); httpd_handler_t *handler = xmalloc( sizeof( httpd_handler_t ) );
handler->url = httpd_UrlNewPrivate( host, psz_url, psz_user, psz_password, handler->url = httpd_UrlNew( host, psz_url, psz_user, psz_password );
p_acl );
if( handler->url == NULL ) if( handler->url == NULL )
{ {
free( handler ); free( handler );
...@@ -852,8 +844,7 @@ httpd_stream_t *httpd_StreamNew( httpd_host_t *host, ...@@ -852,8 +844,7 @@ httpd_stream_t *httpd_StreamNew( httpd_host_t *host,
{ {
httpd_stream_t *stream = xmalloc( sizeof( httpd_stream_t ) ); httpd_stream_t *stream = xmalloc( sizeof( httpd_stream_t ) );
stream->url = httpd_UrlNewPrivate( host, psz_url, psz_user, psz_password, stream->url = httpd_UrlNew( host, psz_url, psz_user, psz_password );
NULL );
if( stream->url == NULL ) if( stream->url == NULL )
{ {
free( stream ); free( stream );
...@@ -1199,9 +1190,8 @@ void httpd_HostDelete( httpd_host_t *host ) ...@@ -1199,9 +1190,8 @@ void httpd_HostDelete( httpd_host_t *host )
} }
/* register a new url */ /* register a new url */
static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url, httpd_url_t *httpd_UrlNew( httpd_host_t *host, const char *psz_url,
const char *psz_user, const char *psz_password, const char *psz_user, const char *psz_password )
const vlc_acl_t *p_acl )
{ {
httpd_url_t *url; httpd_url_t *url;
...@@ -1226,7 +1216,6 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url ...@@ -1226,7 +1216,6 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url
url->psz_url = strdup( psz_url ); url->psz_url = strdup( psz_url );
url->psz_user = strdup( psz_user ? psz_user : "" ); url->psz_user = strdup( psz_user ? psz_user : "" );
url->psz_password = strdup( psz_password ? psz_password : "" ); url->psz_password = strdup( psz_password ? psz_password : "" );
url->p_acl = ACL_Duplicate( host, p_acl );
for( int i = 0; i < HTTPD_MSG_MAX; i++ ) for( int i = 0; i < HTTPD_MSG_MAX; i++ )
{ {
url->catch[i].cb = NULL; url->catch[i].cb = NULL;
...@@ -1240,12 +1229,6 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url ...@@ -1240,12 +1229,6 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url
return url; return url;
} }
httpd_url_t *httpd_UrlNew( httpd_host_t *host, const char *psz_url,
const char *psz_user, const char *psz_password )
{
return httpd_UrlNewPrivate( host, psz_url, psz_user, psz_password, NULL );
}
/* register callback on a url */ /* register callback on a url */
int httpd_UrlCatch( httpd_url_t *url, int i_msg, httpd_callback_t cb, int httpd_UrlCatch( httpd_url_t *url, int i_msg, httpd_callback_t cb,
httpd_callback_sys_t *p_sys ) httpd_callback_sys_t *p_sys )
...@@ -1271,7 +1254,6 @@ void httpd_UrlDelete( httpd_url_t *url ) ...@@ -1271,7 +1254,6 @@ void httpd_UrlDelete( httpd_url_t *url )
free( url->psz_url ); free( url->psz_url );
free( url->psz_user ); free( url->psz_user );
free( url->psz_password ); free( url->psz_password );
ACL_Destroy( url->p_acl );
for( i = 0; i < host->i_client; i++ ) for( i = 0; i < host->i_client; i++ )
{ {
...@@ -2162,7 +2144,6 @@ static void* httpd_HostThread( void *data ) ...@@ -2162,7 +2144,6 @@ static void* httpd_HostThread( void *data )
else else
{ {
bool b_auth_failed = false; bool b_auth_failed = false;
bool b_hosts_failed = false;
/* Search the url and trigger callbacks */ /* Search the url and trigger callbacks */
for(int i = 0; i < host->i_url; i++ ) for(int i = 0; i < host->i_url; i++ )
...@@ -2173,18 +2154,6 @@ static void* httpd_HostThread( void *data ) ...@@ -2173,18 +2154,6 @@ static void* httpd_HostThread( void *data )
{ {
if( url->catch[i_msg].cb ) if( url->catch[i_msg].cb )
{ {
if( answer && ( url->p_acl != NULL ) )
{
char ip[NI_MAXNUMERICHOST];
if( ( httpd_ClientIP( cl, ip, NULL ) == NULL )
|| ACL_Check( url->p_acl, ip ) )
{
b_hosts_failed = true;
break;
}
}
if( answer && ( *url->psz_user || *url->psz_password ) ) if( answer && ( *url->psz_user || *url->psz_password ) )
{ {
/* create the headers */ /* create the headers */
...@@ -2252,11 +2221,7 @@ static void* httpd_HostThread( void *data ) ...@@ -2252,11 +2221,7 @@ static void* httpd_HostThread( void *data )
answer->i_type = HTTPD_MSG_ANSWER; answer->i_type = HTTPD_MSG_ANSWER;
answer->i_version= 0; answer->i_version= 0;
if( b_hosts_failed ) if( b_auth_failed )
{
answer->i_status = 403;
}
else if( b_auth_failed )
{ {
answer->i_status = 401; answer->i_status = 401;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment