MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-24 12:30:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove regex functions from webserver, instead preferring path from root - fixes problems with bad regex in uclibc

Browse Source
This commit is contained in:
Ron Pedde 2007-04-15 23:27:16 +00:00
parent 096975abfe
commit 29478fcca1
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@ -534,7 +534,7 @@ int main(int argc, char *argv[]) {
DPRINTF(E_FATAL,L_MAIN|L_WS,"Error staring web server: %s\n",strerror(errno)); DPRINTF(E_FATAL,L_MAIN|L_WS,"Error staring web server: %s\n",strerror(errno));
} }
ws_registerhandler(config.server, "^.*$",main_handler,main_auth,1); ws_registerhandler(config.server, "/",main_handler,main_auth,1);
#ifndef WITHOUT_MDNS #ifndef WITHOUT_MDNS
if(config.use_mdns) { /* register services */ if(config.use_mdns) { /* register services */

22
src/webserver.c
View File

@ -28,7 +28,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
#include <pthread.h> #include <pthread.h>
#include <regex.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -63,7 +62,7 @@
*/ */
typedef struct tag_ws_handler { typedef struct tag_ws_handler {
regex_t regex; char *stem;
void (*req_handler)(WS_CONNINFO*); void (*req_handler)(WS_CONNINFO*);
int(*auth_handler)(WS_CONNINFO*, char *, char *); int(*auth_handler)(WS_CONNINFO*, char *, char *);
int addheaders; int addheaders;
@ -110,7 +109,7 @@ int ws_findhandler(WS_PRIVATE *pwsp, WS_CONNINFO *pwsc,
void(**preq)(WS_CONNINFO*), void(**preq)(WS_CONNINFO*),
int(**pauth)(WS_CONNINFO*, char *, char *), int(**pauth)(WS_CONNINFO*, char *, char *),
int *addheaders); int *addheaders);
int ws_registerhandler(WSHANDLE ws, char *regex, int ws_registerhandler(WSHANDLE ws, char *stem,
void(*handler)(WS_CONNINFO*), void(*handler)(WS_CONNINFO*),
int(*auth)(WS_CONNINFO*, char *, char *), int(*auth)(WS_CONNINFO*, char *, char *),
int addheaders); int addheaders);
@ -366,7 +365,7 @@ extern int ws_stop(WSHANDLE ws) {
while(pwsp->handlers.next) { while(pwsp->handlers.next) {
current=pwsp->handlers.next; current=pwsp->handlers.next;
pwsp->handlers.next=current->next; pwsp->handlers.next=current->next;
regfree(&current->regex); free(&current->stem);
free(current); free(current);
} }
@ -1349,12 +1348,8 @@ char *ws_urldecode(char *string, int space_as_plus) {
* Register a page and auth handler. Returns 0 on success, * Register a page and auth handler. Returns 0 on success,
* returns -1 on failure. * returns -1 on failure.
* *
* If the regex is not well-formed, it returns -1 iwth
* errno set to EINVAL. It is up to the caller to use
* regerror to display a more interesting error message,
* if appropriate.
*/ */
int ws_registerhandler(WSHANDLE ws, char *regex, int ws_registerhandler(WSHANDLE ws, char *stem,
void(*handler)(WS_CONNINFO*), void(*handler)(WS_CONNINFO*),
int(*auth)(WS_CONNINFO *, char *, char *), int(*auth)(WS_CONNINFO *, char *, char *),
int addheaders) { int addheaders) {
@ -1365,12 +1360,7 @@ int ws_registerhandler(WSHANDLE ws, char *regex,
if(!phandler) if(!phandler)
return -1; return -1;
if(regcomp(&phandler->regex,regex,REG_EXTENDED | REG_NOSUB)) { phandler->stem=strdup(stem);
free(phandler);
errno=EINVAL;
return -1;
}
phandler->req_handler=handler; phandler->req_handler=handler;
phandler->auth_handler=auth; phandler->auth_handler=auth;
phandler->addheaders=addheaders; phandler->addheaders=addheaders;
@ -1405,7 +1395,7 @@ int ws_findhandler(WS_PRIVATE *pwsp, WS_CONNINFO *pwsc,
pwsc->threadno); pwsc->threadno);
while(phandler) { while(phandler) {
if(!regexec(&phandler->regex,pwsc->uri,0,NULL,0)) { if(!strncasecmp(phandler->stem,pwsc->uri,strlen(phandler->stem))) {
/* that's a match */ /* that's a match */
DPRINTF(E_DBG,L_WS,"Thread %d: URI Match!\n",pwsc->threadno); DPRINTF(E_DBG,L_WS,"Thread %d: URI Match!\n",pwsc->threadno);
*preq=phandler->req_handler; *preq=phandler->req_handler;