From 5a40df831f35684adfb1450cf516438ffbcfd3c1 Mon Sep 17 00:00:00 2001
From: Dario <dario.rekowski@gmx.de>
Date: Sun, 3 Nov 2019 12:34:24 +0100
Subject: [PATCH] remove bugs

---
 src/cpp/Gradido_LoginServer.cpp               |  2 +-
 src/cpp/HTTPInterface/ElopageWebhook.h        |  2 +-
 src/cpp/HTTPInterface/LoginPage.cpp           |  5 ++--
 .../PageRequestHandlerFactory.cpp             |  2 +-
 .../HTTPInterface/PageRequestHandlerFactory.h |  2 +-
 src/cpp/HTTPInterface/PassphrasePage.cpp      | 19 +++++++--------
 src/cpp/HTTPInterface/SaveKeysPage.cpp        | 23 +++++++++----------
 src/cpp/SingletonManager/ErrorManager.cpp     |  2 +-
 src/cpp/SingletonManager/MemoryManager.cpp    |  7 +++---
 src/cpp/SingletonManager/MemoryManager.h      |  1 +
 src/cpp/model/Session.cpp                     |  2 +-
 src/cpp/model/User.cpp                        |  4 ++--
 src/cpp/model/User.h                          |  1 +
 src/cpp/tasks/CPUShedulerThread.cpp           |  2 +-
 src/cpp/tasks/PrepareEmailTask.cpp            |  2 +-
 src/cpp/tasks/ProcessingTransaction.h         |  4 ++--
 src/cpp/tasks/SendEmailTask.cpp               |  2 +-
 src/cpp/tasks/SigningTransaction.cpp          | 12 ++++++----
 src/cpp/tasks/SigningTransaction.h            |  2 +-
 src/cpsp/login.cpsp                           |  1 -
 src/cpsp/passphrase.cpsp                      |  1 -
 src/cpsp/saveKeys.cpsp                        |  1 -
 22 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/src/cpp/Gradido_LoginServer.cpp b/src/cpp/Gradido_LoginServer.cpp
index ddfefc3d7..af4de2a88 100644
--- a/src/cpp/Gradido_LoginServer.cpp
+++ b/src/cpp/Gradido_LoginServer.cpp
@@ -3,7 +3,7 @@
 #include "HTTPInterface/PageRequestHandlerFactory.h"
 #include "JSONInterface/JsonRequestHandlerFactory.h"
 
-#include "model/Profiler.h"
+#include "lib/Profiler.h"
 
 #include "SingletonManager/ConnectionManager.h"
 #include "SingletonManager/SessionManager.h"
diff --git a/src/cpp/HTTPInterface/ElopageWebhook.h b/src/cpp/HTTPInterface/ElopageWebhook.h
index c6219e324..9de3986f4 100644
--- a/src/cpp/HTTPInterface/ElopageWebhook.h
+++ b/src/cpp/HTTPInterface/ElopageWebhook.h
@@ -4,7 +4,7 @@
 
 #include "PageRequestMessagedHandler.h"
 #include "../tasks/CPUTask.h"
-#include "../model/ErrorList.h"
+#include "../lib/ErrorList.h"
 
 #include "Poco/Net/NameValueCollection.h"
 
diff --git a/src/cpp/HTTPInterface/LoginPage.cpp b/src/cpp/HTTPInterface/LoginPage.cpp
index cd8da3b10..2ddd22a2d 100644
--- a/src/cpp/HTTPInterface/LoginPage.cpp
+++ b/src/cpp/HTTPInterface/LoginPage.cpp
@@ -13,7 +13,6 @@
 #include "Poco/Logger.h"
 
 #include "../SingletonManager/SessionManager.h"
-#include "../model/Profiler.h"
 	
 #line 1 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\header.cpsp"
  
@@ -28,7 +27,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 	if (_compressResponse) response.set("Content-Encoding", "gzip");
 
 	Poco::Net::HTMLForm form(request, request.stream());
-#line 16 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\login.cpsp"
+#line 15 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\login.cpsp"
  
 	const char* pageName = "Login";
 	auto sm = SessionManager::getInstance();
@@ -165,7 +164,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
 	responseStream << "\t<div class=\"grd_container\">\n";
 	responseStream << "\t\t<h1>Login</h1>\n";
 	responseStream << "\t\t";
-#line 76 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\login.cpsp"
+#line 75 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\login.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
 	responseStream << "\t\t<fieldset class=\"grd_container_small\">\n";
diff --git a/src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp b/src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp
index 8efd024c4..b9158b74c 100644
--- a/src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp
+++ b/src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp
@@ -19,7 +19,7 @@
 
 #include "../SingletonManager/SessionManager.h"
 
-#include "../model/Profiler.h"
+#include "../lib/Profiler.h"
 
 #include "../ServerConfig.h"
 #include "../Crypto/DRRandom.h"
diff --git a/src/cpp/HTTPInterface/PageRequestHandlerFactory.h b/src/cpp/HTTPInterface/PageRequestHandlerFactory.h
index fe9edbdf2..75744d501 100644
--- a/src/cpp/HTTPInterface/PageRequestHandlerFactory.h
+++ b/src/cpp/HTTPInterface/PageRequestHandlerFactory.h
@@ -5,7 +5,7 @@
 #include "Poco/RegularExpression.h"
 #include "Poco/Logger.h"
 #include "../model/Session.h"
-#include "../model/Profiler.h"
+#include "../lib/Profiler.h"
 
 #define HTTP_PAGES_COUNT 1
 
diff --git a/src/cpp/HTTPInterface/PassphrasePage.cpp b/src/cpp/HTTPInterface/PassphrasePage.cpp
index c484d785b..9ee0f0029 100644
--- a/src/cpp/HTTPInterface/PassphrasePage.cpp
+++ b/src/cpp/HTTPInterface/PassphrasePage.cpp
@@ -7,7 +7,6 @@
 
 #line 7 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
 
-#include "../model/Profiler.h"
 #include "../SingletonManager/SessionManager.h"
 //#include "Poco/Net/HTTPServerParams.h"
 
@@ -35,7 +34,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 	if (_compressResponse) response.set("Content-Encoding", "gzip");
 
 	Poco::Net::HTMLForm form(request, request.stream());
-#line 18 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
+#line 17 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
 
 	const char* pageName = "Passphrase";
 	PageState state = PAGE_ASK_PASSPHRASE;
@@ -152,11 +151,11 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 	responseStream << "<div class=\"grd_container\">\n";
 	responseStream << "\t<h1>Einen neuen Account anlegen</h1>\n";
 	responseStream << "\t";
-#line 58 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
+#line 57 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
 	responseStream << "\t";
-#line 59 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
+#line 58 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
  if(state == PAGE_SHOW_PASSPHRASE) {	responseStream << "\n";
 	responseStream << "\t\t<div class=\"grd_text-max-width\">\n";
 	responseStream << "\t\t\t<div class=\"grd_text\">\n";
@@ -164,11 +163,12 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 	responseStream << "\t\t\t</div>\n";
 	responseStream << "\t\t\t<div class=\"grd_textarea\">\n";
 	responseStream << "\t\t\t\t";
-#line 65 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
+#line 64 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
 	responseStream << ( mSession->getPassphrase() );
 	responseStream << "\n";
 	responseStream << "\t\t\t</div>\n";
-	responseStream << "\t\t\t<a href=\"saveKeys\" class=\"grd-margin-top-10 grd-form-bn grd-form-bn-succeed\">Weiter</a>\n";
+	responseStream << "\t\t\t<div class=\"grd-margin-top-10\"></div>\n";
+	responseStream << "\t\t\t<a href=\"saveKeys\" class=\"grd-form-bn grd-form-bn-succeed grd_clickable\">Weiter</a>\n";
 	responseStream << "\t\t</div>\n";
 	responseStream << "\t";
 #line 69 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
@@ -194,17 +194,18 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
 	responseStream << ( !form.empty() ? form.get("passphrase-existing", "") : "" );
 	responseStream << "</textarea>\n";
 	responseStream << "\t\t</fieldset>\n";
-	responseStream << "\t\t<input class=\"grd-form-bn grd-form-bn-succeed grd-margin-top-10\" type=\"submit\" name=\"submit\" value=\"Weiter\">\n";
+	responseStream << "\t\t\n";
+	responseStream << "\t\t<input class=\"grd-form-bn grd-form-bn-succeed grd_clickable\" type=\"submit\" name=\"submit\" value=\"Weiter\">\n";
 	responseStream << "\t\t\n";
 	responseStream << "\t</form>\n";
 	responseStream << "\t";
-#line 88 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
+#line 89 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
  } else { 	responseStream << "\n";
 	responseStream << "\t\t<div class=\"grd_text\">\n";
 	responseStream << "\t\t\tUngültige Seite, wenn du das siehst stimmt hier etwas nicht. Bitte wende dich an den Server-Admin. \n";
 	responseStream << "\t\t</div>\n";
 	responseStream << "\t";
-#line 92 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
+#line 93 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
diff --git a/src/cpp/HTTPInterface/SaveKeysPage.cpp b/src/cpp/HTTPInterface/SaveKeysPage.cpp
index 156e0fcde..27b4ff394 100644
--- a/src/cpp/HTTPInterface/SaveKeysPage.cpp
+++ b/src/cpp/HTTPInterface/SaveKeysPage.cpp
@@ -8,7 +8,6 @@
 #line 7 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
 
 #include "Poco/Net/HTTPServerParams.h"
-#include "../model/Profiler.h"
 
 enum PageState 
 {
@@ -36,7 +35,7 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
 	if (_compressResponse) response.set("Content-Encoding", "gzip");
 
 	Poco::Net::HTMLForm form(request, request.stream());
-#line 19 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
+#line 18 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
 
 	const char* pageName = "Daten auf Server speichern?";
 	bool hasErrors = mSession->errorCount() > 0;
@@ -170,11 +169,11 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
 	responseStream << "<div class=\"grd_container\">\n";
 	responseStream << "\t<h1>Daten speichern</h1>\n";
 	responseStream << "\t";
-#line 76 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
+#line 75 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
 	responseStream << "\t";
-#line 77 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
+#line 76 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
  if(state == PAGE_ASK) { 	responseStream << "\n";
 	responseStream << "\t<form method=\"POST\">\n";
 	responseStream << "\t\t<fieldset>\n";
@@ -189,7 +188,7 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
 	responseStream << "\t\t\t\t<label class=\"grd_radio_label\" for=\"save-privkey-yes\">Ja, bitte speichern!</label>\n";
 	responseStream << "\t\t\t</p>\n";
 	responseStream << "\t\t\t";
-#line 90 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
+#line 89 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
  if(!hasPassword) { 	responseStream << "\n";
 	responseStream << "\t\t\t\t<p>Ich brauche nochmal dein Passwort wenn du dich für ja entscheidest.</p>\n";
 	responseStream << "\t\t\t\t<p class=\"grd_small\">\n";
@@ -197,7 +196,7 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
 	responseStream << "\t\t\t\t\t<input id=\"save-privkey-password\" type=\"password\" name=\"save-privkey-password\"/>\n";
 	responseStream << "\t\t\t\t</p>\n";
 	responseStream << "\t\t\t";
-#line 96 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
+#line 95 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
  } 	responseStream << "\n";
 	responseStream << "\t\t\t<p class=\"grd_small\">\n";
 	responseStream << "\t\t\t\t<input id=\"save-privkey-no\" type=\"radio\" name=\"save-privkey\" value=\"no\"/>\n";
@@ -222,7 +221,7 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
 	responseStream << "\t\t<input class=\"grd-form-bn grd-form-bn-succeed\" type=\"submit\" value=\"Speichern\">\n";
 	responseStream << "\t</form>\n";
 	responseStream << "\t";
-#line 119 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
+#line 118 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
  } else if(state == PAGE_SHOW_PUBKEY) { 	responseStream << "\n";
 	responseStream << "\t\t<div class=\"grd_text\">\n";
 	responseStream << "\t\t\t<!--<p>Je nach Auswahl werden deine Daten nun verschl&uuml;sselt und gespeichert. </p>-->\n";
@@ -230,27 +229,27 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
 	responseStream << "\t\t\t<!--<p>Deine Gradido Adresse (Hex): </p>\n";
 	responseStream << "\t\t\t<p class=\"grd_textarea\">\n";
 	responseStream << "\t\t\t\t";
-#line 125 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
+#line 124 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
 	responseStream << ( mSession->getUser()->getPublicKeyHex() );
 	responseStream << "\n";
 	responseStream << "\t\t\t</p>-->\n";
 	responseStream << "\t\t\t<a class=\"grd-form-bn\" href=\"";
-#line 127 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
+#line 126 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
 	responseStream << ( uri_start );
 	responseStream << "\">Zur&uuml;ck zur Startseite</a>\n";
 	responseStream << "\t\t</div>\n";
 	responseStream << "\t";
-#line 129 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
+#line 128 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
  } else if(state == PAGE_ERROR) { 	responseStream << "\n";
 	responseStream << "\t\t<div class=\"grd_text\">\n";
 	responseStream << "\t\t\t<p>Ein Fehler trat auf, bitte versuche es erneut oder wende dich an den Server-Admin</p>\n";
 	responseStream << "\t\t\t";
-#line 132 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
+#line 131 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
 	responseStream << ( mSession->getSessionStateString() );
 	responseStream << "\n";
 	responseStream << "\t\t</div>\n";
 	responseStream << "\t";
-#line 134 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
+#line 133 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\saveKeys.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
diff --git a/src/cpp/SingletonManager/ErrorManager.cpp b/src/cpp/SingletonManager/ErrorManager.cpp
index a24ec05ab..aa31b4181 100644
--- a/src/cpp/SingletonManager/ErrorManager.cpp
+++ b/src/cpp/SingletonManager/ErrorManager.cpp
@@ -4,7 +4,7 @@
 #include "Poco/Net/SecureSMTPClientSession.h"
 #include "Poco/Net/StringPartSource.h"
 
-#include "../model/ErrorList.h"
+#include "../lib/ErrorList.h"
 
 
 ErrorManager* ErrorManager::getInstance()
diff --git a/src/cpp/SingletonManager/MemoryManager.cpp b/src/cpp/SingletonManager/MemoryManager.cpp
index b0715edb8..6781c9c43 100644
--- a/src/cpp/SingletonManager/MemoryManager.cpp
+++ b/src/cpp/SingletonManager/MemoryManager.cpp
@@ -29,9 +29,10 @@ MemoryPageStack::~MemoryPageStack()
 {
 	lock();
 	while (mMemoryBinStack.size() > 0) {
-		auto memoryBin = mMemoryBinStack.top();
-		delete memoryBin;
+		MemoryBin* memoryBin = mMemoryBinStack.top();
 		mMemoryBinStack.pop();
+		delete memoryBin;
+		
 	}
 	mSize = 0;
 	unlock();
@@ -48,7 +49,7 @@ MemoryBin* MemoryPageStack::getFreeMemory()
 		unlock();
 		return new MemoryBin(mSize);
 	}
-	auto memoryBin = mMemoryBinStack.top();
+	MemoryBin* memoryBin = mMemoryBinStack.top();
 	mMemoryBinStack.pop();
 	unlock();
 	return memoryBin;
diff --git a/src/cpp/SingletonManager/MemoryManager.h b/src/cpp/SingletonManager/MemoryManager.h
index 165bf1c96..4145bd7bd 100644
--- a/src/cpp/SingletonManager/MemoryManager.h
+++ b/src/cpp/SingletonManager/MemoryManager.h
@@ -17,6 +17,7 @@
 #include "../lib/MultithreadContainer.h"
 
 #include <list>
+#include <stack>
 
 #define MEMORY_MANAGER_PAGE_SIZE 10
 
diff --git a/src/cpp/model/Session.cpp b/src/cpp/model/Session.cpp
index c54def263..b9602a62c 100644
--- a/src/cpp/model/Session.cpp
+++ b/src/cpp/model/Session.cpp
@@ -1,5 +1,5 @@
 #include "Session.h"
-#include "Profiler.h"
+#include "../lib/Profiler.h"
 #include "../ServerConfig.h"
 
 #include "Poco/RegularExpression.h"
diff --git a/src/cpp/model/User.cpp b/src/cpp/model/User.cpp
index 09c72885b..1f359e54a 100644
--- a/src/cpp/model/User.cpp
+++ b/src/cpp/model/User.cpp
@@ -768,7 +768,7 @@ MemoryBin* User::sign(const unsigned char* message, size_t messageSize)
 	auto mm = MemoryManager::getInstance();
 	//auto signBinBuffer = (unsigned char*)malloc(crypto_sign_BYTES);
 	auto signBinBuffer = mm->getFreeMemory(crypto_sign_BYTES);
-	auto privKey = decrypt(mPrivateKey);
+	auto privKey = getPrivKey();
 
 	crypto_sign_detached(*signBinBuffer, NULL, message, messageSize, *privKey);
 
@@ -791,7 +791,7 @@ MemoryBin* User::sign(const unsigned char* message, size_t messageSize)
 	
 	mm->releaseMemory(privKey);
 
-	return  signBinBuffer;
+	return signBinBuffer;
 }
 
 Poco::Data::Statement User::insertIntoDB(Poco::Data::Session session)
diff --git a/src/cpp/model/User.h b/src/cpp/model/User.h
index 47209919d..94145f338 100644
--- a/src/cpp/model/User.h
+++ b/src/cpp/model/User.h
@@ -119,6 +119,7 @@ protected:
 	inline void unlock() { mWorkingMutex.unlock(); }
 
 	MemoryBin* getPrivKey();
+	inline bool hasPrivKey() { lock(); bool result = false; if (mPrivateKey && mCryptoKey) result = true; unlock(); return result; }
 	bool setPrivKey(const MemoryBin* privKey);
 
 private:
diff --git a/src/cpp/tasks/CPUShedulerThread.cpp b/src/cpp/tasks/CPUShedulerThread.cpp
index 893fdceac..ad1d910cc 100644
--- a/src/cpp/tasks/CPUShedulerThread.cpp
+++ b/src/cpp/tasks/CPUShedulerThread.cpp
@@ -5,7 +5,7 @@
 
 #ifdef _UNI_LIB_DEBUG
 //#include "lib/TimeCounter.h"
-#include "../model/Profiler.h"
+#include "../lib/Profiler.h"
 #include "Poco/Message.h"
 #endif //_UNI_LIB_DEBUG
 
diff --git a/src/cpp/tasks/PrepareEmailTask.cpp b/src/cpp/tasks/PrepareEmailTask.cpp
index c0d032c39..20d334d24 100644
--- a/src/cpp/tasks/PrepareEmailTask.cpp
+++ b/src/cpp/tasks/PrepareEmailTask.cpp
@@ -1,5 +1,5 @@
 #include "PrepareEmailTask.h"
-#include "../model/Profiler.h"
+#include "../lib/Profiler.h"
 #include "../ServerConfig.h"
 #include "../SingletonManager/ErrorManager.h"
 
diff --git a/src/cpp/tasks/ProcessingTransaction.h b/src/cpp/tasks/ProcessingTransaction.h
index 01d8560ed..715edbb42 100644
--- a/src/cpp/tasks/ProcessingTransaction.h
+++ b/src/cpp/tasks/ProcessingTransaction.h
@@ -3,8 +3,8 @@
 
 #include "CPUTask.h"
 
-#include "../model/ErrorList.h"
-#include "../Crypto/DRHash.h"
+#include "../lib/ErrorList.h"
+#include "../lib/DRHash.h"
 #include "../model/TransactionBase.h"
 
 #include "../proto/gradido/TransactionBody.pb.h"
diff --git a/src/cpp/tasks/SendEmailTask.cpp b/src/cpp/tasks/SendEmailTask.cpp
index 63c572e44..2ed70a75e 100644
--- a/src/cpp/tasks/SendEmailTask.cpp
+++ b/src/cpp/tasks/SendEmailTask.cpp
@@ -1,6 +1,6 @@
 #include "SendEmailTask.h"
 #include "PrepareEmailTask.h"
-#include "../model/Profiler.h"
+#include "../lib/Profiler.h"
 #include "../SingletonManager/ErrorManager.h"
 #include "../ServerConfig.h"
 
diff --git a/src/cpp/tasks/SigningTransaction.cpp b/src/cpp/tasks/SigningTransaction.cpp
index 1d5dd38ff..0bf41a6c2 100644
--- a/src/cpp/tasks/SigningTransaction.cpp
+++ b/src/cpp/tasks/SigningTransaction.cpp
@@ -1,6 +1,7 @@
 #include "SigningTransaction.h"
 
 #include "../SingletonManager/ErrorManager.h"
+#include "../SingletonManager/MemoryManager.h"
 
 SigningTransaction::SigningTransaction(Poco::AutoPtr<ProcessingTransaction> processingeTransaction, Poco::AutoPtr<User> user)
 	: mProcessingeTransaction(processingeTransaction), mUser(user)
@@ -15,7 +16,7 @@ SigningTransaction::~SigningTransaction()
 
 int SigningTransaction::run() {
 	auto em = ErrorManager::getInstance();
-
+	auto mm = MemoryManager::getInstance();
 
 	Error* transactionError = new Error("SigningTransaction start", mProcessingeTransaction->mProtoMessageBase64.data());
 
@@ -28,8 +29,8 @@ int SigningTransaction::run() {
 		return -1;
 	}
 
-	auto privKey = mUser->getPrivKey();
-	if (!privKey) {
+	//auto privKey = mUser->getPrivKey();
+	if (!mUser->hasPrivKey()) {
 		em->addError(transactionError);
 		em->getErrors(mUser);
 		em->addError(new Error("SigningTransaction", "couldn't get user priv key"));
@@ -37,9 +38,10 @@ int SigningTransaction::run() {
 		return -2;
 	}
 
-
+	//auto sign = mUser->sign(mProcessingeTransaction->)
 	delete transactionError;
-	delete privKey;
+	//delete privKey;
+	//mm->releaseMemory(privKey);
 
 	return 0;
 }
\ No newline at end of file
diff --git a/src/cpp/tasks/SigningTransaction.h b/src/cpp/tasks/SigningTransaction.h
index 47731e6c8..c54dbf0cd 100644
--- a/src/cpp/tasks/SigningTransaction.h
+++ b/src/cpp/tasks/SigningTransaction.h
@@ -3,7 +3,7 @@
 
 #include "CPUTask.h"
 
-#include "../model/ErrorList.h"
+#include "../lib/ErrorList.h"
 #include "../model/TransactionBase.h"
 #include "../model/User.h"
 
diff --git a/src/cpsp/login.cpsp b/src/cpsp/login.cpsp
index cfc859536..dbfd30d63 100644
--- a/src/cpsp/login.cpsp
+++ b/src/cpsp/login.cpsp
@@ -10,7 +10,6 @@
 #include "Poco/Logger.h"
 
 #include "../SingletonManager/SessionManager.h"
-#include "../model/Profiler.h"
 	
 %>
 <%% 
diff --git a/src/cpsp/passphrase.cpsp b/src/cpsp/passphrase.cpsp
index 968921bf5..2c9a9ff47 100644
--- a/src/cpsp/passphrase.cpsp
+++ b/src/cpsp/passphrase.cpsp
@@ -5,7 +5,6 @@
 <%@ page form="true" %>
 <%@	page compressed="true" %>
 <%!
-#include "../model/Profiler.h"
 #include "../SingletonManager/SessionManager.h"
 //#include "Poco/Net/HTTPServerParams.h"
 
diff --git a/src/cpsp/saveKeys.cpsp b/src/cpsp/saveKeys.cpsp
index 4cb48c642..e9b3032af 100644
--- a/src/cpsp/saveKeys.cpsp
+++ b/src/cpsp/saveKeys.cpsp
@@ -6,7 +6,6 @@
 <%@	page compressed="true" %>
 <%!
 #include "Poco/Net/HTTPServerParams.h"
-#include "../model/Profiler.h"
 
 enum PageState 
 {