Skip to content

Commit 0abde70

Browse files
paullouisageneaupaullouisageneau
authored
Merge pull request #888 from paullouisageneau/move-http-utils
Move HTTP utils to their own file
2 parents 834ff1f + 0d0257a commit 0abde70

7 files changed

+113
-73
lines changed

‎CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ set(LIBDATACHANNEL_IMPL_SOURCES
136136
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/sha.cpp
137137
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/pollinterrupter.cpp
138138
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/pollservice.cpp
139+
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/http.cpp
139140
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/httpproxytransport.cpp
140141
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/tcpserver.cpp
141142
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/tcptransport.cpp
@@ -169,6 +170,7 @@ set(LIBDATACHANNEL_IMPL_HEADERS
169170
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/sha.hpp
170171
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/pollinterrupter.hpp
171172
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/pollservice.hpp
173+
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/http.hpp
172174
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/httpproxytransport.hpp
173175
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/tcpserver.hpp
174176
${CMAKE_CURRENT_SOURCE_DIR}/src/impl/tcptransport.hpp

‎src/impl/http.cpp

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/**
2+
* Copyright (c) 2020-2023 Paul-Louis Ageneau
3+
*
4+
* This Source Code Form is subject to the terms of the Mozilla Public
5+
* License, v. 2.0. If a copy of the MPL was not distributed with this
6+
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
7+
*/
8+
9+
#include "http.hpp"
10+
11+
#include <algorithm>
12+
13+
namespace rtc::impl {
14+
15+
bool isHttpRequest(const byte *buffer, size_t size) {
16+
// Check the buffer starts with a valid-looking HTTP method
17+
for (size_t i = 0; i < size; ++i) {
18+
char c = static_cast<char>(buffer[i]);
19+
if (i > 0 && c == ' ')
20+
break;
21+
else if (i >= 8 || c < 'A' || c > 'Z')
22+
return false;
23+
}
24+
return true;
25+
}
26+
27+
size_t parseHttpLines(const byte *buffer, size_t size, std::list<string> &lines) {
28+
lines.clear();
29+
auto begin = reinterpret_cast<const char *>(buffer);
30+
auto end = begin + size;
31+
auto cur = begin;
32+
while (true) {
33+
auto last = cur;
34+
cur = std::find(cur, end, '\n');
35+
if (cur == end)
36+
return 0;
37+
string line(last, cur != begin && *std::prev(cur) == '\r' ? std::prev(cur++) : cur++);
38+
if (line.empty())
39+
break;
40+
lines.emplace_back(std::move(line));
41+
}
42+
43+
return cur - begin;
44+
}
45+
46+
std::multimap<string, string> parseHttpHeaders(const std::list<string> &lines) {
47+
std::multimap<string, string> headers;
48+
for (const auto &line : lines) {
49+
if (size_t pos = line.find_first_of(':'); pos != string::npos) {
50+
string key = line.substr(0, pos);
51+
string value = "";
52+
if (size_t subPos = line.find_first_not_of(' ', pos + 1); subPos != string::npos) {
53+
value = line.substr(subPos);
54+
}
55+
std::transform(key.begin(), key.end(), key.begin(),
56+
[](char c) { return std::tolower(c); });
57+
headers.emplace(std::move(key), std::move(value));
58+
} else {
59+
headers.emplace(line, "");
60+
}
61+
}
62+
63+
return headers;
64+
}
65+
66+
} // namespace rtc::impl

‎src/impl/http.hpp

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/**
2+
* Copyright (c) 2020-2023 Paul-Louis Ageneau
3+
*
4+
* This Source Code Form is subject to the terms of the Mozilla Public
5+
* License, v. 2.0. If a copy of the MPL was not distributed with this
6+
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
7+
*/
8+
9+
#ifndef RTC_IMPL_HTTP_H
10+
#define RTC_IMPL_HTTP_H
11+
12+
#include "common.hpp"
13+
14+
#include <list>
15+
#include <map>
16+
17+
namespace rtc::impl {
18+
19+
// Check the buffer contains the beginning of an HTTP request
20+
bool isHttpRequest(const byte *buffer, size_t size);
21+
22+
// Parse an http message into lines
23+
size_t parseHttpLines(const byte *buffer, size_t size, std::list<string> &lines);
24+
25+
// Parse headers of a http message
26+
std::multimap<string, string> parseHttpHeaders(const std::list<string> &lines);
27+
28+
} // namespace rtc::impl
29+
30+
#endif

‎src/impl/httpproxytransport.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "httpproxytransport.hpp"
1111
#include "tcptransport.hpp"
12-
#include "utils.hpp"
12+
#include "http.hpp"
1313

1414
#if RTC_ENABLE_WEBSOCKET
1515

@@ -103,7 +103,7 @@ string HttpProxyTransport::generateHttpRequest() {
103103

104104
size_t HttpProxyTransport::parseHttpResponse(std::byte *buffer, size_t size) {
105105
std::list<string> lines;
106-
size_t length = utils::parseHttpLines(buffer, size, lines);
106+
size_t length = parseHttpLines(buffer, size, lines);
107107
if (length == 0)
108108
return 0;
109109

‎src/impl/utils.cpp

+4-55
Original file line numberDiff line numberDiff line change
@@ -135,57 +135,6 @@ std::seed_seq random_seed() {
135135
return std::seed_seq(seed.begin(), seed.end());
136136
}
137137

138-
bool IsHttpRequest(const byte *buffer, size_t size) {
139-
// Check the buffer starts with a valid-looking HTTP method
140-
for (size_t i = 0; i < size; ++i) {
141-
char c = static_cast<char>(buffer[i]);
142-
if (i > 0 && c == ' ')
143-
break;
144-
else if (i >= 8 || c < 'A' || c > 'Z')
145-
return false;
146-
}
147-
return true;
148-
}
149-
150-
size_t parseHttpLines(const byte *buffer, size_t size, std::list<string> &lines) {
151-
lines.clear();
152-
auto begin = reinterpret_cast<const char *>(buffer);
153-
auto end = begin + size;
154-
auto cur = begin;
155-
while (true) {
156-
auto last = cur;
157-
cur = std::find(cur, end, '\n');
158-
if (cur == end)
159-
return 0;
160-
string line(last, cur != begin && *std::prev(cur) == '\r' ? std::prev(cur++) : cur++);
161-
if (line.empty())
162-
break;
163-
lines.emplace_back(std::move(line));
164-
}
165-
166-
return cur - begin;
167-
}
168-
169-
std::multimap<string, string> parseHttpHeaders(const std::list<string> &lines) {
170-
std::multimap<string, string> headers;
171-
for (const auto &line : lines) {
172-
if (size_t pos = line.find_first_of(':'); pos != string::npos) {
173-
string key = line.substr(0, pos);
174-
string value = "";
175-
if (size_t subPos = line.find_first_not_of(' ', pos + 1); subPos != string::npos) {
176-
value = line.substr(subPos);
177-
}
178-
std::transform(key.begin(), key.end(), key.begin(),
179-
[](char c) { return std::tolower(c); });
180-
headers.emplace(std::move(key), std::move(value));
181-
} else {
182-
headers.emplace(line, "");
183-
}
184-
}
185-
186-
return headers;
187-
}
188-
189138
namespace {
190139

191140
void thread_set_name_self(const char *name) {
@@ -205,9 +154,9 @@ void thread_set_name_self(const char *name) {
205154
} // namespace
206155

207156
namespace this_thread {
208-
void set_name(const string &name) {
209-
thread_set_name_self(name.c_str());
210-
}
211-
}
157+
158+
void set_name(const string &name) { thread_set_name_self(name.c_str()); }
159+
160+
} // namespace this_thread
212161

213162
} // namespace rtc::impl::utils

‎src/impl/utils.hpp

+3-11
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
#include <climits>
1515
#include <limits>
16-
#include <list>
1716
#include <map>
1817
#include <random>
1918
#include <vector>
@@ -34,15 +33,6 @@ string base64_encode(const binary &data);
3433
// Return a random seed sequence
3534
std::seed_seq random_seed();
3635

37-
// Check the buffer contains the beginning of an HTTP request
38-
bool IsHttpRequest(const byte *buffer, size_t size);
39-
40-
// Parse an http message into lines
41-
size_t parseHttpLines(const byte *buffer, size_t size, std::list<string> &lines);
42-
43-
// Parse headers of a http message
44-
std::multimap<string, string> parseHttpHeaders(const std::list<string> &lines);
45-
4636
template <typename Generator, typename Result = typename Generator::result_type>
4737
struct random_engine_wrapper {
4838
Generator &engine;
@@ -71,8 +61,10 @@ template <typename Generator = std::mt19937> auto random_bytes_engine() {
7161
}
7262

7363
namespace this_thread {
64+
7465
void set_name(const string &name);
75-
}
66+
67+
} // namespace this_thread
7668

7769
} // namespace rtc::impl::utils
7870

‎src/impl/wshandshake.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "internals.hpp"
1111
#include "sha.hpp"
1212
#include "utils.hpp"
13+
#include "http.hpp"
1314

1415
#if RTC_ENABLE_WEBSOCKET
1516

@@ -131,12 +132,12 @@ string WsHandshake::generateHttpError(int responseCode) {
131132
}
132133

133134
size_t WsHandshake::parseHttpRequest(const byte *buffer, size_t size) {
134-
if (!utils::IsHttpRequest(buffer, size))
135+
if (!isHttpRequest(buffer, size))
135136
throw RequestError("Invalid HTTP request for WebSocket", 400);
136137

137138
std::unique_lock lock(mMutex);
138139
std::list<string> lines;
139-
size_t length = utils::parseHttpLines(buffer, size, lines);
140+
size_t length = parseHttpLines(buffer, size, lines);
140141
if (length == 0)
141142
return 0;
142143

@@ -154,7 +155,7 @@ size_t WsHandshake::parseHttpRequest(const byte *buffer, size_t size) {
154155

155156
mPath = std::move(path);
156157

157-
auto headers = utils::parseHttpHeaders(lines);
158+
auto headers = parseHttpHeaders(lines);
158159

159160
auto h = headers.find("host");
160161
if (h == headers.end())
@@ -188,7 +189,7 @@ size_t WsHandshake::parseHttpRequest(const byte *buffer, size_t size) {
188189
size_t WsHandshake::parseHttpResponse(const byte *buffer, size_t size) {
189190
std::unique_lock lock(mMutex);
190191
std::list<string> lines;
191-
size_t length = utils::parseHttpLines(buffer, size, lines);
192+
size_t length = parseHttpLines(buffer, size, lines);
192193
if (length == 0)
193194
return 0;
194195

@@ -205,7 +206,7 @@ size_t WsHandshake::parseHttpResponse(const byte *buffer, size_t size) {
205206
if (code != 101)
206207
throw std::runtime_error("Unexpected response code " + to_string(code) + " for WebSocket");
207208

208-
auto headers = utils::parseHttpHeaders(lines);
209+
auto headers = parseHttpHeaders(lines);
209210

210211
auto h = headers.find("upgrade");
211212
if (h == headers.end())

0 commit comments

Comments
 (0)