From 56263b6512f60cf055a925f5446f1f504bb65a4d Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 9 Jun 2016 12:11:03 +0200 Subject: add Hkp::Source with same interface as CouchDB::Source --- lib/nickserver/hkp/source.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 lib/nickserver/hkp/source.rb (limited to 'lib/nickserver/hkp/source.rb') diff --git a/lib/nickserver/hkp/source.rb b/lib/nickserver/hkp/source.rb new file mode 100644 index 0000000..79333f0 --- /dev/null +++ b/lib/nickserver/hkp/source.rb @@ -0,0 +1,20 @@ +require 'nickserver/hkp/response' +module Nickserver::Hkp + class Source + + def initialize(adapter) + end + + def query(nick) + fetcher.get(nick).callback {|key| + yield Response.new(nick, key) + }.errback {|status, msg| + yield Nickserver::Response.new(status, msg) + } + end + + def fetcher + Nickserver::Hkp::FetchKey.new + end + end +end -- cgit v1.2.3 From b4075771b2b1f3c688496d18d7a5a5f1db952004 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 9 Jun 2016 13:51:02 +0200 Subject: refactor: remove EM specific stuff from Hkp::FetchKey interface --- lib/nickserver/hkp/source.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/nickserver/hkp/source.rb') diff --git a/lib/nickserver/hkp/source.rb b/lib/nickserver/hkp/source.rb index 79333f0..f06a931 100644 --- a/lib/nickserver/hkp/source.rb +++ b/lib/nickserver/hkp/source.rb @@ -1,20 +1,20 @@ -require 'nickserver/hkp/response' module Nickserver::Hkp class Source def initialize(adapter) + @adapter = adapter end - def query(nick) - fetcher.get(nick).callback {|key| - yield Response.new(nick, key) - }.errback {|status, msg| - yield Nickserver::Response.new(status, msg) - } + def query(nick, &block) + fetcher.get(nick, &block) end + protected + + attr_reader :adapter + def fetcher - Nickserver::Hkp::FetchKey.new + Nickserver::Hkp::FetchKey.new(adapter) end end end -- cgit v1.2.3 From 10a57e4f92432ff2b82c4a6bb5027bb3bcbdfab9 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 10 Jun 2016 10:28:09 +0200 Subject: turn Hkp::FetchKey into Hkp::Source The source was really just an empty shell now that we pushed the em specific stuff further down. --- lib/nickserver/hkp/source.rb | 51 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 7 deletions(-) (limited to 'lib/nickserver/hkp/source.rb') diff --git a/lib/nickserver/hkp/source.rb b/lib/nickserver/hkp/source.rb index f06a931..1dd386d 100644 --- a/lib/nickserver/hkp/source.rb +++ b/lib/nickserver/hkp/source.rb @@ -1,4 +1,12 @@ -module Nickserver::Hkp +require 'nickserver/response' +require 'nickserver/hkp/response' + +# +# Fetch keys via HKP +# http://tools.ietf.org/html/draft-shaw-openpgp-hkp-00 +# + +module Nickserver; module Hkp class Source def initialize(adapter) @@ -6,15 +14,44 @@ module Nickserver::Hkp end def query(nick, &block) - fetcher.get(nick, &block) + FetchKeyInfo.new.search(nick).callback {|key_info_list| + best = pick_best_key(key_info_list) + get_key_by_fingerprint(nick, best.keyid, &block) + }.errback {|status, msg| + yield Nickserver::Response.new(status, msg) + } end - protected + # + # fetches ascii armored OpenPGP public key from the keyserver + # + def get_key_by_fingerprint(nick, key_id) + params = {op: 'get', search: "0x" + key_id, exact: 'on', options: 'mr'} + http = EventMachine::HttpRequest.new(Config.hkp_url).get(query: params) + http.callback { + status = http.response_header.status + if status != 200 + yield Nickserver::Response.new status, "HKP Request failed" + else + yield Response.new nick, http.response + end + } + http.errback { + yield Nickserver::Response.new 500, http.error + } + end - attr_reader :adapter + protected - def fetcher - Nickserver::Hkp::FetchKey.new(adapter) + # + # for now, just pick the newest key. + # + # in the future, we should perhaps pick the newest key + # that is signed by the oldest key. + # + def pick_best_key(key_info_list) + key_info_list.sort {|a,b| a.creationdate <=> b.creationdate}.last end end -end + +end; end -- cgit v1.2.3 From 92c86fc4e1e6dcb86793992e69dfd0608c118c9a Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 11 Jun 2016 10:20:06 +0200 Subject: use the adapter not EM in hkp source --- lib/nickserver/hkp/source.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'lib/nickserver/hkp/source.rb') diff --git a/lib/nickserver/hkp/source.rb b/lib/nickserver/hkp/source.rb index 1dd386d..48a63d8 100644 --- a/lib/nickserver/hkp/source.rb +++ b/lib/nickserver/hkp/source.rb @@ -22,23 +22,22 @@ module Nickserver; module Hkp } end + protected + + attr_reader :adapter + # # fetches ascii armored OpenPGP public key from the keyserver # def get_key_by_fingerprint(nick, key_id) params = {op: 'get', search: "0x" + key_id, exact: 'on', options: 'mr'} - http = EventMachine::HttpRequest.new(Config.hkp_url).get(query: params) - http.callback { - status = http.response_header.status - if status != 200 - yield Nickserver::Response.new status, "HKP Request failed" + adapter.get Config.hkp_url, query: params do |status, response| + if status == 200 + yield Response.new nick, response else - yield Response.new nick, http.response + yield Nickserver::Response.new status, "HKP Request failed" end - } - http.errback { - yield Nickserver::Response.new 500, http.error - } + end end protected -- cgit v1.2.3 From f567ed80427d43019ceb1aaf77d4bc6c01e62729 Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 11 Jun 2016 15:19:50 +0200 Subject: use adapter for FetchKeyInfo --- lib/nickserver/hkp/source.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib/nickserver/hkp/source.rb') diff --git a/lib/nickserver/hkp/source.rb b/lib/nickserver/hkp/source.rb index 48a63d8..1af8ac9 100644 --- a/lib/nickserver/hkp/source.rb +++ b/lib/nickserver/hkp/source.rb @@ -14,12 +14,14 @@ module Nickserver; module Hkp end def query(nick, &block) - FetchKeyInfo.new.search(nick).callback {|key_info_list| - best = pick_best_key(key_info_list) - get_key_by_fingerprint(nick, best.keyid, &block) - }.errback {|status, msg| - yield Nickserver::Response.new(status, msg) - } + FetchKeyInfo.new(adapter).search(nick) do |status, response| + if status == 200 + best = pick_best_key(response) + get_key_by_fingerprint(nick, best.keyid, &block) + else + yield Nickserver::Response.new(status, response) + end + end end protected -- cgit v1.2.3 From 48502085e5aa7a1d8d430fc1dd4913f34e818afa Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 14 Jun 2016 09:36:29 +0200 Subject: introduce Hkp::Client wraps the hkp protocol --- lib/nickserver/hkp/source.rb | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'lib/nickserver/hkp/source.rb') diff --git a/lib/nickserver/hkp/source.rb b/lib/nickserver/hkp/source.rb index 1af8ac9..cbff91a 100644 --- a/lib/nickserver/hkp/source.rb +++ b/lib/nickserver/hkp/source.rb @@ -1,5 +1,6 @@ require 'nickserver/response' require 'nickserver/hkp/response' +require 'nickserver/hkp/client' # # Fetch keys via HKP @@ -29,11 +30,17 @@ module Nickserver; module Hkp attr_reader :adapter # - # fetches ascii armored OpenPGP public key from the keyserver + # for now, just pick the newest key. # - def get_key_by_fingerprint(nick, key_id) - params = {op: 'get', search: "0x" + key_id, exact: 'on', options: 'mr'} - adapter.get Config.hkp_url, query: params do |status, response| + # in the future, we should perhaps pick the newest key + # that is signed by the oldest key. + # + def pick_best_key(key_info_list) + key_info_list.sort {|a,b| a.creationdate <=> b.creationdate}.last + end + + def get_key_by_fingerprint(nick, fingerprint) + client.get_key_by_fingerprint fingerprint do |status, response| if status == 200 yield Response.new nick, response else @@ -42,17 +49,8 @@ module Nickserver; module Hkp end end - protected - - # - # for now, just pick the newest key. - # - # in the future, we should perhaps pick the newest key - # that is signed by the oldest key. - # - def pick_best_key(key_info_list) - key_info_list.sort {|a,b| a.creationdate <=> b.creationdate}.last + def client + @client ||= Client.new(adapter) end end - end; end -- cgit v1.2.3 From 93258bd6fe6247e7af67f423243eba9808e920ee Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 15 Jun 2016 10:36:25 +0200 Subject: we don't need FetchKeyInfo anymore including in Source --- lib/nickserver/hkp/source.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'lib/nickserver/hkp/source.rb') diff --git a/lib/nickserver/hkp/source.rb b/lib/nickserver/hkp/source.rb index cbff91a..cae3e01 100644 --- a/lib/nickserver/hkp/source.rb +++ b/lib/nickserver/hkp/source.rb @@ -1,6 +1,9 @@ require 'nickserver/response' require 'nickserver/hkp/response' require 'nickserver/hkp/client' +require "nickserver/hkp/parse_key_info" +require "nickserver/hkp/key_info" + # # Fetch keys via HKP @@ -15,7 +18,7 @@ module Nickserver; module Hkp end def query(nick, &block) - FetchKeyInfo.new(adapter).search(nick) do |status, response| + search(nick) do |status, response| if status == 200 best = pick_best_key(response) get_key_by_fingerprint(nick, best.keyid, &block) @@ -25,6 +28,13 @@ module Nickserver; module Hkp end end + def search(nick, &block) + client.get_key_infos_by_email(nick) do |status, response| + parser = ParseKeyInfo.new status, response + yield parser.status_for(nick), parser.response_for(nick) + end + end + protected attr_reader :adapter -- cgit v1.2.3