-
-
- {
- setActiveTab(slugify(tab));
- window.location.hash = `#${slugify(tab)}`;
+ setActiveTab(slugifyAndEncode(tab));
+ window.location.hash = `#${slugifyAndEncode(tab)}`;
}}
>
{tab}
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 10b2f6d5..5e1bd6e2 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -10,7 +10,7 @@ import { BiError } from "react-icons/bi";
import { serverSideTranslations } from "next-i18next/serverSideTranslations";
import { useRouter } from "next/router";
-import Tab, { slugify } from "components/tab";
+import Tab, { slugifyAndEncode } from "components/tab";
import ServicesGroup from "components/services/group";
import BookmarksGroup from "components/bookmarks/group";
import Widget from "components/widgets/widget";
@@ -258,13 +258,13 @@ function Home({ initialSettings }) {
useEffect(() => {
if (!activeTab) {
- const initialTab = decodeURI(asPath.substring(asPath.indexOf("#") + 1));
- setActiveTab(initialTab === "/" ? slugify(tabs["0"]) : initialTab);
+ const initialTab = asPath.substring(asPath.indexOf("#") + 1);
+ setActiveTab(initialTab === "/" ? slugifyAndEncode(tabs["0"]) : initialTab);
}
});
const servicesAndBookmarksGroups = useMemo(() => {
- const tabGroupFilter = (g) => g && [activeTab, ""].includes(slugify(settings.layout?.[g.name]?.tab));
+ const tabGroupFilter = (g) => g && [activeTab, ""].includes(slugifyAndEncode(settings.layout?.[g.name]?.tab));
const undefinedGroupFilter = (g) => settings.layout?.[g.name] === undefined;
const layoutGroups = Object.keys(settings.layout ?? {})
From 0af975b3d9e5e626380f430cdf0209e488b47ce4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 24 Mar 2024 00:09:15 -0700
Subject: [PATCH 046/136] New Crowdin translations by GitHub Action (#3096)
Co-authored-by: Crowdin Bot {t("common.bitrate", { - value: (interfaceData.rx * 8) / interfaceData.time_since_update, + value: (interfaceData[rxKey] * 8) / interfaceData.time_since_update, maximumFractionDigits: 0, })}{" "} {t("docker.rx")} @@ -115,7 +119,7 @@ export default function Component({ service }) {@@ -288,6 +294,7 @@ export default function Component({ service }) { key={session.Id} playCommand={(currentSession, command) => handlePlayCommand(currentSession, command)} session={session} + enableUser={enableUser} /> ))}{t("common.bitrate", { - value: (interfaceData.tx * 8) / interfaceData.time_since_update, + value: (interfaceData[txKey] * 8) / interfaceData.time_since_update, maximumFractionDigits: 0, })}{" "} {t("docker.tx")} diff --git a/src/widgets/glances/metrics/process.jsx b/src/widgets/glances/metrics/process.jsx index 0b2e8e4b..24b447cb 100644 --- a/src/widgets/glances/metrics/process.jsx +++ b/src/widgets/glances/metrics/process.jsx @@ -22,10 +22,13 @@ const defaultInterval = 1000; export default function Component({ service }) { const { t } = useTranslation(); const { widget } = service; - const { chart, refreshInterval = defaultInterval } = widget; + const { chart, refreshInterval = defaultInterval, version = 3 } = widget; + + const memoryInfoKey = version === 3 ? 0 : "data"; const { data, error } = useWidgetAPI(service.widget, "processlist", { refreshInterval: Math.max(defaultInterval, refreshInterval), + version, }); if (error) { @@ -66,7 +69,7 @@ export default function Component({ service }) {{item.cpu_percent.toFixed(1)}%{t("common.bytes", { - value: item.memory_info[0], + value: item.memory_info[memoryInfoKey], maximumFractionDigits: 0, })}diff --git a/src/widgets/glances/metrics/sensor.jsx b/src/widgets/glances/metrics/sensor.jsx index 60ea07c8..9dc28bb1 100644 --- a/src/widgets/glances/metrics/sensor.jsx +++ b/src/widgets/glances/metrics/sensor.jsx @@ -16,13 +16,14 @@ const defaultInterval = 1000; export default function Component({ service }) { const { t } = useTranslation(); const { widget } = service; - const { chart, refreshInterval = defaultInterval, pointsLimit = defaultPointsLimit } = widget; + const { chart, refreshInterval = defaultInterval, pointsLimit = defaultPointsLimit, version = 3 } = widget; const [, sensorName] = widget.metric.split(":"); const [dataPoints, setDataPoints] = useState(new Array(pointsLimit).fill({ value: 0 }, 0, pointsLimit)); const { data, error } = useWidgetAPI(service.widget, "sensors", { refreshInterval: Math.max(defaultInterval, refreshInterval), + version, }); useEffect(() => { diff --git a/src/widgets/glances/widget.js b/src/widgets/glances/widget.js index 3da1c6d1..a824e4c1 100644 --- a/src/widgets/glances/widget.js +++ b/src/widgets/glances/widget.js @@ -1,7 +1,7 @@ import credentialedProxyHandler from "utils/proxy/handlers/credentialed"; const widget = { - api: "{url}/api/3/{endpoint}", + api: "{url}/api/{version}/{endpoint}", proxyHandler: credentialedProxyHandler, }; From d4c0e482d3e233bea9de23b17b1060e80bf84c7b Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 28 Mar 2024 15:39:40 -0500 Subject: [PATCH 049/136] Feature: crowdsec widget (#3197) --- docs/widgets/services/crowdsec.md | 19 +++++++ mkdocs.yml | 1 + public/locales/en/common.json | 4 ++ src/widgets/components.js | 1 + src/widgets/crowdsec/component.jsx | 34 +++++++++++ src/widgets/crowdsec/proxy.js | 90 ++++++++++++++++++++++++++++++ src/widgets/crowdsec/widget.js | 18 ++++++ src/widgets/widgets.js | 2 + 8 files changed, 169 insertions(+) create mode 100644 docs/widgets/services/crowdsec.md create mode 100644 src/widgets/crowdsec/component.jsx create mode 100644 src/widgets/crowdsec/proxy.js create mode 100644 src/widgets/crowdsec/widget.js diff --git a/docs/widgets/services/crowdsec.md b/docs/widgets/services/crowdsec.md new file mode 100644 index 00000000..608367df --- /dev/null +++ b/docs/widgets/services/crowdsec.md @@ -0,0 +1,19 @@ +--- +title: Crowdsec +description: Crowdsec Widget Configuration +--- + +Learn more about [Crowdsec](https://crowdsec.net). + +See the [crowdsec docs](https://docs.crowdsec.net/docs/local_api/intro/#machines) for information about registering a machine, +in most instances you can use the default credentials (`/etc/crowdsec/local_api_credentials.yaml`). + +Allowed fields: ["alerts", "bans"] + +```yaml +widget: + type: crowdsec + url: http://crowdsechostorip:port + username: localhost # machine_id in crowdsec + passowrd: password +``` diff --git a/mkdocs.yml b/mkdocs.yml index a0994fad..e58cb1e4 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -44,6 +44,7 @@ nav: - widgets/services/channelsdvrserver.md - widgets/services/cloudflared.md - widgets/services/coin-market-cap.md + - widgets/services/crowdsec.md - widgets/services/customapi.md - widgets/services/deluge.md - widgets/services/diskstation.md diff --git a/public/locales/en/common.json b/public/locales/en/common.json index c7339c0b..98daae9e 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -872,5 +872,9 @@ "labels": "Labels", "users": "Users", "totalValue": "Total Value" + }, + "crowdsec": { + "alerts": "Alerts", + "bans": "Bans" } } diff --git a/src/widgets/components.js b/src/widgets/components.js index f3d567bb..8c85bd77 100644 --- a/src/widgets/components.js +++ b/src/widgets/components.js @@ -15,6 +15,7 @@ const components = { channelsdvrserver: dynamic(() => import("./channelsdvrserver/component")), cloudflared: dynamic(() => import("./cloudflared/component")), coinmarketcap: dynamic(() => import("./coinmarketcap/component")), + crowdsec: dynamic(() => import("./crowdsec/component")), iframe: dynamic(() => import("./iframe/component")), customapi: dynamic(() => import("./customapi/component")), deluge: dynamic(() => import("./deluge/component")), diff --git a/src/widgets/crowdsec/component.jsx b/src/widgets/crowdsec/component.jsx new file mode 100644 index 00000000..9565ee73 --- /dev/null +++ b/src/widgets/crowdsec/component.jsx @@ -0,0 +1,34 @@ +import { useTranslation } from "next-i18next"; + +import Container from "components/services/widget/container"; +import Block from "components/services/widget/block"; +import useWidgetAPI from "utils/proxy/use-widget-api"; + +export default function Component({ service }) { + const { t } = useTranslation(); + + const { widget } = service; + + const { data: alerts, error: alertsError } = useWidgetAPI(widget, "alerts"); + const { data: bans, error: bansError } = useWidgetAPI(widget, "bans"); + + if (alertsError || bansError) { + return
; + } + + if (!alerts || !bans) { + return ( + + + ); + } + + return ( ++ + + + ); +} diff --git a/src/widgets/crowdsec/proxy.js b/src/widgets/crowdsec/proxy.js new file mode 100644 index 00000000..a367e716 --- /dev/null +++ b/src/widgets/crowdsec/proxy.js @@ -0,0 +1,90 @@ +import cache from "memory-cache"; + +import { httpProxy } from "utils/proxy/http"; +import { formatApiCall } from "utils/proxy/api-helpers"; +import getServiceWidget from "utils/config/service-helpers"; +import createLogger from "utils/logger"; +import widgets from "widgets/widgets"; + +const proxyName = "crowdsecProxyHandler"; +const logger = createLogger(proxyName); +const sessionTokenCacheKey = `${proxyName}__sessionToken`; + +async function login(widget, service) { + const url = formatApiCall(widgets[widget.type].loginURL, widget); + const [status, , data] = await httpProxy(url, { + method: "POST", + headers: { + "Content-Type": "application/json", + "User-Agent": "Mozilla/5.0", // Crowdsec requires a user-agent + }, + body: JSON.stringify({ + machine_id: widget.username, + password: widget.password, + scenarios: [], + }), + }); + + const dataParsed = JSON.parse(data); + + if (!(status === 200) || !dataParsed.token) { + logger.error("Failed to login to Crowdsec API, status: %d", status); + cache.del(`${sessionTokenCacheKey}.${service}`); + } + cache.put(`${sessionTokenCacheKey}.${service}`, dataParsed.token, new Date(dataParsed.expire) - new Date()); +} + +export default async function crowdsecProxyHandler(req, res) { + const { group, service, endpoint } = req.query; + + if (!group || !service) { + logger.error("Invalid or missing service '%s' or group '%s'", service, group); + return res.status(400).json({ error: "Invalid proxy service type" }); + } + + const widget = await getServiceWidget(group, service); + if (!widget || !widgets[widget.type].api) { + logger.error("Invalid or missing widget for service '%s' in group '%s'", service, group); + return res.status(400).json({ error: "Invalid widget configuration" }); + } + + if (!cache.get(`${sessionTokenCacheKey}.${service}`)) { + await login(widget, service); + } + + const token = cache.get(`${sessionTokenCacheKey}.${service}`); + if (!token) { + return res.status(500).json({ error: "Failed to authenticate with Crowdsec" }); + } + + const url = new URL(formatApiCall(widgets[widget.type].api, { endpoint, ...widget })); + + try { + const params = { + method: "GET", + headers: { + "User-Agent": "Mozilla/5.0", // Crowdsec requires a user-agent + "Content-Type": "application/json", + Authorization: `Bearer ${token}`, + }, + }; + + logger.debug("Calling Crowdsec API endpoint: %s", endpoint); + + if (endpoint.indexOf("decisions") === 0) { + delete params.headers.Authorization; + } + + const [status, , data] = await httpProxy(url, params); + + if (status !== 200) { + logger.error("Error calling Crowdsec API: %d. Data: %s", status, data); + return res.status(status).json({ error: "Crowdsec API Error", data }); + } + + return res.status(status).send(data); + } catch (error) { + logger.error("Exception calling Crowdsec API: %s", error.message); + return res.status(500).json({ error: "Crowdsec API Error", message: error.message }); + } +} diff --git a/src/widgets/crowdsec/widget.js b/src/widgets/crowdsec/widget.js new file mode 100644 index 00000000..d29fa1f1 --- /dev/null +++ b/src/widgets/crowdsec/widget.js @@ -0,0 +1,18 @@ +import crowdsecProxyHandler from "./proxy"; + +const widget = { + api: "{url}/v1/{endpoint}", + loginURL: "{url}/v1/watchers/login", + proxyHandler: crowdsecProxyHandler, + + mappings: { + alerts: { + endpoint: "alerts", + }, + bans: { + endpoint: "alerts?decision_type=ban&origin=crowdsec&has_active_decision=1", + }, + }, +}; + +export default widget; diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js index a9cae230..6e02d932 100644 --- a/src/widgets/widgets.js +++ b/src/widgets/widgets.js @@ -12,6 +12,7 @@ import changedetectionio from "./changedetectionio/widget"; import channelsdvrserver from "./channelsdvrserver/widget"; import cloudflared from "./cloudflared/widget"; import coinmarketcap from "./coinmarketcap/widget"; +import crowdsec from "./crowdsec/widget"; import customapi from "./customapi/widget"; import deluge from "./deluge/widget"; import diskstation from "./diskstation/widget"; @@ -125,6 +126,7 @@ const widgets = { channelsdvrserver, cloudflared, coinmarketcap, + crowdsec, customapi, deluge, diskstation, From 97d193faf12a18142d5e2f117f67db5df7f5eb65 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 28 Mar 2024 13:41:29 -0700 Subject: [PATCH 050/136] Fix crowdsec widget with no bans / alerts --- src/widgets/crowdsec/component.jsx | 6 +++--- src/widgets/crowdsec/proxy.js | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/widgets/crowdsec/component.jsx b/src/widgets/crowdsec/component.jsx index 9565ee73..2e98cee9 100644 --- a/src/widgets/crowdsec/component.jsx +++ b/src/widgets/crowdsec/component.jsx @@ -16,7 +16,7 @@ export default function Component({ service }) { return+ + ; } - if (!alerts || !bans) { + if (!alerts && !bans) { return ( @@ -27,8 +27,8 @@ export default function Component({ service }) { return ( - ); } diff --git a/src/widgets/crowdsec/proxy.js b/src/widgets/crowdsec/proxy.js index a367e716..e78fbc5e 100644 --- a/src/widgets/crowdsec/proxy.js +++ b/src/widgets/crowdsec/proxy.js @@ -71,10 +71,6 @@ export default async function crowdsecProxyHandler(req, res) { logger.debug("Calling Crowdsec API endpoint: %s", endpoint); - if (endpoint.indexOf("decisions") === 0) { - delete params.headers.Authorization; - } - const [status, , data] = await httpProxy(url, params); if (status !== 200) { From b0d57866a0ed0e2507d12ca480c17e0bb8cc0199 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 29 Mar 2024 06:32:25 -0700 Subject: [PATCH 051/136] Fix glances service widgets handling of default version --- src/widgets/glances/metrics/cpu.jsx | 5 ++--- src/widgets/glances/metrics/disk.jsx | 3 +-- src/widgets/glances/metrics/fs.jsx | 3 +-- src/widgets/glances/metrics/gpu.jsx | 3 +-- src/widgets/glances/metrics/info.jsx | 6 ++---- src/widgets/glances/metrics/memory.jsx | 3 +-- src/widgets/glances/metrics/net.jsx | 5 ++--- src/widgets/glances/metrics/process.jsx | 3 +-- src/widgets/glances/metrics/sensor.jsx | 3 +-- src/widgets/glances/widget.js | 2 +- 10 files changed, 13 insertions(+), 23 deletions(-) diff --git a/src/widgets/glances/metrics/cpu.jsx b/src/widgets/glances/metrics/cpu.jsx index bd12dc29..553517ba 100644 --- a/src/widgets/glances/metrics/cpu.jsx +++ b/src/widgets/glances/metrics/cpu.jsx @@ -20,12 +20,11 @@ export default function Component({ service }) { const [dataPoints, setDataPoints] = useState(new Array(pointsLimit).fill({ value: 0 }, 0, pointsLimit)); - const { data, error } = useWidgetAPI(service.widget, "cpu", { + const { data, error } = useWidgetAPI(service.widget, `${version}/cpu`, { refreshInterval: Math.max(defaultInterval, refreshInterval), - version, }); - const { data: quicklookData, error: quicklookError } = useWidgetAPI(service.widget, "quicklook", { version }); + const { data: quicklookData, error: quicklookError } = useWidgetAPI(service.widget, `${version}/quicklook`); useEffect(() => { if (data) { diff --git a/src/widgets/glances/metrics/disk.jsx b/src/widgets/glances/metrics/disk.jsx index 662822ef..04a5071f 100644 --- a/src/widgets/glances/metrics/disk.jsx +++ b/src/widgets/glances/metrics/disk.jsx @@ -24,9 +24,8 @@ export default function Component({ service }) { ); const [ratePoints, setRatePoints] = useState(new Array(pointsLimit).fill({ a: 0, b: 0 }, 0, pointsLimit)); - const { data, error } = useWidgetAPI(service.widget, "diskio", { + const { data, error } = useWidgetAPI(service.widget, `${version}/diskio`, { refreshInterval: Math.max(defaultInterval, refreshInterval), - version, }); const calculateRates = (d) => diff --git a/src/widgets/glances/metrics/fs.jsx b/src/widgets/glances/metrics/fs.jsx index 1a26c2ab..3ec7eb6c 100644 --- a/src/widgets/glances/metrics/fs.jsx +++ b/src/widgets/glances/metrics/fs.jsx @@ -15,9 +15,8 @@ export default function Component({ service }) { const [, fsName] = widget.metric.split("fs:"); const diskUnits = widget.diskUnits === "bbytes" ? "common.bbytes" : "common.bytes"; - const { data, error } = useWidgetAPI(widget, "fs", { + const { data, error } = useWidgetAPI(widget, `${version}/fs`, { refreshInterval: Math.max(defaultInterval, refreshInterval), - version, }); if (error) { diff --git a/src/widgets/glances/metrics/gpu.jsx b/src/widgets/glances/metrics/gpu.jsx index cc8504fa..174ae2e0 100644 --- a/src/widgets/glances/metrics/gpu.jsx +++ b/src/widgets/glances/metrics/gpu.jsx @@ -21,9 +21,8 @@ export default function Component({ service }) { const [dataPoints, setDataPoints] = useState(new Array(pointsLimit).fill({ a: 0, b: 0 }, 0, pointsLimit)); - const { data, error } = useWidgetAPI(widget, "gpu", { + const { data, error } = useWidgetAPI(widget, `${version}/gpu`, { refreshInterval: Math.max(defaultInterval, refreshInterval), - version, }); useEffect(() => { diff --git a/src/widgets/glances/metrics/info.jsx b/src/widgets/glances/metrics/info.jsx index a90cbdb5..1ee47b98 100644 --- a/src/widgets/glances/metrics/info.jsx +++ b/src/widgets/glances/metrics/info.jsx @@ -76,14 +76,12 @@ export default function Component({ service }) { const { widget } = service; const { chart, refreshInterval = defaultInterval, version = 3 } = widget; - const { data: quicklookData, errorL: quicklookError } = useWidgetAPI(service.widget, "quicklook", { + const { data: quicklookData, errorL: quicklookError } = useWidgetAPI(service.widget, `${version}/quicklook`, { refreshInterval, - version, }); - const { data: systemData, errorL: systemError } = useWidgetAPI(service.widget, "system", { + const { data: systemData, errorL: systemError } = useWidgetAPI(service.widget, `${version}/system`, { refreshInterval: defaultSystemInterval, - version, }); if (quicklookError) { diff --git a/src/widgets/glances/metrics/memory.jsx b/src/widgets/glances/metrics/memory.jsx index 87ec0f78..49046a5f 100644 --- a/src/widgets/glances/metrics/memory.jsx +++ b/src/widgets/glances/metrics/memory.jsx @@ -21,9 +21,8 @@ export default function Component({ service }) { const [dataPoints, setDataPoints] = useState(new Array(pointsLimit).fill({ value: 0 }, 0, pointsLimit)); - const { data, error } = useWidgetAPI(service.widget, "mem", { + const { data, error } = useWidgetAPI(service.widget, `${version}/mem`, { refreshInterval: Math.max(defaultInterval(chart), refreshInterval), - version, }); useEffect(() => { diff --git a/src/widgets/glances/metrics/net.jsx b/src/widgets/glances/metrics/net.jsx index a51c8388..c1ec937e 100644 --- a/src/widgets/glances/metrics/net.jsx +++ b/src/widgets/glances/metrics/net.jsx @@ -26,9 +26,8 @@ export default function Component({ service }) { const [dataPoints, setDataPoints] = useState(new Array(pointsLimit).fill({ value: 0 }, 0, pointsLimit)); - const { data, error } = useWidgetAPI(widget, "network", { + const { data, error } = useWidgetAPI(widget, `${version}/network`, { refreshInterval: Math.max(defaultInterval(chart), refreshInterval), - version, }); useEffect(() => { @@ -51,7 +50,7 @@ export default function Component({ service }) { }); } } - }, [data, interfaceName, pointsLimit]); + }, [data, interfaceName, pointsLimit, rxKey, txKey]); if (error) { return ( diff --git a/src/widgets/glances/metrics/process.jsx b/src/widgets/glances/metrics/process.jsx index 24b447cb..b242535e 100644 --- a/src/widgets/glances/metrics/process.jsx +++ b/src/widgets/glances/metrics/process.jsx @@ -26,9 +26,8 @@ export default function Component({ service }) { const memoryInfoKey = version === 3 ? 0 : "data"; - const { data, error } = useWidgetAPI(service.widget, "processlist", { + const { data, error } = useWidgetAPI(service.widget, `${version}/processlist`, { refreshInterval: Math.max(defaultInterval, refreshInterval), - version, }); if (error) { diff --git a/src/widgets/glances/metrics/sensor.jsx b/src/widgets/glances/metrics/sensor.jsx index 9dc28bb1..e0f679c1 100644 --- a/src/widgets/glances/metrics/sensor.jsx +++ b/src/widgets/glances/metrics/sensor.jsx @@ -21,9 +21,8 @@ export default function Component({ service }) { const [dataPoints, setDataPoints] = useState(new Array(pointsLimit).fill({ value: 0 }, 0, pointsLimit)); - const { data, error } = useWidgetAPI(service.widget, "sensors", { + const { data, error } = useWidgetAPI(service.widget, `${version}/sensors`, { refreshInterval: Math.max(defaultInterval, refreshInterval), - version, }); useEffect(() => { diff --git a/src/widgets/glances/widget.js b/src/widgets/glances/widget.js index a824e4c1..3357cf28 100644 --- a/src/widgets/glances/widget.js +++ b/src/widgets/glances/widget.js @@ -1,7 +1,7 @@ import credentialedProxyHandler from "utils/proxy/handlers/credentialed"; const widget = { - api: "{url}/api/{version}/{endpoint}", + api: "{url}/api/{endpoint}", proxyHandler: credentialedProxyHandler, }; From 29ac7bfea7af2e19af38c88f9c583be1806abbb0 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 31 Mar 2024 20:34:46 -0700 Subject: [PATCH 052/136] Feature: Support pi-hole v6 (#3207) --- docs/widgets/services/pihole.md | 1 + src/utils/config/service-helpers.js | 8 ++- src/widgets/pihole/component.jsx | 2 +- src/widgets/pihole/proxy.js | 95 +++++++++++++++++++++++++++++ src/widgets/pihole/widget.js | 14 ++--- 5 files changed, 107 insertions(+), 13 deletions(-) create mode 100644 src/widgets/pihole/proxy.js diff --git a/docs/widgets/services/pihole.md b/docs/widgets/services/pihole.md index 8079d1b1..90d5926c 100644 --- a/docs/widgets/services/pihole.md +++ b/docs/widgets/services/pihole.md @@ -15,6 +15,7 @@ Note: by default the "blocked" and "blocked_percent" fields are merged e.g. "1,2 widget: type: pihole url: http://pi.hole.or.ip + version: 6 # required if running v6 or higher, defaults to 5 key: yourpiholeapikey # optional ``` diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index bee7db4e..bea28278 100644 --- a/src/utils/config/service-helpers.js +++ b/src/utils/config/service-helpers.js @@ -393,8 +393,10 @@ export function cleanServiceGroups(groups) { enableBlocks, enableNowPlaying, - // glances + // glances, pihole version, + + // glances chart, metric, pointsLimit, @@ -528,8 +530,10 @@ export function cleanServiceGroups(groups) { if (snapshotHost) cleanedService.widget.snapshotHost = snapshotHost; if (snapshotPath) cleanedService.widget.snapshotPath = snapshotPath; } - if (type === "glances") { + if (["glances", "pihole"].includes(type)) { if (version) cleanedService.widget.version = version; + } + if (type === "glances") { if (metric) cleanedService.widget.metric = metric; if (chart !== undefined) { cleanedService.widget.chart = chart; diff --git a/src/widgets/pihole/component.jsx b/src/widgets/pihole/component.jsx index a36071a1..4d95b4ac 100644 --- a/src/widgets/pihole/component.jsx +++ b/src/widgets/pihole/component.jsx @@ -9,7 +9,7 @@ export default function Component({ service }) { const { widget } = service; - const { data: piholeData, error: piholeError } = useWidgetAPI(widget, "summaryRaw"); + const { data: piholeData, error: piholeError } = useWidgetAPI(widget); if (piholeError) { return- + + ; diff --git a/src/widgets/pihole/proxy.js b/src/widgets/pihole/proxy.js new file mode 100644 index 00000000..724d4943 --- /dev/null +++ b/src/widgets/pihole/proxy.js @@ -0,0 +1,95 @@ +import cache from "memory-cache"; + +import { httpProxy } from "utils/proxy/http"; +import { formatApiCall } from "utils/proxy/api-helpers"; +import getServiceWidget from "utils/config/service-helpers"; +import createLogger from "utils/logger"; +import widgets from "widgets/widgets"; + +const proxyName = "piholeProxyHandler"; +const logger = createLogger(proxyName); +const sessionSIDCacheKey = `${proxyName}__sessionSID`; + +async function login(widget, service) { + const url = formatApiCall(widgets[widget.type].api, { ...widget, endpoint: "auth" }); + const [status, , data] = await httpProxy(url, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify({ + password: widget.key, + }), + }); + + const dataParsed = JSON.parse(data); + + if (status !== 200 || !dataParsed.session) { + logger.error("Failed to login to Pi-Hole API, status: %d", status); + cache.del(`${sessionSIDCacheKey}.${service}`); + } else { + cache.put(`${sessionSIDCacheKey}.${service}`, dataParsed.session.sid, dataParsed.session.validity); + } +} + +export default async function piholeProxyHandler(req, res) { + const { group, service } = req.query; + let endpoint = "stats/summary"; + + if (!group || !service) { + logger.error("Invalid or missing service '%s' or group '%s'", service, group); + return res.status(400).json({ error: "Invalid proxy service type" }); + } + + const widget = await getServiceWidget(group, service); + if (!widget) { + logger.error("Invalid or missing widget for service '%s' in group '%s'", service, group); + return res.status(400).json({ error: "Invalid widget configuration" }); + } + + let status; + let data; + if (!widget.version || widget.version < 6) { + // pihole v5 + endpoint = "summaryRaw"; + [status, , data] = await httpProxy(formatApiCall(widgets[widget.type].apiv5, { ...widget, endpoint })); + return res.status(status).send(data); + } + + // pihole v6 + if (!cache.get(`${sessionSIDCacheKey}.${service}`)) { + await login(widget, service); + } + + const sid = cache.get(`${sessionSIDCacheKey}.${service}`); + if (!sid) { + return res.status(500).json({ error: "Failed to authenticate with Pi-hole" }); + } + + try { + logger.debug("Calling Pi-hole API endpoint: %s", endpoint); + + [status, , data] = await httpProxy(formatApiCall(widgets[widget.type].api, { ...widget, endpoint }), { + headers: { + "Content-Type": "application/json", + "X-FTL-SID": sid, + }, + }); + + if (status !== 200) { + logger.error("Error calling Pi-Hole API: %d. Data: %s", status, data); + return res.status(status).json({ error: "Pi-Hole API Error", data }); + } + + const dataParsed = JSON.parse(data); + return res.status(status).json({ + domains_being_blocked: dataParsed.gravity.domains_being_blocked, + ads_blocked_today: dataParsed.queries.blocked, + ads_percentage_today: dataParsed.queries.percent_blocked, + dns_queries_today: dataParsed.queries.total, + }); + } catch (error) { + logger.error("Exception calling Pi-Hole API: %s", error.message); + return res.status(500).json({ error: "Pi-Hole API Error", message: error.message }); + } +} diff --git a/src/widgets/pihole/widget.js b/src/widgets/pihole/widget.js index 10b30b1a..54c84832 100644 --- a/src/widgets/pihole/widget.js +++ b/src/widgets/pihole/widget.js @@ -1,15 +1,9 @@ -import genericProxyHandler from "utils/proxy/handlers/generic"; +import piholeProxyHandler from "./proxy"; const widget = { - api: "{url}/admin/api.php?{endpoint}&auth={key}", - proxyHandler: genericProxyHandler, - - mappings: { - summaryRaw: { - endpoint: "summaryRaw", - validate: ["dns_queries_today", "ads_blocked_today", "ads_percentage_today", "domains_being_blocked"], - }, - }, + api: "{url}/api/{endpoint}", + apiv5: "{url}/admin/api.php?{endpoint}&auth={key}", + proxyHandler: piholeProxyHandler, }; export default widget; From 212e517ebbccfb5b3636d808dd95de447ea5f725 Mon Sep 17 00:00:00 2001 From: Jalin Wang + ))} ); diff --git a/src/widgets/truenas/pool.jsx b/src/widgets/truenas/pool.jsx index 8e9d0465..b92ecb68 100644 --- a/src/widgets/truenas/pool.jsx +++ b/src/widgets/truenas/pool.jsx @@ -1,8 +1,18 @@ import classNames from "classnames"; import prettyBytes from "pretty-bytes"; -export default function Pool({ name, free, allocated, healthy }) { - const total = free + allocated; +export default function Pool({ name, free, allocated, healthy, data, nasType }) { + let total = 0; + if (nasType === "scale") { + total = free + allocated; + } else { + allocated = 0; // eslint-disable-line no-param-reassign + for (let i = 0; i < data.length; i += 1) { + total += data[i].stats.size; + allocated += data[i].stats.allocated; // eslint-disable-line no-param-reassign + } + } + const usedPercent = Math.round((allocated / total) * 100); const statusColor = healthy ? "bg-green-500" : "bg-yellow-500"; diff --git a/src/widgets/truenas/widget.js b/src/widgets/truenas/widget.js index 7435b6e1..5f8a38df 100644 --- a/src/widgets/truenas/widget.js +++ b/src/widgets/truenas/widget.js @@ -25,6 +25,7 @@ const widget = { healthy: entry.healthy, allocated: entry.allocated, free: entry.free, + data: entry.topology.data, })), }, }, From 60db01cc57b99c6d5d35b478e9a70fd4d883d0d9 Mon Sep 17 00:00:00 2001 From: XavierDupuis
Allowed fields: `["result", "status"]`. -2. Pull Requests: returns the amount of open PRs, the amount of the PRs you have open, and how many PRs that you open are marked as 'Approved' by at least 1 person and not yet completed.\ +2. Pull Requests: returns the amount of open PRs, the amount of the PRs you have open, and how many PRs that you open are marked as 'Approved' by at least 1 person and not yet completed.
Allowed fields: `["totalPrs", "myPrs", "approved"]`. You will need to generate a personal access token for an existing user, see the [azure documentation](https://learn.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate?view=azure-devops&tabs=Windows#create-a-pat) diff --git a/docs/widgets/services/crowdsec.md b/docs/widgets/services/crowdsec.md index 608367df..76b8efaa 100644 --- a/docs/widgets/services/crowdsec.md +++ b/docs/widgets/services/crowdsec.md @@ -8,7 +8,7 @@ Learn more about [Crowdsec](https://crowdsec.net). See the [crowdsec docs](https://docs.crowdsec.net/docs/local_api/intro/#machines) for information about registering a machine, in most instances you can use the default credentials (`/etc/crowdsec/local_api_credentials.yaml`). -Allowed fields: ["alerts", "bans"] +Allowed fields: `["alerts", "bans"]`. ```yaml widget: diff --git a/docs/widgets/services/gitea.md b/docs/widgets/services/gitea.md index da695a9a..140c4ee7 100644 --- a/docs/widgets/services/gitea.md +++ b/docs/widgets/services/gitea.md @@ -7,7 +7,7 @@ Learn more about [Gitea](https://gitea.com). API token requires `notifications`, `repository` and `issue` permissions. See the [gitea documentation](https://docs.gitea.com/development/api-usage#generating-and-listing-api-tokens) for details on generating tokens. -Allowed fields: ["notifications", "issues", "pulls"] +Allowed fields: `["notifications", "issues", "pulls"]`. ```yaml widget: diff --git a/docs/widgets/services/peanut.md b/docs/widgets/services/peanut.md index 63d75bbf..eca349b9 100644 --- a/docs/widgets/services/peanut.md +++ b/docs/widgets/services/peanut.md @@ -9,7 +9,7 @@ This widget adds support for [Network UPS Tools](https://networkupstools.org/) v The default ups name is `ups`. To configure more than one ups, you must create multiple peanut services. -Allowed fields: `["battery_charge", "ups_load", "ups_status"]` +Allowed fields: `["battery_charge", "ups_load", "ups_status"]`. !!! note diff --git a/docs/widgets/services/prometheus.md b/docs/widgets/services/prometheus.md index 02560c91..beb04b5e 100644 --- a/docs/widgets/services/prometheus.md +++ b/docs/widgets/services/prometheus.md @@ -5,7 +5,7 @@ description: Prometheus Widget Configuration Learn more about [Prometheus](https://github.com/prometheus/prometheus). -Allowed fields: `["targets_up", "targets_down", "targets_total"]` +Allowed fields: `["targets_up", "targets_down", "targets_total"]`. ```yaml widget: diff --git a/docs/widgets/services/pterodactyl.md b/docs/widgets/services/pterodactyl.md index 76e0f6ce..abf5899b 100644 --- a/docs/widgets/services/pterodactyl.md +++ b/docs/widgets/services/pterodactyl.md @@ -5,7 +5,7 @@ description: Pterodactyl Widget Configuration Learn more about [Pterodactyl](https://github.com/pterodactyl). -Allowed fields: `["nodes", "servers"]` +Allowed fields: `["nodes", "servers"]`. ```yaml widget: From 9904c2db2fd8fbc42be89d171564d02f6101f646 Mon Sep 17 00:00:00 2001 From: mrmorganmurphy <22598031+mrmorganmurphy@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:03:12 -0700 Subject: [PATCH 064/136] Documentation: update diskstation instructions (#3230) --- docs/widgets/services/diskstation.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/widgets/services/diskstation.md b/docs/widgets/services/diskstation.md index 36010bfa..55e28355 100644 --- a/docs/widgets/services/diskstation.md +++ b/docs/widgets/services/diskstation.md @@ -11,22 +11,27 @@ An optional 'volume' parameter can be supplied to specify which volume's free sp Allowed fields: `["uptime", "volumeAvailable", "resources.cpu", "resources.mem"]`. -To access these system metrics you need to connect to the DiskStation with an account that is a member of the default `Administrators` group. That is because these metrics are requested from the API's `SYNO.Core.System` part that is only available to admin users. In order to keep the security impact as small as possible we can set the account in DSM up to limit the user's permissions inside the Synology system. In DSM 7.x, for instance, follow these steps: +To access these system metrics you need to connect to the DiskStation (`DSM`) with an account that is a member of the default `Administrators` group. That is because these metrics are requested from the API's `SYNO.Core.System` part that is only available to admin users. In order to keep the security impact as small as possible we can set the account in DSM up to limit the user's permissions inside the Synology system. In DSM 7.x, for instance, follow these steps: 1. Create a new user, i.e. `remote_stats`. 2. Set up a strong password for the new user 3. Under the `User Groups` tab of the user config dialogue check the box for `Administrators`. 4. On the `Permissions` tab check the top box for `No Access`, effectively prohibiting the user from accessing anything in the shared folders. 5. Under `Applications` check the box next to `Deny` in the header to explicitly prohibit login to all applications. -6. Now _only_ allow login to the `Download Station` application, either by +6. Now _only_ allow login to the `DSM` application, either by - unchecking `Deny` in the respective row, or (if inheriting permission doesn't work because of other group settings) - checking `Allow` for this app, or - checking `By IP` for this app to limit the source of login attempts to one or more IP addresses/subnets. -7. When the `Preview` column shows `Allow` in the `Download Station` row, click `Save`. +7. When the `Preview` column shows `Allow` in the `DSM` row, click `Save`. Now configure the widget with the correct login information and test it. -If you encounter issues during testing, make sure to uncheck the option for automatic blocking due to invalid logins under `Control Panel > Security > Protection`. If desired, this setting can be reactivated once the login is established working. +If you encounter issues during testing: + +1. Make sure to uncheck the option for automatic blocking due to invalid logins under `Control Panel > Security > Protection`. + - If desired, this setting can be reactivated once the login is established working. +2. Login to your Synology DSM with the newly created account and accept terms and conditions. +3. Reattempt ```yaml widget: From d49a06efd983c36b37af941ec1574048d0fee10f Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 6 Apr 2024 17:35:12 -0700 Subject: [PATCH 065/136] Fix: rename pialert to netalertx (#3253) --- docs/widgets/services/netalertx.md | 16 +++++++++ docs/widgets/services/pialert.md | 16 --------- public/locales/en/common.json | 2 +- src/widgets/components.js | 3 +- src/widgets/netalertx/component.jsx | 37 ++++++++++++++++++++ src/widgets/{pialert => netalertx}/widget.js | 0 src/widgets/pialert/component.jsx | 37 -------------------- src/widgets/widgets.js | 5 +-- 8 files changed, 59 insertions(+), 57 deletions(-) create mode 100644 docs/widgets/services/netalertx.md delete mode 100644 docs/widgets/services/pialert.md create mode 100644 src/widgets/netalertx/component.jsx rename src/widgets/{pialert => netalertx}/widget.js (100%) delete mode 100644 src/widgets/pialert/component.jsx diff --git a/docs/widgets/services/netalertx.md b/docs/widgets/services/netalertx.md new file mode 100644 index 00000000..4579d74c --- /dev/null +++ b/docs/widgets/services/netalertx.md @@ -0,0 +1,16 @@ +--- +title: NetAlertX +description: NetAlertX (formerly PiAlert) Widget Configuration +--- + +Learn more about [NetAlertX](https://github.com/jokob-sk/NetAlertX). + +_Note that the project was renamed from PiAlert to NetAlertX._ + +Allowed fields: `["total", "connected", "new_devices", "down_alerts"]`. + +```yaml +widget: + type: netalertx + url: http://ip:port +``` diff --git a/docs/widgets/services/pialert.md b/docs/widgets/services/pialert.md deleted file mode 100644 index ab8fb1e9..00000000 --- a/docs/widgets/services/pialert.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: PiAlert -description: PiAlert Widget Configuration ---- - -Learn more about [PiAlert](https://github.com/jokob-sk/Pi.Alert). - -Note that [pucherot/PiAlert](https://github.com/pucherot/Pi.Alert) has been abandoned and might not work properly. - -Allowed fields: `["total", "connected", "new_devices", "down_alerts"]`. - -```yaml -widget: - type: pialert - url: http://ip:port -``` diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 98daae9e..3ac3ed0d 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -277,7 +277,7 @@ "approved": "Approved", "available": "Available" }, - "pialert": { + "netalertx": { "total": "Total", "connected": "Connected", "new_devices": "New Devices", diff --git a/src/widgets/components.js b/src/widgets/components.js index 8c85bd77..500fe0ce 100644 --- a/src/widgets/components.js +++ b/src/widgets/components.js @@ -63,6 +63,7 @@ const components = { moonraker: dynamic(() => import("./moonraker/component")), mylar: dynamic(() => import("./mylar/component")), navidrome: dynamic(() => import("./navidrome/component")), + netalertx: dynamic(() => import("./netalertx/component")), netdata: dynamic(() => import("./netdata/component")), nextcloud: dynamic(() => import("./nextcloud/component")), nextdns: dynamic(() => import("./nextdns/component")), @@ -80,7 +81,7 @@ const components = { pfsense: dynamic(() => import("./pfsense/component")), photoprism: dynamic(() => import("./photoprism/component")), proxmoxbackupserver: dynamic(() => import("./proxmoxbackupserver/component")), - pialert: dynamic(() => import("./pialert/component")), + pialert: dynamic(() => import("./netalertx/component")), pihole: dynamic(() => import("./pihole/component")), plantit: dynamic(() => import("./plantit/component")), plex: dynamic(() => import("./plex/component")), diff --git a/src/widgets/netalertx/component.jsx b/src/widgets/netalertx/component.jsx new file mode 100644 index 00000000..5172121e --- /dev/null +++ b/src/widgets/netalertx/component.jsx @@ -0,0 +1,37 @@ +import { useTranslation } from "next-i18next"; + +import Container from "components/services/widget/container"; +import Block from "components/services/widget/block"; +import useWidgetAPI from "utils/proxy/use-widget-api"; + +export default function Component({ service }) { + const { t } = useTranslation(); + + const { widget } = service; + + const { data: netalertxData, error: netalertxError } = useWidgetAPI(widget, "data"); + + if (netalertxError) { + return; + } + + if (!netalertxData) { + return ( + + + ); + } + + return ( ++ + + + + + ); +} diff --git a/src/widgets/pialert/widget.js b/src/widgets/netalertx/widget.js similarity index 100% rename from src/widgets/pialert/widget.js rename to src/widgets/netalertx/widget.js diff --git a/src/widgets/pialert/component.jsx b/src/widgets/pialert/component.jsx deleted file mode 100644 index 49bef897..00000000 --- a/src/widgets/pialert/component.jsx +++ /dev/null @@ -1,37 +0,0 @@ -import { useTranslation } from "next-i18next"; - -import Container from "components/services/widget/container"; -import Block from "components/services/widget/block"; -import useWidgetAPI from "utils/proxy/use-widget-api"; - -export default function Component({ service }) { - const { t } = useTranslation(); - - const { widget } = service; - - const { data: pialertData, error: pialertError } = useWidgetAPI(widget, "data"); - - if (pialertError) { - return+ + + + ; - } - - if (!pialertData) { - return ( - - - ); - } - - return ( -- - - - - - ); -} diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js index 6e02d932..7ed98bfb 100644 --- a/src/widgets/widgets.js +++ b/src/widgets/widgets.js @@ -55,6 +55,7 @@ import mjpeg from "./mjpeg/widget"; import moonraker from "./moonraker/widget"; import mylar from "./mylar/widget"; import navidrome from "./navidrome/widget"; +import netalertx from "./netalertx/widget"; import netdata from "./netdata/widget"; import nextcloud from "./nextcloud/widget"; import nextdns from "./nextdns/widget"; @@ -73,7 +74,6 @@ import peanut from "./peanut/widget"; import pfsense from "./pfsense/widget"; import photoprism from "./photoprism/widget"; import proxmoxbackupserver from "./proxmoxbackupserver/widget"; -import pialert from "./pialert/widget"; import pihole from "./pihole/widget"; import plantit from "./plantit/widget"; import plex from "./plex/widget"; @@ -171,6 +171,7 @@ const widgets = { moonraker, mylar, navidrome, + netalertx, netdata, nextcloud, nextdns, @@ -189,7 +190,7 @@ const widgets = { pfsense, photoprism, proxmoxbackupserver, - pialert, + pialert: netalertx, pihole, plantit, plex, From f82a122e26ce843075269ae380dd71b9af516423 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 6 Apr 2024 20:00:16 -0700 Subject: [PATCH 066/136] Fix site monitor with error --- src/components/services/site-monitor.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/services/site-monitor.jsx b/src/components/services/site-monitor.jsx index 4e70c80a..3d5ef79e 100644 --- a/src/components/services/site-monitor.jsx +++ b/src/components/services/site-monitor.jsx @@ -12,7 +12,7 @@ export default function SiteMonitor({ group, service, style }) { let statusTitle = t("siteMonitor.http_status"); let statusText = ""; - if (error) { + if (error || (data && data.error)) { colorClass = "text-rose-500"; statusText = t("siteMonitor.error"); statusTitle += ` ${t("siteMonitor.error")}`; From 4239e8fe97ef064ed5ea2fd89cd65106032f73f7 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 8 Apr 2024 07:58:41 -0700 Subject: [PATCH 067/136] Update contributing / development guidelines --- CONTRIBUTING.md | 6 +++++- docs/more/development.md | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 48f2818d..d3b07697 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,11 +48,15 @@ Please see information in the docs regarding [code formatting with pre-commit ho By contributing, you agree that your contributions will be licensed under its GNU General Public License. +## Use of AI for pull requests + +In general, homepage does not accept "AI-generated" PRs. If you choose to use something like that to aid the development process to generate a significant proportion of the pull request, please make sure this is explicitly stated in the PR itself. + ## References This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebook/draft-js/blob/main/CONTRIBUTING.md) -# Automatic Respository Maintenance +## Automatic Respository Maintenance The homepage team appreciates all effort and interest from the community in filing bug reports, creating feature requests, sharing ideas and helping other community members. That said, in an effort to keep the repository organized and managebale the project uses automatic handling of certain areas: diff --git a/docs/more/development.md b/docs/more/development.md index 8e3fac13..ec580cff 100644 --- a/docs/more/development.md +++ b/docs/more/development.md @@ -39,6 +39,11 @@ Once installed, hooks will run when you commit. If the formatting isn't quite ri See the [pre-commit documentation](https://pre-commit.com/#install) to get started. +## Preferring self-hosted open-source software + +In general, homepage is meant to be a dashboard for 'self-hosted' services and we believe it is a small way we can help showcase this kind of software. While exceptions are made, mostly when there is no viable +self-hosted / open-source alternative, we ask that any widgets, etc. are developed primarily for a self-hosted tool. + ## New Feature Guidelines - New features should be linked to an existing feature request with at least 10 'up-votes'. The purpose of this requirement is to avoid the addition (and maintenance) of features that might only benefit a small number of users. From ffad2b890ee3bccf9ac40c4b9dc2e941d733d806 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 10:20:52 -0700 Subject: [PATCH 068/136] New Crowdin translations by GitHub Action (#3199) Co-authored-by: Crowdin Bot- - - - {Name} {SeriesName && ` - ${SeriesName}`} + {enableUser && ` (${UserName})`}@@ -97,10 +99,11 @@ function SingleSessionEntry({ playCommand, session }) { ); } -function SessionEntry({ playCommand, session }) { +function SessionEntry({ playCommand, session, enableUser }) { const { NowPlayingItem: { Name, SeriesName }, PlayState: { PositionTicks, IsPaused, IsMuted }, + UserName, } = session; const RunTimeTicks = @@ -142,6 +145,7 @@ function SessionEntry({ playCommand, session }) {{Name} {SeriesName && ` - ${SeriesName}`} + {enableUser && ` (${UserName})`}{IsMuted &&@@ -215,6 +219,7 @@ export default function Component({ service }) { const enableBlocks = service.widget?.enableBlocks; const enableNowPlaying = service.widget?.enableNowPlaying ?? true; + const enableUser = !!service.widget?.enableUser; if (!sessionsData || !countData) { return ( @@ -272,6 +277,7 @@ export default function Component({ service }) {} handlePlayCommand(currentSession, command)} session={session} + enableUser={enableUser} />
+
-
+
+ 
+
+Homepage builds are kindly powered by DigitalOcean. +
+ # Features With features like quick search, bookmarks, weather support, a wide range of integrations and widgets, an elegant and modern design, and a focus on performance, Homepage is your ideal start to the day and a handy companion throughout it. diff --git a/docs/index.md b/docs/index.md index 97a3704b..fe1c0adf 100644 --- a/docs/index.md +++ b/docs/index.md @@ -17,3 +17,10 @@ hide: A modern, fully static, fast, secure fully proxied, highly customizable application dashboard with integrations for over 100 services and translations into multiple languages. Easily configured via YAML files or through docker label discovery.  + +
+
+
+Homepage builds are kindly powered by DigitalOcean. +
From c6770d233cff863019e5c096496fde98467ed905 Mon Sep 17 00:00:00 2001 From: quietsy
-
+ 
Homepage builds are kindly powered by DigitalOcean.
From b3cf985d4a522a666544c7cea92ab56af8520d71 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sun, 2 Jun 2024 20:11:03 -0700
Subject: [PATCH 108/136] Merge pull request from GHSA-24m5-7vjx-9x37
* Restrict emby endpoints and proxy segments
* Dont allow path traversal in segments
* Restrict qbittorrent proxy endpoints
* Restrict npm proxy endpoints
* Restrict flood proxy endpoints
* Restrict tdarr proxy endpoints
* Restrict xteve proxy endpoints
* Restrict transmission proxy endpoints
* disallow non-mapped endpoints
this change drops all requests that have un-mapped endpoint queries
allowedEndpoints is added as a method to pass proxy requests via a regex on the endpoint
most widgets with custom proxies use either no endpoint, or a static one
Co-Authored-By: Ben Phelps x3PVfn2UGZ|&GhesgK^=nLveqgzoyh(mW{seP5@&Z
zBfJC^J+|Oh2FyU_1I3WIDY;YSNc!@&^QE*H?*7`W06nM7iD%!vB+0vZ-{4=*#<-<~
zw1n4UbQ+eMg6ZdWYGN%%brg4oW_l)wJ5DiqQBqEV8{G%?nJp-jsCU?LR<~=|6={!y
zjz$x~vz;HTHo*|}6$X(k?^2eH*rI+*EGA9(3D-kC*80jfz^$Cq+x5a~oZ~zfUM0{M
z3_6^35jpVZ?u*E@tIYwJo!Ucl(lbfZZ