Basic implementation of symlink traversal (#293)

SamMousa · joelwurtz · commit cc43b35df21c · 2018-02-22T02:45:36.000+01:00
diff --git a/src/Context/ContextBuilder.php b/src/Context/ContextBuilder.php
@@ -383,7 +383,7 @@ private function getFileFromDisk($directory, $source)
         if (!\array_key_exists($hash, $this->files)) {
             // Check if source is a directory or a file.
             if (\is_dir($source)) {
-                $this->fs->mirror($source, $directory.'/'.$hash);
+                $this->fs->mirror($source, $directory.'/'.$hash, null, ['copy_on_windows' => true]);
             } else {
                 $this->fs->copy($source, $directory.'/'.$hash);
             }
diff --git a/tests/Context/ContextBuilderTest.php b/tests/Context/ContextBuilderTest.php
@@ -269,4 +269,31 @@ public function testTar(): void
         $this->assertInternalType('string', $content);
         $this->assertSame($context->toTar(), $content);
     }
+
+    public function testTraverseSymlinks(): void
+    {
+        $contextBuilder = new ContextBuilder();
+        $dir = \tempnam('', '');
+        \unlink($dir);
+        \mkdir($dir);
+        $file = $dir.'/test';
+
+        \file_put_contents($file, 'abc');
+
+        $linkFile = $file.'-symlink';
+        \symlink($file, $linkFile);
+
+        $contextBuilder->addFile('/foo', $dir);
+
+        $context = $contextBuilder->getContext();
+
+        $filename = \preg_replace(<<<DOCKERFILE
+#FROM base
+ADD (.+?) /foo#
+DOCKERFILE
+            , '$1', $context->getDockerfileContent());
+        \unlink($file);
+        $context->setCleanup(false);
+        $this->assertStringEqualsFile($context->getDirectory().'/'.$filename.'/test-symlink', 'abc');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ private function getFileFromDisk($directory, $source)`
`383`	`383`	`if (!\array_key_exists($hash, $this->files)) {`
`384`	`384`	`// Check if source is a directory or a file.`
`385`	`385`	`if (\is_dir($source)) {`
`386`		`- $this->fs->mirror($source, $directory.'/'.$hash);`
	`386`	`+ $this->fs->mirror($source, $directory.'/'.$hash, null, ['copy_on_windows' => true]);`
`387`	`387`	`} else {`
`388`	`388`	`$this->fs->copy($source, $directory.'/'.$hash);`
`389`	`389`	`}`