fix: avoid blocking URL ending with routes.json (#185)

manekinekko · web-flow · commit 16c4f35df819 · 2021-04-16T15:15:18.000+02:00
Fixes #183
diff --git a/src/proxy/server.ts b/src/proxy/server.ts
@@ -174,12 +174,12 @@ const requestHandler = (userConfig: SWAConfigFile | null) =>
     }
 
     // don't serve staticwebapp.config.json / routes.json
-    if (req.url.endsWith(DEFAULT_CONFIG.swaConfigFilename!) || req.url.endsWith(DEFAULT_CONFIG.swaConfigFilenameLegacy!)) {
+    if (req.url.endsWith(`/${DEFAULT_CONFIG.swaConfigFilename!}`) || req.url.endsWith(`/${DEFAULT_CONFIG.swaConfigFilenameLegacy!}`)) {
       req.url = "404.html";
       res.statusCode = 404;
       serve(SWA_PUBLIC_DIR, req, res);
 
-      logRequest(req, PROTOCOL + "://" + req.headers.host + req.url, 404);
+      logRequest(req, PROTOCOL + "://" + req.headers.host, 404);
     }
 
     // proxy AUTH request to AUTH emulator

Original file line number	Diff line number	Diff line change
`@@ -174,12 +174,12 @@ const requestHandler = (userConfig: SWAConfigFile \| null) =>`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`// don't serve staticwebapp.config.json / routes.json`
`177`		`- if (req.url.endsWith(DEFAULT_CONFIG.swaConfigFilename!) \|\| req.url.endsWith(DEFAULT_CONFIG.swaConfigFilenameLegacy!)) {`
	`177`	+ if (req.url.endsWith(`/${DEFAULT_CONFIG.swaConfigFilename!}`) \|\| req.url.endsWith(`/${DEFAULT_CONFIG.swaConfigFilenameLegacy!}`)) {
`178`	`178`	`req.url = "404.html";`
`179`	`179`	`res.statusCode = 404;`
`180`	`180`	`serve(SWA_PUBLIC_DIR, req, res);`
`181`	`181`
`182`		`- logRequest(req, PROTOCOL + "://" + req.headers.host + req.url, 404);`
	`182`	`+ logRequest(req, PROTOCOL + "://" + req.headers.host, 404);`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`// proxy AUTH request to AUTH emulator`