lib/dragonfly/server.rb in dragonfly-1.0.6 vs lib/dragonfly/server.rb in dragonfly-1.0.7

- old
+ new

@@ -18,13 +18,14 @@ @app = app @dragonfly_url = '/dragonfly' self.url_format = '/:job/:name' @fetch_file_whitelist = Whitelist.new @fetch_url_whitelist = Whitelist.new + @verify_urls = true end - attr_accessor :protect_from_dos_attacks, :url_host, :url_path_prefix, :dragonfly_url + attr_accessor :verify_urls, :url_host, :url_path_prefix, :dragonfly_url attr_reader :url_format, :fetch_file_whitelist, :fetch_url_whitelist def add_to_fetch_file_whitelist(patterns) fetch_file_whitelist.push *patterns @@ -51,11 +52,11 @@ if dragonfly_url == env["PATH_INFO"] dragonfly_response elsif (params = url_mapper.params_for(env["PATH_INFO"], env["QUERY_STRING"])) && params['job'] job = Job.deserialize(params['job'], app) validate_job!(job) - job.validate_sha!(params['sha']) if protect_from_dos_attacks + job.validate_sha!(params['sha']) if verify_urls response = Response.new(job, env) catch(:halt) do if before_serve_callback && response.will_be_served? before_serve_callback.call(job, env) end @@ -81,10 +82,10 @@ host = opts.delete(:host) || url_host path_prefix = opts.delete(:path_prefix) || url_path_prefix params = job.url_attributes.extract(url_mapper.params_in_url) params.merge!(stringify_keys(opts)) params['job'] = job.serialize - params['sha'] = job.sha if protect_from_dos_attacks + params['sha'] = job.sha if verify_urls url = url_mapper.url_for(params) "#{host}#{path_prefix}#{url}" end private