fix(server): crash if remove not existing route

pistacheio · Apr 27, 2024 · 8bd3683 · 8bd3683
1 parent 769c0c3
commit 8bd3683
Show file tree

Hide file tree

Showing 24 changed files with 17 additions and 3 deletions.
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
-Files: tests/fuzzers/corpus/http-*.txt
+Files: tests/fuzzers/corpus/*
 Copyright: 2024 Mikhail Khachayants
 License: Apache-2.0
 
diff --git a/src/server/router.cc b/src/server/router.cc
@@ -217,6 +217,8 @@ namespace Pistache::Rest
                 collection      = &optional_;
                 break;
             case SegmentType::Splat:
+                if (!splat_)
+                    throw std::runtime_error("Requested route does not exist.");
                 return splat_->removeRoute(lower_path);
             }
 

diff --git a/tests/fuzzers/corpus/http-14.txt → .../151a3cba089a89c9d1407ffe08e66f5807206d4f b/tests/fuzzers/corpus/http-14.txt → .../151a3cba089a89c9d1407ffe08e66f5807206d4f
diff --git a/tests/fuzzers/corpus/http-1.txt → .../1a123ecb986602e7a63ad85805ad1b0fa68d7c20 b/tests/fuzzers/corpus/http-1.txt → .../1a123ecb986602e7a63ad85805ad1b0fa68d7c20
diff --git a/tests/fuzzers/corpus/http-17.txt → .../225aa589c4433f4dddf110306aeb1d7daa08d94c b/tests/fuzzers/corpus/http-17.txt → .../225aa589c4433f4dddf110306aeb1d7daa08d94c
diff --git a/tests/fuzzers/corpus/http-18.txt → .../2d8d49508cc1400610e846490e092f5b42b7798b b/tests/fuzzers/corpus/http-18.txt → .../2d8d49508cc1400610e846490e092f5b42b7798b
diff --git a/tests/fuzzers/corpus/http-11.txt → .../337a82e18ae0918c54607da0510111ecae14c5af b/tests/fuzzers/corpus/http-11.txt → .../337a82e18ae0918c54607da0510111ecae14c5af
diff --git a/tests/fuzzers/corpus/http-7.txt → .../3d744c1c4d7c10bd34b2ffc53104b736059d629e b/tests/fuzzers/corpus/http-7.txt → .../3d744c1c4d7c10bd34b2ffc53104b736059d629e
diff --git a/tests/fuzzers/corpus/http-15.txt → .../6a632298ac9ea6e05267892d3eb608e0c06d9759 b/tests/fuzzers/corpus/http-15.txt → .../6a632298ac9ea6e05267892d3eb608e0c06d9759
diff --git a/tests/fuzzers/corpus/http-12.txt → .../746dbfb89b36785075b80569064a1654be613f47 b/tests/fuzzers/corpus/http-12.txt → .../746dbfb89b36785075b80569064a1654be613f47
diff --git a/tests/fuzzers/corpus/http-4.txt → .../75952bb79d780fafa553c1a0bdddc9629cef88f2 b/tests/fuzzers/corpus/http-4.txt → .../75952bb79d780fafa553c1a0bdddc9629cef88f2
diff --git a/tests/fuzzers/corpus/http-5.txt → .../8165d5b7e7fe7c2952955c6618565316649c38c2 b/tests/fuzzers/corpus/http-5.txt → .../8165d5b7e7fe7c2952955c6618565316649c38c2
diff --git a/tests/fuzzers/corpus/http-6.txt → .../83e59c3a4c183f1f88678605e15da3aa568e3b59 b/tests/fuzzers/corpus/http-6.txt → .../83e59c3a4c183f1f88678605e15da3aa568e3b59
diff --git a/tests/fuzzers/corpus/http-10.txt → .../96607ea4447e4d6c28b00990ddec0ee0500955b5 b/tests/fuzzers/corpus/http-10.txt → .../96607ea4447e4d6c28b00990ddec0ee0500955b5
diff --git a/tests/fuzzers/corpus/http-9.txt → .../abfa7b63b7e37a2d992b53c76b7785c1af6ac595 b/tests/fuzzers/corpus/http-9.txt → .../abfa7b63b7e37a2d992b53c76b7785c1af6ac595
diff --git a/tests/fuzzers/corpus/http-8.txt → .../ac5f7a18fa9411453d5bd02978f667d7414876bf b/tests/fuzzers/corpus/http-8.txt → .../ac5f7a18fa9411453d5bd02978f667d7414876bf
diff --git a/tests/fuzzers/corpus/ad71f85838f68e0779de86398faa910d2ce0b229 b/tests/fuzzers/corpus/ad71f85838f68e0779de86398faa910d2ce0b229
@@ -0,0 +1 @@
+S*/apiR
diff --git a/tests/fuzzers/corpus/http-13.txt → .../d7e60042b9c7b4bb905fa6eef2ae3609413dd046 b/tests/fuzzers/corpus/http-13.txt → .../d7e60042b9c7b4bb905fa6eef2ae3609413dd046
diff --git a/tests/fuzzers/corpus/http-3.txt → .../f0c1aa1b78c96efd2b4e57f989c631b373333791 b/tests/fuzzers/corpus/http-3.txt → .../f0c1aa1b78c96efd2b4e57f989c631b373333791
diff --git a/tests/fuzzers/corpus/http-16.txt → .../f95881a2e895c9f007152c6c84e7b3d399c24a65 b/tests/fuzzers/corpus/http-16.txt → .../f95881a2e895c9f007152c6c84e7b3d399c24a65
diff --git a/tests/fuzzers/corpus/http-2.txt → .../fd57d162e86cdf4ca56f780a8280d5e5aa327b58 b/tests/fuzzers/corpus/http-2.txt → .../fd57d162e86cdf4ca56f780a8280d5e5aa327b58
diff --git a/tests/fuzzers/fuzz_parser.cpp b/tests/fuzzers/fuzz_parser.cpp
@@ -117,7 +117,7 @@ void fuzz_router(const std::string& input)
             });
             break;
         case 'R':
-            // ignoreExceptions([&] { tree.removeRoute(path); });
+            ignoreExceptions([&] { tree.removeRoute(path); });
             break;
         case 'F':
             ignoreExceptions([&] { tree.findRoute(path); });

diff --git a/tests/router_test.cc b/tests/router_test.cc
@@ -248,6 +248,17 @@ TEST(router_test, test_route_head_request)
     endpoint->shutdown();
 }
 
+TEST(router_test, test_remove_not_existing)
+{
+    SegmentTreeNode routes;
+
+    ASSERT_THROW(routes.removeRoute("/v1/hello"), std::runtime_error);
+    ASSERT_THROW(routes.removeRoute("/v1/hello/:name/"), std::runtime_error);
+    ASSERT_THROW(routes.removeRoute("/get/:key?/bar"), std::runtime_error);
+    ASSERT_THROW(routes.removeRoute("/say/*/to/*"), std::runtime_error);
+    ASSERT_THROW(routes.removeRoute("*/api"), std::runtime_error);
+}
+
 class MyHandler
 {
 public:

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.2.9.20240421
+0.2.9.20240427