diff --git a/gpt4all-chat/src/download.cpp b/gpt4all-chat/src/download.cpp index 6891feeb28ea..14d76b2d8b91 100644 --- a/gpt4all-chat/src/download.cpp +++ b/gpt4all-chat/src/download.cpp @@ -22,8 +22,6 @@ #include #include #include -#include -#include #include // IWYU pragma: keep #include #include @@ -158,11 +156,8 @@ bool Download::isFirstStart(bool writeVersion) const void Download::updateReleaseNotes() { - QUrl jsonUrl("http://gpt4all.io/meta/release.json"); + QUrl jsonUrl("https://gpt4all.io/meta/release.json"); QNetworkRequest request(jsonUrl); - QSslConfiguration conf = request.sslConfiguration(); - conf.setPeerVerifyMode(QSslSocket::VerifyNone); - request.setSslConfiguration(conf); QNetworkReply *jsonReply = m_networkManager.get(request); connect(qGuiApp, &QCoreApplication::aboutToQuit, jsonReply, &QNetworkReply::abort); connect(jsonReply, &QNetworkReply::finished, this, &Download::handleReleaseJsonDownloadFinished); @@ -170,11 +165,8 @@ void Download::updateReleaseNotes() void Download::updateLatestNews() { - QUrl url("http://gpt4all.io/meta/latestnews.md"); + QUrl url("https://gpt4all.io/meta/latestnews.md"); QNetworkRequest request(url); - QSslConfiguration conf = request.sslConfiguration(); - conf.setPeerVerifyMode(QSslSocket::VerifyNone); - request.setSslConfiguration(conf); QNetworkReply *reply = m_networkManager.get(request); connect(qGuiApp, &QCoreApplication::aboutToQuit, reply, &QNetworkReply::abort); connect(reply, &QNetworkReply::finished, this, &Download::handleLatestNewsDownloadFinished); @@ -211,14 +203,11 @@ void Download::downloadModel(const QString &modelFile) ModelList::globalInstance()->updateDataByFilename(modelFile, {{ ModelList::DownloadingRole, true }}); ModelInfo info = ModelList::globalInstance()->modelInfoByFilename(modelFile); - QString url = !info.url().isEmpty() ? info.url() : "http://gpt4all.io/models/gguf/" + modelFile; + QString url = !info.url().isEmpty() ? info.url() : "https://gpt4all.io/models/gguf/" + modelFile; Network::globalInstance()->trackEvent("download_started", { {"model", modelFile} }); QNetworkRequest request(url); request.setAttribute(QNetworkRequest::User, modelFile); request.setRawHeader("range", u"bytes=%1-"_s.arg(tempFile->pos()).toUtf8()); - QSslConfiguration conf = request.sslConfiguration(); - conf.setPeerVerifyMode(QSslSocket::VerifyNone); - request.setSslConfiguration(conf); QNetworkReply *modelReply = m_networkManager.get(request); connect(qGuiApp, &QCoreApplication::aboutToQuit, modelReply, &QNetworkReply::abort); connect(modelReply, &QNetworkReply::downloadProgress, this, &Download::handleDownloadProgress); diff --git a/gpt4all-chat/src/modellist.cpp b/gpt4all-chat/src/modellist.cpp index 248f2f09f051..16cb5bfcef30 100644 --- a/gpt4all-chat/src/modellist.cpp +++ b/gpt4all-chat/src/modellist.cpp @@ -28,8 +28,6 @@ #include #include #include -#include -#include #include #include // IWYU pragma: keep #include @@ -1484,13 +1482,10 @@ void ModelList::updateModelsFromJson() #if defined(USE_LOCAL_MODELSJSON) QUrl jsonUrl(u"file://%1/dev/large_language_models/gpt4all/gpt4all-chat/metadata/%2"_s.arg(QDir::homePath(), modelsJsonFname)); #else - QUrl jsonUrl(u"http://gpt4all.io/models/%1"_s.arg(modelsJsonFname)); + QUrl jsonUrl(u"https://gpt4all.io/models/%1"_s.arg(modelsJsonFname)); #endif QNetworkRequest request(jsonUrl); - QSslConfiguration conf = request.sslConfiguration(); - conf.setPeerVerifyMode(QSslSocket::VerifyNone); - request.setSslConfiguration(conf); QNetworkReply *jsonReply = m_networkManager.get(request); connect(qGuiApp, &QCoreApplication::aboutToQuit, jsonReply, &QNetworkReply::abort); QEventLoop loop; @@ -1527,13 +1522,10 @@ void ModelList::updateModelsFromJsonAsync() #if defined(USE_LOCAL_MODELSJSON) QUrl jsonUrl(u"file://%1/dev/large_language_models/gpt4all/gpt4all-chat/metadata/%2"_s.arg(QDir::homePath(), modelsJsonFname)); #else - QUrl jsonUrl(u"http://gpt4all.io/models/%1"_s.arg(modelsJsonFname)); + QUrl jsonUrl(u"https://gpt4all.io/models/%1"_s.arg(modelsJsonFname)); #endif QNetworkRequest request(jsonUrl); - QSslConfiguration conf = request.sslConfiguration(); - conf.setPeerVerifyMode(QSslSocket::VerifyNone); - request.setSslConfiguration(conf); QNetworkReply *jsonReply = m_networkManager.get(request); connect(qGuiApp, &QCoreApplication::aboutToQuit, jsonReply, &QNetworkReply::abort); connect(jsonReply, &QNetworkReply::finished, this, &ModelList::handleModelsJsonDownloadFinished); diff --git a/gpt4all-chat/src/network.cpp b/gpt4all-chat/src/network.cpp index e0c04f1d70e0..6ad2ae099757 100644 --- a/gpt4all-chat/src/network.cpp +++ b/gpt4all-chat/src/network.cpp @@ -24,8 +24,6 @@ #include #include #include -#include -#include #include #include #include @@ -221,9 +219,6 @@ bool Network::packageAndSendJson(const QString &ingestId, const QString &json) QUrl jsonUrl("https://api.gpt4all.io/v1/ingest/chat"); QNetworkRequest request(jsonUrl); - QSslConfiguration conf = request.sslConfiguration(); - conf.setPeerVerifyMode(QSslSocket::VerifyNone); - request.setSslConfiguration(conf); QByteArray body(newDoc.toJson(QJsonDocument::Compact)); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); QNetworkReply *jsonReply = m_networkManager.post(request, body); @@ -428,9 +423,6 @@ void Network::sendIpify() QUrl ipifyUrl("https://api.ipify.org"); QNetworkRequest request(ipifyUrl); - QSslConfiguration conf = request.sslConfiguration(); - conf.setPeerVerifyMode(QSslSocket::VerifyNone); - request.setSslConfiguration(conf); QNetworkReply *reply = m_networkManager.get(request); connect(qGuiApp, &QCoreApplication::aboutToQuit, reply, &QNetworkReply::abort); connect(reply, &QNetworkReply::finished, this, &Network::handleIpifyFinished); @@ -440,9 +432,6 @@ void Network::sendMixpanel(const QByteArray &json) { QUrl trackUrl("https://api.mixpanel.com/track"); QNetworkRequest request(trackUrl); - QSslConfiguration conf = request.sslConfiguration(); - conf.setPeerVerifyMode(QSslSocket::VerifyNone); - request.setSslConfiguration(conf); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); QNetworkReply *trackReply = m_networkManager.post(request, json); connect(qGuiApp, &QCoreApplication::aboutToQuit, trackReply, &QNetworkReply::abort); @@ -513,9 +502,6 @@ void Network::sendHealth() { QUrl healthUrl("https://api.gpt4all.io/v1/health"); QNetworkRequest request(healthUrl); - QSslConfiguration conf = request.sslConfiguration(); - conf.setPeerVerifyMode(QSslSocket::VerifyNone); - request.setSslConfiguration(conf); QNetworkReply *healthReply = m_networkManager.get(request); connect(qGuiApp, &QCoreApplication::aboutToQuit, healthReply, &QNetworkReply::abort); connect(healthReply, &QNetworkReply::finished, this, &Network::handleHealthFinished);