net-scp 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee8ac18a34abb6482265e9cef492d7a2988d821feeda9bd25b13158ae9676987
-  data.tar.gz: b35016e03ea18a6a707e6c9f0236930db49fe6ba33e2e675b910b6913f525419
+  metadata.gz: 2d9333fc8b5f1e6a3ef2ac8e0cac2da60439a1a007c0d3f4cdde1f65d9a8b15e
+  data.tar.gz: 71a0e15c9061385b5c3f22b224859ba6d0afb841889210ca21a1e02bef3b3f37
 SHA512:
-  metadata.gz: d3a721c9a2310e338dc12f6f06bc712a3b0961f3236de4f69584541c04b2b4b83caf26954b104b8b4a834a93e8e5a4e50167057d7d9d238455d2012f6754ada6
-  data.tar.gz: aa7d1a69eeb9d67f622ca4af00576c91938bc39c68ce23e57a70b7ff2f156ec3337ecbc0c6fa4edf52780ce1a0ea95e8090e1fd53a23be42e46e86b675dcf8b2
+  metadata.gz: 1fefda923541258a50e80a72412331e1ecf253778912cb4d2baaf75f66010fca666075a8c9fef45a68f133a442e2fb43de54a94cb5ffdd8977e1a9aab9ebf801
+  data.tar.gz: 47e43e791e8939779334280c4593a74d739076d5a690286557ae4d0b4fbc7ba6b0d798656b85b931812a328ecfd0c14b9457f7447095a5c27289840d4d29b6fe

data/CHANGES.txt

@@ -1,3 +1,8 @@
+=== 4.2.2
+
+* Downloads into an IO-like object whose `write` returns a partial byte count now retry until the whole chunk is written, instead of reporting success with only part of the file stored; a count of zero, a negative one or one larger than the chunk raises `Net::SCP::Error`. Thanks @OskarEichler [#121, #99]
+* Uploads now send exactly the number of bytes announced to the server, counted in bytes rather than characters: data a source gains after the size is taken is not sent, and a source that ends early or a reader returning more than requested raises `Net::SCP::Error` instead of completing a short or overlong transfer. Previously the extra bytes of an overlong upload could be read by the server as the next SCP command. Thanks @OskarEichler [#120, #98]
+
 === 4.2.1
 
 * Add a `:limit` option to `upload`/`download` to cap bandwidth in Kbit/s, like `scp -l`. Based on #53 by @marcelrouw [#119, #53]

data/lib/net/scp/download.rb

@@ -67,12 +67,26 @@ module Net; class SCP
     def read_data_state(channel)
       return if channel[:buffer].empty?
       data = channel[:buffer].read!(channel[:remaining])
-      channel[:io].write(data)
+      write_fully(channel, data)
       channel[:remaining] -= data.length
       progress_callback(channel, channel[:file][:name], channel[:file][:size] - channel[:remaining], channel[:file][:size])
       await_response(channel, :finish_read) if channel[:remaining] <= 0
     end
 
+    # Writes +data+ to the local IO, retrying after partial writes. A write
+    # returning something other than an Integer is taken to have written all
+    # of it, as for sinks like uri/open-scp's that return the buffer.
+    def write_fully(channel, data)
+      until data.empty?
+        written = channel[:io].write(data)
+        return unless written.is_a?(Integer)
+        unless written > 0 && written <= data.bytesize
+          raise Net::SCP::Error, "#{channel[:file][:name]}: write returned #{written} for #{data.bytesize} bytes"
+        end
+        data = data.byteslice(written..-1)
+      end
+    end
+
     # Finishes off the read, sets the times for the file (if any), and then
     # jumps to either #finish_state (for single-file downloads) or
     # #read_directive_state (for recursive downloads). A 0-byte is sent to the

data/lib/net/scp/upload.rb

@@ -70,16 +70,26 @@ module Net; class SCP
       end
     end
 
-    # If any data remains to be transferred from the current file, sends it.
-    # Otherwise, sends a 0-byte and transfers to #next_item_state.
+    # If any of the announced bytes remain to be transferred from the current
+    # file, sends the next chunk of them. Otherwise, sends a 0-byte and
+    # transfers to #next_item_state. Data beyond the size announced in the 'C'
+    # directive is never read, as the server would take it as the next directive.
     def send_data_state(channel)
-      data = channel[:io].read(channel[:chunk_size])
-      if data.nil?
+      remaining = channel[:size] - channel[:sent]
+      if remaining <= 0
         channel[:io].close unless channel[:local].respond_to?(:read)
         channel.send_data("\0")
         await_response(channel, :next_item)
       else
-        channel[:sent] += data.length
+        length = [channel[:chunk_size], remaining].min
+        data = channel[:io].read(length)
+        if data.nil? || data.empty?
+          raise Net::SCP::Error, "#{channel[:name]}: source ended after #{channel[:sent]} of #{channel[:size]} bytes"
+        elsif data.bytesize > length
+          raise Net::SCP::Error, "#{channel[:name]}: read returned #{data.bytesize} bytes, more than the #{length} requested"
+        end
+
+        channel[:sent] += data.bytesize
         progress_callback(channel, channel[:name], channel[:sent], channel[:size])
         channel.send_data(data)
       end

data/lib/net/scp/version.rb

@@ -52,7 +52,7 @@ module Net
       MINOR = 2
 
       # The tiny component of this version of the Net::SSH library
-      TINY  = 1
+      TINY  = 2
 
       # The prerelease component of this version of the Net::SSH library
       # nil allowed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-scp
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Jamis Buck
@@ -32,7 +32,7 @@ cert_chain:
   vNiMFH5yLu/tlav4xh+HlYscWVdFQIvd7f/Uxa+Vip1Pi16wmhnrE15z/vDX921v
   hukBRIoCEAuUgNVBh+L/C8aETzbf/77WU3Si/w==
   -----END CERTIFICATE-----
-date: 2026-11-02 00:00:00.000000000 Z
+date: 2026-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh