Skip to content

Change map_with_referer to use Regex class instead of pcre directly #11294

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
bryancall merged 1 commit into from
May 6, 2024
Merged

Change map_with_referer to use Regex class instead of pcre directly #11294

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
28 changes: 11 additions & 17 deletions include/proxy/http/remap/UrlMapping.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,8 @@

#include <vector>

#if __has_include("pcre/pcre.h")
#include <pcre/pcre.h>
#elif __has_include("pcre.h")
#include <pcre.h>
#else
#error "Unable to locate PCRE heeader"
#endif

#include "tscore/ink_config.h"
#include "tsutil/Regex.h"
#include "proxy/http/remap/AclFiltering.h"
#include "proxy/hdrs/URL.h"
#include "proxy/http/remap/RemapPluginInfo.h"
Expand All @@ -45,20 +38,21 @@
class NextHopSelectionStrategy;

/**
* Used to store http referer strings (and/or regexp)
* Used to store http referrer strings (and/or regexp)
**/
class referer_info
{
public:
referer_info(char *_ref, bool *error_flag = nullptr, char *errmsgbuf = nullptr, int errmsgbuf_size = 0);
referer_info(const char *_ref, bool *error_flag, char *errmsgbuf = nullptr, int errmsgbuf_size = 0);
~referer_info();
referer_info *next;
char *referer;
int referer_size;
bool any; /* any flag '*' */
bool negative; /* negative referer '~' */
bool regx_valid;
pcre *regx;

referer_info *next = nullptr;
char *referer = nullptr;
int referer_size = 0;
bool any = false; /* any flag '*' */
bool negative = false; /* negative referer '~' */
bool regex_valid = false;
Regex regex;
};

/**
Expand Down
2 changes: 1 addition & 1 deletion src/proxy/http/remap/RemapProcessor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ RemapProcessor::finish_remap(HttpTransact::State *s, UrlRewrite *table)
if (!map->negative_referer) {
break;
}
} else if (ri->regx_valid && (pcre_exec(ri->regx, nullptr, tmp_referer_buf, referer_len, 0, 0, nullptr, 0) != -1)) {
} else if (ri->regex_valid && ri->regex.exec(std::string_view(tmp_referer_buf, referer_len))) {
enabled_flag = ri->negative ? false : true;
break;
}
Expand Down
20 changes: 5 additions & 15 deletions src/proxy/http/remap/UrlMapping.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,14 @@ redirect_tag_str::parse_format_redirect_url(char *url)
/**
*
**/
referer_info::referer_info(char *_ref, bool *error_flag, char *errmsgbuf, int errmsgbuf_size)
: next(nullptr), referer(nullptr), referer_size(0), any(false), negative(false), regx_valid(false)
referer_info::referer_info(const char *_ref, bool *error_flag, char *errmsgbuf, int errmsgbuf_size)
{
const char *error;
std::string error;
int erroffset;

if (error_flag) {
*error_flag = false;
}
regx = nullptr;

if (_ref) {
if (*_ref == '~') {
Expand All @@ -177,16 +175,14 @@ referer_info::referer_info(char *_ref, bool *error_flag, char *errmsgbuf, int er
if (!strcmp(referer, "*")) {
any = true;
} else {
regx = pcre_compile(referer, PCRE_CASELESS, &error, &erroffset, nullptr);
if (!regx) {
regex_valid = regex.compile(referer, error, erroffset, RE_CASE_INSENSITIVE);
if (regex_valid == false) {
if (errmsgbuf && (errmsgbuf_size - 1) > 0) {
ink_strlcpy(errmsgbuf, error, errmsgbuf_size);
ink_strlcpy(errmsgbuf, error.c_str(), errmsgbuf_size);
}
if (error_flag) {
*error_flag = true;
}
} else {
regx_valid = true;
}
}
}
Expand All @@ -201,10 +197,4 @@ referer_info::~referer_info()
ats_free(referer);
referer = nullptr;
referer_size = 0;

if (regx_valid) {
pcre_free(regx);
regx = nullptr;
regx_valid = false;
}
}