Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-18 21:14:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
arm64v8a
2022-11-02 10:11:54 +09:00
parent aec0ec11b4
commit b4fe36137f
4 changed files with 188 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
qv2ray/v2/utils/HTTPRequestHelper.cpp
View File

@@ -7,51 +7,34 @@
#include "main/NekoRay.hpp"
#define QV_MODULE_NAME "NetworkCore"
#include "qv2ray/wrapper.hpp"
namespace Qv2ray::common::network {
void NetworkRequestHelper::setHeader(QNetworkRequest &request, const QByteArray &key, const QByteArray &value) {
DEBUG("Adding HTTP request header: " + key + ":" + value);
request.setRawHeader(key, value);
}
void
NetworkRequestHelper::setAccessManagerAttributes(QNetworkRequest &request, QNetworkAccessManager &accessManager) {
// Use proxy
if (NekoRay::dataStore->sub_use_proxy) {
QNetworkProxy p{QNetworkProxy::Socks5Proxy, "127.0.0.1",
static_cast<quint16>(NekoRay::dataStore->inbound_socks_port)};
accessManager.setProxy(p);
if (NekoRay::dataStore->started_id < 0) {
showLog(QObject::tr("Request with proxy but no profile started."));
}
}
if (accessManager.proxy().type() == QNetworkProxy::Socks5Proxy) {
DEBUG("Adding HostNameLookupCapability to proxy.");
accessManager.proxy().setCapabilities(
accessManager.proxy().capabilities() | QNetworkProxy::HostNameLookupCapability);
}
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
// request.setAttribute(QNetworkRequest::Http2AllowedAttribute, true);
#else
// request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true);
#endif
request.setHeader(QNetworkRequest::KnownHeaders::UserAgentHeader, NekoRay::dataStore->user_agent);
}
HTTPResponse NetworkRequestHelper::HttpGet(const QUrl &url) {
NekoHTTPResponse NetworkRequestHelper::HttpGet(const QUrl &url) {
QNetworkRequest request;
QNetworkAccessManager accessManager;
request.setUrl(url);
setAccessManagerAttributes(request, accessManager);
// Set proxy
if (NekoRay::dataStore->sub_use_proxy) {
QNetworkProxy p;
// Note: sing-box mixed socks5 protocol error
p.setType(IS_NEKO_BOX ? QNetworkProxy::HttpProxy : QNetworkProxy::Socks5Proxy);
p.setHostName("127.0.0.1");
p.setPort(NekoRay::dataStore->inbound_socks_port);
accessManager.setProxy(p);
if (NekoRay::dataStore->started_id < 0) {
return NekoHTTPResponse{QObject::tr("Request with proxy but no profile started.")};
}
}
if (accessManager.proxy().type() == QNetworkProxy::Socks5Proxy) {
DEBUG("Adding HostNameLookupCapability to proxy.");
auto cap = accessManager.proxy().capabilities();
accessManager.proxy().setCapabilities(cap | QNetworkProxy::HostNameLookupCapability);
}
// Set attribute
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
request.setHeader(QNetworkRequest::KnownHeaders::UserAgentHeader, NekoRay::dataStore->user_agent);
auto _reply = accessManager.get(request);
//
{
@@ -60,38 +43,12 @@ namespace Qv2ray::common::network {
loop.exec();
}
//
return HTTPResponse{_reply->error() == QNetworkReply::NetworkError::NoError ? "" : _reply->errorString(),
_reply->readAll(), _reply->rawHeaderPairs()};
}
void NetworkRequestHelper::AsyncHttpGet(const QString &url, std::function<void(const QByteArray &)> funcPtr) {
QNetworkRequest request;
request.setUrl(url);
auto accessManagerPtr = new QNetworkAccessManager();
setAccessManagerAttributes(request, *accessManagerPtr);
auto reply = accessManagerPtr->get(request);
QObject::connect(reply, &QNetworkReply::finished, [=]() {
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
bool h2Used = reply->attribute(QNetworkRequest::Http2WasUsedAttribute).toBool();
#else
bool h2Used = reply->attribute(QNetworkRequest::HTTP2WasUsedAttribute).toBool();
#endif
if (h2Used)
DEBUG("HTTP/2 was used.");
if (reply->error() != QNetworkReply::NoError)
LOG("Network error: " +
QString(QMetaEnum::fromType<QNetworkReply::NetworkError>().key(reply->error())));
funcPtr(reply->readAll());
accessManagerPtr->deleteLater();
}
});
return NekoHTTPResponse{_reply->error() == QNetworkReply::NetworkError::NoError ? "" : _reply->errorString(),
_reply->readAll(), _reply->rawHeaderPairs()};
}
QString NetworkRequestHelper::GetHeader(const QList<QPair<QByteArray, QByteArray>> &header, const QString &name) {
for (auto p: header) {
for (const auto &p: header) {
if (QString(p.first).toLower() == name.toLower()) return p.second;
}
return "";