Merge pull request #190 from vbscott/cfg_space

Fixed bug with space before comment in config
duosecurity · Dec 20, 2021 · 77a88ec · 77a88ec
2 parents b7562c8 + ac1a052
commit 77a88ec
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/lib/ini.c b/lib/ini.c
@@ -81,10 +81,15 @@ int ini_parse(FILE *file,
         if (*prev_name && *start && start > line) {
             /* Non-black line with leading whitespace, treat as continuation
                of previous name's value (as per Python ConfigParser). */
-	    if (!handler(user, section, prev_name, start) && !error) {
+            value = lskip(start);
+            /* Skip line if this line is a comment with whitespace infront */
+            if (*value == ';') {
+                continue;
+            }
+            if (!handler(user, section, prev_name, start) && !error) {
                 error = lineno;
-		break;
-	    }
+                break;
+            }
         }
         else
 #endif
@@ -102,7 +107,7 @@ int ini_parse(FILE *file,
             else if (!error) {
                 /* No ']' found on section line */
                 error = lineno;
-		break;
+                break;
             }
         }
         else if (*start && *start != ';') {
@@ -121,13 +126,13 @@ int ini_parse(FILE *file,
                 strncpy0(prev_name, name, sizeof(prev_name));
                 if (!handler(user, section, name, value) && !error) {
                     error = lineno;
-		    break;
-		}
+                    break;
+                }
             }
             else if (!error) {
                 /* No '=' found on name=value line */
                 error = lineno;
-		break;
+                break;
             }
         }
     }

diff --git a/tests/confs/mockduo_extra_space.conf b/tests/confs/mockduo_extra_space.conf
@@ -0,0 +1,7 @@
+[duo]
+ikey = DIXYZV6YM8IFYVWBINCA
+skey =
+ yWHSMhWucAcp7qvuH3HWTaSaKABs8Gaddiv1NIRo
+host = localhost:4443
+cafile = certs/mockduo-ca.pem
+ ; This comment shouldn't break Duo
diff --git a/tests/login_duo-4.t b/tests/login_duo-4.t
@@ -103,3 +103,6 @@ Test getting hostname
   [4] Aborted Duo login for 'hostname': correct hostname
   [1]
 
+Test extra whitespace before comment in conf file
+  $ ${BUILDDIR}/login_duo/login_duo -d -c confs/mockduo_extra_space.conf -f preauth-allow true
+  [4] Skipped Duo login for 'preauth-allow': preauth-allowed
diff --git a/tests/pam_duo-4.t b/tests/pam_duo-4.t
@@ -113,3 +113,7 @@ Test max prompts equals PAM_MAXPROMPTS
   Invalid passcode, please try again.
   Autopushing login request to phone...
   Invalid passcode, please try again.
+
+Test extra whitespace before comment in conf fil
+  $ ./testpam.py -d -c confs/mockduo_extra_space.conf -f preauth-allow true
+  [4] Skipped Duo login for 'preauth-allow': preauth-allowed