Merge pull request #1209 from tyler92/fix-remove-route-crash

fix(server): crash if remove not existing route

.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
 

src/server/router.cc

@@ -85,6 +85,9 @@ namespace Pistache::Rest
     SegmentTreeNode::SegmentType
     SegmentTreeNode::getSegmentType(const std::string_view& fragment)
     {
+        if (fragment.empty())
+            return SegmentType::Fixed;
+
         auto optpos = fragment.find('?');
         if (fragment[0] == ':')
         {
@@ -217,6 +220,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);
             }
 
@@ -230,7 +235,7 @@ namespace Pistache::Rest
             }
             catch (const std::out_of_range&)
             {
-                throw std::runtime_error("Requested does not exist.");
+                throw std::runtime_error("Requested route does not exist.");
             }
         }
         else

tests/fuzzers/corpus/ad71f85838f68e0779de86398faa910d2ce0b229

@@ -0,0 +1 @@
+S*/apiR

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); });

tests/router_test.cc

@@ -12,6 +12,7 @@
 
 #include <algorithm>
 #include <gtest/gtest.h>
+#include <gmock/gmock-matchers.h>
 
 #include <pistache/common.h>
 #include <pistache/endpoint.h>
@@ -248,6 +249,29 @@ TEST(router_test, test_route_head_request)
     endpoint->shutdown();
 }
 
+TEST(router_test, test_remove_not_existing)
+{
+    SegmentTreeNode routes;
+
+    using testing::ThrowsMessage;
+
+    ASSERT_THAT(
+        [&] { routes.removeRoute("/v1/hello"); },
+        ThrowsMessage<std::runtime_error>("Requested route does not exist."));
+    ASSERT_THAT(
+        [&] { routes.removeRoute("/v1/hello/:name/"); },
+        ThrowsMessage<std::runtime_error>("Requested route does not exist."));
+    ASSERT_THAT(
+        [&] { routes.removeRoute("/get/:key?/bar"); },
+        ThrowsMessage<std::runtime_error>("Requested route does not exist."));
+    ASSERT_THAT(
+        [&] { routes.removeRoute("/say/*/to/*"); },
+        ThrowsMessage<std::runtime_error>("Requested route does not exist."));
+    ASSERT_THAT(
+        [&] { routes.removeRoute("*/api"); },
+        ThrowsMessage<std::runtime_error>("Requested route does not exist."));
+}
+
 class MyHandler
 {
 public:

version.txt

@@ -1 +1 @@
-0.2.9.20240427
+0.2.9.20240428