traffic_ctl config convert remap

Move ATS core off the remaining remap-only parsing path and
route remap.config loading through the shared src/config remap
parser. This lets traffic_ctl and traffic_server use the
same conversion logic while leaving only runtime regex-mapping helpers
in the remap loader.

This builds off of the work to support remap.yaml here: #12997

Author: bneradt

include/config/remap.h

@@ -0,0 +1,92 @@
+/** @file
+
+  Shared remap configuration parsing and marshalling.
+
+  @section license License
+
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+#pragma once
+
+#include <string>
+#include <string_view>
+
+#include <yaml-cpp/yaml.h>
+
+#include "config/config_result.h"
+
+namespace config
+{
+
+using RemapConfig = YAML::Node;
+
+/**
+ * Parser for remap.yaml / remap.config configuration files.
+ *
+ * The parser normalizes the legacy remap.config format into the YAML tree shape
+ * consumed by the remap.yaml loader so both traffic_server and traffic_ctl can
+ * share one conversion path.
+ */
+class RemapParser
+{
+public:
+  /**
+   * Parse a remap configuration file.
+   *
+   * The format is auto-detected based on the filename extension and content.
+   *
+   * @param[in] filename Path to the configuration file.
+   * @return ConfigResult containing the parsed configuration tree or errors.
+   */
+  ConfigResult<RemapConfig> parse(std::string const &filename);
+
+  /**
+   * Parse remap configuration content from a string.
+   *
+   * The format is auto-detected from @a filename and @a content.
+   *
+   * @param[in] content The configuration content to parse.
+   * @param[in] filename Synthetic filename used for format detection.
+   * @return ConfigResult containing the parsed configuration tree or errors.
+   */
+  ConfigResult<RemapConfig> parse_content(std::string_view content, std::string const &filename = "remap.yaml");
+
+private:
+  enum class Format { YAML, Legacy };
+
+  Format                    detect_format(std::string_view content, std::string const &filename) const;
+  ConfigResult<RemapConfig> parse_yaml(std::string_view content) const;
+  ConfigResult<RemapConfig> parse_legacy(std::string_view content) const;
+};
+
+/**
+ * Marshaller for remap configuration.
+ */
+class RemapMarshaller
+{
+public:
+  /**
+   * Serialize configuration to YAML format.
+   *
+   * @param[in] config The configuration tree to serialize.
+   * @return YAML string representation.
+   */
+  std::string to_yaml(RemapConfig const &config);
+};
+
+} // namespace config

include/proxy/http/remap/RemapConfig.h

@@ -27,25 +27,6 @@
 
 class UrlRewrite;
 
-#define BUILD_TABLE_MAX_ARGS 2048
-
-// Remap inline options
-#define REMAP_OPTFLG_MAP_WITH_REFERER 0x0001u     /* "map_with_referer" option */
-#define REMAP_OPTFLG_PLUGIN           0x0002u     /* "plugin=" option (per remap plugin) */
-#define REMAP_OPTFLG_PPARAM           0x0004u     /* "pparam=" option (per remap plugin option) */
-#define REMAP_OPTFLG_METHOD           0x0008u     /* "method=" option (used for ACL filtering) */
-#define REMAP_OPTFLG_SRC_IP           0x0010u     /* "src_ip=" option (used for ACL filtering) */
-#define REMAP_OPTFLG_SRC_IP_CATEGORY  0x0020u     /* "src_ip_category=" option (used for ACL filtering) */
-#define REMAP_OPTFLG_ACTION           0x0040u     /* "action=" option (used for ACL filtering) */
-#define REMAP_OPTFLG_INTERNAL         0x0080u     /* only allow internal requests to hit this remap */
-#define REMAP_OPTFLG_IN_IP            0x0100u     /* "in_ip=" option (used for ACL filtering)*/
-#define REMAP_OPTFLG_STRATEGY         0x0200u     /* "strategy=" the name of the nexthop selection strategy */
-#define REMAP_OPTFLG_VOLUME           0x0400u     /* "volume=" cache volume override */
-#define REMAP_OPTFLG_MAP_ID           0x0800u     /* associate a map ID with this rule */
-#define REMAP_OPTFLG_INVERT           0x80000000u /* "invert" the rule (for src_ip and src_ip_category at least) */
-#define REMAP_OPTFLG_ALL_FILTERS \
-  (REMAP_OPTFLG_METHOD | REMAP_OPTFLG_SRC_IP | REMAP_OPTFLG_SRC_IP_CATEGORY | REMAP_OPTFLG_ACTION | REMAP_OPTFLG_INTERNAL)
-
 enum class ACLBehaviorPolicy {
   ACL_BEHAVIOR_LEGACY = 0,
   ACL_BEHAVIOR_MODERN,
@@ -55,12 +36,6 @@ struct BUILD_TABLE_INFO {
   BUILD_TABLE_INFO();
   ~BUILD_TABLE_INFO();
 
-  unsigned long remap_optflg = 0;
-  int           paramc       = 0;
-  int           argc         = 0;
-  char         *paramv[BUILD_TABLE_MAX_ARGS];
-  char         *argv[BUILD_TABLE_MAX_ARGS];
-
   ACLBehaviorPolicy behavior_policy{ACLBehaviorPolicy::ACL_BEHAVIOR_LEGACY}; // Default 0.
   bool              ip_allow_check_enabled_p = true;
   bool              accept_check_p           = true;
@@ -79,17 +54,6 @@ struct BUILD_TABLE_INFO {
   BUILD_TABLE_INFO &operator=(const BUILD_TABLE_INFO &) = delete; // disabled
 };
 
-const char *remap_parse_directive(BUILD_TABLE_INFO *bti, char *errbuf, size_t errbufsize);
-bool        remap_parse_config_bti(const char *path, BUILD_TABLE_INFO *bti);
-
-const char *remap_validate_filter_args(acl_filter_rule **rule_pp, const char *const *argv, int argc, char *errStrBuf,
-                                       size_t errStrBufSize, ACLBehaviorPolicy behavior_policy);
-
-unsigned long remap_check_option(const char *const *argv, int argc, unsigned long findmode = 0, int *_ret_idx = nullptr,
-                                 const char **argptr = nullptr);
-
-bool remap_parse_config(const char *path, UrlRewrite *rewrite);
-
 using load_remap_file_func = void (*)(const char *, const char *);
 
 extern load_remap_file_func load_remap_file_cb;

include/proxy/http/remap/UrlRewrite.h

@@ -265,6 +265,6 @@ class UrlRewrite : public RefCountObjInHeap
 
 void url_rewrite_remap_request(const UrlMappingContainer &mapping_container, URL *request_url, int scheme = -1);
 
-mapping_type get_mapping_type(const char *type_str, BUILD_TABLE_INFO *bti);
+mapping_type get_mapping_type(const char *type_str);
 
 bool process_regex_mapping_config(const char *from_host_lower, url_mapping *new_mapping, UrlRewrite::RegexMapping *reg_map);

src/config/CMakeLists.txt

@@ -17,10 +17,10 @@
 
 set(CONFIG_PUBLIC_HEADERS
     ${PROJECT_SOURCE_DIR}/include/config/config_result.h ${PROJECT_SOURCE_DIR}/include/config/ssl_multicert.h
-    ${PROJECT_SOURCE_DIR}/include/config/storage.h
+    ${PROJECT_SOURCE_DIR}/include/config/storage.h ${PROJECT_SOURCE_DIR}/include/config/remap.h
 )
 
-add_library(tsconfig ssl_multicert.cc storage.cc)
+add_library(tsconfig ssl_multicert.cc storage.cc remap.cc)
 
 add_library(ts::config ALIAS tsconfig)
 
@@ -48,7 +48,7 @@ endif()
 clang_tidy_check(tsconfig)
 
 if(BUILD_TESTING)
-  add_executable(test_tsconfig unit_tests/test_ssl_multicert.cc unit_tests/test_storage.cc)
+  add_executable(test_tsconfig unit_tests/test_ssl_multicert.cc unit_tests/test_storage.cc unit_tests/test_remap.cc)
 
   target_link_libraries(test_tsconfig PRIVATE tsconfig ts::tscore Catch2::Catch2WithMain)