IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge updated production code with grpc code

Browse Source
This commit is contained in:
einhornimmond - MarkX 2020-10-08 17:19:30 +02:00 committed by Ulf Gebhardt
parent 9167270149
commit 7d7e2c5441
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
10 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cpp/HTTPInterface/DecodeTransactionPage.cpp
View File

@ -222,8 +222,7 @@ void DecodeTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
auto creation = transactionBody.creation();
TransactionCreation creationObject("", creation);
auto receiver = creation.receiveramount();
auto receiver = creation.receiver();
char hex[65]; memset(hex, 0, 65);
sodium_bin2hex(hex, 65, (const unsigned char*)receiver.pubkey().data(), receiver.pubkey().size());
@ -238,36 +237,36 @@ void DecodeTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "\n";
responseStream << "\t\t<h3>Creation</h3>\n";
responseStream << "\t\t";
#line 121 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
#line 120 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
if(!adminUser || user.isNull() || !user->getModel()) { responseStream << "\n";
responseStream << "\t\t<p>pubkey: ";
#line 122 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
#line 121 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
responseStream << ( hex );
responseStream << "</p>\n";
responseStream << "\t\t";
#line 123 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
#line 122 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
} else { responseStream << "\n";
responseStream << "\t\t<p>user: </p>\n";
responseStream << "\t\t<p>";
#line 125 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
#line 124 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
responseStream << ( user->getModel()->toHTMLString() );
responseStream << "</p>\n";
responseStream << "\t\t";
#line 126 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
#line 125 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
} responseStream << "\n";
responseStream << "\t\t<p>amount: ";
#line 127 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
#line 126 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
responseStream << ( TransactionBase::amountToString(receiver.amount()) );
responseStream << " GDD</p>\n";
responseStream << "\t\t<p>target date: ";
#line 128 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
#line 127 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
responseStream << ( creationObject.getTargetDateString() );
responseStream << "</p>\n";
responseStream << "\t\t";
#line 129 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
#line 128 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
} responseStream << "\n";
responseStream << "\t";
#line 130 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
#line 129 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
} responseStream << "\n";
responseStream << "</div>\n";
// begin include footer.cpsp

2
src/cpp/HTTPInterface/LoginPage.cpp
View File

@ -105,7 +105,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
} else {
langCatalog = mSession->getLanguageCatalog();
}
UserStates user_state;
UserState user_state;
try {
user_state = mSession->loadUser(email, password);
} catch (Poco::Exception& ex) {

4
src/cpp/SingletonManager/EmailManager.cpp
View File

@ -60,7 +60,7 @@ void EmailManager::addEmail(model::Email* email) {
std::string log_message = "Email should be sended to: ";
auto email_user = email->getUser();
if (email_user && email_user->getModel()) {
log_message += email_user->getModel()->getNameWithEmail();
log_message += email_user->getModel()->getNameWithEmailHtml();
}
else {
log_message += "<missing>";
@ -138,7 +138,7 @@ int EmailManager::ThreadFunction()
std::string log_message = "Email sended to: ";
auto email_user = email->getUser();
if (user_model) {
log_message += email_user->getModel()->getNameWithEmail();
log_message += email_user->getModel()->getNameWithEmailHtml();
}
else {
log_message += "<missing>";

1
src/cpp/controller/UserBackup.cpp
View File

@ -54,6 +54,7 @@ namespace controller {
return mKeyPair;
}
mKeyPair = createGradidoKeyPair();
return mKeyPair;
}
KeyPairEd25519* UserBackup::createGradidoKeyPair()

10
src/cpp/model/Session.cpp
View File

@ -685,11 +685,17 @@ bool Session::startProcessingTransaction(const std::string& proto_message_base64
}
}
Languages lang = LANG_DE;
if (!mNewUser.isNull()) {
lang = LanguageManager::languageFromString(mNewUser->getModel()->getLanguageKey());
}
Poco::AutoPtr<ProcessingTransaction> processorTask(
new ProcessingTransaction(
proto_message_base64,
DRMakeStringHash(mSessionUser->getEmail()),
mSessionUser->getLanguage())
DRMakeStringHash(mSessionUser->getEmail().data()),
lang
)
);
if (autoSign && (ServerConfig::g_AllowUnsecureFlags & ServerConfig::UNSECURE_AUTO_SIGN_TRANSACTIONS) == ServerConfig::UNSECURE_AUTO_SIGN_TRANSACTIONS) {
if (processorTask->run() != 0) {

6
src/cpp/tasks/ProcessingTransaction.cpp
View File

@ -9,9 +9,9 @@
#include "../lib/DataTypeConverter.h"
#include "../lib/JsonRequest.h"
ProcessingTransaction::ProcessingTransaction(const std::string& proto_message_base64, DHASH userEmailHash, Languages lang)
ProcessingTransaction::ProcessingTransaction(const std::string& proto_message_base64, DHASH userEmailHash, Languages lang, Poco::DateTime transactionCreated/* = Poco::DateTime()*/)
: mType(TRANSACTION_NONE), mProtoMessageBase64(proto_message_base64), mTransactionSpecific(nullptr), mUserEmailHash(userEmailHash),
mLang(lang)
mLang(lang), mTransactionCreated(transactionCreated)
{
mHashMutex.lock();
mHash = calculateHash(proto_message_base64);
@ -118,7 +118,7 @@ int ProcessingTransaction::run()
if (mTransactionSpecific->prepare()) {
getErrors(mTransactionSpecific);
addError(new Error("ProcessingTransaction", "error preparing"));
reportErrorToCommunityServer(catalog->gettext("format error"), catalog->gettext("format of specific transaction not known, wrong proto version?"), std::to_string(mTransactionBody.created().seconds()));
reportErrorToCommunityServer(catalog->gettext("format error"), catalog->gettext("format of specific transaction not known, wrong proto version?"), Poco::DateTimeFormatter::format(mTransactionCreated, "%s"));
unlock();
return -3;
}

3
src/cpp/tasks/ProcessingTransaction.h
View File

@ -33,7 +33,7 @@ class ProcessingTransaction : public UniLib::controller::CPUTask, public Notific
friend SigningTransaction;
public:
//! \param lang for error messages in user language
ProcessingTransaction(const std::string& proto_message_base64, DHASH userEmailHash, Languages lang);
ProcessingTransaction(const std::string& proto_message_base64, DHASH userEmailHash, Languages lang, Poco::DateTime transactionCreated = Poco::DateTime());
virtual ~ProcessingTransaction();
int run();
@ -70,6 +70,7 @@ protected:
DHASH mUserEmailHash;
Languages mLang;
Poco::Mutex mHashMutex;
Poco::DateTime mTransactionCreated;
private:
};

3
src/cpsp/decodeTransaction.cpsp
View File

@ -103,8 +103,7 @@
auto creation = transactionBody.creation();
TransactionCreation creationObject("", creation);
auto receiver = creation.receiveramount();
auto receiver = creation.receiver();
char hex[65]; memset(hex, 0, 65);
sodium_bin2hex(hex, 65, (const unsigned char*)receiver.pubkey().data(), receiver.pubkey().size());

2
src/cpsp/login.cpsp
View File

@ -81,7 +81,7 @@
} else {
langCatalog = mSession->getLanguageCatalog();
}
UserStates user_state;
UserState user_state;
try {
user_state = mSession->loadUser(email, password);
} catch (Poco::Exception& ex) {

2
src/proto

@ -1 +1 @@
Subproject commit 72e8fe7b73a1aaf2d057d2fef59ade9268830008
Subproject commit ff412f735667b30233c0ce00d461f209ac7dde7c