Skip to content

fix: http header keys are case in-sensitive #11993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: http header keys are case in-sensitive #11993

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
809dd2f
fix: http header keys are case in-sensitive
DeepDiver1975 Nov 25, 2024
9fa0017
Merge branch 'master' into fix/httplogger-content-type-qt6.8
DeepDiver1975 Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions src/libsync/httplogger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ struct HttpContext
bool send = false;
};

void logHttp(const QByteArray &verb, HttpContext *ctx, QJsonObject &&header, QIODevice *device, bool cached = false)
void logHttp(const QByteArray &verb, const QHttpHeaders &headers, HttpContext *ctx, QJsonObject &&header, QIODevice *device, bool cached = false)
{
static const bool redact = !qEnvironmentVariableIsSet("OWNCLOUD_HTTPLOGGER_NO_REDACT");
const auto reply = qobject_cast<QNetworkReply *>(device);

if (redact) {
const QString authKey = QStringLiteral("Authorization");
const QString auth = header.value(authKey).toString();
if (!auth.isEmpty()) {
header.insert(authKey, auth.startsWith(QStringLiteral("Bearer ")) ? QStringLiteral("Bearer [redacted]") : QStringLiteral("Basic [redacted]"));
if (headers.contains(QHttpHeaders::WellKnownHeader::Authorization)) {
const auto auth = QString::fromUtf8(headers.value(QHttpHeaders::WellKnownHeader::Authorization));
header.insert(QStringLiteral("Authorization"),
auth.startsWith(QStringLiteral("Bearer ")) ? QStringLiteral("Bearer [redacted]") : QStringLiteral("Basic [redacted]"));
}
}

Expand Down Expand Up @@ -104,19 +104,15 @@ void logHttp(const QByteArray &verb, HttpContext *ctx, QJsonObject &&header, QIO
const auto contentLength = device ? device->size() : 0;
QJsonObject body = {{QStringLiteral("length"), device ? QString::number(contentLength) : QStringLiteral("null")}};
if (contentLength > 0) {
QString contentType = header.value(QStringLiteral("Content-Type")).toString();
if (contentType.isEmpty()) {
contentType = header.value(QStringLiteral("content-type")).toString();
}
const auto contentType = QString::fromUtf8(headers.value(QHttpHeaders::WellKnownHeader::ContentType));
if (isTextBody(contentType)) {
if (!device->isOpen()) {
// should we close it again?
device->open(QIODevice::ReadOnly);
}
Q_ASSERT(device->pos() == 0);
QString data = QString::fromUtf8(device->peek(PeekSize));
if (PeekSize < contentLength)
{
if (PeekSize < contentLength) {
data += QStringLiteral("...(%1 bytes elided)").arg(QString::number(contentLength - PeekSize));
}
body[QStringLiteral("data")] = data;
Expand Down Expand Up @@ -169,7 +165,7 @@ void HttpLogger::logRequest(QNetworkReply *reply, QNetworkAccessManager::Operati
for (const auto &key : request.rawHeaderList()) {
header[QString::fromUtf8(key)] = QString::fromUtf8(request.rawHeader(key));
}
logHttp(requestVerb(operation, request), ctx, std::move(header), device, cached);
logHttp(requestVerb(operation, request), request.headers(), ctx, std::move(header), device, cached);
};
QObject::connect(reply, &QNetworkReply::requestSent, reply, logSend, Qt::DirectConnection);
QObject::connect(reply, &QNetworkReply::errorOccurred, reply, logError, Qt::DirectConnection);
Expand All @@ -186,7 +182,7 @@ void HttpLogger::logRequest(QNetworkReply *reply, QNetworkAccessManager::Operati
for (const auto &[key, value] : reply->rawHeaderPairs()) {
header[QString::fromUtf8(key)] = QString::fromUtf8(value);
}
logHttp(requestVerb(*reply), ctx.get(), std::move(header), reply);
logHttp(requestVerb(*reply), reply->headers(), ctx.get(), std::move(header), reply);
},
Qt::DirectConnection);
}
Expand Down
Loading