carps 0.2.3 → 0.3.0

data/PostInstall.txt

@@ -5,7 +5,7 @@
                                          o
                               ><> ><> ><>
 
-                  Thank you for installing CARPS 0.2.3
+                  Thank you for installing CARPS 0.3.0
 
                              For help, run:
 

data/lib/carps/crypt/mailbox.rb

@@ -45,7 +45,6 @@ module CARPS
          @sender = sender
          @mail = []
          @peers = {}
-         @secure = false
          # Semaphore to make sure only one thread can send mail at any one time
          @ssemaphore = Mutex.new
          # Semaphore to make sure only one thread can receive mail at any one time 
@@ -125,16 +124,17 @@ module CARPS
             @mail.each_index do |index|
                mail = @mail[index]
                from = mail.from
-               if secure from
-                  unless @peers[from].verify mail
+               peer = @peers[from]
+               if peer
+                  unless peer.verify mail
                      remove_mail index
                      next
                   end
-               end
-               pass = appropriate?(mail, type, must_be_from)
-               if pass
-                  remove_mail index
-                  return mail
+                  pass = appropriate? mail, type, must_be_from 
+                  if pass
+                     remove_mail index
+                     return mail
+                  end
                end
             end
             nil
@@ -150,23 +150,28 @@ module CARPS
          pass and @manager.belong? mail
       end
 
+      # Was the mail message appropriate?  (To a degree)
+      def insecure_appropriate? mail, type, must_be_from
+         pass = mail.class == type
+         if must_be_from
+            pass = pass and mail.from == must_be_from
+         end
+         pass
+      end
+
+
       # Remove a mail message
       def remove_mail index
          @mail[index].delete
          @mail.delete_at index
       end
 
-      # Communication with someone is secure if there is a peer for them
-      def secure addr
-         @peers.member? addr
-      end
-
       # Insecurely see if there is an appropriate message in the mail box
       def insecure_search type, must_be_from
          @rsemaphore.synchronize do
             @mail.each_index do |index|
                mail = @mail[index]
-               pass = appropriate?(mail, type, must_be_from)
+               pass = insecure_appropriate? mail, type, must_be_from 
                if pass
                   remove_mail index
                   return mail

data/lib/carps/crypt/mailer.rb

@@ -33,6 +33,8 @@ require "digest/md5"
 
 require "openssl"
 
+require "set"
+
 module CARPS
 
    # High level CARPS mail client supporting strong cryptographic message signing.
@@ -51,6 +53,7 @@ module CARPS
          @mailbox = mailbox
          @private_key = get_keys
          @public_key = @private_key.public_key
+         @current_handshakes = Set.new 
          # Load the old peers
          load_peers
       end
@@ -61,6 +64,7 @@ module CARPS
             puts "No need for handshake: " + to + " is already a known peer."
          else
             puts "Offering cryptographic handshake to #{to}"
+            @current_handshakes.add to
             # Create a new peer
             peer = Peer.new to
             @mailbox.add_peer peer
@@ -73,7 +77,11 @@ module CARPS
             # Send our key
             send to, PublicKey.new(@public_key)
             # Receive an okay message
-            read AcceptHandshake, to
+            #
+            # Has to be insecure for now... :(
+            #
+            # This is because the client may not know the session yet.
+            @mailbox.insecure_read AcceptHandshake, to
             puts "Established spoof-proof communications with #{to}"
          end
       end
@@ -99,18 +107,21 @@ module CARPS
             # See if the user accepts the handshake.
             accept = accept_handshake? from
             if accept
-               # Send our key to the peer
-               send from, PublicKey.new(@public_key)
-               # Get their key
-               peer_key = @mailbox.insecure_read PublicKey, from
-               # Create a new peer
-               peer = Peer.new from
-               @mailbox.add_peer peer
-               peer.your_key peer_key.key
-               peer.save
-               # Send an okay message
-               send from, AcceptHandshake.new
-               puts "Established spoof-proof communications with #{from}."
+               Thread.fork do
+                  @current_handshakes.add from
+                  # Send our key to the peer
+                  send from, PublicKey.new(@public_key)
+                  # Get their key
+                  peer_key = @mailbox.insecure_read PublicKey, from
+                  # Create a new peer
+                  peer = Peer.new from
+                  @mailbox.add_peer peer
+                  peer.your_key peer_key.key
+                  peer.save
+                  # Send an okay message
+                  send from, AcceptHandshake.new
+                  puts "Established spoof-proof communications with #{from}."
+               end
             end
          end
       end
@@ -122,6 +133,11 @@ module CARPS
 
       # Send a message
       def send to, message
+         unless @mailbox.peer?(to) or @current_handshakes.include?(to)
+            Thread.fork do
+               handshake to
+            end
+         end
          text = message.emit
          # The mailbox tags the message with a session key
          text = @mailbox.tag text

data/lib/carps.rb

@@ -41,5 +41,5 @@ require "carps/wizard"
 #
 # The CARPS module which functions as a namespace for CARPS classes.
 module CARPS
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - John Morrice
@@ -257,7 +257,7 @@ post_install_message: |
                                            o
                                 ><> ><> ><>
   
-                    Thank you for installing CARPS 0.2.3
+                    Thank you for installing CARPS 0.3.0
   
                                For help, run: