Skip to content

Commit 292a63d

Browse files
authored
Merge branch 'main' into release/v4.9.0
2 parents 60ab23f + f43082e commit 292a63d

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ install_aur() {
387387
if [ ! "${DRY_RUN-}" ]; then
388388
cd "$CACHE_DIR/code-server-aur"
389389
fi
390-
sh_c makepkg -si
390+
sh_c makepkg -si --noconfirm
391391

392392
echo_systemd_postinstall AUR
393393
}

src/browser/security.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Contact: mailto:[email protected]
2+
Acknowledgments: https://coder.com/security/thanks
3+
Preferred-Languages: en-US
4+
Canonical: https://coder.com/.well-known/security.txt
5+
Policy: https://coder.com/security/policy
6+
Hiring: https://coder.com/careers

src/node/routes/index.ts

+7
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ export const register = async (app: App, args: DefaultedArgs): Promise<Disposabl
8181
return res.redirect(`https://${req.headers.host}${req.originalUrl}`)
8282
}
8383

84+
// Return security.txt.
85+
if (req.originalUrl === "/security.txt" || req.originalUrl === "/.well-known/security.txt") {
86+
const resourcePath = path.resolve(rootPath, "src/browser/security.txt")
87+
res.set("Content-Type", getMediaMime(resourcePath))
88+
return res.send(await fs.readFile(resourcePath))
89+
}
90+
8491
// Return robots.txt.
8592
if (req.originalUrl === "/robots.txt") {
8693
const resourcePath = path.resolve(rootPath, "src/browser/robots.txt")

0 commit comments

Comments
 (0)