forked from latticeware/Cytoplasm
HttpRouter
: Decode path parts before matching. (#19)
Required by Telodendria/Telodendria#44. Reviewed-on: Telodendria/Cytoplasm#19 Co-authored-by: lda <lda@freetards.xyz> Co-committed-by: lda <lda@freetards.xyz>
This commit is contained in:
parent
29070c8f41
commit
17f1a41519
1 changed files with 7 additions and 0 deletions
|
@ -23,6 +23,7 @@
|
||||||
*/
|
*/
|
||||||
#include <HttpRouter.h>
|
#include <HttpRouter.h>
|
||||||
|
|
||||||
|
#include <Http.h>
|
||||||
#include <Memory.h>
|
#include <Memory.h>
|
||||||
#include <HashMap.h>
|
#include <HashMap.h>
|
||||||
#include <Str.h>
|
#include <Str.h>
|
||||||
|
@ -228,12 +229,15 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
|
||||||
|
|
||||||
regmatch_t pmatch[REG_MAX_SUB];
|
regmatch_t pmatch[REG_MAX_SUB];
|
||||||
|
|
||||||
|
pathPart = HttpUrlDecode(pathPart);
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
|
|
||||||
while (HashMapIterateReentrant(node->children, &key, (void **) &val, &i))
|
while (HashMapIterateReentrant(node->children, &key, (void **) &val, &i))
|
||||||
{
|
{
|
||||||
if (regexec(&val->regex, pathPart, REG_MAX_SUB, pmatch, 0) == 0)
|
if (regexec(&val->regex, pathPart, REG_MAX_SUB, pmatch, 0) == 0)
|
||||||
{
|
{
|
||||||
|
Free(pathPart);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -243,6 +247,7 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
|
||||||
if (!val)
|
if (!val)
|
||||||
{
|
{
|
||||||
exec = NULL;
|
exec = NULL;
|
||||||
|
Free(pathPart);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -263,12 +268,14 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
|
||||||
substr = StrSubstr(pathPart, cpmatch.rm_so, cpmatch.rm_eo);
|
substr = StrSubstr(pathPart, cpmatch.rm_so, cpmatch.rm_eo);
|
||||||
if (pmatch[i].rm_so == -1)
|
if (pmatch[i].rm_so == -1)
|
||||||
{
|
{
|
||||||
|
Free(pathPart);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
ArrayAdd(matches, substr);
|
ArrayAdd(matches, substr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Free(pathPart);
|
||||||
}
|
}
|
||||||
Free(path);
|
Free(path);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue