ETM-Schurig
/
powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unifi: Fix connecting to Controller on Unifi OS devices

master
Michael Zanetti 2023-12-28 22:46:49 +01:00
parent 74bda79d10
commit f740302e36
3 changed files with 71 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
unifi/integrationpluginunifi.cpp
View File

@ -34,6 +34,7 @@
#include <QNetworkReply>
#include <QNetworkRequest>
#include <QJsonDocument>
#include <QNetworkCookieJar>
#include <hardwaremanager.h>
#include <network/networkaccessmanager.h>
@ -190,15 +191,24 @@ void IntegrationPluginUnifi::startPairing(ThingPairingInfo *info)
void IntegrationPluginUnifi::confirmPairing(ThingPairingInfo *info, const QString &username, const QString &secret)
{
QString host = info->params().paramValue(controllerThingIpAddressParamTypeId).toString();
QNetworkRequest request = createRequest(host, "/api/login");
uint port = info->params().paramValue(controllerThingPortParamTypeId).toUInt();
QString path;
if (info->params().paramValue(controllerThingModeParamTypeId).toString() == "UniFi OS") {
path = "/api/auth/login";
} else {
path = "/api/login";
}
QNetworkRequest request = createRequest(host, port, path);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QVariantMap login;
login.insert("username", username);
login.insert("password", secret);
qCDebug(dcUnifi()) << "ConfirmPairing: Sending request:" << request.url().toString() << QJsonDocument::fromVariant(login).toJson();
QNetworkReply *reply = hardwareManager()->networkManager()->post(request, QJsonDocument::fromVariant(login).toJson());
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, info, [this, info, reply, username, secret](){
if (reply->error() != QNetworkReply::NoError) {
qCWarning(dcUnifi()) << "Network request error:" << reply->error() << reply->errorString();
qCWarning(dcUnifi()) << "ConfirmPairing: Network request error:" << reply->error() << reply->errorString();
info->finish(Thing::ThingErrorHardwareFailure);
return;
}
@ -207,11 +217,12 @@ void IntegrationPluginUnifi::confirmPairing(ThingPairingInfo *info, const QStrin
QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &error);
if (error.error != QJsonParseError::NoError) {
qCWarning(dcUnifi()) << "Error parsing JSON response from controller:" << error.errorString() << data;
qCWarning(dcUnifi()) << "ConfirmPairing: Error parsing JSON response from controller:" << error.errorString() << data;
info->finish(Thing::ThingErrorHardwareFailure);
return;
}
qCDebug(dcUnifi()) << "ConfirmPairing succeeded";
pluginStorage()->beginGroup(info->thingId().toString());
pluginStorage()->setValue("username", username);
pluginStorage()->setValue("password", secret);
@ -223,18 +234,37 @@ void IntegrationPluginUnifi::confirmPairing(ThingPairingInfo *info, const QStrin
void IntegrationPluginUnifi::setupThing(ThingSetupInfo *info)
{
if (info->thing()->thingClassId() == controllerThingClassId) {
QNetworkRequest request = createRequest(info->thing(), "/api/login");
// If the user just completed the pairing process we already have a valid cookie in the networkAccessManager.
if (info->isInitialSetup()) {
info->finish(Thing::ThingErrorNoError);
info->thing()->setStateValue(controllerConnectedStateTypeId, true);
return;
}
// After a nymea startup, we'll have to login to obtain a cookie.
QString host = info->thing()->params().paramValue(controllerThingIpAddressParamTypeId).toString();
uint port = info->thing()->params().paramValue(controllerThingPortParamTypeId).toUInt();
QString path;
if (info->thing()->paramValue(controllerThingModeParamTypeId).toString() == "UniFi OS") {
path = "/api/auth/login";
} else {
path = "/api/login";
}
QNetworkRequest request = createRequest(host, port, path);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QVariantMap login;
pluginStorage()->beginGroup(info->thing()->id().toString());
login.insert("username", pluginStorage()->value("username").toString());
login.insert("password", pluginStorage()->value("password").toString());
pluginStorage()->endGroup();
qCDebug(dcUnifi()) << "SetupThing: Sending request:" << request.url().toString() << QJsonDocument::fromVariant(login).toJson();
QNetworkReply *reply = hardwareManager()->networkManager()->post(request, QJsonDocument::fromVariant(login).toJson());
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, info, [this, info, reply](){
if (reply->error() != QNetworkReply::NoError) {
qCWarning(dcUnifi()) << "Network request error:" << reply->error() << reply->errorString();
qCWarning(dcUnifi()) << "SetupThing: Network request error:" << reply->error() << reply->errorString();
info->finish(Thing::ThingErrorHardwareFailure);
return;
}
@ -243,11 +273,13 @@ void IntegrationPluginUnifi::setupThing(ThingSetupInfo *info)
QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &error);
if (error.error != QJsonParseError::NoError) {
qCWarning(dcUnifi()) << "Error parsing JSON response from controller:" << error.errorString() << data;
qCWarning(dcUnifi()) << "SetupThing: Error parsing JSON response from controller:" << error.errorString() << data;
info->finish(Thing::ThingErrorHardwareFailure);
return;
}
qCDebug(dcUnifi()) << "SetupThing succeded";
info->thing()->setStateValue(controllerConnectedStateTypeId, true);
info->finish(Thing::ThingErrorNoError);
@ -266,12 +298,22 @@ void IntegrationPluginUnifi::postSetupThing(Thing *thing)
m_loginTimer = hardwareManager()->pluginTimerManager()->registerTimer();
connect(m_loginTimer, &PluginTimer::timeout, this, [this](){
foreach (Thing *controller, myThings().filterByThingClassId(controllerThingClassId)) {
QNetworkRequest request = createRequest(controller, "/api/login");
QString host = controller->paramValue(controllerThingIpAddressParamTypeId).toString();
uint port = controller->paramValue(controllerThingPortParamTypeId).toUInt();
QString path;
if (controller->paramValue(controllerThingModeParamTypeId).toString() == "UniFi OS") {
path = "/api/auth/login";
} else {
path = "/api/login";
}
QNetworkRequest request = createRequest(host, port, path);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QVariantMap login;
pluginStorage()->beginGroup(controller->id().toString());
login.insert("username", pluginStorage()->value("username"));
login.insert("password", pluginStorage()->value("password"));
pluginStorage()->endGroup();
qCDebug(dcUnifi()) << "Cookie KeepAlive: Sending request:" << request.url().toString();
QNetworkReply *reply = hardwareManager()->networkManager()->post(request, QJsonDocument::fromVariant(login).toJson());
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
}
@ -338,13 +380,13 @@ void IntegrationPluginUnifi::thingRemoved(Thing *thing)
}
}
QNetworkRequest IntegrationPluginUnifi::createRequest(const QString &address, const QString &path)
QNetworkRequest IntegrationPluginUnifi::createRequest(const QString &address, uint port, const QString &path, const QString &prefix)
{
QUrl url;
url.setScheme("https");
url.setHost(address);
url.setPort(8443);
url.setPath(path);
url.setPort(port);
url.setPath(prefix + path);
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
@ -357,7 +399,9 @@ QNetworkRequest IntegrationPluginUnifi::createRequest(const QString &address, co
QNetworkRequest IntegrationPluginUnifi::createRequest(Thing *thing, const QString &path)
{
QString ipAddress = thing->paramValue(controllerThingIpAddressParamTypeId).toString();
return createRequest(ipAddress, path);
uint port = thing->paramValue(controllerThingPortParamTypeId).toUInt();
bool prefix = thing->paramValue(controllerThingModeParamTypeId).toString() == "UniFi OS";
return createRequest(ipAddress, port, path, prefix ? "/proxy/network" : "");
}
void IntegrationPluginUnifi::markOffline(Thing *thing)

2
unifi/integrationpluginunifi.h
View File

@ -59,7 +59,7 @@ public:
// void executeAction(ThingActionInfo *info) override;
private:
QNetworkRequest createRequest(const QString &address, const QString &path);
QNetworkRequest createRequest(const QString &address, uint port, const QString &path, const QString &prefix = QString());
QNetworkRequest createRequest(Thing *thing, const QString &path);
void markOffline(Thing *thing);

15
unifi/integrationpluginunifi.json
View File

@ -21,6 +21,21 @@
"name": "ipAddress",
"displayName": "IP Address",
"type": "QString"
},
{
"id": "f7e65914-0f75-4c1e-bd66-90f7937f3a0d",
"name": "port",
"displayName": "Port",
"type": "uint",
"defaultValue": 8443
},
{
"id": "4d95c5e7-a60b-4804-8418-6d08174a025f",
"name": "mode",
"displayName": "Controller mode",
"type": "QString",
"allowedValues": ["Unifi Network Application", "UniFi OS"],
"defaultValue": "Application"
}
],
"stateTypes": [