httpimagestore 1.6.0 → 1.7.0

data/Gemfile

@@ -1,9 +1,9 @@
 source "http://rubygems.org"
 ruby "1.9.3"
 
-gem "unicorn-cuba-base", "~> 1.1.2"
+gem "unicorn-cuba-base", "~> 1.2.0"
 #gem "unicorn-cuba-base", path: "../unicorn-cuba-base"
-gem "httpthumbnailer-client", "~> 1.1.1"
+gem "httpthumbnailer-client", "~> 1.2.0"
 #gem "httpthumbnailer-client", path: "../httpthumbnailer-client"
 gem "aws-sdk", "~> 1.10"
 gem "mime-types", "~> 1.17"
@@ -20,6 +20,7 @@ group :development do
   gem "rdoc", "~> 3.9"
   gem "daemon", "~> 1"
   gem "prawn", "= 0.8.4"
-  gem "httpthumbnailer", path: '../httpthumbnailer'
+  #gem "httpthumbnailer", path: '../httpthumbnailer'
+  gem "httpthumbnailer", "~> 1.2.0"
 end
 

data/Gemfile.lock

@@ -1,10 +1,3 @@
-PATH
-  remote: ../httpthumbnailer
-  specs:
-    httpthumbnailer (1.1.1)
-      rmagick (~> 2)
-      unicorn-cuba-base (~> 1.1.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -15,7 +8,7 @@ GEM
       uuidtools (~> 2.1)
     builder (3.2.2)
     cli (1.3.1)
-    cuba (3.1.0)
+    cuba (3.1.1)
       rack
     cucumber (1.3.8)
       builder (>= 2.1.2)
@@ -42,7 +35,10 @@ GEM
     highline (1.6.20)
     httpauth (0.2.0)
     httpclient (2.3.4.1)
-    httpthumbnailer-client (1.1.1)
+    httpthumbnailer (1.2.0)
+      rmagick (~> 2)
+      unicorn-cuba-base
+    httpthumbnailer-client (1.2.0)
       cli (~> 1.3)
       httpclient (>= 2.3)
       multipart-parser (~> 0.1.1)
@@ -58,7 +54,7 @@ GEM
     json (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    kgio (2.8.1)
+    kgio (2.9.2)
     mime-types (1.25)
     msgpack (0.5.5)
     multi_json (1.8.2)
@@ -82,7 +78,7 @@ GEM
     prawn-layout (0.8.4)
     prawn-security (0.8.4)
     rack (1.5.2)
-    raindrops (0.12.0)
+    raindrops (0.13.0)
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -97,11 +93,11 @@ GEM
     rspec-mocks (2.14.3)
     ruby-ip (0.9.1)
     sdl4r (0.9.11)
-    unicorn (4.6.3)
+    unicorn (4.8.2)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    unicorn-cuba-base (1.1.2)
+    unicorn-cuba-base (1.2.0)
       cli (~> 1.3)
       cuba (~> 3.0)
       facter (~> 1.6.11)
@@ -118,8 +114,8 @@ DEPENDENCIES
   cucumber
   daemon (~> 1)
   httpclient (>= 2.3)
-  httpthumbnailer!
-  httpthumbnailer-client (~> 1.1.1)
+  httpthumbnailer (~> 1.2.0)
+  httpthumbnailer-client (~> 1.2.0)
   jeweler (~> 1.8.4)
   mime-types (~> 1.17)
   msgpack (~> 0.5)
@@ -127,4 +123,4 @@ DEPENDENCIES
   rdoc (~> 3.9)
   rspec (~> 2.13)
   sdl4r (~> 0.9)
-  unicorn-cuba-base (~> 1.1.2)
+  unicorn-cuba-base (~> 1.2.0)

data/README.md

@@ -17,6 +17,14 @@ It is using [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer) as
 
 ## Changelog
 
+### 1.7.0
+* `output_data_uri_image` support
+* `source_failover` support
+* fixed possible data leak with nested template processing
+* reporting `400 Bad Request` for non UTF-8 characters encoded in URLs
+* syslog logging
+* transaction ID tracking
+
 ### 1.6.0
 * `output_store_path` and `output_store_url` `path` argument support
 * encoding resulting file storage URL
@@ -261,6 +269,33 @@ get "small" {
 
 Requesting `/small` URI will result with image fetched from S3 bucket `mybucket` and key `myimage.jpg` and named `original`.
 
+
+#### source_failover
+
+This statement can be used to wrap around other sources.
+HTTP Image Store will try wrapped sources one by one until one will succeed.
+If all sources fail status code for error from the first source will be returned.
+
+This source has no options.
+
+Example:
+
+```sdl
+s3 key="AIAITCKMELYWQZPJP7HQ" secret="V37lCu0F48Tv9s7QVqIT/sLf/wwqhNSB4B0Em7Ei" ssl=false
+path "myimage"	"myimage.jpg"
+
+get "small" {
+	source_failover {
+		source_s3 "original" bucket="mybucket" path="myimage"
+		source_s3 "original" bucket="mybucket-backup" path="myimage"
+	}
+}
+```
+
+Requesting `/small` URI will result with image fetched from S3 bucket `mybucket`.
+If `mybucket` does not contain key `myimage.jpg` than `mybucket-backup` will be tried.
+If `mybucket-backup` does not contain the key than `404` status code will be returned.
+
 ### API endpoint processing operations
 
 #### thumbnail
@@ -440,6 +475,38 @@ put "test" {
 
 The output will contain the posted image with `Content-Type` header set to `application/octet-stream` and `Cache-Control` to `public, max-age=999, s-maxage=666`.
 
+#### output_data_uri_image
+
+This statement will produce `200 OK` response containing base64 encoded image data within data URI in format:
+```
+data:<image mime type>;base64,<base64 encoded image data>
+```
+No tailing new line/line feed is added to the output.
+
+This may be used to include images directly in HTML pages or CSS.
+
+The `Content-Type` of the response will be `text/uri-list`.
+Image mime type will be provided within data URI and must be known before output is constructed or `500 Internal Server Error` will be served.
+
+Arguments:
+
+1. image name - image to be sent in response body
+
+Options:
+
+* `cache-control` - value of response `Cache-Control` header can be specified with this option
+
+Example:
+
+```sdl
+put "test" {
+	identify "input"
+	output_data_uri_image "input" cache-control="public, max-age=31557600, s-maxage=0"
+}
+```
+
+The output will contain base64 encoded posted image within data URI with `Content-Type` header set to `text/uri-list` and `Cache-Control` to `public, max-age=999, s-maxage=666`.
+
 #### output_store_path
 
 This statement will output actual storage path on the file system (without root) or S3 key under witch the image was stored.
@@ -901,6 +968,12 @@ If running as root you can use `--user` option to specify user with whose privil
 
 Additionally `httpimagestore` will log requests in [common NCSA format](http://en.wikipedia.org/wiki/Common_Log_Format) to `httpimagestore_access.log` file. Use `--access-log-file` option to change location of access log.
 
+Syslog logging can be enabled with `--syslog-facility` option followed by name of syslog facility to use. When enabled log files are not created and both application logs and access logs are sent to syslog. 
+Access logs will gain meta information that will include `type="http-access"` that can be used to filter access log entries out from application log entries.
+
+With `--xid-header` option name of HTTP request header can be specified. Value of this header will be logged in meta information tag `xid` along side all request related log entries.
+Named header will be passed down with requests to HTTP Thumbnailer for grater traceability.
+
 ### Running with nginx
 
 [nginx](http://nginx.org) if configured properly will buffer incoming requests before sending them to the backend and server response before sending them to client.

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.0

data/bin/httpimagestore

@@ -14,13 +14,13 @@ Application.new('httpimagestore', port: 3000, processor_count_factor: 2) do
 	end
 
 	settings do |settings|
-		Controler.settings[:config_file] = settings.config
+		Controller.settings[:config_file] = settings.config
 	end
 
 	main do |settings|
 		require 'httpimagestore/error_reporter'
 
-		class HTTPImageStore < Controler
+		class HTTPImageStore < Controller
 			extend Stats
 			def_stats(
 				:workers,
@@ -85,18 +85,18 @@ Application.new('httpimagestore', port: 3000, processor_count_factor: 2) do
 						names.zip(args)
 						.each do |name, value|
 							fail "name should be a symbol" unless name.is_a? Symbol
-							matches[name] = URI.decode(value).force_encoding('UTF-8')
+							matches[name] = URI.utf_decode(value)
 						end
 
 						# decode remaining URI components
 						path = (env["PATH_INFO"][1..-1] || '').split('/').map do |part|
-							URI.decode(part).force_encoding('UTF-8')
+							URI.utf_decode(part)
 						end.join('/')
 
 						# query string already decoded by Rack
 						query_string = req.GET
 
-						state = Configuration::RequestState.new(req.body.read, matches, path, query_string, memory_limit)
+						state = Configuration::RequestState.new(req.body.read, matches, path, query_string, memory_limit, env['xid'] || {})
 
 						handler.sources.each do |source|
 							source.realize(state) unless source.respond_to? :excluded? and source.excluded?(state)
@@ -133,8 +133,8 @@ Application.new('httpimagestore', port: 3000, processor_count_factor: 2) do
 
 		require 'httpimagestore/configuration'
 
-		# connect Scope tree with Controler logger
-		Configuration::Scope.logger = Controler.logger_for(Configuration::Scope)
+		# connect Scope tree with Controller logger
+		Configuration::Scope.logger = Controller.logger_for(Configuration::Scope)
 
 		# load builin supported set
 		require 'httpimagestore/configuration/path'

data/features/data-uri.feature

@@ -0,0 +1,55 @@
+Feature: Data URI style image output
+	HTTP Image Store can provide images base64 encoded in data URI format so they can be included directly in HTML pages.
+
+	Background:
+		Given httpthumbnailer server is running at http://localhost:3100/health_check
+		Given httpimagestore server is running at http://localhost:3000/ with the following configuration
+		"""
+		post "data-uri" "no-identify" {
+			output_data_uri_image "input"
+		}
+
+		post "data-uri" "cache-control" {
+			identify "input"
+			output_data_uri_image "input" cache-control="public, max-age=31557600, s-maxage=0"
+		}
+
+		post "data-uri" {
+			identify "input"
+			output_data_uri_image "input"
+		}
+		"""
+
+	@data-uri
+	Scenario: Getting image encoded in data URI scheme with base64 encoding
+		Given tiny.png file content as request body
+		When I do POST request http://localhost:3000/data-uri
+		Then response status will be 200
+		And response content type will be text/uri-list
+		And response body will be
+		"""
+		data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAgUlEQVQI10XNsQ2CUBhF4XOTfwJeog0U2kLJNlZOxQ4swBLGwkhhY6MNRkic4Fq8ENqTLznqhuvlOY2v5f6egaYs6iq1x30YAENdJskgEBAYUFMlYSMw2CYk2sMOkTFgI6Fp/mEpt7Ua69Sf2TRgLESMt8dW5bwE4vtZvOK8xkj8Ac8BL8dFQipPAAAAAElFTkSuQmCC
+		"""
+
+	@data-uri
+	Scenario: Getting image encoded in data URI scheme with base64 encoding - cache-control should be supported
+		Given tiny.png file content as request body
+		When I do POST request http://localhost:3000/data-uri/cache-control
+		Then response status will be 200
+		And response content type will be text/uri-list
+		And response Cache-Control will be public, max-age=31557600, s-maxage=0
+		And response body will be
+		"""
+		data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAgUlEQVQI10XNsQ2CUBhF4XOTfwJeog0U2kLJNlZOxQ4swBLGwkhhY6MNRkic4Fq8ENqTLznqhuvlOY2v5f6egaYs6iq1x30YAENdJskgEBAYUFMlYSMw2CYk2sMOkTFgI6Fp/mEpt7Ua69Sf2TRgLESMt8dW5bwE4vtZvOK8xkj8Ac8BL8dFQipPAAAAAElFTkSuQmCC
+		"""
+
+	@data-uri
+	Scenario: Error 500 served when data URI output is used on unidentified image
+		Given tiny.png file content as request body
+		When I do POST request http://localhost:3000/data-uri/no-identify
+		Then response status will be 500
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		image 'input' needs to be identified first to be used in data URI output
+		"""

data/features/error-reporting.feature

@@ -1,6 +1,5 @@
-Feature: Image list based thumbnailing and S3 storage
-	Storage based on URL specified image names to be generated and stored using two different path formats.
-	This configuration should be mostly compatible with pre v1.0 release.
+Feature: Error handling
+	API should provide different status codes with text/plain description body for different error modes.
 
 	Background:
 		Given S3 settings in AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_S3_TEST_BUCKET environment variables
@@ -9,9 +8,11 @@ Feature: Image list based thumbnailing and S3 storage
 		"""
 		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
 
+		path "uri_part"     "/thumbnails/#{input_digest}/#{name}.#{image_mime_extension}"
 		path "structured-name"  "#{dirname}/#{input_digest}/#{basename}-#{image_name}.#{image_mime_extension}"
 		path "missing"          "blah"
 		path "zero"             "zero"
+		path "hash"     "#{input_digest}"
 
 		put "multipart" ":name_list" {
 			thumbnail "input" {
@@ -33,6 +34,12 @@ Feature: Image list based thumbnailing and S3 storage
 			thumbnail "input"    "bad_opts"      operation="crop"        width=128       height=128      options="foo=bar"       if-image-name-on="#{name_list}"
 		}
 
+		post "filename" "/(?<name>.+?)(\\.[^\\.]+)?$/" {
+			identify "input"
+			store_s3 "input" bucket="@AWS_S3_TEST_BUCKET@" path="hash" cache-root="/tmp"
+			output_store_path "input" path="uri_part"
+		}
+
 		get "s3" {
 			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="missing"
 		}
@@ -199,6 +206,17 @@ Feature: Image list based thumbnailing and S3 storage
 		thumbnailing of 'input' into 'superlarge' failed: image too large: cache resources exhausted
 		"""
 
+	@error-reporting
+	Scenario: Bad URI encoding
+		Given test.jpg file content as request body
+		When I do POST request http://localhost:3000/filename/hello%e9world.jpg
+		Then response status will be 400
+		And response content type will be text/plain
+		And response body will be CRLF ended lines like
+		"""
+		invalid UTF-8 encoding in URI: "hello\\xE9world"
+		"""
+
 	@error-reporting
 	Scenario: Zero body length
 		Given test.empty file content as request body

data/features/source-failover.feature

@@ -0,0 +1,71 @@
+Feature: More than one source can be tried in canse of source problem
+	Sources can be grouped under source_failover group.
+	HTTP Image Store will try each source until working one is found.
+
+	Background:
+		Given S3 settings in AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_S3_TEST_BUCKET environment variables
+		Given httpimagestore server is running at http://localhost:3000/ with the following configuration
+		"""
+		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
+
+		path "test-file"  "test.file"
+		path "bogus"  "bogus"
+
+		put "input" {
+			store_s3 "input" bucket="@AWS_S3_TEST_BUCKET@" path="test-file"
+		}
+
+		get "s3_fail" {
+			source_s3 "image" bucket="@AWS_S3_TEST_BUCKET@" path="bogus"
+			source_s3 "image" bucket="@AWS_S3_TEST_BUCKET@" path="test-file"
+			output_image "image"
+		}
+
+		get "s3_failover" {
+			source_failover {
+				source_s3 "image" bucket="@AWS_S3_TEST_BUCKET@" path="bogus"
+				source_s3 "image" bucket="@AWS_S3_TEST_BUCKET@" path="test-file"
+			}
+			output_image "image"
+		}
+
+		get "s3_all_fail" {
+			source_failover {
+				source_s3 "image" bucket="@AWS_S3_TEST_BUCKET@" path="bogus"
+				source_s3 "image" bucket="@AWS_S3_TEST_BUCKET@" path="bogus"
+			}
+			output_image "image"
+		}
+		"""
+
+	@source-failover
+	Scenario: Sourcing S3 object without failover
+		Given there is no test.file file in S3 bucket
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3000/input
+		Then response status will be 200
+		When I do GET request http://localhost:3000/s3_fail
+		Then response status will be 404
+
+	@source-failover
+	Scenario: Sourcing S3 object with failover
+		Given there is no test.file file in S3 bucket
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3000/input
+		Then response status will be 200
+		When I do GET request http://localhost:3000/s3_failover
+		Then response status will be 200
+
+	@source-failover
+	Scenario: Sourcing S3 object with all sources failing
+		Given there is no test.file file in S3 bucket
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3000/input
+		Then response status will be 200
+		When I do GET request http://localhost:3000/s3_all_fail
+		Then response status will be 404
+		And response content type will be text/plain
+		And response body will be CRLF ended lines
+		"""
+		all sources failed: S3Source[image_name: 'image' bucket: 'httpimagestoretest' prefix: '' path_spec: 'bogus'](Configuration::S3NoSuchKeyError: S3 bucket 'httpimagestoretest' does not contain key 'bogus'), S3Source[image_name: 'image' bucket: 'httpimagestoretest' prefix: '' path_spec: 'bogus'](Configuration::S3NoSuchKeyError: S3 bucket 'httpimagestoretest' does not contain key 'bogus')
+		"""

data/features/step_definitions/httpimagestore_steps.rb

@@ -4,7 +4,7 @@ end
 
 Given /httpimagestore server is running at (.*) with the following configuration/ do |url, config|
 	$temp_dir = Pathname.new(Dir.mktmpdir) unless $temp_dir
-	
+
 	cfile = $temp_dir + Digest.hexencode(Digest::MD5.digest(config))
 	cfile.open('w') do |io|
 		io.write(config.replace_s3_variables)
@@ -13,7 +13,7 @@ Given /httpimagestore server is running at (.*) with the following configuration
 	begin
 		log = support_dir + 'server.log'
 		start_server(
-			"bundle exec #{script('httpimagestore')} -f -d -l #{log} -w 1 #{(@httpimagestore_args ||= []).join(' ')} #{cfile.to_s}",
+			"bundle exec #{script('httpimagestore')} -f -d -x XID -l #{log} -w 1 #{(@httpimagestore_args ||= []).join(' ')} #{cfile.to_s}",
 			'/tmp/httpimagestore.pid',
 			log,
 			url
@@ -26,7 +26,7 @@ end
 Given /httpthumbnailer server is running at (.*)/ do |url|
 	log = support_dir + 'thumbniler.log'
 	start_server(
-		"httpthumbnailer -f -d -l #{log} -w 1",
+		"httpthumbnailer -f -d -x XID -l #{log} -a #{log}.access -w 1",
 		'/tmp/httpthumbnailer.pid',
 		log,
 		url
@@ -34,7 +34,7 @@ Given /httpthumbnailer server is running at (.*)/ do |url|
 end
 
 Given /httpthumbnailer server is not running/ do
-	stop_server('/tmp/httpthumbnailer.pid') 
+	stop_server('/tmp/httpthumbnailer.pid')
 end
 
 Given /httpimagestore log is empty/ do
@@ -56,7 +56,7 @@ Given /there is no file (.*)/ do |file|
 end
 
 Given /S3 settings in AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_S3_TEST_BUCKET environment variables/ do
-	
+
 	unless ENV['AWS_ACCESS_KEY_ID'] and ENV['AWS_SECRET_ACCESS_KEY'] and ENV['AWS_S3_TEST_BUCKET']
 		fail "AWS_ACCESS_KEY_ID or AWS_SECRET_ACCESS_KEY or AWS_S3_TEST_BUCKET environment variables not set"
 	end
@@ -83,7 +83,7 @@ end
 
 When /I do (.*) request (.*)/ do |method, uri|
 	@request_body = nil if method == 'GET'
-	@response = HTTPClient.new.request(method, URI.encode(uri.replace_s3_variables), nil, @request_body, (@request_headers or {}))
+	@response = HTTPClient.new.request(method, uri.replace_s3_variables, nil, @request_body, (@request_headers or {}))
 end
 
 Then /response status will be (.*)/ do |status|
@@ -94,14 +94,22 @@ Then /response content type will be (.*)/ do |content_type|
 	@response.header['Content-Type'].first.should == content_type
 end
 
-Then /response body will be CRLF ended lines like/ do |body|	
+Then /response Cache-Control will be (.*)/ do |content_type|
+	@response.header['Cache-Control'].first.should == content_type
+end
+
+Then /response body will be CRLF ended lines like/ do |body|
 	@response.body.should match(body.replace_s3_variables)
 	@response.body.each_line do |line|
 		line[-2,2].should == "\r\n"
 	end
 end
 
-Then /response body will be CRLF ended lines$/ do |body|	
+Then /response body will be$/ do |body|
+	@response.body.should == body.replace_s3_variables
+end
+
+Then /response body will be CRLF ended lines$/ do |body|
 	@response.body.should == body.replace_s3_variables.gsub("\n", "\r\n") + "\r\n"
 end
 
@@ -119,7 +127,7 @@ end
 
 Then /(http.*) will contain (.*) image of size (.*)x(.*)/ do |url, format, width, height|
 	data = get(url.replace_s3_variables)
-	
+
 	@image.destroy! if @image
 	@image = Magick::Image.from_blob(data).first
 
@@ -130,7 +138,7 @@ end
 
 Then /S3 object (.*) will contain (.*) image of size (.*)x(.*)/ do |key, format, width, height|
 	data = @bucket.objects[key].read
-	
+
 	@image.destroy! if @image
 	@image = Magick::Image.from_blob(data).first
 
@@ -146,7 +154,7 @@ end
 Then /response body will contain (.*) image of size (.*)x(.*)/ do |format, width, height|
 	data = @response.body
 	Pathname.new('/tmp/out.jpg').open('w'){|io| io.write data}
-	
+
 	@image.destroy! if @image
 	@image = Magick::Image.from_blob(data).first
 
@@ -165,7 +173,7 @@ end
 
 Then /file (.*) will contain (.*) image of size (.*)x(.*)/ do |file, format, width, height|
 	data = Pathname.new(file).read
-	
+
 	@image.destroy! if @image
 	@image = Magick::Image.from_blob(data).first
 
@@ -174,3 +182,10 @@ Then /file (.*) will contain (.*) image of size (.*)x(.*)/ do |file, format, wid
 	@image.rows.should == height.to_i
 end
 
+Then /httpimagestore log will contain (.*)/ do |entry|
+	(support_dir + 'server.log').read.should include entry
+end
+
+Then /httpthumbnailer log will contain (.*)/ do |entry|
+	(support_dir + 'thumbniler.log').read.should include entry
+end

data/features/storage.feature

@@ -110,31 +110,32 @@ Feature: Storing images under different names
 			"""
 			Then file /tmp/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e will contain PNG image of size 50x50
 
-		@storage @image_digest
-		Scenario: Posting picture to file system under input data digest
-		Given there is no file /tmp/b0fe25319ba5909a
-			Given test.png file content as request body
-			When I do POST request http://localhost:3000/images/image_digest
-			Then response status will be 200
-			And response content type will be text/plain
-			And response body will be CRLF ended lines
-			"""
-			091000e2c0aee836
-			"""
-			Then file /tmp/091000e2c0aee836 will contain PNG image of size 50x50
-
-		@storage @image_sha256
-		Scenario: Posting picture to file system under input data digest
-			Given there is no file /tmp/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e
-			Given test.png file content as request body
-			When I do POST request http://localhost:3000/images/image_sha256
-			Then response status will be 200
-			And response content type will be text/plain
-			And response body will be CRLF ended lines
-			"""
-			091000e2c0aee836fff432c1151faba86d46690c900c0f6355247a353defa37f
-			"""
-			Then file /tmp/091000e2c0aee836fff432c1151faba86d46690c900c0f6355247a353defa37f will contain PNG image of size 50x50
+		# Following tests depend on libpng/ImageMagick version
+		#@storage @image_digest
+		#Scenario: Posting picture to file system under input data digest
+		#Given there is no file /tmp/b0fe25319ba5909a
+			#Given test.png file content as request body
+			#When I do POST request http://localhost:3000/images/image_digest
+			#Then response status will be 200
+			#And response content type will be text/plain
+			#And response body will be CRLF ended lines
+			#"""
+			#091000e2c0aee836
+			#"""
+			#Then file /tmp/091000e2c0aee836 will contain PNG image of size 50x50
+
+		#@storage @image_sha256
+		#Scenario: Posting picture to file system under input data digest
+			#Given there is no file /tmp/b0fe25319ba5909aa97fded546847a96d7fdf26e18715b0cfccfcbee52dce57e
+			#Given test.png file content as request body
+			#When I do POST request http://localhost:3000/images/image_sha256
+			#Then response status will be 200
+			#And response content type will be text/plain
+			#And response body will be CRLF ended lines
+			#"""
+			#091000e2c0aee836fff432c1151faba86d46690c900c0f6355247a353defa37f
+			#"""
+			#Then file /tmp/091000e2c0aee836fff432c1151faba86d46690c900c0f6355247a353defa37f will contain PNG image of size 50x50
 
 		@storage @uuid
 		Scenario: Posting picture to file system under input data digest

data/features/xid-forwarding.feature

@@ -0,0 +1,49 @@
+Feature: Forwarding of transaction ID header to thumbnailer
+	HTTP Image Store should forward transaction ID header found in the request to HTTP Thumbnailer
+
+	Background:
+		Given httpthumbnailer server is running at http://localhost:3100/health_check
+		Given httpimagestore server is running at http://localhost:3000/ with the following configuration
+		"""
+		post "identify" {
+			identify "input"
+		}
+
+		post "single" {
+			thumbnail "input" "thumbnail" operation="pad" width="8" height="8"
+		}
+
+		post "multi" {
+			thumbnail "input" {
+				"small"             operation="crop"        width=128       height=128      format="jpeg"
+				"tiny_png"          operation="crop"        width=32        height=32       format="png"
+			}
+		}
+		"""
+
+	@xid-forwarding
+	Scenario: Should forward XID with identify requests
+		Given tiny.png file content as request body
+		And XID header set to 123
+		When I do POST request http://localhost:3000/identify
+		Then response status will be 200
+		And httpimagestore log will contain xid="123"
+		And httpthumbnailer log will contain xid="123"
+
+	@xid-forwarding
+	Scenario: Should forward XID with single thumbnail requests
+		Given tiny.png file content as request body
+		And XID header set to 123
+		When I do POST request http://localhost:3000/single
+		Then response status will be 200
+		And httpimagestore log will contain xid="123"
+		And httpthumbnailer log will contain xid="123"
+
+	@xid-forwarding
+	Scenario: Should forward XID with multi thumbnail requests
+		Given tiny.png file content as request body
+		And XID header set to 123
+		When I do POST request http://localhost:3000/multi
+		Then response status will be 200
+		And httpimagestore log will contain xid="123"
+		And httpthumbnailer log will contain xid="123"