patrick/OpenDTU
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Password protection for mqtt settings API

Browse Source
This commit is contained in:
Thomas Basler 2022-11-03 21:31:50 +01:00
parent 3a2f73a2b3
commit 902e632f51
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/WebApi_mqtt.cpp
View File

@ -8,6 +8,7 @@
#include "Configuration.h"
#include "MqttHassPublishing.h"
#include "MqttSettings.h"
#include "WebApi.h"
#include "helper.h"
void WebApiMqttClass::init(AsyncWebServer* server)
@ -54,6 +55,10 @@ void WebApiMqttClass::onMqttStatus(AsyncWebServerRequest* request)
void WebApiMqttClass::onMqttAdminGet(AsyncWebServerRequest* request)
{
if (!WebApi.checkCredentials(request)) {
return;
}
AsyncJsonResponse* response = new AsyncJsonResponse(false, MQTT_JSON_DOC_SIZE);
JsonObject root = response->getRoot();
const CONFIG_T& config = Configuration.get();
@ -83,6 +88,10 @@ void WebApiMqttClass::onMqttAdminGet(AsyncWebServerRequest* request)
void WebApiMqttClass::onMqttAdminPost(AsyncWebServerRequest* request)
{
if (!WebApi.checkCredentials(request)) {
return;
}
AsyncJsonResponse* response = new AsyncJsonResponse(false, MQTT_JSON_DOC_SIZE);
JsonObject retMsg = response->getRoot();
retMsg[F("type")] = F("warning");

2
webapp/src/router/index.ts
View File

@ -100,7 +100,7 @@ const router = createRouter({
router.beforeEach((to, from, next) => {
// redirect to login page if not logged in and trying to access a restricted page
const publicPages = ['/', '/login', '/about', '/info/network', '/info/system', '/info/ntp', '/info/mqtt',
'/settings/mqtt', '/settings/inverter', '/firmware/upgrade', '/settings/config', ];
'/settings/inverter', '/firmware/upgrade', '/settings/config', ];
const authRequired = !publicPages.includes(to.path);
const loggedIn = localStorage.getItem('user');

14
webapp/src/views/MqttAdminView.vue
View File

@ -218,6 +218,7 @@
import { defineComponent } from 'vue';
import BasePage from '@/components/BasePage.vue';
import BootstrapAlert from "@/components/BootstrapAlert.vue";
import { handleResponse, authHeader } from '@/utils/authentication';
import type { MqttConfig } from "@/types/MqttConfig";
export default defineComponent({
@ -240,8 +241,8 @@ export default defineComponent({
methods: {
getMqttConfig() {
this.dataLoading = true;
fetch("/api/mqtt/config")
.then((response) => response.json())
fetch("/api/mqtt/config", { headers: authHeader() })
.then(handleResponse)
.then((data) => {
this.mqttConfigList = data;
this.dataLoading = false;
@ -255,15 +256,10 @@ export default defineComponent({
fetch("/api/mqtt/config", {
method: "POST",
headers: authHeader(),
body: formData,
})
.then(function (response) {
if (response.status != 200) {
throw response.status;
} else {
return response.json();
}
})
.then(handleResponse)
.then(
(response) => {
this.alertMessage = response.message;