settings: Don't allow dots in section/key names anymore

This requires config changes if filelog is used with a path that
contains dots. This path must now be defined in the `path` setting of an
arbitrarily named subsection of `filelog`.  Without that change the
whole strongswan.conf file will fail to load, which some users might
not notice immediately.

diff --git a/conf/strongswan.conf.5.head.in b/conf/strongswan.conf.5.head.in
index c9db45355dc49b3689bac08b6d7f657bb621de19..9337c19e229c614735fe0aa1cc276c1104279393 100644 (file)
--- a/conf/strongswan.conf.5.head.in
+++ b/conf/strongswan.conf.5.head.in
@@ -40,12 +40,6 @@ Section names and keys may contain any printable character except:
        . , : { } = " # \\n \\t space
 .EE
 .PP
-In rare circumstances \fB.\fP characters may be used in section names (e.g. for
-log file names in a filelog section), but should generally be avoided.
-To use \fB:\fP characters in section names (e.g. for Windows log file paths)
-they may be written as \fB::\fP, which the parser replaces with a single
-\fB:\fP.
-
 An example file in this format might look like this:
 .PP
 .EX

diff --git a/scripts/settings-test.c b/scripts/settings-test.c
index 336da09f01c42fee0c661dc1d68948193d034917..5811d70b5d87474c865551bb72ac4dab445188a8 100644 (file)
--- a/scripts/settings-test.c
+++ b/scripts/settings-test.c
@@ -81,7 +81,6 @@ static void print_section(section_t *section, int level)
 
 /**
  * Recursively print a given section and all subsections/settings
- * FIXME: Doesn't work properly if any of the keys contain dots
  */
 static void print_settings_section(settings_t *settings, char *section,
                                                                   int level)

diff --git a/src/libstrongswan/settings/settings_lexer.l b/src/libstrongswan/settings/settings_lexer.l
index 9cde1190013f9b4d097385d363dafdf52f714d63..c21ebbba30b67fbbccc32390bce7054e994904f6 100644 (file)
--- a/src/libstrongswan/settings/settings_lexer.l
+++ b/src/libstrongswan/settings/settings_lexer.l
@@ -49,8 +49,8 @@ static void include_files(parser_helper_t *ctx);
 /* type of our extra data */
 %option extra-type="parser_helper_t*"
 
-/* state used to scan names */
-%x nam
+/* state used to scan references */
+%x ref
 /* state used to scan values */
 %x val
 /* state used to scan include file patterns */
@@ -59,7 +59,7 @@ static void include_files(parser_helper_t *ctx);
 %x str
 
 /* pattern for section/key names */
-NAME [^#{}:,="\r\n\t ]
+NAME [^#{}:.,="\r\n\t ]
 
 %%
 
@@ -68,10 +68,15 @@ NAME [^#{}:,="\r\n\t ]
 \n|#.*\n                               /* eat newlines and comments at the end of a line */
 
 "{"                                            |
-"}"                                            |
-","                                            return yytext[0];
+"}"                                            return yytext[0];
 
-":"                                            return REFS;
+"."                                            return DOT;
+","                                            return COMMA;
+
+":"                                            {
+       yy_push_state(ref, yyscanner);
+       return COLON;
+}
 
 "="                                            {
        yy_push_state(val, yyscanner);
@@ -88,41 +93,26 @@ NAME [^#{}:,="\r\n\t ]
        return STRING_ERROR;
 }
 
-{NAME} {
-       yyextra->string_init(yyextra);
-       yyextra->string_add(yyextra, yytext);
-       yy_push_state(nam, yyscanner);
+{NAME}+                                {
+       yylval->s = strdup(yytext);
+       return NAME;
 }
 
-<nam>{
-       "::"                            {
-               yyextra->string_add(yyextra, yytext+1);
-       }
+<ref>{
+       [\t ]*#[^\r\n]*                 /* eat comments */
+       [\t\r ]+                                /* eat whitespace */
+       \n|#.*\n                                /* eat newlines and comments at the end of a line */
 
-       {NAME}+                         {
-               yyextra->string_add(yyextra, yytext);
+       ","                                             return COMMA;
+
+       {NAME}+(\.{NAME}+)* {
+               yylval->s = strdup(yytext);
+               return NAME;
        }
 
-       <<EOF>>                         |
-       .|[\r\n]                        {
-               if (*yytext)
-               {
-                       switch (yytext[0])
-                       {
-                               case '\n':
-                                       /* put the newline back to fix the line numbers */
-                                       unput('\n');
-                                       yy_set_bol(0);
-                                       break;
-                               default:
-                                       /* these are parsed outside of this start condition */
-                                       unput(yytext[0]);
-                                       break;
-                       }
-               }
+       .                                       {
+               unput(yytext[0]);
                yy_pop_state(yyscanner);
-               yylval->s = yyextra->string_get(yyextra);
-               return NAME;
        }
 }
 

diff --git a/src/libstrongswan/settings/settings_parser.y b/src/libstrongswan/settings/settings_parser.y
index 7e72a90c90c24ca3e653225c746d77060b7fac64..cc1c917756aaa0ca66d252bd7519f2d215032f84 100644 (file)
--- a/src/libstrongswan/settings/settings_parser.y
+++ b/src/libstrongswan/settings/settings_parser.y
@@ -82,7 +82,9 @@ static int yylex(YYSTYPE *lvalp, parser_helper_t *ctx)
        array_t *refs;
 }
 %token <s> NAME STRING
-%token REFS ":"
+%token DOT "."
+%token COMMA ","
+%token COLON ":"
 %token NEWLINE STRING_ERROR
 
 /* ...and other symbols */
@@ -152,7 +154,7 @@ references:
                $$ = array_create(0, 0);
                array_insert($$, ARRAY_TAIL, $1);
        }
-       | references ',' NAME
+       | references "," NAME
        {
                array_insert($1, ARRAY_TAIL, $3);
                $$ = $1;

diff --git a/src/libstrongswan/tests/suites/test_settings.c b/src/libstrongswan/tests/suites/test_settings.c
index 6259c9ed08129c2016581d0205fcb5d37e4f8756..e0609605cb4a61b13320bdf8e01da1baf79c6792 100644 (file)
--- a/src/libstrongswan/tests/suites/test_settings.c
+++ b/src/libstrongswan/tests/suites/test_settings.c
@@ -1480,18 +1480,6 @@ START_TEST(test_valid)
        ck_assert(settings->load_files(settings, path, FALSE));
        verify_string("value", "valid.key");
        verify_string("value1", "valid.key1");
-
-       contents = chunk_from_str(
-               "c::\\Logfiles\\charon.log { dmn = 1 }");
-       ck_assert(chunk_write(contents, path, 0022, TRUE));
-       ck_assert(settings->load_files(settings, path, FALSE));
-       verify_string("1", "%s.dmn", "c:\\Logfiles\\charon.log");
-
-       contents = chunk_from_str(
-               "section { c::\\Logfiles\\charon.log = 1 }");
-       ck_assert(chunk_write(contents, path, 0022, TRUE));
-       ck_assert(settings->load_files(settings, path, FALSE));
-       verify_string("1", "section.%s", "c:\\Logfiles\\charon.log");
 }
 END_TEST
 
@@ -1539,6 +1527,16 @@ START_TEST(test_invalid)
                "incorrect :: ref {}");
        ck_assert(chunk_write(contents, path, 0022, TRUE));
        ck_assert(!settings->load_files(settings, path, FALSE));
+
+       contents = chunk_from_str(
+               "/var/log/daemon.log { dmn = 1 }");
+       ck_assert(chunk_write(contents, path, 0022, TRUE));
+       ck_assert(!settings->load_files(settings, path, FALSE));
+
+       contents = chunk_from_str(
+               "filelog { /var/log/daemon.log = 1 }");
+       ck_assert(chunk_write(contents, path, 0022, TRUE));
+       ck_assert(!settings->load_files(settings, path, FALSE));
 }
 END_TEST