GopherSecurity · viksachdev · Sep 3, 2025 · Sep 3, 2025 · Sep 3, 2025 · Sep 3, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,10 @@
 cmake_minimum_required(VERSION 3.10)
 
+# Set policy for FetchContent timestamp extraction
+if(POLICY CMP0135)
+    cmake_policy(SET CMP0135 NEW)
+endif()
+
 #Prevent in - source builds
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     message(FATAL_ERROR "In-source builds are not allowed.
@@ -78,6 +83,9 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Debug)
 endif()
 
+# Set custom install prefix
+set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/install_prefix_dir")
+
 #Compiler flags
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
     add_compile_options(-Wall -Wextra -Wpedantic)
@@ -117,6 +125,7 @@ endif()
 #Find packages
 find_package(Threads REQUIRED)
 find_package(OpenSSL REQUIRED)
+find_package(yaml-cpp REQUIRED)
 
 #Find libevent
 find_package(PkgConfig)
@@ -176,33 +185,33 @@ message(STATUS "")
 option(MCP_USE_LLHTTP "Use llhttp for HTTP/1.x parsing" ON)
 
 if(MCP_USE_LLHTTP)
-#Use a simpler approach - download just the release archive
+    # Use a simpler approach - download just the release archive
     FetchContent_Declare(
         llhttp
         URL https://github.com/nodejs/llhttp/archive/refs/tags/release/v9.1.3.tar.gz
+        DOWNLOAD_EXTRACT_TIMESTAMP TRUE
     )
 
-    FetchContent_GetProperties(llhttp)
-    if(NOT llhttp_POPULATED)
-        message(STATUS "Downloading llhttp... This may take a moment depending on your connection speed.")
-        FetchContent_Populate(llhttp)
-        message(STATUS "llhttp download complete.")
-
-#Build llhttp as a simple static library
-#The release archive contains pre - generated C files
-        file(GLOB LLHTTP_SOURCES ${llhttp_SOURCE_DIR}/src/*.c)
-
+    message(STATUS "Downloading llhttp... This may take a moment depending on your connection speed.")
+    FetchContent_MakeAvailable(llhttp)
+    message(STATUS "llhttp download complete.")
+
+    # Build llhttp as a simple static library
+    # The release archive contains pre-generated C files
+    file(GLOB LLHTTP_SOURCES ${llhttp_SOURCE_DIR}/src/*.c)
+
+    if(NOT TARGET llhttp)
         add_library(llhttp STATIC ${LLHTTP_SOURCES})
         target_include_directories(llhttp PUBLIC ${llhttp_SOURCE_DIR}/include)
 
         # Disable warnings for third-party code
         if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
             target_compile_options(llhttp PRIVATE -w)
         endif()
-
-        set(LLHTTP_FOUND TRUE)
-        message(STATUS "llhttp successfully configured for build from source")
     endif()
+
+    set(LLHTTP_FOUND TRUE)
+    message(STATUS "llhttp successfully configured for build from source")
 else()
     set(LLHTTP_FOUND FALSE)
     message(STATUS "llhttp support disabled")
@@ -280,15 +289,9 @@ else()
     message(STATUS "nghttp2 support disabled")
 endif()
 
-# fmt library for formatting
-FetchContent_Declare(
-    fmt
-    GIT_REPOSITORY https://github.com/fmtlib/fmt.git
-    GIT_TAG 10.1.1
-)
-message(STATUS "Downloading fmt... This may take a moment depending on your connection speed.")
-FetchContent_MakeAvailable(fmt)
-message(STATUS "fmt download complete.")
+# fmt library for formatting - use system-installed version
+find_package(fmt REQUIRED)
+message(STATUS "Found fmt: ${fmt_VERSION}")
 
 # nlohmann/json
 FetchContent_Declare(
@@ -300,6 +303,18 @@ message(STATUS "Downloading nlohmann/json... This may take a moment depending on
 FetchContent_MakeAvailable(nlohmann_json)
 message(STATUS "nlohmann/json download complete.")
 
+# json-schema-validator (header-only) for schema validation
+if(NOT TARGET nlohmann_json_schema_validator)
+    FetchContent_Declare(
+        json_schema_validator
+        GIT_REPOSITORY https://github.com/pboettch/json-schema-validator.git
+        GIT_TAG 2.3.0
+    )
+    message(STATUS "Downloading json-schema-validator... This may take a moment depending on your connection speed.")
+    FetchContent_MakeAvailable(json_schema_validator)
+    message(STATUS "json-schema-validator download complete.")
+endif()
+
 # Google Test
 FetchContent_Declare(
     googletest
@@ -318,30 +333,8 @@ message(STATUS "All dependencies ready. Configuring build...")
 message(STATUS "==================================================")
 message(STATUS "")
 
-# nlohmann/json - check if already available (when used as submodule)
-if(NOT TARGET nlohmann_json::nlohmann_json)
-    FetchContent_Declare(
-        nlohmann_json
-        GIT_REPOSITORY https://github.com/nlohmann/json.git
-        GIT_TAG v3.11.3
-    )
-    FetchContent_MakeAvailable(nlohmann_json)
-endif()
-
-# Google Test - only fetch if not already available and not a submodule
-if(NOT GOPHER_MCP_IS_SUBMODULE)
-    # Check if Google Test is already available
-    if(NOT TARGET gtest AND NOT TARGET GTest::gtest)
-        FetchContent_Declare(
-            googletest
-            GIT_REPOSITORY https://github.com/google/googletest.git
-            GIT_TAG release-1.12.1
-        )
-        # For Windows: Prevent overriding the parent project's compiler/linker settings
-        set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-        FetchContent_MakeAvailable(googletest)
-    endif()
-endif()
+# Note: nlohmann/json already fetched above (lines 298-305)
+# Note: Google Test already fetched above (lines 319-329)
 
 # Source files - split core from client/server to avoid circular deps
 set(MCP_CORE_SOURCES
@@ -383,8 +376,24 @@ set(MCP_CORE_SOURCES
     src/filter/protocol_detection_filter_chain_factory.cc
     src/filter/http_routing_filter.cc
     src/filter/protocol_detection_filter.cc
+    src/filter/filter_registry.cc
+    src/filter/http_codec_filter_factory.cc
+    src/filter/sse_codec_filter_factory.cc
+    src/filter/json_rpc_dispatcher_filter_factory.cc
+    src/filter/rate_limit_factory.cc
+    src/filter/circuit_breaker_factory.cc
+    src/filter/metrics_factory.cc
+    src/filter/filter_chain_assembler.cc
     src/mcp_connection_manager.cc
     src/protocol/mcp_protocol_state_machine.cc
+    src/config/config_manager.cc
+    src/config/file_config_source.cc
+    src/config/config_merger.cc
+    src/config/config_validator.cc
+    src/config/units.cc
+    # TODO : Re-enable filter order validator for new architecture
+    # src/config/filter_order_validator.cc
+    src/config/predicate_evaluator.cc
 )
 
 # Client and server sources that need event library
@@ -497,7 +506,12 @@ foreach(lib_target ${REAL_TARGETS})
             PRIVATE
                 nlohmann_json::nlohmann_json
                 ${LIBEVENT_LIBRARIES}
+                yaml-cpp::yaml-cpp
+                $<$<TARGET_EXISTS:gopher-mcp-logging>:gopher-mcp-logging>
+                $<$<AND:$<NOT:$<TARGET_EXISTS:gopher-mcp-logging>>,$<TARGET_EXISTS:gopher-mcp-logging-static>>:gopher-mcp-logging-static>
         )
+        # Disable json-schema-validator by default to avoid export/link issues
+        target_compile_definitions(${lib_target} PUBLIC MCP_HAS_JSON_SCHEMA_VALIDATOR=0)
         if(LIBEVENT_LIBRARY_DIRS)
             target_link_directories(${lib_target} PRIVATE ${LIBEVENT_LIBRARY_DIRS})
         endif()

diff --git a/examples/mcp/CMakeLists.txt b/examples/mcp/CMakeLists.txt
@@ -12,19 +12,36 @@ target_link_libraries(mcp_example_client
     ${LIBEVENT_LIBRARIES}
 )
 
-# MCP Server Example  
-add_executable(mcp_example_server 
+# MCP Server Example
+add_executable(mcp_example_server
     mcp_example_server.cc
 )
 
-target_link_libraries(mcp_example_server 
+target_link_libraries(mcp_example_server
     gopher-mcp
     gopher-mcp-event
     gopher-mcp-echo-advanced  # For advanced features
     ${LIBEVENT_LIBRARIES}
 )
 
+# Config-driven MCP Server Example
+add_executable(mcp_config_example_server
+    mcp_config_example_server.cc
+)
+
+target_link_libraries(mcp_config_example_server
+    gopher-mcp
+    gopher-mcp-event
+    ${LIBEVENT_LIBRARIES}
+)
+
 # Install targets
-install(TARGETS mcp_example_client mcp_example_server
+install(TARGETS mcp_example_client mcp_example_server mcp_config_example_server
     RUNTIME DESTINATION bin
+)
+
+# Install example configuration files
+install(FILES
+    ../configs/mcp_server_example.json
+    DESTINATION share/mcp/examples/configs
 )