aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-02-02 15:07:36 -05:00
Code

Fix: Convert admin path in XSLT loader to URI

Browse Source 
The xmlBuildURI function only deals with URIs, not paths, therefore
the admin path has to be converted to a URI first.
This commit is contained in:
Marvin Scholz 2018-07-09 03:27:47 +02:00
parent 858ff390d3
commit 450c26a45b
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/xslt.c
View File

@ -100,8 +100,8 @@ static mutex_t xsltlock;
/* Reference to the original xslt loader func */ /* Reference to the original xslt loader func */
static xsltDocLoaderFunc xslt_loader; static xsltDocLoaderFunc xslt_loader;
/* Admin path cache */ /* Admin URI cache */
static xmlChar *admin_path = NULL; static xmlChar *admin_URI = NULL;
void xslt_initialize(void) void xslt_initialize(void)
{ {
@ -121,8 +121,8 @@ void xslt_shutdown(void) {
thread_mutex_destroy (&xsltlock); thread_mutex_destroy (&xsltlock);
xmlCleanupParser(); xmlCleanupParser();
xsltCleanupGlobals(); xsltCleanupGlobals();
if (admin_path) if (admin_URI)
xmlFree(admin_path); xmlFree(admin_URI);
} }
static void clear_cache_entry(size_t idx) { static void clear_cache_entry(size_t idx) {
@ -220,7 +220,7 @@ static xmlDocPtr custom_loader(const xmlChar *URI,
xsltLoadType type) xsltLoadType type)
{ {
xmlDocPtr ret; xmlDocPtr ret;
xmlChar *rel_path, *fn, *final_URI = NULL; xmlChar *rel_URI, *fn, *final_URI = NULL;
char *path_URI = NULL; char *path_URI = NULL;
xsltStylesheet *c; xsltStylesheet *c;
ice_config_t *config; ice_config_t *config;
@ -247,33 +247,41 @@ static xmlDocPtr custom_loader(const xmlChar *URI,
break; break;
/* Construct the right path */ /* Construct the right path */
rel_path = xmlBuildRelativeURI(URI, c->doc->URL); rel_URI = xmlBuildRelativeURI(URI, c->doc->URL);
if (rel_path != NULL && admin_path != NULL) { if (rel_URI != NULL && admin_URI != NULL) {
fn = xmlBuildURI(rel_path, admin_path); fn = xmlBuildURI(rel_URI, admin_URI);
final_URI = fn; final_URI = fn;
xmlFree(rel_path); xmlFree(rel_URI);
} }
/* Fail if there was an error constructing the path */ /* Fail if there was an error constructing the path */
if (final_URI == NULL) { if (final_URI == NULL) {
if (rel_path) if (rel_URI)
xmlFree(rel_path); xmlFree(rel_URI);
return NULL; return NULL;
} }
break; break;
/* In case a top stylesheet is loaded */ /* In case a top stylesheet is loaded */
case XSLT_LOAD_START: case XSLT_LOAD_START:
config = config_get_config(); config = config_get_config();
/* Do we need to load the admin path? */
if (!admin_path) { /* Check if we need to load the admin path */
if (!admin_URI) {
/* Append path separator to path */
size_t len = strlen(config->adminroot_dir); size_t len = strlen(config->adminroot_dir);
xmlChar* admin_path = xmlMalloc(len+2);
xmlStrPrintf(admin_path, len+2, "%s/", XMLSTR(config->adminroot_dir));
admin_path = xmlMalloc(len+2); /* Convert admin path to URI */
if (!admin_path) admin_URI = xmlPathToURI(admin_path);
xmlFree(admin_path);
if (!admin_URI) {
return NULL; return NULL;
} else {
/* Copy over admin path and add a tailing slash. */ ICECAST_LOG_DEBUG("Loaded and cached admin_URI \"%s\"", admin_URI);
xmlStrPrintf(admin_path, len+2, XMLSTR("%s/"), XMLSTR(config->adminroot_dir)); }
} }
config_release_config(); config_release_config();
break; break;