Merge pull request #6 from pixelated/by_fingerprint

By fingerprint

3 files changed, 35 insertions, 21 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
diff --git a/lib/nickserver/request_handler.rb b/lib/nickserver/request_handler.rb
index 608db83..856ec5d 100644
--- a/lib/nickserver/request_handler.rb
+++ b/lib/nickserver/request_handler.rb
@@ -10,14 +10,14 @@ module Nickserver
     end
 
     def respond_to(params, headers)
-      email = get_email_from_params(params)
-      if email.nil?
-        send_not_found
-      elsif email.invalid?
-        send_error("Not a valid address")
+      if params && params["address"] && params["address"].any?
+        by_email(params, headers)
+      elsif params && params["fingerprint"] && params["fingerprint"].any?
+        by_fingerprint(params)
       else
-        send_key(email, headers)
+        send_not_found
       end
+
     rescue RuntimeError => exc
       puts "Error: #{exc}"
       puts exc.backtrace
@@ -26,9 +26,23 @@ module Nickserver
 
     protected
 
-    def get_email_from_params(params)
-      if params && params["address"] && params["address"].any?
-        EmailAddress.new(params["address"].first)
+    def by_email(params, headers)
+      email = EmailAddress.new(params["address"].first)
+      if email.invalid?
+        send_error("Not a valid address")
+      else
+        send_key(email, headers)
+      end
+    end
+
+    def by_fingerprint(params)
+      fingerprint = params["fingerprint"].first
+      if fingerprint.length == 40 && !fingerprint[/\H/]
+        source = Nickserver::Hkp::Source.new(adapter)
+        key_response = source.get_key_by_fingerprint(fingerprint)
+        send_response key_response.status, key_response.content
+      else
+        send_error('Fingerprint invalid: ' + fingerprint)
       end
     end