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

update passphrase text

Browse Source
This commit is contained in:
Dario 2019-11-09 09:56:24 +01:00
parent 42d3a5d4ce
commit 95f805c28f
18 changed files with 61 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "<body>\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\">Alpha 0.4.5</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.5.1</p>\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";

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

@ -144,7 +144,7 @@ void CheckTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
responseStream << "<body>\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\">Alpha 0.4.5</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.5.1</p>\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";

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

@ -82,7 +82,7 @@ void ConfigPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:
responseStream << "<body>\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\">Alpha 0.4.5</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.5.1</p>\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";

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

@ -98,7 +98,7 @@ void DashboardPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::N
responseStream << "<body>\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\">Alpha 0.4.5</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.5.1</p>\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";

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

@ -97,7 +97,7 @@ void Error500Page::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
responseStream << "<body>\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\">Alpha 0.4.5</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.5.1</p>\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";

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

@ -145,7 +145,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << "<body>\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\">Alpha 0.4.5</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.5.1</p>\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";

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

@ -133,7 +133,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "<body>\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\">Alpha 0.4.5</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.5.1</p>\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";
@ -180,7 +180,8 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "/passphrase\">\n";
responseStream << "\t\t<fieldset class=\"grd_container_small\">\n";
responseStream << "\t\t\t<legend>Neue Gradido Adresse anlegen / wiederherstellen</legend>\n";
responseStream << "\t\t\t<p>Hast du schonmal ein Gradido Konto besessen?</p>\n";
responseStream << "\t\t\t<p>Möchtest Du ein bestehendes* Gradido-Konto wiederherstellen oder ein neues anlegen?</p>\n";
responseStream << "\t\t\t<p>*Das Konto muss nach dem 01.09.2019 angelegt worden sein.</p>\n";
responseStream << "\t\t\t<p class=\"grd_small\">\n";
responseStream << "\t\t\t\t<input id=\"passphrase-new-yes\" type=\"radio\" name=\"passphrase\" value=\"yes\" checked/>\n";
responseStream << "\t\t\t\t<label class=\"grd_radio_label\" for=\"passphrase-new-yes\">Nein, bitte ein neues erstellen!</label>\n";
@ -190,7 +191,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t\t\t\t<label class=\"grd_radio_label\" for=\"passphrase-new-no\">Ja, bitte wiederherstellen!</label>\n";
responseStream << "\t\t\t</p>\n";
responseStream << "\t\t\t<textarea style=\"width:100%;height:100px\" name=\"passphrase-existing\">";
#line 83 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
#line 84 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
responseStream << ( !form.empty() ? form.get("passphrase-existing", "") : "" );
responseStream << "</textarea>\n";
responseStream << "\t\t</fieldset>\n";
@ -199,13 +200,13 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
responseStream << "\t\t\n";
responseStream << "\t</form>\n";
responseStream << "\t";
#line 89 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
#line 90 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
} else { responseStream << "\n";
responseStream << "\t\t<div class=\"grd_text\">\n";
responseStream << "\t\t\tUngültige Seite, wenn du das siehst stimmt hier etwas nicht. Bitte wende dich an den Server-Admin. \n";
responseStream << "\t\t</div>\n";
responseStream << "\t";
#line 93 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
#line 94 "I:\\Code\\C++\\Eigene_Projekte\\Gradido_LoginServer\\src\\cpsp\\passphrase.cpsp"
} responseStream << "\n";
responseStream << "</div>\n";
// begin include footer.cpsp

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

@ -116,7 +116,7 @@ void RegisterPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
responseStream << "<body>\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\">Alpha 0.4.5</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.5.1</p>\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";

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

@ -151,7 +151,7 @@ void SaveKeysPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Ne
responseStream << "<body>\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\">Alpha 0.4.5</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.5.1</p>\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";

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

@ -121,7 +121,7 @@ void UpdateUserPasswordPage::handleRequest(Poco::Net::HTTPServerRequest& request
responseStream << "<body>\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\">Alpha 0.4.5</p>\n";
responseStream << "\t<p class=\"grd_small\">Alpha 0.5.1</p>\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";

1
src/cpp/JSONInterface/JsonGetLogin.cpp
View File

@ -64,6 +64,7 @@ Poco::JSON::Object* JsonGetLogin::handle(Poco::Dynamic::Var params)
result->set("clientIP", session->getClientIp().toString());
result->set("user", user->getJson());
result->set("Transaction.pending", session->getProcessingTransactionCount());
printf("pending: %d\n", session->getProcessingTransactionCount());
return result;
}
else {

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

@ -119,7 +119,7 @@ std::string ErrorList::getErrorsHtml()
}
void ErrorList::sendErrorsAsEmail()
void ErrorList::sendErrorsAsEmail(std::string rawHtml/* = ""*/)
{
auto message = new Poco::Net::MailMessage();
message->setSender("gradido_loginServer@gradido.net");
@ -135,6 +135,9 @@ void ErrorList::sendErrorsAsEmail()
}
message->addContent(new Poco::Net::StringPartSource(content));
if (rawHtml != "") {
message->addContent(new Poco::Net::StringPartSource(rawHtml));
}
UniLib::controller::TaskPtr sendErrorMessageTask(new SendErrorMessage(message, ServerConfig::g_CPUScheduler));
sendErrorMessageTask->scheduleTask(sendErrorMessageTask);

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

@ -43,7 +43,7 @@ public:
void printErrors();
std::string getErrorsHtml();
void sendErrorsAsEmail();
void sendErrorsAsEmail(std::string rawHtml = "");
protected:
std::stack<Error*> mErrorStack;

8
src/cpp/model/User.cpp
View File

@ -786,8 +786,14 @@ MemoryBin* User::sign(const unsigned char* message, size_t messageSize)
//binArrayObj = new BinaryArray(crypto_sign_BYTES);
auto mm = MemoryManager::getInstance();
//auto signBinBuffer = (unsigned char*)malloc(crypto_sign_BYTES);
auto signBinBuffer = mm->getFreeMemory(crypto_sign_BYTES);
auto privKey = getPrivKey();
if (!privKey) {
addError(new Error("User::sign", "decrypt privkey failed"));
return nullptr;
}
auto signBinBuffer = mm->getFreeMemory(crypto_sign_BYTES);
size_t actualSignLength = 0;
if (crypto_sign_detached(*signBinBuffer, &actualSignLength, message, messageSize, *privKey)) {

43
src/cpp/tasks/SigningTransaction.cpp
View File

@ -91,6 +91,7 @@ int SigningTransaction::run() {
// finalize
printf("sigpair size: %d\n", transaction.sigmap().sigpair_size());
std::string finalTransactionBin = transaction.SerializeAsString();
if (finalTransactionBin == "") {
addError(new Error("SigningTransaction", "error serializing final transaction"));
@ -99,9 +100,9 @@ int SigningTransaction::run() {
}
// finale to base64
auto finalBase64Size = sodium_base64_encoded_len(finalTransactionBin.size(), sodium_base64_VARIANT_ORIGINAL);
auto finalBase64Size = sodium_base64_encoded_len(finalTransactionBin.size(), sodium_base64_VARIANT_URLSAFE_NO_PADDING);
auto finalBase64Bin = mm->getFreeMemory(finalBase64Size);
if (!sodium_bin2base64(*finalBase64Bin, finalBase64Size, (const unsigned char*)finalTransactionBin.data(), finalTransactionBin.size(), sodium_base64_VARIANT_ORIGINAL)) {
if (!sodium_bin2base64(*finalBase64Bin, finalBase64Size, (const unsigned char*)finalTransactionBin.data(), finalTransactionBin.size(), sodium_base64_VARIANT_URLSAFE_NO_PADDING)) {
addError(new Error("SigningTransaction", "error convert final transaction to base64"));
sendErrorsAsEmail();
mm->releaseMemory(finalBase64Bin);
@ -112,8 +113,8 @@ int SigningTransaction::run() {
Poco::JSON::Object requestJson;
requestJson.set("method", "putTransaction");
requestJson.set("transaction", std::string((char*)*finalBase64Bin, finalBase64Size));
printf("base64 transaction: %s\n", (char*)*finalBase64Bin);
requestJson.set("transaction", std::string((char*)*finalBase64Bin));
printf("\nbase64 transaction: \n%s\n\n", (char*)*finalBase64Bin);
mm->releaseMemory(finalBase64Bin);
@ -134,32 +135,46 @@ int SigningTransaction::run() {
std::istream& request_stream = httpsClientSession.receiveResponse(response);
// debugging answer
std::stringstream responseStringStream;
for (std::string line; std::getline(request_stream, line); ) {
responseStringStream << line << std::endl;
}
//printf("server response: %s\n", responseStringStream.str().data());
FILE* f = fopen("response.html", "wt");
std::string responseString = responseStringStream.str();
fwrite(responseString.data(), 1, responseString.size(), f);
fclose(f);
// extract parameter from request
Poco::JSON::Parser jsonParser;
Poco::Dynamic::Var parsedJson;
try {
parsedJson = jsonParser.parse(request_stream);
parsedJson = jsonParser.parse(responseStringStream.str());
}
catch (Poco::Exception& ex) {
//printf("[JsonRequestHandler::handleRequest] Exception: %s\n", ex.displayText().data());
addError(new ParamError("SigningTransaction", "error parsing request answer", ex.displayText().data()));
sendErrorsAsEmail();
FILE* f = fopen("response.html", "wt");
std::string responseString = responseStringStream.str();
fwrite(responseString.data(), 1, responseString.size(), f);
fclose(f);
// */
sendErrorsAsEmail(responseStringStream.str());
return -9;
}
if (parsedJson.isStruct()) {
Poco::JSON::Object object = *parsedJson.extract<Poco::JSON::Object::Ptr>();
auto state = object.get("state");
std::string stateString = state.convert<std::string>();
if (stateString == "error") {
addError(new Error("SigningTransaction", "php server return error"));
if (!object.isNull("msg")) {
addError(new ParamError("SigningTransaction", "msg:", object.get("msg").convert<std::string>().data()));
}
if (!object.isNull("details")) {
addError(new ParamError("SigningTransaction", "details:", object.get("details").convert<std::string>().data()));
}
sendErrorsAsEmail();
return -10;
}
printf("state: %s\n", stateString.data());
int zahl = 1;
}
catch (Poco::Exception& e) {

2
src/cpsp/header.cpsp
View File

@ -50,7 +50,7 @@ label:not(.grd_radio_label) {
<body>
<div class="versionstring dev-info">
<p class="grd_small">Login Server in Entwicklung</p>
<p class="grd_small">Alpha 0.4.5</p>
<p class="grd_small">Alpha 0.5.1</p>
</div>
<!--<nav class="grd-left-bar expanded" data-topbar role="navigation">
<div class="grd-left-bar-section">

3
src/cpsp/passphrase.cpsp
View File

@ -71,7 +71,8 @@ enum PageState
<form method="POST" action="<%= uri_start %>/passphrase">
<fieldset class="grd_container_small">
<legend>Neue Gradido Adresse anlegen / wiederherstellen</legend>
<p>Hast du schonmal ein Gradido Konto besessen?</p>
<p>Möchtest Du ein bestehendes* Gradido-Konto wiederherstellen oder ein neues anlegen?</p>
<p>*Das Konto muss nach dem 01.09.2019 angelegt worden sein.</p>
<p class="grd_small">
<input id="passphrase-new-yes" type="radio" name="passphrase" value="yes" checked/>
<label class="grd_radio_label" for="passphrase-new-yes">Nein, bitte ein neues erstellen!</label>

2
src/proto

@ -1 +1 @@
Subproject commit 96edfc4337f05865da51db2f01f3caa5ba0965b5
Subproject commit 77e878253ac2a044eb59700386c961c812667eae