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

fix passphrase error

Browse Source
This commit is contained in:
Dario 2020-02-28 13:27:17 +01:00
parent f77f50a24b
commit 3a36059519
34 changed files with 243 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpp/Crypto/KeyPair.cpp
View File

@ -185,7 +185,7 @@ MemoryBin* KeyPair::createWordIndices(const std::string& passphrase, const Mnemo
if (buffer_cursor < 3) { if (buffer_cursor < 3) {
continue; continue;
} }
if (word_source->isWordExist(acBuffer)) { if (PHRASE_WORD_COUNT > word_cursor && word_source->isWordExist(acBuffer)) {
word_indices_p[word_cursor] = word_source->getWordIndex(acBuffer); word_indices_p[word_cursor] = word_source->getWordIndex(acBuffer);
//word_indices_old[word_cursor] = word_source->getWordIndex(acBuffer); //word_indices_old[word_cursor] = word_source->getWordIndex(acBuffer);
} }
@ -204,7 +204,7 @@ MemoryBin* KeyPair::createWordIndices(const std::string& passphrase, const Mnemo
acBuffer[buffer_cursor++] = *it; acBuffer[buffer_cursor++] = *it;
} }
} }
if (word_source->isWordExist(acBuffer)) { if (PHRASE_WORD_COUNT > word_cursor && word_source->isWordExist(acBuffer)) {
word_indices_p[word_cursor] = word_source->getWordIndex(acBuffer); word_indices_p[word_cursor] = word_source->getWordIndex(acBuffer);
//word_indices_old[word_cursor] = word_source->getWordIndex(acBuffer); //word_indices_old[word_cursor] = word_source->getWordIndex(acBuffer);
word_cursor++; word_cursor++;

8
src/cpp/HTTPInterface/AdminCheckUserBackup.cpp
View File

@ -69,9 +69,9 @@ void AdminCheckUserBackup::handleRequest(Poco::Net::HTTPServerRequest& request,
auto user_id = tuple.get<0>(); auto user_id = tuple.get<0>();
Mnemonic* wordSource = nullptr; Mnemonic* wordSource = nullptr;
if(!User::validatePassphrase(passphrase, &wordSource)) { if(!User::validatePassphrase(passphrase, &wordSource)) {
addError(new Error("admin Check user backup", "invalid passphrase")); addError(new Error("admin Check user backup", "invalid passphrase"), false);
addError(new ParamError("admin Check user backup", "passphrase", passphrase.data())); addError(new ParamError("admin Check user backup", "passphrase", passphrase.data()), false);
addError(new ParamError("admin Check user backup", "user id", user_id)); addError(new ParamError("admin Check user backup", "user id", user_id), false);
continue; continue;
} else { } else {
keys.generateFromPassphrase(passphrase.data(), wordSource); keys.generateFromPassphrase(passphrase.data(), wordSource);
@ -89,7 +89,7 @@ void AdminCheckUserBackup::handleRequest(Poco::Net::HTTPServerRequest& request,
} }
} }
catch (Poco::Exception& ex) { catch (Poco::Exception& ex) {
addError(new ParamError("adminCheckUserBackup", "mysql error", ex.displayText().data())); addError(new ParamError("adminCheckUserBackup", "mysql error", ex.displayText().data()), false);
} }

19
src/cpp/HTTPInterface/CheckEmailPage.cpp
View File

@ -74,6 +74,9 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
verificationCode = getLastGetAsU64(request.getURI()); verificationCode = getLastGetAsU64(request.getURI());
} }
#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
bool withMaterialIcons = false;
std::ostream& _responseStream = response.send(); std::ostream& _responseStream = response.send();
Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
@ -86,19 +89,27 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "<meta charset=\"UTF-8\">\n"; responseStream << "<meta charset=\"UTF-8\">\n";
responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n"; responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n";
responseStream << "<title>Gradido Login Server: "; responseStream << "<title>Gradido Login Server: ";
#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( pageName ); responseStream << ( pageName );
responseStream << "</title>\n"; responseStream << "</title>\n";
responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\""; responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "css/loginServer/style.css\">\n"; responseStream << "css/loginServer/style.css\">\n";
#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
if(withMaterialIcons) { responseStream << "\n";
responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "css/materialdesignicons.min.css\">\n";
#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
} responseStream << "\n";
responseStream << "</head>\n"; responseStream << "</head>\n";
responseStream << "<body class=\"header-fixed\">\n"; responseStream << "<body class=\"header-fixed\">\n";
responseStream << "<div class=\"versionstring dev-info\">\n"; responseStream << "<div class=\"versionstring dev-info\">\n";
responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n"; responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha "; responseStream << "\t<p class=\"grd_small\">Alpha ";
#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_versionString ); responseStream << ( ServerConfig::g_versionString );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "</div>\n"; responseStream << "</div>\n";
@ -106,7 +117,7 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t<div class=\"grd-left-bar-section\">\n"; responseStream << "\t<div class=\"grd-left-bar-section\">\n";
responseStream << "\t\t<ul class=\"grd-no-style\">\n"; responseStream << "\t\t<ul class=\"grd-no-style\">\n";
responseStream << "\t\t <li><a href=\""; responseStream << "\t\t <li><a href=\"";
#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n"; responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
responseStream << "\t\t <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n"; responseStream << "\t\t <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";

6
src/cpp/HTTPInterface/CheckTransactionPage.cpp
View File

@ -490,8 +490,8 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "</div>\n"; responseStream << "</div>\n";
#line 196 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp" #line 196 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkTransaction.cpsp"
} // begin include footer_ripple.cpsp } // begin include footer_ripple.cpsp
responseStream << "\t</div>\n"; responseStream << "\t\t\t</div>\n";
responseStream << " </div>\n"; responseStream << "\t\t</div>\n";
responseStream << " <!-- content viewport ends -->\n"; responseStream << " <!-- content viewport ends -->\n";
responseStream << " <!-- partial:partials/_footer.html -->\n"; responseStream << " <!-- partial:partials/_footer.html -->\n";
responseStream << " <footer class=\"footer\">\n"; responseStream << " <footer class=\"footer\">\n";
@ -503,7 +503,7 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << " </ul>\n"; responseStream << " </ul>\n";
responseStream << " </div>\n"; responseStream << " </div>\n";
responseStream << " <div class=\"col-sm-6 text-center text-sm-left mt-3 mt-sm-0\">\n"; responseStream << " <div class=\"col-sm-6 text-center text-sm-left mt-3 mt-sm-0\">\n";
responseStream << " <small class=\"text-muted d-block\">Copyright © 2019 Gradido</small>\n"; responseStream << " <small class=\"text-muted d-block\">Copyright © 2020 Gradido</small>\n";
responseStream << " </div>\n"; responseStream << " </div>\n";
responseStream << " </div>\n"; responseStream << " </div>\n";
responseStream << " </footer>\n"; responseStream << " </footer>\n";

19
src/cpp/HTTPInterface/ConfigPage.cpp
View File

@ -21,6 +21,9 @@ void ConfigPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:
if (_compressResponse) response.set("Content-Encoding", "gzip"); if (_compressResponse) response.set("Content-Encoding", "gzip");
Poco::Net::HTMLForm form(request, request.stream()); Poco::Net::HTMLForm form(request, request.stream());
#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
bool withMaterialIcons = false;
std::ostream& _responseStream = response.send(); std::ostream& _responseStream = response.send();
Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
@ -33,19 +36,27 @@ void ConfigPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:
responseStream << "<meta charset=\"UTF-8\">\n"; responseStream << "<meta charset=\"UTF-8\">\n";
responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n"; responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n";
responseStream << "<title>Gradido Login Server: "; responseStream << "<title>Gradido Login Server: ";
#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( pageName ); responseStream << ( pageName );
responseStream << "</title>\n"; responseStream << "</title>\n";
responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\""; responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "css/loginServer/style.css\">\n"; responseStream << "css/loginServer/style.css\">\n";
#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
if(withMaterialIcons) { responseStream << "\n";
responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "css/materialdesignicons.min.css\">\n";
#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
} responseStream << "\n";
responseStream << "</head>\n"; responseStream << "</head>\n";
responseStream << "<body class=\"header-fixed\">\n"; responseStream << "<body class=\"header-fixed\">\n";
responseStream << "<div class=\"versionstring dev-info\">\n"; responseStream << "<div class=\"versionstring dev-info\">\n";
responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n"; responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha "; responseStream << "\t<p class=\"grd_small\">Alpha ";
#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_versionString ); responseStream << ( ServerConfig::g_versionString );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "</div>\n"; responseStream << "</div>\n";
@ -53,7 +64,7 @@ void ConfigPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:
responseStream << "\t<div class=\"grd-left-bar-section\">\n"; responseStream << "\t<div class=\"grd-left-bar-section\">\n";
responseStream << "\t\t<ul class=\"grd-no-style\">\n"; responseStream << "\t\t<ul class=\"grd-no-style\">\n";
responseStream << "\t\t <li><a href=\""; responseStream << "\t\t <li><a href=\"";
#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n"; responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
responseStream << "\t\t <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n"; responseStream << "\t\t <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";

11
src/cpp/HTTPInterface/DashboardPage.cpp
View File

@ -105,17 +105,6 @@ void DashboardPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
responseStream << ( ServerConfig::g_versionString ); responseStream << ( ServerConfig::g_versionString );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "</div>\n"; responseStream << "</div>\n";
responseStream << "<!--<nav class=\"grd-left-bar expanded\" data-topbar role=\"navigation\">\n";
responseStream << "\t<div class=\"grd-left-bar-section\">\n";
responseStream << "\t\t<ul class=\"grd-no-style\">\n";
responseStream << "\t\t <li><a href=\"";
#line 58 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
responseStream << "\t\t <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";
responseStream << "\t\t</ul>\n";
responseStream << "\t</div>\n";
responseStream << "</nav>-->";
// end include header_old.cpsp // end include header_old.cpsp
responseStream << "\n"; responseStream << "\n";
responseStream << "<div class=\"grd_container\">\n"; responseStream << "<div class=\"grd_container\">\n";

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

@ -40,7 +40,7 @@ void DebugPassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, P
auto passphrase = KeyPair::filterPassphrase(form.get("passphrase", "")); auto passphrase = KeyPair::filterPassphrase(form.get("passphrase", ""));
Mnemonic* wordSource = nullptr; Mnemonic* wordSource = nullptr;
if(!User::validatePassphrase(passphrase, &wordSource)) { if(!User::validatePassphrase(passphrase, &wordSource)) {
addError(new Error("debug Passphrase", "invalid passphrase")); addError(new Error("debug Passphrase", "invalid passphrase"), false);
} else { } else {
keys.generateFromPassphrase(passphrase.data(), wordSource); keys.generateFromPassphrase(passphrase.data(), wordSource);
} }

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

@ -56,13 +56,13 @@ void DecodeTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
sodium_base64_VARIANT_ORIGINAL)) sodium_base64_VARIANT_ORIGINAL))
{ {
free(binBuffer); free(binBuffer);
addError(new Error("ProcessingTransaction", "error decoding base64")); addError(new Error("ProcessingTransaction", "error decoding base64"), false);
} else { } else {
std::string binString((char*)binBuffer, resultingBinSize); std::string binString((char*)binBuffer, resultingBinSize);
free(binBuffer); free(binBuffer);
if (!transactionBody.ParseFromString(binString)) { if (!transactionBody.ParseFromString(binString)) {
addError(new Error("ProcessingTransaction", "error creating Transaction from binary Message")); addError(new Error("ProcessingTransaction", "error creating Transaction from binary Message"), false);
} else { } else {
decoded = true; decoded = true;
} }

16
src/cpp/HTTPInterface/Error500Page.cpp
View File

@ -97,19 +97,11 @@ void Error500Page::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
responseStream << "<body>\n"; responseStream << "<body>\n";
responseStream << "<div class=\"versionstring dev-info\">\n"; responseStream << "<div class=\"versionstring dev-info\">\n";
responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n"; responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.8.1</p>\n"; responseStream << "\t<p class=\"grd_small\">Alpha ";
#line 53 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
responseStream << ( ServerConfig::g_versionString );
responseStream << "</p>\n";
responseStream << "</div>\n"; responseStream << "</div>\n";
responseStream << "<!--<nav class=\"grd-left-bar expanded\" data-topbar role=\"navigation\">\n";
responseStream << "\t<div class=\"grd-left-bar-section\">\n";
responseStream << "\t\t<ul class=\"grd-no-style\">\n";
responseStream << "\t\t <li><a href=\"";
#line 58 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
responseStream << "\t\t <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";
responseStream << "\t\t</ul>\n";
responseStream << "\t</div>\n";
responseStream << "</nav>-->";
// end include header_old.cpsp // end include header_old.cpsp
responseStream << "\n"; responseStream << "\n";
responseStream << "<div class=\"grd_container\">\n"; responseStream << "<div class=\"grd_container\">\n";

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

@ -103,13 +103,13 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
switch(userState) { switch(userState) {
case USER_EMPTY: case USER_EMPTY:
case USER_PASSWORD_INCORRECT: case USER_PASSWORD_INCORRECT:
addError(new Error(langCatalog->gettext("Login"), langCatalog->gettext("E-Mail or password isn't right, please try again!"))); addError(new Error(langCatalog->gettext("Login"), langCatalog->gettext("E-Mail or password isn't right, please try again!")), false);
break; break;
case USER_PASSWORD_ENCRYPTION_IN_PROCESS: case USER_PASSWORD_ENCRYPTION_IN_PROCESS:
addError(new Error(langCatalog->gettext("Passwort"), langCatalog->gettext("Passwort wird noch berechnet, bitte versuche es in etwa 1 Minute erneut."))); addError(new Error(langCatalog->gettext("Passwort"), langCatalog->gettext("Passwort wird noch berechnet, bitte versuche es in etwa 1 Minute erneut.")), false);
break; break;
case USER_EMAIL_NOT_ACTIVATED: case USER_EMAIL_NOT_ACTIVATED:
mSession->addError(new Error(langCatalog->gettext("Account"), langCatalog->gettext("E-Mail Address not checked, do you already get one?"))); mSession->addError(new Error(langCatalog->gettext("Account"), langCatalog->gettext("E-Mail Address not checked, do you already get one?")), false);
response.redirect(ServerConfig::g_serverPath + "/checkEmail"); response.redirect(ServerConfig::g_serverPath + "/checkEmail");
return; return;
case USER_NO_KEYS: case USER_NO_KEYS:
@ -142,7 +142,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
} }
} else if(!langUpdatedByBtn) { } else if(!langUpdatedByBtn) {
addError(new Error(langCatalog->gettext("Login"), langCatalog->gettext("Username and password are needed!"))); addError(new Error(langCatalog->gettext("Login"), langCatalog->gettext("Username and password are needed!")), false);
} }
} else { } else {

120
src/cpp/HTTPInterface/PassphrasePage.cpp
View File

@ -112,7 +112,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
} }
} }
else { else {
addError(new Error("Passphrase", "Diese Passphrase ist ung&uuml;ltig, bitte &uuml;berpr&uuml;fen oder neu generieren (lassen).")); addError(new Error(gettext("Passphrase"), gettext("Diese Passphrase ist ung&uuml;ltig, bitte &uuml;berpr&uuml;fen oder neu generieren (lassen).")), false);
} }
} }
} }
@ -126,11 +126,17 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
auto passphrase = mSession->getPassphrase(); auto passphrase = mSession->getPassphrase();
auto langWordSource = wordSource; auto langWordSource = wordSource;
if("" != passphrase && !User::validatePassphrase(passphrase, &wordSource)) { if("" != passphrase && !User::validatePassphrase(passphrase, &wordSource)) {
addError(new Error(gettext("Intern error"), gettext("Invalid Passphrase"))); addError(new Error("PassphrasePage", "Invalid Passphrase after double check"));
addError(new ParamError(gettext("Passphrase"), gettext("Passphrase"), passphrase.data())); addError(new ParamError("PassphrasePage", "passphrase", passphrase.data()));
if(!mSession->getNewUser().isNull()) {
addError(new ParamError("PassphrasePage", "user email", mSession->getNewUser()->getModel()->getEmail()));
}
sendErrorsAsEmail();
addError(new Error(gettext("Passphrase"), gettext("intern errorm please try again later")), false);
//response.redirect(ServerConfig::g_serverPath + "/error500"); //response.redirect(ServerConfig::g_serverPath + "/error500");
//return; //return;
} }
//printf("wordSource: %d, langWordSource: %d\n", (int)wordSource, (int)langWordSource);
if(wordSource != langWordSource) { if(wordSource != langWordSource) {
mSession->generatePassphrase(); mSession->generatePassphrase();
User::validatePassphrase(passphrase, &wordSource); User::validatePassphrase(passphrase, &wordSource);
@ -153,7 +159,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
bool withMaterialIcons = false; bool withMaterialIcons = false;
#line 132 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 138 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
withMaterialIcons = true; std::ostream& _responseStream = response.send(); withMaterialIcons = true; std::ostream& _responseStream = response.send();
Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
@ -240,9 +246,9 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << " <div class=\"grid-body\">"; responseStream << " <div class=\"grid-body\">";
// end include login_header.cpsp // end include login_header.cpsp
responseStream << "\n"; responseStream << "\n";
#line 133 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 139 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
if(state == PAGE_ASK_ENSURE_PASSPHRASE) { responseStream << "<div style=\"display:none\"> "; if(state == PAGE_ASK_ENSURE_PASSPHRASE) { responseStream << "<div style=\"display:none\"> ";
#line 133 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 139 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "\t"; responseStream << "\t";
// begin include flags.cpsp // begin include flags.cpsp
@ -280,71 +286,71 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "</form>"; responseStream << "</form>";
// end include flags.cpsp // end include flags.cpsp
responseStream << "\n"; responseStream << "\n";
#line 135 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 141 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
if(state == PAGE_ASK_ENSURE_PASSPHRASE) { responseStream << "</div> "; if(state == PAGE_ASK_ENSURE_PASSPHRASE) { responseStream << "</div> ";
#line 135 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 141 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "<div class=\"row mb-3\" "; responseStream << "<div class=\"row mb-3\" ";
#line 136 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
if(state != PAGE_ASK_ENSURE_PASSPHRASE) { responseStream << " style=\"margin-top:70px;\" "; if(state != PAGE_ASK_ENSURE_PASSPHRASE) { responseStream << " style=\"margin-top:70px;\" ";
#line 136 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
} responseStream << ">\n"; } responseStream << ">\n";
responseStream << "\t<h2 class=\"mx-auto\">"; responseStream << "\t<h2 class=\"mx-auto\">";
#line 137 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 143 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( pageTitle ); responseStream << ( pageTitle );
responseStream << ": "; responseStream << ": ";
#line 137 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 143 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( pageSubtitle ); responseStream << ( pageSubtitle );
responseStream << "</h2>\n"; responseStream << "</h2>\n";
responseStream << "</div>\n"; responseStream << "</div>\n";
responseStream << "<div class=\"item-wrapper\">\n"; responseStream << "<div class=\"item-wrapper\">\n";
responseStream << "\t<div class=\"row mb-3\">\n"; responseStream << "\t<div class=\"row mb-3\">\n";
responseStream << "\t"; responseStream << "\t";
#line 141 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
if(state == PAGE_SHOW_PASSPHRASE) { responseStream << "\n"; if(state == PAGE_SHOW_PASSPHRASE) { responseStream << "\n";
responseStream << "\t <div class=\"col-md-10 mx-auto\">\n"; responseStream << "\t <div class=\"col-md-10 mx-auto\">\n";
responseStream << "\t\t<div class=\"form-group row showcase_row_area\">\n"; responseStream << "\t\t<div class=\"form-group row showcase_row_area\">\n";
responseStream << "\t\t\t<form method=\"POST\" action=\""; responseStream << "\t\t\t<form method=\"POST\" action=\"";
#line 144 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 150 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( uri_start ); responseStream << ( uri_start );
responseStream << "/passphrase\">\n"; responseStream << "/passphrase\">\n";
responseStream << "\t\t\t <div class=\"col-md-12 col-lg-12 \">\n"; responseStream << "\t\t\t <div class=\"col-md-12 col-lg-12 \">\n";
responseStream << "\t\t\t\t<div class=\"alert alert-orange\">\n"; responseStream << "\t\t\t\t<div class=\"alert alert-orange\">\n";
responseStream << "\t\t\t\t <h5 class=\"alert-heading\">"; responseStream << "\t\t\t\t <h5 class=\"alert-heading\">";
#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 153 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Was zu tun ist:") ); responseStream << ( gettext("Was zu tun ist:") );
responseStream << "</h5>\n"; responseStream << "</h5>\n";
responseStream << "\t\t\t\t <p>"; responseStream << "\t\t\t\t <p>";
#line 148 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 154 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Schreibe dir deine Passphrase auf und packe sie gut weg. Du brauchst sie um deine Adresse wiederherzustellen. Wenn du sie verlierst, sind auch deine Gradidos verloren.") ); responseStream << ( gettext("Schreibe dir deine Passphrase auf und packe sie gut weg. Du brauchst sie um deine Adresse wiederherzustellen. Wenn du sie verlierst, sind auch deine Gradidos verloren.") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t\t</div>\n"; responseStream << "\t\t\t\t</div>\n";
responseStream << "\t\t\t\t<div class=\"col-lg-12 col-md-12 mx-auto alert alert-primary\" style=\"text-align:center\">\n"; responseStream << "\t\t\t\t<div class=\"col-lg-12 col-md-12 mx-auto alert alert-primary\" style=\"text-align:center\">\n";
responseStream << "\t\t\t\t <h5 class=\"alert-heading\">"; responseStream << "\t\t\t\t <h5 class=\"alert-heading\">";
#line 151 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 157 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Passphrase") ); responseStream << ( gettext("Passphrase") );
responseStream << "</h5>\n"; responseStream << "</h5>\n";
responseStream << "\t\t\t\t <p>"; responseStream << "\t\t\t\t <p>";
#line 152 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 158 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( mSession->getPassphrase() ); responseStream << ( mSession->getPassphrase() );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t\t</div>\n"; responseStream << "\t\t\t\t</div>\n";
responseStream << "\t\t\t\t<div class=\"alert alert-secondary\">\n"; responseStream << "\t\t\t\t<div class=\"alert alert-secondary\">\n";
responseStream << "\t\t\t\t <h5 class=\"alert-heading\">"; responseStream << "\t\t\t\t <h5 class=\"alert-heading\">";
#line 155 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 161 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Was ist eine Passphrase?") ); responseStream << ( gettext("Was ist eine Passphrase?") );
responseStream << "</h5>\n"; responseStream << "</h5>\n";
responseStream << "\t\t\t\t <p>"; responseStream << "\t\t\t\t <p>";
#line 156 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 162 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Die Passphrase kommt aus dem Crypto-Bereich und ist ein Weg einen komplizierte kryptografischen Schlüssel in einer lesbaren Form darzustellen.") ); responseStream << ( gettext("Die Passphrase kommt aus dem Crypto-Bereich und ist ein Weg einen komplizierte kryptografischen Schlüssel in einer lesbaren Form darzustellen.") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t\t <p>"; responseStream << "\t\t\t\t <p>";
#line 157 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 163 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Der neue Gradido basiert technisch auf einer Kryptowährung (wie z.B. Bitcoin) um maximale Sicherheit zu erreichen.") ); responseStream << ( gettext("Der neue Gradido basiert technisch auf einer Kryptowährung (wie z.B. Bitcoin) um maximale Sicherheit zu erreichen.") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t\t</div>\n"; responseStream << "\t\t\t\t</div>\n";
responseStream << "\t\t\t\t<input type=\"submit\" class=\"btn btn-sm btn-primary pull-right\" name=\"nextEnsure\" value=\""; responseStream << "\t\t\t\t<input type=\"submit\" class=\"btn btn-sm btn-primary pull-right\" name=\"nextEnsure\" value=\"";
#line 159 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 165 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Weiter") ); responseStream << ( gettext("Weiter") );
responseStream << "\"/>\n"; responseStream << "\"/>\n";
responseStream << "\t\t\t </div>\n"; responseStream << "\t\t\t </div>\n";
@ -352,7 +358,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t\t</div>\n"; responseStream << "\t\t</div>\n";
responseStream << "\t </div>\n"; responseStream << "\t </div>\n";
responseStream << "\t "; responseStream << "\t ";
#line 164 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 170 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
} else if(state == PAGE_ASK_ENSURE_PASSPHRASE) { responseStream << "\n"; } else if(state == PAGE_ASK_ENSURE_PASSPHRASE) { responseStream << "\n";
responseStream << "\t <style type=\"text/css\">\n"; responseStream << "\t <style type=\"text/css\">\n";
responseStream << "\t\tbutton:disabled {\n"; responseStream << "\t\tbutton:disabled {\n";
@ -367,41 +373,41 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t\t\t<div class=\"row mb-3\">\n"; responseStream << "\t\t\t<div class=\"row mb-3\">\n";
responseStream << "\t\t\t <div class=\"col-md-10 mx-auto\">\n"; responseStream << "\t\t\t <div class=\"col-md-10 mx-auto\">\n";
responseStream << "\t\t\t\t<form method=\"POST\" action=\""; responseStream << "\t\t\t\t<form method=\"POST\" action=\"";
#line 177 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 183 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( uri_start ); responseStream << ( uri_start );
responseStream << "/passphrase\">\n"; responseStream << "/passphrase\">\n";
responseStream << "\t\t\t\t <div class=\"form-group row showcase_row_area\">\n"; responseStream << "\t\t\t\t <div class=\"form-group row showcase_row_area\">\n";
responseStream << "\t\t\t\t\t<form method=\"POST\" action=\""; responseStream << "\t\t\t\t\t<form method=\"POST\" action=\"";
#line 179 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 185 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( uri_start ); responseStream << ( uri_start );
responseStream << "/passphrase\">\n"; responseStream << "/passphrase\">\n";
responseStream << "\t\t\t\t\t\t<div class=\"col-md-12 col-lg-12 \">\n"; responseStream << "\t\t\t\t\t\t<div class=\"col-md-12 col-lg-12 \">\n";
responseStream << "\t\t\t\t\t\t <div class=\"alert alert-orange\">\n"; responseStream << "\t\t\t\t\t\t <div class=\"alert alert-orange\">\n";
responseStream << "\t\t\t\t\t\t\t<h5 class=\"alert-heading\">"; responseStream << "\t\t\t\t\t\t\t<h5 class=\"alert-heading\">";
#line 182 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 188 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Was zu tun ist:") ); responseStream << ( gettext("Was zu tun ist:") );
responseStream << "</h5>\n"; responseStream << "</h5>\n";
responseStream << "\t\t\t\t\t\t\t<p>"; responseStream << "\t\t\t\t\t\t\t<p>";
#line 183 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 189 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Hast du dir deine Passphrase gemerkt?") ); responseStream << ( gettext("Hast du dir deine Passphrase gemerkt?") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t\t\t\t\t<p>"; responseStream << "\t\t\t\t\t\t\t<p>";
#line 184 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 190 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Dann zeig es mir. Zur Unterstützung gebe ich dir deine Wörter aber in anderer Reihenfolge.") ); responseStream << ( gettext("Dann zeig es mir. Zur Unterstützung gebe ich dir deine Wörter aber in anderer Reihenfolge.") );
responseStream << "<p>\n"; responseStream << "<p>\n";
responseStream << "\t\t\t\t\t\t\t<p>"; responseStream << "\t\t\t\t\t\t\t<p>";
#line 185 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 191 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Klicke sie an um sie einzusetzen.") ); responseStream << ( gettext("Klicke sie an um sie einzusetzen.") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t\t\t\t </div>\n"; responseStream << "\t\t\t\t\t\t </div>\n";
responseStream << "\t\t\t\t\t\t <div id=\"gradido-mithril-passphrase\"></div>\n"; responseStream << "\t\t\t\t\t\t <div id=\"gradido-mithril-passphrase\"></div>\n";
responseStream << "\t\t\t\t\t\t <noscript>\n"; responseStream << "\t\t\t\t\t\t <noscript>\n";
responseStream << "\t\t\t\t\t\t\t<p>"; responseStream << "\t\t\t\t\t\t\t<p>";
#line 189 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 195 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Weil du kein Javascript verwendest geht es direkt weiter. Hast du dir deine Passphrase gemerkt oder aufgeschrieben?") ); responseStream << ( gettext("Weil du kein Javascript verwendest geht es direkt weiter. Hast du dir deine Passphrase gemerkt oder aufgeschrieben?") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t\t\t\t\t<input type=\"submit\" class=\"btn btn-sm btn-primary pull-right\" name=\"btnChecked\" value=\""; responseStream << "\t\t\t\t\t\t\t<input type=\"submit\" class=\"btn btn-sm btn-primary pull-right\" name=\"btnChecked\" value=\"";
#line 190 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 196 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Ja") ); responseStream << ( gettext("Ja") );
responseStream << "\"/>\n"; responseStream << "\"/>\n";
responseStream << "\t\t\t\t\t\t </noscript>\n"; responseStream << "\t\t\t\t\t\t </noscript>\n";
@ -415,48 +421,48 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t\t</div>\n"; responseStream << "\t\t</div>\n";
responseStream << "\t\t<script type=\"text/javascript\">\n"; responseStream << "\t\t<script type=\"text/javascript\">\n";
responseStream << "\t\t\tvar mnemonicWords = "; responseStream << "\t\t\tvar mnemonicWords = ";
#line 201 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 207 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
wordSource->getSortedWordList().stringify(responseStream); responseStream << ";\n"; wordSource->getSortedWordList().stringify(responseStream); responseStream << ";\n";
responseStream << "\t\t\tvar passphrase = \""; responseStream << "\t\t\tvar passphrase = \"";
#line 202 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 208 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( mSession->getPassphrase() ); responseStream << ( mSession->getPassphrase() );
responseStream << "\";\n"; responseStream << "\";\n";
responseStream << "\t\t\tlanguage = \""; responseStream << "\t\t\tlanguage = \"";
#line 203 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 209 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( lm->keyForLanguage(lang) ); responseStream << ( lm->keyForLanguage(lang) );
responseStream << "\";\n"; responseStream << "\";\n";
responseStream << "\t\t</script>\n"; responseStream << "\t\t</script>\n";
responseStream << "\t\t<script src=\""; responseStream << "\t\t<script src=\"";
#line 205 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 211 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "js/ensurePassphrase.min.js\" type=\"text/javascript\"></script>\n"; responseStream << "js/ensurePassphrase.min.js\" type=\"text/javascript\"></script>\n";
responseStream << "\t "; responseStream << "\t ";
#line 206 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 212 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
} else if(state == PAGE_ASK_PASSPHRASE) { responseStream << "\n"; } else if(state == PAGE_ASK_PASSPHRASE) { responseStream << "\n";
responseStream << "\t <div class=\"col-md-10 mx-auto\">\n"; responseStream << "\t <div class=\"col-md-10 mx-auto\">\n";
responseStream << "\t\t<div class=\"form-group row showcase_row_area\">\n"; responseStream << "\t\t<div class=\"form-group row showcase_row_area\">\n";
responseStream << "\t\t <div class=\"col-md-12 col-lg-12 \">\n"; responseStream << "\t\t <div class=\"col-md-12 col-lg-12 \">\n";
responseStream << "\t\t\t<div class=\"col-lg-12 col-md-12 mx-auto alert alert-primary\" style=\"text-align:center\">\n"; responseStream << "\t\t\t<div class=\"col-lg-12 col-md-12 mx-auto alert alert-primary\" style=\"text-align:center\">\n";
responseStream << "\t\t\t <p>"; responseStream << "\t\t\t <p>";
#line 211 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 217 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Deine E-Mail Adresse wurde erfolgreich bestätigt.") ); responseStream << ( gettext("Deine E-Mail Adresse wurde erfolgreich bestätigt.") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t</div>\n"; responseStream << "\t\t\t</div>\n";
responseStream << "\t\t\t<form method=\"POST\" action=\""; responseStream << "\t\t\t<form method=\"POST\" action=\"";
#line 213 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 219 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( uri_start ); responseStream << ( uri_start );
responseStream << "/passphrase\">\n"; responseStream << "/passphrase\">\n";
responseStream << "\t\t\t\t<div class=\"alert alert-orange\">\n"; responseStream << "\t\t\t\t<div class=\"alert alert-orange\">\n";
responseStream << "\t\t\t\t <h5 class=\"alert-heading\">"; responseStream << "\t\t\t\t <h5 class=\"alert-heading\">";
#line 215 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 221 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Neue Gradido Adresse anlegen / wiederherstellen") ); responseStream << ( gettext("Neue Gradido Adresse anlegen / wiederherstellen") );
responseStream << "</h5>\n"; responseStream << "</h5>\n";
responseStream << "\t\t\t\t <p>"; responseStream << "\t\t\t\t <p>";
#line 216 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 222 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Möchtest Du ein bestehendes* Gradido-Konto wiederherstellen oder ein neues anlegen?") ); responseStream << ( gettext("Möchtest Du ein bestehendes* Gradido-Konto wiederherstellen oder ein neues anlegen?") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t\t <p>"; responseStream << "\t\t\t\t <p>";
#line 217 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 223 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("*Das Konto muss nach dem 01.09.2019 angelegt worden sein.") ); responseStream << ( gettext("*Das Konto muss nach dem 01.09.2019 angelegt worden sein.") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t\t</div>\n"; responseStream << "\t\t\t\t</div>\n";
@ -467,7 +473,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t\t\t\t\t\t\t\t<label for=\"passphrase-new-yes\" class=\"radio-label mr-4\">\n"; responseStream << "\t\t\t\t\t\t\t\t<label for=\"passphrase-new-yes\" class=\"radio-label mr-4\">\n";
responseStream << "\t\t\t\t\t\t\t\t\t<input id=\"passphrase-new-yes\" name=\"passphrase\" type=\"radio\" value=\"yes\" checked/>\n"; responseStream << "\t\t\t\t\t\t\t\t\t<input id=\"passphrase-new-yes\" name=\"passphrase\" type=\"radio\" value=\"yes\" checked/>\n";
responseStream << "\t\t\t\t\t\t\t\t\t"; responseStream << "\t\t\t\t\t\t\t\t\t";
#line 225 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 231 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Nein, bitte ein neues erstellen!") ); responseStream << ( gettext("Nein, bitte ein neues erstellen!") );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t\t\t\t\t\t\t\t<i class=\"input-frame\"></i>\n"; responseStream << "\t\t\t\t\t\t\t\t\t<i class=\"input-frame\"></i>\n";
@ -477,7 +483,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t\t\t\t\t\t\t\t<label for=\"passphrase-new-no\" class=\"radio-label mr-4\">\n"; responseStream << "\t\t\t\t\t\t\t\t<label for=\"passphrase-new-no\" class=\"radio-label mr-4\">\n";
responseStream << "\t\t\t\t\t\t\t\t\t<input id=\"passphrase-new-no\" name=\"passphrase\" type=\"radio\" value=\"no\"/>\n"; responseStream << "\t\t\t\t\t\t\t\t\t<input id=\"passphrase-new-no\" name=\"passphrase\" type=\"radio\" value=\"no\"/>\n";
responseStream << "\t\t\t\t\t\t\t\t\t"; responseStream << "\t\t\t\t\t\t\t\t\t";
#line 232 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 238 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Ja, bitte wiederherstellen!") ); responseStream << ( gettext("Ja, bitte wiederherstellen!") );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t\t\t\t\t\t\t\t<i class=\"input-frame\"></i>\n"; responseStream << "\t\t\t\t\t\t\t\t\t<i class=\"input-frame\"></i>\n";
@ -485,11 +491,11 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t\t\t\t\t\t\t</div>\n"; responseStream << "\t\t\t\t\t\t\t</div>\n";
responseStream << "\t\t\t\t\t\t</div>\n"; responseStream << "\t\t\t\t\t\t</div>\n";
responseStream << "\t\t\t\t\t\t<textarea class=\"form-control\" name=\"passphrase-existing\" cols=\"12\" rows=\"5\">"; responseStream << "\t\t\t\t\t\t<textarea class=\"form-control\" name=\"passphrase-existing\" cols=\"12\" rows=\"5\">";
#line 237 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 243 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( !form.empty() ? form.get("passphrase-existing", "") : "" ); responseStream << ( !form.empty() ? form.get("passphrase-existing", "") : "" );
responseStream << "</textarea>\n"; responseStream << "</textarea>\n";
responseStream << "\t\t\t\t\t\t<button type=\"submit\" class=\"btn btn-sm btn-primary pull-right\" name=\"submit\">"; responseStream << "\t\t\t\t\t\t<button type=\"submit\" class=\"btn btn-sm btn-primary pull-right\" name=\"submit\">";
#line 238 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 244 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Weiter") ); responseStream << ( gettext("Weiter") );
responseStream << "</button>\n"; responseStream << "</button>\n";
responseStream << "\t\t\t\t\t</div>\n"; responseStream << "\t\t\t\t\t</div>\n";
@ -497,40 +503,40 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t\t\t</form>\n"; responseStream << "\t\t\t</form>\n";
responseStream << "\t\t </div>\n"; responseStream << "\t\t </div>\n";
responseStream << "\t\t <!--<a href=\""; responseStream << "\t\t <!--<a href=\"";
#line 243 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 249 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( uri_start ); responseStream << ( uri_start );
responseStream << "/passphrase\" class=\"btn btn-sm btn-primary pull-right\" name=\"next\">"; responseStream << "/passphrase\" class=\"btn btn-sm btn-primary pull-right\" name=\"next\">";
#line 243 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 249 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Weiter") ); responseStream << ( gettext("Weiter") );
responseStream << "</a>-->\n"; responseStream << "</a>-->\n";
responseStream << "\t\t</div>\n"; responseStream << "\t\t</div>\n";
responseStream << "\t </div>\n"; responseStream << "\t </div>\n";
responseStream << "\t "; responseStream << "\t ";
#line 246 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 252 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
} else if(state == PAGE_FORCE_ASK_PASSPHRASE) { responseStream << "\n"; } else if(state == PAGE_FORCE_ASK_PASSPHRASE) { responseStream << "\n";
responseStream << "\t <div class=\"col-md-10 mx-auto\">\n"; responseStream << "\t <div class=\"col-md-10 mx-auto\">\n";
responseStream << "\t\t<div class=\"form-group row showcase_row_area\">\n"; responseStream << "\t\t<div class=\"form-group row showcase_row_area\">\n";
responseStream << "\t\t <div class=\"col-md-12 col-lg-12 \">\n"; responseStream << "\t\t <div class=\"col-md-12 col-lg-12 \">\n";
responseStream << "\t\t\t<div class=\"col-lg-12 col-md-12 mx-auto alert alert-primary\" style=\"text-align:center\">\n"; responseStream << "\t\t\t<div class=\"col-lg-12 col-md-12 mx-auto alert alert-primary\" style=\"text-align:center\">\n";
responseStream << "\t\t\t <h5 class=\"alert-heading\">"; responseStream << "\t\t\t <h5 class=\"alert-heading\">";
#line 251 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 257 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Konto wiederherstellen / Neues Passwort anlegen") ); responseStream << ( gettext("Konto wiederherstellen / Neues Passwort anlegen") );
responseStream << "</h5>\n"; responseStream << "</h5>\n";
responseStream << "\t\t\t <p>"; responseStream << "\t\t\t <p>";
#line 252 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 258 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Um dein Konto wiederherzustellen, dir ein Neues Passwort auswählen zu können, tippe hier bitte die Wörter deiner Passphrase in der richtigen Reihenfolge ein, welche du dir aufgeschrieben hast.") ); responseStream << ( gettext("Um dein Konto wiederherzustellen, dir ein Neues Passwort auswählen zu können, tippe hier bitte die Wörter deiner Passphrase in der richtigen Reihenfolge ein, welche du dir aufgeschrieben hast.") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t</div>\n"; responseStream << "\t\t\t</div>\n";
responseStream << "\t\t\t<form method=\"POST\" action=\""; responseStream << "\t\t\t<form method=\"POST\" action=\"";
#line 254 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 260 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( uri_start ); responseStream << ( uri_start );
responseStream << "/passphrase\">\n"; responseStream << "/passphrase\">\n";
responseStream << "\t\t\t\t<textarea class=\"form-control\" name=\"passphrase-existing\" cols=\"12\" rows=\"5\">"; responseStream << "\t\t\t\t<textarea class=\"form-control\" name=\"passphrase-existing\" cols=\"12\" rows=\"5\">";
#line 255 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 261 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( !form.empty() ? form.get("passphrase-existing", "") : "" ); responseStream << ( !form.empty() ? form.get("passphrase-existing", "") : "" );
responseStream << "</textarea>\n"; responseStream << "</textarea>\n";
responseStream << "\t\t\t\t<button type=\"submit\" class=\"btn btn-sm btn-primary pull-right\" name=\"submit\">"; responseStream << "\t\t\t\t<button type=\"submit\" class=\"btn btn-sm btn-primary pull-right\" name=\"submit\">";
#line 256 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 262 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Weiter") ); responseStream << ( gettext("Weiter") );
responseStream << "</button>\n"; responseStream << "</button>\n";
responseStream << "\t\t\t</form>\n"; responseStream << "\t\t\t</form>\n";
@ -538,18 +544,18 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t\t</div>\n"; responseStream << "\t\t</div>\n";
responseStream << "\t </div>\n"; responseStream << "\t </div>\n";
responseStream << "\t "; responseStream << "\t ";
#line 261 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 267 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
} else { responseStream << "\n"; } else { responseStream << "\n";
responseStream << "\t\t<div class=\"col-md-10 mx-auto\">\n"; responseStream << "\t\t<div class=\"col-md-10 mx-auto\">\n";
responseStream << "\t\t\t<div class=\"form-group row showcase_row_area\">\n"; responseStream << "\t\t\t<div class=\"form-group row showcase_row_area\">\n";
responseStream << "\t\t\t <div class=\"col-md-12 col-lg-12 \">\n"; responseStream << "\t\t\t <div class=\"col-md-12 col-lg-12 \">\n";
responseStream << "\t\t\t\t<div class=\"col-lg-8 col-md-10 mx-auto alert alert-danger\" style=\"text-align:center\">\n"; responseStream << "\t\t\t\t<div class=\"col-lg-8 col-md-10 mx-auto alert alert-danger\" style=\"text-align:center\">\n";
responseStream << "\t\t\t\t <h5 class=\"alert-heading\">"; responseStream << "\t\t\t\t <h5 class=\"alert-heading\">";
#line 266 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 272 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Fehler") ); responseStream << ( gettext("Fehler") );
responseStream << "</h5>\n"; responseStream << "</h5>\n";
responseStream << "\t\t\t\t <p>"; responseStream << "\t\t\t\t <p>";
#line 267 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 273 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Ungültige Seite, wenn du das siehst stimmt hier etwas nicht. Bitte wende dich an den Server-Admin.") ); responseStream << ( gettext("Ungültige Seite, wenn du das siehst stimmt hier etwas nicht. Bitte wende dich an den Server-Admin.") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t\t\t\t</div>\n"; responseStream << "\t\t\t\t</div>\n";
@ -557,7 +563,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t\t\t</div>\n"; responseStream << "\t\t\t</div>\n";
responseStream << "\t\t</div>\n"; responseStream << "\t\t</div>\n";
responseStream << "\t "; responseStream << "\t ";
#line 272 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 278 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
} responseStream << "\n"; } responseStream << "\n";
responseStream << "\t</div>\n"; responseStream << "\t</div>\n";
responseStream << "</div>\n"; responseStream << "</div>\n";

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

@ -134,7 +134,7 @@ void RegisterAdminPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poc
responseStream << "\t\t\n"; responseStream << "\t\t\n";
responseStream << "\t\t<fieldset class=\"grd_container_small\">\n"; responseStream << "\t\t<fieldset class=\"grd_container_small\">\n";
responseStream << "\t\t\t<legend>Account anlegen</legend>\n"; responseStream << "\t\t\t<legend>Account anlegen</legend>\n";
responseStream << "\t\t\t<p>Bitte gebe deine Daten um einen Account anzulegen</p>\n"; responseStream << "\t\t\t<p>Bitte gebe die Benutzer-Daten ein um einen Account anzulegen</p>\n";
responseStream << "\t\t\t<p class=\"grd_small\">\n"; responseStream << "\t\t\t<p class=\"grd_small\">\n";
responseStream << "\t\t\t\t<label for=\"register-first-name\">Vorname</label>\n"; responseStream << "\t\t\t\t<label for=\"register-first-name\">Vorname</label>\n";
responseStream << "\t\t\t\t<input id=\"register-first-name\" type=\"text\" name=\"register-first-name\" value=\""; responseStream << "\t\t\t\t<input id=\"register-first-name\" type=\"text\" name=\"register-first-name\" value=\"";

13
src/cpp/HTTPInterface/RegisterPage.cpp
View File

@ -31,7 +31,7 @@ void RegisterPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
if(!form.empty()) { if(!form.empty()) {
if(form.get("register-password2", "") != form.get("register-password", "")) { if(form.get("register-password2", "") != form.get("register-password", "")) {
addError(new Error("Passwort", "Passw&ouml;rter sind nicht identisch.")); addError(new Error("Passwort", "Passw&ouml;rter sind nicht identisch."), false);
} else { } else {
auto session = sm->getSession(request); auto session = sm->getSession(request);
if(!session) { if(!session) {
@ -121,17 +121,6 @@ void RegisterPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
responseStream << ( ServerConfig::g_versionString ); responseStream << ( ServerConfig::g_versionString );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "</div>\n"; responseStream << "</div>\n";
responseStream << "<!--<nav class=\"grd-left-bar expanded\" data-topbar role=\"navigation\">\n";
responseStream << "\t<div class=\"grd-left-bar-section\">\n";
responseStream << "\t\t<ul class=\"grd-no-style\">\n";
responseStream << "\t\t <li><a href=\"";
#line 58 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
responseStream << "\t\t <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";
responseStream << "\t\t</ul>\n";
responseStream << "\t</div>\n";
responseStream << "</nav>-->";
// end include header_old.cpsp // end include header_old.cpsp
responseStream << "\n"; responseStream << "\n";
responseStream << "<div class=\"grd_container\">\n"; responseStream << "<div class=\"grd_container\">\n";

77
src/cpp/HTTPInterface/ResetPassword.cpp
View File

@ -64,16 +64,16 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
if(email != "") { if(email != "") {
if(!user->getModel()->loadFromDB("email", email) || !user->getModel()->isEmailChecked()) { if(!user->getModel()->loadFromDB("email", email) || !user->getModel()->isEmailChecked()) {
//printf("user: %s\n", user->getModel()->toString().data()); //printf("user: %s\n", user->getModel()->toString().data());
addError(new Error(langCatalog->gettext("E-Mail"), langCatalog->gettext("E-Mail Adresse konnte nicht gefunden werden oder ist nicht aktiviert."))); addError(new Error(langCatalog->gettext("E-Mail"), langCatalog->gettext("E-Mail Adresse konnte nicht gefunden werden oder ist nicht aktiviert.")), false);
emailInputClass += " is-invalid"; emailInputClass += " is-invalid";
} }
} else { } else {
addError(new Error(langCatalog->gettext("E-Mail"), langCatalog->gettext("E-Mail Adresse nicht angegeben."))); addError(new Error(langCatalog->gettext("E-Mail"), langCatalog->gettext("E-Mail Adresse nicht angegeben.")), false);
emailInputClass += " is-invalid"; emailInputClass += " is-invalid";
} }
if(errorCount() < 1 && passphraseMemorized == "") { if(errorCount() < 1 && passphraseMemorized == "") {
addError(new Error(langCatalog->gettext("Passphrase"), langCatalog->gettext("Bitte w&auml;hle eine Option aus."))); addError(new Error(langCatalog->gettext("Passphrase"), langCatalog->gettext("Bitte w&auml;hle eine Option aus.")), false);
passphraseRadioClass += " group-is-invalid"; passphraseRadioClass += " group-is-invalid";
} }
if(errorCount() == 0) { if(errorCount() == 0) {
@ -95,6 +95,9 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
} }
#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
bool withMaterialIcons = false;
std::ostream& _responseStream = response.send(); std::ostream& _responseStream = response.send();
Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
@ -108,19 +111,27 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
responseStream << "<meta charset=\"UTF-8\">\n"; responseStream << "<meta charset=\"UTF-8\">\n";
responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n"; responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n";
responseStream << "<title>Gradido Login Server: "; responseStream << "<title>Gradido Login Server: ";
#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( pageName ); responseStream << ( pageName );
responseStream << "</title>\n"; responseStream << "</title>\n";
responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\""; responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "css/loginServer/style.css\">\n"; responseStream << "css/loginServer/style.css\">\n";
#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
if(withMaterialIcons) { responseStream << "\n";
responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "css/materialdesignicons.min.css\">\n";
#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
} responseStream << "\n";
responseStream << "</head>\n"; responseStream << "</head>\n";
responseStream << "<body class=\"header-fixed\">\n"; responseStream << "<body class=\"header-fixed\">\n";
responseStream << "<div class=\"versionstring dev-info\">\n"; responseStream << "<div class=\"versionstring dev-info\">\n";
responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n"; responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha "; responseStream << "\t<p class=\"grd_small\">Alpha ";
#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_versionString ); responseStream << ( ServerConfig::g_versionString );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "</div>\n"; responseStream << "</div>\n";
@ -128,7 +139,7 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
responseStream << "\t<div class=\"grd-left-bar-section\">\n"; responseStream << "\t<div class=\"grd-left-bar-section\">\n";
responseStream << "\t\t<ul class=\"grd-no-style\">\n"; responseStream << "\t\t<ul class=\"grd-no-style\">\n";
responseStream << "\t\t <li><a href=\""; responseStream << "\t\t <li><a href=\"";
#line 20 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 25 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n"; responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
responseStream << "\t\t <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n"; responseStream << "\t\t <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";
@ -202,36 +213,38 @@ void ResetPassword::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
responseStream << "/resetPassword\">\n"; responseStream << "/resetPassword\">\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
// begin include flags.cpsp // begin include flags.cpsp
responseStream << "<div class=\"row pull-right-row\">\n"; responseStream << "<form method=\"GET\" action=\"\">\n";
responseStream << " <div class=\"equel-grid pull-right\">\n"; responseStream << "\t<div class=\"row pull-right-row\">\n";
responseStream << "\t<div class=\"grid-body-small text-center\">\n"; responseStream << "\t <div class=\"equel-grid pull-right\">\n";
responseStream << "\t\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" "; responseStream << "\t\t<div class=\"grid-body-small text-center\">\n";
#line 4 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp" responseStream << "\t\t\t<button id=\"flag-england\" name=\"lang\" value=\"en\" title=\"English\" type=\"submit\" ";
if(lang != LANG_EN) { responseStream << "class=\"btn btn-outline-secondary flag-btn\""; #line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
#line 4 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp" if(lang != LANG_EN) { responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
}
else { responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
#line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp" #line 5 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
} responseStream << ">\n";
responseStream << "\t\t <span class=\"flag-england\"></span>\n";
responseStream << "\t\t</button>\n";
responseStream << "\t</div>\n";
responseStream << " </div>\n";
responseStream << " <div class=\"equel-grid pull-right\">\n";
responseStream << "\t<div class=\"grid-body-small text-center\">\n";
responseStream << "\t\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
#line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
if(lang != LANG_DE) { responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
#line 12 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
} }
else { responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled"; else { responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp" #line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
} responseStream << ">\n"; } responseStream << ">\n";
responseStream << "\t\t <span class=\"flag-germany\"></span>\n"; responseStream << "\t\t\t <span class=\"flag-england\"></span>\n";
responseStream << "\t\t</button>\n"; responseStream << "\t\t\t</button>\n";
responseStream << "\t\t</div>\n";
responseStream << "\t </div>\n"; responseStream << "\t </div>\n";
responseStream << " </div>\n"; responseStream << "\t <div class=\"equel-grid pull-right\">\n";
responseStream << "</div>"; responseStream << "\t\t<div class=\"grid-body-small text-center\">\n";
responseStream << "\t\t\t<button id=\"flag-germany\" name=\"lang\" value=\"de\" title=\"Deutsch\" type=\"submit\" ";
#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
if(lang != LANG_DE) { responseStream << "class=\"btn btn-outline-secondary flag-btn\"";
#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
}
else { responseStream << "class=\"btn btn-secondary disabled flag-btn\" disabled";
#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\flags.cpsp"
} responseStream << ">\n";
responseStream << "\t\t\t <span class=\"flag-germany\"></span>\n";
responseStream << "\t\t\t</button>\n";
responseStream << "\t\t</div>\n";
responseStream << "\t </div>\n";
responseStream << "\t</div>\n";
responseStream << "</form>";
// end include flags.cpsp // end include flags.cpsp
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t\t<div class=\"item-wrapper\">\n"; responseStream << "\t\t\t<div class=\"item-wrapper\">\n";

36
src/cpp/HTTPInterface/SaveKeysPage.cpp
View File

@ -16,7 +16,7 @@ enum PageState
PAGE_ERROR PAGE_ERROR
}; };
#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
#include "../ServerConfig.h" #include "../ServerConfig.h"
@ -44,12 +44,12 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
PageState state = PAGE_ASK; PageState state = PAGE_ASK;
auto uri_start = ServerConfig::g_php_serverPath;//request.serverParams().getServerName(); auto uri_start = ServerConfig::g_php_serverPath;//request.serverParams().getServerName();
// skip asking user if he like to save keys and passphrase on server // skip asking user if he like to save keys and passphrase on server for now!
state = PAGE_SHOW_PUBKEY; state = PAGE_SHOW_PUBKEY;
if(!mSession->generateKeys(true, true)) { if(!mSession->generateKeys(true, true)) {
getErrors(mSession); getErrors(mSession);
} }
/*
if(!form.empty()) { if(!form.empty()) {
// privkey // privkey
auto savePrivkeyChoice = form.get("save-privkey"); auto savePrivkeyChoice = form.get("save-privkey");
@ -60,7 +60,7 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
auto pwd = form.get("save-privkey-password", ""); auto pwd = form.get("save-privkey-password", "");
if(!mSession->isPwdValid(pwd)) { if(!mSession->isPwdValid(pwd)) {
addError(new Error("Passwort", "Das Passwort stimmt nicht. Bitte verwende dein Passwort von der Registrierung")); addError(new Error("Passwort", "Das Passwort stimmt nicht. Bitte verwende dein Passwort von der Registrierung"), false);
hasErrors = true; hasErrors = true;
} else { } else {
savePrivkey = true; savePrivkey = true;
@ -88,26 +88,26 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
} }
//printf("SaveKeysPage: hasErrors: %d, session state: %d, target state: %d\n", //printf("SaveKeysPage: hasErrors: %d, session state: %d, target state: %d\n",
//hasErrors, mSession->getSessionState(), SESSION_STATE_KEY_PAIR_GENERATED); //hasErrors, mSession->getSessionState(), SESSION_STATE_KEY_PAIR_GENERATED);
} }*/
getErrors(mSession); getErrors(mSession);
std::ostream& _responseStream = response.send(); std::ostream& _responseStream = response.send();
Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1); Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);
std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream; std::ostream& responseStream = _compressResponse ? _gzipStream : _responseStream;
responseStream << "\n"; responseStream << "\n";
// begin include header.cpsp // begin include header_old.cpsp
responseStream << "\n"; responseStream << "\n";
responseStream << "<!DOCTYPE html>\n"; responseStream << "<!DOCTYPE html>\n";
responseStream << "<html>\n"; responseStream << "<html>\n";
responseStream << "<head>\n"; responseStream << "<head>\n";
responseStream << "<meta charset=\"UTF-8\">\n"; responseStream << "<meta charset=\"UTF-8\">\n";
responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n"; responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n";
responseStream << "<title>Gradido Login Server: "; responseStream << "<title>Gradido Login Server: ";
#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
responseStream << ( pageName ); responseStream << ( pageName );
responseStream << "</title>\n"; responseStream << "</title>\n";
responseStream << "<!--<link rel=\"stylesheet\" type=\"text/css\" href=\"css/styles.min.css\">-->\n"; responseStream << "<!--<link rel=\"stylesheet\" type=\"text/css\" href=\"css/styles.min.css\">-->\n";
responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\""; responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp" #line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
responseStream << ( ServerConfig::g_php_serverPath ); responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "/css/styles.css\">\n"; responseStream << "/css/styles.css\">\n";
responseStream << "<style type=\"text/css\" >\n"; responseStream << "<style type=\"text/css\" >\n";
@ -151,20 +151,12 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
responseStream << "<body>\n"; responseStream << "<body>\n";
responseStream << "<div class=\"versionstring dev-info\">\n"; responseStream << "<div class=\"versionstring dev-info\">\n";
responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n"; responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.6.0</p>\n"; responseStream << "\t<p class=\"grd_small\">Alpha ";
#line 53 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
responseStream << ( ServerConfig::g_versionString );
responseStream << "</p>\n";
responseStream << "</div>\n"; responseStream << "</div>\n";
responseStream << "<!--<nav class=\"grd-left-bar expanded\" data-topbar role=\"navigation\">\n"; // end include header_old.cpsp
responseStream << "\t<div class=\"grd-left-bar-section\">\n";
responseStream << "\t\t<ul class=\"grd-no-style\">\n";
responseStream << "\t\t <li><a href=\"";
#line 58 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "\" class=\"grd-nav-bn\">Startseite</a>\n";
responseStream << "\t\t <li><a href=\"./account/logout\" class=\"grd-nav-bn\">Logout</a></li>\n";
responseStream << "\t\t</ul>\n";
responseStream << "\t</div>\n";
responseStream << "</nav>-->";
// end include header.cpsp
responseStream << "\n"; responseStream << "\n";
responseStream << "<div class=\"grd_container\">\n"; responseStream << "<div class=\"grd_container\">\n";
responseStream << "\t<h1>Daten speichern</h1>\n"; responseStream << "\t<h1>Daten speichern</h1>\n";

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

@ -63,7 +63,7 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
addError(new Error( addError(new Error(
gettext("Fehler"), gettext("Fehler"),
gettext("Diese Passphrase ist ung&uuml;ltig, bitte &uuml;berpr&uuml;fen oder neu generieren (lassen).") gettext("Diese Passphrase ist ung&uuml;ltig, bitte &uuml;berpr&uuml;fen oder neu generieren (lassen).")
)); ), false);
} else { } else {
if(wordSource == &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER]) { if(wordSource == &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER]) {
targetSource = &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER]; targetSource = &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER];

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

@ -51,7 +51,7 @@ void UpdateUserPasswordPage::handleRequest(Poco::Net::HTTPServerRequest& request
auto pwd = form.get("register-password", ""); auto pwd = form.get("register-password", "");
if(pwd != "") { if(pwd != "") {
if(pwd != form.get("register-password2", "")) { if(pwd != form.get("register-password2", "")) {
mSession->addError(new Error("Passwort", "Passw&ouml;rter sind nicht identisch.")); mSession->addError(new Error("Passwort", "Passw&ouml;rter sind nicht identisch."), false);
} else if(SessionManager::getInstance()->checkPwdValidation(pwd, mSession)) { } else if(SessionManager::getInstance()->checkPwdValidation(pwd, mSession)) {
auto sessionState = mSession->getSessionState(); auto sessionState = mSession->getSessionState();

6
src/cpp/SingletonManager/ErrorManager.cpp
View File

@ -34,7 +34,7 @@ ErrorManager::~ErrorManager()
mErrorsMap.clear(); mErrorsMap.clear();
} }
void ErrorManager::addError(Error* error) void ErrorManager::addError(Error* error, bool log/* = true*/)
{ {
DHASH id = DRMakeStringHash(error->getFunctionName()); DHASH id = DRMakeStringHash(error->getFunctionName());
mWorkingMutex.lock(); mWorkingMutex.lock();
@ -42,7 +42,7 @@ void ErrorManager::addError(Error* error)
std::list<Error*>* list = nullptr; std::list<Error*>* list = nullptr;
//printf("[ErrorManager::addError] error with function: %s, %s\n", error->getFunctionName(), error->getMessage()); //printf("[ErrorManager::addError] error with function: %s, %s\n", error->getFunctionName(), error->getMessage());
mLogging.error("[ErrorManager::addError] %s", error->getString()); if(log) mLogging.error("[ErrorManager::addError] %s", error->getString(false));
if (it == mErrorsMap.end()) { if (it == mErrorsMap.end()) {
list = new std::list<Error *>; list = new std::list<Error *>;
@ -67,7 +67,7 @@ int ErrorManager::getErrors(ErrorList* send)
Error* error = nullptr; Error* error = nullptr;
int iCount = 0; int iCount = 0;
while (error = send->getLastError()) { while (error = send->getLastError()) {
addError(error); addError(error, false);
iCount++; iCount++;
} }
return iCount; return iCount;

2
src/cpp/SingletonManager/ErrorManager.h
View File

@ -32,7 +32,7 @@ public:
static ErrorManager* getInstance(); static ErrorManager* getInstance();
// will called delete on error // will called delete on error
virtual void addError(Error* error); virtual void addError(Error* error, bool log = true);
int getErrors(ErrorList* send); int getErrors(ErrorList* send);

1
src/cpp/SingletonManager/MemoryManager.cpp
View File

@ -13,6 +13,7 @@ MemoryBin::~MemoryBin()
{ {
if (mData) { if (mData) {
free(mData); free(mData);
mData = nullptr;
} }
} }

10
src/cpp/lib/Error.cpp
View File

@ -12,10 +12,11 @@ Error::~Error()
} }
std::string Error::getString() std::string Error::getString(bool withNewline/* = true*/)
{ {
std::stringstream ss; std::stringstream ss;
ss << mFunctionName << ": " << mMessage << std::endl; ss << mFunctionName << ": " << mMessage;
if(withNewline) ss << std::endl;
return ss.str(); return ss.str();
} }
@ -27,10 +28,11 @@ std::string Error::getHtmlString()
return ss.str(); return ss.str();
} }
std::string ParamError::getString() std::string ParamError::getString(bool withNewline/* = true*/)
{ {
std::stringstream ss; std::stringstream ss;
ss << mFunctionName << ": " << mMessage << " " << mParam << std::endl; ss << mFunctionName << ": " << mMessage << " " << mParam;
if (withNewline) ss << std::endl;
return ss.str(); return ss.str();
} }

6
src/cpp/lib/Error.h
View File

@ -21,7 +21,7 @@ public:
const char* getFunctionName() { return mFunctionName.data(); } const char* getFunctionName() { return mFunctionName.data(); }
const char* getMessage() { return mMessage.data(); } const char* getMessage() { return mMessage.data(); }
virtual std::string getString(); virtual std::string getString(bool withNewline = true);
virtual std::string getHtmlString(); virtual std::string getHtmlString();
protected: protected:
@ -44,7 +44,7 @@ public:
mParam = ss.str(); mParam = ss.str();
} }
virtual std::string getString(); virtual std::string getString(bool withNewline = true);
virtual std::string getHtmlString(); virtual std::string getHtmlString();
protected: protected:
std::string mParam; std::string mParam;
@ -55,7 +55,7 @@ protected:
class IErrorCollection class IErrorCollection
{ {
public: public:
virtual void addError(Error*) = 0; virtual void addError(Error*, bool log = true) = 0;
}; };
#endif // DR_LUA_WEB_MODULE_ERROR_ERROR_H #endif // DR_LUA_WEB_MODULE_ERROR_ERROR_H

6
src/cpp/lib/ErrorList.cpp
View File

@ -56,9 +56,9 @@ ErrorList::~ErrorList()
} }
} }
void ErrorList::addError(Error* error) void ErrorList::addError(Error* error, bool log/* = true */)
{ {
mLogging.error("[ErrorList::addError] %s", error->getString()); if(log) mLogging.error("[ErrorList::addError] %s", error->getString(false));
mErrorStack.push(error); mErrorStack.push(error);
} }
@ -93,7 +93,7 @@ int ErrorList::getErrors(ErrorList* send)
Error* error = nullptr; Error* error = nullptr;
int iCount = 0; int iCount = 0;
while (error = send->getLastError()) { while (error = send->getLastError()) {
addError(error); addError(error, false);
iCount++; iCount++;
} }
return iCount; return iCount;

2
src/cpp/lib/ErrorList.h
View File

@ -26,7 +26,7 @@ public:
~ErrorList(); ~ErrorList();
// push error, error will be deleted in deconstructor // push error, error will be deleted in deconstructor
virtual void addError(Error* error); virtual void addError(Error* error, bool log = true);
// return error on top of stack, please delete after using // return error on top of stack, please delete after using
Error* getLastError(); Error* getLastError();

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

@ -140,28 +140,28 @@ bool Session::adminCreateUser(const std::string& first_name, const std::string&
Profiler usedTime; Profiler usedTime;
if (mNewUser->getModel()->getRole() != model::table::ROLE_ADMIN) { if (mNewUser->getModel()->getRole() != model::table::ROLE_ADMIN) {
addError(new Error(gettext("Benutzer"), gettext("Eingeloggter Benutzer ist kein Admin"))); addError(new Error(gettext("Benutzer"), gettext("Eingeloggter Benutzer ist kein Admin")), false);
return false; return false;
} }
auto sm = SessionManager::getInstance(); auto sm = SessionManager::getInstance();
if (!sm->isValid(first_name, VALIDATE_NAME)) { if (!sm->isValid(first_name, VALIDATE_NAME)) {
addError(new Error(gettext("Vorname"), gettext("Bitte gebe einen Namen an. Mindestens 3 Zeichen, keines folgender Zeichen <>&;"))); addError(new Error(gettext("Vorname"), gettext("Bitte gebe einen Namen an. Mindestens 3 Zeichen, keines folgender Zeichen <>&;")), false);
return false; return false;
} }
if (!sm->isValid(last_name, VALIDATE_NAME)) { if (!sm->isValid(last_name, VALIDATE_NAME)) {
addError(new Error(gettext("Nachname"), gettext("Bitte gebe einen Namen an. Mindestens 3 Zeichen, keines folgender Zeichen <>&;"))); addError(new Error(gettext("Nachname"), gettext("Bitte gebe einen Namen an. Mindestens 3 Zeichen, keines folgender Zeichen <>&;")), false);
return false; return false;
} }
if (!sm->isValid(email, VALIDATE_EMAIL)) { if (!sm->isValid(email, VALIDATE_EMAIL)) {
addError(new Error(gettext("E-Mail"), gettext("Bitte gebe eine g&uuml;ltige E-Mail Adresse an."))); addError(new Error(gettext("E-Mail"), gettext("Bitte gebe eine g&uuml;ltige E-Mail Adresse an.")), false);
return false; return false;
} }
// check if user with that email already exist // check if user with that email already exist
if (mNewUser->getModel()->isExistInDB("email", email)) { if (mNewUser->getModel()->isExistInDB("email", email)) {
addError(new Error(gettext("E-Mail"), gettext("F&uuml;r diese E-Mail Adresse gibt es bereits einen Account"))); addError(new Error(gettext("E-Mail"), gettext("F&uuml;r diese E-Mail Adresse gibt es bereits einen Account")), false);
return false; return false;
} }
@ -192,15 +192,15 @@ bool Session::createUser(const std::string& first_name, const std::string& last_
Profiler usedTime; Profiler usedTime;
auto sm = SessionManager::getInstance(); auto sm = SessionManager::getInstance();
if (!sm->isValid(first_name, VALIDATE_NAME)) { if (!sm->isValid(first_name, VALIDATE_NAME)) {
addError(new Error(gettext("Vorname"), gettext("Bitte gebe einen Namen an. Mindestens 3 Zeichen, keines folgender Zeichen <>&;"))); addError(new Error(gettext("Vorname"), gettext("Bitte gebe einen Namen an. Mindestens 3 Zeichen, keines folgender Zeichen <>&;")), false);
return false; return false;
} }
if (!sm->isValid(last_name, VALIDATE_NAME)) { if (!sm->isValid(last_name, VALIDATE_NAME)) {
addError(new Error(gettext("Nachname"), gettext("Bitte gebe einen Namen an. Mindestens 3 Zeichen, keines folgender Zeichen <>&;"))); addError(new Error(gettext("Nachname"), gettext("Bitte gebe einen Namen an. Mindestens 3 Zeichen, keines folgender Zeichen <>&;")), false);
return false; return false;
} }
if (!sm->isValid(email, VALIDATE_EMAIL)) { if (!sm->isValid(email, VALIDATE_EMAIL)) {
addError(new Error(gettext("E-Mail"), gettext("Bitte gebe eine g&uuml;ltige E-Mail Adresse an."))); addError(new Error(gettext("E-Mail"), gettext("Bitte gebe eine g&uuml;ltige E-Mail Adresse an.")), false);
return false; return false;
} }
if (!sm->checkPwdValidation(password, this)) { if (!sm->checkPwdValidation(password, this)) {
@ -225,7 +225,7 @@ bool Session::createUser(const std::string& first_name, const std::string& last_
select << "SELECT email from users where email = ?;", useRef(email); select << "SELECT email from users where email = ?;", useRef(email);
try { try {
if (select.execute() > 0) { if (select.execute() > 0) {
addError(new Error(gettext("E-Mail"), gettext("F&uuml;r diese E-Mail Adresse gibt es bereits einen Account"))); addError(new Error(gettext("E-Mail"), gettext("F&uuml;r diese E-Mail Adresse gibt es bereits einen Account")), false);
return false; return false;
} }
} }
@ -370,7 +370,7 @@ int Session::updateEmailVerification(Poco::UInt64 emailVerificationCode)
} }
if (firstEmailActivation && userModel->isEmailChecked()) { if (firstEmailActivation && userModel->isEmailChecked()) {
mSessionUser = new User(mNewUser); mSessionUser = new User(mNewUser);
addError(new Error(gettext("E-Mail Verification"), gettext("Du hast dein Konto bereits aktiviert!"))); addError(new Error(gettext("E-Mail Verification"), gettext("Du hast dein Konto bereits aktiviert!")), false);
unlock(); unlock();
return 1; return 1;
} }
@ -482,7 +482,12 @@ int Session::comparePassphraseWithSavedKeys(const std::string& inputPassphrase,
return -2; return -2;
} }
if (!keys.generateFromPassphrase(inputPassphrase.data(), wordSource)) { if (!keys.generateFromPassphrase(inputPassphrase.data(), wordSource)) {
addError(new Error(gettext("Passphrase"), gettext("Deine Passphrase ist ung&uuml;tig"))); addError(new ParamError(functionName, "invalid passphrase", inputPassphrase));
if (!mNewUser.isNull() && mNewUser->getModel()) {
addError(new ParamError(functionName, "user email", mNewUser->getModel()->getEmail()));
}
sendErrorsAsEmail();
addError(new Error(gettext("Passphrase"), gettext("Deine Passphrase ist ung&uuml;tig")), false);
return 0; return 0;
} }
auto userModel = mNewUser->getModel(); auto userModel = mNewUser->getModel();
@ -491,7 +496,10 @@ int Session::comparePassphraseWithSavedKeys(const std::string& inputPassphrase,
userModel->loadFromDB("email", userModel->getEmail()); userModel->loadFromDB("email", userModel->getEmail());
existingPublic = userModel->getPublicKey(); existingPublic = userModel->getPublicKey();
if (!existingPublic) { if (!existingPublic) {
addError(new Error(gettext("Passphrase"), gettext("Ein Fehler trat auf, bitte versuche es erneut"))); addError(new Error(functionName, "cannot load existing public key from db"));
addError(new ParamError(functionName, "user email", userModel->getEmail()));
sendErrorsAsEmail();
addError(new Error(gettext("Passphrase"), gettext("Ein Fehler trat auf, bitte versuche es erneut")), false);
return -1; return -1;
} }
} }
@ -499,7 +507,7 @@ int Session::comparePassphraseWithSavedKeys(const std::string& inputPassphrase,
mPassphrase = inputPassphrase; mPassphrase = inputPassphrase;
return 1; return 1;
} }
addError(new Error(gettext("Passphrase"), gettext("Das ist nicht die richtige Passphrase."))); addError(new Error(gettext("Passphrase"), gettext("Das ist nicht die richtige Passphrase.")), false);
return 0; return 0;
} }

8
src/cpsp/adminCheckUserBackup.cpsp
View File

@ -48,9 +48,9 @@ struct SListEntry
auto user_id = tuple.get<0>(); auto user_id = tuple.get<0>();
Mnemonic* wordSource = nullptr; Mnemonic* wordSource = nullptr;
if(!User::validatePassphrase(passphrase, &wordSource)) { if(!User::validatePassphrase(passphrase, &wordSource)) {
addError(new Error("admin Check user backup", "invalid passphrase")); addError(new Error("admin Check user backup", "invalid passphrase"), false);
addError(new ParamError("admin Check user backup", "passphrase", passphrase.data())); addError(new ParamError("admin Check user backup", "passphrase", passphrase.data()), false);
addError(new ParamError("admin Check user backup", "user id", user_id)); addError(new ParamError("admin Check user backup", "user id", user_id), false);
continue; continue;
} else { } else {
keys.generateFromPassphrase(passphrase.data(), wordSource); keys.generateFromPassphrase(passphrase.data(), wordSource);
@ -68,7 +68,7 @@ struct SListEntry
} }
} }
catch (Poco::Exception& ex) { catch (Poco::Exception& ex) {
addError(new ParamError("adminCheckUserBackup", "mysql error", ex.displayText().data())); addError(new ParamError("adminCheckUserBackup", "mysql error", ex.displayText().data()), false);
} }

2
src/cpsp/debugPassphrase.cpsp
View File

@ -19,7 +19,7 @@
auto passphrase = KeyPair::filterPassphrase(form.get("passphrase", "")); auto passphrase = KeyPair::filterPassphrase(form.get("passphrase", ""));
Mnemonic* wordSource = nullptr; Mnemonic* wordSource = nullptr;
if(!User::validatePassphrase(passphrase, &wordSource)) { if(!User::validatePassphrase(passphrase, &wordSource)) {
addError(new Error("debug Passphrase", "invalid passphrase")); addError(new Error("debug Passphrase", "invalid passphrase"), false);
} else { } else {
keys.generateFromPassphrase(passphrase.data(), wordSource); keys.generateFromPassphrase(passphrase.data(), wordSource);
} }

4
src/cpsp/decodeTransaction.cpsp
View File

@ -35,13 +35,13 @@
sodium_base64_VARIANT_ORIGINAL)) sodium_base64_VARIANT_ORIGINAL))
{ {
free(binBuffer); free(binBuffer);
addError(new Error("ProcessingTransaction", "error decoding base64")); addError(new Error("ProcessingTransaction", "error decoding base64"), false);
} else { } else {
std::string binString((char*)binBuffer, resultingBinSize); std::string binString((char*)binBuffer, resultingBinSize);
free(binBuffer); free(binBuffer);
if (!transactionBody.ParseFromString(binString)) { if (!transactionBody.ParseFromString(binString)) {
addError(new Error("ProcessingTransaction", "error creating Transaction from binary Message")); addError(new Error("ProcessingTransaction", "error creating Transaction from binary Message"), false);
} else { } else {
decoded = true; decoded = true;
} }

8
src/cpsp/login.cpsp
View File

@ -82,13 +82,13 @@
switch(userState) { switch(userState) {
case USER_EMPTY: case USER_EMPTY:
case USER_PASSWORD_INCORRECT: case USER_PASSWORD_INCORRECT:
addError(new Error(langCatalog->gettext("Login"), langCatalog->gettext("E-Mail or password isn't right, please try again!"))); addError(new Error(langCatalog->gettext("Login"), langCatalog->gettext("E-Mail or password isn't right, please try again!")), false);
break; break;
case USER_PASSWORD_ENCRYPTION_IN_PROCESS: case USER_PASSWORD_ENCRYPTION_IN_PROCESS:
addError(new Error(langCatalog->gettext("Passwort"), langCatalog->gettext("Passwort wird noch berechnet, bitte versuche es in etwa 1 Minute erneut."))); addError(new Error(langCatalog->gettext("Passwort"), langCatalog->gettext("Passwort wird noch berechnet, bitte versuche es in etwa 1 Minute erneut.")), false);
break; break;
case USER_EMAIL_NOT_ACTIVATED: case USER_EMAIL_NOT_ACTIVATED:
mSession->addError(new Error(langCatalog->gettext("Account"), langCatalog->gettext("E-Mail Address not checked, do you already get one?"))); mSession->addError(new Error(langCatalog->gettext("Account"), langCatalog->gettext("E-Mail Address not checked, do you already get one?")), false);
response.redirect(ServerConfig::g_serverPath + "/checkEmail"); response.redirect(ServerConfig::g_serverPath + "/checkEmail");
return; return;
case USER_NO_KEYS: case USER_NO_KEYS:
@ -121,7 +121,7 @@
} }
} else if(!langUpdatedByBtn) { } else if(!langUpdatedByBtn) {
addError(new Error(langCatalog->gettext("Login"), langCatalog->gettext("Username and password are needed!"))); addError(new Error(langCatalog->gettext("Login"), langCatalog->gettext("Username and password are needed!")), false);
} }
} else { } else {

14
src/cpsp/passphrase.cpsp
View File

@ -38,7 +38,7 @@ enum PageState
//Mnemonic* wordSource = &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER]; //Mnemonic* wordSource = &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER];
Mnemonic* wordSource = &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER]; Mnemonic* wordSource = &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER];
if(lang == LANG_DE) { if(lang == LANG_DE) {
//wordSource = &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER]; wordSource = &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER];
} }
// remove old cookies if exist // remove old cookies if exist
@ -91,7 +91,7 @@ enum PageState
} }
} }
else { else {
addError(new Error("Passphrase", "Diese Passphrase ist ung&uuml;ltig, bitte &uuml;berpr&uuml;fen oder neu generieren (lassen).")); addError(new Error(gettext("Passphrase"), gettext("Diese Passphrase ist ung&uuml;ltig, bitte &uuml;berpr&uuml;fen oder neu generieren (lassen).")), false);
} }
} }
} }
@ -105,11 +105,17 @@ enum PageState
auto passphrase = mSession->getPassphrase(); auto passphrase = mSession->getPassphrase();
auto langWordSource = wordSource; auto langWordSource = wordSource;
if("" != passphrase && !User::validatePassphrase(passphrase, &wordSource)) { if("" != passphrase && !User::validatePassphrase(passphrase, &wordSource)) {
addError(new Error(gettext("Intern error"), gettext("Invalid Passphrase"))); addError(new Error("PassphrasePage", "Invalid Passphrase after double check"));
addError(new ParamError(gettext("Passphrase"), gettext("Passphrase"), passphrase.data())); addError(new ParamError("PassphrasePage", "passphrase", passphrase.data()));
if(!mSession->getNewUser().isNull()) {
addError(new ParamError("PassphrasePage", "user email", mSession->getNewUser()->getModel()->getEmail()));
}
sendErrorsAsEmail();
addError(new Error(gettext("Passphrase"), gettext("intern errorm please try again later")), false);
//response.redirect(ServerConfig::g_serverPath + "/error500"); //response.redirect(ServerConfig::g_serverPath + "/error500");
//return; //return;
} }
//printf("wordSource: %d, langWordSource: %d\n", (int)wordSource, (int)langWordSource);
if(wordSource != langWordSource) { if(wordSource != langWordSource) {
mSession->generatePassphrase(); mSession->generatePassphrase();
User::validatePassphrase(passphrase, &wordSource); User::validatePassphrase(passphrase, &wordSource);

2
src/cpsp/register.cpsp
View File

@ -15,7 +15,7 @@
if(!form.empty()) { if(!form.empty()) {
if(form.get("register-password2", "") != form.get("register-password", "")) { if(form.get("register-password2", "") != form.get("register-password", "")) {
addError(new Error("Passwort", "Passw&ouml;rter sind nicht identisch.")); addError(new Error("Passwort", "Passw&ouml;rter sind nicht identisch."), false);
} else { } else {
auto session = sm->getSession(request); auto session = sm->getSession(request);
if(!session) { if(!session) {

4
src/cpsp/saveKeys.cpsp
View File

@ -39,7 +39,7 @@ enum PageState
auto pwd = form.get("save-privkey-password", ""); auto pwd = form.get("save-privkey-password", "");
if(!mSession->isPwdValid(pwd)) { if(!mSession->isPwdValid(pwd)) {
addError(new Error("Passwort", "Das Passwort stimmt nicht. Bitte verwende dein Passwort von der Registrierung")); addError(new Error("Passwort", "Das Passwort stimmt nicht. Bitte verwende dein Passwort von der Registrierung"), false);
hasErrors = true; hasErrors = true;
} else { } else {
savePrivkey = true; savePrivkey = true;
@ -69,7 +69,7 @@ enum PageState
//hasErrors, mSession->getSessionState(), SESSION_STATE_KEY_PAIR_GENERATED); //hasErrors, mSession->getSessionState(), SESSION_STATE_KEY_PAIR_GENERATED);
}*/ }*/
getErrors(mSession); getErrors(mSession);
%><%@ include file="header.cpsp" %> %><%@ include file="header_old.cpsp" %>
<div class="grd_container"> <div class="grd_container">
<h1>Daten speichern</h1> <h1>Daten speichern</h1>
<%= getErrorsHtml() %> <%= getErrorsHtml() %>

2
src/cpsp/translatePassphrase.cpsp
View File

@ -42,7 +42,7 @@
addError(new Error( addError(new Error(
gettext("Fehler"), gettext("Fehler"),
gettext("Diese Passphrase ist ung&uuml;ltig, bitte &uuml;berpr&uuml;fen oder neu generieren (lassen).") gettext("Diese Passphrase ist ung&uuml;ltig, bitte &uuml;berpr&uuml;fen oder neu generieren (lassen).")
)); ), false);
} else { } else {
if(wordSource == &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER]) { if(wordSource == &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER]) {
targetSource = &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER]; targetSource = &ServerConfig::g_Mnemonic_WordLists[ServerConfig::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER];

2
src/cpsp/updateUserPassword.cpsp
View File

@ -29,7 +29,7 @@ enum PageState {
auto pwd = form.get("register-password", ""); auto pwd = form.get("register-password", "");
if(pwd != "") { if(pwd != "") {
if(pwd != form.get("register-password2", "")) { if(pwd != form.get("register-password2", "")) {
mSession->addError(new Error("Passwort", "Passw&ouml;rter sind nicht identisch.")); mSession->addError(new Error("Passwort", "Passw&ouml;rter sind nicht identisch."), false);
} else if(SessionManager::getInstance()->checkPwdValidation(pwd, mSession)) { } else if(SessionManager::getInstance()->checkPwdValidation(pwd, mSession)) {
auto sessionState = mSession->getSessionState(); auto sessionState = mSession->getSessionState();