haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wsd: remove duplicate Server and Date headers 

We always create http::Response instances
with these headers. These explicit entries
are vestiges from Poco sockets.

Change-Id: I65c263e95b253e22e4e6deae57fffc5616311c84
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
pull/8581/head
Ashod Nakashian 2024-03-16 07:19:20 -04:00 committed by Ashod Nakashian
parent 00d483f67d
commit 7fb6ccf4ee
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/Socket.cpp
View File

@ -811,8 +811,9 @@ void StreamSocket::dumpState(std::ostream& os)
void StreamSocket::sendWithDateAndAgent(http::Response& response)
{
response.set("Server", http::getServerString());
response.set("Date", Util::getHttpTimeNow());
assert(response.get("Server") == http::getServerString() &&
"Server Agent is always set in http::Response ctor");
assert(!response.get("Date").empty() && "Date is always set in http::Response ctor");
send(response);
}

1
wsd/ClientRequestDispatcher.cpp
View File

@ -654,7 +654,6 @@ void ClientRequestDispatcher::handleIncomingMessage(SocketDisposition& dispositi
response->add("X-XSS-Protection", "1; mode=block");
// No referrer-policy
response->add("Referrer-Policy", "no-referrer");
response->set("Server", http::getServerString());
response->add("Content-Type", "text/plain");
response->add("X-Content-Type-Options", "nosniff");

5
wsd/FileServer.cpp
View File

@ -691,9 +691,6 @@ void FileServerRequestHandler::handleRequest(const HTTPRequest& request,
}
}
response.set("Server", http::getServerString());
response.set("Date", Util::getHttpTimeNow());
#if !MOBILEAPP
if (COOLWSD::WASMState != COOLWSD::WASMActivationState::Disabled &&
relPath.find("wasm") != std::string::npos)
@ -1555,8 +1552,6 @@ void FileServerRequestHandler::preprocessWelcomeFile(const HTTPRequest& request,
// No referrer-policy
httpResponse.add("Referrer-Policy", "no-referrer");
httpResponse.add("X-Content-Type-Options", "nosniff");
httpResponse.set("Server", http::getServerString());
httpResponse.set("Date", Util::getHttpTimeNow());
httpResponse.setBody(std::move(templateWelcome));
socket->send(httpResponse);

2
wsd/ProxyRequestHandler.cpp
View File

@ -65,8 +65,6 @@ void ProxyRequestHandler::handleRequest(const std::string& relPath,
CacheFileHash[httpSession->getUrl()] = httpResponse;
httpResponse->add("Server", http::getServerString());
httpResponse->add("Date", Util::getHttpTimeNow());
socket->sendAndShutdown(*httpResponse);
}
else