rstyx 0.4.0 → 0.4.1

data/lib/rstyx/keyring.rb

@@ -1,33 +1,29 @@
 #!/usr/bin/ruby
 #
-# Copyright (C) 2005-2007 Rafael Sevilla
-# This file is part of RStyx
+# Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
+# Copyright:: Copyright (c) 2005-2007 Rafael R. Sevilla
+# Homepage:: http://rstyx.rubyforge.org/
+# License:: GNU Lesser General Public License / Ruby License
+#
+# $Id: keyring.rb 282 2007-09-19 07:26:50Z dido $
 #
-# RStyx is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1
-# of the License, or (at your option) any later version.
+#----------------------------------------------------------------------------
 #
-# RStyx is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTIBILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# Copyright (C) 2005-2007 Rafael Sevilla
+# This file is part of RStyx
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with RStyx; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St., Fifth Floor, Boston, MA
-# 02110-1301 USA.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of either 1) the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version; or 2) Ruby's license.
 #
+# See the file COPYING for complete licensing information
 #
-# Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
-# Copyright:: Copyright (c) 2005-2007 Rafael R. Sevilla
-# License:: GNU Lesser General Public License
+#----------------------------------------------------------------------------
 #
 # This is an implementation of the Inferno authentication protocol
 # (keyring). Adapted from the styx-n-9p Java code.
 #
-# $Id: keyring.rb 259 2007-09-18 04:42:01Z dido $
-#
 require 'openssl'
 require 'rstyx/errors'
 require 'digest/sha1'
@@ -501,10 +497,10 @@ EOS
         hispkbuf = getmsg(fd)
         hispk = InfPublicKey.from_s(hispkbuf)
         unless verify(info.spk, hiscert, hispkbuf)
-          raise LocalAuthErr("pk doesn't match certificate")
+          raise LocalAuthErr.new("pk doesn't match certificate")
         end
         if hiscert.exp != 0 && (Time.at(hiscert.exp) <= Time.now)
-          raise LocalAuthErr("certificate expired")
+          raise LocalAuthErr.new("certificate expired")
         end
 
         # 6. Send a certificate to the peer with alpha**r0 mod p and
@@ -538,7 +534,7 @@ EOS
         # 9. Send a protocol message containing OK back to the client.
         sendmsg(fd, "OK")
       rescue IOError => e
-        raise LocalAuthErr.new("I/O error: #{e.message} at #{e.backtrace}")
+        raise LocalAuthErr.new("I/O error: #{e.message}")
       rescue InvalidCertificateException => e
         senderrmsg(fd, "remote: #{e.message}")
         raise e
@@ -561,7 +557,7 @@ EOS
         until /OK/ =~ getmsg(fd)
         end
       rescue Exception => e
-        raise AuthenticationException.new("i/o error: #{e.message} #{e.backtrace.join("\n")}")
+        raise AuthenticationException.new("i/o error: #{e.message}")
       end
       return([peerauth, secret])
     end
@@ -668,5 +664,65 @@ EOS
       return(Certificate.new("rsa", "sha1", sk.owner, exp, sig))
     end
 
+    ##
+    # A connection wrapper, which provides read and write methods
+    # just like a socket, given a connection object.
+    #
+    class FileWrapper
+      attr_accessor :data
+      ##
+      # Create a new FileWrapper, given an EventMachine connection
+      # object.
+      #
+      def initialize(conn)
+        @conn = conn
+        @data = ""
+        @datalock = Mutex.new
+        @dcondvar = ConditionVariable.new
+      end
+
+      ##
+      # Write data to the connection
+      #
+      def write(data)
+        @conn.send_data(data)
+      end
+
+      ##
+      # Read data from the connection
+      #
+      def read(length)
+        @datalock.synchronize do
+          while @data.length < length
+            @dcondvar.wait(@datalock)
+          end
+          retval, rest = @data.unpack("a#{length}a*")
+          @data = rest
+          return(retval)
+        end
+      end
+
+      ##
+      # Add data received from the connection here
+      #
+      def <<(str)
+        @datalock.synchronize do
+          @data << str
+          @dcondvar.signal
+        end
+      end
+
+      ##
+      # Print data to the connection
+      #
+      def printf(str, *args)
+        str = sprintf(str, *args)
+        write(str)
+      end
+    end
+
+
+
   end
+
 end

data/lib/rstyx/messages.rb

@@ -1,30 +1,27 @@
 #!/usr/bin/ruby
 #
-# Copyright (C) 2005,2006 Rafael Sevilla
-# This file is part of RStyx
+# Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
+# Copyright:: Copyright (c) 2005-2007 Rafael R. Sevilla
+# Homepage:: http://rstyx.rubyforge.org/
+# License:: GNU Lesser General Public License / Ruby License
 #
-# RStyx is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1
-# of the License, or (at your option) any later version.
+# $Id: messages.rb 283 2007-09-19 07:28:28Z dido $
 #
-# RStyx is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTIBILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+#----------------------------------------------------------------------------
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with RStyx; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St., Fifth Floor, Boston, MA
-# 02110-1301 USA.
+# Copyright (C) 2005-2007 Rafael Sevilla
+# This file is part of RStyx
 #
-# Styx Message classes and utility functions
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of either 1) the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version; or 2) Ruby's license.
 #
-# Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
-# Copyright:: Copyright (c) 2005,2006 Rafael R. Sevilla
-# License:: GNU Lesser General Public License
+# See the file COPYING for complete licensing information
+#
+#----------------------------------------------------------------------------
 #
-# $Id: messages.rb 242 2007-09-13 08:05:57Z dido $
+# Styx Message classes and utility functions
 #
 
 require 'rstyx/errors'