From f54ae4ed4fd2f22525492e2525d0f24a314e65b2 Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara@cisco.com>
Date: Wed, 27 May 2020 19:16:27 +0200
Subject: [HICH-618] HTTP proxy automatic configuration.

Change-Id: I6a76b31b743f155a2d9f7b88e84b838265aab6c8
Signed-off-by: Mauro Sardara <msardara@cisco.com>
---
 .../includes/hicn/transport/utils/CMakeLists.txt   |  1 +
 .../includes/hicn/transport/utils/string_utils.h   | 75 ++++++++++++++++++++++
 libtransport/src/http/request.cc                   | 15 ++++-
 libtransport/src/protocols/raaqm.cc                |  4 --
 4 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 libtransport/includes/hicn/transport/utils/string_utils.h

(limited to 'libtransport')

diff --git a/libtransport/includes/hicn/transport/utils/CMakeLists.txt b/libtransport/includes/hicn/transport/utils/CMakeLists.txt
index f9a98dc69..11a9b0f25 100644
--- a/libtransport/includes/hicn/transport/utils/CMakeLists.txt
+++ b/libtransport/includes/hicn/transport/utils/CMakeLists.txt
@@ -30,6 +30,7 @@ list(APPEND HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/spinlock.h
   ${CMAKE_CURRENT_SOURCE_DIR}/fixed_block_allocator.h
   ${CMAKE_CURRENT_SOURCE_DIR}/event_thread.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/string_utils.h
 )
 
 if(NOT WIN32)
diff --git a/libtransport/includes/hicn/transport/utils/string_utils.h b/libtransport/includes/hicn/transport/utils/string_utils.h
new file mode 100644
index 000000000..bfda816f1
--- /dev/null
+++ b/libtransport/includes/hicn/transport/utils/string_utils.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * Licensed 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 <algorithm>
+#include <cctype>
+#include <locale>
+#include <string>
+
+namespace utils {
+
+/**
+ * Trim from start (in place)
+ */
+static inline void ltrim(std::string &s) {
+  s.erase(s.begin(), std::find_if(s.begin(), s.end(),
+                                  [](int ch) { return !std::isspace(ch); }));
+}
+
+/**
+ * Trim from end (in place)
+ */
+static inline void rtrim(std::string &s) {
+  s.erase(std::find_if(s.rbegin(), s.rend(),
+                       [](int ch) { return !std::isspace(ch); })
+              .base(),
+          s.end());
+}
+
+/**
+ * Trim from both ends (in place)
+ */
+static inline void trim(std::string &s) {
+  ltrim(s);
+  rtrim(s);
+}
+
+/**
+ * Trim from start (make a copy)
+ */
+static inline std::string ltrim_copy(std::string s) {
+  ltrim(s);
+  return s;
+}
+
+/**
+ * Trim from end (make a copy)
+ */
+static inline std::string rtrim_copy(std::string s) {
+  rtrim(s);
+  return s;
+}
+
+/**
+ * Trim from both ends (make a copy)
+ */
+static inline std::string trim_copy(std::string s) {
+  trim(s);
+  return s;
+}
+
+}
\ No newline at end of file
diff --git a/libtransport/src/http/request.cc b/libtransport/src/http/request.cc
index 87e499cc6..29118fd88 100644
--- a/libtransport/src/http/request.cc
+++ b/libtransport/src/http/request.cc
@@ -97,14 +97,15 @@ std::size_t HTTPRequest::parseHeaders(const uint8_t *buffer, std::size_t size,
       if (_http_version.substr(0, separator) != "HTTP") {
         return 0;
       }
-      http_version =
-          line.substr(separator + 1, _http_version.length() - separator - 1);
+      http_version = _http_version.substr(
+          separator + 1, _http_version.length() - separator - 1);
     } else {
       return 0;
     }
 
     std::size_t param_end;
     std::size_t value_start;
+    std::string header_key, header_value;
     while (getline(ss, line)) {
       if ((param_end = line.find(':')) != std::string::npos) {
         value_start = param_end + 1;
@@ -113,8 +114,16 @@ std::size_t HTTPRequest::parseHeaders(const uint8_t *buffer, std::size_t size,
             value_start++;
           }
           if (value_start < line.size()) {
-            headers[line.substr(0, param_end)] =
+            header_key = line.substr(0, param_end);
+            header_value =
                 line.substr(value_start, line.size() - value_start - 1);
+            std::transform(header_key.begin(), header_key.end(),
+                           header_key.begin(),
+                           [](unsigned char c) { return std::tolower(c); });
+            std::transform(header_value.begin(), header_value.end(),
+                           header_value.begin(),
+                           [](unsigned char c) { return std::tolower(c); });
+            headers[header_key] = header_value;
           }
         }
       } else {
diff --git a/libtransport/src/protocols/raaqm.cc b/libtransport/src/protocols/raaqm.cc
index 8f9ccc4f0..783d6194b 100644
--- a/libtransport/src/protocols/raaqm.cc
+++ b/libtransport/src/protocols/raaqm.cc
@@ -432,10 +432,6 @@ void RaaqmTransportProtocol::onTimeout(Interest::Ptr &&interest) {
       (*on_interest_retransmission_)(*socket_->getInterface(), *interest);
     }
 
-    if (*on_interest_output_) {
-      (*on_interest_output_)(*socket_->getInterface(), *interest);
-    }
-
     if (!is_running_) {
       return;
     }
-- 
cgit 1.2.3-korg