Skip to content
Snippets Groups Projects
Commit d15b4f79 authored by Amna Snene's avatar Amna Snene Committed by Amna Snene
Browse files

test: remove certstore test and ice test from the daemon 

certstore test and ice test are moved to DHTnet project.

Change-Id: Iefba61c36d5790df5753fefd97b0eaa40f15ad0d
parent c7dfb70f
Branches
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 0
− 8
View file @ d15b4f79
......@@ -712,10 +712,6 @@ else()
target_link_libraries(ut_base64 ut_library)
add_test(NAME base64 COMMAND ut_base64)
add_executable(ut_ice test/unitTest/ice/ice.cpp)
target_link_libraries(ut_ice ut_library)
add_test(NAME ice COMMAND ut_ice)
add_executable(ut_ice_sdp_parser test/unitTest/ice/ice_sdp_parser.cpp)
target_link_libraries(ut_ice_sdp_parser ut_library)
add_test(NAME ice_sdp_parser COMMAND ut_ice_sdp_parser)
......@@ -788,10 +784,6 @@ else()
target_link_libraries(ut_utf8_utils ut_library)
add_test(NAME utf8_utils COMMAND ut_utf8_utils)
add_executable(ut_certstore test/unitTest/certstore.cpp)
target_link_libraries(ut_certstore ut_library)
add_test(NAME certstore COMMAND ut_certstore)
add_executable(ut_presence test/unitTest/presence/presence.cpp)
target_link_libraries(ut_presence ut_library)
add_test(NAME presence COMMAND ut_presence)
......
test/meson.build
+ 0
− 21
View file @ d15b4f79
......@@ -77,17 +77,6 @@ test('call', ut_call,
)
ut_certificate_store = executable('ut_certificate_store',
sources: files('unitTest/certstore.cpp'),
include_directories: ut_includedirs,
dependencies: ut_dependencies,
link_with: ut_library
)
test('certificate_store', ut_certificate_store,
workdir: ut_workdir, is_parallel: false, timeout: 1800
)
ut_conference = executable('ut_conference',
sources: files('unitTest/call/conference.cpp'),
include_directories: ut_includedirs,
......@@ -206,16 +195,6 @@ test('hold_resume', ut_hold_resume,
)
ut_ice = executable('ut_ice',
sources: files('unitTest/ice/ice.cpp'),
include_directories: ut_includedirs,
dependencies: ut_dependencies,
link_with: ut_library
)
test('ice', ut_ice,
workdir: ut_workdir, is_parallel: false, timeout: 1800
)
ut_ice_sdp_parser = executable('ut_ice_sdp_parser',
sources: files('unitTest/ice/ice_sdp_parser.cpp'),
include_directories: ut_includedirs,
......
test/unitTest/Makefile.am
+ 0
− 11
View file @ d15b4f79
......@@ -31,12 +31,6 @@ ut_account_archive_SOURCES = account_archive/account_archive.cpp common.cpp
check_PROGRAMS += ut_migration
ut_migration_SOURCES = account_archive/migration.cpp common.cpp
#
# certstore
#
check_PROGRAMS += ut_certstore
ut_certstore_SOURCES = certstore.cpp common.cpp
#
# scheduler
#
......@@ -216,11 +210,6 @@ ut_typers_SOURCES = conversation/typers.cpp conversation/conversationcommon.cpp
check_PROGRAMS += ut_syncHistory
ut_syncHistory_SOURCES = syncHistory/syncHistory.cpp common.cpp
#
# ice
#
check_PROGRAMS += ut_ice
ut_ice_SOURCES = ice/ice.cpp common.cpp
#
# revoke
......
test/unitTest/certstore.cpp deleted 100644 → 0
+ 0
− 245
View file @ c7dfb70f
/*
* Copyright (C) 2004-2024 Savoir-faire Linux Inc.
*
* Author: florian Wiesweg <florian.wiesweg@campus.tu-berlin.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include "common.h"
#include "test_runner.h"
#include "manager.h"
#include "jami.h"
#include "jamidht/jamiaccount.h"
#include "logger.h"
#include <dhtnet/certstore.h>
namespace jami {
namespace test {
class CertStoreTest : public CppUnit::TestFixture
{
public:
CertStoreTest()
{
// Init daemon
libjami::init(
libjami::InitFlag(libjami::LIBJAMI_FLAG_DEBUG | libjami::LIBJAMI_FLAG_CONSOLE_LOG));
if (not Manager::instance().initialized)
CPPUNIT_ASSERT(libjami::start("jami-sample.yml"));
}
~CertStoreTest() { libjami::fini(); }
static std::string name() { return "certstore"; }
void setUp();
void tearDown();
std::string aliceId;
std::string bobId;
private:
void trustStoreTest();
void getCertificateWithSplitted();
void testBannedParent();
CPPUNIT_TEST_SUITE(CertStoreTest);
CPPUNIT_TEST(trustStoreTest);
CPPUNIT_TEST(getCertificateWithSplitted);
CPPUNIT_TEST(testBannedParent);
CPPUNIT_TEST_SUITE_END();
};
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(CertStoreTest, CertStoreTest::name());
void
CertStoreTest::setUp()
{
auto actors = load_actors_and_wait_for_announcement("actors/alice-bob.yml");
aliceId = actors["alice"];
bobId = actors["bob"];
}
void
CertStoreTest::tearDown()
{
wait_for_removal_of({aliceId, bobId});
}
void
CertStoreTest::trustStoreTest()
{
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
auto ca = dht::crypto::generateIdentity("test CA");
auto account = dht::crypto::generateIdentity("test account", ca, 4096, true);
auto device = dht::crypto::generateIdentity("test device", account);
auto device2 = dht::crypto::generateIdentity("test device 2", account);
auto storeSize = aliceAccount->certStore().getPinnedCertificates().size();
auto id = ca.second->getId().toString();
auto pinned = aliceAccount->certStore().getPinnedCertificates();
CPPUNIT_ASSERT(std::find_if(pinned.begin(), pinned.end(), [&](auto v) { return v == id; })
== pinned.end());
// Test certificate status
auto certAllowed = aliceAccount->accountManager()->getCertificatesByStatus(
dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
CPPUNIT_ASSERT(
std::find_if(certAllowed.begin(), certAllowed.end(), [&](auto v) { return v == id; })
== certAllowed.end());
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(id)
== dhtnet::tls::TrustStore::PermissionStatus::UNDEFINED);
aliceAccount->setCertificateStatus(ca.second, dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
certAllowed = aliceAccount->accountManager()->getCertificatesByStatus(
dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
CPPUNIT_ASSERT(
std::find_if(certAllowed.begin(), certAllowed.end(), [&](auto v) { return v == id; })
!= certAllowed.end());
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(id)
== dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
aliceAccount->setCertificateStatus(ca.second, dhtnet::tls::TrustStore::PermissionStatus::UNDEFINED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(id)
== dhtnet::tls::TrustStore::PermissionStatus::UNDEFINED);
aliceAccount->setCertificateStatus(ca.second, dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(id)
== dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
// Test getPinnedCertificates
pinned = aliceAccount->certStore().getPinnedCertificates();
CPPUNIT_ASSERT(pinned.size() == storeSize + 2 /* account + device */);
CPPUNIT_ASSERT(std::find_if(pinned.begin(), pinned.end(), [&](auto v) { return v == id; })
!= pinned.end());
// Test findCertificateByUID & findIssuer
CPPUNIT_ASSERT(!aliceAccount->certStore().findCertificateByUID("NON_EXISTING_ID"));
auto cert = aliceAccount->certStore().findCertificateByUID(id);
CPPUNIT_ASSERT(cert);
auto issuer = aliceAccount->certStore().findIssuer(cert);
CPPUNIT_ASSERT(issuer);
CPPUNIT_ASSERT(issuer->getId().toString() == id);
// Test is allowed
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*ca.second));
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*account.second));
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*device.second));
// Ban device
aliceAccount->setCertificateStatus(device.second, dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(device.second->getId().toString())
== dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(id)
== dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*ca.second));
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*account.second));
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*device.second));
// Ban account
aliceAccount->setCertificateStatus(account.second, dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(account.second->getId().toString())
== dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*ca.second));
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*account.second));
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*device2.second));
// Unban account
aliceAccount->setCertificateStatus(account.second,
dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(account.second->getId().toString())
== dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*ca.second));
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*account.second));
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*device2.second));
// Ban CA
aliceAccount->setCertificateStatus(ca.second, dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(ca.second->getId().toString())
== dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*ca.second));
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*account.second));
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*device2.second));
aliceAccount->setCertificateStatus(ca.second, dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(ca.second->getId().toString())
== dhtnet::tls::TrustStore::PermissionStatus::BANNED);
// Test unpin
aliceAccount->certStore().unpinCertificate(id);
pinned = aliceAccount->certStore().getPinnedCertificates();
CPPUNIT_ASSERT(std::find_if(pinned.begin(), pinned.end(), [&](auto v) { return v == id; })
== pinned.end());
// Test statusToStr
/*CPPUNIT_ASSERT(strcmp(dhtnet::tls::statusToStr(dhtnet::tls::TrustStatus::TRUSTED),
libdhtnet::Certificate::TrustStatus::TRUSTED)
== 0);
CPPUNIT_ASSERT(strcmp(dhtnet::tls::statusToStr(dhtnet::tls::TrustStatus::UNTRUSTED),
libdhtnet::Certificate::TrustStatus::UNTRUSTED)
== 0);*/
}
void
CertStoreTest::getCertificateWithSplitted()
{
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
auto ca = dht::crypto::generateIdentity("test CA");
auto account = dht::crypto::generateIdentity("test account", ca, 4096, true);
auto device = dht::crypto::generateIdentity("test device", account);
auto caCert = std::make_shared<dht::crypto::Certificate>(ca.second->toString(false));
auto accountCert = std::make_shared<dht::crypto::Certificate>(account.second->toString(false));
auto devicePartialCert = std::make_shared<dht::crypto::Certificate>(
device.second->toString(false));
aliceAccount->certStore().pinCertificate(caCert);
aliceAccount->certStore().pinCertificate(accountCert);
aliceAccount->certStore().pinCertificate(devicePartialCert);
auto fullCert = aliceAccount->certStore().getCertificate(device.second->getId().toString());
CPPUNIT_ASSERT(fullCert->issuer && fullCert->issuer->getUID() == accountCert->getUID());
CPPUNIT_ASSERT(fullCert->issuer->issuer
&& fullCert->issuer->issuer->getUID() == caCert->getUID());
}
void
CertStoreTest::testBannedParent()
{
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
auto ca = dht::crypto::generateIdentity("test CA");
auto account = dht::crypto::generateIdentity("test account", ca, 4096, true);
auto device = dht::crypto::generateIdentity("test device", account);
auto device2 = dht::crypto::generateIdentity("test device 2", account);
auto id = ca.second->getId().toString();
auto pinned = aliceAccount->certStore().getPinnedCertificates();
CPPUNIT_ASSERT(std::find_if(pinned.begin(), pinned.end(), [&](auto v) { return v == id; })
== pinned.end());
// Ban account
aliceAccount->setCertificateStatus(account.second, dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(account.second->getId().toString())
== dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*account.second));
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*device2.second));
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*device.second));
}
} // namespace test
} // namespace jami
RING_TEST_RUNNER(jami::test::CertStoreTest::name());
test/unitTest/ice/ice.cpp deleted 100644 → 0
+ 0
− 659
View file @ c7dfb70f
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment