Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 19:02:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kio: new KHTTP::setServerID() setter

Browse source 
because authentication is done before calling the virtual KHTTP::responed()
method which means that Server header set in the headers from it would have
no effect

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-12-25 18:33:02 +02:00
parent 11e4eacc8e
commit 046d5caaee
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
kio/kio/khttp.cpp
View file

@ -246,15 +246,14 @@ static QByteArray HTTPStatusToContent(const ushort httpstatus)
return httpdata; return httpdata;
} }
static KHTTPHeaders HTTPHeaders(const bool authenticate) static KHTTPHeaders HTTPHeaders(const QString &serverid, const bool authenticate)
{ {
KHTTPHeaders khttpheaders; KHTTPHeaders khttpheaders;
const QString httpserver = QCoreApplication::applicationName(); khttpheaders.insert("Server", serverid.toAscii());
khttpheaders.insert("Server", httpserver.toAscii());
const QString httpdate = QDateTime::currentDateTimeUtc().toString("ddd, dd MMM yyyy hh:mm:ss") + QLatin1String(" GMT"); const QString httpdate = QDateTime::currentDateTimeUtc().toString("ddd, dd MMM yyyy hh:mm:ss") + QLatin1String(" GMT");
khttpheaders.insert("Date", httpdate.toAscii()); khttpheaders.insert("Date", httpdate.toAscii());
if (authenticate) { if (authenticate) {
const QString httpauthenticate = QString::fromLatin1("Basic realm=") + httpserver; const QString httpauthenticate = QString::fromLatin1("Basic realm=") + serverid;
khttpheaders.insert("WWW-Authenticate", httpauthenticate.toAscii()); khttpheaders.insert("WWW-Authenticate", httpauthenticate.toAscii());
} }
return khttpheaders; return khttpheaders;
@ -352,6 +351,7 @@ private Q_SLOTS:
void slotNewConnection(); void slotNewConnection();
public: public:
QString serverid;
QByteArray authusername; QByteArray authusername;
QByteArray authpassword; QByteArray authpassword;
QString errorstring; QString errorstring;
@ -365,6 +365,8 @@ KHTTPPrivate::KHTTPPrivate(QObject *parent)
: QObject(parent), : QObject(parent),
tcpserver(nullptr) tcpserver(nullptr)
{ {
serverid = QCoreApplication::applicationName();
// NOTE: the default maximum for pending connections is 30 // NOTE: the default maximum for pending connections is 30
tcpserver = new QTcpServer(this); tcpserver = new QTcpServer(this);
connect(tcpserver, SIGNAL(newConnection()), this, SLOT(slotNewConnection())); connect(tcpserver, SIGNAL(newConnection()), this, SLOT(slotNewConnection()));
@ -398,7 +400,7 @@ void KHTTPPrivate::slotNewConnection()
khttpheadersparser.parseHeaders(clientdata, requiresauthorization); khttpheadersparser.parseHeaders(clientdata, requiresauthorization);
// qDebug() << Q_FUNC_INFO << "url" << khttpheadersparser.path(); // qDebug() << Q_FUNC_INFO << "url" << khttpheadersparser.path();
KHTTPHeaders khttpheaders = HTTPHeaders(requiresauthorization); KHTTPHeaders khttpheaders = HTTPHeaders(serverid, requiresauthorization);
if (requiresauthorization && if (requiresauthorization &&
(khttpheadersparser.authUser() != authusername || khttpheadersparser.authPass() != authpassword)) { (khttpheadersparser.authUser() != authusername || khttpheadersparser.authPass() != authpassword)) {
writeResponse(401, true, client); writeResponse(401, true, client);
@ -467,7 +469,7 @@ void KHTTPPrivate::slotNewConnection()
void KHTTPPrivate::writeResponse(const ushort httpstatus, const bool authenticate, QTcpSocket *client) void KHTTPPrivate::writeResponse(const ushort httpstatus, const bool authenticate, QTcpSocket *client)
{ {
kDebug(s_khttpdebugarea) << "sending status to client" << httpstatus << client->peerAddress() << client->peerPort(); kDebug(s_khttpdebugarea) << "sending status to client" << httpstatus << client->peerAddress() << client->peerPort();
KHTTPHeaders khttpheaders = HTTPHeaders(authenticate); KHTTPHeaders khttpheaders = HTTPHeaders(serverid, authenticate);
const QByteArray contentdata = HTTPStatusToContent(httpstatus); const QByteArray contentdata = HTTPStatusToContent(httpstatus);
const QByteArray httpdata = HTTPData(httpstatus, khttpheaders, contentdata.size()); const QByteArray httpdata = HTTPData(httpstatus, khttpheaders, contentdata.size());
client->write(httpdata); client->write(httpdata);
@ -492,6 +494,11 @@ KHTTP::~KHTTP()
delete d; delete d;
} }
void KHTTP::setServerID(const QString &id)
{
d->serverid = id;
}
bool KHTTP::setAuthenticate(const QByteArray &username, const QByteArray &password) bool KHTTP::setAuthenticate(const QByteArray &username, const QByteArray &password)
{ {
d->errorstring.clear(); d->errorstring.clear();

6
kio/kio/khttp.h
View file

@ -53,6 +53,12 @@ public:
KHTTP(QObject *parent = nullptr); KHTTP(QObject *parent = nullptr);
~KHTTP(); ~KHTTP();
/*!
@brief Sets the server ID to @p id
@note The ID is @p QApplication::applicationName() by default
*/
void setServerID(const QString &id);
/*! /*!
@brief Sets @p username and @p password to be used for authentication. @brief Sets @p username and @p password to be used for authentication.
@note The authentication method used is basic. @note The authentication method used is basic.