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 pages for using depracted getOldPassphrase function from session, or use new Passphrase class

Browse Source
This commit is contained in:
Dario 2020-06-25 15:58:55 +02:00
parent 30ba3d7f78
commit ecae855fc0
7 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ void PassphrasePage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::
}
// double check passphrase
auto passphrase = mSession->getPassphrase();
auto passphrase = mSession->getOldPassphrase();
auto langWordSource = wordSource;
if("" != passphrase && !User::validatePassphrase(passphrase, &wordSource)) {
addError(new Error("PassphrasePage", "Invalid Passphrase after double check"));

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

@ -55,7 +55,7 @@ void TranslatePassphrase::handleRequest(Poco::Net::HTTPServerRequest& request, P
auto btnGenerate = form.get("btnGenerate", "");
if("" != btnGenerate) {
mSession->generatePassphrase();
localPassphrase = mSession->getPassphrase();
localPassphrase = mSession->getOldPassphrase();
inputPassphrase = localPassphrase;
}

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

@ -8,6 +8,7 @@
#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
#include "../SingletonManager/SessionManager.h"
#include "../tasks/AuthenticatedEncryptionCreateKeyTask.h"
#include "Poco/Net/HTTPCookie.h"
enum PageState {
@ -34,10 +35,10 @@ void UpdateUserPasswordPage::handleRequest(Poco::Net::HTTPServerRequest& request
if (_compressResponse) response.set("Content-Encoding", "gzip");
Poco::Net::HTMLForm form(request, request.stream());
#line 16 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
#line 17 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\UpdateUserPassword.cpsp"
const char* pageName = "Passwort bestimmen";
auto user = mSession->getUser();
auto user = mSession->getNewUser();
auto sm = SessionManager::getInstance();
auto uri_start = ServerConfig::g_serverPath;
PageState state = PAGE_STATE_ASK_PASSWORD;
@ -55,8 +56,7 @@ void UpdateUserPasswordPage::handleRequest(Poco::Net::HTTPServerRequest& request
} else if(SessionManager::getInstance()->checkPwdValidation(pwd, mSession)) {
auto sessionState = mSession->getSessionState();
if(user->updatePassword(pwd, mSession->getPassphrase(), mSession->getNewUser())) {
if(user->setNewPassword(pwd) >= 0) {
//std::string referUri = request.get("Referer", uri_start + "/");
//printf("[updateUserPasswordPage] redirect to referUri: %s\n", referUri.data());
@ -70,7 +70,7 @@ void UpdateUserPasswordPage::handleRequest(Poco::Net::HTTPServerRequest& request
if(code) {
retUpdateEmailCode = mSession->updateEmailVerification(mSession->getEmailVerificationCode());
}
mSession->getErrors(user);
//mSession->getErrors(user);
if(-2 == retUpdateEmailCode || -1 == retUpdateEmailCode || 1 == retUpdateEmailCode) {
response.redirect(uri_start + "/error500");
return;
@ -92,7 +92,7 @@ void UpdateUserPasswordPage::handleRequest(Poco::Net::HTTPServerRequest& request
if(mSession) {
getErrors(mSession);
}
getErrors(user);
//getErrors(user);
//printf("session state end [UpdateUserPassword Page]: %s\n", mSession->getSessionStateString());
std::ostream& _responseStream = response.send();
Poco::DeflatingOutputStream _gzipStream(_responseStream, Poco::DeflatingStreamBuf::STREAM_GZIP, 1);

3
src/cpp/tasks/AuthenticatedEncryptionCreateKeyTask.cpp
View File

@ -9,6 +9,7 @@
AuthenticatedEncryptionCreateKeyTask::AuthenticatedEncryptionCreateKeyTask(Poco::AutoPtr<controller::User> user, const std::string& passwd)
: UniLib::controller::CPUTask(ServerConfig::g_CryptoCPUScheduler), mUser(user), mPassword(passwd)
{
assert(!mUser.isNull());
SingletonTaskObserver::getInstance()->addTask(mUser->getModel()->getEmail(), TASK_OBSERVER_PASSWORD_CREATION);
}
@ -32,7 +33,7 @@ int AuthenticatedEncryptionCreateKeyTask::run()
}
printf("create password time: %s\n", timeUsed.string().data());
timeUsed.reset();
mUser->setPassword(authenticated_encryption);
mUser->setNewPassword(authenticated_encryption);
printf("set password time: %s\n", timeUsed.string().data());
return 0;

2
src/cpsp/passphrase.cpsp
View File

@ -102,7 +102,7 @@ enum PageState
}
// double check passphrase
auto passphrase = mSession->getPassphrase();
auto passphrase = mSession->getOldPassphrase();
auto langWordSource = wordSource;
if("" != passphrase && !User::validatePassphrase(passphrase, &wordSource)) {
addError(new Error("PassphrasePage", "Invalid Passphrase after double check"));

2
src/cpsp/translatePassphrase.cpsp
View File

@ -34,7 +34,7 @@
auto btnGenerate = form.get("btnGenerate", "");
if("" != btnGenerate) {
mSession->generatePassphrase();
localPassphrase = mSession->getPassphrase();
localPassphrase = mSession->getOldPassphrase();
inputPassphrase = localPassphrase;
}

10
src/cpsp/updateUserPassword.cpsp
View File

@ -5,6 +5,7 @@
<%@ page compressed="true" %>
<%!
#include "../SingletonManager/SessionManager.h"
#include "../tasks/AuthenticatedEncryptionCreateKeyTask.h"
#include "Poco/Net/HTTPCookie.h"
enum PageState {
@ -15,7 +16,7 @@ enum PageState {
%>
<%%
const char* pageName = "Passwort bestimmen";
auto user = mSession->getUser();
auto user = mSession->getNewUser();
auto sm = SessionManager::getInstance();
auto uri_start = ServerConfig::g_serverPath;
PageState state = PAGE_STATE_ASK_PASSWORD;
@ -33,8 +34,7 @@ enum PageState {
} else if(SessionManager::getInstance()->checkPwdValidation(pwd, mSession)) {
auto sessionState = mSession->getSessionState();
if(user->updatePassword(pwd, mSession->getPassphrase(), mSession->getNewUser())) {
if(user->setNewPassword(pwd) >= 0) {
//std::string referUri = request.get("Referer", uri_start + "/");
//printf("[updateUserPasswordPage] redirect to referUri: %s\n", referUri.data());
@ -48,7 +48,7 @@ enum PageState {
if(code) {
retUpdateEmailCode = mSession->updateEmailVerification(mSession->getEmailVerificationCode());
}
mSession->getErrors(user);
//mSession->getErrors(user);
if(-2 == retUpdateEmailCode || -1 == retUpdateEmailCode || 1 == retUpdateEmailCode) {
response.redirect(uri_start + "/error500");
return;
@ -70,7 +70,7 @@ enum PageState {
if(mSession) {
getErrors(mSession);
}
getErrors(user);
//getErrors(user);
//printf("session state end [UpdateUserPassword Page]: %s\n", mSession->getSessionStateString());
%><%@ include file="header_old.cpsp" %>
<div class="grd_container">