[patch] fixed patch to honor a second commit in github

gvmd-21.4.5-r6-fix-PCRE2-user-validation-regex.patch (text/plain), 4.64 KB, created by Giuseppe Foti on 2023-05-01 09:50:09 UTC

diff -ruN a/src/manage.c b/src/manage.c
--- a/src/manage.c	2022-02-22 11:52:13.000000000 +0100
+++ b/src/manage.c	2023-05-01 10:54:59.843397954 +0200
@@ -6178,7 +6178,7 @@
 int
 validate_username (const gchar * name)
 {
-  if (g_regex_match_simple ("^[[:alnum:]-_.]+$", name, 0, 0))
+  if (g_regex_match_simple ("^[[:alnum:]_.-]+$", name, 0, 0))
     return 0;
   else
     return 1;
diff -ruN a/src/manage_configs.c b/src/manage_configs.c
--- a/src/manage_configs.c	2022-02-22 11:52:13.000000000 +0100
+++ b/src/manage_configs.c	2023-05-01 10:56:25.809542002 +0200
@@ -318,7 +318,7 @@
 
   split = g_regex_split_simple
            (/* Full-and-Fast--daba56c8-73ec-11df-a475-002264764cea.xml */
-            "^.*([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12}).xml$",
+            "^.*([0-9a-f]{8})\\-([0-9a-f]{4})\\-([0-9a-f]{4})\\-([0-9a-f]{4})\\-([0-9a-f]{12}).xml$",
             path, 0, 0);
 
   if (split == NULL || g_strv_length (split) != 7)
diff -ruN a/src/manage_port_lists.c b/src/manage_port_lists.c
--- a/src/manage_port_lists.c	2022-02-22 11:52:13.000000000 +0100
+++ b/src/manage_port_lists.c	2023-05-01 10:56:56.489588232 +0200
@@ -253,7 +253,7 @@
 
   split = g_regex_split_simple
            (/* Full-and-Fast--daba56c8-73ec-11df-a475-002264764cea.xml */
-            "^.*([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12}).xml$",
+            "^.*([0-9a-f]{8})\\-([0-9a-f]{4})\\-([0-9a-f]{4})\\-([0-9a-f]{4})\\-([0-9a-f]{12}).xml$",
             path, 0, 0);
 
   if (split == NULL || g_strv_length (split) != 7)
diff -ruN a/src/manage_report_formats.c b/src/manage_report_formats.c
--- a/src/manage_report_formats.c	2022-02-22 11:52:13.000000000 +0100
+++ b/src/manage_report_formats.c	2023-05-01 11:13:43.248938614 +0200
@@ -613,7 +613,7 @@
 
   split = g_regex_split_simple
            (/* Full-and-Fast--daba56c8-73ec-11df-a475-002264764cea.xml */
-            "^.*([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12}).xml$",
+            "^.*([0-9a-f]{8})\\-([0-9a-f]{4})\\-([0-9a-f]{4})\\-([0-9a-f]{4})\\-([0-9a-f]{12}).xml$",
             path, 0, 0);
 
   if (split == NULL || g_strv_length (split) != 7)
@@ -867,4 +867,5 @@
       return TRUE;
 
   return FALSE;
-}
\ Manca newline alla fine del file
+}
+
diff -ruN a/src/manage_sql.c b/src/manage_sql.c
--- a/src/manage_sql.c	2022-02-22 11:52:13.000000000 +0100
+++ b/src/manage_sql.c	2023-05-01 11:00:57.534890691 +0200
@@ -7001,7 +7001,7 @@
 
       if (strcmp (name, "tp_sms_hostname") == 0)
         {
-          if (g_regex_match_simple ("^[0-9A-Za-z][0-9A-Za-z.-]*$",
+          if (g_regex_match_simple ("^[0-9A-Za-z][0-9A-Za-z.\\-]*$",
                                     *data, 0, 0)
               == FALSE)
             {
@@ -49987,8 +49987,8 @@
            */
           languages_regex
             = g_regex_new ("^(Browser Language|"
-                           "([a-z]{2,3})(_[A-Z]{2})?(@[[:alnum:]_-]+)?"
-                           "(:([a-z]{2,3})(_[A-Z]{2})?(@[[:alnum:]_-]+)?)*)$",
+                           "([a-z]{2,3})(_[A-Z]{2})?(@[[:alnum:]_\\-]+)?"
+                           "(:([a-z]{2,3})(_[A-Z]{2})?(@[[:alnum:]_\\-]+)?)*)$",
                            0, 0, NULL);
           match = g_regex_match (languages_regex, value, 0, NULL);
           g_regex_unref (languages_regex);
@@ -50572,7 +50572,7 @@
   if (strcmp (uuid, SETTING_UUID_LSC_DEB_MAINTAINER) == 0)
     {
       if (g_regex_match_simple
-            ("^([[:alnum:]-_]*@[[:alnum:]-_][[:alnum:]-_.]*)?$",
+            ("^([[:alnum:]\\-_]*@[[:alnum:]\\-_][[:alnum:]\\-_.]*)?$",
             value, 0, 0) == FALSE)
         return 1;
     }
diff -ruN a/src/manage_sql_report_formats.c b/src/manage_sql_report_formats.c
--- a/src/manage_sql_report_formats.c	2022-02-22 11:52:13.000000000 +0100
+++ b/src/manage_sql_report_formats.c	2023-05-01 11:01:28.025923759 +0200
@@ -2470,7 +2470,7 @@
       case REPORT_FORMAT_PARAM_TYPE_REPORT_FORMAT_LIST:
         {
           if (g_regex_match_simple
-                ("^(?:[[:alnum:]-_]+)?(?:,(?:[[:alnum:]-_])+)*$", value, 0, 0)
+                ("^(?:[[:alnum:]\\-_]+)?(?:,(?:[[:alnum:]\\-_])+)*$", value, 0, 0)
               == FALSE)
             return 1;
           else
diff -ruN a/src/utils.c b/src/utils.c
--- a/src/utils.c	2022-02-22 11:52:13.000000000 +0100
+++ b/src/utils.c	2023-05-01 11:01:59.334956934 +0200
@@ -337,7 +337,7 @@
   epoch_time = 0;
 
   if (regex == NULL)
-    regex = g_regex_new ("^([0-9]{4}-[0-9]{2}-[0-9]{2})"
+    regex = g_regex_new ("^([0-9]{4}\\-[0-9]{2}\\-[0-9]{2})"
                          "[T ]([0-9]{2}:[0-9]{2})"
                          "(:[0-9]{2})?(?:\\.[0-9]+)?"
                          "(Z|[+-][0-9]{2}:?[0-9]{2})?$",