github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adds support to the TIME* variables

Browse Source
This commit is contained in:
Felipe Zimmerle
2015-07-22 01:06:08 -03:00
parent ad442fb201
commit 6f7d3fa67a
30 changed files with 1488 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,15 @@ class Driver;
#include "variable_modsec_build.h"
#include "variable_highest_severity.h"
#include "utils/geo_lookup.h"
#include "variables/time.h"
#include "variables/time_day.h"
#include "variables/time_epoch.h"
#include "variables/time_hour.h"
#include "variables/time_min.h"
#include "variables/time_mon.h"
#include "variables/time_sec.h"
#include "variables/time_wday.h"
#include "variables/time_year.h"
using ModSecurity::actions::Action;
using ModSecurity::actions::transformations::Transformation;
@@ -31,6 +40,15 @@ using ModSecurity::VariableModsecBuild;
using ModSecurity::VariableHighestSeverity;
using ModSecurity::Rule;
using ModSecurity::Utils::GeoLookup;
using ModSecurity::Variables::Time;
using ModSecurity::Variables::TimeDay;
using ModSecurity::Variables::TimeEpoch;
using ModSecurity::Variables::TimeHour;
using ModSecurity::Variables::TimeMin;
using ModSecurity::Variables::TimeMon;
using ModSecurity::Variables::TimeSec;
using ModSecurity::Variables::TimeWDay;
using ModSecurity::Variables::TimeYear;
}
// The parsing context.
@@ -97,6 +115,16 @@ using ModSecurity::Utils::GeoLookup;
%token <std::string> RUN_TIME_VAR_BLD
%token <std::string> RUN_TIME_VAR_HSV
%token <std::string> RUN_TIME_VAR_TIME
%token <std::string> RUN_TIME_VAR_TIME_DAY
%token <std::string> RUN_TIME_VAR_TIME_EPOCH
%token <std::string> RUN_TIME_VAR_TIME_HOUR
%token <std::string> RUN_TIME_VAR_TIME_MIN
%token <std::string> RUN_TIME_VAR_TIME_MON
%token <std::string> RUN_TIME_VAR_TIME_SEC
%token <std::string> RUN_TIME_VAR_TIME_WDAY
%token <std::string> RUN_TIME_VAR_TIME_YEAR
%token <std::string> CONFIG_DIR_GEO_DB
%token <std::string> OPERATOR
@@ -322,8 +350,115 @@ variables:
variables->push_back(new VariableHighestSeverity($1));
$$ = variables;
}
| RUN_TIME_VAR_TIME
{
std::vector<Variable *> *variables = new std::vector<Variable *>;
variables->push_back(new ModSecurity::Variables::Time($1));
$$ = variables;
}
| RUN_TIME_VAR_TIME_DAY
{
std::vector<Variable *> *variables = new std::vector<Variable *>;
variables->push_back(new ModSecurity::Variables::TimeDay($1));
$$ = variables;
}
| RUN_TIME_VAR_TIME_EPOCH
{
std::vector<Variable *> *variables = new std::vector<Variable *>;
variables->push_back(new ModSecurity::Variables::TimeEpoch($1));
$$ = variables;
}
| RUN_TIME_VAR_TIME_HOUR
{
std::vector<Variable *> *variables = new std::vector<Variable *>;
variables->push_back(new ModSecurity::Variables::TimeHour($1));
$$ = variables;
}
| RUN_TIME_VAR_TIME_MIN
{
std::vector<Variable *> *variables = new std::vector<Variable *>;
variables->push_back(new ModSecurity::Variables::TimeMin($1));
$$ = variables;
}
| RUN_TIME_VAR_TIME_MON
{
std::vector<Variable *> *variables = new std::vector<Variable *>;
variables->push_back(new ModSecurity::Variables::TimeMon($1));
$$ = variables;
}
| RUN_TIME_VAR_TIME_SEC
{
std::vector<Variable *> *variables = new std::vector<Variable *>;
variables->push_back(new ModSecurity::Variables::TimeSec($1));
$$ = variables;
}
| RUN_TIME_VAR_TIME_WDAY
{
std::vector<Variable *> *variables = new std::vector<Variable *>;
variables->push_back(new ModSecurity::Variables::TimeWDay($1));
$$ = variables;
}
| RUN_TIME_VAR_TIME_YEAR
{
std::vector<Variable *> *variables = new std::vector<Variable *>;
variables->push_back(new ModSecurity::Variables::TimeYear($1));
$$ = variables;
}
| variables PIPE RUN_TIME_VAR_TIME
{
std::vector<Variable *> *v = $1;
v->push_back(new ModSecurity::Variables::Time($3));
$$ = $1;
}
| variables PIPE RUN_TIME_VAR_TIME_DAY
{
std::vector<Variable *> *v = $1;
v->push_back(new ModSecurity::Variables::TimeDay($3));
$$ = $1;
}
| variables PIPE RUN_TIME_VAR_TIME_EPOCH
{
std::vector<Variable *> *v = $1;
v->push_back(new ModSecurity::Variables::TimeEpoch($3));
$$ = $1;
}
| variables PIPE RUN_TIME_VAR_TIME_HOUR
{
std::vector<Variable *> *v = $1;
v->push_back(new ModSecurity::Variables::TimeHour($3));
$$ = $1;
}
| variables PIPE RUN_TIME_VAR_TIME_MIN
{
std::vector<Variable *> *v = $1;
v->push_back(new ModSecurity::Variables::TimeMin($3));
$$ = $1;
}
| variables PIPE RUN_TIME_VAR_TIME_MON
{
std::vector<Variable *> *v = $1;
v->push_back(new ModSecurity::Variables::TimeMon($3));
$$ = $1;
}
| variables PIPE RUN_TIME_VAR_TIME_SEC
{
std::vector<Variable *> *v = $1;
v->push_back(new ModSecurity::Variables::TimeSec($3));
$$ = $1;
}
| variables PIPE RUN_TIME_VAR_TIME_WDAY
{
std::vector<Variable *> *v = $1;
v->push_back(new ModSecurity::Variables::TimeWDay($3));
$$ = $1;
}
| variables PIPE RUN_TIME_VAR_TIME_YEAR
{
std::vector<Variable *> *v = $1;
v->push_back(new ModSecurity::Variables::TimeYear($3));
$$ = $1;
}
actions:
actions COMMA SPACE ACTION
{

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

@@ -66,6 +66,16 @@ RUN_TIME_VAR_ENV (?i:ENV)
RUN_TIME_VAR_BLD (?i:MODSEC_BUILD)
RUN_TIME_VAR_HSV (?i:HIGHEST_SEVERITY)
RUN_TIME_VAR_TIME (?i:TIME)
RUN_TIME_VAR_TIME_DAY (?i:TIME_DAY)
RUN_TIME_VAR_TIME_EPOCH (?i:TIME_EPOCH)
RUN_TIME_VAR_TIME_HOUR (?i:TIME_HOUR)
RUN_TIME_VAR_TIME_MIN (?i:TIME_MIN)
RUN_TIME_VAR_TIME_MON (?i:TIME_MON)
RUN_TIME_VAR_TIME_SEC (?i:TIME_SEC)
RUN_TIME_VAR_TIME_WDAY (?i:TIME_WDAY)
RUN_TIME_VAR_TIME_YEAR (?i:TIME_YEAR)
VARIABLENOCOLON (?i:REQBODY_ERROR|MULTIPART_STRICT_ERROR|MULTIPART_UNMATCHED_BOUNDARY|REMOTE_ADDR|REQUEST_LINE)
CONFIG_VALUE_ON On
@@ -122,6 +132,17 @@ FREE_TEXT_NEW_LINE [^\"|\n]+
{RUN_TIME_VAR_BLD} { return yy::seclang_parser::make_RUN_TIME_VAR_BLD(yytext, loc); }
{RUN_TIME_VAR_HSV} { return yy::seclang_parser::make_RUN_TIME_VAR_HSV(yytext, loc); }
%{ /* Variables: TIME */ %}
{RUN_TIME_VAR_TIME} { return yy::seclang_parser::make_RUN_TIME_VAR_TIME(yytext, loc); }
{RUN_TIME_VAR_TIME_DAY} { return yy::seclang_parser::make_RUN_TIME_VAR_TIME_DAY(yytext, loc); }
{RUN_TIME_VAR_TIME_EPOCH} { return yy::seclang_parser::make_RUN_TIME_VAR_TIME_EPOCH(yytext, loc); }
{RUN_TIME_VAR_TIME_HOUR} { return yy::seclang_parser::make_RUN_TIME_VAR_TIME_HOUR(yytext, loc); }
{RUN_TIME_VAR_TIME_MIN} { return yy::seclang_parser::make_RUN_TIME_VAR_TIME_MIN(yytext, loc); }
{RUN_TIME_VAR_TIME_MON} { return yy::seclang_parser::make_RUN_TIME_VAR_TIME_MON(yytext, loc); }
{RUN_TIME_VAR_TIME_SEC} { return yy::seclang_parser::make_RUN_TIME_VAR_TIME_SEC(yytext, loc); }
{RUN_TIME_VAR_TIME_WDAY} { return yy::seclang_parser::make_RUN_TIME_VAR_TIME_WDAY(yytext, loc); }
{RUN_TIME_VAR_TIME_YEAR} { return yy::seclang_parser::make_RUN_TIME_VAR_TIME_YEAR(yytext, loc); }
%{ /* Geo DB loopkup */ %}
{CONFIG_DIR_GEO_DB}[ ]{FREE_TEXT_NEW_LINE} { return yy::seclang_parser::make_CONFIG_DIR_GEO_DB(strchr(yytext, ' ') + 1, loc); }