carthage_remote_cache 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 419b8edd1e39136269db80965bcffb2fe4e6207f7b83459e549a37f4beac9f7c
-  data.tar.gz: 0c83197b67a7e6b5ef504a1811a533a082c98152e07315414d346eb97049a9fc
+  metadata.gz: 76eb34fe905eb5fce02802b6b3d7a764b144cc4ab20b6f67d2068215c6605811
+  data.tar.gz: ce2786ceae18cdc95d4c21360044b21838f839879d5a69f883d7b8c8d2040f15
 SHA512:
-  metadata.gz: 5b4aaad19ca7a53f5ce85fa801c22fe019c66a3281ecb6d239516d8d0c94418201b1974d149ff44fc2e22b6a5085227f9280680b0aef1bc0700ea480fa4a1310
-  data.tar.gz: 5fd1d49c2c75c9ffa64fc36cad248ee4cb670abab779f821582cdfc8b656ba175ece52608a6017022d2ffabd1997bda53c442229d14b876041f557929396bbc9
+  metadata.gz: a128b2d782cee56f2ddfc018a8f4e4e3275dd87b1337d6420861ee376edd0ea468655739951667768855721d0f91a7176a4102a4f20a2cc92e363e617bebe2d8
+  data.tar.gz: ffead6c5c29416ed7d12e2fdbd26f465127deedb80fb3af261904de35b2a22245a9302427081ff5e86585e2426db4a4444bbac57680e0726b7b3d2d9809f2e8d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    carthage_remote_cache (0.0.4)
+    carthage_remote_cache (0.0.5)
       concurrent-ruby (~> 1.0.5)
       rack (~> 2.0.4)
       rest-client (~> 2.0.2)

data/lib/api.rb

@@ -22,17 +22,30 @@ class API
     archive.create_archive(@shell, carthage_dependency.should_include_dsym)
     archive_size = archive.archive_size
     begin
-      @networking.upload_framework_archive(archive.archive_path, carthage_dependency, framework_name, platform)
+      checksum = crc32(archive.archive_path)
+      @networking.upload_framework_archive(archive.archive_path, carthage_dependency, framework_name, platform, checksum)
     ensure
       archive.delete_archive
     end
     archive_size
   end
 
-  # @return zip archive size in Bytes or nil if archive download failed
+  # @return zip archive size in Bytes
+  # @raise AppError if download or checksum validation fails
   def download_and_unpack_archive(carthage_dependency, framework_name, platform)
-    archive = @networking.download_framework_archive(carthage_dependency, framework_name, platform)
-    return nil if archive.nil?
+    result = @networking.download_framework_archive(carthage_dependency, framework_name, platform)
+    if result.nil?
+      raise AppError.new, "Failed to download framework #{carthage_dependency} – #{framework_name} (#{platform}). Please `upload` the framework first."
+    end
+
+    archive = result[:archive]
+    remote_checksum = result[:checksum]
+    local_checksum = crc32(archive.archive_path)
+
+    if local_checksum != remote_checksum
+      raise AppError.new, checksum_error_message(archive.archive_path, remote_checksum, local_checksum)
+    end
+
     archive_size = archive.archive_size
     begin
       $LOG.debug("Downloaded #{archive.archive_path}")
@@ -42,4 +55,14 @@ class API
     end
     archive_size
   end
+
+  private
+
+  def checksum_error_message(path, remote, local)
+    <<~EOS
+      Checksums for '#{path}' do not match:
+        Remote: #{remote}
+        Local:  #{local}
+    EOS
+  end
 end

data/lib/carthage_remote_cache.rb

@@ -6,6 +6,7 @@ require 'carthage_archive'
 require 'carthage_dependency'
 require 'constants'
 require 'configuration'
+require 'crc32'
 require 'errors'
 require 'log'
 require 'networking'

data/lib/commands/download_command.rb

@@ -72,12 +72,8 @@ class DownloadCommand
     version_file.frameworks_by_platform.each do |platform, framework_names|
       for framework_name in framework_names
         archive_size = @api.download_and_unpack_archive(carthage_dependency, framework_name, platform)
-        if archive_size.nil?
-          raise AppError.new, "Failed to download framework #{carthage_dependency} – #{framework_name} (#{platform}). Please `upload` the framework first."
-        else
-          @number_of_downloaded_archives += 1
-          @total_archive_size += archive_size
-        end
+        @number_of_downloaded_archives += 1
+        @total_archive_size += archive_size
       end
     end
     version_file.move_to_build_dir

data/lib/constants.rb

@@ -6,3 +6,7 @@ THREAD_POOL_SIZE = 8
 
 SERVER_DEFAULT_PORT = 9292
 SERVER_CACHE_DIR = File.join(Dir.home, '.carthagerc_server')
+
+ARCHIVE_CHECKSUM_HEADER_REST_CLIENT = :archive_checksum
+ARCHIVE_CHECKSUM_HEADER_SINATRA_IN = 'HTTP_ARCHIVE_CHECKSUM'
+ARCHIVE_CHECKSUM_HEADER_SINATRA_OUT = 'Archive-Checksum'

data/lib/crc32.rb

@@ -0,0 +1,22 @@
+require 'digest'
+require 'zlib'
+
+class Digest::CRC32 < Digest::Class
+  include Digest::Instance
+
+  def initialize
+    reset
+  end
+
+  def reset
+    @crc32 = 0
+  end
+
+  def update(str)
+    @crc32 = Zlib.crc32(str, @crc32)
+  end
+
+  def finish
+    [@crc32].pack('N')
+  end
+end

data/lib/errors.rb

@@ -1,6 +1,14 @@
 # Common type for all carthage_remote_cache Errors.
 class AppError < StandardError; end
 
+class CmdError < StandardError
+  attr_reader :command
+
+  def initialize(command)
+    @command = command
+  end
+end
+
 class MultipleErrorsError < AppError
   def initialize(errors)
     @errors = errors

data/lib/networking.rb

@@ -8,6 +8,7 @@ class Networking
 
   # Version Files
 
+  # @return VersionFile or nil
   def download_version_file(carthage_dependency)
     url = new_version_file_url(carthage_dependency)
     $LOG.debug("Downloading version file from #{url}")
@@ -22,14 +23,20 @@ class Networking
     version_file
   end
 
+  # @raise AppError on upload failure
   def upload_version_file(carthage_dependency)
     url = new_version_file_url(carthage_dependency)
     $LOG.debug("Uploading #{carthage_dependency.version_filename}")
-    RestClient.post(url, :version_file => File.new(carthage_dependency.version_filepath))
+    RestClient.post(url, :version_file => File.new(carthage_dependency.version_filepath)) do |response, request, result|
+      unless response.code == 200
+        raise AppError.new, "Version file upload #{carthage_dependency.version_filename} failed, response:\n  #{response[0..300]}"
+      end
+    end
   end
 
   #  Archives
 
+  # @return Hash with CarthageArchive and checksum or nil
   def download_framework_archive(carthage_dependency, framework_name, platform)
     url = new_framework_url(carthage_dependency, framework_name, platform)
     $LOG.debug("Downloading framework from #{url}")
@@ -37,7 +44,7 @@ class Networking
       if response.code == 200
         archive = CarthageArchive.new(framework_name, platform)
         File.write(archive.archive_path, response.to_s)
-        archive
+        {:archive => archive, :checksum => response.headers[ARCHIVE_CHECKSUM_HEADER_REST_CLIENT]}
       else
         nil
       end
@@ -45,10 +52,17 @@ class Networking
     archive
   end
 
-  def upload_framework_archive(zipfile_name, carthage_dependency, framework_name, platform)
+  # @raise AppError when upload fails
+  def upload_framework_archive(zipfile_name, carthage_dependency, framework_name, platform, checksum)
     url = new_framework_url(carthage_dependency, framework_name, platform)
-    $LOG.debug("Uploading framework to #{url}")
-    RestClient.post(url, :framework_file => File.new(zipfile_name))
+    params = {:framework_file => File.new(zipfile_name)}
+    headers = {ARCHIVE_CHECKSUM_HEADER_REST_CLIENT => checksum}
+    $LOG.debug("Uploading framework to #{url}, headers: #{headers}")
+    RestClient.post(url, params, headers) do |response, request, result|
+      unless response.code == 200
+        raise AppError.new, "Framework upload #{zipfile_name} failed, response:\n  #{response[0..300]}"
+      end
+    end
   end
 
   private

data/lib/server/server_app.rb

@@ -47,15 +47,18 @@ get frameworks_path do
   filename = File.join(dirname, archive.archive_filename)
 
   if File.exist?(filename)
+    headers[ARCHIVE_CHECKSUM_HEADER_SINATRA_OUT] = crc32(filename)
     status(200)
     send_file(filename)
   else
     status(404)
+    "Missing framework archive at '#{filename}'"
   end
 end
 
 # Upload framework archive. Overwrites already cached archive if exists.
 post frameworks_path do
+  expected_checksum = request.env[ARCHIVE_CHECKSUM_HEADER_SINATRA_IN]
   filename = params[:framework_file][:filename]
   source_file = params[:framework_file][:tempfile]
 
@@ -70,7 +73,16 @@ post frameworks_path do
     target_file.write(source_file.read)
   end
 
-  status(200)
+  checksum = crc32(target_filename)
+  if checksum == expected_checksum
+    status(200)
+  else
+    File.delete(target_filename)
+    message = "Checksums for '#{target_filename}' don't match. Expected '#{expected_checksum}', got '#{checksum}'"
+    $LOG.error(message)
+    status(500)
+    message
+  end
 end
 
 private

data/lib/shell_wrapper.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 class ShellWrapper
   # @return
   #   Xcode 9.2
@@ -29,4 +31,17 @@ class ShellWrapper
   def unpack(archive_path)
     sh("unzip -o #{quote archive_path}")
   end
+
+  private
+
+  # @return command output if successful
+  # @raise CmdError
+  def sh(command)
+    stdout, stderr, status = Open3.capture3(command)
+    if status.success?
+      stdout.strip
+    else
+      raise CmdError.new(command), "Command '#{command}' failed, error output:\n#{stderr.strip}"
+    end
+  end
 end

data/lib/utils.rb

@@ -1,19 +1,15 @@
-# Execute arbitrary system command.
-# @return command output, bails on failure
-def sh(cmd)
-  output = `#{cmd}`
-  bail("Command `#{cmd}` failed!") unless $?.success?
-  output.strip
-end
-
-# Exits Ruby process, only to be called:
-# 1. If sh / system calls fail
-# 2. From top level `carthagerc` script
+# Exits Ruby process, only to be called from top level `carthagerc` script
 def bail(message, code = 1)
   $stderr.puts(message.strip + "\n")
   Process.exit(code)
 end
 
+def crc32(filename)
+  checksum = Digest::CRC32.file(filename).hexdigest
+  $LOG.debug("CRC32 checksum for '#{filename}': #{checksum}")
+  checksum
+end
+
 # Quote command line arguments with double quotes.
 # Useful for file paths with spaces.
 def quote(input)

data/lib/version.rb

@@ -1 +1 @@
-VERSION = '0.0.4'
+VERSION = '0.0.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carthage_remote_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Juraj Blahunka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -212,6 +212,7 @@ files:
 - lib/commands/upload_command.rb
 - lib/configuration.rb
 - lib/constants.rb
+- lib/crc32.rb
 - lib/errors.rb
 - lib/log.rb
 - lib/networking.rb