persistent-cache 0.2.0 → 0.2.1

data/lib/persistent-cache/storage/storage_directory.rb

@@ -14,7 +14,7 @@ module Persistent
     end
 
     def connect_to_database
-      FileUtils.makedirs([@storage_root]) if not File.exists?(@storage_root)
+      FileUtils.makedirs([@storage_root]) if not File.exists?(@storage_root) or not File.directory?(@storage_root)
     end
 
     def save_key_value_pair(key, value, timestamp = nil)
@@ -34,12 +34,7 @@ module Persistent
     end
 
     def size
-      count = Dir::glob("#{@storage_root}/**/").size
-      # if the directory does not exist, count == 0, which is what we want
-      return 0 if count == 0
-      # if the directory does exist, but is empty, count == 1, namely the directory itself, and we want to return 0 (i.e. count - 1)
-      # if the directory does exist and includes subdirectories, the directory itself is still counted as well, and we want to return count - 1
-      return count - 1
+      count = Dir::glob("#{@storage_root}/**/#{CACHE_FILE}").size
     end
 
     def keys
@@ -122,6 +117,11 @@ module Persistent
 
     def validate_key(key)
       raise ArgumentError.new("Only string keys allowed") if not key.is_a?(String)
+      root_path = Pathname.new(File.absolute_path(@storage_root))
+      key_path = Pathname.new(File.absolute_path(compile_key_path(key)))
+      relative = key_path.relative_path_from(root_path).to_s
+      raise ArgumentError.new("key is outside of storage_root scope") if relative.start_with?("../")
+      raise ArgumentError.new("key is the same as storage_root") if relative == "."
     end
 
     def empty_key_value(key)
@@ -165,6 +165,5 @@ module Persistent
       output.write(value)
       output.flush
     end
-
   end
 end

data/lib/persistent-cache/version.rb

@@ -1,5 +1,5 @@
 module Persistent
   class Cache
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/storage/storage_directory_spec.rb

@@ -17,7 +17,6 @@ describe Persistent::StorageDirectory do
 
   context "when constructed" do
     it "should create the database if it does not exist" do
-      #debugger
       result = File.exists?(@db_name)
       expect(result).to eq(true)
     end
@@ -85,6 +84,15 @@ describe Persistent::StorageDirectory do
       }.to raise_error ArgumentError
     end
 
+    it "should raise an ArgumentError if a key is requested that traverses above the storage root" do      
+      expect {
+        @iut.lookup_key("/../../secure-stuff-i-should-not-have-access-to")
+      }.to raise_error(ArgumentError)
+      expect {
+        @iut.lookup_key(".")
+      }.to raise_error(ArgumentError)
+    end
+
     it "should raise an ArgumentError if the value is not a string" do
       expect {
         @iut.save_key_value_pair(@test_key, 1234)

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: persistent-cache
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
+  prerelease: 
 platform: ruby
 authors:
 - Wynand van Dyk
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -84,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -91,6 +103,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -115,7 +128,6 @@ files:
 - lib/persistent-cache/storage/storage_ram.rb
 - lib/persistent-cache/storage/storage_sq_lite.rb
 - lib/persistent-cache/version.rb
-- multidb
 - persistent-cache.gemspec
 - spec/persistent-cache_spec.rb
 - spec/spec_helper.rb
@@ -124,26 +136,27 @@ files:
 - spec/storage/storage_sqlite_spec.rb
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.28
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Persistent Cache has a default freshness threshold of 179 days after which
   entries are no longer returned
 test_files:

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWY0N2Y0ZmU4YmE3ZDRhMTAwNDg4MmU2YmUyNDE1ZjZhZDgzZWJlNQ==
-  data.tar.gz: !binary |-
-    NjZiMjdhYWYyYWM4ZjY1YmFiOWJkNThhOTUzNjdjZjE1NTcxNWI3MA==
-SHA512:
-  metadata.gz: !binary |-
-    YWRhODc0MGYwNjNjOGI3ZTg0NTEwMmM2NWI2OGQ3NDgxOWU2ZTIxNWVkY2Y0
-    OThkOTAxYTljNDIxNTQ2NzA5ZTY0ZTg0MmRmOWJmMjRkMzM3ZGE4YTg3OWVi
-    NDBlZjcyOGU1OGJjZDg2M2IzYmU5NDZlZmFkYzllY2FmMTk3YTc=
-  data.tar.gz: !binary |-
-    M2NkMjJkZWRmN2I1MWUyYWZlYzZhOTg1NTZlYjYyZWJkNmY2ODY1NjIxNzYx
-    YzQyMTI0Y2JjOWFmMzkwMTEzZDFhMTg3ZGJmM2MxMjM4OWI3YTk1OGQyMDU5
-    OTU1ZjgxZWUzODI0ZGMwNDQ4NzRkNWQyMWY4ZmY3NmVlN2I4Mzc=