daytona 0.215.0 → 0.216.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95395a0e8e8a1c853fbbb922baf90d9fe6247dc64454589b82692c058aa1c60f
-  data.tar.gz: 588d86f42d524472b0e80ce92cc1931ac180eccb8e0a7ae889c9660a94181490
+  metadata.gz: 6a34e3a8e7bbc3cc889eb3ef79b13b306355d55860a8f50148ce81b45c5df56f
+  data.tar.gz: a56bb3a488e721f05722f8cba62ced2253bdcec09491b376f68cc73da1e53f6c
 SHA512:
-  metadata.gz: dc20a5a6fc3c2f8614b3318f0e5905c9987d7f9801e99e3d389b1abee89d258a50c13c95bda30548ecb31f406f589786c8f9eeb9f40021f6d27434c8480872ee
-  data.tar.gz: 9ef485e7c32dceaf5f52760db0cf3589a88800a1c2e95c3dede6519ca3922834522ef73e3e0f4278fa079d02f755ceaf9696a9c0b000817a4f73b6f1f073f771
+  metadata.gz: 06503be06f45fdbacf029776b60896ea595ebfc562e2882d1005a3201a43172dbd23db1d8a5fdd9a7db2bffa9247f53ff74e5c7c44d8e392ad5732eb9ed14da5
+  data.tar.gz: 79e93c94ce080d2dffc0eb1f01bc13d9b43ec70a3d68d452dc981c7e54f23467206f09184b32f0ca4641dc8d23392cac2302b9ae068f02b676a8507b9943a5be

data/lib/daytona/common/image.rb

@@ -255,27 +255,28 @@ module Daytona
     #
     # @param dockerfile_commands [Array<String>] The commands to add to the Dockerfile
     # @param context_dir [String, nil] The path to the context directory
+    # @param strict_context [Boolean] When true, a COPY source that resolves outside context_dir is
+    #   rejected instead of read. Requires context_dir, so that the boundary is explicit rather than
+    #   taken from the working directory. Sources that legitimately live elsewhere belong in
+    #   add_local_file or add_local_dir
     # @return [Image] The image with the Dockerfile commands added
     #
     # @example
     #   image = Image.debian_slim("3.12").dockerfile_commands(["RUN echo 'Hello, world!'"])
-    def dockerfile_commands(dockerfile_commands, context_dir: nil) # rubocop:disable Metrics/MethodLength
-      if context_dir
-        context_dir = File.expand_path(context_dir)
-        raise Sdk::Error, "Context directory #{context_dir} does not exist" unless Dir.exist?(context_dir)
-      end
+    def dockerfile_commands(dockerfile_commands, context_dir: nil, strict_context: false) # rubocop:disable Metrics/MethodLength
+      context_dir = self.class.send(:validate_context_dir, context_dir, strict_context)
+      root, real_root = self.class.send(:context_boundary, context_dir, strict_context)
+      commands = dockerfile_commands.join("\n")
 
       # Extract copy sources from dockerfile commands (class-level helper)
-      self.class.send(:extract_copy_sources, dockerfile_commands.join("\n"),
-                      context_dir || '').each do |context_path, original_path|
+      copy_sources = self.class.send(:extract_copy_sources, commands, context_dir || '', real_root)
+      copy_sources.each do |context_path, original_path|
         archive_base_path = context_path
-        if context_dir && !original_path.start_with?(context_dir)
-          archive_base_path = context_path.delete_prefix(context_dir)
-        end
+        archive_base_path = context_path.delete_prefix(root) unless original_path.start_with?(root)
         @context_list << Context.new(source_path: context_path, archive_path: archive_base_path)
       end
 
-      @dockerfile += "#{dockerfile_commands.join("\n")}\n"
+      @dockerfile += "#{commands}\n"
       self
     end
 
@@ -283,19 +284,23 @@ module Daytona
       # Creates an Image from an existing Dockerfile
       #
       # @param path [String] The path to the Dockerfile
+      # @param strict_context [Boolean] When true, a COPY source that resolves outside the
+      #   Dockerfile's directory is rejected instead of read. Sources that legitimately live
+      #   elsewhere belong in add_local_file or add_local_dir
       # @return [Image] The image with the Dockerfile added
       #
       # @example
       #   image = Image.from_dockerfile("Dockerfile")
-      def from_dockerfile(path) # rubocop:disable Metrics/AbcSize
+      def from_dockerfile(path, strict_context: false) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         path = Pathname.new(File.expand_path(path))
         dockerfile = path.read
         img = new(dockerfile: dockerfile)
 
         # Remove dockerfile filename from path
         path_prefix = path.to_s.delete_suffix(path.basename.to_s)
+        real_root = strict_root(path_prefix, strict_context)
 
-        extract_copy_sources(dockerfile, path_prefix).each do |context_path, original_path|
+        extract_copy_sources(dockerfile, path_prefix, real_root).each do |context_path, original_path|
           archive_base_path = context_path
           archive_base_path = context_path.delete_prefix(path_prefix) unless original_path.start_with?(path_prefix)
           img.context_list << Context.new(source_path: context_path, archive_path: archive_base_path)
@@ -361,7 +366,7 @@ module Daytona
       # @param dockerfile_content [String] The content of the Dockerfile
       # @param path_prefix [String] The path prefix to use for the sources
       # @return [Array<Array<String>>] The list of the actual file path and its corresponding COPY-command source path
-      def extract_copy_sources(dockerfile_content, path_prefix = '') # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
+      def extract_copy_sources(dockerfile_content, path_prefix = '', real_root = nil) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
         sources = []
         lines = dockerfile_logical_lines(dockerfile_content)
 
@@ -381,22 +386,28 @@ module Daytona
 
           # Get source paths from the parsed command parts
           command_parts['sources'].each do |source|
+            ensure_source_within_context(source) unless real_root.nil?
+
             # Handle absolute and relative paths differently
             full_path_pattern = if Pathname.new(source).absolute?
                                   # Absolute path - use as is
                                   source
                                 else
                                   # Relative path - add prefix
-                                  File.join(path_prefix, source)
+                                  File.join(context_root(path_prefix), source)
                                 end
 
             # Handle glob patterns
             matching_files = Dir.glob(full_path_pattern)
 
             if matching_files.any?
-              matching_files.each { |matching_file| sources << [matching_file, source] }
+              matching_files.each do |matching_file|
+                ensure_within_build_context(real_root, matching_file)
+                sources << [matching_file, source]
+              end
             else
               # If no files match, include the pattern anyway
+              ensure_within_build_context(real_root, full_path_pattern)
               sources << [full_path_pattern, source]
             end
           end
@@ -405,6 +416,124 @@ module Daytona
         sources
       end
 
+      # Validates the context directory and the strict_context combination
+      #
+      # @param context_dir [String, nil] The caller-supplied context directory
+      # @param strict_context [Boolean] Whether the build context boundary is enforced
+      # @return [String, nil] The expanded context directory
+      # @raise [Sdk::Error] If the directory is missing, or strict_context was asked for without one
+      def validate_context_dir(context_dir, strict_context)
+        # An empty string is truthy in Ruby and expands to the working directory, which would let
+        # a strict context take its boundary from wherever the process was started
+        context_dir = nil if context_dir.nil? || context_dir.to_s.strip.empty?
+
+        if context_dir
+          context_dir = File.expand_path(context_dir)
+          raise Sdk::Error, "Context directory #{context_dir} does not exist" unless Dir.exist?(context_dir)
+        elsif strict_context
+          raise Sdk::Error, 'strict_context requires context_dir so that the build context boundary is explicit'
+        end
+
+        context_dir
+      end
+
+      # The join root and the strict boundary for a set of COPY sources
+      #
+      # @param context_dir [String, nil] The expanded context directory
+      # @param strict_context [Boolean] Whether the build context boundary is enforced
+      # @return [Array<String, String, nil>] The join root and the strict boundary
+      def context_boundary(context_dir, strict_context)
+        [context_root(context_dir || ''), strict_root(context_dir, strict_context)]
+      end
+
+      # The resolved boundary a strict build context is enforced against, or nil when the caller
+      # did not ask for one
+      #
+      # @param root [String, nil] The build context root
+      # @param strict_context [Boolean] Whether the build context boundary is enforced
+      # @return [String, nil] The resolved boundary, or nil
+      def strict_root(root, strict_context)
+        return nil unless strict_context
+
+        real_path(root) || root
+      end
+
+      # The build context root that a COPY source is resolved against. An empty prefix means
+      # the caller supplied no context directory, in which case `docker build .` semantics
+      # apply and the working directory is the context.
+      #
+      # @param path_prefix [String, nil] The path prefix the sources are resolved against
+      # @return [String] The build context root
+      def context_root(path_prefix)
+        path_prefix.nil? || path_prefix.empty? ? Dir.pwd : path_prefix
+      end
+
+      # Rejects a COPY source that names something outside the build context. This is decided on
+      # the source itself, before anything is read, so that a source is accepted or rejected the
+      # same way whether or not it happens to exist on disk. An absolute source, including a
+      # Windows drive, UNC or root-relative path, and one whose normalised form climbs above the
+      # context both name something the build context cannot address. Backslashes are read as
+      # separators, since that is what they are on Windows.
+      #
+      # @param source [String] The COPY-command source path
+      # @raise [Sdk::Error] If the source names something outside the build context
+      def ensure_source_within_context(source)
+        # A backslash is a separator on Windows, so fold it before deciding: otherwise
+        # '..\secret.txt' reads as an ordinary filename here and as a traversal there.
+        candidate = Pathname.new(source.tr('\\', '/'))
+        normalized = candidate.cleanpath.to_s
+        outside = candidate.absolute? ||
+                  source.match?(/\A[A-Za-z]:/) ||
+                  normalized == '..' ||
+                  normalized.start_with?('../')
+        return unless outside
+
+        raise Sdk::Error, "forbidden path outside the build context: #{source}"
+      end
+
+      # Rejects a source that resolves outside the build context. Normalisation alone cannot see
+      # this: a symlinked parent directory is traversed transparently by the archiver, so a
+      # regular file reached through one is stored with its contents even though the written
+      # path stays inside the context.
+      #
+      # @param real_root [String] The resolved build context root
+      # @param candidate [String] The resolved source path to check
+      # @raise [Sdk::Error] If the candidate resolves outside the build context
+      def ensure_within_build_context(real_root, candidate)
+        # real_root is nil unless the caller asked for a strict build context
+        return if real_root.nil?
+
+        resolved = real_path(candidate)
+        # A path that does not exist cannot be archived. A symlink whose target is missing still
+        # leaves the context, so it is rejected rather than tolerated.
+        return if resolved.nil? && !File.symlink?(candidate)
+
+        raise Sdk::Error, "forbidden path outside the build context: #{candidate}" if resolved.nil?
+        raise Sdk::Error, "forbidden path outside the build context: #{resolved}" unless within?(real_root, resolved)
+      end
+
+      # Whether a resolved path lies inside the resolved build context root
+      #
+      # @param real_root [String] The resolved build context root
+      # @param resolved [String] The resolved candidate path
+      # @return [Boolean]
+      def within?(real_root, resolved)
+        relative = Pathname.new(resolved).relative_path_from(Pathname.new(real_root)).to_s
+        relative != '..' && !relative.start_with?("..#{File::SEPARATOR}")
+      rescue ArgumentError
+        false
+      end
+
+      # Resolves a path to its real location, or nil when it cannot be resolved
+      #
+      # @param path [String] The path to resolve
+      # @return [String, nil] The real path, or nil
+      def real_path(path)
+        File.realpath(path)
+      rescue SystemCallError
+        nil
+      end
+
       # Joins backslash-continued physical lines into logical Dockerfile instruction lines
       #
       # @param dockerfile_content [String] The content of the Dockerfile

data/lib/daytona/sdk/version.rb

@@ -5,6 +5,6 @@
 
 module Daytona
   module Sdk
-    VERSION = '0.215.0'
+    VERSION = '0.216.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daytona
 version: !ruby/object:Gem::Version
-  version: 0.215.0
+  version: 0.216.0
 platform: ruby
 authors:
 - Daytona Platforms Inc.
@@ -91,42 +91,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.215.0
+        version: 0.216.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.215.0
+        version: 0.216.0
 - !ruby/object:Gem::Dependency
   name: daytona_api_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.215.0
+        version: 0.216.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.215.0
+        version: 0.216.0
 - !ruby/object:Gem::Dependency
   name: daytona_toolbox_api_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.215.0
+        version: 0.216.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.215.0
+        version: 0.216.0
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement