nfs-rb 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f89588ae594babd596c23383c2b1ad83cf363a4c1085a6cd7318bc8800f3aa04
-  data.tar.gz: f56bcb66d4e4b6b87025cb9a2cf233e61f7c4fcafd0ad8847e6312068325f1ec
+  metadata.gz: da83f2d0b02d0b4510cfee2eb9e0901e27f135c8061f7e3af4903a6107a38610
+  data.tar.gz: e2f99227ed65807cc4eae2b7ef6f94607eb3d71daa0cf510d34e6a754e3ae962
 SHA512:
-  metadata.gz: e290e627fbbbe509b5504df9560aea5613a16a81966ff64dfbd307599ef4595e38b7238e48cc626e36e0a819f15728ef55fa4c03f9413cb537e9ad529166e4c9
-  data.tar.gz: '038b038715b5a04f0a7be70ea0ae1361bdabf16db509faf0792682cecbf346ae6817e3663f7b4467139eab7fc46e574b7b2e1a15480c8ebccb46ddd81651b0cf'
+  metadata.gz: 0e8249ea929bd6800341b14658aafb8f43e4b45bc15c7a83636ae6c91779c25f59ccb56cbd960520f115cbfe2cc2537ffb734e18a5eb6f55fc9a8f919e89baed
+  data.tar.gz: 125b3f234f74932584aa1a543114541f6bd70a4d56e8000254f295627df33068ec653b9c0d2240cf281aa4cd3c06ce1ce663ad953e2168c619f2345cc926dc78

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.2
+* Limit open file handles to prevent Errno::EMFILE errors.
+
 ## 1.0.1
 * Fix missing constant error in `UDPClient`.
 * Add protocol to startup log message.

data/lib/nfs.rb

@@ -1,6 +1,8 @@
 module NFS
   class << self
-    attr_accessor :logger
+    def logger
+      @logger ||= DefaultLogger.new(STDOUT)
+    end
   end
 
   autoload :DefaultLogger, 'nfs/default_logger'
@@ -13,5 +15,3 @@ module NFS
   autoload :SUNRPC,        'nfs/sunrpc'
   autoload :XDR,           'nfs/xdr'
 end
-
-NFS.logger = NFS::DefaultLogger.new(STDOUT)

data/lib/nfs/file_proxy.rb

@@ -1,44 +1,28 @@
-module NFS
-  class FileProxy < ::File
-    class << self
-      def new(*args, &block)
-        super(*args, &block)._nfs_setup
-      end
-
-      def open(*args)
-        f = super(*args)._nfs_setup
+require 'fileutils'
 
-        if block_given?
-          begin
-            return yield(f)
-          ensure
-            f.close
-          end
-        end
-
-        f
-      end
-    end
+module NFS
+  class FileProxy
+    attr_reader :path
 
-    def _nfs_setup
+    def initialize(path)
+      @path = path
       @absolute_path = File.expand_path(path)
       @looked_up = {}
-      self
     end
 
     def create(name, mode, uid, gid)
-      f = nil
+      path = _lookup(name)
+      f = self.class.new(path)
 
-      begin
-        f = self.class.new(_lookup(name), File::RDWR | File::CREAT, mode)
-      rescue
-        f = self.class.new(_lookup(name), File::RDONLY | File::CREAT, mode)
+      unless File.exist?(path)
+        FileUtils.touch(path)
       end
 
-      stat = f.lstat
+      f.chmod(mode)
+      f.chown(uid, gid)
 
+      stat = f.lstat
       @looked_up[[stat.ino, name]] = f
-
       [f, stat]
     end
 
@@ -47,13 +31,7 @@ module NFS
     end
 
     def lookup(name)
-      f = nil
-
-      begin
-        f = self.class.new(_lookup(name), File::RDWR)
-      rescue
-        f = self.class.new(_lookup(name), File::RDONLY)
-      end
+      f = self.class.new(_lookup(name))
 
       stat = f.lstat
       key = [stat.ino, name]
@@ -81,16 +59,11 @@ module NFS
       File.symlink(to_name, _lookup(name))
     end
 
-    def readlink
-      File.readlink(@absolute_path)
-    end
-
-    def mkdir(name, mode, uid, gid)
+    def mkdir(name, mode)
       path = _lookup(name)
       Dir.mkdir(path, mode)
 
       f = self.class.new(path)
-      #f.chown(uid, gid)
 
       stat = f.lstat
       @looked_up[[stat.ino, name]] = f
@@ -113,5 +86,21 @@ module NFS
     def utime(atime, mtime)
       File.utime(atime, mtime, @absolute_path)
     end
+
+    def lstat
+      File.lstat(@absolute_path)
+    end
+
+    def truncate(len)
+      File.truncate(@absolute_path, len)
+    end
+
+    def chmod(new_mode)
+      File.chmod(new_mode, @absolute_path)
+    end
+
+    def chown(uid, gid)
+      File.chown(uid, gid, @absolute_path)
+    end
   end
 end

data/lib/nfs/handler.rb

@@ -1,5 +1,7 @@
 module NFS
   class Handler
+    MAX_READDIR_ENTRIES = 200
+
     def initialize(root = nil, fsid = 0)
       @mount_prog = Mount::MOUNTPROG.dup
       @mount_vers = Mount::MOUNTVERS
@@ -8,6 +10,7 @@ module NFS
 
       @exports = {}
       @fh_table = {}
+      @write_handles = {}
       @file_objects = {}
       @next_fh = Filehandle.new
 
@@ -21,6 +24,12 @@ module NFS
       define_nfs_procedures
 
       instance_eval(&block) if block_given?
+
+      at_exit do
+        @write_handles.each do |_, wh|
+          wh.close
+        end
+      end
     end
 
     def programs
@@ -284,7 +293,7 @@ module NFS
             f.utime(atime, mtime)
           end
 
-          ::NFS.logger.info("SETATTR #{f} #{changes.join(', ')}")
+          ::NFS.logger.info("SETATTR #{f.path} #{changes.join(', ')}")
 
           {
             _discriminant: :NFS_OK,
@@ -334,19 +343,22 @@ module NFS
 
       @nfs_prog.on_call(@nfs_vers, :READ) do |arg, auth, verf|
         handle_errors do
-          f = @fh_table[arg[:file][:data]]
-          ::NFS.logger.info("READ #{f.path}")
-          attrs = f.lstat
-          f.pos = arg[:offset]
-          result = f.read(arg[:count])
-
-          {
-            _discriminant: :NFS_OK,
-            reply: {
-              attributes: convert_attrs(attrs),
-              data: result
+          fh = @fh_table[arg[:file][:data]]
+          ::NFS.logger.info("READ #{fh.path}")
+          attrs = fh.lstat
+
+          File.open(fh.path, 'r') do |f|
+            f.pos = arg[:offset]
+            result = f.read(arg[:count])
+
+            {
+              _discriminant: :NFS_OK,
+              reply: {
+                attributes: convert_attrs(attrs),
+                data: result
+              }
             }
-          }
+          end
         end
       end
 
@@ -357,12 +369,14 @@ module NFS
       @nfs_prog.on_call(@nfs_vers, :WRITE) do |arg, auth, verf|
 
         handle_errors do
-          f = @fh_table[arg[:file][:data]]
-          ::NFS.logger.info("WRITE #{f.path}")
-          f.pos = arg[:offset]
-          f.write(arg[:data])
-          f.flush
-          attrs = f.lstat
+          fh = @fh_table[arg[:file][:data]]
+          ::NFS.logger.info("WRITE #{fh.path}")
+
+          wh = @write_handles[arg[:file][:data]] ||= File.open(fh.path, 'w')
+          wh.pos = arg[:offset]
+          wh.write(arg[:data])
+          wh.flush
+          attrs = fh.lstat
 
           {
             _discriminant: :NFS_OK,
@@ -503,8 +517,9 @@ module NFS
 
           result_entries = nil
           last_entry = nil
+          total = 0
 
-          while cookie < entries.size && need_bytes < count
+          while cookie < entries.size && total < MAX_READDIR_ENTRIES && need_bytes < count
             need_bytes += NFS::Filename.encode(entries[cookie]).size
 
             next_entry = {
@@ -513,7 +528,7 @@ module NFS
               cookie: cookie
             }
 
-            if not last_entry.nil?
+            if !last_entry.nil?
               last_entry[:nextentry] = next_entry
               last_entry = next_entry
             end
@@ -524,6 +539,7 @@ module NFS
             end
 
             cookie += 1
+            total += 1
             need_bytes += 16
           end
 
@@ -533,7 +549,7 @@ module NFS
             eof = :FALSE
           end
 
-          if not last_entry.nil?
+          if !last_entry.nil?
             last_entry[:nextentry] = nil
           end
 

data/lib/nfs/server.rb

@@ -8,7 +8,7 @@ module NFS
       @port = port
       @protocol = protocol
 
-      @handler = Handler.new(FileProxy.open(dir))
+      @handler = Handler.new(FileProxy.new(dir))
       @server = server_class.new(@handler.programs, port, host)
     end
 

data/lib/nfs/sunrpc/procedure.rb

@@ -44,8 +44,8 @@ module NFS
         begin
           result = @returntype.encode(result_object)
         rescue => e
-          NFS.logger.error(e.message)
-          NFS.logger.error(e.backtrace.join("\n"))
+          ::NFS.logger.error(e.message)
+          ::NFS.logger.error(e.backtrace.join("\n"))
           raise IgnoreRequest
         end
 

data/lib/nfs/version.rb

@@ -1,3 +1,3 @@
 module NFS
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfs-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Cameron Dutro
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2020-08-29 00:00:00.000000000 Z
 dependencies: []
 description: An NFS v2 server implemented in pure Ruby.
 email: