Merge branch 'wkd' into 'master'

Fetch keys from web key directory

See merge request leap/nickserver!18

5 files changed, 70 insertions, 5 deletions

diff --git a/test/functional/sample_test.rb b/test/functional/sample_test.rb
index 18fad74..2b49527 100644
--- a/test/functional/sample_test.rb
+++ b/test/functional/sample_test.rb
@@ -18,19 +18,19 @@ class SampleTest < FunctionalTest
   #   assert_lookup_status 400, 'invalid'
   # end
 
-  def test_nicknym
+  def test_nicknym_success
     assert_lookup_status 200, 'test@mail.bitmask.net'
   end
 
   # Regression Tests
 
   # #3 handle missing A records
-  def test_nicknym
+  def test_nicknym_handles_missing_a_record
     assert_lookup_status 404, 'postmaster@cs.ucl.ac.uk'
   end
 
   # platform/#8674 handle nonexisting domains
-  def test_nicknym
+  def test_nicknym_handles_missing_domain
     assert_lookup_status 404, 'postmaster@now-dont-you-dare-register-this-domain.coop'
   end
 
diff --git a/test/support/http_stub_helper.rb b/test/support/http_stub_helper.rb
index 4e3d89b..cc9196e 100644
--- a/test/support/http_stub_helper.rb
+++ b/test/support/http_stub_helper.rb
@@ -27,8 +27,7 @@ module HttpStubHelper
 
   def stub_couch_response(uid, response = {})
     query = "\?key=#{"%22#{uid}%22"}&reduce=false"
-    stub_http_get /#{Regexp.escape(config.couch_url)}.*#{query}/,
-      response
+    stub_http_get(/#{Regexp.escape(config.couch_url)}.*#{query}/, response)
   end
 
   private
diff --git a/test/unit/email_address_test.rb b/test/unit/email_address_test.rb
index 6aecef7..2fea65d 100644
--- a/test/unit/email_address_test.rb
+++ b/test/unit/email_address_test.rb
@@ -10,6 +10,11 @@ class EmailAddressTest < Minitest::Test
     assert !nick.domain?('est.me')
   end
 
+  def test_local_part
+    nick = Nickserver::EmailAddress.new 'nick@test.me'
+    assert_equal 'nick', nick.local_part
+  end
+
   def test_valid
     nick = Nickserver::EmailAddress.new 'nick@remote.domain'
     assert nick.valid?
diff --git a/test/unit/wkd/url_test.rb b/test/unit/wkd/url_test.rb
new file mode 100644
index 0000000..9bf8f64
--- /dev/null
+++ b/test/unit/wkd/url_test.rb
@@ -0,0 +1,26 @@
+require 'test_helper'
+require 'nickserver/wkd/url'
+require 'nickserver/email_address'
+
+module Nickserver::Wkd
+  class UrlTest < Minitest::Test
+    # TODO: test utf8 behavior
+
+    # https://tools.ietf.org/html/draft-koch-openpgp-webkey-service-00#section-3.1
+    def test_sample_from_draft
+      url = Url.new sample_email
+      assert_equal sample_url, url.to_s
+    end
+
+    protected
+
+    def sample_email
+      Nickserver::EmailAddress.new 'Joe.Doe@Example.ORG'
+    end
+
+    def sample_url
+      'https://example.org/.well-known/openpgpkey/' +
+        'hu/example.org/iy9q119eutrkn8s1mk4r39qejnbu3n5q'
+    end
+  end
+end
diff --git a/test/unit/zbase_test.rb b/test/unit/zbase_test.rb
new file mode 100644
index 0000000..97f0fc5
--- /dev/null
+++ b/test/unit/zbase_test.rb
@@ -0,0 +1,35 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'minitest/autorun'
+require 'zbase32'
+
+class Zbase32Test < Minitest::Test
+
+  def test_samples
+    samples.each do |k,v|
+      assert_equal k, decode(v)
+      assert_equal v, encode(k)
+    end
+  end
+
+  protected
+
+  def samples
+    {
+      '111100001011111111000111' => '6n9hq',
+      '110101000111101000000100' => '4t7ye',
+      wkd_sample => 'iy9q119eutrkn8s1mk4r39qejnbu3n5q'
+    }
+  end
+
+  def wkd_sample
+    'a83ee94be89c48a11ed25ab44cfdc848833c8b6e'.to_i(16).to_s(2)
+  end
+
+  def encode(string)
+    ZBase32.encode32 string
+  end
+
+  def decode(enc)
+    ZBase32.decode32 enc
+  end
+end