aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorJakob Borg <jakob@kastelo.net>2023-11-14 11:57:39 +0100
committerGitHub <noreply@github.com>2023-11-14 11:57:39 +0100
commit439c6c5b7c64eb8f06d2cd4d8f66e27d0e277d2d (patch)
tree355e712079d49f8233ca0396cdda9a89a4f242d4 /gui
parentaaee0c126b8aef480489f157eab34bdacaf92499 (diff)
downloadsyncthing-439c6c5b7c64eb8f06d2cd4d8f66e27d0e277d2d.tar.gz
syncthing-439c6c5b7c64eb8f06d2cd4d8f66e27d0e277d2d.zip
lib/api: Add cache busting for basic auth (ref #9208) (#9215)v1.27.0-rc.1
This adds our short device ID to the basic auth realm. This has at least two consequences: - It is different from what's presented by another device on the same address (e.g., if I use SSH forwards to different dives on the same local address), preventing credentials for one from being sent to another. - It is different from what we did previously, meaning we avoid cached credentials from old versions interfering with the new login flow. I don't *think* there should be things that depend on our precise realm string, so this shouldn't break any existing setups... Sneakily this also changes the session cookie and CSRF name, because I think `id.Short().String()` is nicer than `id.String()[:5]` and the short ID is two characters longer. That's also not a problem...
Diffstat (limited to 'gui')
-rw-r--r--gui/default/syncthing/app.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/gui/default/syncthing/app.js b/gui/default/syncthing/app.js
index 80e9a20d7..0a961f508 100644
--- a/gui/default/syncthing/app.js
+++ b/gui/default/syncthing/app.js
@@ -39,9 +39,8 @@ syncthing.config(function ($httpProvider, $translateProvider, LocaleServiceProvi
return;
}
- var deviceIDShort = metadata.deviceID.substr(0, 5);
- $httpProvider.defaults.xsrfHeaderName = 'X-CSRF-Token-' + deviceIDShort;
- $httpProvider.defaults.xsrfCookieName = 'CSRF-Token-' + deviceIDShort;
+ $httpProvider.defaults.xsrfHeaderName = 'X-CSRF-Token-' + metadata.deviceIDShort;
+ $httpProvider.defaults.xsrfCookieName = 'CSRF-Token-' + metadata.deviceIDShort;
});
// @TODO: extract global level functions into separate service(s)