attache 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1438a328d3cedfa04d52dcbe33d1b168be8ccd98
-  data.tar.gz: 0676c54d6050a8280247fa4e48ade32ec749edaf
+  metadata.gz: 228685a6b1038b73b233cf5165570252f271f447
+  data.tar.gz: df3611d3b73a8c2120b9fda08fab214bfaa55ecb
 SHA512:
-  metadata.gz: 25f7bdb0321d6850f7e42002fa54670654260f670023d3a119b587302f704efc303f2ef2c6ba8bcb852d77b7f35a66f11332b6fd2dc260940f94090ed25f523b
-  data.tar.gz: bea5d1625b2235168897f5978de5fb1dbb62a5a9ec65af10a1264e7204c5397939b0d5447129ca2fff3b72e79c09956f90298f533c6815788f108cf97a007a32
+  metadata.gz: d8556bbf47617561a3bafd4bacb72ae3445e52357ee1acd5e5fd92473f4d1fbfe9336a86a3c6af30df01392a207a3be05881d88290c3cbf95dff3335dc515899
+  data.tar.gz: 71ec695990a228854eb3ba24fdcb5462f70b106670fa370d08d89584e04ae7e4ab8f9d5788cbf800f6d312a0fc6093bd8e82a86af27b8e8f605907de28199ee8

data/README.md

@@ -67,7 +67,7 @@ NOTE: some config files will be written into your current directory (see RubyGem
 
 #### Source code
 
-You can checkout the source code and run it like a regular [a Procfile-based app](ddollar.github.io/foreman/)
+You can checkout the source code and run it like a regular [a Procfile-based app](https://ddollar.github.io/foreman/):
 
 ```
 git clone https://github.com/choonkeat/attache.git
@@ -143,7 +143,11 @@ Users will upload files directly into the `attache` server from their browser, b
 > ```
 > PUT /upload?file=image123.jpg
 > ```
-> file content is the http request body
+> file content is the http request body as raw binary (preferred) or encoded as base64 uri like this:
+> ```
+> PUT /upload?file=image123.jpg
+> data:image/jpeg;base64,/9j/4QBiR....
+> ```
 
 The main app front end will receive a unique `path` for each uploaded file - the only information to store in the main app database.
 
@@ -152,6 +156,16 @@ The main app front end will receive a unique `path` for each uploaded file - the
 > ```
 > json response from attache after upload.
 
+##### Upload by url
+
+> ```
+> GET /upload_url?url=https://example.com/logo.png
+> ```
+
+Attache will download the file from `url` supplied and uploads it through the regular `/upload` handler. So be expecting the same json response after upload. works with `GET`, `POST`, `PUT`.
+
+Data URIs (aka base64 encoded file binaries) can also be uploaded to the same `/upload_url` endpoint through the same `url` parameter.
+
 #### Download
 
 Whenever the main app wants to display the uploaded file, constrained to a particular size, it will use a helper method provided by the `attache` lib. e.g. `embed_attache(path)` which will generate the necessary, barebones markup.

data/config.ru

@@ -1,6 +1,7 @@
 require 'attache'
 
 use Attache::Delete
+use Attache::UploadUrl
 use Attache::Upload
 use Attache::Download
 use Attache::Tus::Upload

data/lib/attache.rb

@@ -4,6 +4,8 @@ require 'securerandom'
 require 'disk_store'
 require 'fileutils'
 require 'paperclip'
+require 'net/http'
+require 'tempfile'
 require 'sidekiq'
 require 'tmpdir'
 require 'logger'
@@ -50,6 +52,7 @@ require 'attache/job'
 require 'attache/resize_job'
 require 'attache/base'
 require 'attache/vhost'
+require 'attache/upload_url'
 require 'attache/upload'
 require 'attache/delete'
 require 'attache/backup'

data/lib/attache/upload.rb

@@ -9,7 +9,7 @@ class Attache::Upload < Attache::Base
       case env['REQUEST_METHOD']
       when 'POST', 'PUT', 'PATCH'
         request  = Rack::Request.new(env)
-        params   = request.params
+        params   = request.GET # stay away from parsing body
         return config.unauthorized unless config.authorized?(params)
 
         relpath = generate_relpath(Attache::Upload.sanitize params['file'])

data/lib/attache/upload_url.rb

@@ -0,0 +1,67 @@
+class Attache::UploadUrl < Attache::Base
+  def initialize(app)
+    @app = app
+  end
+
+  def _call(env, config)
+    case env['PATH_INFO']
+    when '/upload_url'
+
+      # always pretend to be `POST /upload`
+      env['PATH_INFO'] = '/upload'
+      env['REQUEST_METHOD'] = 'POST'
+
+      request  = Rack::Request.new(env)
+      params   = request.params
+      return config.unauthorized unless config.authorized?(params)
+
+      if params['url']
+        file, filename, content_type = download_file(params['url'])
+        filename = "index" if filename == '/'
+
+        env['CONTENT_TYPE'] = content_type || content_type_of(file.path)
+        env['rack.request.query_hash'] = (env['rack.request.query_hash'] || {}).merge('file' => filename)
+        env['rack.input'] = file
+      end
+    end
+    @app.call(env)
+  end
+
+  MAX_DEPTH = 30
+  def download_file(url, depth = 0)
+    raise Net::HTTPError, "Too many redirects" if depth > MAX_DEPTH
+    Attache.logger.info "Upload GET #{url}"
+
+    if url.match /\Adata:([^;,]+|)(;base64|),/
+      # data:[<mediatype>][;base64],<data>
+      # http://tools.ietf.org/html/rfc2397
+
+      data = URI.decode(url[url.index(',')+1..-1])
+      data = Base64.decode64(data) if $2 == ';base64'
+      content_type = ($1 == '' ? "text/plain" : $1)
+      filename = "data.#{content_type.gsub(/\W+/, '.')}"
+      return [StringIO.new(data), filename, content_type]
+    end
+
+    uri = uri.kind_of?(URI::Generic) ? url : URI.parse(url)
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true if uri.scheme == 'https'
+    req = Net::HTTP::Get.new(uri.request_uri)
+    req.initialize_http_header({"User-Agent" => ENV['USER_AGENT']}) if ENV['USER_AGENT']
+    req.basic_auth(uri.user, uri.password) if uri.user || uri.password
+    res = http.request(req)
+    case res.code
+    when /\A30[1,2]\z/
+      download_file URI.join(url, res['Location']).to_s, depth + 1
+
+    when /\A2\d\d\z/
+      f = Tempfile.new(["upload_url", File.extname(uri.path)])
+      f.write(res.body)
+      f.close
+      [f.tap(&:open), File.basename(uri.path)]
+
+    else
+      raise Net::HTTPError, "Failed #{res.code}"
+    end
+  end
+end

data/lib/attache/version.rb

@@ -1,3 +1,3 @@
 module Attache
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attache
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - choonkeat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -275,6 +275,7 @@ files:
 - lib/attache/tus.rb
 - lib/attache/tus/upload.rb
 - lib/attache/upload.rb
+- lib/attache/upload_url.rb
 - lib/attache/version.rb
 - lib/attache/vhost.rb
 - public/index.html