mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #2985
6d8b29ef
fix some link errors in debug mode for macos (stoffu)fdd4c5e5
move memwipe to epee to avoid common<->crypto circular dependencies (moneromooo-monero)40ab12a7
epee: remove dependency on common (moneromooo-monero)
This commit is contained in:
commit
ab8a32429a
23 changed files with 46 additions and 35 deletions
|
@ -60,12 +60,18 @@
|
|||
|
||||
#include "md5_l.h"
|
||||
#include "string_tools.h"
|
||||
#include "crypto/crypto.h"
|
||||
|
||||
namespace {
|
||||
namespace http = epee::net_utils::http;
|
||||
using fields = std::unordered_map<std::string, std::string>;
|
||||
using auth_responses = std::vector<fields>;
|
||||
|
||||
void rng(size_t len, uint8_t *ptr)
|
||||
{
|
||||
crypto::rand(len, ptr);
|
||||
}
|
||||
|
||||
std::string quoted(std::string str)
|
||||
{
|
||||
str.insert(str.begin(), '"');
|
||||
|
@ -250,13 +256,13 @@ std::string get_nc(std::uint32_t count)
|
|||
|
||||
TEST(HTTP_Server_Auth, NotRequired)
|
||||
{
|
||||
http::http_server_auth auth{};
|
||||
http::http_server_auth auth{}; // no rng here
|
||||
EXPECT_FALSE(auth.get_response(http::http_request_info{}));
|
||||
}
|
||||
|
||||
TEST(HTTP_Server_Auth, MissingAuth)
|
||||
{
|
||||
http::http_server_auth auth{{"foo", "bar"}};
|
||||
http::http_server_auth auth{{"foo", "bar"}, rng};
|
||||
EXPECT_TRUE(bool(auth.get_response(http::http_request_info{})));
|
||||
{
|
||||
http::http_request_info request{};
|
||||
|
@ -267,7 +273,7 @@ TEST(HTTP_Server_Auth, MissingAuth)
|
|||
|
||||
TEST(HTTP_Server_Auth, BadSyntax)
|
||||
{
|
||||
http::http_server_auth auth{{"foo", "bar"}};
|
||||
http::http_server_auth auth{{"foo", "bar"}, rng};
|
||||
EXPECT_TRUE(bool(auth.get_response(make_request({{u8"algorithm", "fo\xFF"}}))));
|
||||
EXPECT_TRUE(bool(auth.get_response(make_request({{u8"cnonce", "\"000\xFF\""}}))));
|
||||
EXPECT_TRUE(bool(auth.get_response(make_request({{u8"cnonce \xFF =", "\"000\xFF\""}}))));
|
||||
|
@ -277,7 +283,7 @@ TEST(HTTP_Server_Auth, BadSyntax)
|
|||
TEST(HTTP_Server_Auth, MD5)
|
||||
{
|
||||
http::login user{"foo", "bar"};
|
||||
http::http_server_auth auth{user};
|
||||
http::http_server_auth auth{user, rng};
|
||||
|
||||
const auto response = auth.get_response(make_request(fields{}));
|
||||
ASSERT_TRUE(bool(response));
|
||||
|
@ -326,7 +332,7 @@ TEST(HTTP_Server_Auth, MD5_sess)
|
|||
constexpr const char cnonce[] = "not a good cnonce";
|
||||
|
||||
http::login user{"foo", "bar"};
|
||||
http::http_server_auth auth{user};
|
||||
http::http_server_auth auth{user, rng};
|
||||
|
||||
const auto response = auth.get_response(make_request(fields{}));
|
||||
ASSERT_TRUE(bool(response));
|
||||
|
@ -378,7 +384,7 @@ TEST(HTTP_Server_Auth, MD5_auth)
|
|||
constexpr const char qop[] = "auth";
|
||||
|
||||
http::login user{"foo", "bar"};
|
||||
http::http_server_auth auth{user};
|
||||
http::http_server_auth auth{user, rng};
|
||||
|
||||
const auto response = auth.get_response(make_request(fields{}));
|
||||
ASSERT_TRUE(bool(response));
|
||||
|
@ -446,7 +452,7 @@ TEST(HTTP_Server_Auth, MD5_sess_auth)
|
|||
constexpr const char qop[] = "auth";
|
||||
|
||||
http::login user{"foo", "bar"};
|
||||
http::http_server_auth auth{user};
|
||||
http::http_server_auth auth{user, rng};
|
||||
|
||||
const auto response = auth.get_response(make_request(fields{}));
|
||||
ASSERT_TRUE(bool(response));
|
||||
|
@ -523,7 +529,7 @@ TEST(HTTP_Auth, DogFood)
|
|||
|
||||
const http::login user{"some_user", "ultimate password"};
|
||||
|
||||
http::http_server_auth server{user};
|
||||
http::http_server_auth server{user, rng};
|
||||
http::http_client_auth client{user};
|
||||
|
||||
http::http_request_info request{};
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include <stdint.h>
|
||||
#include "misc_log_ex.h"
|
||||
#include "common/memwipe.h"
|
||||
#include "memwipe.h"
|
||||
|
||||
// Probably won't catch the optimized out case, but at least we test
|
||||
// it works in the normal case
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue