diff options
Diffstat (limited to 'lib/nickserver/hkp')
| -rw-r--r-- | lib/nickserver/hkp/client.rb | 4 | ||||
| -rw-r--r-- | lib/nickserver/hkp/source.rb | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/lib/nickserver/hkp/client.rb b/lib/nickserver/hkp/client.rb index 1fbe7a2..d53daad 100644 --- a/lib/nickserver/hkp/client.rb +++ b/lib/nickserver/hkp/client.rb @@ -27,8 +27,8 @@ module Nickserver; module Hkp # # fetches ascii armored OpenPGP public key from the keyserver # - def get_key_by_fingerprint(fingerprint, &block) - get op: 'get', search: "0x" + fingerprint, &block + def get_key_by_fingerprint(fingerprint) + get op: 'get', search: "0x" + fingerprint end protected diff --git a/lib/nickserver/hkp/source.rb b/lib/nickserver/hkp/source.rb index 0d79856..e104aa8 100644 --- a/lib/nickserver/hkp/source.rb +++ b/lib/nickserver/hkp/source.rb @@ -18,7 +18,7 @@ module Nickserver; module Hkp status, response = search(nick) if status == 200 best = pick_best_key(response) - get_key_by_fingerprint(nick, best.keyid) + get_key_by_fingerprint(best.keyid, nick) else Nickserver::Response.new(status, response) end @@ -30,6 +30,15 @@ module Nickserver; module Hkp return parser.status_for(nick), parser.response_for(nick) end + def get_key_by_fingerprint(fingerprint, nick = nil) + status, response = client.get_key_by_fingerprint fingerprint + if status == 200 + Response.new nick, response + else + Nickserver::Response.new status, "HKP Request failed" + end + end + protected # @@ -42,15 +51,6 @@ module Nickserver; module Hkp key_info_list.sort {|a,b| a.creationdate <=> b.creationdate}.last end - def get_key_by_fingerprint(nick, fingerprint) - status, response = client.get_key_by_fingerprint fingerprint - if status == 200 - Response.new nick, response - else - Nickserver::Response.new status, "HKP Request failed" - end - end - def client @client ||= Client.new(adapter) end |