Merge pull request #1637

Fix continuation on colons in plugin baseclass

CHANGELOG.md

@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - dird: fix `purge oldest volume` [PR #1628]
+- Fix continuation on colons in plugin baseclass [PR #1637]
 
 [PR #1581]: https://github.com/bareos/bareos/pull/1581
 [PR #1587]: https://github.com/bareos/bareos/pull/1587
@@ -45,4 +46,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [PR #1628]: https://github.com/bareos/bareos/pull/1628
 [PR #1630]: https://github.com/bareos/bareos/pull/1630
 [PR #1632]: https://github.com/bareos/bareos/pull/1632
+[PR #1637]: https://github.com/bareos/bareos/pull/1637
 [unreleased]: https://github.com/bareos/bareos/tree/master

core/src/plugins/filed/python/pyfiles/BareosFdPluginBaseclass.py

@@ -49,7 +49,7 @@ def parse_plugindef_string(plugindef):
             continue
         # See if the last character is a escape of the value string
         while val[-1:] == "\\":
-            val = val[:-1] + ":" + plugin_options.pop(0)
+            val = val[:-1] + ":" + parts.pop(0)
         if key not in options:
             options[key] = val
     return options

systemtests/tests/py3plug-fd-basic/etc/bareos/bareos-dir.d/fileset/PluginConfigTestNoFile.conf.in

@@ -13,5 +13,6 @@ FileSet {
     ":option3=value3"
     ":option4=value4"
     ":password#enc=aA9+EcW-iJ"
+    ":masked-colon=one\\:two\\:three"
   }
 }

systemtests/tests/py3plug-fd-basic/testrunner-config

@@ -66,6 +66,7 @@ for i in 1 2 3 4; do
   check_option "option$i" "value$i" nofile
 done
 check_option "password" "password" nofile
+check_option "masked-colon" 'one:two:three' nofile
 
 for i in 1 6 7 8; do
   check_not_option "option$i" "override-value$i" defaults-file