Skip to content

fix: correctly parse the path in getloc #4940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

fix: correctly parse the path in getloc #4940

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6068fe
fix: correctly parse the path in getloc
K3das Sep 16, 2025
414eb45
fix: properly trim settings-related paths
K3das Sep 16, 2025
888877e
fix: check that settings is in the path
K3das Sep 16, 2025
50ea832
fix: formatting
K3das Sep 16, 2025
0949dd1
fix: cover trailing file cases and coderabbit changes
K3das Sep 16, 2025
aea1a0f
fix: simplify slice logic
K3das Sep 18, 2025
e948f68
fix: cleaner path logic
K3das Sep 18, 2025
b4e1394
fix: trailing spaces
K3das Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions wled00/data/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ function getLoc() {
localStorage.setItem('locIp', locip);
}
} else {
// detect reverse proxy
let path = l.pathname;
let paths = path.slice(1,path.endsWith('/')?-1:undefined).split("/");
if (paths.length > 1) paths.pop(); // remove subpage (or "settings")
if (paths.length > 0 && paths[paths.length-1]=="settings") paths.pop(); // remove "settings"
if (paths.length > 1) {
// guess the base url if WLED is behind a reverse proxy
let paths = l.pathname.split("/").slice(1); // first is always empty
let settingsIndex = paths.lastIndexOf("settings");
paths = paths.slice(0, settingsIndex); // if we don't have "settings", remove last entry (empty / or file)

if (paths.length > 0) {
locproto = l.protocol;
loc = true;
locip = l.hostname + (l.port ? ":" + l.port : "") + "/" + paths.join('/');
Expand Down