pray-cli 1.9.1 → 1.10.0

data/lib/pray/session.rb

@@ -2,6 +2,7 @@
 
 require "json"
 require "fileutils"
+require_relative "trust"
 
 module Pray
   SessionFile = Struct.new(
@@ -12,13 +13,14 @@ module Pray
   module Session
     module_function
 
-    def session_file_path(root)
-      File.join(root, ".pray", "session.json")
+    def session_file_path(_root)
+      File.join(Trust.trust_home, "session.json")
     end
 
     def persist(root, session)
       path = session_file_path(root)
       FileUtils.mkdir_p(File.dirname(path))
+      migrate_legacy_session(root, path)
       sessions = load_sessions(path)
       existing = sessions.find { |entry| entry.server_url == session.server_url }
       if existing
@@ -34,12 +36,14 @@ module Pray
       else
         {"sessions" => sessions.map { |entry| session_to_hash(entry) }}
       end
-      File.write(path, JSON.pretty_generate(document))
+      write_document(path, document)
       session
     end
 
     def load_latest(root)
-      sessions = load_sessions(session_file_path(root))
+      path = session_file_path(root)
+      migrate_legacy_session(root, path)
+      sessions = load_sessions(path)
       sessions.reverse.find { |session| !session.email.to_s.strip.empty? }
     end
 
@@ -86,5 +90,33 @@ module Pray
         signer_fingerprint: entry["signer_fingerprint"]
       )
     end
+
+    def migrate_legacy_session(root, path)
+      legacy_path = File.join(root, ".pray", "session.json")
+      return unless File.file?(legacy_path)
+      return if File.expand_path(legacy_path) == File.expand_path(path)
+
+      sessions = load_sessions(path)
+      load_sessions(legacy_path).each do |legacy|
+        sessions << legacy unless sessions.any? { |entry| entry.server_url == legacy.server_url }
+      end
+      document = (sessions.length == 1) ? session_to_hash(sessions.first) : {
+        "sessions" => sessions.map { |entry| session_to_hash(entry) }
+      }
+      FileUtils.mkdir_p(File.dirname(path))
+      write_document(path, document)
+      File.delete(legacy_path)
+    end
+
+    def write_document(path, document)
+      temporary_path = "#{path}.tmp-#{Process.pid}"
+      File.open(temporary_path, File::WRONLY | File::CREAT | File::TRUNC, 0o600) do |file|
+        file.write("#{JSON.pretty_generate(document)}\n")
+        file.flush
+        file.fsync
+      end
+      File.chmod(0o600, temporary_path)
+      File.rename(temporary_path, path)
+    end
   end
 end

data/lib/pray/tar_validation.rb

@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+
+require "fileutils"
+require_relative "path_safety"
+require_relative "resource_limits"
+
+module Pray
+  module TarValidation
+    BLOCK_BYTES = 512
+    State = Struct.new(:paths, :entry_count, :total_bytes, :pending_path, keyword_init: true)
+
+    module_function
+
+    def extract!(bytes, output_directory)
+      FileUtils.mkdir_p(output_directory)
+      validate!(bytes, output_directory: output_directory)
+    end
+
+    def validate!(bytes, output_directory: nil)
+      offset = 0
+      state = State.new(paths: {}, entry_count: 0, total_bytes: 0)
+
+      while offset + BLOCK_BYTES <= bytes.bytesize
+        header = bytes.byteslice(offset, BLOCK_BYTES)
+        return if header.bytes.all?(&:zero?)
+
+        verify_checksum!(header)
+        size = parse_octal(header.byteslice(124, 12), "entry size")
+        data_start = offset + BLOCK_BYTES
+        data_end = data_start + size
+        raise Error.integrity("truncated package archive entry") if data_end > bytes.bytesize
+
+        process_entry(header, bytes.byteslice(data_start, size), size, state, output_directory)
+        offset = data_start + ((size + BLOCK_BYTES - 1) / BLOCK_BYTES * BLOCK_BYTES)
+      end
+      raise Error.integrity("package archive is missing its end marker")
+    end
+
+    def process_entry(header, data, size, state, output_directory)
+      type = header.byteslice(156, 1)
+      if type == "x"
+        state.pending_path = pax_path(data)
+        return
+      end
+      if type == "L"
+        state.pending_path = c_string(data).delete_suffix("\n")
+        return
+      end
+
+      raw_path = state.pending_path || header_path(header)
+      state.pending_path = nil
+      return if type == "5" && [".", "./"].include?(raw_path)
+
+      path = PathSafety.validate_archive_member_path!(raw_path)
+      return if File.basename(path).start_with?("._")
+      if type == "5"
+        write_extracted_directory(output_directory, path) if output_directory
+        return
+      end
+      validate_regular_entry!(type, path, size, state)
+      write_extracted_file(output_directory, path, data) if output_directory
+    end
+
+    def validate_regular_entry!(type, path, size, state)
+      raise Error.integrity("unsupported package archive entry type") unless ["0", "\0"].include?(type)
+
+      state.entry_count += 1
+      if state.entry_count > ResourceLimits::MAX_ARCHIVE_ENTRIES
+        raise Error.integrity("package archive exceeds #{ResourceLimits::MAX_ARCHIVE_ENTRIES} entries")
+      end
+      raise Error.integrity("duplicate package archive path: #{path}") if state.paths.key?(path)
+
+      state.paths[path] = true
+      if size > ResourceLimits::MAX_ARCHIVE_ENTRY_BYTES
+        raise Error.integrity("package archive entry exceeds #{ResourceLimits::MAX_ARCHIVE_ENTRY_BYTES} bytes: #{path}")
+      end
+      state.total_bytes += size
+      if state.total_bytes > ResourceLimits::MAX_ARCHIVE_TOTAL_BYTES
+        raise Error.integrity("package archive exceeds #{ResourceLimits::MAX_ARCHIVE_TOTAL_BYTES} decompressed bytes")
+      end
+    end
+
+    def write_extracted_directory(output_directory, path)
+      FileUtils.mkdir_p(extracted_destination(output_directory, path))
+    end
+
+    def write_extracted_file(output_directory, path, data)
+      destination = extracted_destination(output_directory, path)
+      FileUtils.mkdir_p(File.dirname(destination))
+      File.open(destination, File::WRONLY | File::CREAT | File::EXCL | File::BINARY) do |file|
+        file.write(data)
+      end
+    end
+
+    def extracted_destination(output_directory, path)
+      destination = File.join(output_directory, path)
+      unless PathSafety.path_under_root?(output_directory, destination)
+        raise Error.integrity("package path escapes package root: #{path}")
+      end
+
+      destination
+    end
+
+    def verify_checksum!(header)
+      stored = parse_octal(header.byteslice(148, 6), "checksum")
+      sum = 0
+      header.bytes.each_with_index do |byte, index|
+        sum += (index >= 148 && index < 156) ? 32 : byte
+      end
+      return if sum == stored
+
+      raise Error.integrity("invalid package archive checksum")
+    end
+
+    def header_path(header)
+      name = c_string(header.byteslice(0, 100))
+      prefix = c_string(header.byteslice(345, 155))
+      prefix.empty? ? name : "#{prefix}/#{name}"
+    end
+
+    def c_string(bytes)
+      bytes.to_s.split("\0", 2).first.to_s.force_encoding(Encoding::UTF_8).tap do |text|
+        raise Error.integrity("invalid package archive path encoding") unless text.valid_encoding?
+      end
+    end
+
+    def parse_octal(bytes, label)
+      value = c_string(bytes).strip
+      raise Error.integrity("invalid package archive #{label}") unless value.match?(/\A[0-7]+\z/)
+
+      value.to_i(8)
+    end
+
+    def pax_path(data)
+      cursor = 0
+      path = nil
+      while cursor < data.bytesize
+        separator = data.index(" ".b, cursor)
+        length = separator && Integer(data.byteslice(cursor, separator - cursor), exception: false)
+        record_end = cursor + length.to_i
+        if !length || length <= 0 || record_end > data.bytesize
+          raise Error.integrity("invalid package archive pax header")
+        end
+        record = data.byteslice(separator + 1, record_end - separator - 2)
+        equals = record.index("=".b)
+        if equals && record.byteslice(0, equals) == "path"
+          value = record.byteslice(equals + 1, record.bytesize - equals - 1).force_encoding(Encoding::UTF_8)
+          raise Error.integrity("invalid package archive path encoding") unless value.valid_encoding?
+
+          path = value
+        end
+        cursor = record_end
+      end
+      path
+    end
+  end
+end

data/lib/pray/verify.rb

@@ -165,6 +165,8 @@ module Pray
         )
       end
 
+      VerifyProvisioned.push_findings(project, report)
+
       [report, rendered_targets, fresh_targets]
     end
 

data/lib/pray/verify_provisioned.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Pray
+  module VerifyProvisioned
+    module_function
+
+    def push_findings(project, report)
+      push_exclusive_file_export_findings(project, report)
+      Render.planned_provisioned_files(project).each do |file|
+        path_text = file.path.to_s.tr("\\", "/")
+        absolute = File.join(project.project_root, file.path)
+        if File.symlink?(absolute)
+          report.findings << VerificationFinding.new(
+            kind: "verify_error",
+            message: "Provisioned file `#{path_text}` is a symbolic link. Remove the link or choose another destination."
+          )
+          next
+        end
+        unless File.file?(absolute)
+          report.findings << VerificationFinding.new(
+            kind: "verify_error",
+            message: "Provisioned file `#{path_text}` from `#{file.package}` is missing. Run `pray install` to materialize it."
+          )
+          next
+        end
+        destination_bytes = File.binread(absolute)
+        expected_bytes = Render.expected_provisioned_bytes(file.source, project.manifest.symbols || {})
+        next if Hashing.sha256_prefixed(destination_bytes) == Hashing.sha256_prefixed(expected_bytes.b)
+
+        report.findings << VerificationFinding.new(
+          kind: "package_integrity",
+          message: "Provisioned file `#{path_text}` no longer matches package `#{file.package}`. Run `pray install` to restore it."
+        )
+      end
+    end
+
+    def push_exclusive_file_export_findings(project, report)
+      project.packages.each do |package|
+        destination = package.declaration.file
+        next unless destination
+
+        has_file_export = package.selected_exports.any? do |name|
+          export = package.spec.exports[name]
+          export && export.kind == "file"
+        end
+        next if has_file_export
+
+        report.findings << VerificationFinding.new(
+          kind: "verify_error",
+          message: "Package `#{package.declaration.name}` declares file: \"#{destination}\" but has no selected file export."
+        )
+      end
+    end
+  end
+end

data/lib/pray/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Pray
-  VERSION = "1.9.1"
-  GENERATED_BY = "pray 1.9.1"
+  VERSION = "1.10.0"
+  GENERATED_BY = "pray 1.10.0"
 end

data/lib/pray.rb

@@ -19,12 +19,24 @@ require_relative "pray/dotenv"
 require_relative "pray/project_context"
 require_relative "pray/environment"
 require_relative "pray/resolve_context"
+require_relative "pray/resolve_source"
+require_relative "pray/resolve_exports"
 require_relative "pray/invocation"
 require_relative "pray/resolve"
+require_relative "pray/compose_dest"
+require_relative "pray/render_patch"
 require_relative "pray/render"
+require_relative "pray/render_dest"
+require_relative "pray/render_layout"
 require_relative "pray/verify_position"
+require_relative "pray/verify_provisioned"
 require_relative "pray/verify"
+require_relative "pray/resource_limits"
+require_relative "pray/http_body"
+require_relative "pray/registry_install"
+require_relative "pray/registry_integrity"
 require_relative "pray/registry"
+require_relative "pray/archive_unpack"
 require_relative "pray/archive"
 require_relative "pray/plan"
 require_relative "pray/git_sources"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pray-cli
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Andrei Makarov
@@ -97,6 +97,7 @@ files:
 - lib/pray-cli.rb
 - lib/pray.rb
 - lib/pray/archive.rb
+- lib/pray/archive_unpack.rb
 - lib/pray/auth_client.rb
 - lib/pray/cli.rb
 - lib/pray/cli/commands/auth.rb
@@ -112,6 +113,7 @@ files:
 - lib/pray/cli/parse_auth.rb
 - lib/pray/cli/parse_trust.rb
 - lib/pray/cli/suggest.rb
+- lib/pray/compose_dest.rb
 - lib/pray/confess.rb
 - lib/pray/config.rb
 - lib/pray/constraint.rb
@@ -123,6 +125,7 @@ files:
 - lib/pray/format_serialize.rb
 - lib/pray/git_sources.rb
 - lib/pray/hashing.rb
+- lib/pray/http_body.rb
 - lib/pray/invocation.rb
 - lib/pray/literal.rb
 - lib/pray/lockfile.rb
@@ -141,9 +144,18 @@ files:
 - lib/pray/project_context.rb
 - lib/pray/publish.rb
 - lib/pray/registry.rb
+- lib/pray/registry_install.rb
+- lib/pray/registry_integrity.rb
 - lib/pray/render.rb
+- lib/pray/render_content.rb
+- lib/pray/render_dest.rb
+- lib/pray/render_layout.rb
+- lib/pray/render_patch.rb
 - lib/pray/resolve.rb
 - lib/pray/resolve_context.rb
+- lib/pray/resolve_exports.rb
+- lib/pray/resolve_source.rb
+- lib/pray/resource_limits.rb
 - lib/pray/serve.rb
 - lib/pray/serve_federation.rb
 - lib/pray/session.rb
@@ -151,12 +163,14 @@ files:
 - lib/pray/statement_surface.rb
 - lib/pray/substitute.rb
 - lib/pray/sync.rb
+- lib/pray/tar_validation.rb
 - lib/pray/terminal.rb
 - lib/pray/trust.rb
 - lib/pray/trust_feed.rb
 - lib/pray/trust_ops.rb
 - lib/pray/verify.rb
 - lib/pray/verify_position.rb
+- lib/pray/verify_provisioned.rb
 - lib/pray/version.rb
 - pray-cli.gemspec
 homepage: https://pray.kisko.dev