Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cheat card fixes #61

Merged
merged 34 commits into from
Mar 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
514b61f
simple fixes of macros
EndrII Dec 2, 2022
b82f636
added debug validation of registered commands
EndrII Dec 3, 2022
33dbbdf
Update src/private/versionisreceived.h
EndrII Dec 3, 2022
2865717
ignore self id
EndrII Dec 3, 2022
f80eef1
Merge branch 'cheat_card_fixes' of github.com:QuasarApp/Heart into ch…
EndrII Dec 3, 2022
f0bfabb
simple fixes
EndrII Dec 3, 2022
1e30103
simple fix
EndrII Dec 4, 2022
f85458e
fix docs
EndrII Dec 11, 2022
c07bfbb
added new method for import exists parsers into node object
EndrII Dec 14, 2022
be97672
added bad request after wrong commnads
EndrII Dec 20, 2022
9bd6fbe
adde new option of the node
EndrII Dec 20, 2022
c8b799f
fix build with qt 6
EndrII Dec 20, 2022
35f266a
fix build withou ssl
EndrII Dec 21, 2022
d3aec15
added simpel options
EndrII Dec 22, 2022
ff6551e
added replace query and remove deprecated insertifnotexists
EndrII Dec 22, 2022
bfe6ed8
some fixes of the node log
EndrII Dec 23, 2022
f3e0502
fixed some erroros in dependecies
EndrII Dec 25, 2022
bbb423a
update copyright
EndrII Dec 31, 2022
f9f4e46
database patches can get access to the database object (not const)
EndrII Feb 1, 2023
24c6f13
added size method for the data package class
EndrII Feb 7, 2023
6e0f603
added const postfix for some api's functions
EndrII Feb 12, 2023
470a242
added more logs into big data parser
EndrII Feb 21, 2023
9c371f2
some fixes of the api parsers
EndrII Feb 23, 2023
d929ce8
update some issues
EndrII Feb 24, 2023
e923fbb
new conditions of database objects
EndrII Feb 26, 2023
438ec18
remove deprecated code
EndrII Feb 26, 2023
3eab275
fix some requests
EndrII Feb 27, 2023
760e9ae
fix database upgrade method
EndrII Feb 28, 2023
df9e61f
fix options
EndrII Mar 1, 2023
df23e4d
change default behavior of wrong messages
EndrII Mar 3, 2023
d057875
added new selector for the parasers
EndrII Mar 20, 2023
3230d0a
fix vulnerability of the package parser
EndrII Mar 21, 2023
3a270d9
added support for old packages
EndrII Mar 21, 2023
cdce342
fix parser
EndrII Mar 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2018-2022 QuasarApp.
# Copyright (C) 2018-2023 QuasarApp.
# Distributed under the lgplv3 software license, see the accompanying
# Everyone is permitted to copy and distribute verbatim copies
# of this license document, but changing it is not allowed.
Expand Down Expand Up @@ -33,8 +33,9 @@ else()
endif()
# Use only for android debug builds with debugging from usb.
option(HEART_STATIC_SSL "This option enable or disabled static link ssl libraryes" OFF)
option(HEART_DEPRECATED_API "This option enable or disabled deprecated command api" OFF)
option(CMAKE_SHARE "This option enable or disabled ssl functions of nodes" OFF)
option(HEART_PRINT_PACKAGES "This option enable or disabled log of add incoming network packages" OFF)
option(HEART_PRINT_SQL_QUERIES "This option enable or disabled log of all sql queries" OFF)

option(BUILD_SHARED_LIBS "Enable or disable shared libraryes" OFF)

if (WIN32)
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2018-2022 QuasarApp.
# Copyright (C) 2018-2023 QuasarApp.
# Distributed under the lgplv3 software license, see the accompanying
# Everyone is permitted to copy and distribute verbatim copies
# of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/tst_testprotockol.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/abstractnodetest.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/abstractnodetest.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/bigdatatest.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/bigdatatest.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/ecdsaauthtest.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022-2022 QuasarApp.
* Copyright (C) 2022-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/ecdsaauthtest.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022-2022 QuasarApp.
* Copyright (C) 2022-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/keystoragetest.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/shedullertest.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//#
//# Copyright (C) 2021-2022 QuasarApp.
//# Copyright (C) 2021-2023 QuasarApp.
//# Distributed under the lgplv3 software license, see the accompanying
//# Everyone is permitted to copy and distribute verbatim copies
//# of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/shedullertest.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//#
//# Copyright (C) 2021-2022 QuasarApp.
//# Copyright (C) 2021-2023 QuasarApp.
//# Distributed under the lgplv3 software license, see the accompanying
//# Everyone is permitted to copy and distribute verbatim copies
//# of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/test.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/test.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/testutils.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion HeartTests/units/testutils.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
8 changes: 4 additions & 4 deletions HeartTests/units/upgradedatabasetest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class UpgradableDatabase: public QH::DataBase {

bool checkVersion(int version) {
QSqlQuery query;
if (!db()->doQuery("SELECT * FROM DataBaseAttributes WHERE name='version'", true, &query)){
if (!db()->doQuery("SELECT * FROM DataBaseAttributes WHERE name='version'", {}, true, &query)){
return false;
};

Expand All @@ -44,7 +44,7 @@ class UpgradableDatabase: public QH::DataBase {

[](const QH::iObjectProvider* database) -> bool {
QSqlQuery query;
if (!database->doQuery("select * from DataBaseAttributes", true, &query)){
if (!database->doQuery("select * from DataBaseAttributes", {}, true, &query)){
return false;
};

Expand All @@ -57,7 +57,7 @@ class UpgradableDatabase: public QH::DataBase {
2, // to version
[](const QH::iObjectProvider* database) -> bool {
QSqlQuery query;
if (!database->doQuery("select * from DataBaseAttributes", true, &query)){
if (!database->doQuery("select * from DataBaseAttributes", {}, true, &query)){
return false;
};

Expand All @@ -70,7 +70,7 @@ class UpgradableDatabase: public QH::DataBase {
3, // to version
[](const QH::iObjectProvider* database) -> bool {
QSqlQuery query;
if (!database->doQuery("select * from DataBaseAttributes", true, &query)){
if (!database->doQuery("select * from DataBaseAttributes", {}, true, &query)){
return false;
};

Expand Down
17 changes: 7 additions & 10 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2018-2022 QuasarApp.
# Copyright (C) 2018-2023 QuasarApp.
# Distributed under the lgplv3 software license, see the accompanying
# Everyone is permitted to copy and distribute verbatim copies
# of this license document, but changing it is not allowed.
Expand All @@ -17,8 +17,12 @@ set(CMAKE_AUTORCC ON)

add_definitions(-DHEART_LIBRARY)

if (HEART_DEPRECATED_API)
add_definitions(-DHEART_DEPRECATED_API)
if (HEART_PRINT_SQL_QUERIES)
add_definitions(-DHEART_PRINT_SQL_QUERIES)
endif()

if (HEART_PRINT_PACKAGES)
add_definitions(-DHEART_PRINT_PACKAGES)
endif()

set(SLL_DEFINE "WITHOUT_SSL")
Expand All @@ -41,13 +45,6 @@ file(GLOB SOURCE_CPP
"public/hcryptoFeatures/*.cpp" "public/hcryptoFeatures/*.h" "public/hcryptoFeatures/*.qrc"
)

if (NOT HEART_DEPRECATED_API)
file(GLOB SOURCE_CPP_DEPRECATED
"private/*_old.cpp" "private/*_old.h"
)
list(REMOVE_ITEM SOURCE_CPP ${SOURCE_CPP_DEPRECATED})
endif()

set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/public")
set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/public/packages")
Expand Down
2 changes: 1 addition & 1 deletion src/heart.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion src/heart.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion src/heart_global.h.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 QuasarApp.
* Copyright (C) 2018-2023 QuasarApp.
* Distributed under the lgplv3 software license, see the accompanying
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion src/private/abstractnodeparser.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//#
//# Copyright (C) 2022-2022 QuasarApp.
//# Copyright (C) 2022-2023 QuasarApp.
//# Distributed under the lgplv3 software license, see the accompanying
//# Everyone is permitted to copy and distribute verbatim copies
//# of this license document, but changing it is not allowed.
Expand Down
2 changes: 1 addition & 1 deletion src/private/abstractnodeparser.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//#
//# Copyright (C) 2022-2022 QuasarApp.
//# Copyright (C) 2022-2023 QuasarApp.
//# Distributed under the lgplv3 software license, see the accompanying
//# Everyone is permitted to copy and distribute verbatim copies
//# of this license document, but changing it is not allowed.
Expand Down
86 changes: 0 additions & 86 deletions src/private/abstractnodeparser_old.cpp

This file was deleted.

53 changes: 0 additions & 53 deletions src/private/abstractnodeparser_old.h

This file was deleted.

2 changes: 1 addition & 1 deletion src/private/apiversion.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//#
//# Copyright (C) 2020-2022 QuasarApp.
//# Copyright (C) 2020-2023 QuasarApp.
//# Distributed under the GPLv3 software license, see the accompanying
//# Everyone is permitted to copy and distribute verbatim copies
//# of this license document, but changing it is not allowed.
Expand Down
4 changes: 1 addition & 3 deletions src/private/apiversion.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//#
//# Copyright (C) 2020-2022 QuasarApp.
//# Copyright (C) 2020-2023 QuasarApp.
//# Distributed under the GPLv3 software license, see the accompanying
//# Everyone is permitted to copy and distribute verbatim copies
//# of this license document, but changing it is not allowed.
Expand Down Expand Up @@ -30,8 +30,6 @@ class APIVersion: public QH::PKG::AbstractData
static QString commandText(){return "PROTOCKOL_VERSION_COMMAND";}
unsigned short cmd() const override {return APIVersion::command();}

unsigned short cmdOld() const override {return APIVersion::command();}

QString cmdString() const override {return APIVersion::commandText();}

const VersionData &version() const;
Expand Down
Loading