From 47343fad827ac2bef2ed7bc08768e4e58ac9a95f Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 27 Aug 2016 09:09:07 +0200 Subject: refactor: push down adapter dependency injection to sources The original idea was that we would have all the celluloid related things injected in reel_server. However it seems unlikely that we will use a different http system anytime soon. Removing some layers of dependency injection to reduce complexity. We can easily bring this back if we want. --- test/unit/request_handler_test.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'test') diff --git a/test/unit/request_handler_test.rb b/test/unit/request_handler_test.rb index 6c7a036..d938706 100644 --- a/test/unit/request_handler_test.rb +++ b/test/unit/request_handler_test.rb @@ -63,14 +63,11 @@ class Nickserver::RequestHandlerTest < Minitest::Test end def handler - Nickserver::RequestHandler.new responder, adapter + Nickserver::RequestHandler.new responder end def responder @responder ||= Minitest::Mock.new end - def adapter - @adapter ||= Minitest::Mock.new - end end -- cgit v1.2.3 From 16d77cc03068b19791e704abfc2eb14f8cd141f0 Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 27 Aug 2016 11:25:30 +0200 Subject: expose Request class from RequestHandler This way we can separate the EmailHandler and the FingerprintHandler as well. --- test/unit/request_test.rb | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 test/unit/request_test.rb (limited to 'test') diff --git a/test/unit/request_test.rb b/test/unit/request_test.rb new file mode 100644 index 0000000..698a275 --- /dev/null +++ b/test/unit/request_test.rb @@ -0,0 +1,44 @@ +require 'test_helper' +require 'nickserver/request' + +class Nickserver::RequestTest < Minitest::Test + + def test_email + request = request_with_params address: fake_email + assert_equal fake_email, request.email + end + + def test_blank_email + request = request_with_params + assert_equal nil, request.email + end + + def test_fingerprint + request = request_with_params fingerprint: fake_fingerprint + assert_equal fake_fingerprint, request.fingerprint + end + + def test_domain + request = Nickserver::Request.new Hash.new, + 'Host' => ' nicknym.my.domain.tld:123' + assert_equal 'my.domain.tld', request.domain + end + + protected + + # params are encoded with strings as keys and arrays with the + # given value(s) + def request_with_params(params = {}) + params = params.collect{|k,v| [k.to_s, Array(v)]}.to_h + Nickserver::Request.new params, {} + end + + def fake_email + 'test@domain.tld' + end + + def fake_fingerprint + 'F' * 40 + end + +end -- cgit v1.2.3 From 58d687f927aabc8aa2fdfc46132cb71706bdde46 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 29 Aug 2016 09:41:12 +0200 Subject: refactor: split up ResponseHandler Now we have a Dispatcher and two ResponseHandlers that have the same interface. Moving towards a Chain of Responsibility pattern. --- test/unit/dispatcher_test.rb | 73 +++++++++++++++++++++++++++++++++++++++ test/unit/request_handler_test.rb | 73 --------------------------------------- 2 files changed, 73 insertions(+), 73 deletions(-) create mode 100644 test/unit/dispatcher_test.rb delete mode 100644 test/unit/request_handler_test.rb (limited to 'test') diff --git a/test/unit/dispatcher_test.rb b/test/unit/dispatcher_test.rb new file mode 100644 index 0000000..60d252b --- /dev/null +++ b/test/unit/dispatcher_test.rb @@ -0,0 +1,73 @@ +require 'test_helper' +require 'nickserver/dispatcher' + +class Nickserver::DispatcherTest < Minitest::Test + + def test_empty_query + handle + assert_response status: 404, content: "404 Not Found\n" + end + + def test_invalid_query + handle address: ['asdf'] + assert_response status: 500, content: "500 Not a valid address\n" + end + + def test_missing_domain + handle address: ['valid@email.tld'] + assert_response status: 500, content: "500 HTTP request must include a Host header.\n" + end + + def test_email_from_hkp + handle address: ['valid@email.tld'], headers: { "Host" => "http://nickserver.me" } + source = Minitest::Mock.new + source.expect :query, Nickserver::Response.new(200, "fake content"), [Nickserver::EmailAddress] + Nickserver::Hkp::Source.stub :new, source do + assert_response status: 200, content: "200 fake content" + end + end + + def test_fingerprint_to_short + handle fingerprint: ['44F2F455E28'] + assert_response status: 500, content: "500 Fingerprint invalid: 44F2F455E28\n" + end + + def test_fingerprint_is_not_hex + handle fingerprint: ['X36E738D69173C13Z709E44F2F455E2824D18DDX'] + assert_response status: 500, + content: "500 Fingerprint invalid: X36E738D69173C13Z709E44F2F455E2824D18DDX\n" + end + + def test_get_key_with_fingerprint_from_hkp + handle fingerprint: ['E36E738D69173C13D709E44F2F455E2824D18DDF'] + source = Minitest::Mock.new + source.expect :get_key_by_fingerprint, + Nickserver::Response.new(200, "fake fingerprint"), + ['E36E738D69173C13D709E44F2F455E2824D18DDF'] + Nickserver::Hkp::Source.stub :new, source do + assert_response status: 200, content: "200 fake fingerprint" + end + end + + protected + + def handle(params = {}) + @headers = params.delete(:headers) || {} + @params = Hash[ params.map{ |k,v| [k.to_s, v] } ] + end + + def assert_response(args) + responder.expect :respond, nil, [args[:status], args[:content]] + dispatcher.respond_to @params, @headers + responder.verify + end + + def dispatcher + Nickserver::Dispatcher.new responder + end + + def responder + @responder ||= Minitest::Mock.new + end + +end diff --git a/test/unit/request_handler_test.rb b/test/unit/request_handler_test.rb deleted file mode 100644 index d938706..0000000 --- a/test/unit/request_handler_test.rb +++ /dev/null @@ -1,73 +0,0 @@ -require 'test_helper' -require 'nickserver/request_handler' - -class Nickserver::RequestHandlerTest < Minitest::Test - - def test_empty_query - handle - assert_response status: 404, content: "404 Not Found\n" - end - - def test_invalid_query - handle address: ['asdf'] - assert_response status: 500, content: "500 Not a valid address\n" - end - - def test_missing_domain - handle address: ['valid@email.tld'] - assert_response status: 500, content: "500 HTTP request must include a Host header.\n" - end - - def test_email_from_hkp - handle address: ['valid@email.tld'], headers: { "Host" => "http://nickserver.me" } - source = Minitest::Mock.new - source.expect :query, Nickserver::Response.new(200, "fake content"), [Nickserver::EmailAddress] - Nickserver::Hkp::Source.stub :new, source do - assert_response status: 200, content: "200 fake content" - end - end - - def test_fingerprint_to_short - handle fingerprint: ['44F2F455E28'] - assert_response status: 500, content: "500 Fingerprint invalid: 44F2F455E28\n" - end - - def test_fingerprint_is_not_hex - handle fingerprint: ['X36E738D69173C13Z709E44F2F455E2824D18DDX'] - assert_response status: 500, - content: "500 Fingerprint invalid: X36E738D69173C13Z709E44F2F455E2824D18DDX\n" - end - - def test_get_key_with_fingerprint_from_hkp - handle fingerprint: ['E36E738D69173C13D709E44F2F455E2824D18DDF'] - source = Minitest::Mock.new - source.expect :get_key_by_fingerprint, - Nickserver::Response.new(200, "fake fingerprint"), - ['E36E738D69173C13D709E44F2F455E2824D18DDF'] - Nickserver::Hkp::Source.stub :new, source do - assert_response status: 200, content: "200 fake fingerprint" - end - end - - protected - - def handle(params = {}) - @headers = params.delete(:headers) || {} - @params = Hash[ params.map{ |k,v| [k.to_s, v] } ] - end - - def assert_response(args) - responder.expect :respond, nil, [args[:status], args[:content]] - handler.respond_to @params, @headers - responder.verify - end - - def handler - Nickserver::RequestHandler.new responder - end - - def responder - @responder ||= Minitest::Mock.new - end - -end -- cgit v1.2.3 From 55006b3ce5967fde08081bfd56d56f76dbaf7c53 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 29 Aug 2016 10:36:05 +0200 Subject: cleanup: remove outdated ideas Lookup and InvalidSource were experiments for a design for the dispatching. Our new dispatcher seems better. --- test/unit/invalid_source_test.rb | 16 ---------------- test/unit/lookup_test.rb | 23 ----------------------- 2 files changed, 39 deletions(-) delete mode 100644 test/unit/invalid_source_test.rb delete mode 100644 test/unit/lookup_test.rb (limited to 'test') diff --git a/test/unit/invalid_source_test.rb b/test/unit/invalid_source_test.rb deleted file mode 100644 index 37a38fc..0000000 --- a/test/unit/invalid_source_test.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'test_helper' -require 'nickserver/invalid_source' - -class Nickserver::InvalidSourceTest < Minitest::Test - - def test_query - adapter.query(nil) do |status, content| - assert_equal 500, status - assert_equal "Not a valid address", content - end - end - - def adapter - Nickserver::InvalidSource.new - end -end diff --git a/test/unit/lookup_test.rb b/test/unit/lookup_test.rb deleted file mode 100644 index ac827e0..0000000 --- a/test/unit/lookup_test.rb +++ /dev/null @@ -1,23 +0,0 @@ -require 'test_helper' -require 'minitest/mock' -require 'nickserver/lookup' - -class TestLookup < Nickserver::Lookup - - def query - yield 200, 'yeah' - end - -end - -class LookupTest < Minitest::Test - - def test_responding - responder = Minitest::Mock.new - responder.expect :send_response, nil, - [{status: 200, content: 'yeah'}] - lookup = TestLookup.new nil - lookup.respond_with responder - responder.verify - end -end -- cgit v1.2.3 From 0784391a21b75ca52892e992a614b0f927ade00e Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 29 Aug 2016 11:59:54 +0200 Subject: refactor: split EmailHandler in 3 InvalidEmailHandler - handle emails with an invalid format LocalEmailHandler - handle emails on the local domain EmailHandler - handle all other emails by using hkp This is a preparation to add leap provider email lookup and remove hkp eventually. But for now we keep the behaviour the same and only refactor. --- test/integration/dispatcher_test.rb | 73 ++++++++++++++++++++++ test/unit/dispatcher_test.rb | 73 ---------------------- .../request_handlers/local_email_handler_test.rb | 65 +++++++++++++++++++ 3 files changed, 138 insertions(+), 73 deletions(-) create mode 100644 test/integration/dispatcher_test.rb delete mode 100644 test/unit/dispatcher_test.rb create mode 100644 test/unit/request_handlers/local_email_handler_test.rb (limited to 'test') diff --git a/test/integration/dispatcher_test.rb b/test/integration/dispatcher_test.rb new file mode 100644 index 0000000..60d252b --- /dev/null +++ b/test/integration/dispatcher_test.rb @@ -0,0 +1,73 @@ +require 'test_helper' +require 'nickserver/dispatcher' + +class Nickserver::DispatcherTest < Minitest::Test + + def test_empty_query + handle + assert_response status: 404, content: "404 Not Found\n" + end + + def test_invalid_query + handle address: ['asdf'] + assert_response status: 500, content: "500 Not a valid address\n" + end + + def test_missing_domain + handle address: ['valid@email.tld'] + assert_response status: 500, content: "500 HTTP request must include a Host header.\n" + end + + def test_email_from_hkp + handle address: ['valid@email.tld'], headers: { "Host" => "http://nickserver.me" } + source = Minitest::Mock.new + source.expect :query, Nickserver::Response.new(200, "fake content"), [Nickserver::EmailAddress] + Nickserver::Hkp::Source.stub :new, source do + assert_response status: 200, content: "200 fake content" + end + end + + def test_fingerprint_to_short + handle fingerprint: ['44F2F455E28'] + assert_response status: 500, content: "500 Fingerprint invalid: 44F2F455E28\n" + end + + def test_fingerprint_is_not_hex + handle fingerprint: ['X36E738D69173C13Z709E44F2F455E2824D18DDX'] + assert_response status: 500, + content: "500 Fingerprint invalid: X36E738D69173C13Z709E44F2F455E2824D18DDX\n" + end + + def test_get_key_with_fingerprint_from_hkp + handle fingerprint: ['E36E738D69173C13D709E44F2F455E2824D18DDF'] + source = Minitest::Mock.new + source.expect :get_key_by_fingerprint, + Nickserver::Response.new(200, "fake fingerprint"), + ['E36E738D69173C13D709E44F2F455E2824D18DDF'] + Nickserver::Hkp::Source.stub :new, source do + assert_response status: 200, content: "200 fake fingerprint" + end + end + + protected + + def handle(params = {}) + @headers = params.delete(:headers) || {} + @params = Hash[ params.map{ |k,v| [k.to_s, v] } ] + end + + def assert_response(args) + responder.expect :respond, nil, [args[:status], args[:content]] + dispatcher.respond_to @params, @headers + responder.verify + end + + def dispatcher + Nickserver::Dispatcher.new responder + end + + def responder + @responder ||= Minitest::Mock.new + end + +end diff --git a/test/unit/dispatcher_test.rb b/test/unit/dispatcher_test.rb deleted file mode 100644 index 60d252b..0000000 --- a/test/unit/dispatcher_test.rb +++ /dev/null @@ -1,73 +0,0 @@ -require 'test_helper' -require 'nickserver/dispatcher' - -class Nickserver::DispatcherTest < Minitest::Test - - def test_empty_query - handle - assert_response status: 404, content: "404 Not Found\n" - end - - def test_invalid_query - handle address: ['asdf'] - assert_response status: 500, content: "500 Not a valid address\n" - end - - def test_missing_domain - handle address: ['valid@email.tld'] - assert_response status: 500, content: "500 HTTP request must include a Host header.\n" - end - - def test_email_from_hkp - handle address: ['valid@email.tld'], headers: { "Host" => "http://nickserver.me" } - source = Minitest::Mock.new - source.expect :query, Nickserver::Response.new(200, "fake content"), [Nickserver::EmailAddress] - Nickserver::Hkp::Source.stub :new, source do - assert_response status: 200, content: "200 fake content" - end - end - - def test_fingerprint_to_short - handle fingerprint: ['44F2F455E28'] - assert_response status: 500, content: "500 Fingerprint invalid: 44F2F455E28\n" - end - - def test_fingerprint_is_not_hex - handle fingerprint: ['X36E738D69173C13Z709E44F2F455E2824D18DDX'] - assert_response status: 500, - content: "500 Fingerprint invalid: X36E738D69173C13Z709E44F2F455E2824D18DDX\n" - end - - def test_get_key_with_fingerprint_from_hkp - handle fingerprint: ['E36E738D69173C13D709E44F2F455E2824D18DDF'] - source = Minitest::Mock.new - source.expect :get_key_by_fingerprint, - Nickserver::Response.new(200, "fake fingerprint"), - ['E36E738D69173C13D709E44F2F455E2824D18DDF'] - Nickserver::Hkp::Source.stub :new, source do - assert_response status: 200, content: "200 fake fingerprint" - end - end - - protected - - def handle(params = {}) - @headers = params.delete(:headers) || {} - @params = Hash[ params.map{ |k,v| [k.to_s, v] } ] - end - - def assert_response(args) - responder.expect :respond, nil, [args[:status], args[:content]] - dispatcher.respond_to @params, @headers - responder.verify - end - - def dispatcher - Nickserver::Dispatcher.new responder - end - - def responder - @responder ||= Minitest::Mock.new - end - -end diff --git a/test/unit/request_handlers/local_email_handler_test.rb b/test/unit/request_handlers/local_email_handler_test.rb new file mode 100644 index 0000000..8f303ec --- /dev/null +++ b/test/unit/request_handlers/local_email_handler_test.rb @@ -0,0 +1,65 @@ +require 'test_helper' +require 'nickserver/request_handlers/local_email_handler' + +class LocalEmailHandlerTest < MiniTest::Test + + def test_no_email + assert_refuses + end + + def test_remote_email + assert_refuses email: 'me@remote.tld', domain: 'local.tld' + end + + def test_local_email + assert_handles email: 'me@local.tld', domain: 'local.tld' + end + + def test_missing_host_header + Nickserver::Config.stub :domain, nil do + assert_responds_with_error "HTTP request must include a Host header.", + email: 'me@local.tld' + end + end + + protected + + def handler + Nickserver::RequestHandlers::LocalEmailHandler.new + end + + def source + source = Minitest::Mock.new + source.expect :query, + 'response', + [Nickserver::EmailAddress] + source + end + + def assert_handles(opts) + Nickserver::CouchDB::Source.stub :new, source do + assert_equal 'response', handle(request(opts)) + end + end + + def assert_responds_with_error(msg, opts) + response = handle(request(opts)) + assert_equal 500, response.status + assert_equal "500 #{msg}\n", response.content + end + + def assert_refuses(opts = {}) + assert_nil handle(request(opts)) + end + + def handle(request) + handler.call(request) + end + + def request(opts = {}) + params = {'address' => [opts[:email]]} + headers = {'Host' => opts[:domain]} + Nickserver::Request.new params, headers + end + +end -- cgit v1.2.3