Remove QRegExp usage from QSslCertificate and QSslSocket

Change-Id: I81abe1ab2173af922fa4b5fad58d25fa602c523b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

6 files changed, 1 insertions, 186 deletions

diff --git a/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp b/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp
index b381ae7b6e..62502afe61 100644
--- a/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp
+++ b/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp
@@ -48,14 +48,6 @@
 **
 ****************************************************************************/
 
-//! [0]
-const auto certs = QSslCertificate::fromPath("C:/ssl/certificate.*.pem",
-                                             QSsl::Pem, QRegExp::Wildcard);
-for (const QSslCertificate &cert : certs) {
-    qDebug() << cert.issuerInfo(QSslCertificate::Organization);
-}
-//! [0]
-
 //! [1]
 const auto certs = QSslCertificate::fromPath("C:/ssl/certificate.*.pem",
                                              QSsl::Pem, QSslCertificate::Wildcard);
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index aa2f8fed02..28dda14436 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -455,86 +455,6 @@ QByteArray QSslCertificate::digest(QCryptographicHash::Algorithm algorithm) cons
     \since 5.0
 */
 
-#if QT_DEPRECATED_SINCE(5,15)
-/*!
-    \obsolete
-
-    Searches all files in the \a path for certificates encoded in the
-    specified \a format and returns them in a list. \a path must be a file
-    or a pattern matching one or more files, as specified by \a syntax.
-
-    Example:
-
-    \snippet code/src_network_ssl_qsslcertificate.cpp 0
-
-    \sa fromData()
-*/
-QList<QSslCertificate> QSslCertificate::fromPath(const QString &path,
-                                                 QSsl::EncodingFormat format,
-                                                 QRegExp::PatternSyntax syntax)
-{
-    // $, (,), *, +, ., ?, [, ,], ^, {, | and }.
-
-    // make sure to use the same path separators on Windows and Unix like systems.
-    QString sourcePath = QDir::fromNativeSeparators(path);
-
-    // Find the path without the filename
-    QString pathPrefix = sourcePath.left(sourcePath.lastIndexOf(QLatin1Char('/')));
-
-    // Check if the path contains any special chars
-    int pos = -1;
-    if (syntax == QRegExp::Wildcard)
-        pos = pathPrefix.indexOf(QRegExp(QLatin1String("[*?[]")));
-    else if (syntax != QRegExp::FixedString)
-        pos = sourcePath.indexOf(QRegExp(QLatin1String("[\\$\\(\\)\\*\\+\\.\\?\\[\\]\\^\\{\\}\\|]")));
-    if (pos != -1) {
-        // there was a special char in the path so cut of the part containing that char.
-        pathPrefix = pathPrefix.left(pos);
-        const int lastIndexOfSlash = pathPrefix.lastIndexOf(QLatin1Char('/'));
-        if (lastIndexOfSlash != -1)
-            pathPrefix = pathPrefix.left(lastIndexOfSlash);
-        else
-            pathPrefix.clear();
-    } else {
-        // Check if the path is a file.
-        if (QFileInfo(sourcePath).isFile()) {
-            QFile file(sourcePath);
-            QIODevice::OpenMode openMode = QIODevice::ReadOnly;
-            if (format == QSsl::Pem)
-                openMode |= QIODevice::Text;
-            if (file.open(openMode))
-                return QSslCertificate::fromData(file.readAll(), format);
-            return QList<QSslCertificate>();
-        }
-    }
-
-    // Special case - if the prefix ends up being nothing, use "." instead.
-    int startIndex = 0;
-    if (pathPrefix.isEmpty()) {
-        pathPrefix = QLatin1String(".");
-        startIndex = 2;
-    }
-
-    // The path can be a file or directory.
-    QList<QSslCertificate> certs;
-    QRegExp pattern(sourcePath, Qt::CaseSensitive, syntax);
-    QDirIterator it(pathPrefix, QDir::Files, QDirIterator::FollowSymlinks | QDirIterator::Subdirectories);
-    while (it.hasNext()) {
-        QString filePath = startIndex == 0 ? it.next() : it.next().mid(startIndex);
-        if (!pattern.exactMatch(filePath))
-            continue;
-
-        QFile file(filePath);
-        QIODevice::OpenMode openMode = QIODevice::ReadOnly;
-        if (format == QSsl::Pem)
-            openMode |= QIODevice::Text;
-        if (file.open(openMode))
-            certs += QSslCertificate::fromData(file.readAll(), format);
-    }
-    return certs;
-}
-#endif // QT_DEPRECATED_SINCE(5,15)
-
 /*!
     \since 5.15
 
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index 525642a809..b7d4f4fa3e 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -50,7 +50,6 @@
 #include <QtCore/qbytearray.h>
 #include <QtCore/qcryptographichash.h>
 #include <QtCore/qdatetime.h>
-#include <QtCore/qregexp.h>
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qmap.h>
 #include <QtNetwork/qssl.h>
@@ -142,19 +141,9 @@ public:
     QByteArray toDer() const;
     QString toText() const;
 
-#if QT_DEPRECATED_SINCE(5,15)
-    QT_DEPRECATED_X("Use the overload not using QRegExp") static QList<QSslCertificate> fromPath(
-        const QString &path, QSsl::EncodingFormat format = QSsl::Pem,
-        QRegExp::PatternSyntax syntax = QRegExp::FixedString);
-
-    static QList<QSslCertificate> fromPath(
-        const QString &path, QSsl::EncodingFormat format,
-        PatternSyntax syntax);
-#else
     static QList<QSslCertificate> fromPath(
         const QString &path, QSsl::EncodingFormat format = QSsl::Pem,
-        PatternSyntax syntax = FixedString);
-#endif
+        PatternSyntax syntax = PatternSyntax::FixedString);
 
     static QList<QSslCertificate> fromDevice(
         QIODevice *device, QSsl::EncodingFormat format = QSsl::Pem);
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 44dcbcec5a..b0a5204844 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -1527,40 +1527,6 @@ QList<QSslCipher> QSslSocket::supportedCiphers()
 /*!
   \deprecated
 
-  Use QSslConfiguration::addCaCertificates() instead.
-
-  Searches all files in the \a path for certificates encoded in the
-  specified \a format and adds them to this socket's CA certificate
-  database. \a path must be a file or a pattern matching one or more
-  files, as specified by \a syntax. Returns \c true if one or more
-  certificates are added to the socket's CA certificate database;
-  otherwise returns \c false.
-
-  The CA certificate database is used by the socket during the
-  handshake phase to validate the peer's certificate.
-
-  For more precise control, use addCaCertificate().
-
-  \sa addCaCertificate(), QSslCertificate::fromPath()
-*/
-bool QSslSocket::addCaCertificates(const QString &path, QSsl::EncodingFormat format,
-                                   QRegExp::PatternSyntax syntax)
-{
-    Q_D(QSslSocket);
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    QList<QSslCertificate> certs = QSslCertificate::fromPath(path, format, syntax);
-QT_WARNING_POP
-    if (certs.isEmpty())
-        return false;
-
-    d->configuration.caCertificates += certs;
-    return true;
-}
-
-/*!
-  \deprecated
-
   Use QSslConfiguration::addCaCertificate() instead.
 
   Adds the \a certificate to this socket's CA certificate database.
@@ -1647,29 +1613,6 @@ QList<QSslCertificate> QSslSocket::caCertificates() const
 /*!
     \deprecated
 
-    Use QSslConfiguration::addCaCertificates() on the default QSslConfiguration instead.
-
-    Searches all files in the \a path for certificates with the
-    specified \a encoding and adds them to the default CA certificate
-    database. \a path can be an explicit file, or it can contain
-    wildcards in the format specified by \a syntax. Returns \c true if
-    any CA certificates are added to the default database.
-
-    Each SSL socket's CA certificate database is initialized to the
-    default CA certificate database.
-
-    \sa QSslConfiguration::caCertificates(), QSslConfiguration::addCaCertificates(),
-        QSslConfiguration::addCaCertificate()
-*/
-bool QSslSocket::addDefaultCaCertificates(const QString &path, QSsl::EncodingFormat encoding,
-                                          QRegExp::PatternSyntax syntax)
-{
-    return QSslSocketPrivate::addDefaultCaCertificates(path, encoding, syntax);
-}
-
-/*!
-    \deprecated
-
     Use QSslConfiguration::addCaCertificate() on the default QSslConfiguration instead.
 
     Adds \a certificate to the default CA certificate database.  Each
@@ -2518,28 +2461,6 @@ void QSslSocketPrivate::setDefaultCaCertificates(const QList<QSslCertificate> &c
 /*!
     \internal
 */
-bool QSslSocketPrivate::addDefaultCaCertificates(const QString &path, QSsl::EncodingFormat format,
-                                                 QRegExp::PatternSyntax syntax)
-{
-    QSslSocketPrivate::ensureInitialized();
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    QList<QSslCertificate> certs = QSslCertificate::fromPath(path, format, syntax);
-QT_WARNING_POP
-    if (certs.isEmpty())
-        return false;
-
-    QMutexLocker locker(&globalData()->mutex);
-    globalData()->config.detach();
-    globalData()->config->caCertificates += certs;
-    globalData()->dtlsConfig.detach();
-    globalData()->dtlsConfig->caCertificates += certs;
-    return true;
-}
-
-/*!
-    \internal
-*/
 void QSslSocketPrivate::addDefaultCaCertificate(const QSslCertificate &cert)
 {
     QSslSocketPrivate::ensureInitialized();
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h
index e99c79a967..7fd2b1cb08 100644
--- a/src/network/ssl/qsslsocket.h
+++ b/src/network/ssl/qsslsocket.h
@@ -43,7 +43,6 @@
 
 #include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/qlist.h>
-#include <QtCore/qregexp.h>
 #include <QtCore/qvector.h>
 #ifndef QT_NO_SSL
 #   include <QtNetwork/qtcpsocket.h>
@@ -208,8 +207,6 @@ public:
 
     // CA settings.
 #if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X("Use QSslConfiguration::addCaCertificates()") bool addCaCertificates(const QString &path, QSsl::EncodingFormat format = QSsl::Pem,
-                           QRegExp::PatternSyntax syntax = QRegExp::FixedString);
     QT_DEPRECATED_X("Use QSslConfiguration::addCaCertificate()") void addCaCertificate(const QSslCertificate &certificate);
     QT_DEPRECATED_X("Use QSslConfiguration::addCaCertificates()") void addCaCertificates(const QList<QSslCertificate> &certificates);
 #endif // QT_DEPRECATED_SINCE(5, 15)
@@ -218,8 +215,6 @@ public:
     QT_DEPRECATED_X("Use QSslConfiguration::caCertificates()") QList<QSslCertificate> caCertificates() const;
 #endif // QT_DEPRECATED_SINCE(5, 5)
 #if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED static bool addDefaultCaCertificates(const QString &path, QSsl::EncodingFormat format = QSsl::Pem,
-                                         QRegExp::PatternSyntax syntax = QRegExp::FixedString);
     QT_DEPRECATED static void addDefaultCaCertificate(const QSslCertificate &certificate);
     QT_DEPRECATED static void addDefaultCaCertificates(const QList<QSslCertificate> &certificates);
 #endif // QT_DEPRECATED_SINCE(5, 15)
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h
index 4b020b6a73..b63e951d5e 100644
--- a/src/network/ssl/qsslsocket_p.h
+++ b/src/network/ssl/qsslsocket_p.h
@@ -140,8 +140,6 @@ public:
     static QList<QSslCertificate> defaultCaCertificates();
     static QList<QSslCertificate> systemCaCertificates();
     static void setDefaultCaCertificates(const QList<QSslCertificate> &certs);
-    static bool addDefaultCaCertificates(const QString &path, QSsl::EncodingFormat format,
-                                         QRegExp::PatternSyntax syntax);
     static void addDefaultCaCertificate(const QSslCertificate &cert);
     static void addDefaultCaCertificates(const QList<QSslCertificate> &certs);
     Q_AUTOTEST_EXPORT static bool isMatchingHostname(const QSslCertificate &cert,