Merge branch 'dev'

.travis.yml

@@ -66,7 +66,7 @@ jobs:
       stage: installation tests
       install: skip
       script: ./tests/docker/build
-      env: DISTRO=centos-latest PYVER=2
+      env: DISTRO=centos-latest PYVER=3
 
     # Ubuntu, latest
     - <<: *installation-stage

CHANGES.rst

@@ -3,6 +3,13 @@ Change log
 
 .. note:: **Upgrade notes**: after upgrading, run the ``arouteserver setup-templates`` command to sync the local templates with those distributed with the new version. More details on the `Upgrading <https://arouteserver.readthedocs.io/en/latest/INSTALLATION.html#upgrading>`__ section of the documentation.
 
+v0.22.2
+-------
+
+- Fix: prevent environment variables with unknown escapes (like `\u`) from interrupting the execution.
+
+  Related: `issue #50 on GitHub <https://github.com/pierky/arouteserver/issues/50>`_.
+
 v0.22.1
 -------
 

pierky/arouteserver/config/base.py

@@ -77,8 +77,7 @@ def expand_include(lines):
 
         def expand_env_vars(doc):
             res = doc
-            for v in os.environ:
-                res = re.sub("\$\{" + v + "\}", os.environ[v], res)
+            res = os.path.expandvars(res)
             res = re.sub("\$\{[A-Za-z0-9_]+\}", "", res)
             return res
 

pierky/arouteserver/version.py

@@ -13,5 +13,5 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = "0.22.1" # pragma: no cover
+__version__ = "0.22.2-alpha3" # pragma: no cover
 COPYRIGHT_YEAR = 2019 # pragma: no cover

tests/docker/centos-latest_py2.m4 → tests/docker/centos-latest_py3.m4

@@ -4,8 +4,11 @@ include(`base.m4')
 
 RUN yum -y update && yum -y install epel-release
 RUN yum -y update && yum -y install \
-	python-pip \
-	python-devel \
+	python3-pip \
+	python3-devel \
 	gcc
 
+ENV python=python3
+ENV pip=pip3
+
 include(`install.m4')

tests/static/test_cfg_general.py

@@ -1411,3 +1411,20 @@ def test_env_vars_corrupted(self):
             "  router_id: ${ROUTER_ID\n"
         )
         self._contains_err("Invalid IPv4 address: ${ROUTER_ID")
+
+    @mock.patch.dict(os.environ, {"ROUTER_ID": "192.0.2.1", "BAD_ESCAPE": r"\u"})
+    def test_env_vars_bad_escape(self):
+        """{}: environment variables: ok (bad escape)"""
+
+        self.cfg._load_from_yaml(
+            "cfg:\n"
+            "  rs_as: 999\n"
+            "  router_id: ${ROUTER_ID}\n"
+            "  filtering:\n"
+            "    global_black_list_pref: ${GLOBAL_BLACK_LIST_PREF}\n"
+        )
+        self.cfg.parse()
+        self._contains_err()
+
+        self.assertEqual(self.cfg["router_id"], "192.0.2.1")
+        self.assertEqual(self.cfg["filtering"]["global_black_list_pref"], None)