AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add function to QAuthenticatorPrivate to check method support

Browse Source 
To see if a certain method is supported. To be used in an upcoming patch.

Change-Id: I1a5c2f655585331820701bb54f6991b4aba38273
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Mårten Nordheim 2021-04-29 13:02:52 +02:00
parent fe6dc9dc85
commit 5a701f5a7e
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/network/kernel/qauthenticator.cpp
View File

@ -423,6 +423,26 @@ void QAuthenticatorPrivate::updateCredentials()
}
}
bool QAuthenticatorPrivate::isMethodSupported(QByteArrayView method)
{
Q_ASSERT(!method.startsWith(' ')); // This should be trimmed during parsing
auto separator = method.indexOf(' ');
if (separator != -1)
method = method.first(separator);
const auto isSupported = [method](QByteArrayView reference) {
return method.compare(reference, Qt::CaseInsensitive) == 0;
};
static const char methods[][10] = {
"basic",
"ntlm",
"digest",
#if QT_CONFIG(sspi) || QT_CONFIG(gssapi)
"negotiate",
#endif
};
return std::any_of(methods, methods + std::size(methods), isSupported);
}
void QAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray, QByteArray> > &values, bool isProxy, const QString &host)
{
#if !QT_CONFIG(gssapi)

2
src/network/kernel/qauthenticator_p.h
View File

@ -115,6 +115,8 @@ public:
void parseHttpResponse(const QList<QPair<QByteArray, QByteArray> >&, bool isProxy, const QString &host);
void updateCredentials();
static bool isMethodSupported(QByteArrayView method);
};

18
tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp
View File

@ -49,6 +49,8 @@ private Q_SLOTS:
void ntlmAuth();
void equalityOperators();
void isMethodSupported();
};
tst_QAuthenticator::tst_QAuthenticator()
@ -163,6 +165,22 @@ void tst_QAuthenticator::equalityOperators()
QVERIFY(s2 != s1);
}
void tst_QAuthenticator::isMethodSupported()
{
QVERIFY(QAuthenticatorPrivate::isMethodSupported("basic"));
QVERIFY(QAuthenticatorPrivate::isMethodSupported("Basic realm=\"Shadow\""));
QVERIFY(QAuthenticatorPrivate::isMethodSupported("DIgesT"));
QVERIFY(QAuthenticatorPrivate::isMethodSupported("NTLM"));
QVERIFY(QAuthenticatorPrivate::isMethodSupported("ntlm"));
#if QT_CONFIG(sspi) || QT_CONFIG(gssapi)
QVERIFY(QAuthenticatorPrivate::isMethodSupported("negotiate"));
#else
QVERIFY(!QAuthenticatorPrivate::isMethodSupported("negotiate"));
#endif
QVERIFY(!QAuthenticatorPrivate::isMethodSupported("Bearer"));
}
QTEST_MAIN(tst_QAuthenticator);
#include "tst_qauthenticator.moc"