github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-13 21:36:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Partially adds the REMOTE_USER variable support

Browse Source
This commit is contained in:
Felipe Zimmerle 2016-05-23 11:04:19 -03:00
parent f989ecd5cb
commit 4b9cff3ec7
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@ -44,6 +44,7 @@ VARIABLES = \
variables/env.cc \ variables/env.cc \
variables/highest_severity.cc \ variables/highest_severity.cc \
variables/modsec_build.cc \ variables/modsec_build.cc \
variables/remote_user.cc \
variables/time.cc \ variables/time.cc \
variables/time_day.cc \ variables/time_day.cc \
variables/time_epoch.cc \ variables/time_epoch.cc \

13
src/parser/seclang-parser.yy
View File

@ -53,6 +53,7 @@ class Driver;
#include "variables/env.h" #include "variables/env.h"
#include "variables/highest_severity.h" #include "variables/highest_severity.h"
#include "variables/modsec_build.h" #include "variables/modsec_build.h"
#include "variables/remote_user.h"
#include "variables/time_day.h" #include "variables/time_day.h"
#include "variables/time_epoch.h" #include "variables/time_epoch.h"
#include "variables/time.h" #include "variables/time.h"
@ -96,6 +97,7 @@ using modsecurity::Variables::Duration;
using modsecurity::Variables::Env; using modsecurity::Variables::Env;
using modsecurity::Variables::HighestSeverity; using modsecurity::Variables::HighestSeverity;
using modsecurity::Variables::ModsecBuild; using modsecurity::Variables::ModsecBuild;
using modsecurity::Variables::RemoteUser;
using modsecurity::Variables::Time; using modsecurity::Variables::Time;
using modsecurity::Variables::TimeDay; using modsecurity::Variables::TimeDay;
using modsecurity::Variables::TimeEpoch; using modsecurity::Variables::TimeEpoch;
@ -227,6 +229,8 @@ using modsecurity::Variables::XML;
%token <std::string> RUN_TIME_VAR_BLD %token <std::string> RUN_TIME_VAR_BLD
%token <std::string> RUN_TIME_VAR_HSV %token <std::string> RUN_TIME_VAR_HSV
%token <std::string> RUN_TIME_VAR_REMOTE_USER
%token <std::string> RUN_TIME_VAR_TIME %token <std::string> RUN_TIME_VAR_TIME
%token <std::string> RUN_TIME_VAR_TIME_DAY %token <std::string> RUN_TIME_VAR_TIME_DAY
%token <std::string> RUN_TIME_VAR_TIME_EPOCH %token <std::string> RUN_TIME_VAR_TIME_EPOCH
@ -752,6 +756,15 @@ var:
if (!var) { var = new HighestSeverity(name); } if (!var) { var = new HighestSeverity(name); }
$$ = var; $$ = var;
} }
| RUN_TIME_VAR_REMOTE_USER
{
std::string name($1);
CHECK_VARIATION_DECL
CHECK_VARIATION(&) { var = new Count(new RemoteUser(name)); }
CHECK_VARIATION(!) { var = new Exclusion(new RemoteUser(name)); }
if (!var) { var = new RemoteUser(name); }
$$ = var;
}
| RUN_TIME_VAR_TIME | RUN_TIME_VAR_TIME
{ {
std::string name($1); std::string name($1);

2
src/parser/seclang-scanner.ll
View File

@ -124,6 +124,7 @@ VARIABLE_COL (?i:(SESSION|GLOBAL|ARGS_POST|ARGS_GET|ARGS|FILES_SIZES|FILES_NAMES
VARIABLE_TX (?i:TX) VARIABLE_TX (?i:TX)
VARIABLE_WEBSERVER_ERROR_LOG (?:WEBSERVER_ERROR_LOG) VARIABLE_WEBSERVER_ERROR_LOG (?:WEBSERVER_ERROR_LOG)
RUN_TIME_VAR_REMOTE_USER (?i:REMOTE_USER)
RUN_TIME_VAR_DUR (?i:DURATION) RUN_TIME_VAR_DUR (?i:DURATION)
RUN_TIME_VAR_ENV (?i:ENV) RUN_TIME_VAR_ENV (?i:ENV)
RUN_TIME_VAR_BLD (?i:MODSEC_BUILD) RUN_TIME_VAR_BLD (?i:MODSEC_BUILD)
@ -235,6 +236,7 @@ CONFIG_DIR_UNICODE_MAP_FILE (?i:SecUnicodeMapFile)
[!&]?{VARIABLE_TX}(\:{DICT_ELEMENT})? { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_VARIABLE_TX(yytext, *driver.loc.back()); } [!&]?{VARIABLE_TX}(\:{DICT_ELEMENT})? { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_VARIABLE_TX(yytext, *driver.loc.back()); }
[!&]?{VARIABLE_TX}(\:[\']{FREE_TEXT_QUOTE}[\'])? { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_VARIABLE_TX(yytext, *driver.loc.back()); } [!&]?{VARIABLE_TX}(\:[\']{FREE_TEXT_QUOTE}[\'])? { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_VARIABLE_TX(yytext, *driver.loc.back()); }
[!&]?{RUN_TIME_VAR_DUR} { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_RUN_TIME_VAR_DUR(yytext, *driver.loc.back()); } [!&]?{RUN_TIME_VAR_DUR} { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_RUN_TIME_VAR_DUR(yytext, *driver.loc.back()); }
[!&]?{RUN_TIME_VAR_REMOTE_USER} { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_RUN_TIME_VAR_REMOTE_USER(yytext, *driver.loc.back()); }
[!&]?{RUN_TIME_VAR_ENV}(\:{DICT_ELEMENT})? { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_RUN_TIME_VAR_ENV(yytext, *driver.loc.back()); } [!&]?{RUN_TIME_VAR_ENV}(\:{DICT_ELEMENT})? { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_RUN_TIME_VAR_ENV(yytext, *driver.loc.back()); }
[!&]?{RUN_TIME_VAR_ENV}(\:[\']{FREE_TEXT_QUOTE}[\'])? { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_RUN_TIME_VAR_ENV(yytext, *driver.loc.back()); } [!&]?{RUN_TIME_VAR_ENV}(\:[\']{FREE_TEXT_QUOTE}[\'])? { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_RUN_TIME_VAR_ENV(yytext, *driver.loc.back()); }
[!&]?{RUN_TIME_VAR_BLD} { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_RUN_TIME_VAR_BLD(yytext, *driver.loc.back()); } [!&]?{RUN_TIME_VAR_BLD} { BEGIN(EXPECTING_OPERATOR); return yy::seclang_parser::make_RUN_TIME_VAR_BLD(yytext, *driver.loc.back()); }