From 7031c3b0ceaa29710328e55bfdb2ba1fd7329c81 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 20 Feb 2024 17:23:58 +0000 Subject: [PATCH] cool#8328 - config header fixup. config.h should be included as the 1st line in each source file. It should not be included in headers. config_version.h which changes on every commit should not be included widely - so remove it from the HttpRequest heeader to save tinderbox's ccache. Fetch version info from helper methods rather than in-lining via defines, to better encapsulate. Signed-off-by: Michael Meeks Change-Id: If449a36f1ac61940f04d70d5f4180db389d9b4c4 --- common/Common.hpp | 9 --------- common/DummyTraceEventEmitter.cpp | 2 ++ common/MobileApp.cpp | 2 ++ common/MobileApp.hpp | 2 -- common/Simd.hpp | 2 -- common/StringVector.cpp | 2 ++ common/TraceEvent.cpp | 2 ++ common/Util.hpp | 2 -- kit/DeltaSimd.c | 3 ++- net/FakeSocket.cpp | 2 ++ net/HttpHelper.cpp | 2 +- net/HttpRequest.cpp | 2 +- net/HttpRequest.hpp | 9 +++++---- net/Socket.cpp | 19 +++++++++++++++++-- net/WebSocketHandler.hpp | 2 +- test/HttpTestServer.hpp | 2 +- test/RequestDetailsTests.cpp | 23 ++++++++++++----------- test/WopiTestServer.hpp | 2 -- test/integration-http-server.cpp | 1 + tools/ConfigMigrationAssistant.cpp | 2 ++ wsd/COOLWSD.cpp | 8 ++++---- wsd/ClientSession.cpp | 6 +++--- wsd/DocumentBroker.cpp | 2 +- wsd/Exceptions.cpp | 2 ++ wsd/FileServer.cpp | 8 ++++---- wsd/HostUtil.cpp | 3 ++- wsd/ProxyProtocol.cpp | 6 +++--- wsd/ProxyRequestHandler.cpp | 2 +- wsd/Storage.cpp | 2 +- wsd/StorageConnectionManager.cpp | 2 +- wsd/coolwsd-fork.cpp | 2 ++ wsd/coolwsd-inproc.cpp | 2 ++ 32 files changed, 79 insertions(+), 58 deletions(-) diff --git a/common/Common.hpp b/common/Common.hpp index 1938ba115a..252a3a4cea 100644 --- a/common/Common.hpp +++ b/common/Common.hpp @@ -77,15 +77,6 @@ constexpr const char UPLOADING_SUFFIX[] = "ing"; /// the code: they are logical execution unit names. #define SHARED_DOC_THREADNAME_SUFFIX "broker_" -/// The HTTP request User-Agent. Used only in Requests. -#define HTTP_AGENT_STRING "COOLWSD HTTP Agent " COOLWSD_VERSION - -/// The WOPI User-Agent. Depricated: use HTTP_AGENT_STRING. -#define WOPI_AGENT_STRING HTTP_AGENT_STRING - -/// The HTTP response Server. Used only in Responses. -#define HTTP_SERVER_STRING "COOLWSD HTTP Server " COOLWSD_VERSION - /// The client port number, both coolwsd and the kits have this. extern int ClientPortNumber; extern std::string MasterLocation; diff --git a/common/DummyTraceEventEmitter.cpp b/common/DummyTraceEventEmitter.cpp index a7dbb712c3..0e36bb9b1e 100644 --- a/common/DummyTraceEventEmitter.cpp +++ b/common/DummyTraceEventEmitter.cpp @@ -11,6 +11,8 @@ // Compile and link this into test and utility executables that need it to link +#include "config.h" + #include void TraceEvent::emitOneRecordingIfEnabled(const std::string &recording) diff --git a/common/MobileApp.cpp b/common/MobileApp.cpp index a609416f51..e04600fe0d 100644 --- a/common/MobileApp.cpp +++ b/common/MobileApp.cpp @@ -9,6 +9,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "config.h" + #include #include #include diff --git a/common/MobileApp.hpp b/common/MobileApp.hpp index dc0fc48fab..0787a778e4 100644 --- a/common/MobileApp.hpp +++ b/common/MobileApp.hpp @@ -11,8 +11,6 @@ #pragma once -#include "config.h" - #if MOBILEAPP #include diff --git a/common/Simd.hpp b/common/Simd.hpp index 7283d52042..9a139e3422 100644 --- a/common/Simd.hpp +++ b/common/Simd.hpp @@ -11,8 +11,6 @@ #pragma once -#include - namespace simd { bool init(); extern bool HasAVX2; diff --git a/common/StringVector.cpp b/common/StringVector.cpp index 2a34442643..60f9f18d67 100644 --- a/common/StringVector.cpp +++ b/common/StringVector.cpp @@ -5,6 +5,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "config.h" + #include "StringVector.hpp" #include "Util.hpp" diff --git a/common/TraceEvent.cpp b/common/TraceEvent.cpp index e4a87e317c..c9a6585a95 100644 --- a/common/TraceEvent.cpp +++ b/common/TraceEvent.cpp @@ -8,6 +8,8 @@ // To build a freestanding test executable for just Tracevent: // clang++ -Wall -Wextra -DTEST_TRACEEVENT_EXE TraceEvent.cpp -o TraceEvent -pthread +#include "config.h" + #include #include #include diff --git a/common/Util.hpp b/common/Util.hpp index dd8353dbef..e7f3a6f975 100644 --- a/common/Util.hpp +++ b/common/Util.hpp @@ -11,8 +11,6 @@ #pragma once -#include - #include #include #include diff --git a/kit/DeltaSimd.c b/kit/DeltaSimd.c index 49d5b040f9..ae678cdadb 100644 --- a/kit/DeltaSimd.c +++ b/kit/DeltaSimd.c @@ -10,7 +10,8 @@ // versions of inlined code that get injected outside of this // module by the linker. -#include +#include "config.h" + #include #include #include diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp index a033a74c7d..a92f7c5973 100644 --- a/net/FakeSocket.cpp +++ b/net/FakeSocket.cpp @@ -9,6 +9,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "config.h" + #include #include #include diff --git a/net/HttpHelper.cpp b/net/HttpHelper.cpp index 206e284ef3..5388a5b873 100644 --- a/net/HttpHelper.cpp +++ b/net/HttpHelper.cpp @@ -33,7 +33,7 @@ void sendError(http::StatusCode errorCode, const std::shared_ptr& std::ostringstream oss; oss << "HTTP/1.1 " << errorCode << "\r\n" << "Date: " << Util::getHttpTimeNow() << "\r\n" - << "User-Agent: " << WOPI_AGENT_STRING << "\r\n" + << "User-Agent: " << http::getAgentString() << "\r\n" << "Content-Length: " << body.size() << "\r\n" << extraHeader << "\r\n" << body; diff --git a/net/HttpRequest.cpp b/net/HttpRequest.cpp index 64e9dde63b..afec1381e5 100644 --- a/net/HttpRequest.cpp +++ b/net/HttpRequest.cpp @@ -9,7 +9,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include "config.h" #include "HttpRequest.hpp" diff --git a/net/HttpRequest.hpp b/net/HttpRequest.hpp index 0a47b8ef8b..fba7bbdb4a 100644 --- a/net/HttpRequest.hpp +++ b/net/HttpRequest.hpp @@ -11,8 +11,6 @@ #pragma once -#include - #include #include #include @@ -326,6 +324,9 @@ static inline const char* getReasonPhraseForCode(StatusCode statusCode) return getReasonPhraseForCode(static_cast(statusCode)); } +std::string getAgentString(); +std::string getServerString(); + /// The callback signature for handling IO writes. /// Returns the number of bytes read from the buffer, /// -1 for error (terminates the transfer). @@ -822,7 +823,7 @@ public: , _fd(fd) { _header.add("Date", Util::getHttpTimeNow()); - _header.add("Server", HTTP_SERVER_STRING); + _header.add("Server", http::getServerString()); } /// A response sent from a server. @@ -1358,7 +1359,7 @@ private: } _request.set("Host", host); // Make sure the host is set. _request.set("Date", Util::getHttpTimeNow()); - _request.set("User-Agent", HTTP_AGENT_STRING); + _request.set("User-Agent", http::getAgentString()); } void onConnect(const std::shared_ptr& socket) override diff --git a/net/Socket.cpp b/net/Socket.cpp index 1d13911a3c..79c362e042 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -9,7 +9,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include "config.h" +#include "config_version.h" #include "Socket.hpp" #include "TraceEvent.hpp" @@ -753,7 +754,7 @@ void StreamSocket::dumpState(std::ostream& os) void StreamSocket::send(Poco::Net::HTTPResponse& response) { - response.set("Server", HTTP_SERVER_STRING); + response.set("Server", http::getServerString()); response.set("Date", Util::getHttpTimeNow()); std::ostringstream oss; @@ -1317,4 +1318,18 @@ bool StreamSocket::sniffSSL() const #endif // !MOBILEAPP +// Required by Android and iOS apps. +namespace http +{ + std::string getAgentString() + { + return "COOLWSD HTTP Agent " COOLWSD_VERSION; + } + + std::string getServerString() + { + return "COOLWSD HTTP Server " COOLWSD_VERSION; + } +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp index 1f6617539e..17a33cd595 100644 --- a/net/WebSocketHandler.hpp +++ b/net/WebSocketHandler.hpp @@ -156,7 +156,7 @@ public: req.set("Host", hostAndPort); // Make sure the host is set. req.set("Date", Util::getHttpTimeNow()); - req.set("User-Agent", HTTP_AGENT_STRING); + req.set("User-Agent", http::getAgentString()); req.set("Connection", "Upgrade"); req.set("Upgrade", "websocket"); diff --git a/test/HttpTestServer.hpp b/test/HttpTestServer.hpp index 2601b0ef3e..9d629793db 100644 --- a/test/HttpTestServer.hpp +++ b/test/HttpTestServer.hpp @@ -19,7 +19,7 @@ #include #include -#ifndef COOLWSD_VERSION +#ifndef APP_NAME static_assert(false, "config.h must be included in the .cpp being compiled"); #endif diff --git a/test/RequestDetailsTests.cpp b/test/RequestDetailsTests.cpp index dcf91877fb..ad9606ac66 100644 --- a/test/RequestDetailsTests.cpp +++ b/test/RequestDetailsTests.cpp @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -144,7 +145,7 @@ void RequestDetailsTests::testLocal() Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, URI, Poco::Net::HTTPMessage::HTTP_1_1); request.setHost(Root); - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); request.set("ProxyPrefix", ProxyPrefix); RequestDetails details(request, ""); @@ -191,7 +192,7 @@ void RequestDetailsTests::testLocal() Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, URI, Poco::Net::HTTPMessage::HTTP_1_1); request.setHost(Root); - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); request.set("ProxyPrefix", ProxyPrefix); RequestDetails details(request, ""); @@ -236,7 +237,7 @@ void RequestDetailsTests::testLocal() Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, URI, Poco::Net::HTTPMessage::HTTP_1_1); request.setHost(Root); - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); request.set("ProxyPrefix", ProxyPrefix); RequestDetails details(request, ""); @@ -294,7 +295,7 @@ void RequestDetailsTests::testLocalHexified() Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, URI, Poco::Net::HTTPMessage::HTTP_1_1); request.setHost(Root); - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); request.set("ProxyPrefix", ProxyPrefix); RequestDetails details(request, ""); @@ -334,7 +335,7 @@ void RequestDetailsTests::testLocalHexified() Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, URI, Poco::Net::HTTPMessage::HTTP_1_1); request.setHost(Root); - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); request.set("ProxyPrefix", ProxyPrefix); RequestDetails details(request, ""); @@ -372,7 +373,7 @@ void RequestDetailsTests::testLocalHexified() Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, URI, Poco::Net::HTTPMessage::HTTP_1_1); request.setHost(Root); - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); request.set("ProxyPrefix", ProxyPrefix); RequestDetails details(request, ""); @@ -435,7 +436,7 @@ void RequestDetailsTests::testRequestDetails() Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, URI, Poco::Net::HTTPMessage::HTTP_1_1); request.setHost(Root); - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); request.set("ProxyPrefix", ProxyPrefix); RequestDetails details(request, ""); @@ -534,7 +535,7 @@ void RequestDetailsTests::testRequestDetails() Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, URI, Poco::Net::HTTPMessage::HTTP_1_1); request.setHost(Root); - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); request.set("ProxyPrefix", ProxyPrefix); RequestDetails details(request, ""); @@ -604,7 +605,7 @@ void RequestDetailsTests::testRequestDetails() Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, URI, Poco::Net::HTTPMessage::HTTP_1_1); request.setHost(Root); - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); request.set("ProxyPrefix", ProxyPrefix); RequestDetails details(request, ""); @@ -649,7 +650,7 @@ void RequestDetailsTests::testRequestDetails() Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, URI, Poco::Net::HTTPMessage::HTTP_1_1); request.setHost(Root); - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); request.set("ProxyPrefix", ProxyPrefix); RequestDetails details(request, ""); @@ -698,7 +699,7 @@ void RequestDetailsTests::testRequestDetails() Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, URI, Poco::Net::HTTPMessage::HTTP_1_1); request.setHost(Root); - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); request.set("ProxyPrefix", ProxyPrefix); RequestDetails details(request, ""); diff --git a/test/WopiTestServer.hpp b/test/WopiTestServer.hpp index 01a7ed4a38..9c1968a04d 100644 --- a/test/WopiTestServer.hpp +++ b/test/WopiTestServer.hpp @@ -11,8 +11,6 @@ #pragma once -#include "config.h" - #include "Protocol.hpp" #include "HttpRequest.hpp" #include "helpers.hpp" diff --git a/test/integration-http-server.cpp b/test/integration-http-server.cpp index 155efceb10..e9aa312388 100644 --- a/test/integration-http-server.cpp +++ b/test/integration-http-server.cpp @@ -10,6 +10,7 @@ */ #include +#include #include #include diff --git a/tools/ConfigMigrationAssistant.cpp b/tools/ConfigMigrationAssistant.cpp index 1290e2bb93..dd0a784de4 100644 --- a/tools/ConfigMigrationAssistant.cpp +++ b/tools/ConfigMigrationAssistant.cpp @@ -9,6 +9,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "config.h" + #include #include #include diff --git a/wsd/COOLWSD.cpp b/wsd/COOLWSD.cpp index 96cb3427f5..6b8a56c96e 100644 --- a/wsd/COOLWSD.cpp +++ b/wsd/COOLWSD.cpp @@ -1983,7 +1983,7 @@ private: std::shared_ptr httpSession(StorageBase::getHttpSession(fontUri)); http::Request request(fontUri.getPathAndQuery()); - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); const std::shared_ptr httpResponse = httpSession->syncRequest(request); @@ -2002,7 +2002,7 @@ private: request.set("If-None-Match", oldETag); } - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); const std::shared_ptr httpResponse = httpSession->syncRequest(request); @@ -2027,7 +2027,7 @@ private: request.set("If-None-Match", oldETag); } - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); const std::shared_ptr httpResponse = httpSession->syncRequest(request); @@ -4362,7 +4362,7 @@ private: response->add("X-XSS-Protection", "1; mode=block"); // No referrer-policy response->add("Referrer-Policy", "no-referrer"); - response->set("Server", HTTP_SERVER_STRING); + response->set("Server", http::getServerString()); response->add("Content-Type", "text/plain"); response->add("X-Content-Type-Options", "nosniff"); diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp index c9e888b429..1c3a28ffe1 100644 --- a/wsd/ClientSession.cpp +++ b/wsd/ClientSession.cpp @@ -293,7 +293,7 @@ void ClientSession::handleClipboardRequest(DocumentBroker::ClipboardRequest std::ostringstream oss; oss << "HTTP/1.1 403 Forbidden\r\n" << "Date: " << Util::getHttpTimeNow() << "\r\n" - << "User-Agent: " << WOPI_AGENT_STRING << "\r\n" + << "User-Agent: " << http::getAgentString() << "\r\n" << "Content-Length: 0\r\n" << "Connection: close\r\n" << "\r\n"; @@ -320,7 +320,7 @@ void ClientSession::handleClipboardRequest(DocumentBroker::ClipboardRequest std::ostringstream oss; oss << "HTTP/1.1 200 OK\r\n" << "Date: " << Util::getHttpTimeNow() << "\r\n" - << "User-Agent: " << WOPI_AGENT_STRING << "\r\n" + << "User-Agent: " << http::getAgentString() << "\r\n" << "Content-Length: 0\r\n" << "Connection: close\r\n" << "\r\n"; @@ -1949,7 +1949,7 @@ bool ClientSession::handleKitToClientMessage(const std::shared_ptr& pay std::ostringstream oss; oss << "HTTP/1.1 200 OK\r\n" << "Last-Modified: " << Util::getHttpTimeNow() << "\r\n" - << "User-Agent: " << WOPI_AGENT_STRING << "\r\n" + << "User-Agent: " << http::getAgentString() << "\r\n" << "Content-Length: " << (empty ? 0 : (payload->size() - header)) << "\r\n" << "Content-Type: application/octet-stream\r\n" << "X-Content-Type-Options: nosniff\r\n" diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 00b9f1b88f..8c9d2cdc51 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -3323,7 +3323,7 @@ bool DocumentBroker::lookupSendClipboardTag(const std::shared_ptr std::ostringstream oss; oss << "HTTP/1.1 200 OK\r\n" << "Last-Modified: " << Util::getHttpTimeNow() << "\r\n" - << "User-Agent: " << WOPI_AGENT_STRING << "\r\n" + << "User-Agent: " << http::getAgentString() << "\r\n" << "Content-Length: " << saved->length() << "\r\n" << "Content-Type: application/octet-stream\r\n" << "X-Content-Type-Options: nosniff\r\n" diff --git a/wsd/Exceptions.cpp b/wsd/Exceptions.cpp index d9bb6945f9..6181176b92 100644 --- a/wsd/Exceptions.cpp +++ b/wsd/Exceptions.cpp @@ -9,6 +9,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "config.h" + #include "Exceptions.hpp" #undef EXCEPTION_DECL diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp index d54bf83609..45be632abb 100644 --- a/wsd/FileServer.cpp +++ b/wsd/FileServer.cpp @@ -666,7 +666,7 @@ void FileServerRequestHandler::handleRequest(const HTTPRequest& request, } } - response.set("Server", HTTP_SERVER_STRING); + response.set("Server", http::getServerString()); response.set("Date", Util::getHttpTimeNow()); #if !MOBILEAPP @@ -1399,7 +1399,7 @@ void FileServerRequestHandler::preprocessFile(const HTTPRequest& request, oss << "HTTP/1.1 200 OK\r\n" "Date: " << Util::getHttpTimeNow() << "\r\n" "Last-Modified: " << Util::getHttpTimeNow() << "\r\n" - "User-Agent: " << WOPI_AGENT_STRING << "\r\n" + "User-Agent: " << http::getAgentString() << "\r\n" "Cache-Control:max-age=11059200\r\n" "ETag: \"" COOLWSD_VERSION_HASH "\"\r\n" "Content-Length: " << preprocess.size() << "\r\n" @@ -1523,7 +1523,7 @@ 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_SERVER_STRING); + httpResponse.set("Server", http::getServerString()); httpResponse.set("Date", Util::getHttpTimeNow()); httpResponse.setBody(std::move(templateWelcome)); @@ -1634,7 +1634,7 @@ void FileServerRequestHandler::preprocessAdminFile(const HTTPRequest& request, // No referrer-policy response.add("Referrer-Policy", "no-referrer"); response.add("X-Content-Type-Options", "nosniff"); - response.set("Server", HTTP_SERVER_STRING); + response.set("Server", http::getServerString()); response.set("Date", Util::getHttpTimeNow()); response.setContentType("text/html"); diff --git a/wsd/HostUtil.cpp b/wsd/HostUtil.cpp index 71d9a5289d..0ef3647249 100644 --- a/wsd/HostUtil.cpp +++ b/wsd/HostUtil.cpp @@ -9,11 +9,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "config.h" + #include "HostUtil.hpp" #include #include #include -#include Util::RegexListMatcher HostUtil::WopiHosts; std::map HostUtil::AliasHosts; diff --git a/wsd/ProxyProtocol.cpp b/wsd/ProxyProtocol.cpp index 0de2e498b7..3d8fb36318 100644 --- a/wsd/ProxyProtocol.cpp +++ b/wsd/ProxyProtocol.cpp @@ -59,7 +59,7 @@ void DocumentBroker::handleProxyRequest( std::ostringstream oss; oss << "HTTP/1.1 200 OK\r\n" "Last-Modified: " << Util::getHttpTimeNow() << "\r\n" - "User-Agent: " WOPI_AGENT_STRING "\r\n" + "User-Agent: " << http::getAgentString() << "\r\n" "Content-Length: " << sessionId.size() << "\r\n" "Content-Type: application/json; charset=utf-8\r\n" "X-Content-Type-Options: nosniff\r\n" @@ -217,7 +217,7 @@ void ProxyProtocolHandler::handleRequest(bool isWaiting, const std::shared_ptrsend(oss.str()); @@ -345,7 +345,7 @@ bool ProxyProtocolHandler::flushQueueTo(const std::shared_ptr &soc std::ostringstream oss; oss << "HTTP/1.1 200 OK\r\n" "Last-Modified: " << Util::getHttpTimeNow() << "\r\n" - "User-Agent: " WOPI_AGENT_STRING "\r\n" + "User-Agent: " << http::getAgentString() << "\r\n" "Content-Length: " << totalSize << "\r\n" "Content-Type: application/json; charset=utf-8\r\n" "X-Content-Type-Options: nosniff\r\n" diff --git a/wsd/ProxyRequestHandler.cpp b/wsd/ProxyRequestHandler.cpp index 441e744353..61877bcb37 100644 --- a/wsd/ProxyRequestHandler.cpp +++ b/wsd/ProxyRequestHandler.cpp @@ -65,7 +65,7 @@ void ProxyRequestHandler::handleRequest(const std::string& relPath, CacheFileHash[httpSession->getUrl()] = httpResponse; - httpResponse->add("Server", HTTP_SERVER_STRING); + httpResponse->add("Server", http::getServerString()); httpResponse->add("Date", Util::getHttpTimeNow()); socket->sendAndShutdown(*httpResponse); } diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp index 77ab608e73..5aec66a6dd 100644 --- a/wsd/Storage.cpp +++ b/wsd/Storage.cpp @@ -608,7 +608,7 @@ void LockContext::dumpState(std::ostream& os) const void WopiStorage::initHttpRequest(Poco::Net::HTTPRequest& request, const Poco::URI& uri, const Authorization& auth) const { - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); auth.authorizeRequest(request); diff --git a/wsd/StorageConnectionManager.cpp b/wsd/StorageConnectionManager.cpp index 0795d02e75..b77dd940a1 100644 --- a/wsd/StorageConnectionManager.cpp +++ b/wsd/StorageConnectionManager.cpp @@ -82,7 +82,7 @@ std::map GetQueryParams(const Poco::URI& uri) void initHttpRequest(Poco::Net::HTTPRequest& request, const Poco::URI& uri, const Authorization& auth) { - request.set("User-Agent", WOPI_AGENT_STRING); + request.set("User-Agent", http::getAgentString()); auth.authorizeRequest(request); diff --git a/wsd/coolwsd-fork.cpp b/wsd/coolwsd-fork.cpp index 0aa361b82b..038d5aa713 100644 --- a/wsd/coolwsd-fork.cpp +++ b/wsd/coolwsd-fork.cpp @@ -7,6 +7,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "config.h" + #include "StringVector.hpp" #include "Util.hpp" #include "TraceEvent.hpp" diff --git a/wsd/coolwsd-inproc.cpp b/wsd/coolwsd-inproc.cpp index ea5bc52702..a65f9af3a1 100644 --- a/wsd/coolwsd-inproc.cpp +++ b/wsd/coolwsd-inproc.cpp @@ -7,6 +7,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "config.h" + #include "StringVector.hpp" #include "Util.hpp" #include "COOLWSD.hpp"