image_vise 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8355426daabd653dd28ce986a379ce74d04015a
-  data.tar.gz: c986a6120fec633545eaaaddb57daf751fc3067f
+  metadata.gz: 2176fbaf15e4bc2d36a698796bfd934f84100070
+  data.tar.gz: 56396a529ce373d32b7a2a27522c8ad82ac65bf9
 SHA512:
-  metadata.gz: 3ab6e3c250db5aa9870702b99b15c5bbbf29bc5d5acdd6647c8bdbb639a2b97b212cc6d9d5d3a10c9007a767ec8a53ede4625479415032d5ffe45e66be9efd21
-  data.tar.gz: b2db49f8c1655d6ff9064749098b856eb4616430e91644309c95fbe32d402e630c6eb224f430a79f9f9b46a4998d80f6f11737524b73cc8524c4aaaa777072f6
+  metadata.gz: cb597e00191e3f4428c35f295041ba0b93181f7fb309f3bb2790d93641d1487a3d9f374acc260a20b93b3acc2987decbf0960266cd2518d2b006243e7dc46e4b
+  data.tar.gz: ac54cb79ad6d908e27fb2b0e26dd538a84db39fea929bdf72928587dcc4378764ed4a02fac458e6e0ef28fbb0ca6e3264cecfd740e4bd1d37b0744ba83675d76

data/SECURITY.md

@@ -4,10 +4,19 @@ This lists out the implementation details of security-sensitive parts of ImageVi
 
 ## Protection of the URLs
 
-URLs are passed as Base64-encoded JSON. The JSON payload is signed using HMAC with SHA256. This should be
-sufficient to prevent too much probing. If this is a critical issue you need to put throttling in front of the application.
+URLs are passed as Base64-encoded JSON. The HMAC signature is computed over the Base-64 encoded string,
+so altering the string (with the intention to bust the cache) will invalidate the signature.
+
 For checking HMAC values `Rack::Utils.secure_compare` constant-time comparison is used.
 
+## Throttling still recommended
+
+Throttling between the caching CDN/proxy is recommended.
+
+## Cache bypass protection for fuzzed paths
+
+ImageVise accepts exactly 2 path components, and will return early if there are more
+
 ## Cache bypass protection for randomized query string params
 
 ImageVise defaults to using paths. If you have a way to forbid query strings on the fronting CDN
@@ -22,7 +31,7 @@ CDN cache because the query string params contain extra data.
 
 ## Protection for remote URLs from HTTP(s) origins
 
-Only URLs referring to permitted hosts are going to be permitted for fetching. If there are no host added,
+Only URLs referring to permitted hosts are going to be permitted for fetching. If there are no hosts added,
 any remote URL is going to cause an exception. No special verification for whether the upstream must be HTTP
 or HTTPS is performed at this time.
 
@@ -33,6 +42,10 @@ The matching takes links (hard and soft) into account, and uses Ruby's `File.fnm
 is always expanded first using `File.expand_path`. The data is not read into ImageMagick from the original location,
 but gets copied into a tempfile first.
 
+The path in to the file gets encoded in the image processing request and may be examined by the user, that will
+disclose where the source image is stored on the server's filesystem. This might be an issue - if it is,
+a customised version with a custom URL scheme should be used for the source URL.
+
 ## ImageMagick memory constraints
 
 ImageVise does not set RMagick limits by itself. You should

data/image_vise.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: image_vise 0.1.5 ruby lib
+# stub: image_vise 0.1.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "image_vise"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2016-11-21"
+  s.date = "2016-12-07"
   s.description = "Image processing via URLs"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [
@@ -67,7 +67,8 @@ Gem::Specification.new do |s|
     "spec/waterside_magic_hour.jpg",
     "spec/waterside_magic_hour.psd",
     "spec/waterside_magic_hour_adobergb.jpg",
-    "spec/waterside_magic_hour_gray.tif"
+    "spec/waterside_magic_hour_gray.tif",
+    "spec/waterside_magic_hour_transp.png"
   ]
   s.homepage = "https://github.com/WeTransfer/image_vise"
   s.licenses = ["MIT"]

data/lib/image_vise/operators/ellipse_stencil.rb

@@ -12,9 +12,44 @@ class ImageVise::EllipseStencil
   private_constant :C_black
 
   def apply!(magick_image)
-    # http://stackoverflow.com/a/13329959/153886
     width, height = magick_image.columns, magick_image.rows
     
+    # This is a bit involved. We need to do a manual composite. Here is what it entails.
+    #
+    # Given a premultiplied RGB image B, and a grayscale mask A, we need to do the following
+    # operation:
+    #
+    #    BrBgBb / Ba * (Ba * A)
+    #
+    # Since ImageMagick works with unpremultiplied alphas, it is doable - but special care
+    # must be taken not to overmult or overdivide.
+    #
+    # To begin,generate a black and white image for the stencil
+    circle_img = Magick::Image.new(width, height)
+    draw_circle(circle_img, width, height)
+    mask = circle_img.negate
+    
+    # At this stage the mask contains a B/W image of the circle, black outside, white inside.
+    # Retain the alpha of the original in a separate image
+    only_alpha = magick_image.copy
+    only_alpha.alpha(Magick::ExtractAlphaChannel)
+    mask.composite!(only_alpha, Magick::CenterGravity, Magick::MultiplyCompositeOp)
+    
+    # With this composite op, enabling alpha on the destination image is
+    # not required - it will be enabled automatically.
+    # The CopyOpacityCompositeOp implies that we copy the grayscale version
+    # of the RGB channels as the alpha channel, so for some weird reason we need
+    # to disable the alpha on our mask image
+    mask.alpha(Magick::DeactivateAlphaChannel)
+    # And perform the operation (set gray(RGB) of mask as the A of magick_image)
+    magick_image.composite!(mask, Magick::CenterGravity, Magick::CopyOpacityCompositeOp)
+  ensure
+    [mask, only_alpha, circle_img].each do |maybe_image|
+      ImageVise.destroy(maybe_image)
+    end
+  end
+  
+  def draw_circle(into_image, width, height)
     center_x = (width / 2.0)
     center_y = (height / 2.0)
     # Make sure all the edges are anti-aliased
@@ -24,19 +59,9 @@ class ImageVise::EllipseStencil
     gc = Magick::Draw.new
     gc.fill C_black
     gc.ellipse(center_x, center_y, radius_width, radius_height, deg_start=0, deg_end=360)
-    
-    circle_img = Magick::Image.new(width, height)
-    gc.draw(circle_img)
-    
-    mask = circle_img.negate
-    mask.matte = false
-    
-    magick_image.matte = true
-    magick_image.composite!(mask, Magick::CenterGravity, Magick::CopyOpacityCompositeOp)
+    gc.draw(into_image)
   ensure
-    [mask, gc, circle_img].each do |maybe_image|
-      ImageVise.destroy(maybe_image)
-    end
+    ImageVise.destroy(gc)
   end
   
   ImageVise.add_operator 'ellipse_stencil', self

data/lib/image_vise.rb

@@ -8,7 +8,7 @@ require 'base64'
 require 'rack'
 
 class ImageVise
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
   S_MUTEX = Mutex.new
   private_constant :S_MUTEX
   

data/spec/image_vise/ellipse_stencil_spec.rb

@@ -7,4 +7,13 @@ describe ImageVise::EllipseStencil do
     stencil.apply!(image)
     examine_image(image, "circle-stencil")
   end
-end
+
+  it 'applies the circle stencil to a png with transparency' do
+    png_transparent_path = File.expand_path(__dir__ + '/../waterside_magic_hour_transp.png')
+    image = Magick::Image.read(png_transparent_path)[0]
+    stencil = described_class.new
+    stencil.apply!(image)
+    examine_image(image, "circle-stencil-transparent-bg")
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_vise
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
@@ -311,6 +311,7 @@ files:
 - spec/waterside_magic_hour.psd
 - spec/waterside_magic_hour_adobergb.jpg
 - spec/waterside_magic_hour_gray.tif
+- spec/waterside_magic_hour_transp.png
 homepage: https://github.com/WeTransfer/image_vise
 licenses:
 - MIT