diff options
author | azul <azul@riseup.net> | 2016-12-02 11:25:35 +0000 |
---|---|---|
committer | azul <azul@riseup.net> | 2016-12-02 11:25:35 +0000 |
commit | 8bfd27e0c851e9786110be4e6485635f769d853f (patch) | |
tree | aed9cc67f5711352e86d8314a4718c777a23cc43 /lib/nickserver/adapters/celluloid_http.rb | |
parent | 244d8a4702f98619078c0e09e485d7e1944e5013 (diff) | |
parent | 0aa101524270c0c398fe17c287d51927f810e499 (diff) |
Merge branch 'bugfix/couch-auth' into 'master'
bugfix: use user:password@ prefix in http basic auth
See merge request !9
Diffstat (limited to 'lib/nickserver/adapters/celluloid_http.rb')
-rw-r--r-- | lib/nickserver/adapters/celluloid_http.rb | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/lib/nickserver/adapters/celluloid_http.rb b/lib/nickserver/adapters/celluloid_http.rb index 92c5c53..62f905f 100644 --- a/lib/nickserver/adapters/celluloid_http.rb +++ b/lib/nickserver/adapters/celluloid_http.rb @@ -1,28 +1,19 @@ -require 'nickserver/adapters' -require 'nickserver/config' +require 'nickserver/adapters/http' silence_warnings do require 'celluloid/io' end -require 'http' module Nickserver::Adapters - class CelluloidHttp + class CelluloidHttp < Http silence_warnings do include Celluloid::IO end - def get(url, options = {}) - response = HTTP.get url, - params: options[:query], - ssl_context: ctx, - ssl_socket_class: Celluloid::IO::SSLSocket - return response.code, response.to_s - end + protected - def ctx - OpenSSL::SSL::SSLContext.new.tap do |ctx| - ctx.ca_file = Nickserver::Config.hkp_ca_file - end + def default_options + super.merge ssl_socket_class: Celluloid::IO::SSLSocket end + end end |