rstyx 0.4.0 → 0.4.1

data/COPYING

@@ -1,3 +1,66 @@
+RStyx is copyrighted free software owned by Rafael Sevilla (dido
+... imperium.ph). The Owner of this software permits you to
+redistribute and/or modify the software under either the terms of the
+LGPL version 3 (see further below), or the conditions below ("Ruby
+License"):
+
+  1. You may make and give away verbatim copies of the source form of this
+     software without restriction, provided that you retain ALL of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the Owner.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in a manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the Owner.
+
+  4. You may modify and include parts of the software into any other
+     software (possibly commercial), provided you comply with the terms in
+     Sections 1, 2, and 3 above. But some files in the distribution
+     are not written by the Owner, so they may be made available to you
+     under different terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whoever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
+
+---------------------------------------------------------------------
+
 		   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 

data/History.txt

@@ -1,4 +1,12 @@
 
+== 0.4.1
+
+Clarified licensing issues to LGPLv3 and Ruby License.  Set up some
+basic support for server-side Inferno authentication, and do some form
+of correct permission checks on file requests.  There's bound to be
+lots of security bugs in this release, but we'll find them and fix
+them someday...
+
 == 0.4.0
 
 Added some basic support for the Inferno authentication protocol.  At

data/Manifest.txt

@@ -9,7 +9,6 @@ examples/testserver.rb
 examples/writestyxfile.rb
 keyring.txt
 lib/rstyx.rb
-lib/rstyx/authmodules.rb
 lib/rstyx/client.rb
 lib/rstyx/common.rb
 lib/rstyx/errors.rb

data/Rakefile

@@ -1,23 +1,25 @@
 # -*- Ruby -*-
-# Copyright (C) 2005,2006 Rafael Sevilla
-# This file is part of RStyx
 #
-# 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.
+# 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: Rakefile 286 2007-09-19 07:33:59Z dido $
+#
+#----------------------------------------------------------------------------
+#
+# Copyright (C) 2005-2007 Rafael Sevilla
+# This file is part of RStyx
 #
-# 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.
+# 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.
 #
-# 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.
+# See the file COPYING for complete licensing information
 #
-# $Id: Rakefile 257 2007-09-17 08:02:21Z dido $
+#----------------------------------------------------------------------------
 #
 require 'rubygems'
 require 'hoe'

data/examples/fileondisk.rb

@@ -1,13 +1,41 @@
 #!/usr/bin/ruby
 #
-# $Id: fileondisk.rb 243 2007-09-13 08:21:09Z dido $
+# 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
 #
-require 'rstyx/server'
+# $Id: fileondisk.rb 292 2007-09-19 07:42:21Z dido $
+#
+#----------------------------------------------------------------------------
+#
+# Copyright (C) 2005-2007 Rafael Sevilla
+# This file is part of RStyx
+#
+# 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
+#
+#----------------------------------------------------------------------------
+#
+# Test server that serves up a file (or directory) on the host machine's
+# filesystem.
+#
+require 'rstyx'
 require 'logger'
 
 log = Logger.new(STDOUT)
 sd = RStyx::Server::SDirectory.new("/")
 sf = RStyx::Server::FileOnDisk.new(ARGV[0])
+authinfo = nil
+unless ARGV[1].nil?
+  File.open(ARGV[1]) do |fp|
+    authinfo = RStyx::Keyring::Authinfo.readauthinfo(fp)
+  end
+end
 sf.add_changelistener do |f|
   puts "File contents changed"
 end
@@ -16,7 +44,8 @@ serv = RStyx::Server::TCPServer.new(:bindaddr => "0.0.0.0",
                                     :port => 9876,
                                     :root => sd,
                                     :log => log,
-                                    :debug => Logger::DEBUG)
+                                    :debug => Logger::DEBUG,
+                                    :auth => authinfo)
 Thread.abort_on_exception = true
 serv.run.join
 

data/examples/readstyxfile.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: readstyxfile.rb 290 2007-09-19 07:39:21Z 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 file reader
+# 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: readstyxfile.rb 264 2007-09-18 05:24:26Z dido $
+# Styx file reader
 #
 require 'rstyx'
 

data/examples/testserver.rb

@@ -1,13 +1,41 @@
 #!/usr/bin/ruby
 #
-# $Id: testserver.rb 237 2007-08-14 11:35:47Z dido $
+# 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
 #
-require 'rstyx/server'
+# $Id: testserver.rb 293 2007-09-19 07:43:41Z dido $
+#
+#----------------------------------------------------------------------------
+#
+# Copyright (C) 2005-2007 Rafael Sevilla
+# This file is part of RStyx
+#
+# 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
+#
+#----------------------------------------------------------------------------
+#
+# Test server that serves up a simple file named test.file that is
+# an InMemoryFile.
+#
+require 'rstyx'
 require 'logger'
 
 log = Logger.new(STDOUT)
 sd = RStyx::Server::SDirectory.new("/")
 sf = RStyx::Server::InMemoryFile.new("test.file")
+authinfo = nil
+unless ARGV[0].nil?
+  File.open(ARGV[0]) do |fp|
+    authinfo = RStyx::Keyring::Authinfo.readauthinfo(fp)
+  end
+end
 sf.contents = "hello"
 sf.add_changelistener do |f|
   puts "File contents changed to #{f.contents}"
@@ -17,7 +45,8 @@ serv = RStyx::Server::TCPServer.new(:bindaddr => "0.0.0.0",
                                     :port => 9876,
                                     :root => sd,
                                     :log => log,
-                                    :debug => Logger::DEBUG)
+                                    :debug => Logger::DEBUG,
+                                    :auth => authinfo)
 Thread.abort_on_exception = true
 serv.run.join
 

data/examples/writestyxfile.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: readstyxfile.rb 290 2007-09-19 07:39:21Z 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 file reader
+# 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: readstyxfile.rb 190 2007-06-04 06:53:54Z dido $
+# Styx file writer, for test
 #
 require 'rstyx'
 require 'digest/sha1'

data/lib/rstyx/client.rb

@@ -1,31 +1,28 @@
 #!/usr/bin/ruby
 #
+# 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: client.rb 279 2007-09-19 07:23:45Z dido $
+#
+#----------------------------------------------------------------------------
+#
 # Copyright (C) 2005-2007 Rafael Sevilla
 # This file is part of RStyx
 #
-# 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.
+# 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.
 #
-# 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.
+# See the file COPYING for complete licensing information
 #
-# 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.
+#----------------------------------------------------------------------------
 #
 # Styx Client
 #
-# Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
-# Copyright:: Copyright (c) 2005-2007 Rafael R. Sevilla
-# License:: GNU Lesser General Public License
-#
-# $Id: client.rb 263 2007-09-18 05:23:24Z dido $
-#
 
 require 'thread'
 require 'timeout'
@@ -189,58 +186,6 @@ module RStyx
 
     end                         # module StyxClient
 
-    ##
-    # A connection wrapper, which provides read and write methods
-    # just like a socket, given a connection object.
-    #
-    class KeyringAuthWrapper
-      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
-
     class Connection
       attr_accessor :usedfids, :pendingclunks, :umask
       attr_reader :connectstate, :msize, :version
@@ -311,7 +256,7 @@ module RStyx
         # Do Inferno authentication if the @authenticator object is a
         # keyring authinfo object
         if @authenticator.is_a?(Keyring::Authinfo)
-          @conn.keyringauth = KeyringAuthWrapper.new(@conn)
+          @conn.keyringauth = Keyring::FileWrapper.new(@conn)
           @peerauth, secret = Keyring.auth(@conn.keyringauth,
                                            :client, @authenticator,
                                            ["none"])

data/lib/rstyx/common.rb

@@ -1,31 +1,28 @@
 #!/usr/bin/ruby
 #
+# 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: common.rb 280 2007-09-19 07:24:51Z dido $
+#
+#----------------------------------------------------------------------------
+#
 # Copyright (C) 2005-2007 Rafael Sevilla
 # This file is part of RStyx
 #
-# 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.
+# 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.
 #
-# 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.
+# See the file COPYING for complete licensing information
 #
-# 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.
+#----------------------------------------------------------------------------
 #
 # Common code and defined constants
 #
-# Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
-# Copyright:: Copyright (c) 2005,2006 Rafael R. Sevilla
-# License:: GNU Lesser General Public License
-#
-# $Id: common.rb 218 2007-07-04 06:24:33Z dido $
-#
 module RStyx
   # File access modes in Styx
   OREAD = 0

data/lib/rstyx/errors.rb

@@ -1,30 +1,27 @@
 #!/usr/bin/ruby
 #
-# Copyright (C) 2005 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: errors.rb 281 2007-09-19 07:25:55Z 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., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# Copyright (C) 2005-2007 Rafael Sevilla
+# This file is part of RStyx
 #
-# Styx Exception classes.
+# 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 Rafael R. Sevilla
-# License:: GNU Lesser General Public License
+# See the file COPYING for complete licensing information
+#
+#----------------------------------------------------------------------------
 #
-# $Id: errors.rb 266 2007-09-18 05:27:07Z dido $
+# Styx Exception classes.
 #
 
 module RStyx