tcpfiletransfer 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caa1cea3d7b2808aca00ad1a748f1a397e874e1add0d0a1ed14ef5fd2f7b5602
-  data.tar.gz: d8aac81d18586700087def6caa05bf85163b4ddc45fb07c7635045a0c9605ab1
+  metadata.gz: c6c7f4fef199c5858b707c3ff5cc74365fcf8c577a43ee6beed17842b315680a
+  data.tar.gz: 9251b887e474654b553bceada578c06308765f5dee659e8d51785fe659c7c200
 SHA512:
-  metadata.gz: e9715882fcbcd4921f84f5668b837a6890a0757610e2d03a15c9fd6c24e8a295ab25368d23235d31b7e2670bfe7b1256115adc1f1bc38b368ae6832e8058861c
-  data.tar.gz: 28269019957eb1a710ed3e2abbbf2d42022b920c2aeb9003b089fba83d64258c2a15ce5c0e0866f3b6b58dbf54b0137ba8b0be669b7f22967ae61c80f2a19b0c
+  metadata.gz: 99599794d083185fe86953e77497ecb22d138ed763032b5d15a2de3b5c7cbe2ed68e1e02ed0c8458b7e060d4cc3cad2b902a1882c81dbfc051bd77b85e0ab6f5
+  data.tar.gz: 16e268c86d36233496e1e3ebd933eb03c7d2829a302ef40ccdf8318f3995c1a43bac31837919b2407d7e65543c1f4b53e92acd6beb9587d5221d46223c3870bb

data/bin/sendfile

@@ -5,25 +5,34 @@ 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 discover available recipients)" --entry --title='Send File'`.chomp
+  recipient = ARGV[1] || `zenity --text="Recipient\\n(Leave blank to search for available recipients)" --entry --title='Send File'`.chomp
   exit(1) if $?.exitstatus == 1
 
   if recipient == ""
-    `notify-send 'Please wait, searching for recipients'`
-    hosts = `nmap -Pn -p8021 --open 192.168.0.0/24 | grep -oP '([\\w-]+\\s\\(((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4}\\)|((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4})'`
-    `zenity --info --no-wrap --title="Avalable recipients" --text="#{hosts}"`
+    `nmap -Pn -p8021 --open 192.168.0.0/24 | grep -oP '([\\w-]+\\s\\(((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4}\\)|((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4})' | tee ~/.tmphosts | zenity --progress --pulsate --no-cancel --text="Searcing for available devices" --title="Searching..." --auto-close`
+    hosts = File.read("#{Dir.home}/.tmphosts")
+    recipient = `zenity --list --title="Avalable recipients" --text="Choose a device" --column="Available Recipients" #{hosts.split("\n").map{|h|"'#{h}'"}.join(" ")}`.match(/((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}/).to_s
+    break if recipient != ""
+    exit(1) if $?.exitstatus == 1
   else
     break
   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

@@ -4,7 +4,10 @@ module FileTransfer
       path = initdata[1].split("/")
       decline = (path[2] == "decline")
       path = ?/ + path[1]
+      sock_domain, remote_port, remote_hostname, remote_ip = client.peeraddr
+
       if decline
+        `zenity --error --title="Transfer Declined" --text="Your transfer to #{remote_hostname} has been declined." --no-wrap`
         $active_transfers.delete(path)
         client.puts "HTTP/1.0 200\r\nContent-Type: text/plain\r\n\r\nTransfer declined"
         client.close
@@ -23,7 +26,15 @@ module FileTransfer
         client.close
         return
       end
-      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])}"
+
+      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
+
+      `zenity --info --title="Transfer Accepted" --text="Your transfer to #{remote_hostname} has been accepted." --no-wrap`
+      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])}"
       $active_transfers.delete(path)
       client.close
     end

data/lib/filetransfer/notifier.rb

@@ -9,7 +9,7 @@ module FileTransfer
 
       x=system("zenity --question --icon-name=document-save-symbolic.symbolic --no-wrap --text=\"#{notification_body}\" --title='#{notification_title}'")
       if x
-        file_location = `zenity --file-selection --save --filename=#{filename.chomp}`.chomp
+        file_location = `zenity --title="Save file" --file-selection --save --filename=#{filename.chomp}`.chomp
         if file_location == ""
           f=open(accept_link + "/decline")
           f.read

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.5"
+    "0.1.0"
   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.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Matthias Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-26 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