interpreter: reorder tests for DependencyVariableString creation

Do the is_dir() test last, once it's known that the directory is
related to the source directory.

Signed-off-by: Paolo Bonzini <[email protected]>

Author: bonzini

mesonbuild/interpreter/interpreter.py

@@ -722,9 +722,14 @@ def func_declare_dependency(self, node: mparser.BaseNode, args: T.List[TYPE_var]
             except ValueError:
                 continue
             else:
-                if not self.is_subproject() and srcdir / self.subproject_dir in p.parents:
-                    continue
-                if p.is_absolute() and p.is_dir() and srcdir / self.root_subdir in [p] + list(Path(os.path.abspath(p)).parents):
+                # Note that p.is_dir() can raise a PermissionError if a parent does not have
+                # the executable permission set.  Test it last, and only after checking that
+                # v is within the project's source directory, to avoid false positives for
+                # e.g. root owned directories under /var.
+                if p.is_absolute() \
+                        and (self.is_subproject() or srcdir / self.subproject_dir not in p.parents) \
+                        and srcdir / self.root_subdir in [p] + list(Path(os.path.abspath(p)).parents) \
+                        and p.is_dir():
                     variables[k] = P_OBJ.DependencyVariableString(v)
 
         dep = dependencies.InternalDependency(version, incs, compile_args,

test cases/unit/125 declare_dep var/meson.build

@@ -0,0 +1,7 @@
+project('foo')
+
+declare_dependency(
+  variables: {
+    'dir': get_option('dir')
+  }
+)

test cases/unit/125 declare_dep var/meson_options.txt

@@ -0,0 +1 @@
+option('dir', type: 'string')

unittests/linuxliketests.py

@@ -1868,6 +1868,18 @@ def test_top_options_in_sp(self):
         testdir = os.path.join(self.unit_test_dir, '124 pkgsubproj')
         self.init(testdir)
 
+    def test_unreadable_dir_in_declare_dep(self):
+        testdir = os.path.join(self.unit_test_dir, '125 declare_dep var')
+        tmpdir = Path(tempfile.mkdtemp())
+        self.addCleanup(windows_proof_rmtree, tmpdir)
+        declaredepdir = tmpdir / 'test'
+        declaredepdir.mkdir()
+        try:
+            tmpdir.chmod(0o444)
+            self.init(testdir, extra_args=f'-Ddir={declaredepdir}')
+        finally:
+            tmpdir.chmod(0o755)
+
     def check_has_flag(self, compdb, src, argument):
         for i in compdb:
             if src in i['file']: