From 5a8727e34b938b70623ca865273fd81c7604b461 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Tue, 13 Mar 2018 06:26:06 +0100 Subject: Expose include dir --- include/DataView.hpp | 30 -------- include/Database.hpp | 153 ------------------------------------- include/DatabaseNode.hpp | 31 -------- include/DatabaseStorage.hpp | 95 ----------------------- include/DhtKey.hpp | 19 ----- include/Encryption.hpp | 64 ---------------- include/Group.hpp | 45 ----------- include/Hash.hpp | 58 -------------- include/Key.hpp | 15 ---- include/LocalUser.hpp | 29 ------- include/Log.hpp | 12 --- include/Permission.hpp | 46 ----------- include/RemoteUser.hpp | 24 ------ include/Signature.hpp | 126 ------------------------------ include/StagedObject.hpp | 22 ------ include/User.hpp | 38 --------- include/bin2hex.hpp | 23 ------ include/odhtdb/DataView.hpp | 30 ++++++++ include/odhtdb/Database.hpp | 153 +++++++++++++++++++++++++++++++++++++ include/odhtdb/DatabaseNode.hpp | 31 ++++++++ include/odhtdb/DatabaseStorage.hpp | 95 +++++++++++++++++++++++ include/odhtdb/DhtKey.hpp | 19 +++++ include/odhtdb/Encryption.hpp | 64 ++++++++++++++++ include/odhtdb/Group.hpp | 45 +++++++++++ include/odhtdb/Hash.hpp | 58 ++++++++++++++ include/odhtdb/Key.hpp | 15 ++++ include/odhtdb/LocalUser.hpp | 29 +++++++ include/odhtdb/Log.hpp | 12 +++ include/odhtdb/Permission.hpp | 46 +++++++++++ include/odhtdb/RemoteUser.hpp | 24 ++++++ include/odhtdb/Signature.hpp | 126 ++++++++++++++++++++++++++++++ include/odhtdb/StagedObject.hpp | 22 ++++++ include/odhtdb/User.hpp | 38 +++++++++ include/odhtdb/bin2hex.hpp | 23 ++++++ include/odhtdb/types.hpp | 22 ++++++ include/odhtdb/utils.hpp | 6 ++ include/types.hpp | 22 ------ include/utils.hpp | 6 -- project.conf | 3 + src/DataView.cpp | 2 +- src/Database.cpp | 16 ++-- src/DatabaseStorage.cpp | 6 +- src/DhtKey.cpp | 4 +- src/Encryption.cpp | 2 +- src/Group.cpp | 4 +- src/Hash.cpp | 4 +- src/Log.cpp | 2 +- src/Permission.cpp | 2 +- src/Signature.cpp | 4 +- src/User.cpp | 4 +- tests/main.cpp | 12 +-- 51 files changed, 892 insertions(+), 889 deletions(-) delete mode 100644 include/DataView.hpp delete mode 100644 include/Database.hpp delete mode 100644 include/DatabaseNode.hpp delete mode 100644 include/DatabaseStorage.hpp delete mode 100644 include/DhtKey.hpp delete mode 100644 include/Encryption.hpp delete mode 100644 include/Group.hpp delete mode 100644 include/Hash.hpp delete mode 100644 include/Key.hpp delete mode 100644 include/LocalUser.hpp delete mode 100644 include/Log.hpp delete mode 100644 include/Permission.hpp delete mode 100644 include/RemoteUser.hpp delete mode 100644 include/Signature.hpp delete mode 100644 include/StagedObject.hpp delete mode 100644 include/User.hpp delete mode 100644 include/bin2hex.hpp create mode 100644 include/odhtdb/DataView.hpp create mode 100644 include/odhtdb/Database.hpp create mode 100644 include/odhtdb/DatabaseNode.hpp create mode 100644 include/odhtdb/DatabaseStorage.hpp create mode 100644 include/odhtdb/DhtKey.hpp create mode 100644 include/odhtdb/Encryption.hpp create mode 100644 include/odhtdb/Group.hpp create mode 100644 include/odhtdb/Hash.hpp create mode 100644 include/odhtdb/Key.hpp create mode 100644 include/odhtdb/LocalUser.hpp create mode 100644 include/odhtdb/Log.hpp create mode 100644 include/odhtdb/Permission.hpp create mode 100644 include/odhtdb/RemoteUser.hpp create mode 100644 include/odhtdb/Signature.hpp create mode 100644 include/odhtdb/StagedObject.hpp create mode 100644 include/odhtdb/User.hpp create mode 100644 include/odhtdb/bin2hex.hpp create mode 100644 include/odhtdb/types.hpp create mode 100755 include/odhtdb/utils.hpp delete mode 100644 include/types.hpp delete mode 100755 include/utils.hpp diff --git a/include/DataView.hpp b/include/DataView.hpp deleted file mode 100644 index 0ecf9fb..0000000 --- a/include/DataView.hpp +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "types.hpp" -#include "Hash.hpp" -#include - -namespace odhtdb -{ - class DataView - { - public: - DataView() : data(nullptr), size(0) {} - DataView(void *_data, usize _size) : data(_data), size(_size) {} - bool operator == (const DataView &other) const; - - void *data; - usize size; - }; - - struct DataViewHasher - { - size_t operator()(const DataView &dataView) const - { - return fnvHash((const unsigned char*)dataView.data, dataView.size); - } - }; - - template - using DataViewMap = std::unordered_map; -} diff --git a/include/Database.hpp b/include/Database.hpp deleted file mode 100644 index 6bc7bc5..0000000 --- a/include/Database.hpp +++ /dev/null @@ -1,153 +0,0 @@ -#pragma once - -#include "types.hpp" -#include "Key.hpp" -#include "DataView.hpp" -#include "DatabaseStorage.hpp" -#include "Hash.hpp" -#include "utils.hpp" -#include "StagedObject.hpp" -#include "Signature.hpp" -#include "Permission.hpp" -#include "DatabaseNode.hpp" -#include -#include -#include -#include -#include - -namespace odhtdb -{ - class User; - class LocalUser; - class Group; - - class CommitCreateException : public std::runtime_error - { - public: - CommitCreateException(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - class CommitAddException : public std::runtime_error - { - public: - CommitAddException(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - class DatabaseCreateException : public std::runtime_error - { - public: - DatabaseCreateException(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - class DatabaseAddException : public std::runtime_error - { - public: - DatabaseAddException(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - enum class DatabaseOperation : u8 - { - ADD_DATA, - ADD_USER - }; - - struct DatabaseCreateRequest - { - DISABLE_COPY(DatabaseCreateRequest) - - u64 timestamp; // In microseconds - Group *creatorGroup; - std::string name; - - DatabaseCreateRequest(u64 _timestamp, Group *_creatorGroup, std::string &&_name) : - timestamp(_timestamp), - creatorGroup(_creatorGroup), - name(std::move(_name)) - { - - } - - DatabaseCreateRequest(DatabaseCreateRequest &&other) - { - timestamp = other.timestamp; - creatorGroup = other.creatorGroup; - name = std::move(other.name); - - other.timestamp = 0; - other.creatorGroup = nullptr; - } - }; - - struct DatabaseAddRequest - { - DISABLE_COPY(DatabaseAddRequest) - - u64 timestamp; // In microseconds - const User *creatorUser; - Decryption decryptedData; - - DatabaseAddRequest(u64 _timestamp, const User *_creatorUser, Decryption &&_decryptedData) : - timestamp(_timestamp), - creatorUser(_creatorUser), - decryptedData(std::move(_decryptedData)) - { - - } - - DatabaseAddRequest(DatabaseAddRequest &&other) - { - timestamp = other.timestamp; - creatorUser = other.creatorUser; - decryptedData = std::move(other.decryptedData); - - other.timestamp = 0; - other.creatorUser = nullptr; - } - }; - - class DatabaseCreateResponse - { - public: - DatabaseCreateResponse(LocalUser *nodeAdminUser, const std::shared_ptr &key, const std::shared_ptr &hash); - - const LocalUser* getNodeAdminUser() const; - const std::shared_ptr getNodeEncryptionKey() const; - const std::shared_ptr getRequestHash() const; - private: - LocalUser *nodeAdminUser; - std::shared_ptr key; - std::shared_ptr hash; - }; - - class Database - { - public: - Database(const char *bootstrapNodeAddr, u16 port, boost::filesystem::path storageDir); - ~Database(); - - void seed(const std::shared_ptr hash, const std::shared_ptr encryptionKey); - // Throws DatabaseCreateException on failure. - std::unique_ptr create(const std::string &ownerName, const std::string &nodeName); - // Throws DatabaseAddException on failure - void addData(const DatabaseNode &nodeInfo, LocalUser *userToPerformActionWith, DataView dataToAdd); - // Throws PermissionDeniedException if user @userToPerformActionWith is not allowed to add user @userToAdd to group @groupToAddUserTo - void addUserToGroup(const DatabaseNode &nodeInfo, LocalUser *userToPerformActionWith, const std::string &userToAddName, const Signature::PublicKey &userToAddPublicKey, Group *groupToAddUserTo); - void commit(); - private: - // Throws CommitCreateException on failure - void commitStagedCreateObject(const std::unique_ptr &stagedObject); - // Throws CommitAddException on failure - void commitStagedAddObject(const std::unique_ptr &stagedObject); - ntp::NtpTimestamp getSyncedTimestampUtc() const; - DatabaseCreateRequest deserializeCreateRequest(const std::shared_ptr &value, const Hash &hash, const std::shared_ptr encryptionKey); - void deserializeAddRequest(const std::shared_ptr &value, const Hash &requestDataHash, const std::shared_ptr encryptionKey); - bool listenCreateData(std::shared_ptr value, const Hash &hash, const std::shared_ptr encryptionKey); - bool listenAddData(std::shared_ptr value, const Hash &requestDataHash, const std::shared_ptr encryptionKey); - private: - dht::DhtRunner node; - std::vector> stagedCreateObjects; - std::vector> stagedAddObjects; - DatabaseStorage databaseStorage; - }; -} diff --git a/include/DatabaseNode.hpp b/include/DatabaseNode.hpp deleted file mode 100644 index 3ca4be3..0000000 --- a/include/DatabaseNode.hpp +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "Hash.hpp" -#include - -namespace odhtdb -{ - class DatabaseNode - { - public: - DatabaseNode(const std::shared_ptr &_encryptionKey, const std::shared_ptr &_nodeHash) : - encryptionKey(_encryptionKey), - nodeHash(_nodeHash) - { - - } - - const std::shared_ptr getNodeEncryptionKey() const - { - return encryptionKey; - } - - const std::shared_ptr getRequestHash() const - { - return nodeHash; - } - private: - std::shared_ptr encryptionKey; - std::shared_ptr nodeHash; - }; -} diff --git a/include/DatabaseStorage.hpp b/include/DatabaseStorage.hpp deleted file mode 100644 index ad4f70b..0000000 --- a/include/DatabaseStorage.hpp +++ /dev/null @@ -1,95 +0,0 @@ -#pragma once - -#include "types.hpp" -#include "Hash.hpp" -#include "DataView.hpp" -#include "Signature.hpp" -#include "Encryption.hpp" -#include -#include - -namespace odhtdb -{ - class Group; - class User; - - struct DatabaseStorageObject - { - DataView data; - u64 createdTimestamp; // In microseconds - Signature::PublicKey creatorPublicKey; - - DatabaseStorageObject(DataView &_data, u64 _timestamp, const Signature::PublicKey &_creatorPublicKey); - }; - - struct DatabaseStorageObjectList - { - DataView data; - u64 createdTimestamp; // In microseconds - std::vector groups; - std::vector objects; - }; - - struct DatabaseStorageQuarantineObject - { - DataView data; - u64 createdTimestamp; // In microseconds - u64 storedTimestamp; // In microseconds - Signature::PublicKey creatorPublicKey; - - DatabaseStorageQuarantineObject(DataView &_data, u64 _timestamp, const Signature::PublicKey &_creatorPublicKey); - }; - - class DatabaseStorageAlreadyExists : public std::runtime_error - { - public: - DatabaseStorageAlreadyExists(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - class DatabaseStorageNotFound : public std::runtime_error - { - public: - DatabaseStorageNotFound(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - using DatabaseStorageMap = MapHash; - using DatabaseStorageQuarantineMap = Signature::MapPublicKey>; - - class DatabaseStorage - { - public: - // Throws DatabaseStorageAlreadyExists if data with hash already exists - void createStorage(const Hash &hash, Group *creatorGroup, u64 timestamp, const u8 *data, usize dataSize); - - // Throws DatabaseStorageNotFound if data with @nodeHash hash has not been created yet. - // Throws DatabaseStorageAlreadyExists if same data has been added before (hash of @data, in @dataHash) - void appendStorage(const Hash &nodeHash, const Hash &dataHash, const User *creatorUser, u64 timestamp, const u8 *data, usize dataSize); - - // Throws DatabaseStorageAlreadyExists if same data has been added before (hash of @data, in @dataHash) - void addToQuarantine(const Hash &dataHash, const Signature::PublicKey &creatorPublicKey, u64 timestamp, const u8 *data, usize dataSize); - - void addUser(User *user, const Hash &hash); - - // Returns nullptr if no storage with provided hash exists - const DatabaseStorageObjectList* getStorage(const Hash &hash) const; - - // Returns nullptr if no node with the user exists - const Hash* getNodeByUserPublicKey(const Signature::PublicKey &userPublicKey) const; - - // Returns nullptr if no user with public key exists - const User* getUserByPublicKey(const Signature::PublicKey &userPublicKey) const; - - // Returns nullptr if a group with id @groupId doesn't exist - Group* getGroupById(uint8_t groupId[16]); - - // Update storage state (remove quarantine objects if they are too old, etc) - void update(); - private: - DatabaseStorageMap storageMap; - DatabaseStorageQuarantineMap quarantineStorageMap; - SetHash storedDataHash; // Prevent duplicate data from being added - Signature::MapPublicKey userPublicKeyNodeMap; - Signature::MapPublicKey publicKeyUserMap; - DataViewMap groupByIdMap; - }; -} diff --git a/include/DhtKey.hpp b/include/DhtKey.hpp deleted file mode 100644 index 7c30ee3..0000000 --- a/include/DhtKey.hpp +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "Hash.hpp" -#include - -namespace odhtdb -{ - class DhtKey - { - public: - DhtKey(const Hash &key); - - const dht::InfoHash& getNewDataListenerKey(); - const dht::InfoHash& getRequestOldDataKey(); - private: - dht::InfoHash infoHash; - unsigned char firstByteOriginalValue; - }; -} diff --git a/include/Encryption.hpp b/include/Encryption.hpp deleted file mode 100644 index 4697b35..0000000 --- a/include/Encryption.hpp +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -/* - * Encrypts/decrypts data using xchacha20-poly1305 ietf - */ - -#include "DataView.hpp" -#include "utils.hpp" -#include -#include - -namespace odhtdb -{ - const int NONCE_BYTE_SIZE = 24; - const int KEY_BYTE_SIZE = 32; - - class EncryptionException : public std::runtime_error - { - public: - EncryptionException(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - class DecryptionException : public std::runtime_error - { - public: - DecryptionException(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - class Encryption - { - DISABLE_COPY(Encryption) - public: - // Throws EncryptionException on failure (or std::bad_alloc on failed memory allocation) - Encryption(const DataView &data, const DataView &additionalData = DataView(), const DataView &key = DataView()); - ~Encryption(); - - DataView getKey() const; - DataView getNonce() const; - DataView getCipherText() const; - private: - unsigned char key[KEY_BYTE_SIZE]; - unsigned char nonce[NONCE_BYTE_SIZE]; - unsigned char *cipherText; - unsigned long long cipherTextLength; - }; - - class Decryption - { - DISABLE_COPY(Decryption) - public: - Decryption() : decryptedText(nullptr), decryptedTextLength(0) {} - - // Throws DecryptionException on failure - Decryption(const DataView &data, const DataView &nonce, const DataView &key); - Decryption(Decryption &&other); - Decryption& operator=(Decryption &&other); - ~Decryption(); - - DataView getDecryptedText() const; - private: - unsigned char *decryptedText; - unsigned long long decryptedTextLength; - }; -} diff --git a/include/Group.hpp b/include/Group.hpp deleted file mode 100644 index 315961d..0000000 --- a/include/Group.hpp +++ /dev/null @@ -1,45 +0,0 @@ -#pragma once - -#include "types.hpp" -#include "DataView.hpp" -#include "Permission.hpp" -#include -#include -#include - -namespace odhtdb -{ - class User; - - class GroupNameTooLongException : public std::runtime_error - { - public: - GroupNameTooLongException(const std::string &groupName) : - std::runtime_error(std::string("The group name ") + groupName + " is longer than 255 bytes") - { - - } - }; - - - - class Group - { - friend class User; - public: - Group(const std::string &name, uint8_t id[16], const Permission &permission); - ~Group(); - - const std::string& getName() const; - DataView getId() const; - const Permission& getPermission() const; - const std::vector& getUsers() const; - private: - void addUser(const User *user); - private: - std::string name; - uint8_t id[16]; - Permission permission; - std::vector users; - }; -} diff --git a/include/Hash.hpp b/include/Hash.hpp deleted file mode 100644 index 9dce168..0000000 --- a/include/Hash.hpp +++ /dev/null @@ -1,58 +0,0 @@ -#pragma once - -#include "utils.hpp" -#include -#include -#include - -namespace odhtdb -{ - const int HASH_BYTE_SIZE = 32; - - // Source: https://stackoverflow.com/a/11414104 (public license) - static size_t fnvHash(const unsigned char *key, int len) - { - size_t h = 2166136261; - for (int i = 0; i < len; i++) - h = (h * 16777619) ^ key[i]; - return h; - } - - class HashException : public std::runtime_error - { - public: - HashException(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - class Hash - { - public: - Hash(); - // Throws HashException on failure - Hash(const void *input, const size_t inputSize); - Hash(const Hash &other); - - void* getData() const { return (void*)data; } - size_t getSize() const { return HASH_BYTE_SIZE; } - - size_t operator()() const; - bool operator==(const Hash &other) const; - - std::string toString() const; - private: - char data[HASH_BYTE_SIZE]; - }; - - struct HashHasher - { - size_t operator()(const Hash &hash) const - { - return hash(); - } - }; - - template - using MapHash = std::unordered_map; - - using SetHash = std::unordered_set; -} diff --git a/include/Key.hpp b/include/Key.hpp deleted file mode 100644 index 18971d1..0000000 --- a/include/Key.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -namespace odhtdb -{ - class Key - { - public: - Key() {} - Key(const char *key) : hashedKey(dht::InfoHash::get(key)) {} - - dht::InfoHash hashedKey; - }; -} diff --git a/include/LocalUser.hpp b/include/LocalUser.hpp deleted file mode 100644 index d60cb38..0000000 --- a/include/LocalUser.hpp +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "User.hpp" - -namespace odhtdb -{ - class LocalUser : public User - { - public: - static LocalUser* create(const Signature::KeyPair &keyPair, const std::string &name, Group *group) - { - return new LocalUser(keyPair, name, group); - } - - const Signature::PublicKey& getPublicKey() const override - { - return keyPair.getPublicKey(); - } - - const Signature::PrivateKey& getPrivateKey() const - { - return keyPair.getPrivateKey(); - } - private: - LocalUser(const Signature::KeyPair &_keyPair, const std::string &name, Group *group) : User(name, group), keyPair(_keyPair) {} - private: - Signature::KeyPair keyPair; - }; -} diff --git a/include/Log.hpp b/include/Log.hpp deleted file mode 100644 index d09c2a2..0000000 --- a/include/Log.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -namespace odhtdb -{ - class Log - { - public: - static void debug(const char *fmt, ...); - static void warn(const char *fmt, ...); - static void error(const char *fmt, ...); - }; -} diff --git a/include/Permission.hpp b/include/Permission.hpp deleted file mode 100644 index 1ae2642..0000000 --- a/include/Permission.hpp +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once - -#include "types.hpp" -#include -#include - -namespace odhtdb -{ - class PermissionDeniedException : public std::runtime_error - { - public: - PermissionDeniedException(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - enum class PermissionType : u32 - { - ADD_DATA = (1 << 0), - ADD_USER_SAME_LEVEL = (1 << 1), - ADD_USER_LOWER_LEVEL = (1 << 2), - ADD_GROUP = (1 << 3), - REMOVE_GROUP = (1 << 4) - }; - - const PermissionType ALL_PERMISSION_TYPES = (PermissionType)0xFFFFFFFF; - - const u8 PERMISSION_LEVEL_ADMIN = 0; - const u8 PERMISSION_LEVEL_MODERATOR = 1; - const u8 PERMISSION_LEVEL_REGULAR_USER = 2; - - class Permission - { - public: - // @permissionLevel is hierarchical access right. A group can only modify a group that has higher @permissionLevel value - Permission(u8 permissionLevel, std::initializer_list permissions); - - u8 getPermissionLevel() const { return permissionLevel; } - u32 getPermissionFlags() const { return permissionFlags; } - bool getFlag(PermissionType permissionType) const; - private: - u8 permissionLevel; - u32 permissionFlags; - }; - - static const Permission ADMIN_PERMISSION(PERMISSION_LEVEL_ADMIN, { ALL_PERMISSION_TYPES }); - static const Permission REGULAR_USER_PERMISSION(PERMISSION_LEVEL_REGULAR_USER, { PermissionType::ADD_DATA }); -} diff --git a/include/RemoteUser.hpp b/include/RemoteUser.hpp deleted file mode 100644 index 181a4c4..0000000 --- a/include/RemoteUser.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "User.hpp" - -namespace odhtdb -{ - class RemoteUser : public User - { - public: - static RemoteUser* create(const Signature::PublicKey &publicKey, const std::string &name, Group *group) - { - return new RemoteUser(publicKey, name, group); - } - - const Signature::PublicKey& getPublicKey() const override - { - return publicKey; - } - private: - RemoteUser(const Signature::PublicKey &_publicKey, const std::string &name, Group *group) : User(name, group), publicKey(_publicKey){} - private: - Signature::PublicKey publicKey; - }; -} diff --git a/include/Signature.hpp b/include/Signature.hpp deleted file mode 100644 index 62c41c3..0000000 --- a/include/Signature.hpp +++ /dev/null @@ -1,126 +0,0 @@ -#pragma once - -#include "DataView.hpp" -#include -#include - -namespace odhtdb -{ - const int PUBLIC_KEY_NUM_BYTES = 32; - const int PRIVATE_KEY_NUM_BYTES = 64; - const int SIGNED_HASH_SIZE = 64; - - class InvalidSignatureKeySize : public std::runtime_error - { - public: - InvalidSignatureKeySize(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - class SignatureGenerationException : public std::runtime_error - { - public: - SignatureGenerationException(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - class DataSignException : public std::runtime_error - { - public: - DataSignException(const std::string &errMsg) : std::runtime_error(errMsg) {} - }; - - class UnsignException : public std::runtime_error - { - public: - UnsignException(const std::string &errMsg) : std::runtime_error(errMsg) {} - virtual ~UnsignException(){} - }; - - class UnsignInvalidSizeException : public UnsignException - { - public: - UnsignInvalidSizeException(const std::string &errMsg) : UnsignException(errMsg) {} - }; - - class UnsignWrongKeyException : public UnsignException - { - public: - UnsignWrongKeyException(const std::string &errMsg) : UnsignException(errMsg) {} - }; - - namespace Signature - { - class PublicKey - { - friend class KeyPair; - public: - static PublicKey ZERO; - - // Throws InvalidSignatureKeySize if size is not PUBLIC_KEY_NUM_BYTES - PublicKey(const char *data, size_t size); - PublicKey(const PublicKey &other); - PublicKey& operator=(const PublicKey &other); - - const char* getData() const { return data; } - size_t getSize() const { return PUBLIC_KEY_NUM_BYTES; } - - // Throws UnsignWrongKeyException if signed message was not signed using the matching private key of this public key. - // Throws UnsignInvalidSizeException if signed message is too small (< SIGNED_HASH_SIZE). - // Both exceptions are derived from UnsignException - std::string unsign(const DataView &signedMessage) const; - - size_t operator()() const; - bool operator==(const PublicKey &other) const; - - std::string toString() const; - private: - PublicKey(){} - private: - char data[PUBLIC_KEY_NUM_BYTES]; - }; - - struct PublicKeyHasher - { - size_t operator()(const PublicKey &publicKey) const - { - return publicKey(); - } - }; - - template - using MapPublicKey = std::unordered_map; - - class PrivateKey - { - friend class KeyPair; - public: - // Throws InvalidSignatureKeySize if size is not PRIVATE_KEY_NUM_BYTES - PrivateKey(const char *data, size_t size); - PrivateKey(const PrivateKey &other); - PrivateKey& operator=(const PrivateKey &other); - - const char* getData() const { return data; } - size_t getSize() const { return PRIVATE_KEY_NUM_BYTES; } - - // Throws DataSignException if signing data failed for whatever reason. This wont happen unless there is an issue with the private key - std::string sign(const DataView &dataToSign) const; - std::string toString() const; - private: - PrivateKey(){} - private: - char data[PRIVATE_KEY_NUM_BYTES]; - }; - - class KeyPair - { - public: - // Throws SignatureGenerationException if generation of private/public key pair fails (should never happen) - KeyPair(); - - const PublicKey& getPublicKey() const { return publicKey; } - const PrivateKey& getPrivateKey() const { return privateKey; } - private: - PublicKey publicKey; - PrivateKey privateKey; - }; - } -} diff --git a/include/StagedObject.hpp b/include/StagedObject.hpp deleted file mode 100644 index 0c9b534..0000000 --- a/include/StagedObject.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "utils.hpp" -#include "Hash.hpp" -#include "DataView.hpp" - -namespace odhtdb -{ - struct StagedObject - { - DISABLE_COPY(StagedObject) - DataView data; - std::shared_ptr requestKey; - - StagedObject(DataView &_data, const std::shared_ptr &_requestKey) : - data(_data), - requestKey(_requestKey) - { - - } - }; -} diff --git a/include/User.hpp b/include/User.hpp deleted file mode 100644 index fb37876..0000000 --- a/include/User.hpp +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once - -#include "Signature.hpp" -#include -#include -#include - -namespace odhtdb -{ - class Group; - - class UserNameTooLongException : public std::runtime_error - { - public: - UserNameTooLongException(const std::string &userName) : - std::runtime_error(std::string("The username ") + userName + " is longer than 255 bytes") - { - - } - }; - - class User - { - public: - virtual ~User(){} - - void addToGroup(Group *group); - - const std::string& getName() const { return name; } - const std::vector& getGroups() const { return groups; } - virtual const Signature::PublicKey& getPublicKey() const = 0; - protected: - User(const std::string &name, Group *group); - private: - std::string name; - std::vector groups; - }; -} diff --git a/include/bin2hex.hpp b/include/bin2hex.hpp deleted file mode 100644 index 72b57c1..0000000 --- a/include/bin2hex.hpp +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include - -namespace odhtdb -{ - static const char HEX_TABLE[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; - - static std::string bin2hex(const char *data, size_t dataSize) - { - std::string result; - result.resize(dataSize * 2); - - for(int i = 0; i < dataSize; ++i) - { - char c = data[i]; - result[i * 2 + 0] = HEX_TABLE[(c & 0xF0) >> 4]; - result[i * 2 + 1] = HEX_TABLE[(c & 0x0F)]; - } - - return result; - } -} diff --git a/include/odhtdb/DataView.hpp b/include/odhtdb/DataView.hpp new file mode 100644 index 0000000..0ecf9fb --- /dev/null +++ b/include/odhtdb/DataView.hpp @@ -0,0 +1,30 @@ +#pragma once + +#include "types.hpp" +#include "Hash.hpp" +#include + +namespace odhtdb +{ + class DataView + { + public: + DataView() : data(nullptr), size(0) {} + DataView(void *_data, usize _size) : data(_data), size(_size) {} + bool operator == (const DataView &other) const; + + void *data; + usize size; + }; + + struct DataViewHasher + { + size_t operator()(const DataView &dataView) const + { + return fnvHash((const unsigned char*)dataView.data, dataView.size); + } + }; + + template + using DataViewMap = std::unordered_map; +} diff --git a/include/odhtdb/Database.hpp b/include/odhtdb/Database.hpp new file mode 100644 index 0000000..6bc7bc5 --- /dev/null +++ b/include/odhtdb/Database.hpp @@ -0,0 +1,153 @@ +#pragma once + +#include "types.hpp" +#include "Key.hpp" +#include "DataView.hpp" +#include "DatabaseStorage.hpp" +#include "Hash.hpp" +#include "utils.hpp" +#include "StagedObject.hpp" +#include "Signature.hpp" +#include "Permission.hpp" +#include "DatabaseNode.hpp" +#include +#include +#include +#include +#include + +namespace odhtdb +{ + class User; + class LocalUser; + class Group; + + class CommitCreateException : public std::runtime_error + { + public: + CommitCreateException(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + class CommitAddException : public std::runtime_error + { + public: + CommitAddException(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + class DatabaseCreateException : public std::runtime_error + { + public: + DatabaseCreateException(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + class DatabaseAddException : public std::runtime_error + { + public: + DatabaseAddException(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + enum class DatabaseOperation : u8 + { + ADD_DATA, + ADD_USER + }; + + struct DatabaseCreateRequest + { + DISABLE_COPY(DatabaseCreateRequest) + + u64 timestamp; // In microseconds + Group *creatorGroup; + std::string name; + + DatabaseCreateRequest(u64 _timestamp, Group *_creatorGroup, std::string &&_name) : + timestamp(_timestamp), + creatorGroup(_creatorGroup), + name(std::move(_name)) + { + + } + + DatabaseCreateRequest(DatabaseCreateRequest &&other) + { + timestamp = other.timestamp; + creatorGroup = other.creatorGroup; + name = std::move(other.name); + + other.timestamp = 0; + other.creatorGroup = nullptr; + } + }; + + struct DatabaseAddRequest + { + DISABLE_COPY(DatabaseAddRequest) + + u64 timestamp; // In microseconds + const User *creatorUser; + Decryption decryptedData; + + DatabaseAddRequest(u64 _timestamp, const User *_creatorUser, Decryption &&_decryptedData) : + timestamp(_timestamp), + creatorUser(_creatorUser), + decryptedData(std::move(_decryptedData)) + { + + } + + DatabaseAddRequest(DatabaseAddRequest &&other) + { + timestamp = other.timestamp; + creatorUser = other.creatorUser; + decryptedData = std::move(other.decryptedData); + + other.timestamp = 0; + other.creatorUser = nullptr; + } + }; + + class DatabaseCreateResponse + { + public: + DatabaseCreateResponse(LocalUser *nodeAdminUser, const std::shared_ptr &key, const std::shared_ptr &hash); + + const LocalUser* getNodeAdminUser() const; + const std::shared_ptr getNodeEncryptionKey() const; + const std::shared_ptr getRequestHash() const; + private: + LocalUser *nodeAdminUser; + std::shared_ptr key; + std::shared_ptr hash; + }; + + class Database + { + public: + Database(const char *bootstrapNodeAddr, u16 port, boost::filesystem::path storageDir); + ~Database(); + + void seed(const std::shared_ptr hash, const std::shared_ptr encryptionKey); + // Throws DatabaseCreateException on failure. + std::unique_ptr create(const std::string &ownerName, const std::string &nodeName); + // Throws DatabaseAddException on failure + void addData(const DatabaseNode &nodeInfo, LocalUser *userToPerformActionWith, DataView dataToAdd); + // Throws PermissionDeniedException if user @userToPerformActionWith is not allowed to add user @userToAdd to group @groupToAddUserTo + void addUserToGroup(const DatabaseNode &nodeInfo, LocalUser *userToPerformActionWith, const std::string &userToAddName, const Signature::PublicKey &userToAddPublicKey, Group *groupToAddUserTo); + void commit(); + private: + // Throws CommitCreateException on failure + void commitStagedCreateObject(const std::unique_ptr &stagedObject); + // Throws CommitAddException on failure + void commitStagedAddObject(const std::unique_ptr &stagedObject); + ntp::NtpTimestamp getSyncedTimestampUtc() const; + DatabaseCreateRequest deserializeCreateRequest(const std::shared_ptr &value, const Hash &hash, const std::shared_ptr encryptionKey); + void deserializeAddRequest(const std::shared_ptr &value, const Hash &requestDataHash, const std::shared_ptr encryptionKey); + bool listenCreateData(std::shared_ptr value, const Hash &hash, const std::shared_ptr encryptionKey); + bool listenAddData(std::shared_ptr value, const Hash &requestDataHash, const std::shared_ptr encryptionKey); + private: + dht::DhtRunner node; + std::vector> stagedCreateObjects; + std::vector> stagedAddObjects; + DatabaseStorage databaseStorage; + }; +} diff --git a/include/odhtdb/DatabaseNode.hpp b/include/odhtdb/DatabaseNode.hpp new file mode 100644 index 0000000..3ca4be3 --- /dev/null +++ b/include/odhtdb/DatabaseNode.hpp @@ -0,0 +1,31 @@ +#pragma once + +#include "Hash.hpp" +#include + +namespace odhtdb +{ + class DatabaseNode + { + public: + DatabaseNode(const std::shared_ptr &_encryptionKey, const std::shared_ptr &_nodeHash) : + encryptionKey(_encryptionKey), + nodeHash(_nodeHash) + { + + } + + const std::shared_ptr getNodeEncryptionKey() const + { + return encryptionKey; + } + + const std::shared_ptr getRequestHash() const + { + return nodeHash; + } + private: + std::shared_ptr encryptionKey; + std::shared_ptr nodeHash; + }; +} diff --git a/include/odhtdb/DatabaseStorage.hpp b/include/odhtdb/DatabaseStorage.hpp new file mode 100644 index 0000000..ad4f70b --- /dev/null +++ b/include/odhtdb/DatabaseStorage.hpp @@ -0,0 +1,95 @@ +#pragma once + +#include "types.hpp" +#include "Hash.hpp" +#include "DataView.hpp" +#include "Signature.hpp" +#include "Encryption.hpp" +#include +#include + +namespace odhtdb +{ + class Group; + class User; + + struct DatabaseStorageObject + { + DataView data; + u64 createdTimestamp; // In microseconds + Signature::PublicKey creatorPublicKey; + + DatabaseStorageObject(DataView &_data, u64 _timestamp, const Signature::PublicKey &_creatorPublicKey); + }; + + struct DatabaseStorageObjectList + { + DataView data; + u64 createdTimestamp; // In microseconds + std::vector groups; + std::vector objects; + }; + + struct DatabaseStorageQuarantineObject + { + DataView data; + u64 createdTimestamp; // In microseconds + u64 storedTimestamp; // In microseconds + Signature::PublicKey creatorPublicKey; + + DatabaseStorageQuarantineObject(DataView &_data, u64 _timestamp, const Signature::PublicKey &_creatorPublicKey); + }; + + class DatabaseStorageAlreadyExists : public std::runtime_error + { + public: + DatabaseStorageAlreadyExists(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + class DatabaseStorageNotFound : public std::runtime_error + { + public: + DatabaseStorageNotFound(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + using DatabaseStorageMap = MapHash; + using DatabaseStorageQuarantineMap = Signature::MapPublicKey>; + + class DatabaseStorage + { + public: + // Throws DatabaseStorageAlreadyExists if data with hash already exists + void createStorage(const Hash &hash, Group *creatorGroup, u64 timestamp, const u8 *data, usize dataSize); + + // Throws DatabaseStorageNotFound if data with @nodeHash hash has not been created yet. + // Throws DatabaseStorageAlreadyExists if same data has been added before (hash of @data, in @dataHash) + void appendStorage(const Hash &nodeHash, const Hash &dataHash, const User *creatorUser, u64 timestamp, const u8 *data, usize dataSize); + + // Throws DatabaseStorageAlreadyExists if same data has been added before (hash of @data, in @dataHash) + void addToQuarantine(const Hash &dataHash, const Signature::PublicKey &creatorPublicKey, u64 timestamp, const u8 *data, usize dataSize); + + void addUser(User *user, const Hash &hash); + + // Returns nullptr if no storage with provided hash exists + const DatabaseStorageObjectList* getStorage(const Hash &hash) const; + + // Returns nullptr if no node with the user exists + const Hash* getNodeByUserPublicKey(const Signature::PublicKey &userPublicKey) const; + + // Returns nullptr if no user with public key exists + const User* getUserByPublicKey(const Signature::PublicKey &userPublicKey) const; + + // Returns nullptr if a group with id @groupId doesn't exist + Group* getGroupById(uint8_t groupId[16]); + + // Update storage state (remove quarantine objects if they are too old, etc) + void update(); + private: + DatabaseStorageMap storageMap; + DatabaseStorageQuarantineMap quarantineStorageMap; + SetHash storedDataHash; // Prevent duplicate data from being added + Signature::MapPublicKey userPublicKeyNodeMap; + Signature::MapPublicKey publicKeyUserMap; + DataViewMap groupByIdMap; + }; +} diff --git a/include/odhtdb/DhtKey.hpp b/include/odhtdb/DhtKey.hpp new file mode 100644 index 0000000..7c30ee3 --- /dev/null +++ b/include/odhtdb/DhtKey.hpp @@ -0,0 +1,19 @@ +#pragma once + +#include "Hash.hpp" +#include + +namespace odhtdb +{ + class DhtKey + { + public: + DhtKey(const Hash &key); + + const dht::InfoHash& getNewDataListenerKey(); + const dht::InfoHash& getRequestOldDataKey(); + private: + dht::InfoHash infoHash; + unsigned char firstByteOriginalValue; + }; +} diff --git a/include/odhtdb/Encryption.hpp b/include/odhtdb/Encryption.hpp new file mode 100644 index 0000000..4697b35 --- /dev/null +++ b/include/odhtdb/Encryption.hpp @@ -0,0 +1,64 @@ +#pragma once + +/* + * Encrypts/decrypts data using xchacha20-poly1305 ietf + */ + +#include "DataView.hpp" +#include "utils.hpp" +#include +#include + +namespace odhtdb +{ + const int NONCE_BYTE_SIZE = 24; + const int KEY_BYTE_SIZE = 32; + + class EncryptionException : public std::runtime_error + { + public: + EncryptionException(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + class DecryptionException : public std::runtime_error + { + public: + DecryptionException(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + class Encryption + { + DISABLE_COPY(Encryption) + public: + // Throws EncryptionException on failure (or std::bad_alloc on failed memory allocation) + Encryption(const DataView &data, const DataView &additionalData = DataView(), const DataView &key = DataView()); + ~Encryption(); + + DataView getKey() const; + DataView getNonce() const; + DataView getCipherText() const; + private: + unsigned char key[KEY_BYTE_SIZE]; + unsigned char nonce[NONCE_BYTE_SIZE]; + unsigned char *cipherText; + unsigned long long cipherTextLength; + }; + + class Decryption + { + DISABLE_COPY(Decryption) + public: + Decryption() : decryptedText(nullptr), decryptedTextLength(0) {} + + // Throws DecryptionException on failure + Decryption(const DataView &data, const DataView &nonce, const DataView &key); + Decryption(Decryption &&other); + Decryption& operator=(Decryption &&other); + ~Decryption(); + + DataView getDecryptedText() const; + private: + unsigned char *decryptedText; + unsigned long long decryptedTextLength; + }; +} diff --git a/include/odhtdb/Group.hpp b/include/odhtdb/Group.hpp new file mode 100644 index 0000000..315961d --- /dev/null +++ b/include/odhtdb/Group.hpp @@ -0,0 +1,45 @@ +#pragma once + +#include "types.hpp" +#include "DataView.hpp" +#include "Permission.hpp" +#include +#include +#include + +namespace odhtdb +{ + class User; + + class GroupNameTooLongException : public std::runtime_error + { + public: + GroupNameTooLongException(const std::string &groupName) : + std::runtime_error(std::string("The group name ") + groupName + " is longer than 255 bytes") + { + + } + }; + + + + class Group + { + friend class User; + public: + Group(const std::string &name, uint8_t id[16], const Permission &permission); + ~Group(); + + const std::string& getName() const; + DataView getId() const; + const Permission& getPermission() const; + const std::vector& getUsers() const; + private: + void addUser(const User *user); + private: + std::string name; + uint8_t id[16]; + Permission permission; + std::vector users; + }; +} diff --git a/include/odhtdb/Hash.hpp b/include/odhtdb/Hash.hpp new file mode 100644 index 0000000..9dce168 --- /dev/null +++ b/include/odhtdb/Hash.hpp @@ -0,0 +1,58 @@ +#pragma once + +#include "utils.hpp" +#include +#include +#include + +namespace odhtdb +{ + const int HASH_BYTE_SIZE = 32; + + // Source: https://stackoverflow.com/a/11414104 (public license) + static size_t fnvHash(const unsigned char *key, int len) + { + size_t h = 2166136261; + for (int i = 0; i < len; i++) + h = (h * 16777619) ^ key[i]; + return h; + } + + class HashException : public std::runtime_error + { + public: + HashException(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + class Hash + { + public: + Hash(); + // Throws HashException on failure + Hash(const void *input, const size_t inputSize); + Hash(const Hash &other); + + void* getData() const { return (void*)data; } + size_t getSize() const { return HASH_BYTE_SIZE; } + + size_t operator()() const; + bool operator==(const Hash &other) const; + + std::string toString() const; + private: + char data[HASH_BYTE_SIZE]; + }; + + struct HashHasher + { + size_t operator()(const Hash &hash) const + { + return hash(); + } + }; + + template + using MapHash = std::unordered_map; + + using SetHash = std::unordered_set; +} diff --git a/include/odhtdb/Key.hpp b/include/odhtdb/Key.hpp new file mode 100644 index 0000000..18971d1 --- /dev/null +++ b/include/odhtdb/Key.hpp @@ -0,0 +1,15 @@ +#pragma once + +#include + +namespace odhtdb +{ + class Key + { + public: + Key() {} + Key(const char *key) : hashedKey(dht::InfoHash::get(key)) {} + + dht::InfoHash hashedKey; + }; +} diff --git a/include/odhtdb/LocalUser.hpp b/include/odhtdb/LocalUser.hpp new file mode 100644 index 0000000..d60cb38 --- /dev/null +++ b/include/odhtdb/LocalUser.hpp @@ -0,0 +1,29 @@ +#pragma once + +#include "User.hpp" + +namespace odhtdb +{ + class LocalUser : public User + { + public: + static LocalUser* create(const Signature::KeyPair &keyPair, const std::string &name, Group *group) + { + return new LocalUser(keyPair, name, group); + } + + const Signature::PublicKey& getPublicKey() const override + { + return keyPair.getPublicKey(); + } + + const Signature::PrivateKey& getPrivateKey() const + { + return keyPair.getPrivateKey(); + } + private: + LocalUser(const Signature::KeyPair &_keyPair, const std::string &name, Group *group) : User(name, group), keyPair(_keyPair) {} + private: + Signature::KeyPair keyPair; + }; +} diff --git a/include/odhtdb/Log.hpp b/include/odhtdb/Log.hpp new file mode 100644 index 0000000..d09c2a2 --- /dev/null +++ b/include/odhtdb/Log.hpp @@ -0,0 +1,12 @@ +#pragma once + +namespace odhtdb +{ + class Log + { + public: + static void debug(const char *fmt, ...); + static void warn(const char *fmt, ...); + static void error(const char *fmt, ...); + }; +} diff --git a/include/odhtdb/Permission.hpp b/include/odhtdb/Permission.hpp new file mode 100644 index 0000000..1ae2642 --- /dev/null +++ b/include/odhtdb/Permission.hpp @@ -0,0 +1,46 @@ +#pragma once + +#include "types.hpp" +#include +#include + +namespace odhtdb +{ + class PermissionDeniedException : public std::runtime_error + { + public: + PermissionDeniedException(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + enum class PermissionType : u32 + { + ADD_DATA = (1 << 0), + ADD_USER_SAME_LEVEL = (1 << 1), + ADD_USER_LOWER_LEVEL = (1 << 2), + ADD_GROUP = (1 << 3), + REMOVE_GROUP = (1 << 4) + }; + + const PermissionType ALL_PERMISSION_TYPES = (PermissionType)0xFFFFFFFF; + + const u8 PERMISSION_LEVEL_ADMIN = 0; + const u8 PERMISSION_LEVEL_MODERATOR = 1; + const u8 PERMISSION_LEVEL_REGULAR_USER = 2; + + class Permission + { + public: + // @permissionLevel is hierarchical access right. A group can only modify a group that has higher @permissionLevel value + Permission(u8 permissionLevel, std::initializer_list permissions); + + u8 getPermissionLevel() const { return permissionLevel; } + u32 getPermissionFlags() const { return permissionFlags; } + bool getFlag(PermissionType permissionType) const; + private: + u8 permissionLevel; + u32 permissionFlags; + }; + + static const Permission ADMIN_PERMISSION(PERMISSION_LEVEL_ADMIN, { ALL_PERMISSION_TYPES }); + static const Permission REGULAR_USER_PERMISSION(PERMISSION_LEVEL_REGULAR_USER, { PermissionType::ADD_DATA }); +} diff --git a/include/odhtdb/RemoteUser.hpp b/include/odhtdb/RemoteUser.hpp new file mode 100644 index 0000000..181a4c4 --- /dev/null +++ b/include/odhtdb/RemoteUser.hpp @@ -0,0 +1,24 @@ +#pragma once + +#include "User.hpp" + +namespace odhtdb +{ + class RemoteUser : public User + { + public: + static RemoteUser* create(const Signature::PublicKey &publicKey, const std::string &name, Group *group) + { + return new RemoteUser(publicKey, name, group); + } + + const Signature::PublicKey& getPublicKey() const override + { + return publicKey; + } + private: + RemoteUser(const Signature::PublicKey &_publicKey, const std::string &name, Group *group) : User(name, group), publicKey(_publicKey){} + private: + Signature::PublicKey publicKey; + }; +} diff --git a/include/odhtdb/Signature.hpp b/include/odhtdb/Signature.hpp new file mode 100644 index 0000000..62c41c3 --- /dev/null +++ b/include/odhtdb/Signature.hpp @@ -0,0 +1,126 @@ +#pragma once + +#include "DataView.hpp" +#include +#include + +namespace odhtdb +{ + const int PUBLIC_KEY_NUM_BYTES = 32; + const int PRIVATE_KEY_NUM_BYTES = 64; + const int SIGNED_HASH_SIZE = 64; + + class InvalidSignatureKeySize : public std::runtime_error + { + public: + InvalidSignatureKeySize(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + class SignatureGenerationException : public std::runtime_error + { + public: + SignatureGenerationException(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + class DataSignException : public std::runtime_error + { + public: + DataSignException(const std::string &errMsg) : std::runtime_error(errMsg) {} + }; + + class UnsignException : public std::runtime_error + { + public: + UnsignException(const std::string &errMsg) : std::runtime_error(errMsg) {} + virtual ~UnsignException(){} + }; + + class UnsignInvalidSizeException : public UnsignException + { + public: + UnsignInvalidSizeException(const std::string &errMsg) : UnsignException(errMsg) {} + }; + + class UnsignWrongKeyException : public UnsignException + { + public: + UnsignWrongKeyException(const std::string &errMsg) : UnsignException(errMsg) {} + }; + + namespace Signature + { + class PublicKey + { + friend class KeyPair; + public: + static PublicKey ZERO; + + // Throws InvalidSignatureKeySize if size is not PUBLIC_KEY_NUM_BYTES + PublicKey(const char *data, size_t size); + PublicKey(const PublicKey &other); + PublicKey& operator=(const PublicKey &other); + + const char* getData() const { return data; } + size_t getSize() const { return PUBLIC_KEY_NUM_BYTES; } + + // Throws UnsignWrongKeyException if signed message was not signed using the matching private key of this public key. + // Throws UnsignInvalidSizeException if signed message is too small (< SIGNED_HASH_SIZE). + // Both exceptions are derived from UnsignException + std::string unsign(const DataView &signedMessage) const; + + size_t operator()() const; + bool operator==(const PublicKey &other) const; + + std::string toString() const; + private: + PublicKey(){} + private: + char data[PUBLIC_KEY_NUM_BYTES]; + }; + + struct PublicKeyHasher + { + size_t operator()(const PublicKey &publicKey) const + { + return publicKey(); + } + }; + + template + using MapPublicKey = std::unordered_map; + + class PrivateKey + { + friend class KeyPair; + public: + // Throws InvalidSignatureKeySize if size is not PRIVATE_KEY_NUM_BYTES + PrivateKey(const char *data, size_t size); + PrivateKey(const PrivateKey &other); + PrivateKey& operator=(const PrivateKey &other); + + const char* getData() const { return data; } + size_t getSize() const { return PRIVATE_KEY_NUM_BYTES; } + + // Throws DataSignException if signing data failed for whatever reason. This wont happen unless there is an issue with the private key + std::string sign(const DataView &dataToSign) const; + std::string toString() const; + private: + PrivateKey(){} + private: + char data[PRIVATE_KEY_NUM_BYTES]; + }; + + class KeyPair + { + public: + // Throws SignatureGenerationException if generation of private/public key pair fails (should never happen) + KeyPair(); + + const PublicKey& getPublicKey() const { return publicKey; } + const PrivateKey& getPrivateKey() const { return privateKey; } + private: + PublicKey publicKey; + PrivateKey privateKey; + }; + } +} diff --git a/include/odhtdb/StagedObject.hpp b/include/odhtdb/StagedObject.hpp new file mode 100644 index 0000000..0c9b534 --- /dev/null +++ b/include/odhtdb/StagedObject.hpp @@ -0,0 +1,22 @@ +#pragma once + +#include "utils.hpp" +#include "Hash.hpp" +#include "DataView.hpp" + +namespace odhtdb +{ + struct StagedObject + { + DISABLE_COPY(StagedObject) + DataView data; + std::shared_ptr requestKey; + + StagedObject(DataView &_data, const std::shared_ptr &_requestKey) : + data(_data), + requestKey(_requestKey) + { + + } + }; +} diff --git a/include/odhtdb/User.hpp b/include/odhtdb/User.hpp new file mode 100644 index 0000000..fb37876 --- /dev/null +++ b/include/odhtdb/User.hpp @@ -0,0 +1,38 @@ +#pragma once + +#include "Signature.hpp" +#include +#include +#include + +namespace odhtdb +{ + class Group; + + class UserNameTooLongException : public std::runtime_error + { + public: + UserNameTooLongException(const std::string &userName) : + std::runtime_error(std::string("The username ") + userName + " is longer than 255 bytes") + { + + } + }; + + class User + { + public: + virtual ~User(){} + + void addToGroup(Group *group); + + const std::string& getName() const { return name; } + const std::vector& getGroups() const { return groups; } + virtual const Signature::PublicKey& getPublicKey() const = 0; + protected: + User(const std::string &name, Group *group); + private: + std::string name; + std::vector groups; + }; +} diff --git a/include/odhtdb/bin2hex.hpp b/include/odhtdb/bin2hex.hpp new file mode 100644 index 0000000..72b57c1 --- /dev/null +++ b/include/odhtdb/bin2hex.hpp @@ -0,0 +1,23 @@ +#pragma once + +#include + +namespace odhtdb +{ + static const char HEX_TABLE[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; + + static std::string bin2hex(const char *data, size_t dataSize) + { + std::string result; + result.resize(dataSize * 2); + + for(int i = 0; i < dataSize; ++i) + { + char c = data[i]; + result[i * 2 + 0] = HEX_TABLE[(c & 0xF0) >> 4]; + result[i * 2 + 1] = HEX_TABLE[(c & 0x0F)]; + } + + return result; + } +} diff --git a/include/odhtdb/types.hpp b/include/odhtdb/types.hpp new file mode 100644 index 0000000..3cf7f02 --- /dev/null +++ b/include/odhtdb/types.hpp @@ -0,0 +1,22 @@ +#pragma once + +#include + +namespace odhtdb +{ + typedef int8_t i8; + typedef int16_t i16; + typedef int32_t i32; + typedef int64_t i64; + + typedef uint8_t u8; + typedef uint16_t u16; + typedef uint32_t u32; + typedef uint64_t u64; + + typedef float f32; + typedef double f64; + + typedef intptr_t isize; + typedef uintptr_t usize; +} diff --git a/include/odhtdb/utils.hpp b/include/odhtdb/utils.hpp new file mode 100755 index 0000000..01e478d --- /dev/null +++ b/include/odhtdb/utils.hpp @@ -0,0 +1,6 @@ +#pragma once + +// Disable copying for a class or struct +#define DISABLE_COPY(ClassName) \ + ClassName(ClassName&) = delete; \ + ClassName& operator = (ClassName&) = delete; diff --git a/include/types.hpp b/include/types.hpp deleted file mode 100644 index 3cf7f02..0000000 --- a/include/types.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include - -namespace odhtdb -{ - typedef int8_t i8; - typedef int16_t i16; - typedef int32_t i32; - typedef int64_t i64; - - typedef uint8_t u8; - typedef uint16_t u16; - typedef uint32_t u32; - typedef uint64_t u64; - - typedef float f32; - typedef double f64; - - typedef intptr_t isize; - typedef uintptr_t usize; -} diff --git a/include/utils.hpp b/include/utils.hpp deleted file mode 100755 index 01e478d..0000000 --- a/include/utils.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -// Disable copying for a class or struct -#define DISABLE_COPY(ClassName) \ - ClassName(ClassName&) = delete; \ - ClassName& operator = (ClassName&) = delete; diff --git a/project.conf b/project.conf index 23be0cc..93dfd0c 100644 --- a/project.conf +++ b/project.conf @@ -5,6 +5,9 @@ type = "library" platforms = ["linux32", "linux64"] tests = "tests" +[config] +expose_include_dirs = ["include"] + [dependencies] opendht = "1.5.0" fmt = "4.1.0" diff --git a/src/DataView.cpp b/src/DataView.cpp index 63c4f07..b9cef47 100644 --- a/src/DataView.cpp +++ b/src/DataView.cpp @@ -1,4 +1,4 @@ -#include "../include/DataView.hpp" +#include "../include/odhtdb/DataView.hpp" #include namespace odhtdb diff --git a/src/Database.cpp b/src/Database.cpp index 6f53f1d..5d082d1 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -1,11 +1,11 @@ -#include "../include/Database.hpp" -#include "../include/Group.hpp" -#include "../include/LocalUser.hpp" -#include "../include/RemoteUser.hpp" -#include "../include/Encryption.hpp" -#include "../include/DhtKey.hpp" -#include "../include/bin2hex.hpp" -#include "../include/Log.hpp" +#include "../include/odhtdb/Database.hpp" +#include "../include/odhtdb/Group.hpp" +#include "../include/odhtdb/LocalUser.hpp" +#include "../include/odhtdb/RemoteUser.hpp" +#include "../include/odhtdb/Encryption.hpp" +#include "../include/odhtdb/DhtKey.hpp" +#include "../include/odhtdb/bin2hex.hpp" +#include "../include/odhtdb/Log.hpp" #include #include #include diff --git a/src/DatabaseStorage.cpp b/src/DatabaseStorage.cpp index 5e43d1a..212ca0f 100644 --- a/src/DatabaseStorage.cpp +++ b/src/DatabaseStorage.cpp @@ -1,6 +1,6 @@ -#include "../include/DatabaseStorage.hpp" -#include "../include/User.hpp" -#include "../include/Group.hpp" +#include "../include/odhtdb/DatabaseStorage.hpp" +#include "../include/odhtdb/User.hpp" +#include "../include/odhtdb/Group.hpp" #include #include diff --git a/src/DhtKey.cpp b/src/DhtKey.cpp index ea59740..7bd6acf 100644 --- a/src/DhtKey.cpp +++ b/src/DhtKey.cpp @@ -1,5 +1,5 @@ -#include "../include/DhtKey.hpp" -#include "../include/types.hpp" +#include "../include/odhtdb/DhtKey.hpp" +#include "../include/odhtdb/types.hpp" namespace odhtdb { diff --git a/src/Encryption.cpp b/src/Encryption.cpp index 238861f..7f8700b 100644 --- a/src/Encryption.cpp +++ b/src/Encryption.cpp @@ -1,4 +1,4 @@ -#include "../include/Encryption.hpp" +#include "../include/odhtdb/Encryption.hpp" #include #include #include diff --git a/src/Group.cpp b/src/Group.cpp index 12b50ed..caf3e05 100644 --- a/src/Group.cpp +++ b/src/Group.cpp @@ -1,5 +1,5 @@ -#include "../include/Group.hpp" -#include "../include/User.hpp" +#include "../include/odhtdb/Group.hpp" +#include "../include/odhtdb/User.hpp" #include using namespace std; diff --git a/src/Hash.cpp b/src/Hash.cpp index 91bc062..e46e5ba 100644 --- a/src/Hash.cpp +++ b/src/Hash.cpp @@ -1,5 +1,5 @@ -#include "../include/Hash.hpp" -#include "../include/bin2hex.hpp" +#include "../include/odhtdb/Hash.hpp" +#include "../include/odhtdb/bin2hex.hpp" #include #include #include diff --git a/src/Log.cpp b/src/Log.cpp index 5d77d73..28a2784 100644 --- a/src/Log.cpp +++ b/src/Log.cpp @@ -1,4 +1,4 @@ -#include "../include/Log.hpp" +#include "../include/odhtdb/Log.hpp" #include #include diff --git a/src/Permission.cpp b/src/Permission.cpp index de0a747..57c1f11 100644 --- a/src/Permission.cpp +++ b/src/Permission.cpp @@ -1,4 +1,4 @@ -#include "../include/Permission.hpp" +#include "../include/odhtdb/Permission.hpp" namespace odhtdb { diff --git a/src/Signature.cpp b/src/Signature.cpp index d328b58..cba5954 100644 --- a/src/Signature.cpp +++ b/src/Signature.cpp @@ -1,5 +1,5 @@ -#include "../include/Signature.hpp" -#include "../include/Hash.hpp" +#include "../include/odhtdb/Signature.hpp" +#include "../include/odhtdb/Hash.hpp" #include #include #include diff --git a/src/User.cpp b/src/User.cpp index 4ec93cd..7b90872 100644 --- a/src/User.cpp +++ b/src/User.cpp @@ -1,5 +1,5 @@ -#include "../include/User.hpp" -#include "../include/Group.hpp" +#include "../include/odhtdb/User.hpp" +#include "../include/odhtdb/Group.hpp" namespace odhtdb { diff --git a/tests/main.cpp b/tests/main.cpp index 9992eee..30703ea 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,10 +1,10 @@ #include "assert.hpp" -#include "../include/Log.hpp" -#include "../include/Database.hpp" -#include "../include/Group.hpp" -#include "../include/LocalUser.hpp" -#include "../include/Encryption.hpp" -#include "../include/Hash.hpp" +#include "../include/odhtdb/Log.hpp" +#include "../include/odhtdb/Database.hpp" +#include "../include/odhtdb/Group.hpp" +#include "../include/odhtdb/LocalUser.hpp" +#include "../include/odhtdb/Encryption.hpp" +#include "../include/odhtdb/Hash.hpp" #include #include #include -- cgit v1.2.3