adding the parser to the .lex and .y files

Author: kordian-pawelec

cfg.lex

@@ -280,6 +280,8 @@ MCAST_TTL			"mcast_ttl"
 TOS					"tos"
 DISABLE_DNS_FAILOVER  "disable_dns_failover"
 REDACT_PII_ "redact_pii_"
+REDACT_TEMPLATE "redact_template"
+REDACT_MODE "redact_mode"
 DISABLE_DNS_BLACKLIST "disable_dns_blacklist"
 DST_BLACKLIST		"dst_blacklist"
 MAX_WHILE_LOOPS "max_while_loops"
@@ -527,6 +529,10 @@ SPACE		[ ]
 									return DISABLE_DNS_FAILOVER; }
 <INITIAL>{REDACT_PII_}	{	count(); yylval.strval=yytext; 
 									return REDACT_PII_;}
+<INITIAL>{REDACT_TEMPLATE}	{	count(); yylval.strval=yytext;
+									return REDACT_TEMPLATE;}
+<INITIAL>{REDACT_MODE}	{	count(); yylval.strval=yytext;
+									return REDACT_MODE;}
 <INITIAL>{DISABLE_DNS_BLACKLIST}	{	count(); yylval.strval=yytext;
 									return DISABLE_DNS_BLACKLIST; }
 <INITIAL>{DST_BLACKLIST}	{	count(); yylval.strval=yytext;

cfg.y

@@ -111,6 +111,7 @@
 #include "config.h"
 #include "mem/rpm_mem.h"
 #include "poll_types.h"
+#include "redact_pii.h"
 
 #ifdef SHM_EXTRA_STATS
 #include "mem/module_info.h"
@@ -394,6 +395,8 @@ extern int cfg_parse_only_routes;
 %token TOS
 %token DISABLE_DNS_FAILOVER
 %token REDACT_PII_
+%token REDACT_TEMPLATE
+%token REDACT_MODE
 %token DISABLE_DNS_BLACKLIST
 %token DST_BLACKLIST
 %token DISABLE_STATELESS_FWD
@@ -1592,7 +1595,24 @@ assign_stm: LOGLEVEL EQUAL snumber { IFOR();
 		| REDACT_PII_ EQUAL NUMBER { IFOR();
 										redact_pii_=$3;
 									}
-		| REDACT_PII_ error { yyerror("boolean value expected"); }				
+		| REDACT_PII_ error { yyerror("boolean value expected"); }
+		| REDACT_TEMPLATE EQUAL STRING { IFOR();
+										redact_template=$3;
+									}
+		| REDACT_TEMPLATE error { yyerror("string value expected"); }
+		| REDACT_MODE EQUAL STRING { IFOR();
+										if (strcasecmp($3, "replace")==0)
+											redact_mode=REDACT_REPLACE;
+										else if (strcasecmp($3, "append")==0)
+											redact_mode=REDACT_APPEND;
+										else if (strcasecmp($3, "prepend")==0)
+											redact_mode=REDACT_PREPEND;
+										else if (strcasecmp($3, "format")==0)
+											redact_mode=REDACT_FORMAT;
+										else
+											yyerror("redact_mode must be: replace|append|prepend|format");
+									}
+		| REDACT_MODE error { yyerror("string value expected (replace|append|prepend|format)"); }
 		| DISABLE_DNS_BLACKLIST EQUAL NUMBER { IFOR();
 										disable_dns_blacklist=$3;
 									}

redact_pii.c

@@ -1,9 +1,31 @@
 #include <string.h>
+#include <stdio.h>
 #include "ut.h"
 #include "redact_pii.h"
 
 int redact_pii_ = 0;
+char *redact_template = "****";
+int redact_mode = REDACT_REPLACE;
 
-inline const char* redact_pii(const char* input) { 
-    return redact_pii_ ? "****" : ZSW(input); 
+inline const char* redact_pii(const char* input) {
+    static char buf[512];
+    const char *safe = ZSW(input);
+
+    if (!redact_pii_)
+        return safe;
+
+    switch (redact_mode) {
+    case REDACT_APPEND:
+        snprintf(buf, sizeof(buf), "%s%s", safe, redact_template);
+        return buf;
+    case REDACT_PREPEND:
+        snprintf(buf, sizeof(buf), "%s%s", redact_template, safe);
+        return buf;
+    case REDACT_FORMAT:
+        snprintf(buf, sizeof(buf), redact_template, safe);
+        return buf;
+    case REDACT_REPLACE:
+    default:
+        return redact_template;
+    }
 }

redact_pii.h

@@ -20,6 +20,17 @@
 #ifndef redact_pii_h
 #define redact_pii_h
 
+enum {
+    REDACT_REPLACE = 0,
+    REDACT_APPEND,
+    REDACT_PREPEND,
+    REDACT_FORMAT
+};
+
+extern int redact_pii_;
+extern char *redact_template;
+extern int redact_mode;
 
 const char* redact_pii(const char* input);
+
 #endif