summaryrefslogtreecommitdiff
path: root/test/HttpRequestTest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'test/HttpRequestTest.cc')
-rw-r--r--test/HttpRequestTest.cc610
1 files changed, 334 insertions, 276 deletions
diff --git a/test/HttpRequestTest.cc b/test/HttpRequestTest.cc
index 273f6825..65cd2f20 100644
--- a/test/HttpRequestTest.cc
+++ b/test/HttpRequestTest.cc
@@ -16,6 +16,7 @@
#include "util.h"
#include "AuthConfig.h"
#include "TestUtil.h"
+#include "MessageDigest.h"
namespace aria2 {
@@ -31,6 +32,7 @@ class HttpRequestTest : public CppUnit::TestFixture {
CPPUNIT_TEST(testCreateRequest_head);
CPPUNIT_TEST(testCreateRequest_ipv6LiteralAddr);
CPPUNIT_TEST(testCreateRequest_endOffsetOverride);
+ CPPUNIT_TEST(testCreateRequest_wantDigest);
CPPUNIT_TEST(testCreateProxyRequest);
CPPUNIT_TEST(testIsRangeSatisfied);
CPPUNIT_TEST(testUserAgent);
@@ -39,9 +41,11 @@ class HttpRequestTest : public CppUnit::TestFixture {
CPPUNIT_TEST(testEnableAcceptEncoding);
CPPUNIT_TEST(testConditionalRequest);
CPPUNIT_TEST_SUITE_END();
+
private:
std::unique_ptr<Option> option_;
std::unique_ptr<AuthConfigFactory> authConfigFactory_;
+
public:
void setUp()
{
@@ -59,6 +63,7 @@ public:
void testCreateRequest_head();
void testCreateRequest_ipv6LiteralAddr();
void testCreateRequest_endOffsetOverride();
+ void testCreateRequest_wantDigest();
void testCreateProxyRequest();
void testIsRangeSatisfied();
void testUserAgent();
@@ -68,8 +73,7 @@ public:
void testConditionalRequest();
};
-
-CPPUNIT_TEST_SUITE_REGISTRATION( HttpRequestTest );
+CPPUNIT_TEST_SUITE_REGISTRATION(HttpRequestTest);
void HttpRequestTest::testGetStartByte()
{
@@ -89,13 +93,13 @@ void HttpRequestTest::testGetStartByte()
void HttpRequestTest::testGetEndByte()
{
size_t index = 1;
- size_t length = 1_m-1_k;
+ size_t length = 1_m - 1_k;
size_t segmentLength = 1_m;
HttpRequest httpRequest;
auto piece = std::make_shared<Piece>(index, length);
auto segment = std::make_shared<PiecedSegment>(segmentLength, piece);
- auto fileEntry = std::make_shared<FileEntry>("file", segmentLength*10, 0);
+ auto fileEntry = std::make_shared<FileEntry>("file", segmentLength * 10, 0);
CPPUNIT_ASSERT_EQUAL((int64_t)0LL, httpRequest.getEndByte());
@@ -110,13 +114,13 @@ void HttpRequestTest::testGetEndByte()
httpRequest.setRequest(request);
httpRequest.setFileEntry(fileEntry);
- CPPUNIT_ASSERT_EQUAL((int64_t)(segmentLength*index+length-1),
+ CPPUNIT_ASSERT_EQUAL((int64_t)(segmentLength * index + length - 1),
httpRequest.getEndByte());
// The end byte of FileEntry are placed inside segment
- fileEntry->setLength(segmentLength+100);
+ fileEntry->setLength(segmentLength + 100);
- CPPUNIT_ASSERT_EQUAL((int64_t)(segmentLength*index+100-1),
+ CPPUNIT_ASSERT_EQUAL((int64_t)(segmentLength * index + 100 - 1),
httpRequest.getEndByte());
request->setPipeliningHint(false);
@@ -141,31 +145,32 @@ void HttpRequestTest::testCreateRequest()
httpRequest.setFileEntry(fileEntry);
httpRequest.setAuthConfigFactory(authConfigFactory_.get());
httpRequest.setOption(option_.get());
+ httpRequest.setNoWantDigest(true);
// remove "Connection: close" and add end byte range
request->setPipeliningHint(true);
std::string expectedText = "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Range: bytes=0-1023\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Range: bytes=0-1023\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
request->setPipeliningHint(false);
expectedText = "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
@@ -174,41 +179,42 @@ void HttpRequestTest::testCreateRequest()
httpRequest.setSegment(segment);
expectedText = "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Range: bytes=1048576-\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Range: bytes=1048576-\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
request->setPipeliningHint(true);
expectedText = "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Range: bytes=1048576-2097151\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Range: bytes=1048576-2097151\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
// redirection set persistent connection flag to true
- request->redirectUri("http://localhost:8080/archives/download/aria2-1.0.0.tar.bz2");
+ request->redirectUri(
+ "http://localhost:8080/archives/download/aria2-1.0.0.tar.bz2");
expectedText = "GET /archives/download/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Range: bytes=1048576-2097151\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Range: bytes=1048576-2097151\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
@@ -219,13 +225,13 @@ void HttpRequestTest::testCreateRequest()
request->setKeepAliveHint(true);
expectedText = "GET /archives/download/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Range: bytes=1048576-\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Range: bytes=1048576-\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
@@ -241,53 +247,57 @@ void HttpRequestTest::testCreateRequest()
option_->put(PREF_HTTP_USER, "aria2user");
option_->put(PREF_HTTP_PASSWD, "aria2passwd");
- CPPUNIT_ASSERT(authConfigFactory_->activateBasicCred
- ("localhost", 8080, "/", option_.get()));
+ CPPUNIT_ASSERT(authConfigFactory_->activateBasicCred("localhost", 8080, "/",
+ option_.get()));
expectedText = "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Authorization: Basic YXJpYTJ1c2VyOmFyaWEycGFzc3dk\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Authorization: Basic YXJpYTJ1c2VyOmFyaWEycGFzc3dk\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
// enable http proxy auth
auto proxyRequest = std::make_shared<Request>();
- CPPUNIT_ASSERT(proxyRequest->setUri
- ("http://aria2proxyuser:aria2proxypasswd@localhost:9000"));
+ CPPUNIT_ASSERT(proxyRequest->setUri(
+ "http://aria2proxyuser:aria2proxypasswd@localhost:9000"));
httpRequest.setProxyRequest(proxyRequest);
- expectedText = "GET http://localhost:8080/archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Proxy-Authorization: Basic YXJpYTJwcm94eXVzZXI6YXJpYTJwcm94eXBhc3N3ZA==\r\n"
- "Authorization: Basic YXJpYTJ1c2VyOmFyaWEycGFzc3dk\r\n"
- "\r\n";
+ expectedText =
+ "GET http://localhost:8080/archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Proxy-Authorization: Basic "
+ "YXJpYTJwcm94eXVzZXI6YXJpYTJwcm94eXBhc3N3ZA==\r\n"
+ "Authorization: Basic YXJpYTJ1c2VyOmFyaWEycGFzc3dk\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
request->setPipeliningHint(true);
- expectedText = "GET http://localhost:8080/archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Range: bytes=0-1048575\r\n"
- "Connection: Keep-Alive\r\n"
- "Proxy-Authorization: Basic YXJpYTJwcm94eXVzZXI6YXJpYTJwcm94eXBhc3N3ZA==\r\n"
- "Authorization: Basic YXJpYTJ1c2VyOmFyaWEycGFzc3dk\r\n"
- "\r\n";
+ expectedText =
+ "GET http://localhost:8080/archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Range: bytes=0-1048575\r\n"
+ "Connection: Keep-Alive\r\n"
+ "Proxy-Authorization: Basic "
+ "YXJpYTJwcm94eXVzZXI6YXJpYTJwcm94eXBhc3N3ZA==\r\n"
+ "Authorization: Basic YXJpYTJ1c2VyOmFyaWEycGFzc3dk\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
@@ -296,15 +306,16 @@ void HttpRequestTest::testCreateRequest()
// turn off proxy auth
CPPUNIT_ASSERT(proxyRequest->setUri("http://localhost:9000"));
- expectedText = "GET http://localhost:8080/archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Authorization: Basic YXJpYTJ1c2VyOmFyaWEycGFzc3dk\r\n"
- "\r\n";
+ expectedText =
+ "GET http://localhost:8080/archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Authorization: Basic YXJpYTJ1c2VyOmFyaWEycGFzc3dk\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
}
@@ -318,8 +329,7 @@ void HttpRequestTest::testCreateRequest_ftp()
request->setUri("ftp://localhost:8080/archives/aria2-1.0.0.tar.bz2");
auto proxyRequest = std::make_shared<Request>();
- CPPUNIT_ASSERT(proxyRequest->setUri
- ("http://localhost:9000"));
+ CPPUNIT_ASSERT(proxyRequest->setUri("http://localhost:9000"));
HttpRequest httpRequest;
auto p = std::make_shared<Piece>(0, 1_m);
@@ -333,45 +343,47 @@ void HttpRequestTest::testCreateRequest_ftp()
httpRequest.setAuthConfigFactory(authConfigFactory_.get());
httpRequest.setOption(option_.get());
httpRequest.setProxyRequest(proxyRequest);
+ httpRequest.setNoWantDigest(true);
std::string expectedText =
- "GET ftp://aria2user@localhost:8080/archives/aria2-1.0.0.tar.bz2"
- " HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Authorization: Basic YXJpYTJ1c2VyOmFyaWEycGFzc3dk\r\n"
- "\r\n";
+ "GET ftp://aria2user@localhost:8080/archives/aria2-1.0.0.tar.bz2"
+ " HTTP/1.1\r\n"
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Authorization: Basic YXJpYTJ1c2VyOmFyaWEycGFzc3dk\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
// test proxy authorization
- CPPUNIT_ASSERT(proxyRequest->setUri
- ("http://aria2proxyuser:aria2proxypasswd@localhost:9000"));
+ CPPUNIT_ASSERT(proxyRequest->setUri(
+ "http://aria2proxyuser:aria2proxypasswd@localhost:9000"));
expectedText =
- "GET ftp://aria2user@localhost:8080/archives/aria2-1.0.0.tar.bz2"
- " HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Proxy-Authorization: Basic YXJpYTJwcm94eXVzZXI6YXJpYTJwcm94eXBhc3N3ZA==\r\n"
- "Authorization: Basic YXJpYTJ1c2VyOmFyaWEycGFzc3dk\r\n"
- "\r\n";
+ "GET ftp://aria2user@localhost:8080/archives/aria2-1.0.0.tar.bz2"
+ " HTTP/1.1\r\n"
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Proxy-Authorization: Basic "
+ "YXJpYTJwcm94eXVzZXI6YXJpYTJwcm94eXBhc3N3ZA==\r\n"
+ "Authorization: Basic YXJpYTJ1c2VyOmFyaWEycGFzc3dk\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
}
-template<typename InputIterator>
+template <typename InputIterator>
void foo(CookieStorage& st, InputIterator first, InputIterator last, time_t t)
{
- for(; first != last; ++first) {
+ for (; first != last; ++first) {
st.store(*first, t);
}
}
@@ -384,16 +396,20 @@ void HttpRequestTest::testCreateRequest_with_cookie()
auto fileEntry = std::make_shared<FileEntry>("file", 10_m, 0);
auto st = CookieStorage{};
- CPPUNIT_ASSERT(st.store(createCookie("name1", "value1", "localhost", true,
- "/archives", false), 0));
+ CPPUNIT_ASSERT(st.store(
+ createCookie("name1", "value1", "localhost", true, "/archives", false),
+ 0));
CPPUNIT_ASSERT(st.store(createCookie("name2", "value2", "localhost", true,
- "/archives/download", false), 0));
+ "/archives/download", false),
+ 0));
CPPUNIT_ASSERT(st.store(createCookie("name3", "value3", "aria2.org", false,
- "/archives/download", false), 0));
- CPPUNIT_ASSERT(st.store(createCookie("name4", "value4", "aria2.org", false,
- "/archives/", true), 0));
- CPPUNIT_ASSERT(st.store(createCookie("name5", "value5", "example.org", false,
- "/", false), 0));
+ "/archives/download", false),
+ 0));
+ CPPUNIT_ASSERT(st.store(
+ createCookie("name4", "value4", "aria2.org", false, "/archives/", true),
+ 0));
+ CPPUNIT_ASSERT(st.store(
+ createCookie("name5", "value5", "example.org", false, "/", false), 0));
HttpRequest httpRequest;
@@ -404,44 +420,45 @@ void HttpRequestTest::testCreateRequest_with_cookie()
httpRequest.setCookieStorage(&st);
httpRequest.setAuthConfigFactory(authConfigFactory_.get());
httpRequest.setOption(option_.get());
+ httpRequest.setNoWantDigest(true);
std::string expectedText = "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Cookie: name1=value1;\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Cookie: name1=value1;\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
request->setUri("http://localhost/archives/download/aria2-1.0.0.tar.bz2");
expectedText = "GET /archives/download/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Cookie: name2=value2;name1=value1;\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Cookie: name2=value2;name1=value1;\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
request->setUri("http://www.aria2.org/archives/download/aria2-1.0.0.tar.bz2");
expectedText = "GET /archives/download/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: www.aria2.org\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Cookie: name3=value3;\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: www.aria2.org\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Cookie: name3=value3;\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
@@ -449,14 +466,14 @@ void HttpRequestTest::testCreateRequest_with_cookie()
"aria2-1.0.0.tar.bz2");
expectedText = "GET /archives/download/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: www.aria2.org\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Cookie: name3=value3;name4=value4;\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: www.aria2.org\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Cookie: name3=value3;name4=value4;\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
@@ -464,28 +481,28 @@ void HttpRequestTest::testCreateRequest_with_cookie()
request->setUri("https://www.aria2.org/archives/aria2-1.0.0.tar.bz2");
expectedText = "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: www.aria2.org\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Cookie: name4=value4;\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: www.aria2.org\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Cookie: name4=value4;\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
request->setUri("http://example.org/aria2-1.0.0.tar.bz2");
expectedText = "GET /aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: example.org\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Cookie: name5=value5;\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: example.org\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Cookie: name5=value5;\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
}
@@ -493,22 +510,24 @@ void HttpRequestTest::testCreateRequest_with_cookie()
void HttpRequestTest::testCreateRequest_query()
{
auto request = std::make_shared<Request>();
- request->setUri("http://localhost/wiki?id=9ad5109a-b8a5-4edf-9373-56a1c34ae138");
+ request->setUri(
+ "http://localhost/wiki?id=9ad5109a-b8a5-4edf-9373-56a1c34ae138");
HttpRequest httpRequest;
httpRequest.disableContentEncoding();
httpRequest.setRequest(request);
httpRequest.setAuthConfigFactory(authConfigFactory_.get());
httpRequest.setOption(option_.get());
+ httpRequest.setNoWantDigest(true);
std::string expectedText =
- "GET /wiki?id=9ad5109a-b8a5-4edf-9373-56a1c34ae138 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "\r\n";
+ "GET /wiki?id=9ad5109a-b8a5-4edf-9373-56a1c34ae138 HTTP/1.1\r\n"
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
}
@@ -540,6 +559,7 @@ void HttpRequestTest::testCreateRequest_endOffsetOverride()
httpRequest.setRequest(request);
httpRequest.setAuthConfigFactory(authConfigFactory_.get());
httpRequest.setOption(option_.get());
+ httpRequest.setNoWantDigest(true);
auto p = std::make_shared<Piece>(0, 1_m);
auto segment = std::make_shared<PiecedSegment>(1_m, p);
httpRequest.setSegment(segment);
@@ -547,31 +567,66 @@ void HttpRequestTest::testCreateRequest_endOffsetOverride()
auto fileEntry = std::make_shared<FileEntry>("file", 10_g, 0);
httpRequest.setFileEntry(fileEntry);
// End byte is passed if it is not 0
- std::string expectedText =
- "GET /myfile HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Range: bytes=0-1073741823\r\n"
- "\r\n";
+ std::string expectedText = "GET /myfile HTTP/1.1\r\n"
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Range: bytes=0-1073741823\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
segment->updateWrittenLength(1);
- expectedText =
- "GET /myfile HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n"
- "Host: localhost\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "Range: bytes=1-1073741823\r\n"
- "\r\n";
+ expectedText = "GET /myfile HTTP/1.1\r\n"
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Range: bytes=1-1073741823\r\n"
+ "\r\n";
+
+ CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
+}
+
+void HttpRequestTest::testCreateRequest_wantDigest()
+{
+ auto request = std::make_shared<Request>();
+ request->setUri("http://localhost/");
+ HttpRequest httpRequest;
+ httpRequest.setRequest(request);
+ httpRequest.setAuthConfigFactory(authConfigFactory_.get());
+ httpRequest.setOption(option_.get());
+
+ std::string wantDigest;
+ if (MessageDigest::supports("sha-512")) {
+ wantDigest += "SHA-512;q=1, ";
+ }
+ if (MessageDigest::supports("sha-256")) {
+ wantDigest += "SHA-256;q=1, ";
+ }
+ if (MessageDigest::supports("sha-1")) {
+ wantDigest += "SHA;q=0.1, ";
+ }
+ if (!wantDigest.empty()) {
+ wantDigest.erase(wantDigest.size() - 2);
+ }
+
+ std::string expectedText = "GET / HTTP/1.1\r\n"
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "Want-Digest: " +
+ wantDigest + "\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
}
@@ -595,10 +650,10 @@ void HttpRequestTest::testCreateProxyRequest()
request->supportsPersistentConnection(true);
std::string expectedText = "CONNECT localhost:80 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Host: localhost:80\r\n"
- //"Proxy-Connection: close\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Host: localhost:80\r\n"
+ //"Proxy-Connection: close\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createProxyRequest());
@@ -606,10 +661,10 @@ void HttpRequestTest::testCreateProxyRequest()
request->setKeepAliveHint(true);
expectedText = "CONNECT localhost:80 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Host: localhost:80\r\n"
- //"Proxy-Connection: Keep-Alive\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Host: localhost:80\r\n"
+ //"Proxy-Connection: Keep-Alive\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createProxyRequest());
@@ -618,23 +673,24 @@ void HttpRequestTest::testCreateProxyRequest()
request->setPipeliningHint(true);
expectedText = "CONNECT localhost:80 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Host: localhost:80\r\n"
- //"Proxy-Connection: Keep-Alive\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Host: localhost:80\r\n"
+ //"Proxy-Connection: Keep-Alive\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createProxyRequest());
// test proxy authorization
- CPPUNIT_ASSERT(proxyRequest->setUri
- ("http://aria2proxyuser:aria2proxypasswd@localhost:9000"));
+ CPPUNIT_ASSERT(proxyRequest->setUri(
+ "http://aria2proxyuser:aria2proxypasswd@localhost:9000"));
expectedText = "CONNECT localhost:80 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Host: localhost:80\r\n"
- //"Proxy-Connection: Keep-Alive\r\n"
- "Proxy-Authorization: Basic YXJpYTJwcm94eXVzZXI6YXJpYTJwcm94eXBhc3N3ZA==\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Host: localhost:80\r\n"
+ //"Proxy-Connection: Keep-Alive\r\n"
+ "Proxy-Authorization: Basic "
+ "YXJpYTJwcm94eXVzZXI6YXJpYTJwcm94eXBhc3N3ZA==\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createProxyRequest());
}
@@ -665,13 +721,13 @@ void HttpRequestTest::testIsRangeSatisfied()
CPPUNIT_ASSERT(!httpRequest.isRangeSatisfied(range));
- uint64_t entityLength = segment->getSegmentLength()*10;
+ uint64_t entityLength = segment->getSegmentLength() * 10;
range = Range(segment->getPosition(), 0, entityLength);
CPPUNIT_ASSERT(httpRequest.isRangeSatisfied(range));
- fileEntry->setLength(entityLength-1);
+ fileEntry->setLength(entityLength - 1);
CPPUNIT_ASSERT(!httpRequest.isRangeSatisfied(range));
@@ -683,23 +739,21 @@ void HttpRequestTest::testIsRangeSatisfied()
CPPUNIT_ASSERT(!httpRequest.isRangeSatisfied(range));
- range = Range(segment->getPosition(),
- segment->getPosition()+segment->getLength()-1,
- entityLength);
+ range =
+ Range(segment->getPosition(),
+ segment->getPosition() + segment->getLength() - 1, entityLength);
CPPUNIT_ASSERT(httpRequest.isRangeSatisfied(range));
range = Range(segment->getPosition(),
- segment->getPosition()+segment->getLength()-1,
- 0);
+ segment->getPosition() + segment->getLength() - 1, 0);
CPPUNIT_ASSERT(!httpRequest.isRangeSatisfied(range));
- range = Range(0, segment->getPosition()+segment->getLength()-1,
- entityLength);
+ range =
+ Range(0, segment->getPosition() + segment->getLength() - 1, entityLength);
CPPUNIT_ASSERT(!httpRequest.isRangeSatisfied(range));
-
}
void HttpRequestTest::testUserAgent()
@@ -707,25 +761,26 @@ void HttpRequestTest::testUserAgent()
auto request = std::make_shared<Request>();
request->setUri("http://localhost:8080/archives/aria2-1.0.0.tar.bz2");
- //std::shared_ptr<Piece> p(new Piece(0, 1_k));
- //std::shared_ptr<Segment> segment(new PiecedSegment(1_k, p));
+ // std::shared_ptr<Piece> p(new Piece(0, 1_k));
+ // std::shared_ptr<Segment> segment(new PiecedSegment(1_k, p));
HttpRequest httpRequest;
httpRequest.disableContentEncoding();
httpRequest.setRequest(request);
- //httpRequest.setSegment(segment);
+ // httpRequest.setSegment(segment);
httpRequest.setUserAgent("aria2 (Linux)");
httpRequest.setAuthConfigFactory(authConfigFactory_.get());
httpRequest.setOption(option_.get());
+ httpRequest.setNoWantDigest(true);
std::string expectedText = "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2 (Linux)\r\n"
- "Accept: */*\r\n"
- "Host: localhost:8080\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "\r\n";
+ "User-Agent: aria2 (Linux)\r\n"
+ "Accept: */*\r\n"
+ "Host: localhost:8080\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
@@ -735,10 +790,10 @@ void HttpRequestTest::testUserAgent()
httpRequest.setProxyRequest(proxyRequest);
std::string expectedTextForProxy = "CONNECT localhost:8080 HTTP/1.1\r\n"
- "User-Agent: aria2 (Linux)\r\n"
- "Host: localhost:8080\r\n"
- //"Proxy-Connection: close\r\n"
- "\r\n";
+ "User-Agent: aria2 (Linux)\r\n"
+ "Host: localhost:8080\r\n"
+ //"Proxy-Connection: close\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedTextForProxy, httpRequest.createProxyRequest());
}
@@ -755,16 +810,17 @@ void HttpRequestTest::testAddHeader()
httpRequest.setOption(option_.get());
httpRequest.addHeader("X-ARIA2: v0.13\nX-ARIA2-DISTRIBUTE: enabled\n");
httpRequest.addHeader("Accept: text/html");
+ httpRequest.setNoWantDigest(true);
std::string expectedText = "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Host: localhost\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "X-ARIA2: v0.13\r\n"
- "X-ARIA2-DISTRIBUTE: enabled\r\n"
- "Accept: text/html\r\n"
- "\r\n";
+ "User-Agent: aria2\r\n"
+ "Host: localhost\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "X-ARIA2: v0.13\r\n"
+ "X-ARIA2-DISTRIBUTE: enabled\r\n"
+ "Accept: text/html\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
}
@@ -780,16 +836,17 @@ void HttpRequestTest::testAcceptMetalink()
httpRequest.setAuthConfigFactory(authConfigFactory_.get());
httpRequest.setOption(option_.get());
httpRequest.setAcceptMetalink(true);
+ httpRequest.setNoWantDigest(true);
std::string expectedText =
- "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*,application/metalink4+xml,application/metalink+xml\r\n"
- "Host: localhost\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "\r\n";
+ "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
+ "User-Agent: aria2\r\n"
+ "Accept: */*,application/metalink4+xml,application/metalink+xml\r\n"
+ "Host: localhost\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "\r\n";
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
}
@@ -803,6 +860,7 @@ void HttpRequestTest::testEnableAcceptEncoding()
httpRequest.setRequest(request);
httpRequest.setAuthConfigFactory(authConfigFactory_.get());
httpRequest.setOption(option_.get());
+ httpRequest.setNoWantDigest(true);
std::string acceptEncodings;
#ifdef HAVE_ZLIB
@@ -810,22 +868,21 @@ void HttpRequestTest::testEnableAcceptEncoding()
#endif // HAVE_ZLIB
std::string expectedTextHead =
- "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
- "User-Agent: aria2\r\n"
- "Accept: */*\r\n";
- std::string expectedTextTail =
- "Host: localhost\r\n"
- "Pragma: no-cache\r\n"
- "Cache-Control: no-cache\r\n"
- "Connection: close\r\n"
- "\r\n";
+ "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n"
+ "User-Agent: aria2\r\n"
+ "Accept: */*\r\n";
+ std::string expectedTextTail = "Host: localhost\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-cache\r\n"
+ "Connection: close\r\n"
+ "\r\n";
std::string expectedText = expectedTextHead;
expectedText += expectedTextTail;
CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
expectedText = expectedTextHead;
- if(!acceptEncodings.empty()) {
+ if (!acceptEncodings.empty()) {
expectedText += "Accept-Encoding: ";
expectedText += acceptEncodings;
expectedText += "\r\n";
@@ -846,7 +903,8 @@ void HttpRequestTest::testCreateRequest_ipv6LiteralAddr()
httpRequest.setAuthConfigFactory(authConfigFactory_.get());
httpRequest.setOption(option_.get());
- CPPUNIT_ASSERT(httpRequest.createRequest().find("Host: [::1]") != std::string::npos);
+ CPPUNIT_ASSERT(httpRequest.createRequest().find("Host: [::1]") !=
+ std::string::npos);
auto proxy = std::make_shared<Request>();
proxy->setUri("http://proxy");
generated by cgit (git 2.46.0) at 2026-10-12 03:10:57 +0000