Skip to content

Commit

Permalink
Merge pull request itamae-kitchen#190 from hico-horiuchi/support-redi…
Browse files Browse the repository at this point in the history
…rect-on-http_request

Support redirect on http_request resource (close itamae-kitchen#187)
  • Loading branch information
ryotarai committed Jan 3, 2016
2 parents c672e64 + d930654 commit c4ec051
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 10 deletions.
38 changes: 28 additions & 10 deletions lib/itamae/resource/http_request.rb
Original file line number Diff line number Diff line change
@@ -1,27 +1,45 @@
require 'itamae'
require 'uri'
require 'net/http'
require 'net/https'

module Itamae
module Resource
class HttpRequest < File
UrlNotFoundError = Class.new(StandardError)
RedirectLimitExceeded = Class.new(StandardError)

define_attribute :action, default: :get
define_attribute :headers, type: Hash, default: {}
define_attribute :message, type: String, default: ""
define_attribute :redirect_limit, type: Integer, default: 10
define_attribute :url, type: String, required: true

def pre_action
uri = URI.parse(attributes.url)
http = Net::HTTP.new(uri.host, uri.port)
http.use_ssl = true if uri.scheme == "https"

case attributes.action
when :delete, :get, :options
response = http.method(attributes.action).call(uri.request_uri, attributes.headers)
when :post, :put
response = http.method(attributes.action).call(uri.request_uri, attributes.message, attributes.headers)
response = nil
redirects_followed = 0

loop do
http = Net::HTTP.new(uri.host, uri.port)
http.use_ssl = true if uri.scheme == "https"

case attributes.action
when :delete, :get, :options
response = http.method(attributes.action).call(uri.request_uri, attributes.headers)
when :post, :put
response = http.method(attributes.action).call(uri.request_uri, attributes.message, attributes.headers)
end

if response.kind_of?(Net::HTTPRedirection)
if redirects_followed < attributes.redirect_limit
uri = URI.parse(response["location"])
redirects_followed += 1
Itamae.logger.debug "Following redirect #{redirects_followed}/#{attributes.redirect_limit}"
else
raise RedirectLimitExceeded
end
else
break
end
end

attributes.content = response.body
Expand Down
5 changes: 5 additions & 0 deletions spec/integration/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@
its(:content) { should match(/"User-Agent": "Itamae"/) }
end

describe file('/tmp/http_request_redirect.html') do
it { should be_file }
its(:content) { should match(/"from": "itamae"/) }
end

describe file('/tmp/notifies') do
it { should be_file }
its(:content) { should eq("2431") }
Expand Down
5 changes: 5 additions & 0 deletions spec/integration/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@
url "https://httpbin.org/get"
end

http_request "/tmp/http_request_redirect.html" do
redirect_limit 1
url "https://httpbin.org/redirect-to?url=https%3A%2F%2Fhttpbin.org%2Fget%3Ffrom%3Ditamae"
end

######

service "cron" do
Expand Down

0 comments on commit c4ec051

Please sign in to comment.