network_clipboard 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8563a699ffa840eaa49ab7029b1c69dc5895b986
-  data.tar.gz: 37be775586fe6006e9d965e0b78860b69d34077a
+  metadata.gz: 6977532a681a67182fb89b165bae55ac45261000
+  data.tar.gz: 85be7d1ed65bc938f1356cdde5e317ae6f8b212c
 SHA512:
-  metadata.gz: ee2e998ccc19888dacf81e883cdb21f5057bfc61c90a0ad1c7e157dd94cd3695045fa323d4d07d2018f617ff681994b40d08b40ec4fcadf07fd5b010ab5a60ab
-  data.tar.gz: d15b51f1788896d289ef0bbd5dfa038936a7da4a23871bc517b4850486987df44af070da79e30a3b18a0926f63ba3acca8a17c653a386e98424bb8b828235400
+  metadata.gz: 1cb92234e9f79112666e167301c311b2e081ebeb965f32310e21f423e8be21622ce2f19f528c770f33b48eb481d696dd52055db1402c0f0c7d19a4cf25d9074f
+  data.tar.gz: cc47484d072601dab2720455b237310bf4d344e0d5b9990fc628d6c11a8626fb14d02178898f9dc454b39af352f72144eba595cd06553d2dad07024b83c545c5

data/lib/network_clipboard/client.rb

@@ -7,115 +7,168 @@ require 'socket'
 require 'logger'
 
 module NetworkClipboard
-  class Client
-    LOGGER = Logger.new(STDOUT)
-    LOGGER.level = Logger::WARN
+  LOGGER = Logger.new(STDOUT)
+  LOGGER.level = Logger::WARN
+
+  class ConnectionWrapper
+    def initialize(client,connection)
+      @client = client
+      @connection = connection
+      @read_thread = Thread.new{read_loop}
+      @write_thread = Thread.new{write_loop}
+      @running = true
+      @value = nil
+    end
+
+    def read_loop
+      while @running
+        begin
+          new_value = @connection.receive()
+        rescue DisconnectedError
+          if @running
+            LOGGER.error("Client #{@connection.remote_client_id} went away")
+            @running = false
+          end
+          break
+        end
+        next if @value == new_value
+        LOGGER.info("Received new clipboard value from #{@connection.remote_client_id}")
+        Clipboard.copy(@value = new_value)
+      end
+      @connection.close_read
+      LOGGER.debug("Read loop completed")
+    end
+
+    def write_loop
+      while @running
+        new_value = Clipboard.paste
+        (sleep(2); next) if new_value.nil? or new_value.empty? or @value == new_value
+        LOGGER.info("Sending clipboard value to #{@connection.remote_client_id}")
+        @connection.send(@value = new_value)
+      end
+      @connection.close_write
+      LOGGER.debug("Write loop completed")
+    end
+    
+    def join
+      @read_thread.join
+      @write_thread.join
+    end
+
+    def stop
+      @running = false
+    end
+  end
 
-    attr_writer :running
+  class Client
 
     def self.run
       c = Client.new
-      Signal.trap('INT'){c.running = false}
+      Signal.trap('INT'){c.stop}
       c.loop
     end
 
     def initialize
       @config = Config.new
       @discovery = Discovery.new(@config)
+
       @tcp_server = TCPServer.new(@config.port)
+
       @connections = {}
+      @connections_mutex = Mutex.new
+
       @running = true
     end
 
     def loop
-      while @running
-        [:announce,
-         :discover,
-         :watch_incoming,
-         :fetch_clipboard,
-         :find_incoming,
-         :wait,
-        ].each do |action|
-          send(action) if @running
-        end
-      end
-    end
+      Thread.abort_on_exception = true
+      @announce_thread = Thread.new{announce_loop}
+      @discover_thread = Thread.new{discover_loop}
+      @incoming_loop = Thread.new{incoming_loop}
 
-    def fetch_clipboard
-      update_clipboard(Clipboard.paste)
-    end
+      @announce_thread.join
 
-    def update_clipboard(new_value)
-      @new_value,@last_value = new_value,@new_value
-      if @new_value != @last_value
-        @connections.values.each{|c| send_new_clipboard(c)}
+      @connections.values.each do |connection|
+        connection.join
       end
     end
 
-    def send_new_clipboard(connection)
-      connection.send(@new_value)
+    def announce_loop
+      while @running
+        LOGGER.debug("Announcing")
+        @discovery.announce
+        LOGGER.debug("Announced")
+        sleep(15)
+      end
     end
 
-    def watch_incoming
-      @connections.values.each{|c| receive_clipboard(c)}
+    def discover_loop
+      while @running
+        LOGGER.debug("Discovering")
+        remote_client_id,address = @discovery.get_peer_announcement
+        LOGGER.debug("Found #{remote_client_id} on #{address}")
+
+        @connections_mutex.synchronize do
+          next if @connections[remote_client_id]
+
+          aes_connection = AESConnection.new(@config,TCPSocket.new(address,@config.port))
+
+          if aes_connection.remote_client_id != remote_client_id
+            LOGGER.error("Client Id #{aes_connection.remote_client_id} doesn't match original value #{remote_client_id}")
+            aes_connection.close
+            next
+          end
+            
+          if @connections[aes_connection.remote_client_id]
+            LOGGER.error("Duplicate connections #{aes_connection} and #{@connections[aes_connection.remote_client_id]}")
+            aes_connection.close
+            next
+          end
+
+          LOGGER.info("New Peer -> #{remote_client_id}")
+          @connections[aes_connection.remote_client_id] = ConnectionWrapper.new(self,aes_connection)
+        end
+      end
     end
 
-    def receive_clipboard(connection)
-      inbound = connection.receive(false)
-      Clipboard.copy(inbound) if inbound
-    end
+    def incoming_loop
+      while @running
+        incoming = @tcp_server.accept
+        aes_connection = AESConnection.new(@config,incoming)
 
-    def announce
-      @discovery.announce
-    end
+        LOGGER.debug("Incoming #{aes_connection.remote_client_id} from #{incoming.peeraddr(false)[-1]}")
 
-    def discover
-      @discovery.get_peer_announcements do |remote_client_id,address|
-        next if @connections[remote_client_id] or remote_client_id < @config.client_id
-        LOGGER.info("New Peer -> #{remote_client_id}")
+        @connections_mutex.synchronize do
+          if @connections[aes_connection.remote_client_id]
+            LOGGER.info("Connection already established to #{aes_connection.remote_client_id}, dropping.")
+            aes_connection.close
+            next
+          end
 
-        aes_connection = AESConnection.new(@config,TCPSocket.new(address,@config.port))
+          LOGGER.info("New Peer <- #{aes_connection.remote_client_id}")
 
-        if aes_connection.remote_client_id != remote_client_id
-          LOGGER.error("Client Id #{aes_connection.remote_client_id} doesn't match original value #{remote_client_id}")
-          aes_connection.close
-          next
+          @connections[aes_connection.remote_client_id] = ConnectionWrapper.new(self,aes_connection)
         end
-          
-        if @connections[aes_connection.remote_client_id]
-          LOGGER.error("Duplicate connections #{aes_connection} and #{@connections[aes_connection.remote_client_id]}")
-          aes_connection.close
-          next
-        end
-
-        @connections[aes_connection.remote_client_id] = aes_connection
       end
     end
 
-    def find_incoming
-      while true
-        begin
-          incoming = @tcp_server.accept_nonblock
-        rescue IO::WaitReadable
-          return
+    def run_connection(connection)
+      begin
+        while @running
+          Clipboard.copy(connection.receive())
         end
-        aes_connection = AESConnection.new(@config,incoming)
-        LOGGER.info("New Peer <- #{aes_connection.remote_client_id}")
+      ensure
+        connection.close
 
-        if @connections[aes_connection.remote_client_id]
-          aes_connection.close
-          next
+        @connections_mutex.synchronize do
+          @connections.delete(connection.remote_client_id)
         end
-
-        @connections[aes_connection.remote_client_id] = aes_connection
       end
     end
 
-    def wait
-      return IO.select([
-        @discovery.receive_socket,
-        @tcp_server,
-      ] + @connections.values.collect(&:socket), [], [], 5)
+    def stop
+      @running = false
+      @connections.values.each(&:stop)
     end
   end
 end

data/lib/network_clipboard/connection.rb

@@ -1,10 +1,15 @@
+require_relative 'error'
+
 require 'socket'
 require 'openssl'
 
 module NetworkClipboard
   HANDSHAKE_STRING = "NetworkClipboard Handshake"
 
-  class HandshakeException < Exception
+  class HandshakeException < NetworkClipboardError
+  end
+
+  class DisconnectedError < NetworkClipboardError
   end
 
   class AESConnection
@@ -29,8 +34,8 @@ module NetworkClipboard
       iv = @encryptor.random_iv
       @socket.send([iv.size].pack('N'),0)
       @socket.send(iv,0)
-      iv_size = @socket.recv(4).unpack('N')[0]
-      @decryptor.iv = @socket.recv(iv_size)
+      iv_size = @socket.read(4).unpack('N')[0]
+      @decryptor.iv = @socket.read(iv_size)
 
       # Verify it all worked.
       send(HANDSHAKE_STRING)
@@ -47,34 +52,25 @@ module NetworkClipboard
       @encryptor.reset
     end
 
-    def receive(blocking=true)
-      begin
-        @partial_read ||= ''
-        while @partial_read.size < 4
-          @partial_read += @socket.recv_nonblock(4 - @partial_read.size)
-        end
-        while @partial_read.size < (total_size = 4 + @partial_read.unpack('N')[0])
-          @partial_read += @socket.recv_nonblock(total_size - @partial_read.size)
-        end
-      rescue IO::WaitReadable
-        if blocking
-          IO.select([@socket])
-          retry
-        else
-          return nil
-        end
+    def receive()
+      size_bits = @socket.read(4)
+      if size_bits.nil? and @socket.eof?
+        raise DisconnectedError
       end
-
-      ciphertext,@partial_read = @partial_read.slice(4,@partial_read.size-4),nil
-
+      ciphertext_size = size_bits.unpack('N')[0]
+      ciphertext = @socket.read(ciphertext_size)
       plaintext = @decryptor.update(ciphertext) + @decryptor.final
       @decryptor.reset
 
       return plaintext
     end
 
-    def close
-      @socket.close
+    def close_read
+      @socket.close_read
+    end
+
+    def close_write
+      @socket.close_write
     end
   end
 end

data/lib/network_clipboard/discovery.rb

@@ -39,24 +39,21 @@ module NetworkClipboard
       @send_socket.send(@authenticated_client_id,0)
     end
 
-    def get_peer_announcements
-      return enum_for(__method__) if !block_given?
-      begin
-        while true
-          msg,ip = @receive_socket.recvfrom_nonblock(65536)
-          other_client_id,other_digest = msg.unpack('H32A32')
-
-          next if other_client_id == @config.client_id
-
-          # We could do a constant time string compare, but an attacker can
-          # just listen to announces and rebroadcast them as his own anyway.
-          # This is just to skip other honest clients with different secrets
-          # on the network, to avoid wasting time on a handshake.
-          next unless other_digest == Digest::HMAC.digest(@config.secret,other_client_id,Digest::SHA256)
-
-          yield [other_client_id,ip[2]]
-        end
-      rescue IO::WaitReadable
+    def get_peer_announcement
+      while true
+        msg,ip = @receive_socket.recvfrom(65536)
+        other_client_id,other_digest = msg.unpack('H32A32')
+
+        # Retry if we got our own announcement.
+        next if other_client_id == @config.client_id
+
+        # We could do a constant time string compare, but an attacker can
+        # just listen to announces and rebroadcast them as his own anyway.
+        # This is just to skip other honest clients with different secrets
+        # on the network, to avoid wasting time on a failed handshake.
+        next unless other_digest == Digest::HMAC.digest(@config.secret,other_client_id,Digest::SHA256)
+
+        return [other_client_id,ip[2]]
       end
     end
   end

data/lib/network_clipboard/error.rb

@@ -0,0 +1,4 @@
+module NetworkClipboard
+  class NetworkClipboardError < StandardError
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: network_clipboard
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Christophe Biocca
@@ -63,6 +63,7 @@ files:
 - lib/network_clipboard/config.rb
 - lib/network_clipboard/connection.rb
 - lib/network_clipboard/discovery.rb
+- lib/network_clipboard/error.rb
 homepage: http://github.com/christophebiocca/network_clipboard
 licenses:
 - Apache-2.0