apache_upload_merger 0.0.1 → 0.0.2

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to apache_upload_merger version 0.0.1
+This documentation refers to apache_upload_merger version 0.0.2
 
 
 == DESCRIPTION

data/lib/apache/upload_merger/version.rb

@@ -6,7 +6,7 @@ module Apache
 
       MAJOR = 0
       MINOR = 0
-      TINY  = 1
+      TINY  = 2
 
       class << self
 

data/lib/apache/upload_merger.rb

@@ -34,6 +34,8 @@ module Apache
 
   class UploadMerger
 
+    MERGE_SIZE = 32 * 1024 * 1024
+
     MODE = Fcntl::O_CREAT|Fcntl::O_WRONLY|Fcntl::O_EXCL
 
     # Creates a new RubyHandler instance for the Apache web server. It
@@ -54,16 +56,16 @@ module Apache
     # determined by its URL prefix. Otherwise, the original error will
     # be thrown.
     def handler(request)
-      request.setup_cgi_env
+      request.add_common_vars  # REDIRECT_URL
 
       if url    = request.subprocess_env['REDIRECT_URL'] and
          prefix = request.path_info                      and
          map    = @map[prefix]                           and
-         path   = url[map[0], 1]                         and
-         src    = Dir[File.join(map[1], '*', path.untaint)].first
+         path   = url[map[0], 1].untaint                 and
+         src    = find(map[1], path)
 
-        dest = File.join(request.server.document_root, prefix, path)
-        copy(src.untaint, dest.untaint)
+        merge(src,
+          File.join(request.server.document_root, prefix, path).untaint)
 
         request.status = HTTP_OK
         request.internal_redirect(url)
@@ -76,12 +78,27 @@ module Apache
 
     private
 
-    def copy(src, dest)
-      File.open(src, 'r') { |r|
-        File.open(dest, MODE, r.stat.mode) { |w|
-          FileUtils.copy_stream(r, w)
-        }
+    # TODO: make it fast *and* secure
+    def find(dir, path)
+      Dir["#{dir}/*/"].find { |subdir|
+        file = File.join(subdir, path).untaint
+        return file if File.exists?(file)
       }
+    end
+
+    # TODO: optimize the copying case
+    def merge(src, dest)
+      stat = File.stat(src)
+
+      if stat.size > MERGE_SIZE
+        File.symlink(src, dest)
+      else
+        File.open(src) { |src_|
+          File.open(dest, MODE, stat.mode) { |dest_|
+            FileUtils.copy_stream(src_, dest_)
+          }
+        }
+      end
     rescue Errno::EEXIST
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jens Wille
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 +01:00
+date: 2010-02-26 00:00:00 +01:00
 default_executable: 
 dependencies: []