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

finish passphrase update with mithril js

Browse Source
This commit is contained in:
Dario 2020-02-21 20:08:37 +01:00
parent c0e40f715d
commit c72b37c7e9
4 changed files with 264 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,8 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
auto sm = SessionManager::getInstance(); auto sm = SessionManager::getInstance();
auto uri_start = ServerConfig::g_serverPath;//request.serverParams().getServerName(); auto uri_start = ServerConfig::g_serverPath;//request.serverParams().getServerName();
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];
// remove old cookies if exist // remove old cookies if exist
sm->deleteLoginCookies(request, response, mSession); sm->deleteLoginCookies(request, response, mSession);
@ -60,6 +61,19 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
} }
if (!form.empty()) { if (!form.empty()) {
auto btnNext = form.get("nextEnsure", "");
auto btnChecked = form.get("btnChecked", "");
if(btnChecked != "") {
mSession->updateState(SESSION_STATE_PASSPHRASE_SHOWN);
response.redirect(ServerConfig::g_serverPath + "/passphrase");
return;
}
if(btnNext != "") {
state = PAGE_ASK_ENSURE_PASSPHRASE;
} else {
auto registerKeyChoice = form.get("passphrase", "no"); auto registerKeyChoice = form.get("passphrase", "no");
std::string oldPassphrase = ""; std::string oldPassphrase = "";
if (registerKeyChoice == "no") { if (registerKeyChoice == "no") {
@ -79,7 +93,9 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
} else { } else {
mSession->setPassphrase(oldPassphrase); mSession->setPassphrase(oldPassphrase);
mSession->updateState(SESSION_STATE_PASSPHRASE_SHOWN); mSession->updateState(SESSION_STATE_PASSPHRASE_SHOWN);
state = PAGE_SHOW_PASSPHRASE; response.redirect(ServerConfig::g_serverPath + "/saveKeys");
return;
//state = PAGE_SHOW_PASSPHRASE;
} }
} }
else { else {
@ -90,10 +106,11 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
mSession->generatePassphrase(); mSession->generatePassphrase();
} }
} }
}
if(mSession->getSessionState() == SESSION_STATE_PASSPHRASE_GENERATED) { if(mSession->getSessionState() == SESSION_STATE_PASSPHRASE_GENERATED && state != PAGE_ASK_ENSURE_PASSPHRASE) {
state = PAGE_SHOW_PASSPHRASE; state = PAGE_SHOW_PASSPHRASE;
mSession->updateState(SESSION_STATE_PASSPHRASE_SHOWN); //mSession->updateState(SESSION_STATE_PASSPHRASE_SHOWN);
} }
if(state == PAGE_ASK_ENSURE_PASSPHRASE) { if(state == PAGE_ASK_ENSURE_PASSPHRASE) {
pageSubtitle = gettext("Passphrase überprüfen"); pageSubtitle = gettext("Passphrase überprüfen");
@ -105,7 +122,11 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
pageSubtitle = gettext("Passphrase erfragen"); pageSubtitle = gettext("Passphrase erfragen");
} }
getErrors(mSession); getErrors(mSession);
std::ostream& _responseStream = response.send(); #line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header.cpsp"
bool withMaterialIcons = false;
#line 104 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
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;
responseStream << "\n"; responseStream << "\n";
@ -118,19 +139,27 @@ void PassphrasePage::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";
@ -138,7 +167,7 @@ void PassphrasePage::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";
@ -217,103 +246,124 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\n"; responseStream << "\n";
responseStream << "<div class=\"row mb-3\">\n"; responseStream << "<div class=\"row mb-3\">\n";
responseStream << "\t<h2>"; responseStream << "\t<h2>";
#line 89 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 106 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( pageTitle ); responseStream << ( pageTitle );
responseStream << "</h2>\n"; responseStream << "</h2>\n";
responseStream << "\t<h3 class=\"mx-auto\">"; responseStream << "\t<h3 class=\"mx-auto\">";
#line 90 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 107 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( pageSubtitle ); responseStream << ( pageSubtitle );
responseStream << "</h3>\n"; responseStream << "</h3>\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 94 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 111 "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 <div class=\"col-md-12 col-lg-12 \">\n"; responseStream << "\t\t\t<form method=\"POST\" action=\"";
responseStream << "\t\t\t<div class=\"alert alert-orange\">\n"; #line 114 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << "\t\t\t <h5 class=\"alert-heading\">"; responseStream << ( uri_start );
#line 99 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" responseStream << "/passphrase\">\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 <h5 class=\"alert-heading\">";
#line 117 "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 <p>"; responseStream << "\t\t\t\t <p>";
#line 100 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 118 "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</div>\n"; responseStream << "\t\t\t\t</div>\n";
responseStream << "\t\t\t<div class=\"col-lg-8 col-md-10 mx-auto alert alert-primary\" style=\"text-align:center\">\n"; responseStream << "\t\t\t\t<div class=\"col-lg-8 col-md-10 mx-auto alert alert-primary\" style=\"text-align:center\">\n";
responseStream << "\t\t\t <h5 class=\"alert-heading\">"; responseStream << "\t\t\t\t <h5 class=\"alert-heading\">";
#line 103 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 121 "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 <p>"; responseStream << "\t\t\t\t <p>";
#line 104 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 122 "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</div>\n"; responseStream << "\t\t\t\t</div>\n";
responseStream << "\t\t\t<div class=\"alert alert-secondary\">\n"; responseStream << "\t\t\t\t<div class=\"alert alert-secondary\">\n";
responseStream << "\t\t\t <h5 class=\"alert-heading\">"; responseStream << "\t\t\t\t <h5 class=\"alert-heading\">";
#line 107 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 125 "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 <p>"; responseStream << "\t\t\t\t <p>";
#line 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 126 "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 <p>"; responseStream << "\t\t\t\t <p>";
#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 127 "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</div>\n"; responseStream << "\t\t\t\t</div>\n";
responseStream << "\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 <a href=\""; #line 129 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
#line 112 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( uri_start );
responseStream << "/passphrase\" class=\"btn btn-sm btn-primary pull-right\" name=\"next\">";
#line 112 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Weiter") ); responseStream << ( gettext("Weiter") );
responseStream << "</a>\n"; responseStream << "\"/>\n";
responseStream << "\t\t\t </div>\n";
responseStream << "\t\t\t</form>\n";
responseStream << "\t\t</div>\n"; responseStream << "\t\t</div>\n";
responseStream << "\t </div>\n"; responseStream << "\t </div>\n";
responseStream << "\t "; responseStream << "\t ";
#line 115 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 134 "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\tbutton:disabled {\n";
responseStream << "\t\t\tcursor:default;\n";
responseStream << "\t\t}\n";
responseStream << "\t\t.visible-modal {\n";
responseStream << "\t\t\tbackground-color: rgba(0,0,0,0.4)\n";
responseStream << "\t\t}\n";
responseStream << "\t\t</style>\n";
responseStream << "\t <div class=\"\">\n"; responseStream << "\t <div class=\"\">\n";
responseStream << "\t\t <div class=\"item-wrapper\">\n"; responseStream << "\t\t <div class=\"item-wrapper\">\n";
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>\n"; responseStream << "\t\t\t\t<form method=\"POST\" action=\"";
#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( uri_start );
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<div class=\"col-md-12 col-lg-12 \">\n"; responseStream << "\t\t\t\t\t<form method=\"POST\" action=\"";
responseStream << "\t\t\t\t\t <div class=\"alert alert-orange\">\n"; #line 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << "\t\t\t\t\t\t<h5 class=\"alert-heading\">"; responseStream << ( uri_start );
#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" 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=\"alert alert-orange\">\n";
responseStream << "\t\t\t\t\t\t\t<h5 class=\"alert-heading\">";
#line 152 "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<p>"; responseStream << "\t\t\t\t\t\t\t<p>";
#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 153 "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<p>"; responseStream << "\t\t\t\t\t\t\t<p>";
#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 154 "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<p>"; responseStream << "\t\t\t\t\t\t\t<p>";
#line 127 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 155 "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 </div>\n"; responseStream << "\t\t\t\t\t\t </div>\n";
responseStream << "\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 <noscript>\n"; responseStream << "\t\t\t\t\t\t <noscript>\n";
responseStream << "\t\t\t\t\t\t"; responseStream << "\t\t\t\t\t\t\t<p>";
#line 131 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 159 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( gettext("Ohne Javascript kannst du auch gleich weiter machen:") ); responseStream << ( gettext("Weil du kein Javascript verwendest geht es direkt weiter. Hast du dir deine Passphrase gemerkt oder aufgeschrieben?") );
responseStream << "\n"; responseStream << "</p>\n";
responseStream << "\t\t\t\t\t\t<a href=\"saveKeys\" class=\"btn btn-sm btn-primary pull-right\" name=\"next\">Weiter</a>\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 </noscript>\n"; #line 160 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << "\t\t\t\t\t</div>\n"; responseStream << ( gettext("Ja") );
responseStream << "\"/>\n";
responseStream << "\t\t\t\t\t\t </noscript>\n";
responseStream << "\t\t\t\t\t\t</div>\n";
responseStream << "\t\t\t\t\t</form>\n";
responseStream << "\t\t\t\t </div>\n"; responseStream << "\t\t\t\t </div>\n";
responseStream << "\t\t\t\t</form>\n"; responseStream << "\t\t\t\t</form>\n";
responseStream << "\t\t\t </div>\n"; responseStream << "\t\t\t </div>\n";
@ -321,41 +371,49 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t\t </div>\n"; responseStream << "\t\t </div>\n";
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 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 171 "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 = \"";
#line 172 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( mSession->getPassphrase() );
responseStream << "\";\n";
responseStream << "\t\t</script>\n"; responseStream << "\t\t</script>\n";
responseStream << "\t\t<script src=\"";
#line 174 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp"
responseStream << ( ServerConfig::g_php_serverPath );
responseStream << "js/ensurePassphrase.js\" type=\"text/javascript\"></script>\n";
responseStream << "\t "; responseStream << "\t ";
#line 144 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 175 "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-8 col-md-10 mx-auto alert alert-primary\" style=\"text-align:center\">\n"; responseStream << "\t\t\t<div class=\"col-lg-8 col-md-10 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 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 180 "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 <p>"; responseStream << "\t\t\t <p>";
#line 150 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 181 "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 152 "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=\"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 154 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 185 "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 155 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 186 "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 156 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 187 "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";
@ -366,7 +424,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 164 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 195 "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";
@ -376,7 +434,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 171 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 202 "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";
@ -384,11 +442,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 176 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 207 "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 177 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 208 "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";
@ -396,40 +454,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 182 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 213 "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 182 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 213 "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 185 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 216 "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-8 col-md-10 mx-auto alert alert-primary\" style=\"text-align:center\">\n"; responseStream << "\t\t\t<div class=\"col-lg-8 col-md-10 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 190 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 221 "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 191 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 222 "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 193 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 224 "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 194 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 225 "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 195 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 226 "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";
@ -437,18 +495,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 200 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 231 "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 205 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 236 "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 206 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 237 "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";
@ -456,7 +514,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 211 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\passphrase.cpsp" #line 242 "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/model/Session.h
View File

@ -51,12 +51,14 @@ enum SessionStates {
class SessionManager; class SessionManager;
class UpdateUserPasswordPage; class UpdateUserPasswordPage;
class PassphrasePage;
class Session : public ErrorList, public UniLib::lib::MultithreadContainer class Session : public ErrorList, public UniLib::lib::MultithreadContainer
{ {
friend WriteEmailVerification; friend WriteEmailVerification;
friend SessionManager; friend SessionManager;
friend UpdateUserPasswordPage; friend UpdateUserPasswordPage;
friend PassphrasePage;
public: public:
Session(int handle); Session(int handle);
~Session(); ~Session();

5
src/cpsp/header.cpsp
View File

@ -1,5 +1,7 @@
<%! <%!
#include "../ServerConfig.h" #include "../ServerConfig.h"
%><%%
bool withMaterialIcons = false;
%> %>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@ -8,6 +10,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Gradido Login Server: <%= pageName %></title> <title>Gradido Login Server: <%= pageName %></title>
<link rel="stylesheet" type="text/css" href="<%= ServerConfig::g_php_serverPath %>css/loginServer/style.css"> <link rel="stylesheet" type="text/css" href="<%= ServerConfig::g_php_serverPath %>css/loginServer/style.css">
<% if(withMaterialIcons) { %>
<link rel="stylesheet" type="text/css" href="<%= ServerConfig::g_php_serverPath %>css/materialdesignicons.min.css">
<% } %>
</head> </head>
<body class="header-fixed"> <body class="header-fixed">
<div class="versionstring dev-info"> <div class="versionstring dev-info">

51
src/cpsp/passphrase.cpsp
View File

@ -27,7 +27,8 @@ enum PageState
auto sm = SessionManager::getInstance(); auto sm = SessionManager::getInstance();
auto uri_start = ServerConfig::g_serverPath;//request.serverParams().getServerName(); auto uri_start = ServerConfig::g_serverPath;//request.serverParams().getServerName();
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];
// remove old cookies if exist // remove old cookies if exist
sm->deleteLoginCookies(request, response, mSession); sm->deleteLoginCookies(request, response, mSession);
@ -39,6 +40,19 @@ enum PageState
} }
if (!form.empty()) { if (!form.empty()) {
auto btnNext = form.get("nextEnsure", "");
auto btnChecked = form.get("btnChecked", "");
if(btnChecked != "") {
mSession->updateState(SESSION_STATE_PASSPHRASE_SHOWN);
response.redirect(ServerConfig::g_serverPath + "/passphrase");
return;
}
if(btnNext != "") {
state = PAGE_ASK_ENSURE_PASSPHRASE;
} else {
auto registerKeyChoice = form.get("passphrase", "no"); auto registerKeyChoice = form.get("passphrase", "no");
std::string oldPassphrase = ""; std::string oldPassphrase = "";
if (registerKeyChoice == "no") { if (registerKeyChoice == "no") {
@ -58,7 +72,9 @@ enum PageState
} else { } else {
mSession->setPassphrase(oldPassphrase); mSession->setPassphrase(oldPassphrase);
mSession->updateState(SESSION_STATE_PASSPHRASE_SHOWN); mSession->updateState(SESSION_STATE_PASSPHRASE_SHOWN);
state = PAGE_SHOW_PASSPHRASE; response.redirect(ServerConfig::g_serverPath + "/saveKeys");
return;
//state = PAGE_SHOW_PASSPHRASE;
} }
} }
else { else {
@ -69,10 +85,11 @@ enum PageState
mSession->generatePassphrase(); mSession->generatePassphrase();
} }
} }
}
if(mSession->getSessionState() == SESSION_STATE_PASSPHRASE_GENERATED) { if(mSession->getSessionState() == SESSION_STATE_PASSPHRASE_GENERATED && state != PAGE_ASK_ENSURE_PASSPHRASE) {
state = PAGE_SHOW_PASSPHRASE; state = PAGE_SHOW_PASSPHRASE;
mSession->updateState(SESSION_STATE_PASSPHRASE_SHOWN); //mSession->updateState(SESSION_STATE_PASSPHRASE_SHOWN);
} }
if(state == PAGE_ASK_ENSURE_PASSPHRASE) { if(state == PAGE_ASK_ENSURE_PASSPHRASE) {
pageSubtitle = gettext("Passphrase überprüfen"); pageSubtitle = gettext("Passphrase überprüfen");
@ -84,7 +101,7 @@ enum PageState
pageSubtitle = gettext("Passphrase erfragen"); pageSubtitle = gettext("Passphrase erfragen");
} }
getErrors(mSession); getErrors(mSession);
%><%@ include file="login_header.cpsp" %><%@ include file="flags.cpsp" %> %><%@ include file="login_header.cpsp" %><%% withMaterialIcons = true; %><%@ include file="flags.cpsp" %>
<div class="row mb-3"> <div class="row mb-3">
<h2><%= pageTitle %></h2> <h2><%= pageTitle %></h2>
<h3 class="mx-auto"><%= pageSubtitle %></h3> <h3 class="mx-auto"><%= pageSubtitle %></h3>
@ -94,6 +111,7 @@ enum PageState
<% if(state == PAGE_SHOW_PASSPHRASE) {%> <% if(state == PAGE_SHOW_PASSPHRASE) {%>
<div class="col-md-10 mx-auto"> <div class="col-md-10 mx-auto">
<div class="form-group row showcase_row_area"> <div class="form-group row showcase_row_area">
<form method="POST" action="<%= uri_start %>/passphrase">
<div class="col-md-12 col-lg-12 "> <div class="col-md-12 col-lg-12 ">
<div class="alert alert-orange"> <div class="alert alert-orange">
<h5 class="alert-heading"><%= gettext("Was zu tun ist:") %></h5> <h5 class="alert-heading"><%= gettext("Was zu tun ist:") %></h5>
@ -108,17 +126,27 @@ enum PageState
<p><%= gettext("Die Passphrase kommt aus dem Crypto-Bereich und ist ein Weg einen komplizierte kryptografischen Schlüssel in einer lesbaren Form darzustellen.") %></p> <p><%= gettext("Die Passphrase kommt aus dem Crypto-Bereich und ist ein Weg einen komplizierte kryptografischen Schlüssel in einer lesbaren Form darzustellen.") %></p>
<p><%= gettext("Der neue Gradido basiert technisch auf einer Kryptowährung (wie z.B. Bitcoin) um maximale Sicherheit zu erreichen.") %></p> <p><%= gettext("Der neue Gradido basiert technisch auf einer Kryptowährung (wie z.B. Bitcoin) um maximale Sicherheit zu erreichen.") %></p>
</div> </div>
<input type="submit" class="btn btn-sm btn-primary pull-right" name="nextEnsure" value="<%= gettext("Weiter") %>"/>
</div> </div>
<a href="<%= uri_start %>/passphrase" class="btn btn-sm btn-primary pull-right" name="next"><%= gettext("Weiter") %></a> </form>
</div> </div>
</div> </div>
<% } else if(state == PAGE_ASK_ENSURE_PASSPHRASE) { %> <% } else if(state == PAGE_ASK_ENSURE_PASSPHRASE) { %>
<style type="text/css">
button:disabled {
cursor:default;
}
.visible-modal {
background-color: rgba(0,0,0,0.4)
}
</style>
<div class=""> <div class="">
<div class="item-wrapper"> <div class="item-wrapper">
<div class="row mb-3"> <div class="row mb-3">
<div class="col-md-10 mx-auto"> <div class="col-md-10 mx-auto">
<form> <form method="POST" action="<%= uri_start %>/passphrase">
<div class="form-group row showcase_row_area"> <div class="form-group row showcase_row_area">
<form method="POST" action="<%= uri_start %>/passphrase">
<div class="col-md-12 col-lg-12 "> <div class="col-md-12 col-lg-12 ">
<div class="alert alert-orange"> <div class="alert alert-orange">
<h5 class="alert-heading"><%= gettext("Was zu tun ist:") %></h5> <h5 class="alert-heading"><%= gettext("Was zu tun ist:") %></h5>
@ -128,10 +156,11 @@ enum PageState
</div> </div>
<div id="gradido-mithril-passphrase"></div> <div id="gradido-mithril-passphrase"></div>
<noscript> <noscript>
<%= gettext("Ohne Javascript kannst du auch gleich weiter machen:") %> <p><%= gettext("Weil du kein Javascript verwendest geht es direkt weiter. Hast du dir deine Passphrase gemerkt oder aufgeschrieben?") %></p>
<a href="saveKeys" class="btn btn-sm btn-primary pull-right" name="next">Weiter</a> <input type="submit" class="btn btn-sm btn-primary pull-right" name="btnChecked" value="<%= gettext("Ja") %>"/>
</noscript> </noscript>
</div> </div>
</form>
</div> </div>
</form> </form>
</div> </div>
@ -139,8 +168,10 @@ enum PageState
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
var mnemonicWords = "<% wordSource->getSortedWordList().stringify(responseStream); %>"; var mnemonicWords = <% wordSource->getSortedWordList().stringify(responseStream); %>;
var passphrase = "<%= mSession->getPassphrase() %>";
</script> </script>
<script src="<%= ServerConfig::g_php_serverPath %>js/ensurePassphrase.js" type="text/javascript"></script>
<% } else if(state == PAGE_ASK_PASSPHRASE) { %> <% } else if(state == PAGE_ASK_PASSPHRASE) { %>
<div class="col-md-10 mx-auto"> <div class="col-md-10 mx-auto">
<div class="form-group row showcase_row_area"> <div class="form-group row showcase_row_area">