Skip to content

Uri signing regex as POSIX ERE #4897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SolidWallOfCode merged 1 commit into from
Feb 4, 2019
Merged

Uri signing regex as POSIX ERE #4897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions plugins/experimental/uri_signing/match.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
* limitations under the License.
*/

#include <regex.h>
#include "common.h"
#include "ts/ts.h"
#include <stdbool.h>
#include <pcre.h>
#include <string.h>

bool
Expand All @@ -31,16 +31,27 @@ match_hash(const char *needle, const char *haystack)
bool
match_regex(const char *pattern, const char *uri)
{
const char *err;
int err_off;
struct re_pattern_buffer pat_buff;

pat_buff.translate = 0;
pat_buff.fastmap = 0;
pat_buff.buffer = 0;
pat_buff.allocated = 0;

re_syntax_options = RE_SYNTAX_POSIX_MINIMAL_EXTENDED;

PluginDebug("Testing regex pattern /%s/ against \"%s\"", pattern, uri);
pcre *re = pcre_compile(pattern, PCRE_ANCHORED | PCRE_UCP | PCRE_UTF8, &err, &err_off, NULL);
if (!re) {
PluginDebug("Regex /%s/ failed to compile.", pattern);

const char *comp_err = re_compile_pattern(pattern, strlen(pattern), &pat_buff);

if (comp_err) {
PluginDebug("Regex Compilation ERROR: %s", comp_err);
return false;
}

int rc = pcre_exec(re, NULL, uri, strlen(uri), 0, 0, NULL, 0);
pcre_free(re);
return rc >= 0;
int match_ret;
match_ret = re_match(&pat_buff, uri, strlen(uri), 0, 0);
regfree(&pat_buff);

return match_ret >= 0;
}
30 changes: 30 additions & 0 deletions plugins/experimental/uri_signing/unit_tests/uri_signing_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ extern "C" {
#include "../jwt.h"
#include "../normalize.h"
#include "../parse.h"
#include "../match.h"
}

bool
Expand Down Expand Up @@ -446,3 +447,32 @@ TEST_CASE("4", "[NormalizeTest]")
SECTION("Testing empty uri after http://?/") { REQUIRE(!normalize_uri_helper("http://?/", NULL)); }
fprintf(stderr, "\n");
}

TEST_CASE("5", "[RegexTests]")
{
INFO("TEST 5, Test Regex Matching");

SECTION("Standard regex")
{
REQUIRE(match_regex("http://kelloggsTester.souza.local/KellogsDir/*",
"http://kelloggsTester.souza.local/KellogsDir/some_manifest.m3u8"));
}

SECTION("Back references are not supported") { REQUIRE(!match_regex("(b*a)\\1$", "bbbbba")); }

SECTION("Escape a special character") { REQUIRE(match_regex("money\\$", "money$bags")); }

SECTION("Dollar sign")
{
REQUIRE(!match_regex(".+foobar$", "foobarfoofoo"));
REQUIRE(match_regex(".+foobar$", "foofoofoobar"));
}

SECTION("Number Quantifier with Groups")
{
REQUIRE(match_regex("(abab){2}", "abababab"));
REQUIRE(!match_regex("(abab){2}", "abab"));
}

SECTION("Alternation") { REQUIRE(match_regex("cat|dog", "dog")); }
}