2004-01-28 20:02:12 -05:00
|
|
|
/* Icecast
|
|
|
|
*
|
|
|
|
* This program is distributed under the GNU General Public License, version 2.
|
|
|
|
* A copy of this license is included with this source.
|
|
|
|
*
|
2014-11-30 15:32:30 -05:00
|
|
|
* Copyright 2000-2004, Jack Moffitt <jack@xiph.org,
|
2004-01-28 20:02:12 -05:00
|
|
|
* Michael Smith <msmith@xiph.org>,
|
|
|
|
* oddsock <oddsock@xiph.org>,
|
|
|
|
* Karl Heyes <karl@xiph.org>
|
|
|
|
* and others (see AUTHORS for details).
|
2014-11-08 12:13:48 -05:00
|
|
|
* Copyright 2011, Dave 'justdave' Miller <justdave@mozilla.com>.
|
|
|
|
* Copyright 2011-2014, Thomas B. "dm8tbr" Ruecker <thomas@ruecker.fi>,
|
2014-11-07 17:06:06 -05:00
|
|
|
* Copyright 2011-2014, Philipp "ph3-der-loewe" Schafft <lion@lion.leolix.org>,
|
2004-01-28 20:02:12 -05:00
|
|
|
*/
|
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include <config.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2013-04-02 22:04:38 -04:00
|
|
|
#ifndef _WIN32
|
2013-04-02 20:46:55 -04:00
|
|
|
#include <fnmatch.h>
|
2013-04-02 22:04:38 -04:00
|
|
|
#endif
|
2003-07-20 21:39:39 -04:00
|
|
|
#include <libxml/xmlmemory.h>
|
|
|
|
#include <libxml/parser.h>
|
|
|
|
|
2014-12-02 16:50:57 -05:00
|
|
|
#include "common/thread/thread.h"
|
2003-07-20 21:39:39 -04:00
|
|
|
#include "cfgfile.h"
|
|
|
|
#include "refbuf.h"
|
|
|
|
#include "client.h"
|
2015-01-10 13:53:44 -05:00
|
|
|
#include "logging.h"
|
|
|
|
#include "util.h"
|
|
|
|
#include "auth.h"
|
|
|
|
#include "event.h"
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2014-12-07 05:54:34 -05:00
|
|
|
/* for config_reread_config() */
|
|
|
|
#include "yp.h"
|
|
|
|
#include "fserve.h"
|
|
|
|
#include "stats.h"
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
#define CATMODULE "CONFIG"
|
|
|
|
#define CONFIG_DEFAULT_LOCATION "Earth"
|
|
|
|
#define CONFIG_DEFAULT_ADMIN "icemaster@localhost"
|
|
|
|
#define CONFIG_DEFAULT_CLIENT_LIMIT 256
|
|
|
|
#define CONFIG_DEFAULT_SOURCE_LIMIT 16
|
2005-06-09 11:32:19 -04:00
|
|
|
#define CONFIG_DEFAULT_QUEUE_SIZE_LIMIT (500*1024)
|
2015-01-25 13:57:27 -05:00
|
|
|
#define CONFIG_DEFAULT_BURST_SIZE (64*1024)
|
|
|
|
#define CONFIG_DEFAULT_THREADPOOL_SIZE 4
|
|
|
|
#define CONFIG_DEFAULT_CLIENT_TIMEOUT 30
|
|
|
|
#define CONFIG_DEFAULT_HEADER_TIMEOUT 15
|
|
|
|
#define CONFIG_DEFAULT_SOURCE_TIMEOUT 10
|
|
|
|
#define CONFIG_DEFAULT_MASTER_USERNAME "relay"
|
|
|
|
#define CONFIG_DEFAULT_SHOUTCAST_MOUNT "/stream"
|
|
|
|
#define CONFIG_DEFAULT_FILESERVE 1
|
|
|
|
#define CONFIG_DEFAULT_TOUCH_FREQ 5
|
|
|
|
#define CONFIG_DEFAULT_HOSTNAME "localhost"
|
|
|
|
#define CONFIG_DEFAULT_PLAYLIST_LOG NULL
|
|
|
|
#define CONFIG_DEFAULT_ACCESS_LOG "access.log"
|
|
|
|
#define CONFIG_DEFAULT_ERROR_LOG "error.log"
|
|
|
|
#define CONFIG_DEFAULT_LOG_LEVEL ICECAST_LOGLEVEL_INFO
|
|
|
|
#define CONFIG_DEFAULT_CHROOT 0
|
|
|
|
#define CONFIG_DEFAULT_CHUID 0
|
|
|
|
#define CONFIG_DEFAULT_USER NULL
|
|
|
|
#define CONFIG_DEFAULT_GROUP NULL
|
|
|
|
#define CONFIG_MASTER_UPDATE_INTERVAL 120
|
|
|
|
#define CONFIG_YP_URL_TIMEOUT 10
|
|
|
|
#define CONFIG_DEFAULT_CIPHER_LIST "ECDHE-RSA-AES128-GCM-SHA256:"\
|
|
|
|
"ECDHE-ECDSA-AES128-GCM-SHA256:"\
|
|
|
|
"ECDHE-RSA-AES256-GCM-SHA384:"\
|
|
|
|
"ECDHE-ECDSA-AES256-GCM-SHA384:"\
|
|
|
|
"DHE-RSA-AES128-GCM-SHA256:"\
|
|
|
|
"DHE-DSS-AES128-GCM-SHA256:"\
|
|
|
|
"kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:"\
|
|
|
|
"ECDHE-ECDSA-AES128-SHA256:"\
|
|
|
|
"ECDHE-RSA-AES128-SHA:"\
|
|
|
|
"ECDHE-ECDSA-AES128-SHA:"\
|
|
|
|
"ECDHE-RSA-AES256-SHA384:"\
|
|
|
|
"ECDHE-ECDSA-AES256-SHA384:"\
|
|
|
|
"ECDHE-RSA-AES256-SHA:"\
|
|
|
|
"ECDHE-ECDSA-AES256-SHA:"\
|
|
|
|
"DHE-RSA-AES128-SHA256:"\
|
|
|
|
"DHE-RSA-AES128-SHA:"\
|
|
|
|
"DHE-DSS-AES128-SHA256:"\
|
|
|
|
"DHE-RSA-AES256-SHA256:"\
|
|
|
|
"DHE-DSS-AES256-SHA:"\
|
|
|
|
"DHE-RSA-AES256-SHA:"\
|
|
|
|
"ECDHE-RSA-DES-CBC3-SHA:"\
|
|
|
|
"ECDHE-ECDSA-DES-CBC3-SHA:"\
|
|
|
|
"AES128-GCM-SHA256:AES256-GCM-SHA384:"\
|
|
|
|
"AES128-SHA256:AES256-SHA256:"\
|
|
|
|
"AES128-SHA:AES256-SHA:AES:"\
|
|
|
|
"DES-CBC3-SHA:HIGH:!aNULL:!eNULL:"\
|
|
|
|
"!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:"\
|
|
|
|
"!EDH-DSS-DES-CBC3-SHA:"\
|
|
|
|
"!EDH-RSA-DES-CBC3-SHA:"\
|
|
|
|
"!KRB5-DES-CBC3-SHA"
|
2003-07-20 21:39:39 -04:00
|
|
|
|
|
|
|
#ifndef _WIN32
|
2015-01-25 13:57:27 -05:00
|
|
|
#define CONFIG_DEFAULT_BASE_DIR "/usr/local/icecast"
|
|
|
|
#define CONFIG_DEFAULT_LOG_DIR "/usr/local/icecast/logs"
|
|
|
|
#define CONFIG_DEFAULT_WEBROOT_DIR "/usr/local/icecast/webroot"
|
|
|
|
#define CONFIG_DEFAULT_ADMINROOT_DIR "/usr/local/icecast/admin"
|
|
|
|
#define CONFIG_DEFAULT_NULL_FILE "/dev/null"
|
|
|
|
#define MIMETYPESFILE "/etc/mime.types"
|
2003-07-20 21:39:39 -04:00
|
|
|
#else
|
2015-01-25 13:57:27 -05:00
|
|
|
#define CONFIG_DEFAULT_BASE_DIR ".\\"
|
|
|
|
#define CONFIG_DEFAULT_LOG_DIR ".\\logs"
|
|
|
|
#define CONFIG_DEFAULT_WEBROOT_DIR ".\\webroot"
|
|
|
|
#define CONFIG_DEFAULT_ADMINROOT_DIR ".\\admin"
|
|
|
|
#define CONFIG_DEFAULT_NULL_FILE "nul:"
|
|
|
|
#define MIMETYPESFILE ".\\mime.types"
|
2003-07-20 21:39:39 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
static ice_config_t _current_configuration;
|
|
|
|
static ice_config_locks _locks;
|
|
|
|
|
|
|
|
static void _set_defaults(ice_config_t *c);
|
|
|
|
static void _parse_root(xmlDocPtr doc, xmlNodePtr node, ice_config_t *c);
|
|
|
|
static void _parse_limits(xmlDocPtr doc, xmlNodePtr node, ice_config_t *c);
|
|
|
|
static void _parse_directory(xmlDocPtr doc, xmlNodePtr node, ice_config_t *c);
|
|
|
|
static void _parse_paths(xmlDocPtr doc, xmlNodePtr node, ice_config_t *c);
|
|
|
|
static void _parse_logging(xmlDocPtr doc, xmlNodePtr node, ice_config_t *c);
|
|
|
|
static void _parse_security(xmlDocPtr doc, xmlNodePtr node, ice_config_t *c);
|
2015-01-25 13:57:27 -05:00
|
|
|
|
|
|
|
static void _parse_authentication(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_t *c,
|
|
|
|
char **source_password);
|
|
|
|
|
|
|
|
static void _parse_http_headers(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_http_header_t **http_headers);
|
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
static void _parse_relay(xmlDocPtr doc, xmlNodePtr node, ice_config_t *c);
|
|
|
|
static void _parse_mount(xmlDocPtr doc, xmlNodePtr node, ice_config_t *c);
|
2015-01-25 13:57:27 -05:00
|
|
|
|
|
|
|
static void _parse_listen_socket(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_t *c);
|
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
static void _add_server(xmlDocPtr doc, xmlNodePtr node, ice_config_t *c);
|
2014-12-07 19:39:57 -05:00
|
|
|
static void _parse_events(event_registration_t **events, xmlNodePtr node);
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2013-04-02 20:33:10 -04:00
|
|
|
static void merge_mounts(mount_proxy * dst, mount_proxy * src);
|
|
|
|
static inline void _merge_mounts_all(ice_config_t *c);
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
operation_mode config_str_to_omode(const char *str)
|
|
|
|
{
|
2014-12-18 04:56:54 -05:00
|
|
|
if (!str || !*str)
|
|
|
|
return OMODE_DEFAULT;
|
|
|
|
if (strcasecmp(str, "default") == 0) {
|
|
|
|
return OMODE_DEFAULT;
|
|
|
|
} else if (strcasecmp(str, "normal") == 0) {
|
|
|
|
return OMODE_NORMAL;
|
|
|
|
} else if (strcasecmp(str, "legacy-compat") == 0 || strcasecmp(str, "legacy") == 0) {
|
|
|
|
return OMODE_LEGACY;
|
|
|
|
} else {
|
|
|
|
ICECAST_LOG_ERROR("Unknown operation mode \"%s\", falling back to DEFAULT.", str);
|
|
|
|
return OMODE_DEFAULT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void create_locks(void)
|
|
|
|
{
|
2003-07-20 21:39:39 -04:00
|
|
|
thread_mutex_create(&_locks.relay_lock);
|
2005-04-20 18:34:54 -04:00
|
|
|
thread_rwlock_create(&_locks.config_lock);
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void release_locks(void)
|
|
|
|
{
|
2003-07-20 21:39:39 -04:00
|
|
|
thread_mutex_destroy(&_locks.relay_lock);
|
2005-04-20 18:34:54 -04:00
|
|
|
thread_rwlock_destroy(&_locks.config_lock);
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
void config_initialize(void)
|
|
|
|
{
|
2003-07-20 21:39:39 -04:00
|
|
|
create_locks();
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
void config_shutdown(void)
|
|
|
|
{
|
2003-07-20 21:39:39 -04:00
|
|
|
config_get_config();
|
|
|
|
config_clear(&_current_configuration);
|
|
|
|
config_release_config();
|
|
|
|
release_locks();
|
|
|
|
}
|
|
|
|
|
|
|
|
void config_init_configuration(ice_config_t *configuration)
|
|
|
|
{
|
|
|
|
memset(configuration, 0, sizeof(ice_config_t));
|
|
|
|
_set_defaults(configuration);
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static inline int __parse_public(const char *str)
|
|
|
|
{
|
2014-11-21 14:52:48 -05:00
|
|
|
/* values that are not bool */
|
|
|
|
if (strcasecmp(str, "client") == 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* old way of doing so */
|
|
|
|
if (strcmp(str, "-1") == 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* ok, only normal bool left! */
|
|
|
|
return util_str_to_bool(str);
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void __append_old_style_auth(auth_stack_t **stack,
|
|
|
|
const char *name,
|
|
|
|
const char *type,
|
|
|
|
const char *username,
|
|
|
|
const char *password,
|
|
|
|
const char *method,
|
|
|
|
const char *allow_method,
|
|
|
|
int allow_web,
|
|
|
|
const char *allow_admin)
|
|
|
|
{
|
|
|
|
xmlNodePtr role,
|
|
|
|
user,
|
|
|
|
pass;
|
|
|
|
auth_t *auth;
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
|
|
|
|
if (!type)
|
|
|
|
return;
|
|
|
|
|
|
|
|
role = xmlNewNode(NULL, XMLSTR("role"));
|
|
|
|
|
|
|
|
xmlSetProp(role, XMLSTR("type"), XMLSTR(type));
|
|
|
|
xmlSetProp(role, XMLSTR("deny-method"), XMLSTR("*"));
|
|
|
|
if (allow_method)
|
|
|
|
xmlSetProp(role, XMLSTR("allow-method"), XMLSTR(allow_method));
|
|
|
|
|
|
|
|
if (name)
|
|
|
|
xmlSetProp(role, XMLSTR("name"), XMLSTR(name));
|
|
|
|
|
|
|
|
if (method)
|
|
|
|
xmlSetProp(role, XMLSTR("method"), XMLSTR(method));
|
|
|
|
|
|
|
|
if (allow_web) {
|
|
|
|
xmlSetProp(role, XMLSTR("allow-web"), XMLSTR("*"));
|
|
|
|
} else {
|
|
|
|
xmlSetProp(role, XMLSTR("deny-web"), XMLSTR("*"));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (allow_admin && strcmp(allow_admin, "*") == 0) {
|
|
|
|
xmlSetProp(role, XMLSTR("allow-admin"), XMLSTR("*"));
|
|
|
|
} else {
|
|
|
|
xmlSetProp(role, XMLSTR("deny-admin"), XMLSTR("*"));
|
|
|
|
if (allow_admin)
|
|
|
|
xmlSetProp(role, XMLSTR("allow-admin"), XMLSTR(allow_admin));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (username) {
|
|
|
|
user = xmlNewChild(role, NULL, XMLSTR("option"), NULL);
|
|
|
|
xmlSetProp(user, XMLSTR("name"), XMLSTR("username"));
|
|
|
|
xmlSetProp(user, XMLSTR("value"), XMLSTR(username));
|
|
|
|
}
|
|
|
|
if (password) {
|
|
|
|
pass = xmlNewChild(role, NULL, XMLSTR("option"), NULL);
|
|
|
|
xmlSetProp(pass, XMLSTR("name"), XMLSTR("password"));
|
|
|
|
xmlSetProp(pass, XMLSTR("value"), XMLSTR(password));
|
|
|
|
}
|
|
|
|
|
|
|
|
auth = auth_get_authenticator(role);
|
|
|
|
auth_stack_push(stack, auth);
|
|
|
|
auth_release(auth);
|
|
|
|
|
|
|
|
xmlFreeNode(role);
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void __append_option_tag(xmlNodePtr parent,
|
|
|
|
const char *name,
|
|
|
|
const char *value)
|
|
|
|
{
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
xmlNodePtr node;
|
|
|
|
|
|
|
|
if (!name || !value)
|
|
|
|
return;
|
|
|
|
|
|
|
|
node = xmlNewChild(parent, NULL, XMLSTR("option"), NULL);
|
|
|
|
xmlSetProp(node, XMLSTR("name"), XMLSTR(name));
|
|
|
|
xmlSetProp(node, XMLSTR("value"), XMLSTR(value));
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void __append_old_style_urlauth(auth_stack_t **stack,
|
|
|
|
const char *client_add,
|
|
|
|
const char *client_remove,
|
|
|
|
const char *action_add,
|
|
|
|
const char *action_remove,
|
|
|
|
const char *username,
|
|
|
|
const char *password,
|
|
|
|
int is_source,
|
|
|
|
const char *auth_header,
|
|
|
|
const char *timelimit_header,
|
|
|
|
const char *headers,
|
|
|
|
const char *header_prefix)
|
|
|
|
{
|
|
|
|
xmlNodePtr role;
|
|
|
|
auth_t *auth;
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
|
2014-12-14 04:27:49 -05:00
|
|
|
if (!stack || (!client_add && !client_remove))
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
return;
|
|
|
|
|
|
|
|
role = xmlNewNode(NULL, XMLSTR("role"));
|
|
|
|
|
|
|
|
xmlSetProp(role, XMLSTR("type"), XMLSTR("url"));
|
|
|
|
|
|
|
|
if (is_source) {
|
|
|
|
xmlSetProp(role, XMLSTR("method"), XMLSTR("source,put"));
|
|
|
|
xmlSetProp(role, XMLSTR("deny-method"), XMLSTR("*"));
|
|
|
|
xmlSetProp(role, XMLSTR("allow-method"), XMLSTR("source,put"));
|
|
|
|
xmlSetProp(role, XMLSTR("allow-web"), XMLSTR("*"));
|
|
|
|
xmlSetProp(role, XMLSTR("allow-admin"), XMLSTR("*"));
|
|
|
|
} else {
|
|
|
|
xmlSetProp(role, XMLSTR("method"), XMLSTR("get,post,head"));
|
|
|
|
xmlSetProp(role, XMLSTR("deny-method"), XMLSTR("*"));
|
|
|
|
xmlSetProp(role, XMLSTR("allow-method"), XMLSTR("get,post,head"));
|
|
|
|
xmlSetProp(role, XMLSTR("allow-web"), XMLSTR("*"));
|
|
|
|
xmlSetProp(role, XMLSTR("deny-admin"), XMLSTR("*"));
|
|
|
|
}
|
|
|
|
|
|
|
|
__append_option_tag(role, "client_add", client_add);
|
|
|
|
__append_option_tag(role, "client_remove", client_remove);
|
|
|
|
__append_option_tag(role, "action_add", action_add);
|
|
|
|
__append_option_tag(role, "action_remove", action_remove);
|
|
|
|
__append_option_tag(role, "username", username);
|
|
|
|
__append_option_tag(role, "password", password);
|
|
|
|
__append_option_tag(role, "auth_header", auth_header);
|
|
|
|
__append_option_tag(role, "timelimit_header", timelimit_header);
|
|
|
|
__append_option_tag(role, "headers", headers);
|
|
|
|
__append_option_tag(role, "header_prefix", header_prefix);
|
|
|
|
|
|
|
|
auth = auth_get_authenticator(role);
|
2014-12-14 04:27:49 -05:00
|
|
|
if (auth) {
|
|
|
|
auth_stack_push(stack, auth);
|
|
|
|
auth_release(auth);
|
|
|
|
ICECAST_LOG_DEBUG("Pushed authenticator %p on stack %p.", auth, stack);
|
|
|
|
} else {
|
|
|
|
ICECAST_LOG_DEBUG("Failed to set up authenticator.");
|
|
|
|
}
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
|
|
|
|
xmlFreeNode(role);
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void __append_old_style_exec_event(event_registration_t **list,
|
|
|
|
const char *trigger,
|
|
|
|
const char *executable)
|
|
|
|
{
|
|
|
|
xmlNodePtr exec;
|
2014-12-07 19:39:57 -05:00
|
|
|
event_registration_t *er;
|
|
|
|
|
|
|
|
exec = xmlNewNode(NULL, XMLSTR("event"));
|
|
|
|
|
|
|
|
xmlSetProp(exec, XMLSTR("type"), XMLSTR("exec"));
|
|
|
|
xmlSetProp(exec, XMLSTR("trigger"), XMLSTR(trigger));
|
|
|
|
|
|
|
|
__append_option_tag(exec, "executable", executable);
|
|
|
|
|
|
|
|
er = event_new_from_xml_node(exec);
|
|
|
|
event_registration_push(list, er);
|
|
|
|
event_registration_release(er);
|
|
|
|
|
|
|
|
xmlFreeNode(exec);
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void __append_old_style_url_event(event_registration_t **list,
|
|
|
|
const char *trigger,
|
|
|
|
const char *url,
|
|
|
|
const char *action,
|
|
|
|
const char *username,
|
|
|
|
const char *password)
|
|
|
|
{
|
|
|
|
xmlNodePtr exec;
|
2014-12-07 19:39:57 -05:00
|
|
|
event_registration_t *er;
|
|
|
|
|
|
|
|
exec = xmlNewNode(NULL, XMLSTR("event"));
|
|
|
|
|
|
|
|
xmlSetProp(exec, XMLSTR("type"), XMLSTR("url"));
|
|
|
|
xmlSetProp(exec, XMLSTR("trigger"), XMLSTR(trigger));
|
|
|
|
|
|
|
|
__append_option_tag(exec, "url", url);
|
|
|
|
__append_option_tag(exec, "action", action);
|
|
|
|
__append_option_tag(exec, "username", username);
|
|
|
|
__append_option_tag(exec, "password", password);
|
|
|
|
|
|
|
|
er = event_new_from_xml_node(exec);
|
|
|
|
event_registration_push(list, er);
|
|
|
|
event_registration_release(er);
|
|
|
|
|
|
|
|
xmlFreeNode(exec);
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void config_clear_http_header(ice_config_http_header_t *header)
|
|
|
|
{
|
|
|
|
ice_config_http_header_t *old;
|
|
|
|
|
|
|
|
while (header) {
|
|
|
|
xmlFree(header->name);
|
|
|
|
xmlFree(header->value);
|
|
|
|
old = header;
|
|
|
|
header = header->next;
|
|
|
|
free(old);
|
|
|
|
}
|
2014-11-06 19:56:02 -05:00
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static inline ice_config_http_header_t *config_copy_http_header(ice_config_http_header_t *header)
|
|
|
|
{
|
2014-11-06 21:55:57 -05:00
|
|
|
ice_config_http_header_t *ret = NULL;
|
|
|
|
ice_config_http_header_t *cur = NULL;
|
|
|
|
ice_config_http_header_t *old = NULL;
|
|
|
|
|
|
|
|
while (header) {
|
|
|
|
if (cur) {
|
|
|
|
cur->next = calloc(1, sizeof(ice_config_http_header_t));
|
|
|
|
old = cur;
|
|
|
|
cur = cur->next;
|
|
|
|
} else {
|
|
|
|
ret = calloc(1, sizeof(ice_config_http_header_t));
|
|
|
|
cur = ret;
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
if (!cur)
|
|
|
|
return ret; /* TODO: do better error handling */
|
2014-11-06 21:55:57 -05:00
|
|
|
|
2014-11-07 05:12:24 -05:00
|
|
|
cur->type = header->type;
|
|
|
|
cur->name = (char *)xmlCharStrdup(header->name);
|
|
|
|
cur->value = (char *)xmlCharStrdup(header->value);
|
|
|
|
cur->status = header->status;
|
2014-11-06 21:55:57 -05:00
|
|
|
|
|
|
|
if (!cur->name || !cur->value) {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (cur->name)
|
|
|
|
xmlFree(cur->name);
|
|
|
|
if (cur->value)
|
|
|
|
xmlFree(cur->value);
|
2014-11-06 21:55:57 -05:00
|
|
|
if (old) {
|
|
|
|
old->next = NULL;
|
|
|
|
} else {
|
|
|
|
ret = NULL;
|
|
|
|
}
|
|
|
|
free(cur);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
header = header->next;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-11-30 15:32:30 -05:00
|
|
|
static void config_clear_mount(mount_proxy *mount)
|
2005-10-11 09:40:17 -04:00
|
|
|
{
|
2015-01-25 13:57:27 -05:00
|
|
|
if (mount->mountname) xmlFree (mount->mountname);
|
|
|
|
if (mount->dumpfile) xmlFree (mount->dumpfile);
|
|
|
|
if (mount->intro_filename) xmlFree (mount->intro_filename);
|
|
|
|
if (mount->fallback_mount) xmlFree (mount->fallback_mount);
|
|
|
|
if (mount->stream_name) xmlFree (mount->stream_name);
|
2008-01-23 22:31:25 -05:00
|
|
|
if (mount->stream_description) xmlFree (mount->stream_description);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (mount->stream_url) xmlFree (mount->stream_url);
|
|
|
|
if (mount->stream_genre) xmlFree (mount->stream_genre);
|
|
|
|
if (mount->bitrate) xmlFree (mount->bitrate);
|
|
|
|
if (mount->type) xmlFree (mount->type);
|
|
|
|
if (mount->charset) xmlFree (mount->charset);
|
2008-01-23 22:31:25 -05:00
|
|
|
if (mount->cluster_password) xmlFree (mount->cluster_password);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (mount->authstack) auth_stack_release(mount->authstack);
|
2008-01-23 22:31:25 -05:00
|
|
|
|
2014-12-07 19:39:57 -05:00
|
|
|
event_registration_release(mount->event);
|
2014-11-06 21:55:57 -05:00
|
|
|
config_clear_http_header(mount->http_headers);
|
2015-01-25 13:57:27 -05:00
|
|
|
free(mount);
|
2005-10-11 09:40:17 -04:00
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
listener_t *config_clear_listener(listener_t *listener)
|
2007-10-15 21:53:06 -04:00
|
|
|
{
|
|
|
|
listener_t *next = NULL;
|
|
|
|
if (listener)
|
|
|
|
{
|
|
|
|
next = listener->next;
|
|
|
|
if (listener->bind_address) xmlFree (listener->bind_address);
|
2007-10-24 22:25:49 -04:00
|
|
|
if (listener->shoutcast_mount) xmlFree (listener->shoutcast_mount);
|
2007-10-15 21:53:06 -04:00
|
|
|
free (listener);
|
|
|
|
}
|
|
|
|
return next;
|
|
|
|
}
|
2005-10-11 09:40:17 -04:00
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
void config_clear(ice_config_t *c)
|
|
|
|
{
|
2015-01-25 13:57:27 -05:00
|
|
|
ice_config_dir_t *dirnode,
|
|
|
|
*nextdirnode;
|
|
|
|
relay_server *relay,
|
|
|
|
*nextrelay;
|
|
|
|
mount_proxy *mount,
|
|
|
|
*nextmount;
|
|
|
|
aliases *alias,
|
|
|
|
*nextalias;
|
2014-11-07 18:10:43 -05:00
|
|
|
#ifdef USE_YP
|
2015-01-25 13:57:27 -05:00
|
|
|
int i;
|
2014-11-07 18:10:43 -05:00
|
|
|
#endif
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2007-10-04 12:48:38 -04:00
|
|
|
free(c->config_filename);
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
xmlFree(c->server_id);
|
|
|
|
if (c->location) xmlFree(c->location);
|
|
|
|
if (c->admin) xmlFree(c->admin);
|
|
|
|
if (c->hostname) xmlFree(c->hostname);
|
|
|
|
if (c->base_dir) xmlFree(c->base_dir);
|
|
|
|
if (c->log_dir) xmlFree(c->log_dir);
|
|
|
|
if (c->webroot_dir) xmlFree(c->webroot_dir);
|
|
|
|
if (c->adminroot_dir) xmlFree(c->adminroot_dir);
|
|
|
|
if (c->null_device) xmlFree(c->null_device);
|
|
|
|
if (c->cert_file) xmlFree(c->cert_file);
|
|
|
|
if (c->cipher_list) xmlFree(c->cipher_list);
|
|
|
|
if (c->pidfile) xmlFree(c->pidfile);
|
|
|
|
if (c->banfile) xmlFree(c->banfile);
|
|
|
|
if (c->allowfile) xmlFree(c->allowfile);
|
|
|
|
if (c->playlist_log) xmlFree(c->playlist_log);
|
|
|
|
if (c->access_log) xmlFree(c->access_log);
|
|
|
|
if (c->error_log) xmlFree(c->error_log);
|
2007-10-03 20:55:13 -04:00
|
|
|
if (c->shoutcast_mount) xmlFree(c->shoutcast_mount);
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
if (c->authstack) auth_stack_release(c->authstack);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (c->master_server) xmlFree(c->master_server);
|
2005-05-12 20:35:08 -04:00
|
|
|
if (c->master_username) xmlFree(c->master_username);
|
2003-07-20 21:39:39 -04:00
|
|
|
if (c->master_password) xmlFree(c->master_password);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (c->user) xmlFree(c->user);
|
|
|
|
if (c->group) xmlFree(c->group);
|
|
|
|
if (c->mimetypes_fn) xmlFree (c->mimetypes_fn);
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2014-12-07 19:39:57 -05:00
|
|
|
event_registration_release(c->event);
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
while ((c->listen_sock = config_clear_listener (c->listen_sock)));
|
2007-10-15 21:53:06 -04:00
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
thread_mutex_lock(&(_locks.relay_lock));
|
|
|
|
relay = c->relay;
|
2014-11-30 15:32:30 -05:00
|
|
|
while (relay) {
|
2003-07-20 21:39:39 -04:00
|
|
|
nextrelay = relay->next;
|
|
|
|
xmlFree(relay->server);
|
|
|
|
xmlFree(relay->mount);
|
2004-02-17 10:46:05 -05:00
|
|
|
xmlFree(relay->localmount);
|
2003-07-20 21:39:39 -04:00
|
|
|
free(relay);
|
|
|
|
relay = nextrelay;
|
|
|
|
}
|
|
|
|
thread_mutex_unlock(&(_locks.relay_lock));
|
|
|
|
|
|
|
|
mount = c->mounts;
|
2014-11-30 15:32:30 -05:00
|
|
|
while (mount) {
|
2003-07-20 21:39:39 -04:00
|
|
|
nextmount = mount->next;
|
2014-11-30 15:32:30 -05:00
|
|
|
config_clear_mount(mount);
|
2003-07-20 21:39:39 -04:00
|
|
|
mount = nextmount;
|
|
|
|
}
|
|
|
|
|
|
|
|
alias = c->aliases;
|
2014-11-30 15:32:30 -05:00
|
|
|
while (alias) {
|
2003-07-20 21:39:39 -04:00
|
|
|
nextalias = alias->next;
|
|
|
|
xmlFree(alias->source);
|
|
|
|
xmlFree(alias->destination);
|
|
|
|
xmlFree(alias->bind_address);
|
2014-11-20 13:32:14 -05:00
|
|
|
xmlFree(alias->vhost);
|
2003-07-20 21:39:39 -04:00
|
|
|
free(alias);
|
|
|
|
alias = nextalias;
|
|
|
|
}
|
|
|
|
|
|
|
|
dirnode = c->dir_list;
|
2014-11-30 15:32:30 -05:00
|
|
|
while (dirnode) {
|
2003-07-20 21:39:39 -04:00
|
|
|
nextdirnode = dirnode->next;
|
|
|
|
xmlFree(dirnode->host);
|
|
|
|
free(dirnode);
|
|
|
|
dirnode = nextdirnode;
|
|
|
|
}
|
2004-10-25 17:10:10 -04:00
|
|
|
#ifdef USE_YP
|
2004-02-19 09:48:31 -05:00
|
|
|
i = 0;
|
2015-01-25 13:57:27 -05:00
|
|
|
while (i < c->num_yp_directories) {
|
2004-02-19 09:48:31 -05:00
|
|
|
xmlFree (c->yp_url[i]);
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
#endif
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2014-11-06 19:56:02 -05:00
|
|
|
config_clear_http_header(c->http_headers);
|
2003-07-20 21:39:39 -04:00
|
|
|
memset(c, 0, sizeof(ice_config_t));
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
void config_reread_config(void)
|
|
|
|
{
|
|
|
|
int ret;
|
2014-12-07 05:54:34 -05:00
|
|
|
ice_config_t *config;
|
2015-01-25 13:57:27 -05:00
|
|
|
ice_config_t new_config;
|
2014-12-07 05:54:34 -05:00
|
|
|
/* reread config file */
|
|
|
|
|
|
|
|
config = config_grab_config(); /* Both to get the lock, and to be able
|
|
|
|
to find out the config filename */
|
|
|
|
xmlSetGenericErrorFunc("config", log_parse_failure);
|
|
|
|
ret = config_parse_file(config->config_filename, &new_config);
|
|
|
|
if(ret < 0) {
|
|
|
|
ICECAST_LOG_ERROR("Error parsing config, not replacing existing config");
|
|
|
|
switch (ret) {
|
|
|
|
case CONFIG_EINSANE:
|
|
|
|
ICECAST_LOG_ERROR("Config filename null or blank");
|
2015-01-25 13:57:27 -05:00
|
|
|
break;
|
2014-12-07 05:54:34 -05:00
|
|
|
case CONFIG_ENOROOT:
|
|
|
|
ICECAST_LOG_ERROR("Root element not found in %s", config->config_filename);
|
2015-01-25 13:57:27 -05:00
|
|
|
break;
|
2014-12-07 05:54:34 -05:00
|
|
|
case CONFIG_EBADROOT:
|
|
|
|
ICECAST_LOG_ERROR("Not an icecast2 config file: %s",
|
|
|
|
config->config_filename);
|
2015-01-25 13:57:27 -05:00
|
|
|
break;
|
2014-12-07 05:54:34 -05:00
|
|
|
default:
|
|
|
|
ICECAST_LOG_ERROR("Parse error in reading %s", config->config_filename);
|
2015-01-25 13:57:27 -05:00
|
|
|
break;
|
2014-12-07 05:54:34 -05:00
|
|
|
}
|
|
|
|
config_release_config();
|
|
|
|
} else {
|
|
|
|
config_clear(config);
|
|
|
|
config_set_config(&new_config);
|
|
|
|
config = config_get_config_unlocked();
|
2015-01-25 13:57:27 -05:00
|
|
|
restart_logging(config);
|
|
|
|
yp_recheck_config(config);
|
|
|
|
fserve_recheck_mime_types(config);
|
|
|
|
stats_global(config);
|
2014-12-07 05:54:34 -05:00
|
|
|
config_release_config();
|
|
|
|
slave_update_all_mounts();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
int config_initial_parse_file(const char *filename)
|
|
|
|
{
|
|
|
|
/* Since we're already pointing at it, we don't need to copy it in place */
|
|
|
|
return config_parse_file(filename, &_current_configuration);
|
|
|
|
}
|
|
|
|
|
|
|
|
int config_parse_file(const char *filename, ice_config_t *configuration)
|
|
|
|
{
|
2015-01-25 13:57:27 -05:00
|
|
|
xmlDocPtr doc;
|
2003-07-20 21:39:39 -04:00
|
|
|
xmlNodePtr node;
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
if (filename == NULL || strcmp(filename, "") == 0)
|
|
|
|
return CONFIG_EINSANE;
|
2015-01-10 13:53:44 -05:00
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
doc = xmlParseFile(filename);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (doc == NULL)
|
2003-07-20 21:39:39 -04:00
|
|
|
return CONFIG_EPARSE;
|
|
|
|
node = xmlDocGetRootElement(doc);
|
|
|
|
if (node == NULL) {
|
|
|
|
xmlFreeDoc(doc);
|
|
|
|
return CONFIG_ENOROOT;
|
|
|
|
}
|
|
|
|
|
2007-10-04 12:48:38 -04:00
|
|
|
if (xmlStrcmp (node->name, XMLSTR("icecast")) != 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
xmlFreeDoc(doc);
|
|
|
|
return CONFIG_EBADROOT;
|
|
|
|
}
|
|
|
|
|
|
|
|
config_init_configuration(configuration);
|
2015-01-25 13:57:27 -05:00
|
|
|
configuration->config_filename = strdup(filename);
|
2003-07-20 21:39:39 -04:00
|
|
|
_parse_root(doc, node->xmlChildrenNode, configuration);
|
|
|
|
xmlFreeDoc(doc);
|
2013-04-02 20:33:10 -04:00
|
|
|
_merge_mounts_all(configuration);
|
2003-07-20 21:39:39 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int config_parse_cmdline(int arg, char **argv)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
ice_config_locks *config_locks(void)
|
|
|
|
{
|
|
|
|
return &_locks;
|
|
|
|
}
|
|
|
|
|
|
|
|
void config_release_config(void)
|
|
|
|
{
|
2005-04-20 18:34:54 -04:00
|
|
|
thread_rwlock_unlock(&(_locks.config_lock));
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
ice_config_t *config_get_config(void)
|
|
|
|
{
|
2005-04-20 18:34:54 -04:00
|
|
|
thread_rwlock_rlock(&(_locks.config_lock));
|
|
|
|
return &_current_configuration;
|
|
|
|
}
|
|
|
|
|
|
|
|
ice_config_t *config_grab_config(void)
|
|
|
|
{
|
|
|
|
thread_rwlock_wlock(&(_locks.config_lock));
|
2003-07-20 21:39:39 -04:00
|
|
|
return &_current_configuration;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* MUST be called with the lock held! */
|
2015-01-25 13:57:27 -05:00
|
|
|
void config_set_config(ice_config_t *config)
|
|
|
|
{
|
2003-07-20 21:39:39 -04:00
|
|
|
memcpy(&_current_configuration, config, sizeof(ice_config_t));
|
|
|
|
}
|
|
|
|
|
|
|
|
ice_config_t *config_get_config_unlocked(void)
|
|
|
|
{
|
|
|
|
return &_current_configuration;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void _set_defaults(ice_config_t *configuration)
|
|
|
|
{
|
2015-01-25 13:57:27 -05:00
|
|
|
configuration
|
|
|
|
->location = (char *) xmlCharStrdup(CONFIG_DEFAULT_LOCATION);
|
|
|
|
configuration
|
|
|
|
->server_id = (char *) xmlCharStrdup(ICECAST_VERSION_STRING);
|
|
|
|
configuration
|
|
|
|
->admin = (char *) xmlCharStrdup(CONFIG_DEFAULT_ADMIN);
|
|
|
|
configuration
|
|
|
|
->client_limit = CONFIG_DEFAULT_CLIENT_LIMIT;
|
|
|
|
configuration
|
|
|
|
->source_limit = CONFIG_DEFAULT_SOURCE_LIMIT;
|
|
|
|
configuration
|
|
|
|
->queue_size_limit = CONFIG_DEFAULT_QUEUE_SIZE_LIMIT;
|
|
|
|
configuration
|
|
|
|
->client_timeout = CONFIG_DEFAULT_CLIENT_TIMEOUT;
|
|
|
|
configuration
|
|
|
|
->header_timeout = CONFIG_DEFAULT_HEADER_TIMEOUT;
|
|
|
|
configuration
|
|
|
|
->source_timeout = CONFIG_DEFAULT_SOURCE_TIMEOUT;
|
|
|
|
configuration
|
|
|
|
->shoutcast_mount = (char *) xmlCharStrdup(CONFIG_DEFAULT_SHOUTCAST_MOUNT);
|
|
|
|
configuration
|
|
|
|
->fileserve = CONFIG_DEFAULT_FILESERVE;
|
|
|
|
configuration
|
|
|
|
->touch_interval = CONFIG_DEFAULT_TOUCH_FREQ;
|
|
|
|
configuration
|
|
|
|
->on_demand = 0;
|
|
|
|
configuration
|
|
|
|
->dir_list = NULL;
|
|
|
|
configuration
|
|
|
|
->hostname = (char *) xmlCharStrdup (CONFIG_DEFAULT_HOSTNAME);
|
|
|
|
configuration
|
|
|
|
->mimetypes_fn = (char *) xmlCharStrdup (MIMETYPESFILE);
|
|
|
|
configuration
|
|
|
|
->master_server = NULL;
|
|
|
|
configuration
|
|
|
|
->master_server_port = 0;
|
|
|
|
configuration
|
|
|
|
->master_update_interval = CONFIG_MASTER_UPDATE_INTERVAL;
|
|
|
|
configuration
|
|
|
|
->master_username = (char *) xmlCharStrdup (CONFIG_DEFAULT_MASTER_USERNAME);
|
|
|
|
configuration
|
|
|
|
->master_password = NULL;
|
|
|
|
configuration
|
|
|
|
->base_dir = (char *) xmlCharStrdup(CONFIG_DEFAULT_BASE_DIR);
|
|
|
|
configuration
|
|
|
|
->log_dir = (char *) xmlCharStrdup(CONFIG_DEFAULT_LOG_DIR);
|
|
|
|
configuration
|
|
|
|
->cipher_list = (char *) xmlCharStrdup(CONFIG_DEFAULT_CIPHER_LIST);
|
|
|
|
configuration
|
|
|
|
->null_device = (char *) xmlCharStrdup(CONFIG_DEFAULT_NULL_FILE);
|
|
|
|
configuration
|
|
|
|
->webroot_dir = (char *) xmlCharStrdup(CONFIG_DEFAULT_WEBROOT_DIR);
|
|
|
|
configuration
|
|
|
|
->adminroot_dir = (char *) xmlCharStrdup(CONFIG_DEFAULT_ADMINROOT_DIR);
|
|
|
|
configuration
|
|
|
|
->playlist_log = (char *) xmlCharStrdup(CONFIG_DEFAULT_PLAYLIST_LOG);
|
|
|
|
configuration
|
|
|
|
->access_log = (char *) xmlCharStrdup(CONFIG_DEFAULT_ACCESS_LOG);
|
|
|
|
configuration
|
|
|
|
->error_log = (char *) xmlCharStrdup(CONFIG_DEFAULT_ERROR_LOG);
|
|
|
|
configuration
|
|
|
|
->loglevel = CONFIG_DEFAULT_LOG_LEVEL;
|
|
|
|
configuration
|
|
|
|
->chroot = CONFIG_DEFAULT_CHROOT;
|
|
|
|
configuration
|
|
|
|
->chuid = CONFIG_DEFAULT_CHUID;
|
|
|
|
configuration
|
|
|
|
->user = NULL;
|
|
|
|
configuration
|
|
|
|
->group = NULL;
|
|
|
|
configuration
|
|
|
|
->num_yp_directories = 0;
|
2004-08-20 11:13:59 -04:00
|
|
|
/* default to a typical prebuffer size used by clients */
|
2015-01-25 13:57:27 -05:00
|
|
|
configuration
|
|
|
|
->burst_size = CONFIG_DEFAULT_BURST_SIZE;
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static inline void __check_hostname(ice_config_t *configuration)
|
|
|
|
{
|
2014-11-20 13:41:42 -05:00
|
|
|
char *p;
|
|
|
|
|
|
|
|
// ensure we have a non-NULL buffer:
|
|
|
|
if (!configuration->hostname)
|
|
|
|
configuration->hostname = (char *)xmlCharStrdup (CONFIG_DEFAULT_HOSTNAME);
|
|
|
|
|
|
|
|
// convert to lower case:
|
2015-01-25 13:57:27 -05:00
|
|
|
for (p = configuration->hostname; *p; p++) {
|
2014-11-20 13:41:42 -05:00
|
|
|
if ( *p >= 'A' && *p <= 'Z' )
|
|
|
|
*p += 'a' - 'A';
|
2015-01-25 13:57:27 -05:00
|
|
|
}
|
2014-11-20 13:41:42 -05:00
|
|
|
|
|
|
|
configuration->sane_hostname = 0;
|
|
|
|
switch (util_hostcheck(configuration->hostname)) {
|
|
|
|
case HOSTCHECK_SANE:
|
|
|
|
configuration->sane_hostname = 1;
|
|
|
|
break;
|
|
|
|
case HOSTCHECK_ERROR:
|
2015-01-25 13:57:27 -05:00
|
|
|
ICECAST_LOG_ERROR("Can not check hostname \"%s\".",
|
|
|
|
configuration->hostname);
|
2014-11-20 13:41:42 -05:00
|
|
|
break;
|
|
|
|
case HOSTCHECK_NOT_FQDN:
|
2015-01-25 13:57:27 -05:00
|
|
|
ICECAST_LOG_WARN("Warning, <hostname> seems not to be set to a "
|
|
|
|
"fully qualified fomain name (FQDN). This may cause problems, "
|
|
|
|
"e.g. with YP directory listings.");
|
2014-11-20 13:41:42 -05:00
|
|
|
break;
|
|
|
|
case HOSTCHECK_IS_LOCALHOST:
|
2015-01-25 13:57:27 -05:00
|
|
|
ICECAST_LOG_WARN("Warning, <hostname> not configured, using "
|
|
|
|
"default value \"%s\". This will cause problems, e.g. with "
|
|
|
|
"YP directory listings.", CONFIG_DEFAULT_HOSTNAME);
|
2014-11-20 13:41:42 -05:00
|
|
|
break;
|
|
|
|
case HOSTCHECK_IS_IPV4:
|
2015-01-25 13:57:27 -05:00
|
|
|
ICECAST_LOG_WARN("Warning, <hostname> seems to be set to an IPv4 "
|
|
|
|
"address. This may cause problems, e.g. with YP directory "
|
|
|
|
"listings.");
|
2014-11-20 13:41:42 -05:00
|
|
|
break;
|
|
|
|
case HOSTCHECK_IS_IPV6:
|
2015-01-25 13:57:27 -05:00
|
|
|
ICECAST_LOG_WARN("Warning, <hostname> seems to be set to an IPv6 "
|
|
|
|
"address. This may cause problems, e.g. with YP directory "
|
|
|
|
"listings.");
|
2014-11-20 13:41:42 -05:00
|
|
|
break;
|
|
|
|
case HOSTCHECK_BADCHAR:
|
2015-01-25 13:57:27 -05:00
|
|
|
ICECAST_LOG_WARN("Warning, <hostname> configured to unusual "
|
|
|
|
"characters. This may cause problems, e.g. with YP directory "
|
|
|
|
"listings.");
|
2014-11-20 13:41:42 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _parse_root(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_t *configuration)
|
2003-07-20 21:39:39 -04:00
|
|
|
{
|
|
|
|
char *tmp;
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
char *source_password = NULL;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
configuration
|
|
|
|
->listen_sock = calloc (1, sizeof (*configuration->listen_sock));
|
|
|
|
configuration
|
|
|
|
->listen_sock->port = 8000;
|
|
|
|
configuration
|
|
|
|
->listen_sock_count = 1;
|
2007-10-15 21:53:06 -04:00
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
|
|
|
if (xmlStrcmp(node->name, XMLSTR("location")) == 0) {
|
|
|
|
if (configuration->location)
|
|
|
|
xmlFree(configuration->location);
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->location = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("admin")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (configuration->admin)
|
|
|
|
xmlFree(configuration->admin);
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->admin = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("server-id")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
xmlFree(configuration->server_id);
|
2007-09-02 20:55:27 -04:00
|
|
|
configuration->server_id = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
ICECAST_LOG_WARN("Warning, server version string override "
|
|
|
|
"detected. This may lead to unexpected client software "
|
|
|
|
"behavior.");
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("authentication")) == 0) {
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
_parse_authentication(doc, node->xmlChildrenNode, configuration, &source_password);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("source-password")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
/* TODO: This is the backwards-compatibility location */
|
2015-01-25 13:57:27 -05:00
|
|
|
ICECAST_LOG_WARN("<source-password> defined outside "
|
|
|
|
"<authentication>. This is deprecated and will be removed in "
|
|
|
|
"version 2.5.");
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
if (source_password)
|
|
|
|
xmlFree(source_password);
|
|
|
|
source_password = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("icelogin")) == 0) {
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
ICECAST_LOG_ERROR("<icelogin> has been removed.");
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("fileserve")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
configuration->fileserve = util_str_to_bool(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("relays-on-demand")) == 0) {
|
2005-06-08 21:51:47 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
configuration->on_demand = util_str_to_bool(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("hostname")) == 0) {
|
|
|
|
if (configuration->hostname)
|
|
|
|
xmlFree(configuration->hostname);
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->hostname = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("mime-types")) == 0) {
|
|
|
|
if (configuration->mimetypes_fn)
|
|
|
|
xmlFree(configuration->mimetypes_fn);
|
2007-08-13 17:33:27 -04:00
|
|
|
configuration->mimetypes_fn = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("listen-socket")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
_parse_listen_socket(doc, node->xmlChildrenNode, configuration);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("port")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-06 20:40:28 -05:00
|
|
|
if (tmp) {
|
|
|
|
configuration->port = atoi(tmp);
|
|
|
|
configuration->listen_sock->port = atoi(tmp);
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else {
|
|
|
|
ICECAST_LOG_WARN("<port> must not be empty.");
|
|
|
|
}
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("bind-address")) == 0) {
|
2015-01-10 13:53:44 -05:00
|
|
|
if (configuration->listen_sock->bind_address)
|
2007-10-15 21:53:06 -04:00
|
|
|
xmlFree(configuration->listen_sock->bind_address);
|
|
|
|
configuration->listen_sock->bind_address = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("master-server")) == 0) {
|
|
|
|
if (configuration->master_server)
|
|
|
|
xmlFree(configuration->master_server);
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->master_server = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("master-username")) == 0) {
|
|
|
|
if (configuration->master_username)
|
|
|
|
xmlFree(configuration->master_username);
|
2005-05-12 20:35:08 -04:00
|
|
|
configuration->master_username = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("master-password")) == 0) {
|
|
|
|
if (configuration->master_password)
|
|
|
|
xmlFree(configuration->master_password);
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->master_password = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("master-server-port")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
configuration->master_server_port = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("master-update-interval")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
configuration->master_update_interval = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("shoutcast-mount")) == 0) {
|
|
|
|
if (configuration->shoutcast_mount)
|
|
|
|
xmlFree(configuration->shoutcast_mount);
|
2004-11-17 11:02:04 -05:00
|
|
|
configuration->shoutcast_mount = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("limits")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
_parse_limits(doc, node->xmlChildrenNode, configuration);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("http-headers")) == 0) {
|
2014-11-06 21:55:57 -05:00
|
|
|
_parse_http_headers(doc, node->xmlChildrenNode, &(configuration->http_headers));
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("relay")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
_parse_relay(doc, node->xmlChildrenNode, configuration);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("mount")) == 0) {
|
2013-04-02 14:46:44 -04:00
|
|
|
_parse_mount(doc, node, configuration);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("directory")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
_parse_directory(doc, node->xmlChildrenNode, configuration);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("paths")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
_parse_paths(doc, node->xmlChildrenNode, configuration);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("logging")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
_parse_logging(doc, node->xmlChildrenNode, configuration);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("security")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
_parse_security(doc, node->xmlChildrenNode, configuration);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("kartoffelsalat")) == 0) {
|
2014-12-07 19:39:57 -05:00
|
|
|
/* BEFORE RELEASE NEXT REVIEW: Should this tag really be <kartoffelsalat>? */
|
|
|
|
_parse_events(&configuration->event, node->xmlChildrenNode);
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
} while ((node = node->next));
|
2007-12-19 14:09:04 -05:00
|
|
|
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
/* global source password is set.
|
|
|
|
* We need to set it on default mount.
|
|
|
|
* If default mount has a authstack not NULL we don't need to do anything.
|
|
|
|
*/
|
|
|
|
if (source_password) {
|
|
|
|
mount_proxy *mount = config_find_mount(configuration, NULL, MOUNT_TYPE_DEFAULT);
|
|
|
|
if (!mount) {
|
|
|
|
/* create a default mount here */
|
|
|
|
xmlNodePtr node;
|
|
|
|
node = xmlNewNode(NULL, XMLSTR("mount"));
|
|
|
|
xmlSetProp(node, XMLSTR("type"), XMLSTR("default"));
|
|
|
|
_parse_mount(doc, node, configuration);
|
|
|
|
xmlFreeNode(node);
|
|
|
|
mount = config_find_mount(configuration, NULL, MOUNT_TYPE_DEFAULT);
|
|
|
|
}
|
|
|
|
if (mount) {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (!mount->authstack) {
|
|
|
|
__append_old_style_auth(&mount->authstack,
|
|
|
|
"legacy-global-source",
|
|
|
|
AUTH_TYPE_STATIC, "source",
|
|
|
|
source_password, NULL,
|
|
|
|
"source,put,get", 0, "*");
|
|
|
|
}
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
} else {
|
2015-01-25 13:57:27 -05:00
|
|
|
ICECAST_LOG_ERROR("Can not find nor create default mount but "
|
|
|
|
"global lagency source password set. Bad.");
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
}
|
2014-12-20 10:29:53 -05:00
|
|
|
xmlFree(source_password);
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
}
|
2007-12-19 14:09:04 -05:00
|
|
|
/* drop the first listening socket details if more than one is defined, as we only
|
|
|
|
* have port or listen-socket not both */
|
2015-01-25 13:57:27 -05:00
|
|
|
if (configuration->listen_sock_count > 1) {
|
|
|
|
configuration->listen_sock = config_clear_listener(configuration->listen_sock);
|
2007-12-19 14:09:04 -05:00
|
|
|
configuration->listen_sock_count--;
|
|
|
|
}
|
2007-12-20 11:36:37 -05:00
|
|
|
if (configuration->port == 0)
|
|
|
|
configuration->port = 8000;
|
2014-11-07 14:14:28 -05:00
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
/* issue some warnings on bad configurations */
|
|
|
|
if (!configuration->fileserve)
|
|
|
|
ICECAST_LOG_WARN("Warning, serving of static files has been disabled "
|
|
|
|
"in the config, this will also affect files used by the web "
|
|
|
|
"interface (stylesheets, images).");
|
|
|
|
|
|
|
|
__check_hostname(configuration);
|
|
|
|
|
|
|
|
if (!configuration->location ||
|
|
|
|
strcmp(configuration->location, CONFIG_DEFAULT_LOCATION) == 0) {
|
|
|
|
ICECAST_LOG_WARN("Warning, <location> not configured, using default "
|
|
|
|
"value \"%s\".", CONFIG_DEFAULT_LOCATION);
|
2014-11-07 14:14:28 -05:00
|
|
|
if (!configuration->location)
|
2015-01-25 13:57:27 -05:00
|
|
|
configuration->location = (char *) xmlCharStrdup(CONFIG_DEFAULT_LOCATION);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!configuration->admin ||
|
|
|
|
strcmp(configuration->admin, CONFIG_DEFAULT_ADMIN) == 0) {
|
|
|
|
ICECAST_LOG_WARN("Warning, <admin> contact not configured, using "
|
|
|
|
"default value \"%s\".", CONFIG_DEFAULT_ADMIN);
|
2014-11-07 14:14:28 -05:00
|
|
|
if (!configuration->admin)
|
2015-01-25 13:57:27 -05:00
|
|
|
configuration->admin = (char *) xmlCharStrdup(CONFIG_DEFAULT_ADMIN);
|
2014-11-07 14:14:28 -05:00
|
|
|
}
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _parse_limits(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_t *configuration)
|
2003-07-20 21:39:39 -04:00
|
|
|
{
|
|
|
|
char *tmp;
|
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2007-10-04 12:48:38 -04:00
|
|
|
if (xmlStrcmp (node->name, XMLSTR("clients")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
configuration->client_limit = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("sources")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
configuration->source_limit = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("queue-size")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
configuration->queue_size_limit = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("threadpool")) == 0) {
|
2014-11-20 13:36:57 -05:00
|
|
|
ICECAST_LOG_WARN("<threadpool> deprecated and will be removed in version 2.5.");
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("client-timeout")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
configuration->client_timeout = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("header-timeout")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
configuration->header_timeout = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("source-timeout")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
configuration->source_timeout = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("burst-on-connect")) == 0) {
|
2004-04-29 11:23:13 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2004-08-20 11:13:59 -04:00
|
|
|
if (atoi(tmp) == 0)
|
|
|
|
configuration->burst_size = 0;
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("burst-size")) == 0) {
|
2004-08-20 11:13:59 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
configuration->burst_size = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
} while ((node = node->next));
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _parse_mount_oldstyle_authentication(mount_proxy *mount,
|
|
|
|
xmlNodePtr node,
|
|
|
|
auth_stack_t **authstack)
|
|
|
|
{
|
|
|
|
int allow_duplicate_users = 1;
|
|
|
|
auth_t *auth;
|
|
|
|
char *type;
|
|
|
|
char *name;
|
|
|
|
char *value;
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
xmlNodePtr child;
|
|
|
|
|
|
|
|
child = node->xmlChildrenNode;
|
|
|
|
|
|
|
|
while (child) {
|
2014-12-14 04:27:49 -05:00
|
|
|
if (xmlStrcmp(child->name, XMLSTR("option")) == 0) {
|
|
|
|
name = (char *)xmlGetProp(child, XMLSTR("name"));
|
|
|
|
value = (char *)xmlGetProp(child, XMLSTR("value"));
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
if (name && value) {
|
|
|
|
if (strcmp(name, "allow_duplicate_users") == 0) {
|
|
|
|
allow_duplicate_users = util_str_to_bool(value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (name)
|
|
|
|
xmlFree(name);
|
|
|
|
if (value)
|
|
|
|
xmlFree(value);
|
|
|
|
}
|
|
|
|
child = child->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
type = (char *)xmlGetProp(node, XMLSTR("type"));
|
|
|
|
if (strcmp(type, AUTH_TYPE_HTPASSWD) == 0) {
|
|
|
|
if (!allow_duplicate_users)
|
|
|
|
xmlSetProp(node, XMLSTR("connections-per-user"), XMLSTR("0"));
|
|
|
|
|
|
|
|
auth = auth_get_authenticator(node);
|
|
|
|
if (auth) {
|
|
|
|
auth_stack_push(authstack, auth);
|
|
|
|
auth_release(auth);
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
__append_old_style_auth(authstack, NULL, AUTH_TYPE_ANONYMOUS,
|
|
|
|
NULL, NULL, "get,head,post", NULL, 0, NULL);
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
} else if (strcmp(type, AUTH_TYPE_URL) == 0) {
|
|
|
|
/* This block is super fun! Attention! Super fun ahead! Ladies and Gentlemans take care and watch your children! */
|
|
|
|
/* Stuff that was of help:
|
|
|
|
* $ sed 's/^.*name="\([^"]*\)".*$/ const char *\1 = NULL;/'
|
|
|
|
* $ sed 's/^.*name="\([^"]*\)".*$/ if (\1)\n xmlFree(\1);/'
|
|
|
|
* $ sed 's/^.*name="\([^"]*\)".*$/ } else if (strcmp(name, "\1") == 0) {\n \1 = value;\n value = NULL;/'
|
|
|
|
*/
|
|
|
|
/* urls */
|
|
|
|
char *mount_add = NULL;
|
|
|
|
char *mount_remove = NULL;
|
|
|
|
char *listener_add = NULL;
|
|
|
|
char *listener_remove = NULL;
|
|
|
|
char *stream_auth = NULL;
|
|
|
|
/* request credentials */
|
|
|
|
char *username = NULL;
|
|
|
|
char *password = NULL;
|
|
|
|
/* general options */
|
|
|
|
char *auth_header = NULL;
|
|
|
|
char *timelimit_header = NULL;
|
|
|
|
char *headers = NULL;
|
|
|
|
char *header_prefix = NULL;
|
|
|
|
|
|
|
|
child = node->xmlChildrenNode;
|
|
|
|
while (child) {
|
2014-12-14 04:27:49 -05:00
|
|
|
if (xmlStrcmp(child->name, XMLSTR("option")) == 0) {
|
|
|
|
name = (char *)xmlGetProp(child, XMLSTR("name"));
|
|
|
|
value = (char *)xmlGetProp(child, XMLSTR("value"));
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
|
|
|
|
if (name && value) {
|
|
|
|
if (strcmp(name, "mount_add") == 0) {
|
|
|
|
mount_add = value;
|
|
|
|
value = NULL;
|
|
|
|
} else if (strcmp(name, "mount_add") == 0) {
|
|
|
|
mount_add = value;
|
|
|
|
value = NULL;
|
|
|
|
} else if (strcmp(name, "mount_remove") == 0) {
|
|
|
|
mount_remove = value;
|
|
|
|
value = NULL;
|
|
|
|
} else if (strcmp(name, "listener_add") == 0) {
|
|
|
|
listener_add = value;
|
|
|
|
value = NULL;
|
|
|
|
} else if (strcmp(name, "listener_remove") == 0) {
|
|
|
|
listener_remove = value;
|
|
|
|
value = NULL;
|
|
|
|
} else if (strcmp(name, "username") == 0) {
|
|
|
|
username = value;
|
|
|
|
value = NULL;
|
|
|
|
} else if (strcmp(name, "password") == 0) {
|
|
|
|
password = value;
|
|
|
|
value = NULL;
|
|
|
|
} else if (strcmp(name, "auth_header") == 0) {
|
|
|
|
auth_header = value;
|
|
|
|
value = NULL;
|
|
|
|
} else if (strcmp(name, "timelimit_header") == 0) {
|
|
|
|
timelimit_header = value;
|
|
|
|
value = NULL;
|
|
|
|
} else if (strcmp(name, "headers") == 0) {
|
|
|
|
headers = value;
|
|
|
|
value = NULL;
|
|
|
|
} else if (strcmp(name, "header_prefix") == 0) {
|
|
|
|
header_prefix = value;
|
|
|
|
value = NULL;
|
|
|
|
} else if (strcmp(name, "stream_auth") == 0) {
|
|
|
|
stream_auth = value;
|
|
|
|
value = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (name)
|
|
|
|
xmlFree(name);
|
|
|
|
if (value)
|
|
|
|
xmlFree(value);
|
|
|
|
}
|
|
|
|
child = child->next;
|
|
|
|
}
|
|
|
|
|
2014-12-07 19:39:57 -05:00
|
|
|
if (mount_add)
|
2015-01-25 13:57:27 -05:00
|
|
|
__append_old_style_url_event(&mount->event, "source-connect",
|
|
|
|
mount_add, "mount_add", username, password);
|
2014-12-07 19:39:57 -05:00
|
|
|
if (mount_remove)
|
2015-01-25 13:57:27 -05:00
|
|
|
__append_old_style_url_event(&mount->event, "source-disconnect",
|
|
|
|
mount_add, "mount_remove", username, password);
|
|
|
|
|
|
|
|
__append_old_style_urlauth(authstack, listener_add, listener_remove,
|
|
|
|
"listener_add", "listener_remove", username, password, 0,
|
|
|
|
auth_header, timelimit_header, headers, header_prefix);
|
|
|
|
__append_old_style_urlauth(authstack, stream_auth, NULL, "stream_auth",
|
|
|
|
NULL, username, password, 1, auth_header, timelimit_header,
|
|
|
|
headers, header_prefix);
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
if (listener_add)
|
2015-01-25 13:57:27 -05:00
|
|
|
__append_old_style_auth(authstack, NULL, AUTH_TYPE_ANONYMOUS, NULL,
|
|
|
|
NULL, "get,put,head", NULL, 0, NULL);
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
if (stream_auth)
|
2015-01-25 13:57:27 -05:00
|
|
|
__append_old_style_auth(authstack, NULL, AUTH_TYPE_ANONYMOUS, NULL,
|
|
|
|
NULL, "source,put", NULL, 0, NULL);
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
|
|
|
|
if (mount_add)
|
|
|
|
xmlFree(mount_add);
|
|
|
|
if (mount_remove)
|
|
|
|
xmlFree(mount_remove);
|
|
|
|
if (listener_add)
|
|
|
|
xmlFree(listener_add);
|
|
|
|
if (listener_remove)
|
|
|
|
xmlFree(listener_remove);
|
|
|
|
if (username)
|
|
|
|
xmlFree(username);
|
|
|
|
if (password)
|
|
|
|
xmlFree(password);
|
|
|
|
if (auth_header)
|
|
|
|
xmlFree(auth_header);
|
|
|
|
if (timelimit_header)
|
|
|
|
xmlFree(timelimit_header);
|
|
|
|
if (headers)
|
|
|
|
xmlFree(headers);
|
|
|
|
if (header_prefix)
|
|
|
|
xmlFree(header_prefix);
|
|
|
|
if (stream_auth)
|
|
|
|
xmlFree(stream_auth);
|
|
|
|
} else {
|
2015-01-25 13:57:27 -05:00
|
|
|
ICECAST_LOG_ERROR("Unknown authentication type in legacy mode. "
|
|
|
|
"Disable anonymous login listener and global login for source.");
|
|
|
|
__append_old_style_auth(authstack, NULL, AUTH_TYPE_ANONYMOUS, NULL,
|
|
|
|
NULL, NULL, NULL, 0, NULL);
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
}
|
|
|
|
xmlFree(type);
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _parse_mount(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_t *configuration)
|
2003-07-20 21:39:39 -04:00
|
|
|
{
|
2015-01-25 13:57:27 -05:00
|
|
|
char *tmp;
|
|
|
|
mount_proxy *mount = calloc(1, sizeof(mount_proxy));
|
|
|
|
mount_proxy *current = configuration->mounts;
|
|
|
|
mount_proxy *last = NULL;
|
|
|
|
char *username = NULL;
|
|
|
|
char *password = NULL;
|
|
|
|
auth_stack_t *authstack = NULL;
|
2015-01-10 13:53:44 -05:00
|
|
|
|
2004-08-20 11:13:59 -04:00
|
|
|
/* default <mount> settings */
|
2015-01-25 13:57:27 -05:00
|
|
|
mount->mounttype = MOUNT_TYPE_NORMAL;
|
|
|
|
mount->max_listeners = -1;
|
|
|
|
mount->burst_size = -1;
|
|
|
|
mount->mp3_meta_interval = -1;
|
|
|
|
mount->yp_public = -1;
|
|
|
|
mount->next = NULL;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2013-04-02 14:46:44 -04:00
|
|
|
tmp = (char *)xmlGetProp(node, XMLSTR("type"));
|
|
|
|
if (tmp) {
|
|
|
|
if (strcmp(tmp, "normal") == 0) {
|
2015-01-09 20:48:15 -05:00
|
|
|
mount->mounttype = MOUNT_TYPE_NORMAL;
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (strcmp(tmp, "default") == 0) {
|
2015-01-09 20:48:15 -05:00
|
|
|
mount->mounttype = MOUNT_TYPE_DEFAULT;
|
2015-01-25 13:57:27 -05:00
|
|
|
} else {
|
2015-01-09 20:48:15 -05:00
|
|
|
ICECAST_LOG_WARN("Unknown mountpoint type: %s", tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
config_clear_mount(mount);
|
2013-04-02 14:46:44 -04:00
|
|
|
return;
|
2015-01-09 20:48:15 -05:00
|
|
|
}
|
|
|
|
xmlFree(tmp);
|
2013-04-02 14:46:44 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
node = node->xmlChildrenNode;
|
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
if (xmlStrcmp(node->name, XMLSTR("mount-name")) == 0) {
|
|
|
|
mount->mountname = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("username")) == 0) {
|
|
|
|
username = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("password")) == 0) {
|
|
|
|
password = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("dump-file")) == 0) {
|
|
|
|
mount->dumpfile = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("intro")) == 0) {
|
|
|
|
mount->intro_filename = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("fallback-mount")) == 0) {
|
|
|
|
mount->fallback_mount = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("fallback-when-full")) == 0) {
|
2005-08-23 14:40:20 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
mount->fallback_when_full = util_str_to_bool(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("max-listeners")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
mount->max_listeners = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("charset")) == 0) {
|
2007-08-24 11:44:37 -04:00
|
|
|
mount->charset = (char *)xmlNodeListGetString(doc,
|
2015-01-25 13:57:27 -05:00
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("mp3-metadata-interval")) == 0) {
|
2005-05-07 16:18:13 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
mount->mp3_meta_interval = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("fallback-override")) == 0) {
|
2004-01-14 20:01:09 -05:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
mount->fallback_override = util_str_to_bool(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("no-mount")) == 0) {
|
2004-01-14 20:01:09 -05:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
mount->no_mount = util_str_to_bool(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("no-yp")) == 0) {
|
|
|
|
ICECAST_LOG_WARN("<no-yp> defined. Please use <public>. This is "
|
|
|
|
"deprecated and will be removed in version 2.5.");
|
2004-11-21 10:51:49 -05:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
mount->yp_public = util_str_to_bool(tmp) == 0 ? -1 : 0;
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("hidden")) == 0) {
|
2004-11-22 13:21:48 -05:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
mount->hidden = util_str_to_bool(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("authentication")) == 0) {
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
tmp = (char *)xmlGetProp(node, XMLSTR("type"));
|
|
|
|
if (tmp) {
|
|
|
|
xmlFree(tmp);
|
|
|
|
_parse_mount_oldstyle_authentication(mount, node, &authstack);
|
|
|
|
} else {
|
|
|
|
xmlNodePtr child = node->xmlChildrenNode;
|
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (child == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(child))
|
|
|
|
continue;
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
if (xmlStrcmp (child->name, XMLSTR("role")) == 0) {
|
|
|
|
auth_t *auth = auth_get_authenticator(child);
|
|
|
|
auth_stack_push(&authstack, auth);
|
|
|
|
auth_release(auth);
|
|
|
|
}
|
|
|
|
} while ((child = child->next));
|
|
|
|
}
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("on-connect")) == 0) {
|
2014-12-07 19:39:57 -05:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
if (tmp) {
|
2015-01-25 13:57:27 -05:00
|
|
|
__append_old_style_exec_event(&mount->event,
|
|
|
|
"source-connect", tmp);
|
2014-12-07 19:39:57 -05:00
|
|
|
xmlFree(tmp);
|
|
|
|
}
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("on-disconnect")) == 0) {
|
2014-12-07 19:39:57 -05:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
if (tmp) {
|
2015-01-25 13:57:27 -05:00
|
|
|
__append_old_style_exec_event(&mount->event,
|
|
|
|
"source-disconnect", tmp);
|
2014-12-07 19:39:57 -05:00
|
|
|
xmlFree(tmp);
|
|
|
|
}
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("max-listener-duration")) == 0) {
|
2005-08-23 15:00:15 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
mount->max_listener_duration = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("queue-size")) == 0) {
|
2004-02-26 06:56:48 -05:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
mount->queue_size_limit = atoi (tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("source-timeout")) == 0) {
|
2004-02-26 06:56:48 -05:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp) {
|
2004-02-26 06:56:48 -05:00
|
|
|
mount->source_timeout = atoi (tmp);
|
|
|
|
xmlFree(tmp);
|
|
|
|
}
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("burst-size")) == 0) {
|
2004-08-20 11:13:59 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
mount->burst_size = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("cluster-password")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
mount->cluster_password = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("stream-name")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
mount->stream_name = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("stream-description")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
mount->stream_description = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("stream-url")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
mount->stream_url = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("genre")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
mount->stream_genre = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("bitrate")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
mount->bitrate = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("public")) == 0) {
|
2005-05-30 10:50:57 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
mount->yp_public = __parse_public(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("type")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
mount->type = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("subtype")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
mount->subtype = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
2014-11-06 21:55:57 -05:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("http-headers")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
_parse_http_headers(doc, node->xmlChildrenNode,
|
|
|
|
&(mount->http_headers));
|
2014-12-07 19:39:57 -05:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("kartoffelsalat")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
/* BEFORE RELEASE NEXT REVIEW: Should this tag
|
|
|
|
* really be <kartoffelsalat>?
|
|
|
|
*/
|
2014-12-07 19:39:57 -05:00
|
|
|
_parse_events(&mount->event, node->xmlChildrenNode);
|
2004-02-26 06:56:48 -05:00
|
|
|
}
|
2003-07-20 21:39:39 -04:00
|
|
|
} while ((node = node->next));
|
2005-10-11 09:40:17 -04:00
|
|
|
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
if (password) {
|
|
|
|
auth_stack_t *old_style = NULL;
|
2015-01-25 13:57:27 -05:00
|
|
|
__append_old_style_auth(&old_style, "legacy-mount-source",
|
|
|
|
AUTH_TYPE_STATIC, username ? username : "source", password, NULL,
|
|
|
|
"source,put,get", 0, "*");
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
if (authstack) {
|
|
|
|
auth_stack_append(old_style, authstack);
|
|
|
|
auth_stack_release(authstack);
|
|
|
|
}
|
|
|
|
authstack = old_style;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (username)
|
|
|
|
xmlFree(username);
|
|
|
|
if (password)
|
|
|
|
xmlFree(password);
|
|
|
|
|
|
|
|
if (mount->authstack)
|
|
|
|
auth_stack_release(mount->authstack);
|
|
|
|
auth_stack_addref(mount->authstack = authstack);
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
ICECAST_LOG_DEBUG("Mount %p (mountpoint %s) has %sactive "
|
|
|
|
"roles on authstack.", mount, mount->mountname, authstack ? "" : "no ");
|
2014-12-14 04:27:49 -05:00
|
|
|
|
2005-10-11 09:40:17 -04:00
|
|
|
/* make sure we have at least the mountpoint name */
|
2015-01-25 13:57:27 -05:00
|
|
|
if (mount->mountname == NULL && mount->mounttype != MOUNT_TYPE_DEFAULT) {
|
2005-10-11 09:40:17 -04:00
|
|
|
config_clear_mount (mount);
|
|
|
|
return;
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (mount->mountname != NULL && mount->mounttype == MOUNT_TYPE_DEFAULT) {
|
|
|
|
ICECAST_LOG_WARN("Default mount %s has mount-name set. This is "
|
|
|
|
"not supported. Behavior may not be consistent.", mount->mountname);
|
2013-04-05 15:49:13 -04:00
|
|
|
}
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
|
|
|
|
while (authstack) {
|
|
|
|
auth_t *auth = auth_stack_get(authstack);
|
|
|
|
if (mount->mountname) {
|
|
|
|
auth->mount = strdup((char *)mount->mountname);
|
|
|
|
} else if (mount->mounttype == MOUNT_TYPE_DEFAULT ) {
|
|
|
|
auth->mount = strdup("(default mount)");
|
|
|
|
}
|
|
|
|
auth_release(auth);
|
|
|
|
auth_stack_next(&authstack);
|
2014-10-26 10:03:57 -04:00
|
|
|
}
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
|
2005-10-11 09:40:17 -04:00
|
|
|
while(current) {
|
|
|
|
last = current;
|
|
|
|
current = current->next;
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
if (!mount->fallback_mount && (mount->fallback_when_full || mount->fallback_override)) {
|
|
|
|
ICECAST_LOG_WARN("Config for mount %s contains fallback options "
|
|
|
|
"but no fallback mount.", mount->mountname);
|
2013-01-02 09:44:08 -05:00
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
if(last) {
|
2005-10-11 09:40:17 -04:00
|
|
|
last->next = mount;
|
2015-01-25 13:57:27 -05:00
|
|
|
} else {
|
2005-10-11 09:40:17 -04:00
|
|
|
configuration->mounts = mount;
|
2015-01-25 13:57:27 -05:00
|
|
|
}
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _parse_http_headers(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_http_header_t **http_headers)
|
|
|
|
{
|
2014-11-06 19:56:02 -05:00
|
|
|
ice_config_http_header_t *header;
|
|
|
|
ice_config_http_header_t *next;
|
2015-01-25 13:57:27 -05:00
|
|
|
char *name = NULL;
|
|
|
|
char *value = NULL;
|
|
|
|
char *tmp;
|
|
|
|
int status;
|
|
|
|
http_header_type type;
|
2014-11-06 19:56:02 -05:00
|
|
|
|
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
|
|
|
if (xmlStrcmp (node->name, XMLSTR("header")) != 0)
|
|
|
|
continue;
|
|
|
|
if (!(name = (char *)xmlGetProp(node, XMLSTR("name"))))
|
|
|
|
break;
|
|
|
|
if (!(value = (char *)xmlGetProp(node, XMLSTR("value"))))
|
|
|
|
break;
|
2014-11-06 19:56:02 -05:00
|
|
|
|
2014-11-07 05:12:24 -05:00
|
|
|
type = HTTP_HEADER_TYPE_STATIC; /* default */
|
|
|
|
if ((tmp = (char *)xmlGetProp(node, XMLSTR("type")))) {
|
|
|
|
if (strcmp(tmp, "static") == 0) {
|
|
|
|
type = HTTP_HEADER_TYPE_STATIC;
|
|
|
|
} else {
|
2015-01-25 13:57:27 -05:00
|
|
|
ICECAST_LOG_WARN("Unknown type %s for "
|
|
|
|
"HTTP Header %s", tmp, name);
|
2014-11-07 05:12:24 -05:00
|
|
|
xmlFree(tmp);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
xmlFree(tmp);
|
|
|
|
}
|
|
|
|
|
|
|
|
status = 0; /* default: any */
|
|
|
|
if ((tmp = (char *)xmlGetProp(node, XMLSTR("status")))) {
|
|
|
|
status = atoi(tmp);
|
|
|
|
xmlFree(tmp);
|
|
|
|
}
|
|
|
|
|
2014-11-06 19:56:02 -05:00
|
|
|
header = calloc(1, sizeof(ice_config_http_header_t));
|
2015-01-25 13:57:27 -05:00
|
|
|
if (!header)
|
|
|
|
break;
|
|
|
|
|
|
|
|
header->type = type;
|
|
|
|
header->name = name;
|
|
|
|
header->value = value;
|
|
|
|
header->status = status;
|
|
|
|
name = NULL;
|
|
|
|
value = NULL;
|
2014-11-06 19:56:02 -05:00
|
|
|
|
2014-11-06 21:55:57 -05:00
|
|
|
if (!*http_headers) {
|
|
|
|
*http_headers = header;
|
2014-11-06 19:56:02 -05:00
|
|
|
continue;
|
|
|
|
}
|
2014-11-06 21:55:57 -05:00
|
|
|
next = *http_headers;
|
2015-01-25 13:57:27 -05:00
|
|
|
while (next->next) {
|
|
|
|
next = next->next;
|
|
|
|
}
|
2014-11-06 19:56:02 -05:00
|
|
|
next->next = header;
|
|
|
|
} while ((node = node->next));
|
|
|
|
/* in case we used break we may need to clean those up */
|
|
|
|
if (name)
|
2015-01-09 20:48:15 -05:00
|
|
|
xmlFree(name);
|
2014-11-06 19:56:02 -05:00
|
|
|
if (value)
|
2015-01-09 20:48:15 -05:00
|
|
|
xmlFree(value);
|
2014-11-06 19:56:02 -05:00
|
|
|
}
|
2005-05-30 10:50:57 -04:00
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _parse_relay(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_t *configuration)
|
2003-07-20 21:39:39 -04:00
|
|
|
{
|
2015-01-25 13:57:27 -05:00
|
|
|
char *tmp;
|
|
|
|
relay_server *relay = calloc(1, sizeof(relay_server));
|
|
|
|
relay_server *current = configuration->relay;
|
|
|
|
relay_server *last = NULL;
|
2004-02-26 06:56:48 -05:00
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
while(current) {
|
|
|
|
last = current;
|
|
|
|
current = current->next;
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
if (last) {
|
2003-07-20 21:39:39 -04:00
|
|
|
last->next = relay;
|
2015-01-25 13:57:27 -05:00
|
|
|
} else {
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->relay = relay;
|
2015-01-25 13:57:27 -05:00
|
|
|
}
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
relay->next = NULL;
|
|
|
|
relay->mp3metadata = 1;
|
|
|
|
relay->on_demand = configuration->on_demand;
|
|
|
|
relay->server = (char *) xmlCharStrdup("127.0.0.1");
|
|
|
|
relay->mount = (char *) xmlCharStrdup("/");
|
2003-07-20 21:39:39 -04:00
|
|
|
|
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
if (xmlStrcmp(node->name, XMLSTR("server")) == 0) {
|
|
|
|
if (relay->server)
|
|
|
|
xmlFree (relay->server);
|
|
|
|
relay->server = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("port")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-06 20:40:28 -05:00
|
|
|
if (tmp) {
|
|
|
|
relay->port = atoi(tmp);
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else {
|
|
|
|
ICECAST_LOG_WARN("<port> must not be empty.");
|
|
|
|
}
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("mount")) == 0) {
|
|
|
|
if (relay->mount)
|
|
|
|
xmlFree (relay->mount);
|
|
|
|
relay->mount = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("local-mount")) == 0) {
|
|
|
|
if (relay->localmount)
|
|
|
|
xmlFree (relay->localmount);
|
|
|
|
relay->localmount = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("relay-shoutcast-metadata")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
relay->mp3metadata = util_str_to_bool(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("username")) == 0) {
|
|
|
|
if (relay->username)
|
|
|
|
xmlFree (relay->username);
|
2004-12-09 12:08:52 -05:00
|
|
|
relay->username = (char *)xmlNodeListGetString(doc,
|
2015-01-25 13:57:27 -05:00
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("password")) == 0) {
|
|
|
|
if (relay->password)
|
|
|
|
xmlFree (relay->password);
|
|
|
|
relay->password = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("on-demand")) == 0) {
|
2005-06-08 21:51:47 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
relay->on_demand = util_str_to_bool(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("bind")) == 0) {
|
|
|
|
if (relay->bind)
|
|
|
|
xmlFree (relay->bind);
|
|
|
|
relay->bind = (char *)xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
2009-03-16 21:45:41 -04:00
|
|
|
}
|
2003-07-20 21:39:39 -04:00
|
|
|
} while ((node = node->next));
|
2004-02-17 10:46:05 -05:00
|
|
|
if (relay->localmount == NULL)
|
2007-10-04 12:48:38 -04:00
|
|
|
relay->localmount = (char *)xmlStrdup (XMLSTR(relay->mount));
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _parse_listen_socket(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_t *configuration)
|
2003-07-20 21:39:39 -04:00
|
|
|
{
|
2015-01-25 13:57:27 -05:00
|
|
|
char *tmp;
|
|
|
|
listener_t *listener = calloc (1, sizeof(listener_t));
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2005-08-07 10:50:59 -04:00
|
|
|
if (listener == NULL)
|
|
|
|
return;
|
2007-10-15 21:53:06 -04:00
|
|
|
listener->port = 8000;
|
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2007-10-04 12:48:38 -04:00
|
|
|
if (xmlStrcmp (node->name, XMLSTR("port")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-06 20:40:28 -05:00
|
|
|
if (tmp) {
|
|
|
|
if(configuration->port == 0)
|
|
|
|
configuration->port = atoi(tmp);
|
|
|
|
listener->port = atoi(tmp);
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else {
|
|
|
|
ICECAST_LOG_WARN("<port> must not be empty.");
|
|
|
|
}
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("ssl")) == 0) {
|
2007-08-28 23:51:22 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
listener->ssl = util_str_to_bool(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("shoutcast-compat")) == 0) {
|
2004-11-11 10:47:33 -05:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
listener->shoutcast_compat = util_str_to_bool(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("shoutcast-mount")) == 0) {
|
|
|
|
if (listener->shoutcast_mount)
|
|
|
|
xmlFree (listener->shoutcast_mount);
|
2015-01-10 13:53:44 -05:00
|
|
|
listener->shoutcast_mount = (char *)xmlNodeListGetString(doc,
|
2015-01-25 13:57:27 -05:00
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("bind-address")) == 0) {
|
|
|
|
if (listener->bind_address)
|
|
|
|
xmlFree (listener->bind_address);
|
2015-01-10 13:53:44 -05:00
|
|
|
listener->bind_address = (char *)xmlNodeListGetString(doc,
|
2015-01-25 13:57:27 -05:00
|
|
|
node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("so-sndbuf")) == 0) {
|
2009-03-14 12:05:12 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
listener->so_sndbuf = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if(tmp)
|
|
|
|
xmlFree(tmp);
|
2009-03-14 12:05:12 -04:00
|
|
|
}
|
2003-07-20 21:39:39 -04:00
|
|
|
} while ((node = node->next));
|
2007-10-15 21:53:06 -04:00
|
|
|
|
2007-12-19 14:09:04 -05:00
|
|
|
/* we know there's at least one of these, so add this new one after the first
|
|
|
|
* that way it can be removed easily later on */
|
|
|
|
listener->next = configuration->listen_sock->next;
|
|
|
|
configuration->listen_sock->next = listener;
|
2007-10-15 21:53:06 -04:00
|
|
|
configuration->listen_sock_count++;
|
2015-01-25 13:57:27 -05:00
|
|
|
if (listener->shoutcast_mount) {
|
2007-10-24 22:25:49 -04:00
|
|
|
listener_t *sc_port = calloc (1, sizeof (listener_t));
|
|
|
|
sc_port->port = listener->port+1;
|
|
|
|
sc_port->shoutcast_compat = 1;
|
2015-01-25 13:57:27 -05:00
|
|
|
sc_port->shoutcast_mount = (char*)xmlStrdup(XMLSTR(listener->shoutcast_mount));
|
2007-10-24 22:25:49 -04:00
|
|
|
if (listener->bind_address)
|
2015-01-25 13:57:27 -05:00
|
|
|
sc_port->bind_address = (char*)xmlStrdup(XMLSTR(listener->bind_address));
|
2007-10-24 22:25:49 -04:00
|
|
|
|
2007-12-19 14:09:04 -05:00
|
|
|
sc_port->next = listener->next;
|
|
|
|
listener->next = sc_port;
|
2007-10-24 22:25:49 -04:00
|
|
|
configuration->listen_sock_count++;
|
|
|
|
}
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void _parse_authentication(xmlDocPtr doc, xmlNodePtr node,
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
ice_config_t *configuration, char **source_password)
|
2003-07-20 21:39:39 -04:00
|
|
|
{
|
2015-01-25 13:57:27 -05:00
|
|
|
char *admin_password = NULL,
|
|
|
|
*admin_username = NULL;
|
|
|
|
char *relay_password = NULL,
|
|
|
|
*relay_username = (char*)xmlCharStrdup(CONFIG_DEFAULT_MASTER_USERNAME);
|
|
|
|
auth_stack_t *old_style = NULL,
|
|
|
|
*new_style = NULL;
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2014-11-30 15:32:30 -05:00
|
|
|
if (xmlStrcmp(node->name, XMLSTR("source-password")) == 0) {
|
2012-10-11 18:28:40 -04:00
|
|
|
if (xmlGetProp(node, XMLSTR("mount"))) {
|
2014-10-31 04:46:58 -04:00
|
|
|
ICECAST_LOG_ERROR("Mount level source password defined within global <authentication> section.");
|
2015-01-25 13:57:27 -05:00
|
|
|
} else {
|
|
|
|
if (*source_password)
|
|
|
|
xmlFree(*source_password);
|
|
|
|
*source_password = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("admin-password")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
if(admin_password)
|
|
|
|
xmlFree(admin_password);
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
admin_password = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("admin-user")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
if(admin_username)
|
|
|
|
xmlFree(admin_username);
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
admin_username = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("relay-password")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
if(relay_password)
|
|
|
|
xmlFree(relay_password);
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
relay_password = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("relay-user")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
if(relay_username)
|
|
|
|
xmlFree(relay_username);
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
relay_username = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("role")) == 0) {
|
|
|
|
auth_t *auth = auth_get_authenticator(node);
|
|
|
|
auth_stack_push(&new_style, auth);
|
|
|
|
auth_release(auth);
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
} while ((node = node->next));
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
|
|
|
|
if (admin_password && admin_username)
|
2015-01-25 13:57:27 -05:00
|
|
|
__append_old_style_auth(&old_style, "legacy-admin", AUTH_TYPE_STATIC,
|
|
|
|
admin_username, admin_password, NULL, "get,post,head", 1, "*");
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
|
|
|
|
if (relay_password && relay_username)
|
2015-01-25 13:57:27 -05:00
|
|
|
__append_old_style_auth(&old_style, "legacy-relay", AUTH_TYPE_STATIC,
|
|
|
|
relay_username, relay_password, NULL, "get", 1, "streamlist.txt");
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
|
|
|
|
if (admin_password)
|
|
|
|
xmlFree(admin_password);
|
|
|
|
if (admin_username)
|
|
|
|
xmlFree(admin_username);
|
|
|
|
if (relay_password)
|
|
|
|
xmlFree(relay_password);
|
|
|
|
if (relay_username)
|
|
|
|
xmlFree(relay_username);
|
|
|
|
|
|
|
|
if (old_style && new_style) {
|
|
|
|
auth_stack_append(old_style, new_style);
|
|
|
|
auth_stack_release(new_style);
|
|
|
|
} else if (new_style) {
|
|
|
|
old_style = new_style;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* default unauthed anonymous account */
|
2015-01-25 13:57:27 -05:00
|
|
|
__append_old_style_auth(&old_style, "anonymous", AUTH_TYPE_ANONYMOUS,
|
|
|
|
NULL, NULL, NULL, "get,post,head", 1, NULL);
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
if (!old_style)
|
|
|
|
ICECAST_LOG_ERROR("BAD. old_style=NULL");
|
|
|
|
|
|
|
|
if (configuration->authstack)
|
|
|
|
auth_stack_release(configuration->authstack);
|
|
|
|
configuration->authstack = old_style;
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _parse_directory(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_t *configuration)
|
2003-07-20 21:39:39 -04:00
|
|
|
{
|
|
|
|
char *tmp;
|
|
|
|
|
|
|
|
if (configuration->num_yp_directories >= MAX_YP_DIRECTORIES) {
|
2014-10-31 04:46:58 -04:00
|
|
|
ICECAST_LOG_ERROR("Maximum number of yp directories exceeded!");
|
2003-07-20 21:39:39 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2007-10-04 12:48:38 -04:00
|
|
|
if (xmlStrcmp (node->name, XMLSTR("yp-url")) == 0) {
|
2015-01-10 13:53:44 -05:00
|
|
|
if (configuration->yp_url[configuration->num_yp_directories])
|
2003-07-20 21:39:39 -04:00
|
|
|
xmlFree(configuration->yp_url[configuration->num_yp_directories]);
|
2015-01-10 13:53:44 -05:00
|
|
|
configuration->yp_url[configuration->num_yp_directories] =
|
2003-07-20 21:39:39 -04:00
|
|
|
(char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("yp-url-timeout")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-10 13:53:44 -05:00
|
|
|
configuration->yp_url_timeout[configuration->num_yp_directories] =
|
2003-07-20 21:39:39 -04:00
|
|
|
atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("server")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
_add_server(doc, node->xmlChildrenNode, configuration);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("touch-interval")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
configuration
|
|
|
|
->yp_touch_interval[configuration->num_yp_directories] =
|
|
|
|
atoi(tmp);
|
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
} while ((node = node->next));
|
2008-05-11 19:20:50 -04:00
|
|
|
if (configuration->yp_url [configuration->num_yp_directories] == NULL)
|
|
|
|
return;
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->num_yp_directories++;
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _parse_paths(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_t *configuration)
|
2003-07-20 21:39:39 -04:00
|
|
|
{
|
2015-01-25 13:57:27 -05:00
|
|
|
char *temp;
|
|
|
|
aliases *alias,
|
|
|
|
*current,
|
|
|
|
*last;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
if (xmlStrcmp(node->name, XMLSTR("basedir")) == 0) {
|
|
|
|
if (configuration->base_dir)
|
|
|
|
xmlFree(configuration->base_dir);
|
|
|
|
configuration->base_dir =
|
|
|
|
(char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("logdir")) == 0) {
|
2014-11-06 20:40:28 -05:00
|
|
|
if (!(temp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1))) {
|
|
|
|
ICECAST_LOG_WARN("<logdir> must not be empty.");
|
|
|
|
continue;
|
|
|
|
}
|
2015-01-25 13:57:27 -05:00
|
|
|
if (configuration->log_dir)
|
|
|
|
xmlFree(configuration->log_dir);
|
2014-11-06 20:40:28 -05:00
|
|
|
configuration->log_dir = temp;
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("pidfile")) == 0) {
|
|
|
|
if (configuration->pidfile)
|
|
|
|
xmlFree(configuration->pidfile);
|
2003-12-01 18:30:13 -05:00
|
|
|
configuration->pidfile = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("nulldevice")) == 0) {
|
|
|
|
if (configuration->null_device)
|
|
|
|
xmlFree(configuration->null_device);
|
2014-11-21 04:28:29 -05:00
|
|
|
configuration->null_device = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("deny-ip")) == 0) {
|
|
|
|
if (configuration->banfile)
|
|
|
|
xmlFree(configuration->banfile);
|
2007-10-23 18:25:31 -04:00
|
|
|
configuration->banfile = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("allow-ip")) == 0) {
|
|
|
|
if (configuration->allowfile)
|
|
|
|
xmlFree(configuration->allowfile);
|
2007-10-23 18:25:31 -04:00
|
|
|
configuration->allowfile = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("ssl-certificate")) == 0) {
|
|
|
|
if (configuration->cert_file)
|
|
|
|
xmlFree(configuration->cert_file);
|
2007-08-28 23:51:22 -04:00
|
|
|
configuration->cert_file = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("ssl-allowed-ciphers")) == 0) {
|
|
|
|
if (configuration->cipher_list)
|
|
|
|
xmlFree(configuration->cipher_list);
|
2011-11-25 17:12:11 -05:00
|
|
|
configuration->cipher_list = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("webroot")) == 0) {
|
2014-11-06 20:40:28 -05:00
|
|
|
if (!(temp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1))) {
|
|
|
|
ICECAST_LOG_WARN("<webroot> must not be empty.");
|
|
|
|
continue;
|
|
|
|
}
|
2015-01-25 13:57:27 -05:00
|
|
|
if (configuration->webroot_dir)
|
|
|
|
xmlFree(configuration->webroot_dir);
|
2014-11-06 20:40:28 -05:00
|
|
|
configuration->webroot_dir = temp;
|
2015-01-25 13:57:27 -05:00
|
|
|
if (configuration->webroot_dir[strlen(configuration->webroot_dir)-1] == '/')
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->webroot_dir[strlen(configuration->webroot_dir)-1] = 0;
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("adminroot")) == 0) {
|
2014-11-06 20:40:28 -05:00
|
|
|
if (!(temp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1))) {
|
|
|
|
ICECAST_LOG_WARN("<adminroot> must not be empty.");
|
|
|
|
continue;
|
|
|
|
}
|
2015-01-10 13:53:44 -05:00
|
|
|
if (configuration->adminroot_dir)
|
2003-07-20 21:39:39 -04:00
|
|
|
xmlFree(configuration->adminroot_dir);
|
2014-11-06 20:40:28 -05:00
|
|
|
configuration->adminroot_dir = (char *)temp;
|
2015-01-25 13:57:27 -05:00
|
|
|
if (configuration->adminroot_dir[strlen(configuration->adminroot_dir)-1] == '/')
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->adminroot_dir[strlen(configuration->adminroot_dir)-1] = 0;
|
2014-12-06 14:47:54 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("resource")) == 0 || xmlStrcmp(node->name, XMLSTR("alias")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
alias = malloc(sizeof(aliases));
|
|
|
|
alias->next = NULL;
|
2007-10-04 12:48:38 -04:00
|
|
|
alias->source = (char *)xmlGetProp(node, XMLSTR("source"));
|
2011-11-25 17:22:48 -05:00
|
|
|
alias->destination = (char *)xmlGetProp(node, XMLSTR("destination"));
|
|
|
|
if (!alias->destination)
|
|
|
|
alias->destination = (char *)xmlGetProp(node, XMLSTR("dest"));
|
2014-12-20 13:48:03 -05:00
|
|
|
|
|
|
|
if (!alias->source && alias->destination) {
|
|
|
|
alias->source = alias->destination;
|
|
|
|
alias->destination = NULL;
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (!alias->source && !alias->destination) {
|
2003-07-20 21:39:39 -04:00
|
|
|
xmlFree(alias->source);
|
2014-12-20 13:48:03 -05:00
|
|
|
xmlFree(alias->destination);
|
2003-07-20 21:39:39 -04:00
|
|
|
free(alias);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
temp = NULL;
|
2007-10-04 12:48:38 -04:00
|
|
|
temp = (char *)xmlGetProp(node, XMLSTR("port"));
|
2003-07-20 21:39:39 -04:00
|
|
|
if(temp != NULL) {
|
|
|
|
alias->port = atoi(temp);
|
|
|
|
xmlFree(temp);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else {
|
2003-07-20 21:39:39 -04:00
|
|
|
alias->port = -1;
|
2015-01-25 13:57:27 -05:00
|
|
|
}
|
2007-10-04 12:48:38 -04:00
|
|
|
alias->bind_address = (char *)xmlGetProp(node, XMLSTR("bind-address"));
|
2014-11-20 13:32:14 -05:00
|
|
|
alias->vhost = (char *)xmlGetProp(node, XMLSTR("vhost"));
|
2014-12-18 04:56:54 -05:00
|
|
|
temp = (char *)xmlGetProp(node, XMLSTR("omode"));
|
|
|
|
if (temp) {
|
|
|
|
alias->omode = config_str_to_omode(temp);
|
|
|
|
xmlFree(temp);
|
|
|
|
} else {
|
|
|
|
alias->omode = OMODE_DEFAULT;
|
|
|
|
}
|
2003-07-20 21:39:39 -04:00
|
|
|
current = configuration->aliases;
|
|
|
|
last = NULL;
|
2014-11-30 15:32:30 -05:00
|
|
|
while (current) {
|
2003-07-20 21:39:39 -04:00
|
|
|
last = current;
|
|
|
|
current = current->next;
|
|
|
|
}
|
2015-01-25 13:57:27 -05:00
|
|
|
if(last) {
|
2003-07-20 21:39:39 -04:00
|
|
|
last->next = alias;
|
2015-01-25 13:57:27 -05:00
|
|
|
} else {
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->aliases = alias;
|
2015-01-25 13:57:27 -05:00
|
|
|
}
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
} while ((node = node->next));
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _parse_logging(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_t *configuration)
|
2003-07-20 21:39:39 -04:00
|
|
|
{
|
2014-11-06 20:40:28 -05:00
|
|
|
char *tmp;
|
2003-07-20 21:39:39 -04:00
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2007-10-04 12:48:38 -04:00
|
|
|
if (xmlStrcmp (node->name, XMLSTR("accesslog")) == 0) {
|
2014-11-06 20:40:28 -05:00
|
|
|
if (!(tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1))) {
|
|
|
|
ICECAST_LOG_WARN("<accesslog> must not be empty.");
|
|
|
|
continue;
|
|
|
|
}
|
2015-01-25 13:57:27 -05:00
|
|
|
if (configuration->access_log)
|
|
|
|
xmlFree(configuration->access_log);
|
2014-11-06 20:40:28 -05:00
|
|
|
configuration->access_log = tmp;
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("errorlog")) == 0) {
|
2014-11-06 20:40:28 -05:00
|
|
|
if (!(tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1))) {
|
|
|
|
ICECAST_LOG_WARN("<errorlog> must not be empty.");
|
|
|
|
continue;
|
|
|
|
}
|
2015-01-25 13:57:27 -05:00
|
|
|
if (configuration->error_log)
|
|
|
|
xmlFree(configuration->error_log);
|
2014-11-06 20:40:28 -05:00
|
|
|
configuration->error_log = tmp;
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("playlistlog")) == 0) {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (configuration->playlist_log)
|
|
|
|
xmlFree(configuration->playlist_log);
|
2004-11-15 23:04:02 -05:00
|
|
|
configuration->playlist_log = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("logsize")) == 0) {
|
2005-10-24 10:51:54 -04:00
|
|
|
char *tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
configuration->logsize = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("loglevel")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
char *tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-12-07 19:39:57 -05:00
|
|
|
configuration->loglevel = util_str_to_loglevel(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2007-10-04 12:48:38 -04:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("logarchive")) == 0) {
|
2005-10-24 10:51:54 -04:00
|
|
|
char *tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
configuration->logarchive = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
} while ((node = node->next));
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _parse_security(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_t *configuration)
|
2003-07-20 21:39:39 -04:00
|
|
|
{
|
2015-01-25 13:57:27 -05:00
|
|
|
char *tmp;
|
|
|
|
xmlNodePtr oldnode;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
if (xmlStrcmp(node->name, XMLSTR("chroot")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2014-11-21 14:52:48 -05:00
|
|
|
configuration->chroot = util_str_to_bool(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("changeowner")) == 0) {
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->chuid = 1;
|
|
|
|
oldnode = node;
|
|
|
|
node = node->xmlChildrenNode;
|
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
|
|
|
if (xmlStrcmp (node->name, XMLSTR("user")) == 0) {
|
|
|
|
if (configuration->user)
|
|
|
|
xmlFree(configuration->user);
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->user = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2015-01-25 13:57:27 -05:00
|
|
|
} else if (xmlStrcmp (node->name, XMLSTR("group")) == 0) {
|
|
|
|
if (configuration->group)
|
|
|
|
xmlFree(configuration->group);
|
2003-07-20 21:39:39 -04:00
|
|
|
configuration->group = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
|
|
|
}
|
|
|
|
} while((node = node->next));
|
|
|
|
node = oldnode;
|
|
|
|
}
|
|
|
|
} while ((node = node->next));
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _add_server(xmlDocPtr doc,
|
|
|
|
xmlNodePtr node,
|
|
|
|
ice_config_t *configuration)
|
2003-07-20 21:39:39 -04:00
|
|
|
{
|
2015-01-25 13:57:27 -05:00
|
|
|
ice_config_dir_t *dirnode,
|
|
|
|
*server;
|
|
|
|
int addnode;
|
|
|
|
char *tmp;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
|
|
|
server = (ice_config_dir_t *)malloc(sizeof(ice_config_dir_t));
|
|
|
|
server->touch_interval = configuration->touch_interval;
|
|
|
|
server->host = NULL;
|
|
|
|
addnode = 0;
|
2015-01-10 13:53:44 -05:00
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
do {
|
2015-01-25 13:57:27 -05:00
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
if (xmlIsBlankNode(node))
|
|
|
|
continue;
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2014-11-30 15:32:30 -05:00
|
|
|
if (xmlStrcmp(node->name, XMLSTR("host")) == 0) {
|
|
|
|
server->host = (char *) xmlNodeListGetString(doc,
|
|
|
|
node->xmlChildrenNode, 1);
|
2003-07-20 21:39:39 -04:00
|
|
|
addnode = 1;
|
2014-11-30 15:32:30 -05:00
|
|
|
} else if (xmlStrcmp(node->name, XMLSTR("touch-interval")) == 0) {
|
|
|
|
tmp = (char *) xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
2003-07-20 21:39:39 -04:00
|
|
|
server->touch_interval = atoi(tmp);
|
2015-01-25 13:57:27 -05:00
|
|
|
if (tmp)
|
|
|
|
xmlFree(tmp);
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
server->next = NULL;
|
|
|
|
} while ((node = node->next));
|
|
|
|
|
|
|
|
if (addnode) {
|
|
|
|
dirnode = configuration->dir_list;
|
|
|
|
if (dirnode == NULL) {
|
|
|
|
configuration->dir_list = server;
|
|
|
|
} else {
|
|
|
|
while (dirnode->next) dirnode = dirnode->next;
|
|
|
|
dirnode->next = server;
|
|
|
|
}
|
2015-01-10 13:53:44 -05:00
|
|
|
|
2003-07-20 21:39:39 -04:00
|
|
|
server = NULL;
|
|
|
|
addnode = 0;
|
2015-01-25 13:57:27 -05:00
|
|
|
} else {
|
2006-03-07 14:21:04 -05:00
|
|
|
free (server);
|
|
|
|
}
|
2003-07-20 21:39:39 -04:00
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void _parse_events(event_registration_t **events, xmlNodePtr node)
|
|
|
|
{
|
2014-12-07 19:39:57 -05:00
|
|
|
while (node) {
|
|
|
|
if (xmlStrcmp(node->name, XMLSTR("event")) == 0) {
|
|
|
|
event_registration_t *reg = event_new_from_xml_node(node);
|
|
|
|
event_registration_push(events, reg);
|
|
|
|
event_registration_release(reg);
|
|
|
|
}
|
|
|
|
node = node->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
config_options_t *config_parse_options(xmlNodePtr node)
|
|
|
|
{
|
2014-12-07 19:39:57 -05:00
|
|
|
config_options_t *ret = NULL;
|
|
|
|
config_options_t *cur = NULL;
|
|
|
|
|
|
|
|
if (!node)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
node = node->xmlChildrenNode;
|
|
|
|
|
|
|
|
if (!node)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
do {
|
|
|
|
if (xmlStrcmp(node->name, XMLSTR("option")) != 0)
|
|
|
|
continue;
|
|
|
|
if (cur) {
|
|
|
|
cur->next = calloc(1, sizeof(config_options_t));
|
|
|
|
cur = cur->next;
|
|
|
|
} else {
|
|
|
|
cur = ret = calloc(1, sizeof(config_options_t));
|
|
|
|
}
|
|
|
|
|
|
|
|
cur->type = (char *)xmlGetProp(node, XMLSTR("type"));
|
|
|
|
cur->name = (char *)xmlGetProp(node, XMLSTR("name"));
|
|
|
|
cur->value = (char *)xmlGetProp(node, XMLSTR("value"));
|
|
|
|
|
|
|
|
/* map type="default" to NULL. This is to avoid many extra xmlCharStrdup()s. */
|
|
|
|
if (cur->type && strcmp(cur->type, "default") == 0) {
|
|
|
|
xmlFree(cur->type);
|
|
|
|
cur->type = NULL;
|
|
|
|
}
|
|
|
|
} while ((node = node->next));
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
void config_clear_options(config_options_t *options)
|
|
|
|
{
|
2014-12-07 19:39:57 -05:00
|
|
|
while (options) {
|
|
|
|
config_options_t *opt = options;
|
|
|
|
options = opt->next;
|
2015-01-25 13:57:27 -05:00
|
|
|
if (opt->type)
|
|
|
|
xmlFree(opt->type);
|
|
|
|
if (opt->name)
|
|
|
|
xmlFree(opt->name);
|
|
|
|
if (opt->value)
|
|
|
|
xmlFree(opt->value);
|
2014-12-07 19:39:57 -05:00
|
|
|
free(opt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
static void merge_mounts(mount_proxy * dst, mount_proxy * src)
|
|
|
|
{
|
2014-11-06 21:55:57 -05:00
|
|
|
ice_config_http_header_t *http_header_next;
|
|
|
|
ice_config_http_header_t **http_header_tail;
|
|
|
|
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst || !src)
|
2015-01-09 20:48:15 -05:00
|
|
|
return;
|
2013-04-02 20:33:10 -04:00
|
|
|
|
|
|
|
if (!dst->dumpfile)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->dumpfile = (char*)xmlStrdup((xmlChar*)src->dumpfile);
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->intro_filename)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->intro_filename = (char*)xmlStrdup((xmlChar*)src->intro_filename);
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->fallback_when_full)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->fallback_when_full = src->fallback_when_full;
|
2013-04-02 20:33:10 -04:00
|
|
|
if (dst->max_listeners == -1)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->max_listeners = src->max_listeners;
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->fallback_mount)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->fallback_mount = (char*)xmlStrdup((xmlChar*)src->fallback_mount);
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->fallback_override)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->fallback_override = src->fallback_override;
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->no_mount)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->no_mount = src->no_mount;
|
2013-04-02 20:33:10 -04:00
|
|
|
if (dst->burst_size == -1)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->burst_size = src->burst_size;
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->queue_size_limit)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->queue_size_limit = src->queue_size_limit;
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->hidden)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->hidden = src->hidden;
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->source_timeout)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->source_timeout = src->source_timeout;
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->charset)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->charset = (char*)xmlStrdup((xmlChar*)src->charset);
|
2013-04-02 20:33:10 -04:00
|
|
|
if (dst->mp3_meta_interval == -1)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->mp3_meta_interval = src->mp3_meta_interval;
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->cluster_password)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->cluster_password = (char*)xmlStrdup((xmlChar*)src->cluster_password);
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->max_listener_duration)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->max_listener_duration = src->max_listener_duration;
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->stream_name)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->stream_name = (char*)xmlStrdup((xmlChar*)src->stream_name);
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->stream_description)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->stream_description = (char*)xmlStrdup((xmlChar*)src->stream_description);
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->stream_url)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->stream_url = (char*)xmlStrdup((xmlChar*)src->stream_url);
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->stream_genre)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->stream_genre = (char*)xmlStrdup((xmlChar*)src->stream_genre);
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->bitrate)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->bitrate = (char*)xmlStrdup((xmlChar*)src->bitrate);
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->type)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->type = (char*)xmlStrdup((xmlChar*)src->type);
|
2013-04-02 20:33:10 -04:00
|
|
|
if (!dst->subtype)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->subtype = (char*)xmlStrdup((xmlChar*)src->subtype);
|
2013-04-02 20:33:10 -04:00
|
|
|
if (dst->yp_public == -1)
|
2015-01-09 20:48:15 -05:00
|
|
|
dst->yp_public = src->yp_public;
|
2014-11-06 21:55:57 -05:00
|
|
|
|
|
|
|
if (dst->http_headers) {
|
|
|
|
http_header_next = dst->http_headers;
|
|
|
|
while (http_header_next->next) http_header_next = http_header_next->next;
|
|
|
|
http_header_tail = &(http_header_next->next);
|
|
|
|
} else {
|
|
|
|
http_header_tail = &(dst->http_headers);
|
|
|
|
}
|
|
|
|
*http_header_tail = config_copy_http_header(src->http_headers);
|
2013-04-02 20:33:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void _merge_mounts_all(ice_config_t *c) {
|
|
|
|
mount_proxy *mountinfo = c->mounts;
|
|
|
|
mount_proxy *default_mount;
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
for (; mountinfo; mountinfo = mountinfo->next) {
|
2015-01-09 20:48:15 -05:00
|
|
|
if (mountinfo->mounttype != MOUNT_TYPE_NORMAL)
|
|
|
|
continue;
|
2013-04-02 20:33:10 -04:00
|
|
|
default_mount = config_find_mount(c, mountinfo->mountname, MOUNT_TYPE_DEFAULT);
|
2015-01-09 20:48:15 -05:00
|
|
|
merge_mounts(mountinfo, default_mount);
|
2013-04-02 20:33:10 -04:00
|
|
|
}
|
|
|
|
}
|
2003-07-20 21:39:39 -04:00
|
|
|
|
2005-05-08 07:54:46 -04:00
|
|
|
/* return the mount details that match the supplied mountpoint */
|
2015-01-25 13:57:27 -05:00
|
|
|
mount_proxy *config_find_mount (ice_config_t *config,
|
|
|
|
const char *mount,
|
|
|
|
mount_type type)
|
|
|
|
{
|
2005-05-08 07:54:46 -04:00
|
|
|
mount_proxy *mountinfo = config->mounts;
|
|
|
|
|
2015-01-25 13:57:27 -05:00
|
|
|
for (; mountinfo; mountinfo = mountinfo->next) {
|
2013-04-02 14:46:44 -04:00
|
|
|
if (mountinfo->mounttype != type)
|
2015-01-09 20:48:15 -05:00
|
|
|
continue;
|
|
|
|
if (!mount && !mountinfo->mountname)
|
2013-04-02 14:46:44 -04:00
|
|
|
break;
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
if (mountinfo->mounttype == MOUNT_TYPE_NORMAL) {
|
|
|
|
if (!mount || !mountinfo->mountname)
|
|
|
|
continue;
|
2015-01-09 20:48:15 -05:00
|
|
|
if (strcmp(mountinfo->mountname, mount) == 0)
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
break;
|
|
|
|
} else if (mountinfo->mounttype == MOUNT_TYPE_DEFAULT) {
|
|
|
|
if (!mountinfo->mountname)
|
|
|
|
break;
|
2013-04-02 22:04:38 -04:00
|
|
|
#ifndef _WIN32
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
if (fnmatch(mountinfo->mountname, mount, FNM_PATHNAME) == 0)
|
|
|
|
break;
|
2013-04-02 22:04:38 -04:00
|
|
|
#else
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
if (strcmp(mountinfo->mountname, mount) == 0)
|
|
|
|
break;
|
2013-04-02 22:04:38 -04:00
|
|
|
#endif
|
Wow. Mega patch!
This patch *replaces* the authentication system completly.
What is new:
- <authentication> in mount section is now a container object.
- <authentication> in root and mount section may hold any number of <role>-Tags.
- <role> tags:
Those tags define a 'role' and it's ACL rules.
A role is a instance of an authentication module (see below).
<role> takes the following options. All but type are optional.
- authentication related:
- type: Type of the authentication module (values: anonymous, static, legacy-password, url or htpasswd;
symbolic constants in auth.h)
- name: Name for the role. For later matching. (values: any string; default: (none))
- method: This rule is only active on the given list of HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- ACL related:
- allow-method: Allowed HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: get)
- deny-method: Rejected HTTP methods.
(list of enum values: methods as recognized by httpp/ (e.g: get,post); default: *)
- allow-admin: Allowed admin commands. (list of enum values: admin command; default: buildm3u)
- deny-admin: Rejected admin commands. (list of enum values: admin command; default: *)
- allow-web: Allowed web pages. (values: empty or *; default: *)
- deny-web: Rejected web pages. (values: empty or *; default: (empty))
- connections-per-user: maximum number of simultaneous connections per role and username.
This is only active on active sources. (values: unlimited or number of connections; default: unlimited)
- connection-duration: maximum time of a connection. This is only active on active sources.
(values: unlimited or number of secounds; default: unlimited)
<role> takes <option> child tags. <option> tags contain a name and a value option.
Meaning of <option> tags is up to the authentication module.
- <role>s are considered to build a stack. If a role returns with AUTH_NOMATCH the next one will be tried.
- <role>s are tested in this order: mount specific, default mount specific, global, internal fallback.
Internal fallback is set to allow web/ access via GET, POST and HEAD (only GET supported by this time)
and rejects all other requests.
- New authentication module: anonymous
This module matches all requests. No options taken.
- New authentication module: static
This module matches with a static username and password.
It takes two <option>s. One with name="username" and one with name="password" to set username and password.
This replaces old style <*-username> and <*-password> tags.
- New authentication module: legacy-password
This module matches with a statich password.
It takes one <option> with name="password" to set password.
This replaces old ICE and ICY (shoutcast compat mode) authentication.
- Parsing <authentication> in <mount> with a type set in a special way to allow 100% backward compatibility.
- Parsing of <source-password>, <admin-password>, <admin-user>, <relay-password> and <relay-user> in global
<authentication> for 100% backward compatibility.
- <alias> is now proccessed very early. This enables them to be used for all kinds of requests.
To Do List & What does not yet work:
- type="url" auth: mount_add and mount_remove.
This should be replaced by an unique feature I would call '<event>'.
- Admin commands manageauth and manageauth.xsl are disabled as they need more review:
This code needs to be ported to support multiple <role>s per <mount>.
- url authentication module can not yet return AUTH_NOMATCH.
This needs to be reviewed and discussed on how to handle this case best way.
- Default config files needs to be updated to reflect the changes.
As this is quite some political act it should be done in dicussion with the whole team
and permission of the release manager.
- Docs need to be updated to reflect the changes.
How does it work:
Code has been changed so that authentification is done early for all clients.
This allows accessing the ACL data (client->acl) from nearly everywhere in the code.
After accept() and initial client setup the request is parsed. In the next step
all <alias>es are resolved. After this the client is passed for authentication.
After authentication it is passed to the corresponding subsystem depending on kind of request.
All authentication instances have a thread running for doing the authentication.
This thread works on a queue of clients.
Hints for testers:
- Test with default config.
- Test with diffrent authentication modules in <mount>.
- Test shoutcast compatibility mode.
- Test with new style <authentication> and any amount of <role> (zero to quite some).
- Test <alias> lookup on all kinds of objects.
- Test source level credential login into the admin interface.
- Test shoucast style meta data updates.
- Test playlist generation.
Thank you for reading this long commit message. Have fun reading the full patch!
svn path=/icecast/trunk/icecast/; revision=19358
2014-11-28 18:46:08 -05:00
|
|
|
}
|
2005-05-08 07:54:46 -04:00
|
|
|
}
|
2013-04-02 14:46:44 -04:00
|
|
|
/* retry with default mount */
|
|
|
|
if (!mountinfo && type == MOUNT_TYPE_NORMAL)
|
2014-11-30 15:32:30 -05:00
|
|
|
mountinfo = config_find_mount(config, mount, MOUNT_TYPE_DEFAULT);
|
2005-05-08 07:54:46 -04:00
|
|
|
return mountinfo;
|
|
|
|
}
|
|
|
|
|
2015-01-10 13:53:44 -05:00
|
|
|
/* Helper function to locate the configuration details of the listening
|
2007-10-15 21:53:06 -04:00
|
|
|
* socket
|
|
|
|
*/
|
2014-11-30 15:32:30 -05:00
|
|
|
listener_t *config_get_listen_sock(ice_config_t *config, connection_t *con)
|
2007-10-15 21:53:06 -04:00
|
|
|
{
|
|
|
|
listener_t *listener;
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
listener = config->listen_sock;
|
2015-01-25 13:57:27 -05:00
|
|
|
while (listener) {
|
|
|
|
if (i >= global.server_sockets) {
|
2007-10-15 21:53:06 -04:00
|
|
|
listener = NULL;
|
2015-01-25 13:57:27 -05:00
|
|
|
} else {
|
2007-10-15 21:53:06 -04:00
|
|
|
if (global.serversock[i] == con->serversock)
|
|
|
|
break;
|
|
|
|
listener = listener->next;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return listener;
|
|
|
|
}
|