summaryrefslogtreecommitdiff
path: root/lib/nickserver/wkd
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2018-02-05 03:04:01 -0800
committerazul <azul@riseup.net>2018-02-05 03:04:01 -0800
commit492226b0b56e6031132e205286333e8ef2ab6296 (patch)
treebb2280cd6063547b3240c9f62d17ecdd264ddb59 /lib/nickserver/wkd
parent51d41e15dca8aac3c96ab68b1cec22415a8ceae9 (diff)
parent5ab2095a169a867b1158a77181dd447b2bbf2118 (diff)
Merge branch 'feature/web-key-directory' into 'master'HEADmaster
feature: enamble wkd lookup Closes #1 See merge request leap/nickserver!23
Diffstat (limited to 'lib/nickserver/wkd')
-rw-r--r--lib/nickserver/wkd/source.rb3
-rw-r--r--lib/nickserver/wkd/url.rb5
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/nickserver/wkd/source.rb b/lib/nickserver/wkd/source.rb
index bf30c94..da7abb8 100644
--- a/lib/nickserver/wkd/source.rb
+++ b/lib/nickserver/wkd/source.rb
@@ -8,7 +8,8 @@ module Nickserver::Wkd
class Source < Nickserver::Source
def query(email)
url = Url.new(email)
- status, blob = adapter.get url
+ status, blob = adapter.get url,
+ rescue: 'failed to connect: getaddrinfo'
if status == 200
Nickserver::KeyResponse.new(email.to_s, armor_key(blob))
end
diff --git a/lib/nickserver/wkd/url.rb b/lib/nickserver/wkd/url.rb
index 0ccff38..759222d 100644
--- a/lib/nickserver/wkd/url.rb
+++ b/lib/nickserver/wkd/url.rb
@@ -13,6 +13,11 @@ module Nickserver::Wkd
"https://#{domain}/.well-known/openpgpkey/hu/#{encoded_digest}"
end
+ # needed to compare when used as an arg calling a test mock
+ def ==(other)
+ self.to_s == other.to_s
+ end
+
protected
attr_reader :domain, :local_part