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

show debug infos about group forward url

Browse Source
This commit is contained in:
Dario 2020-12-09 13:03:42 +01:00 committed by Ulf Gebhardt
parent 6b17a04bf1
commit 29a54cc559
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,18 +168,19 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
refererString = referer->second; refererString = referer->second;
} }
if(lastExternReferer != "") { if(lastExternReferer != "") {
//printf("redirect to: %s\n", lastExternReferer.data()); printf("redirect to: %s (last extern referer)\n", lastExternReferer.data());
response.redirect(lastExternReferer); response.redirect(lastExternReferer);
} else if(refererString != "" && } else if(refererString != "" &&
refererString.find("login") == std::string::npos && refererString.find("login") == std::string::npos &&
refererString.find("logout") == std::string::npos && refererString.find("logout") == std::string::npos &&
refererString.find("user_delete") == std::string::npos && refererString.find("user_delete") == std::string::npos &&
refererString != ServerConfig::g_serverPath + request.getURI()) { refererString != ServerConfig::g_serverPath + request.getURI() &&
refererString != user->getGroupBaseUrl() + request.getURI()) {
std::string uri = request.getURI(); std::string uri = request.getURI();
printf("request uri: %s, redirect to: %s\n", uri.data(), refererString.data()); printf("request uri: %s, redirect to: %s\n", uri.data(), refererString.data());
response.redirect(refererString); response.redirect(refererString);
} else { } else {
//printf("redirect to: %s\n", ServerConfig::g_php_serverPath.data()); printf("redirect to: %s/\n", user->getGroupBaseUrl().data());
response.redirect(user->getGroupBaseUrl() + "/"); response.redirect(user->getGroupBaseUrl() + "/");
} }
return; return;
@ -258,11 +259,11 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << " </div>"; responseStream << " </div>";
// end include header.cpsp // end include header.cpsp
responseStream << "\n"; responseStream << "\n";
#line 170 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" #line 171 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( getErrorsHtml() ); responseStream << ( getErrorsHtml() );
responseStream << "\n"; responseStream << "\n";
responseStream << "<!--<input type=\"hidden\" name=\"lang\" value=\""; responseStream << "<!--<input type=\"hidden\" name=\"lang\" value=\"";
#line 171 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" #line 172 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( LanguageManager::keyForLanguage(lang) ); responseStream << ( LanguageManager::keyForLanguage(lang) );
responseStream << "\">-->\n"; responseStream << "\">-->\n";
responseStream << "<div class=\"center-form-container\">\n"; responseStream << "<div class=\"center-form-container\">\n";
@ -296,22 +297,22 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << "\n"; responseStream << "\n";
responseStream << " <div class=\"center-form-form\">\n"; responseStream << " <div class=\"center-form-form\">\n";
responseStream << "\t\t<form action=\""; responseStream << "\t\t<form action=\"";
#line 175 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" #line 176 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( ServerConfig::g_serverPath ); responseStream << ( ServerConfig::g_serverPath );
responseStream << "/\" method=\"POST\">\n"; responseStream << "/\" method=\"POST\">\n";
responseStream << "\t\t\t<input class=\"form-control\" type=\"text\" name=\"login-email\" placeholder=\""; responseStream << "\t\t\t<input class=\"form-control\" type=\"text\" name=\"login-email\" placeholder=\"";
#line 176 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" #line 177 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("E-Mail") ); responseStream << ( langCatalog->gettext("E-Mail") );
responseStream << "\" value=\""; responseStream << "\" value=\"";
#line 176 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" #line 177 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( presetEmail ); responseStream << ( presetEmail );
responseStream << "\"/>\n"; responseStream << "\"/>\n";
responseStream << "\t\t\t<input class=\"form-control\" type=\"password\" name=\"login-password\" placeholder=\""; responseStream << "\t\t\t<input class=\"form-control\" type=\"password\" name=\"login-password\" placeholder=\"";
#line 177 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" #line 178 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("Password") ); responseStream << ( langCatalog->gettext("Password") );
responseStream << "\" />\n"; responseStream << "\" />\n";
responseStream << "\t\t <button type=\"submit\" name=\"submit\" class=\"center-form-submit form-button\">"; responseStream << "\t\t <button type=\"submit\" name=\"submit\" class=\"center-form-submit form-button\">";
#line 178 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" #line 179 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext(" Login ") ); responseStream << ( langCatalog->gettext(" Login ") );
responseStream << "</button>\n"; responseStream << "</button>\n";
responseStream << "\t\t</form>\n"; responseStream << "\t\t</form>\n";
@ -319,7 +320,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << " <div class=\"center-form-bottom\">\n"; responseStream << " <div class=\"center-form-bottom\">\n";
responseStream << " <div class=\"signup-link\">\n"; responseStream << " <div class=\"signup-link\">\n";
responseStream << "\t <p>"; responseStream << "\t <p>";
#line 183 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" #line 184 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("You haven't any account yet? Please follow the link to create one.") ); responseStream << ( langCatalog->gettext("You haven't any account yet? Please follow the link to create one.") );
responseStream << "</p>\n"; responseStream << "</p>\n";
responseStream << "\t <a href=\""; responseStream << "\t <a href=\"";
@ -327,17 +328,17 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net::
responseStream << ( ServerConfig::g_serverPath ); responseStream << ( ServerConfig::g_serverPath );
responseStream << "/registerDirect\">\n"; responseStream << "/registerDirect\">\n";
responseStream << "\t\t\t"; responseStream << "\t\t\t";
#line 185 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" #line 186 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("Create New Account") ); responseStream << ( langCatalog->gettext("Create New Account") );
responseStream << "\n"; responseStream << "\n";
responseStream << "\t\t </a>\n"; responseStream << "\t\t </a>\n";
responseStream << "\t </div>\n"; responseStream << "\t </div>\n";
responseStream << "\t\t<div class=\"reset-pwd-link\">\n"; responseStream << "\t\t<div class=\"reset-pwd-link\">\n";
responseStream << "\t\t\t<a href=\""; responseStream << "\t\t\t<a href=\"";
#line 189 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" #line 190 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( ServerConfig::g_serverPath ); responseStream << ( ServerConfig::g_serverPath );
responseStream << "/resetPassword\">"; responseStream << "/resetPassword\">";
#line 189 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp" #line 190 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\login.cpsp"
responseStream << ( langCatalog->gettext("Passwort vergessen") ); responseStream << ( langCatalog->gettext("Passwort vergessen") );
responseStream << "</a>\n"; responseStream << "</a>\n";
responseStream << "\t\t</div>\n"; responseStream << "\t\t</div>\n";

11
src/cpp/controller/User.cpp
View File

@ -523,18 +523,24 @@ namespace controller {
std::string User::getGroupBaseUrl() std::string User::getGroupBaseUrl()
{ {
UNIQUE_LOCK; UNIQUE_LOCK;
static const char* function_name = "User::getGroupBaseUrl";
if (mGroupBaseUrl != "") { if (mGroupBaseUrl != "") {
printf("[%s] return saved group base Url: %s\n", function_name, mGroupBaseUrl.data());
return mGroupBaseUrl; return mGroupBaseUrl;
} }
static const char* function_name = "User::getGroupBaseUrl";
auto model = getModel(); auto model = getModel();
if (!model->getGroupId()) return ServerConfig::g_php_serverPath; if (!model->getGroupId()) {
printf("[%s] return ServerConfig::g_php_serverPath because no group id\n", function_name);
return ServerConfig::g_php_serverPath;
}
auto servers = controller::NodeServer::load(model::table::NODE_SERVER_GRADIDO_COMMUNITY, model->getGroupId()); auto servers = controller::NodeServer::load(model::table::NODE_SERVER_GRADIDO_COMMUNITY, model->getGroupId());
if (!servers.size()) { if (!servers.size()) {
auto group = controller::Group::load(model->getGroupId()); auto group = controller::Group::load(model->getGroupId());
if (!group.isNull()) { if (!group.isNull()) {
auto group_model = group->getModel(); auto group_model = group->getModel();
mGroupBaseUrl = group_model->getUrl() + group_model->getHome(); mGroupBaseUrl = group_model->getUrl() + group_model->getHome();
printf("[%s] return group base Url: %s from Group\n", function_name, mGroupBaseUrl.data());
return mGroupBaseUrl; return mGroupBaseUrl;
} }
return ServerConfig::g_php_serverPath; return ServerConfig::g_php_serverPath;
@ -546,6 +552,7 @@ namespace controller {
return ServerConfig::g_php_serverPath; return ServerConfig::g_php_serverPath;
} }
mGroupBaseUrl = servers[0]->getBaseUri(); mGroupBaseUrl = servers[0]->getBaseUri();
printf("[%s] return group base Url: %s from NodeServer\n", function_name, mGroupBaseUrl.data());
return mGroupBaseUrl; return mGroupBaseUrl;
} }

7
src/cpsp/login.cpsp
View File

@ -144,18 +144,19 @@
refererString = referer->second; refererString = referer->second;
} }
if(lastExternReferer != "") { if(lastExternReferer != "") {
//printf("redirect to: %s\n", lastExternReferer.data()); printf("redirect to: %s (last extern referer)\n", lastExternReferer.data());
response.redirect(lastExternReferer); response.redirect(lastExternReferer);
} else if(refererString != "" && } else if(refererString != "" &&
refererString.find("login") == std::string::npos && refererString.find("login") == std::string::npos &&
refererString.find("logout") == std::string::npos && refererString.find("logout") == std::string::npos &&
refererString.find("user_delete") == std::string::npos && refererString.find("user_delete") == std::string::npos &&
refererString != ServerConfig::g_serverPath + request.getURI()) { refererString != ServerConfig::g_serverPath + request.getURI() &&
refererString != user->getGroupBaseUrl() + request.getURI()) {
std::string uri = request.getURI(); std::string uri = request.getURI();
printf("request uri: %s, redirect to: %s\n", uri.data(), refererString.data()); printf("request uri: %s, redirect to: %s\n", uri.data(), refererString.data());
response.redirect(refererString); response.redirect(refererString);
} else { } else {
//printf("redirect to: %s\n", ServerConfig::g_php_serverPath.data()); printf("redirect to: %s/\n", user->getGroupBaseUrl().data());
response.redirect(user->getGroupBaseUrl() + "/"); response.redirect(user->getGroupBaseUrl() + "/");
} }
return; return;