TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-18 02:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

client/web: pass URL prefix to frontend

Browse Source 
This allows wouter to route URLs properly when running in CGI mode.

Updates tailscale/corp#14335

Signed-off-by: Will Norris <will@tailscale.com>
This commit is contained in:
Will Norris 2023-11-07 11:11:33 -08:00 committed by Will Norris
parent 0753ad6cf8
commit 623f669239
3 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
client/web/src/components/app.tsx
View File

@ -8,7 +8,7 @@ import useAuth, { AuthResponse } from "src/hooks/auth"
import useNodeData, { NodeData, NodeUpdate } from "src/hooks/node-data" import useNodeData, { NodeData, NodeUpdate } from "src/hooks/node-data"
import { ReactComponent as TailscaleIcon } from "src/icons/tailscale-icon.svg" import { ReactComponent as TailscaleIcon } from "src/icons/tailscale-icon.svg"
import ProfilePic from "src/ui/profile-pic" import ProfilePic from "src/ui/profile-pic"
import { Link, Route, Switch, useLocation } from "wouter" import { Link, Route, Router, Switch, useLocation } from "wouter"
import DeviceDetailsView from "./views/device-details-view" import DeviceDetailsView from "./views/device-details-view"
export default function App() { export default function App() {
@ -46,30 +46,32 @@ function WebClient({
{/* TODO(sonia): get rid of the conditions here once full/readonly {/* TODO(sonia): get rid of the conditions here once full/readonly
* views live on same components */} * views live on same components */}
{data.DebugMode === "full" && auth?.ok && <Header node={data} />} {data.DebugMode === "full" && auth?.ok && <Header node={data} />}
<Switch> <Router base={data.URLPrefix}>
<Route path="/"> <Switch>
<HomeView <Route path="/">
auth={auth} <HomeView
data={data} auth={auth}
newSession={newSession} data={data}
refreshData={refreshData} newSession={newSession}
updateNode={updateNode} refreshData={refreshData}
/> updateNode={updateNode}
</Route> />
{data.DebugMode !== "" && ( </Route>
<> {data.DebugMode !== "" && (
<Route path="/details"> <>
<DeviceDetailsView node={data} /> <Route path="/details">
</Route> <DeviceDetailsView node={data} />
<Route path="/subnets">{/* TODO */}Subnet router</Route> </Route>
<Route path="/ssh">{/* TODO */}Tailscale SSH server</Route> <Route path="/subnets">{/* TODO */}Subnet router</Route>
<Route path="/serve">{/* TODO */}Share local content</Route> <Route path="/ssh">{/* TODO */}Tailscale SSH server</Route>
</> <Route path="/serve">{/* TODO */}Share local content</Route>
)} </>
<Route> )}
<h2 className="mt-8">Page not found</h2> <Route>
</Route> <h2 className="mt-8">Page not found</h2>
</Switch> </Route>
</Switch>
</Router>
</> </>
) )
} }

1
client/web/src/hooks/node-data.ts
View File

@ -15,6 +15,7 @@ export type NodeData = {
IsUnraid: boolean IsUnraid: boolean
UnraidToken: string UnraidToken: string
IPNVersion: string IPNVersion: string
URLPrefix: string
DebugMode: "" | "login" | "full" // empty when not running in any debug mode DebugMode: "" | "login" | "full" // empty when not running in any debug mode
} }

2
client/web/web.go
View File

@ -504,6 +504,7 @@ type nodeData struct {
UnraidToken string UnraidToken string
IPNVersion string IPNVersion string
DebugMode string // empty when not running in any debug mode DebugMode string // empty when not running in any debug mode
URLPrefix string // if set, the URL prefix the client is served behind
} }
func (s *Server) serveGetNodeData(w http.ResponseWriter, r *http.Request) { func (s *Server) serveGetNodeData(w http.ResponseWriter, r *http.Request) {
@ -537,6 +538,7 @@ func (s *Server) serveGetNodeData(w http.ResponseWriter, r *http.Request) {
IsUnraid: distro.Get() == distro.Unraid, IsUnraid: distro.Get() == distro.Unraid,
UnraidToken: os.Getenv("UNRAID_CSRF_TOKEN"), UnraidToken: os.Getenv("UNRAID_CSRF_TOKEN"),
IPNVersion: versionShort, IPNVersion: versionShort,
URLPrefix: strings.TrimSuffix(s.pathPrefix, "/"),
DebugMode: debugMode, // TODO(sonia,will): just pass back s.mode directly? DebugMode: debugMode, // TODO(sonia,will): just pass back s.mode directly?
} }
for _, r := range prefs.AdvertiseRoutes { for _, r := range prefs.AdvertiseRoutes {