syntropy 0.30.0 → 0.32.0

data/test/test_http_protocol.rb

@@ -0,0 +1,250 @@
+# frozen_string_literal: true
+
+require_relative './helper'
+
+class HTTPProtocolTest < Minitest::Test
+  def setup
+    @machine = UM.new
+    @r, @w = UM.pipe
+    @io = @machine.io(@r)
+  end
+
+  def teardown
+    @machine.close(@r) rescue nil
+    @machine.close(@w) rescue nil
+    @io = nil
+    @machine = nil
+  end
+
+  def write(str)
+    @machine.write(@w, str)
+  end
+end
+
+class HTTPProtocolRequestTest < HTTPProtocolTest
+  def test_http_request_headers_basic
+    write("GET /foo HTTP/1.1\r\nHost: bar.baz\r\n\r\n")
+    h = @io.http_read_request_headers
+    assert_equal({
+      ':method'   => 'get',
+      ':path'     => '/foo',
+      'host'    => 'bar.baz'
+    }, h)
+  end
+
+  def test_http_request_headers_bad_http_method
+    write("foo /foo HTTP/1.1\r\n\r\n")
+    assert_raises(Syntropy::ProtocolError) { @io.http_read_request_headers }
+  end
+
+  def test_http_request_headers_bad_path
+    write("get HTTP/1.1\r\n\r\n")
+    assert_raises(Syntropy::ProtocolError) { @io.http_read_request_headers }
+  end
+
+  def test_http_request_headers_bad_protocol
+    write("get / HTTP/1.0\r\n\r\n")
+    assert_raises(Syntropy::ProtocolError) { @io.http_read_request_headers }
+  end
+
+  def test_http_request_headers_bad_header_missing_value
+    write("GET /foo HTTP/1.1\r\nHost: \r\n\r\n")
+    assert_raises(Syntropy::ProtocolError) { @io.http_read_request_headers }
+  end
+
+  def test_http_request_headers_bad_header
+    write("GET /foo HTTP/1.1\r\nHost\r\n\r\n")
+    assert_raises(Syntropy::ProtocolError) { @io.http_read_request_headers }
+  end
+
+  def test_http_request_with_body_cl
+    write("POST /foo HTTP/1.1\r\nContent-Length: 3\r\n\r\nabc")
+
+    h = @io.http_read_request_headers
+    assert_equal({
+      ':method'         => 'post',
+      ':path'           => '/foo',
+      'content-length'  => '3'
+    }, h)
+
+    b = @io.http_read_body(h)
+    assert_equal 'abc', b
+  end
+
+  def test_http_request_with_body_te
+    write("POST /foo HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n11\r\nabcdefghijKLMNOPQ\r\n3\r\nfoo\r\n0\r\n\r\n")
+
+    h = @io.http_read_request_headers
+    assert_equal({
+      ':method'           => 'post',
+      ':path'             => '/foo',
+      'transfer-encoding' => 'chunked'
+    }, h)
+
+    b = @io.http_read_body(h)
+    assert_equal 'abcdefghijKLMNOPQfoo', b
+  end
+
+  def test_http_request_pipelining
+    write(
+      "GET /a HTTP/1.1\r\n\r\n" +
+      "POST /b HTTP/1.1\r\nHost: foo.com\r\nContent-Length: 2\r\n\r\nab" +
+      "PATCH /c HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n3\r\nabc\r\n10\r\n#{'*' * 16}\r\n0\r\n\r\n" +
+      "GET /d HTTP/1.1\r\nFoo: bar\r\n\r\n"
+    )
+
+    reqs = 4.times.map {
+      h = @io.http_read_request_headers
+      b = @io.http_read_body(h)
+      [h, b]
+    }
+
+    assert_equal [
+      [
+        {
+          ':method'   => 'get',
+          ':path'     => '/a',
+        },
+        nil
+      ],
+      [
+        {
+          ':method'         => 'post',
+          ':path'           => '/b',
+          'host'            => 'foo.com',
+          'content-length'  => '2'
+        },
+        'ab'
+      ],
+      [
+        {
+          ':method'           => 'patch',
+          ':path'             => '/c',
+          'transfer-encoding' => 'chunked'
+        },
+        "abc#{'*' * 16}"
+      ],
+      [
+        {
+          ':method'   => 'get',
+          ':path'     => '/d',
+          'foo'       => 'bar'
+        },
+        nil
+      ],
+    ], reqs
+  end
+
+  def test_http_request_pipelining_skip_body
+    write(
+      "GET /a HTTP/1.1\r\n\r\n" +
+      "POST /b HTTP/1.1\r\nHost: foo.com\r\nContent-Length: 2\r\n\r\nab" +
+      "PATCH /c HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n3\r\nabc\r\n10\r\n#{'*' * 16}\r\n0\r\n\r\n" +
+      "GET /d HTTP/1.1\r\nFoo: bar\r\n\r\n"
+    )
+
+    reqs = 4.times.map {
+      h = @io.http_read_request_headers
+      @io.http_skip_body(h)
+      h
+    }
+
+    assert_equal [
+      {
+        ':method'   => 'get',
+        ':path'     => '/a'
+      },
+      {
+        ':method'         => 'post',
+        ':path'           => '/b',
+        'host'            => 'foo.com',
+        'content-length'  => '2'
+      },
+      {
+        ':method'           => 'patch',
+        ':path'             => '/c',
+        'transfer-encoding' => 'chunked'
+      },
+      {
+        ':method'   => 'get',
+        ':path'     => '/d',
+        'foo'       => 'bar'
+      }
+    ], reqs
+  end
+
+  def test_http_request_desync1
+    write(
+      "POST / HTTP/1.1\r\nHost: foo.com\r\nTransfer-Encoding: chunked\r\nContent-length: 35\r\n\r\n0\r\n\r\n" +
+      "GET /robots.txt HTTP/1.1\r\nX: y\r\n\r\n"
+    )
+
+    h = @io.http_read_request_headers
+    assert_equal({
+      ':method'           => 'post',
+      ':path'             => '/',
+      'host'              => 'foo.com',
+      'transfer-encoding' => 'chunked',
+      'content-length'    => '35'
+    }, h)
+
+    @io.http_skip_body(h)
+
+    assert_raises(Syntropy::ProtocolError) { @io.http_read_request_headers }
+  end
+end
+
+class HTTPProtocolReadChunkTest < HTTPProtocolTest
+  def test_http_read_body_chunk_no_body
+    write("GET /foo HTTP/1.1\r\Host: bar.baz\r\n\r\n")
+    h = @io.http_read_request_headers
+    assert_nil @io.http_read_body_chunk(h)
+  end
+
+  def test_http_read_body_chunk_cl
+    write("POST /foo HTTP/1.1\r\Host: bar.baz\r\nContent-Length: 5\r\n\r\nabcde")
+    h = @io.http_read_request_headers
+    assert_equal 'abcde', @io.http_read_body_chunk(h)
+  end
+
+  def test_http_read_body_chunk_te
+    write("POST /foo HTTP/1.1\r\Host: bar.baz\r\nTransfer-Encoding: chunked\r\n\r\n5\r\nabcde\r\n0\r\n\r\n")
+    h = @io.http_read_request_headers
+    assert_equal 'abcde', @io.http_read_body_chunk(h)
+    assert_nil @io.http_read_body_chunk(h)
+  end
+
+  def test_http_read_body_chunk_te2
+    write("POST /foo HTTP/1.1\r\Host: bar.baz\r\nTransfer-Encoding: chunked\r\n\r\n5\r\nabcde\r\n3\r\nfgh\r\n0\r\n\r\n")
+    h = @io.http_read_request_headers
+    assert_equal 'abcde', @io.http_read_body_chunk(h)
+    assert_equal 'fgh', @io.http_read_body_chunk(h)
+    assert_nil @io.http_read_body_chunk(h)
+  end
+end
+
+class HTTPProtocolResponseTest < HTTPProtocolTest
+  def test_http_response_headers_basic
+    write("HTTP/1.1 200 OK\r\nHost: bar.baz\r\n\r\n")
+    h = @io.http_read_response_headers
+    assert_equal({
+      ':status' => 200,
+      'host'    => 'bar.baz'
+    }, h)
+  end
+
+  def test_http_response_headers_invalid_status_line1
+    write("HTTP 200 OK\r\nHost: bar.baz\r\n\r\n")
+    assert_raises(Syntropy::ProtocolError) { @io.http_read_response_headers }
+  end
+
+  def test_http_response_headers_invalid_status_line2
+    write("HTTP/1.1\r\nHost: bar.baz\r\n\r\n")
+    assert_raises(Syntropy::ProtocolError) { @io.http_read_response_headers }
+  end
+
+  def test_http_response_headers_invalid_status_line3
+    write("HTTP/1.1 ok\r\nBlahblah\r\n\r\n")
+    assert_raises(Syntropy::ProtocolError) { @io.http_read_response_headers }
+  end
+end

data/test/{test_connection.rb → test_http_server_connection.rb}

@@ -3,7 +3,7 @@
 require_relative './helper'
 require 'securerandom'
 
-class ConnectionTest < Minitest::Test
+class HTTPServerConnectionTest < Minitest::Test
   def make_socket_pair
     port = SecureRandom.random_number(10000..40000)
     server_fd = @machine.socket(UM::AF_INET, UM::SOCK_STREAM, 0, 0)
@@ -29,7 +29,7 @@ class ConnectionTest < Minitest::Test
     @hook = nil
     @app = ->(req) { @reqs << req; @hook&.call(req) }
     @env = {}
-    @adapter = Syntropy::HTTP::Connection.new(nil, @machine, @s_fd, @env, &@app)
+    @connection = Syntropy::HTTP::ServerConnection.new(@machine, @s_fd, @env, &@app)
   end
 
   def teardown
@@ -54,14 +54,14 @@ class ConnectionTest < Minitest::Test
 
   def test_http_unsupported_versions
     write_http_request "GET / HTTP/0.9\r\n\r\n"
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side
     assert_equal "HTTP/1.1 505\r\nTransfer-Encoding: chunked\r\n\r\n1a\r\nHTTP version not supported\r\n0\r\n\r\n", response
 
     setup
 
     write_http_request "GET / HTTP/1.0\r\n\r\n"
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side
     assert_equal "HTTP/1.1 505\r\nTransfer-Encoding: chunked\r\n\r\n1a\r\nHTTP version not supported\r\n0\r\n\r\n", response
 
@@ -69,7 +69,7 @@ class ConnectionTest < Minitest::Test
 
     @hook = ->(req) { req.respond('hi') }
     write_http_request "GET / HTTP/1.1\r\n\r\n"
-    @adapter.serve_request
+    @connection.serve_request
     @machine.close(@s_fd)
     response = read_client_side
     assert_equal "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n2\r\nhi\r\n0\r\n\r\n", response
@@ -78,14 +78,13 @@ class ConnectionTest < Minitest::Test
   def test_basic_request_parsing
     write_http_request "GET / HTTP/1.1\r\n\r\n"
 
-    @adapter.serve_request
+    @connection.serve_request
     assert_equal 1, @reqs.size
     req = @reqs.shift
     headers = req.headers
     assert_equal({
       ':method'   => 'get',
-      ':path'     => '/',
-      ':protocol' => 'http/1.1'
+      ':path'     => '/'
     }, headers)
   end
 
@@ -94,30 +93,28 @@ class ConnectionTest < Minitest::Test
       GET /foo HTTP/1.1
       Server: foo.com
 
-      SCHMET /bar HTTP/1.1
+      GET /bar HTTP/1.1
 
 
 
     HTTP
     write_http_request msg
 
-    @adapter.run
+    @connection.run
     assert_equal 2, @reqs.size
     req0 = @reqs.shift
     headers = req0.headers
     assert_equal({
       ':method'   => 'get',
       ':path'     => '/foo',
-      ':protocol' => 'http/1.1',
       'server'    => 'foo.com'
     }, headers)
 
     req1 = @reqs.shift
     headers = req1.headers
     assert_equal({
-      ':method'   => 'schmet',
-      ':path'     => '/bar',
-      ':protocol' => 'http/1.1'
+      ':method'   => 'get',
+      ':path'     => '/bar'
     }, headers)
   end
 
@@ -127,7 +124,7 @@ class ConnectionTest < Minitest::Test
       Server: foo.com
       Content-Length: 3
 
-      abcSCHMOST /bar HTTP/1.1
+      abcPOST /bar HTTP/1.1
       Server: bar.com
       Content-Length: 6
 
@@ -137,7 +134,7 @@ class ConnectionTest < Minitest::Test
     @bodies = []
     @hook = ->(req) { @bodies << req.read }
 
-    @adapter.run
+    @connection.run
     assert_equal 2, @reqs.size
 
     req0 = @reqs.shift
@@ -145,7 +142,6 @@ class ConnectionTest < Minitest::Test
     assert_equal({
       ':method' => 'post',
       ':path' => '/foo',
-      ':protocol' => 'http/1.1',
       'server' => 'foo.com',
       'content-length' => '3',
       ':body-done-reading' => true
@@ -156,9 +152,8 @@ class ConnectionTest < Minitest::Test
     req1 = @reqs.shift
     headers = req1.headers
     assert_equal({
-      ':method' => 'schmost',
+      ':method' => 'post',
       ':path' => '/bar',
-      ':protocol' => 'http/1.1',
       'server' => 'bar.com',
       'content-length' => '6',
       ':body-done-reading' => true
@@ -179,7 +174,7 @@ class ConnectionTest < Minitest::Test
       de
       0
 
-      SCHMOST /bar HTTP/1.1
+      POST /bar HTTP/1.1
       Server: bar.com
       Transfer-Encoding: chunked
 
@@ -195,7 +190,7 @@ class ConnectionTest < Minitest::Test
     @bodies = []
     @hook = ->(req) { @bodies << req.read }
 
-    @adapter.run
+    @connection.run
     assert_equal 2, @reqs.size
 
     req0 = @reqs.shift
@@ -203,7 +198,6 @@ class ConnectionTest < Minitest::Test
     assert_equal({
       ':method'             => 'post',
       ':path'               => '/foo',
-      ':protocol'           => 'http/1.1',
       'server'              => 'foo.com',
       'transfer-encoding'   => 'chunked',
       ':body-done-reading'  => true
@@ -214,9 +208,8 @@ class ConnectionTest < Minitest::Test
     req1 = @reqs.shift
     headers = req1.headers
     assert_equal({
-      ':method'             => 'schmost',
+      ':method'             => 'post',
       ':path'               => '/bar',
-      ':protocol'           => 'http/1.1',
       'server'              => 'bar.com',
       'transfer-encoding'   => 'chunked',
       ':body-done-reading'  => true
@@ -237,7 +230,7 @@ class ConnectionTest < Minitest::Test
       de
       0
 
-      SCHMOST /bar HTTP/1.1
+      POST /bar HTTP/1.1
       Server: bar.com
       Content-Length: 31
 
@@ -247,7 +240,7 @@ class ConnectionTest < Minitest::Test
     chunks = []
     @hook = ->(req) { req.each_chunk { chunks << it } }
 
-    @adapter.serve_request
+    @connection.serve_request
     assert_equal 1, @reqs.size
 
     req0 = @reqs.shift
@@ -255,7 +248,6 @@ class ConnectionTest < Minitest::Test
     assert_equal({
       ':method'             => 'post',
       ':path'               => '/foo',
-      ':protocol'           => 'http/1.1',
       'server'              => 'foo.com',
       'transfer-encoding'   => 'chunked',
       ':body-done-reading'  => true
@@ -263,15 +255,14 @@ class ConnectionTest < Minitest::Test
     assert_equal ['abc', 'de'], chunks
 
     chunks.clear
-    @adapter.serve_request
+    @connection.serve_request
     assert_equal 1, @reqs.size
 
     req1 = @reqs.shift
     headers = req1.headers
     assert_equal({
-      ':method'             => 'schmost',
+      ':method'             => 'post',
       ':path'               => '/bar',
-      ':protocol'           => 'http/1.1',
       'server'              => 'bar.com',
       'content-length'      => '31',
       ':body-done-reading'  => true
@@ -285,7 +276,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_http_request "GET / HTTP/1.1\r\n\r\n"
-    @adapter.run
+    @connection.run
     response = read_client_side
 
     expected = <<~HTTP.crlf_lines
@@ -305,7 +296,7 @@ class ConnectionTest < Minitest::Test
 
     # using HTTP 1.0, server should close connection after responding
     write_http_request "GET / HTTP/1.1\r\n\r\n"
-    @adapter.run
+    @connection.run
 
     response = read_client_side
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\nd\r\nHello, world!\r\n0\r\n\r\n"
@@ -318,14 +309,14 @@ class ConnectionTest < Minitest::Test
     }
 
     write_http_request "GET / HTTP/1.1\r\nConnection: close\r\n\r\n", false
-    res = @adapter.serve_request
+    res = @connection.serve_request
     assert_equal false, res
 
     response = read_client_side
     assert_equal("HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n2\r\nHi\r\n0\r\n\r\n", response)
 
     write_http_request "GET / HTTP/1.1\r\n\r\n", false
-    res = @adapter.serve_request
+    res = @connection.serve_request
     assert_equal true, res
 
     response = read_client_side
@@ -344,7 +335,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_http_request "GET / HTTP/1.1\r\n\r\nGET / HTTP/1.1\r\nFoo: bar\r\n\r\n"
-    @adapter.run
+    @connection.run
     response = read_client_side
 
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\nd\r\nHello, world!\r\n0\r\n\r\n" +
@@ -368,7 +359,7 @@ class ConnectionTest < Minitest::Test
 
     msg = "POST / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n6\r\nfoobar\r\n"
     write_http_request msg, false
-    @machine.spin { @adapter.serve_request rescue nil }
+    @machine.spin { @connection.serve_request rescue nil }
     @machine.sleep(0.01)
 
     assert request
@@ -417,7 +408,7 @@ class ConnectionTest < Minitest::Test
 
     msg = "GET / HTTP/1.1\r\nUpgrade: echo\r\nConnection: upgrade\r\n\r\n"
     write_http_request(msg, false)
-    @machine.spin { @adapter.serve_request rescue nil }
+    @machine.spin { @connection.serve_request rescue nil }
     @machine.sleep(0.01)
 
     response = read_client_side
@@ -462,7 +453,7 @@ class ConnectionTest < Minitest::Test
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
     @machine.spin do
-      @adapter.serve_request
+      @connection.serve_request
     rescue => e
       p e
       p e.backtrace
@@ -498,7 +489,7 @@ class ConnectionTest < Minitest::Test
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
     @machine.spin do
-      @adapter.serve_request
+      @connection.serve_request
     rescue => e
       p e
       p e.backtrace
@@ -531,7 +522,7 @@ class ConnectionTest < Minitest::Test
     count = 0
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @machine.spin { @adapter.serve_request }
+    @machine.spin { @connection.serve_request }
 
     while (data = read_client_side(65536))
       response << data
@@ -551,7 +542,7 @@ class ConnectionTest < Minitest::Test
     end
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nServer: Syntropy\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -559,7 +550,7 @@ class ConnectionTest < Minitest::Test
     @env[:server_headers] = "Server: TP3\r\n"
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nServer: TP3\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -572,7 +563,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: foo=bar\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -583,7 +574,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: foo=bar\r\nContent-Type: text/plain\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -597,7 +588,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: foo=bar\r\nFoo: bar\r\nContent-Type: text/plain\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -610,7 +601,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: foo=bar; HttpOnly\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -624,7 +615,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: foo=bar; HttpOnly\r\nSet-Cookie: bar=baz\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
@@ -640,7 +631,7 @@ class ConnectionTest < Minitest::Test
     }
 
     write_client_side("GET / HTTP/1.1\r\n\r\n")
-    @adapter.serve_request
+    @connection.serve_request
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: a=1\r\nSet-Cookie: b=2\r\nSet-Cookie: c=3\r\nSet-Cookie: d=4\r\nSet-Cookie: e=5\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response

data/test/test_json_api.rb

@@ -11,7 +11,7 @@ class JSONAPITest < Minitest::Test
     end
 
     def bar!(req)
-      @value = req.query[:v]
+      @value = req.query['v']
       true
     end
   end
@@ -28,7 +28,7 @@ class JSONAPITest < Minitest::Test
     req = mock_req(':method' => 'GET', ':path' => '/?q=foo')
     @app.call(req)
     assert_equal HTTP::OK, req.response_status
-    assert_equal({ status: 'OK', response: nil }, req.response_json)
+    assert_equal({ 'status' => 'OK', 'response' => nil }, req.response_json)
 
     req = mock_req(':method' => 'POST', ':path' => '/?q=foo')
     @app.call(req)
@@ -38,7 +38,7 @@ class JSONAPITest < Minitest::Test
     req = mock_req(':method' => 'POST', ':path' => '/?q=bar&v=foo')
     @app.call(req)
     assert_equal HTTP::OK, req.response_status
-    assert_equal({ status: 'OK', response: true }, req.response_json)
+    assert_equal({ 'status' => 'OK', 'response' => true }, req.response_json)
 
     req = mock_req(':method' => 'GET', ':path' => '/?q=bar&v=foo')
     @app.call(req)
@@ -47,12 +47,12 @@ class JSONAPITest < Minitest::Test
     req = mock_req(':method' => 'GET', ':path' => '/?q=foo')
     @app.call(req)
     assert_equal HTTP::OK, req.response_status
-    assert_equal({ status: 'OK', response: 'foo' }, req.response_json)
+    assert_equal({ 'status' => 'OK', 'response' => 'foo' }, req.response_json)
 
     req = mock_req(':method' => 'GET', ':path' => '/?q=foo')
     @app.call(req)
     assert_equal HTTP::OK, req.response_status
-    assert_equal({ status: 'OK', response: 'foo' }, req.response_json)
+    assert_equal({ 'status' => 'OK', 'response' => 'foo' }, req.response_json)
 
     req = mock_req(':method' => 'GET', ':path' => '/?q=xxx')
     @app.call(req)

data/test/{test_module.rb → test_module_loader.rb}

@@ -79,4 +79,35 @@ class ModuleTest < Minitest::Test
     mod = @loader.load('mod/foo/index')
     assert_equal '/mod/foo', mod.env[:ref]
   end
+
+  def test_list
+    list = @loader.list('_layout')
+    assert_equal ['_layout/default'], list
+
+    list = @loader.list('_lib')
+    assert_equal [
+      '_lib/callable',
+      '_lib/dep',
+      '_lib/env',
+      '_lib/klass',
+      '_lib/missing-export',
+      '_lib/self',
+    ], list
+
+    list = @loader.list('about')
+    assert_equal [
+      'about/_error',
+      'about/index',
+      'about/raise'
+    ], list
+
+    list = @loader.list('assets')
+    assert_equal [], list
+
+    list = @loader.list('mod')
+    assert_equal [], list
+
+    list = @loader.list('mod/bar')
+    assert_equal ['mod/bar/index+'], list
+  end
 end