Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-23 08:11:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

using static resources for webui

Browse source
This commit is contained in:
csoler 2019-11-24 10:50:58 +01:00
parent c2d47b01df
commit c7af86b4c1
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
2 changed files with 50 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/jsonapi/jsonapi.cpp
View file

@ -454,8 +454,8 @@ bool JsonApiServer::isAuthTokenValid(const std::string& token)
auto it = mAuthTokenStorage.mAuthorizedTokens.find(user); auto it = mAuthTokenStorage.mAuthorizedTokens.find(user);
if(it == mAuthTokenStorage.mAuthorizedTokens.end()) if(it == mAuthTokenStorage.mAuthorizedTokens.end())
return false; return false;
// attempt avoiding +else CRYPTO_memcmp+ being optimized away // attempt avoiding +else CRYPTO_memcmp+ being optimized away
int noOptimiz = 1; int noOptimiz = 1;

98
libretroshare/src/rsserver/p3webui.cc
View file

@ -106,56 +106,59 @@ static void service_ready_handler( restbed::Service& )
std::vector<std::shared_ptr<restbed::Resource> > p3WebUI::getResources() const std::vector<std::shared_ptr<restbed::Resource> > p3WebUI::getResources() const
{ {
std::vector<std::shared_ptr<restbed::Resource> > rtab; static std::vector<std::shared_ptr<restbed::Resource> > rtab;
auto resource1 = std::make_shared< restbed::Resource >( ); if(rtab.empty())
resource1->set_paths( { {
"/{filename: index.html}", auto resource1 = std::make_shared< restbed::Resource >( );
"/{filename: app.js}", resource1->set_paths( {
} "/{filename: index.html}",
); "/{filename: app.js}",
resource1->set_method_handler( "GET", handler<TEXT_HTML>::get_handler ); }
);
resource1->set_method_handler( "GET", handler<TEXT_HTML>::get_handler );
auto resource2 = std::make_shared< restbed::Resource >(); auto resource2 = std::make_shared< restbed::Resource >();
resource2->set_paths( { resource2->set_paths( {
"/{dir: css}/{filename: fontawesome.css}", "/{dir: css}/{filename: fontawesome.css}",
"/{dir: css}/{filename: solid.css}", "/{dir: css}/{filename: solid.css}",
"/{filename: app.css}", "/{filename: app.css}",
} ); } );
resource2->set_method_handler( "GET", handler<TEXT_CSS>::get_handler ); resource2->set_method_handler( "GET", handler<TEXT_CSS>::get_handler );
auto resource3 = std::make_shared< restbed::Resource >(); auto resource3 = std::make_shared< restbed::Resource >();
resource3->set_paths( { resource3->set_paths( {
"/{dir: data}/{filename: retroshare.svg}", "/{dir: data}/{filename: retroshare.svg}",
"/{dir: webfonts}/{filename: fa-solid-900.svg}", "/{dir: webfonts}/{filename: fa-solid-900.svg}",
} ); } );
resource3->set_method_handler( "GET", handler<TEXT_SVG>::get_handler ); resource3->set_method_handler( "GET", handler<TEXT_SVG>::get_handler );
auto resource4 = std::make_shared< restbed::Resource >(); auto resource4 = std::make_shared< restbed::Resource >();
resource4->set_paths( { resource4->set_paths( {
"/{dir: webfonts}/{filename: fa-solid-900.ttf}", "/{dir: webfonts}/{filename: fa-solid-900.ttf}",
} ); } );
resource4->set_method_handler( "GET", handler<TEXT_TTF>::get_handler ); resource4->set_method_handler( "GET", handler<TEXT_TTF>::get_handler );
auto resource5 = std::make_shared< restbed::Resource >(); auto resource5 = std::make_shared< restbed::Resource >();
resource5->set_paths( { resource5->set_paths( {
"/{dir: webfonts}/{filename: fa-solid-900.woff}", "/{dir: webfonts}/{filename: fa-solid-900.woff}",
"/{dir: webfonts}/{filename: fa-solid-900.woff2}", "/{dir: webfonts}/{filename: fa-solid-900.woff2}",
} ); } );
resource5->set_method_handler( "GET", handler<TEXT_WOFF>::get_handler ); resource5->set_method_handler( "GET", handler<TEXT_WOFF>::get_handler );
auto resource6 = std::make_shared< restbed::Resource >(); auto resource6 = std::make_shared< restbed::Resource >();
resource6->set_paths( { resource6->set_paths( {
"/{dir: webfonts}/{filename: fa-solid-900.eot}", "/{dir: webfonts}/{filename: fa-solid-900.eot}",
} ); } );
resource6->set_method_handler( "GET", handler<APPLICATION_OCTET_STREAM>::get_handler ); resource6->set_method_handler( "GET", handler<APPLICATION_OCTET_STREAM>::get_handler );
rtab.push_back(resource1); rtab.push_back(resource1);
rtab.push_back(resource2); rtab.push_back(resource2);
rtab.push_back(resource3); rtab.push_back(resource3);
rtab.push_back(resource4); rtab.push_back(resource4);
rtab.push_back(resource5); rtab.push_back(resource5);
rtab.push_back(resource6); rtab.push_back(resource6);
}
return rtab; return rtab;
} }
@ -189,18 +192,13 @@ void p3WebUI::setUserPassword(const std::string& passwd)
bool p3WebUI::restart() bool p3WebUI::restart()
{ {
rsJsonAPI->registerResourceProvider(this); rsJsonAPI->registerResourceProvider(this);
return true;
return rsJsonAPI->restart();
} }
bool p3WebUI::stop() bool p3WebUI::stop()
{ {
rsJsonAPI->unregisterResourceProvider(this); rsJsonAPI->unregisterResourceProvider(this);
return true;
if(rsJsonAPI->status()==RsJsonAPI::JSONAPI_STATUS_RUNNING)
return rsJsonAPI->restart();
else
return true;
} }