Skip to content

Commit 68658bb

Browse files
author
Andrew Turner
committed
Fixed to use SSL for all the badger requests
1 parent 90e35dd commit 68658bb

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

badger_ui/f1/badger.rb

+10-6
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,12 @@ def attribute_params(resource, stem, cookie=nil)
9898
f.close()
9999

100100
url = URI.parse(resource)
101+
res = Net::HTTP.new(url.host, url.port)
102+
res.use_ssl = (url.scheme == 'https')
101103
req = Net::HTTP::Get.new(url.path)
102-
req.use_ssl = (url.scheme == 'https')
103104

104105
req["Cookie"] = cookie
105-
response = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
106+
response = res.start {|http| http.request(req) }
106107

107108
current_metadata = REXML::Document.new(response.body)
108109

@@ -151,20 +152,23 @@ def upload_shapefile(stem)
151152

152153
def upload( query,cookie = nil )
153154
url = URI.parse(@finder_path)
155+
res = Net::HTTP.new(url.host, url.port)
156+
res.use_ssl = (url.scheme == 'https')
154157
req = Net::HTTP::Post.new("/overlays.xml")
155-
req.use_ssl = (url.scheme == 'https')
156158
req["Cookie"] = cookie
157159
req.set_multipart_form_data(query)
158-
res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
160+
res = res.start {|http| http.request(req) }
159161
end
160162

161163
def upload_metadata(resource, params, cookie=nil)
162164
url = URI.parse(resource)
165+
res = Net::HTTP.new(url.host, url.port)
166+
res.use_ssl = (url.scheme == 'https')
167+
163168
req = Net::HTTP::Put.new(url.path)
164-
req.use_ssl = (url.scheme == 'https')
165169
req["Cookie"] = cookie
166170
req.set_form_data(params)
167-
response = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
171+
response = res.start {|http| http.request(req) }
168172
if response.is_a?(Net::HTTPSuccess) || response.is_a?(Net::HTTPRedirection)
169173
return response
170174
else

0 commit comments

Comments
 (0)