Skip to content

Refactor NLAP XML parsing to a new Xerces-based tree parser with static DTD validation #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 5 commits into
base: main
Choose a base branch
from
+586 −1,420
Draft

Refactor NLAP XML parsing to a new Xerces-based tree parser with static DTD validation #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc4d112
Rewrite XML parser core and tests
Copilot Jul 25, 2026
65d43bd
Fix XML parser error classification and unit checks
Copilot Jul 25, 2026
342c35f
Harden XML parser against XXE during parse passes
Copilot Jul 25, 2026
2c854ef
Remove coroutine usage from XML parser implementation
Copilot Jul 25, 2026
d07c727
Reapply XML parser specs using C++23 std::generator
Copilot Jul 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ endif()
# set g++ compiler flags
if ( DEFINED DEBUG_BUILD )
add_compile_definitions(DEBUG_BUILD)
set(CMAKE_CXX_FLAGS "-g -fPIC -Wall -pthread -std=c++20 -Wno-unused-result -Wsign-compare -Wformat -Werror=format-security -fwrapv -rdynamic -fno-elide-constructors")
set(CMAKE_CXX_FLAGS "-g -fPIC -Wall -pthread -std=c++23 -Wno-unused-result -Wsign-compare -Wformat -Werror=format-security -fwrapv -rdynamic -fno-elide-constructors")
else()
set(CMAKE_CXX_FLAGS "-g -fPIC -Wall -pthread -O3 -fstack-protector-strong -std=c++20 -Wno-unused-result -Wsign-compare -Wformat -Werror=format-security -DNDEBUG -fwrapv -fno-elide-constructors")
set(CMAKE_CXX_FLAGS "-g -fPIC -Wall -pthread -O3 -fstack-protector-strong -std=c++23 -Wno-unused-result -Wsign-compare -Wformat -Werror=format-security -DNDEBUG -fwrapv -fno-elide-constructors")
endif()

# set boost specs
Expand Down
1 change: 1 addition & 0 deletions lib/xml/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ install(
FILES
./xmlparser.hpp
./xmlconstants.hpp
./static-dtd.hpp
DESTINATION /usr/local/include
)
6 changes: 6 additions & 0 deletions lib/xml/static-dtd.hpp
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 11 additions & 6 deletions lib/xml/xmlconstants.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
#pragma once

#include <string>
#include <cstdint>
#include <string_view>

//- NLAP XML start marker: configurable tag used to identify message boundaries
static constexpr std::string_view NLAP_XML_START_MARKER("<NLAP>");

//- NLAP XML end marker: used to split stream data into individual NLAP messages
static const std::string NLAP_XML_END_MARKER("</NLAP>");
static constexpr std::string_view NLAP_XML_END_MARKER("</NLAP>");

//- XML declaration prepended to messages that do not already contain it
static const std::string NLAP_XML_DECLARATION("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
static constexpr std::string_view NLAP_XML_DECLARATION("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");

//- Path to the NLAP DTD used for validation (override at compile time via -DNLAP_DTD_PATH=...)
#ifndef NLAP_DTD_PATH
#define NLAP_DTD_PATH "specs/xml/nlap.dtd"
#endif

static const std::string NLAP_DTD_SYSTEM_PATH(NLAP_DTD_PATH);
static const std::string_view NLAP_DTD_SYSTEM_PATH(NLAP_DTD_PATH);

//- constant expressions (error)
constexpr uint16_t XML_ERROR_PARSE_BUFFER_EXCEEDED = 10;
constexpr uint16_t XML_ERROR_BAD_REQUEST = 400;
constexpr uint16_t XML_ERROR_INVALID_CONTENT_DTD = 10;
constexpr uint16_t XML_ERROR_INVALID_SYNTAX = 20;
constexpr uint16_t XML_ERROR_INVALID_FRAMING = 30;
Loading
Loading