Fix Router#path_parent to not break on double slash.

Author: noteflakes

TODO.md

@@ -1,6 +1,13 @@
-- Test HEAD requests for:
-  - markdown
-  - static files
+- add support for applets
+
+  - can be implemented as separate gems
+  - can route requests to a different directory (i.e. inside the gem directory)
+  - simple way to instantiate and setup the applet
+  - as a first example, implement an auth/signin applet:
+    - session hook
+    - session persistence
+    - login page
+    - support for custom behaviour and custom workflows (2FA, signin using OTP etc.)
 
 - Some standard middleware:
 

lib/syntropy/router.rb

@@ -84,7 +84,8 @@ def path_abs(path, base)
     def path_parent(path)
       return nil if path == '/'
 
-      path.match(PATH_PARENT_RE)[1] || '/'
+      m = path.match(PATH_PARENT_RE)
+      m && (m[1] || '/')
     end
 
     MD_EXT_RE = /\.md$/

test/test_router.rb

@@ -24,7 +24,7 @@ def full_path(fn)
     File.join(APP_ROOT, fn)
   end
 
-  def test_find_route
+  def test_routing
     # entry = @router['/']
     # assert_equal :not_found, entry[:kind]
 
@@ -50,6 +50,9 @@ def test_find_route
     assert_equal :module, entry[:kind]
     assert_equal full_path('api+.rb'), entry[:fn]
 
+    entry = @router['/test/api//foo/bar']
+    assert_equal :not_found, entry[:kind]
+
     entry = @router['/test/api/foo/../bar']
     assert_equal :not_found, entry[:kind]
 
@@ -87,4 +90,27 @@ def test_router_file_watching
   ensure
     IO.write(@tmp_fn, orig_body) if orig_body
   end
+
+  def test_malformed_path_routing
+    entry = @router['//xmlrpc.php?rsd']
+    assert_equal :not_found, entry[:kind]
+
+    entry = @router['/test//xmlrpc.php?rsd']
+    assert_equal :not_found, entry[:kind]
+
+    entry = @router['/test///xmlrpc.php?rsd']
+    assert_equal :not_found, entry[:kind]
+
+    entry = @router['/test///xmlrpc.php?rsd']
+    assert_equal :not_found, entry[:kind]
+
+    entry = @router['/test/./qsdf']
+    assert_equal :not_found, entry[:kind]
+
+    entry = @router['/test/../../lib/syntropy.rb']
+    assert_equal :not_found, entry[:kind]
+
+    entry = @router['/../../lib/syntropy.rb']
+    assert_equal :not_found, entry[:kind]
+  end
 end