From 48d53626c290d3f36931b393fa3f2cafe4853671 Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 15 Jul 2020 12:18:33 +0200 Subject: [PATCH] remove skipping CheckEmailPage by some session states, because this don't work with current register process --- src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp | 9 ++++++--- src/cpp/model/User.cpp | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp b/src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp index 88ba59239..2835fb19c 100644 --- a/src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp +++ b/src/cpp/HTTPInterface/PageRequestHandlerFactory.cpp @@ -111,9 +111,11 @@ Poco::Net::HTTPRequestHandler* PageRequestHandlerFactory::createRequestHandler(c if (url_first_part == "/checkEmail") { //return new CheckEmailPage(s); - if (!s || s->getSessionState() < SESSION_STATE_EMAIL_VERIFICATION_CODE_CHECKED) { + //printf("url checkEmail\n"); +// if (!s) { return handleCheckEmail(s, uri, request, timeUsed); - } + // } + //printf("skip handleCheckEmail\n"); } /*if (url_first_part == "/register") { auto pageRequestHandler = new RegisterPage; @@ -338,11 +340,12 @@ Poco::Net::HTTPRequestHandler* PageRequestHandlerFactory::handleCheckEmail(Sessi */ // update session, mark as verified int retUpdateEmailVerification = session->updateEmailVerification(verificationCode); - + printf("[%s] return from update email verification: %d\n", __FUNCTION__, retUpdateEmailVerification); if (0 == retUpdateEmailVerification) { //printf("[PageRequestHandlerFactory::handleCheckEmail] timeUsed: %s\n", timeUsed.string().data()); SessionHTTPRequestHandler* pageRequestHandler = nullptr; if (model::table::EMAIL_OPT_IN_REGISTER_DIRECT == session->getEmailVerificationType()) { + printf("return check email page\n"); pageRequestHandler = new CheckEmailPage(session); } else if(SESSION_STATE_RESET_PASSWORD_REQUEST == session->getSessionState()) { pageRequestHandler = new UpdateUserPasswordPage(session); diff --git a/src/cpp/model/User.cpp b/src/cpp/model/User.cpp index e36874e71..27539ecf1 100644 --- a/src/cpp/model/User.cpp +++ b/src/cpp/model/User.cpp @@ -914,7 +914,6 @@ MemoryBin* User::createCryptoKey(const std::string& password) //ObfusArray* key = new ObfusArray(crypto_box_SEEDBYTES); auto key = mm->getFreeMemory(crypto_box_SEEDBYTES); //Bin32Bytes* key = mm->get32Bytes(); - if (crypto_pwhash(*key, key->size(), password.data(), password.size(), hash512_salt, 10U, 33554432, 2) != 0) { lock(funcName); addError(new ParamError(funcName, " error creating pwd hash, maybe to much memory requestet? error:", strerror(errno)));