tcpfiletransfer 0.0.6 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e05f1f2443f8672ad35b72d470ebaee0c906cf686d9e94fb010757d1d62dcb42
-  data.tar.gz: af5dcbb81340ddc9794f94c64401adccaba2fe0d2c39666016adb01d979c6644
+  metadata.gz: 8e0a0809c3a57508d72d20251e9add6bfc72b8817eefd27fca7b91b934b478d3
+  data.tar.gz: fabdf4f66b9f720e6ff0eaeeef9de12eb7866637155e7b2b6c4917ee962666dc
 SHA512:
-  metadata.gz: adc96bd9d1709741b31603b6874f61028ccb92b032dc0b4351fc010c00974adeb0138d3ea0111c29c904225a711460f3673568ef156c93abed835ea846b4960b
-  data.tar.gz: bb99ab26bca1a85e3d760cbcc63a47f2fe1d6f3c41d8763c2f603d0b79762968f361bb472e0f7fb48c4be6167793220644c233d14675cf273f9ee80240ba745f
+  metadata.gz: 26982483ee4507c81bdd955eee74a57a60db263febb8dedcd2ea4ec3484257f52008886c817028c5497ff8dfa774b47ef181950ca4424467765f961544a9c9e2
+  data.tar.gz: d998a476a2782b5c17ddb06e6f59890f2192b1be64063764c06c0ccc59e61b02447f8c71492e4eb5659d002a8fdba3eb21666166be6d2c2ca7deaf51b43101cb

data/bin/sendfile

@@ -5,12 +5,18 @@ require "socket"
 originalpath = ARGV[0] || `zenity --file-selection --title='Send File'`.chomp
 exit(1) if (!ARGV[0] && $?.exitstatus == 1)
 
-path = originalpath.gsub(" ", "`")
+path = File.expand_path(originalpath).gsub(" ", "`")
 name = originalpath.split("/").last.gsub(" ", "_")
 
+if File.directory?(path)
+  `zenity --error --text="Error: #{path} is a folder." --no-wrap --title="Send File"`
+  exit(1)
+end
+
 recipient = ""
 loop do
   recipient = ARGV[1] || `zenity --text="Recipient\\n(Leave blank to search for available recipients)" --entry --title='Send File'`.chomp
+  break if ARGV[1]
   exit(1) if $?.exitstatus == 1
 
   if recipient == ""
@@ -24,8 +30,10 @@ loop do
   end
 end
 
+recipient = IPSocket.getaddress(recipient)
+
 server = TCPSocket.new("127.0.0.1", 8021)
-server.puts "FTSUBMIT #{name} #{path}"
+server.puts "FTSUBMIT #{name} #{path} #{recipient}"
 fileid = server.gets
 
 file_size = '%.2f' % (File.size(originalpath).to_f / 2**20)

data/lib/filetransfer/ftserver.rb

@@ -13,9 +13,10 @@ module FileTransfer
     def self.handle_file_submission(initdata, client)
       filename = initdata[1]
       filepath = initdata[2].gsub("`", " ")
+      dest_ip = initdata[3]
 
       fileid = self.genfileid(6)
-      $active_transfers[?/ + fileid] = {name: filename, path: filepath}
+      $active_transfers[?/ + fileid] = {name: filename, path: filepath, dest_ip: dest_ip}
       client.puts fileid
       client.close
     end

data/lib/filetransfer/httpserver.rb

@@ -27,8 +27,14 @@ module FileTransfer
         return
       end
 
+      if client.peeraddr[2] != file[:dest_ip]
+        client.puts "HTTP/1.0 403\r\nContent-Type: text/plain\r\n\r\nRequest from forbidden IP."
+        client.close
+        return
+      end
+
+      client.puts "HTTP/1.0 200\r\nContent-Length: #{File.size file[:path]}\r\nContent-Type: application/octet-stream\r\nContent-Disposition: attachment; filename=\"#{file[:name]}\"\r\n\r\n#{IO.binread(file[:path])}"
       `zenity --info --title="Transfer Accepted" --text="Your transfer to #{remote_hostname} has been accepted." --no-wrap`
-      client.puts "HTTP/1.0 200\r\nContent-Type: application/octet-stream\r\nContent-Disposition: attachment; filename=\"#{file[:name]}\"\r\n\r\n#{File.read(file[:path])}"
       $active_transfers.delete(path)
       client.close
     end

data/lib/filetransfer/server.rb

@@ -15,7 +15,12 @@ module FileTransfer
           elsif initdata[0] == "FTSEND"
             FTserver.handle_client(initdata, client)
           elsif initdata[0] == "FTSUBMIT"
-            FTserver.handle_file_submission(initdata, client)
+            if client.peeraddr[2] == "127.0.0.1"
+              FTserver.handle_file_submission(initdata, client)
+            else
+              client.puts "ERROR FILE_SUBMIT_NOTLOCAL"
+              client.close
+            end
           else
             client.close
           end

data/lib/filetransfer.rb

@@ -5,7 +5,7 @@ module FileTransfer
   @@files = ['server.rb', 'notifier.rb', 'httpserver.rb', 'ftserver.rb']
 
   def self.version
-    "0.0.6"
+    "0.1.1"
   end
 
   def self.file_paths(relative:false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcpfiletransfer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.1
 platform: ruby
 authors:
 - Matthias Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies: []
 description: An easy way to transfer files over TCP between linux computers
 email: matthias@matthiasclee.com