starter: Add support for multi-line strings in ipsec.conf

diff --git a/src/starter/parser/lexer.l b/src/starter/parser/lexer.l
index d9f469c36a8d19e690ddd1f4bf1dda8d77a4471c..f70658e683c19d16b21b91cae5cdb85682566ea7 100644 (file)
--- a/src/starter/parser/lexer.l
+++ b/src/starter/parser/lexer.l
@@ -123,16 +123,11 @@ static void include_files(parser_helper_t *ctx);
 <str>{
        "\""                            |
        <<EOF>>                         |
-       \n                                      |
        \\                                      {
                if (!streq(yytext, "\""))
                {
-                       if (streq(yytext, "\n"))
-                       {       /* put the newline back to fix the line numbers */
-                               unput('\n');
-                               yy_set_bol(0);
-                       }
                        PARSER_DBG1(yyextra, "unterminated string detected");
+                       return STRING_ERROR;
                }
                if (yy_top_state(yyscanner) == inc)
                {       /* string include */
@@ -152,7 +147,7 @@ static void include_files(parser_helper_t *ctx);
        \\t     yyextra->string_add(yyextra, "\t");
        \\\r?\n /* merge lines that end with EOL characters */
        \\.     yyextra->string_add(yyextra, yytext+1);
-       [^\\\n"]+                       {
+       [^\\"]+                 {
                yyextra->string_add(yyextra, yytext);
        }
 }

diff --git a/src/starter/parser/parser.y b/src/starter/parser/parser.y
index 54dedc12bf7e6490776dda72da0c20950526c02e..0b2b3b09f74188674acfec7a437d128a109fd067 100644 (file)
--- a/src/starter/parser/parser.y
+++ b/src/starter/parser/parser.y
@@ -73,7 +73,7 @@ static int yylex(YYSTYPE *lvalp, parser_helper_t *ctx)
        conf_parser_section_t t;
 }
 %token <s> STRING
-%token EQ SPACES NEWLINE CONFIG_SETUP CONN CA
+%token EQ SPACES NEWLINE CONFIG_SETUP CONN CA STRING_ERROR
 
 /* ...and other symbols */
 %type <t> section_type

diff --git a/src/starter/tests/suites/test_parser.c b/src/starter/tests/suites/test_parser.c
index 26a41ba55c5d6af7d14162f25f2ffc7bf6677b60..4ae7b22fa8ba122a045187b666f3591ba10686b1 100644 (file)
--- a/src/starter/tests/suites/test_parser.c
+++ b/src/starter/tests/suites/test_parser.c
@@ -328,6 +328,9 @@ static struct {
        { TRUE, "conn foo\n\tkey=val     ue", "foo", "val ue" },
        { TRUE, "conn foo\n\tkey=\"val   ue\"", "foo", "val   ue" },
        { TRUE, "conn foo\n\tkey=\"val\\nue\"", "foo", "val\nue" },
+       { TRUE, "conn foo\n\tkey=\"val\nue\"", "foo", "val\nue" },
+       { TRUE, "conn foo\n\tkey=\"val\\\nue\"", "foo", "value" },
+       { FALSE, "conn foo\n\tkey=\"unterminated", "foo", NULL },
 };
 
 START_TEST(test_strings)