em-ftpd-memory 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0744dde341febc22360dc49fb92b41909272e8ea
-  data.tar.gz: 0cde755aab1c955576c8225eed23622bfc111aa1
+  metadata.gz: f956464e630343b641be99ed93084dcb2a611315
+  data.tar.gz: 29590d20f13333be333625911bd2e926b72f8d00
 SHA512:
-  metadata.gz: c2d9b81bfbefa1c169245ba6debb3cd3d1d3041217b5f670c894cf27efb028dc4ca057c41ec261f04dc97c0de01efa603378aff56d873f7476ec6aecb8915353
-  data.tar.gz: b531295f70b050fdc1b0f630587632260b2549853332d4ff703ca9ec3471d2fd9f8ba1bf56102666bba2295924ee49d6deead724992fe78cf0948425fee16ef7
+  metadata.gz: 478ecd65ede2e791ce9e15379feecc04766b5e5896ca9c77cc3a8b885df3dc4d408dd233cd48c3674d3463a989124b3d107b19bdedf6d0892eadbc3050d6131e
+  data.tar.gz: 88f9881f706324244c08740de23803f298e14b52ff57ee4d88b7a2b43c46b957b4f9744e369721b343a77766197eb8e05b9aa9d1f3b054aeeba985e8bfb963c2

data/em-ftpd-memory.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "em-ftpd-memory"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["chrislee35"]
   spec.email         = ["rubygems@chrislee.dhs.org"]
   spec.summary       = %q{Memory-based backing store for em-ftpd}

data/lib/em/ftpd/memory/driver.rb

@@ -62,5 +62,9 @@ module EM::FTPD::Memory
       yield @fs.create_dir(path, @authenticated_user)
     end
     
+    def mtime(path, &block)
+      yield @fs.modified_time(path, @authenticated_user)
+    end
+    
   end
 end

data/lib/em/ftpd/memory/filesystem.rb

@@ -52,6 +52,13 @@ module EM::FTPD::Memory
       f.size
     end
     
+    def modified_time(path, user = nil)
+      return nil unless use_allowed?(path, :time, user)
+      f = get_file(path)
+      return nil unless f
+      f.time
+    end
+    
     def file_contents(path, user = nil)
       return false unless use_allowed?(path, :read, user)
       # nil || false => false
@@ -162,11 +169,12 @@ module EM::FTPD::Memory
       raise InvalidPermissionsError.new if permissions.nil?
       raise InvalidPermissionsError.new(permissions.to_s) unless permissions.class == String
       raise InvalidPermissionsError.new(permissions) unless permissions =~ /^[r\.][w\.][x\.][r\.][w\.][x\.][r\.][w\.][x\.]$/
-      entry = get_entry(path)
-      return false unless entry
-      return false unless user and (entry.owner == user or user == "root")
-      entry.permissions = permissions
-      true
+      if use_allowed?(path, :chmod, user)
+        entry = get_entry(path)
+        entry.permissions = permissions
+        return true
+      end
+      false
     end
     
     def set_owner(path, owner, user = nil)
@@ -230,6 +238,11 @@ module EM::FTPD::Memory
         return allowed?(path, 'rx', username)
       when :size
         return true # since we've already checked everything
+      when :time
+        return true # since we've already checked everything
+      when :chmod
+        entry = get_entry(path)
+        return entry.owner == username
       when :delete
         return allowed?(dirname, "rwx", username)
       when :create

data/test/test_ftpd-memory.rb

@@ -28,7 +28,7 @@ class TestFTPDMemory < Minitest::Test
     
     EM.run {
       EventMachine::start_server("0.0.0.0", 2021, EM::FTPD::Server, EM::FTPD::Memory::Driver, options)
-      EM::Timer.new(100) do
+      EM::Timer.new(0.1) do
         EM.stop
       end
     }

data/test/test_memory_filesystem.rb

@@ -171,12 +171,17 @@ class TestMemoryFilesystem < Minitest::Test
     assert_equal(169, fs.file_size("/pub/pub2/pub3/pub4/helper.rb", "root"))
 
 
-    assert_equal(0, fs.list_files("/pub/pub2/pub3", "charlie").length)
-    refute(fs.file_size("/pub/pub2/pub3/pub4/helper.rb", "charlie"))
-    assert(fs.set_owner("/pub/pub2/pub3", "charlie", "root"))
-    assert_equal(1, fs.list_files("/pub/pub2/pub3", "charlie").length)
-    assert_equal(169, fs.file_size("/pub/pub2/pub3/pub4/helper.rb", "charlie"))
-    
+    assert_equal(0, fs.list_files("/pub/pub2/pub3", "jem").length)
+    refute(fs.file_size("/pub/pub2/pub3/pub4/helper.rb", "jem"))
+    assert(fs.set_owner("/pub/pub2/pub3", "jem", "root"))
+    assert_equal(1, fs.list_files("/pub/pub2/pub3", "jem").length)
+    assert_equal(169, fs.file_size("/pub/pub2/pub3/pub4/helper.rb", "jem"))
+
+    assert(fs.set_permissions("/pub/pub2", "rwx......", "root"))
+    # jem owns pub3, but should be denied since she can't traverse pub2
+    refute(fs.set_permissions("/pub/pub2/pub3", "rwx......", "jem"))
+    assert(fs.set_permissions("/pub/pub2", "rwxr.xr.x", "root"))
+    assert(fs.set_permissions("/pub/pub2/pub3", "rwx......", "jem"))
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-ftpd-memory
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-ftpd