Merge conflicts

Author: Katie Horne

.github/dependabot.yml

@@ -19,7 +19,7 @@ updates:
       time: "11:00"
     ignore:
       - dependency-name: "@types/node"
-        versions: ["15.x", "14.x", "13.x"]
+        update-types: ["version-update:semver-major"]
       - dependency-name: "xdg-basedir"
         # 5.0.0 has breaking changes as they switch to named exports
         # and convert the module to ESM

.github/workflows/ci.yaml

@@ -16,8 +16,9 @@ on:
 
 jobs:
   prebuild:
-    name: Pre-build checks
+    name: Pre-Build checks
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     env:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     steps:
@@ -65,6 +66,7 @@ jobs:
     name: Run audit-ci
     needs: prebuild
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -95,6 +97,7 @@ jobs:
     name: Build
     needs: prebuild
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v2
         with:
@@ -170,6 +173,7 @@ jobs:
     name: x86-64 Linux build
     needs: build
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     container: "centos:7"
 
     steps:
@@ -240,6 +244,7 @@ jobs:
     name: Linux ARM64 cross-compile build
     needs: build
     runs-on: ubuntu-16.04
+    timeout-minutes: 15
     env:
       AR: aarch64-linux-gnu-ar
       CC: aarch64-linux-gnu-gcc
@@ -293,6 +298,7 @@ jobs:
     name: x86-64 macOS build
     needs: build
     runs-on: macos-latest
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v2
 
@@ -333,6 +339,7 @@ jobs:
     name: End-to-end tests
     needs: package-linux-amd64
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     env:
       # Since we build code-server we might as well run tests from the release
       # since VS Code will load faster due to the bundling.

docs/guide.md

@@ -10,7 +10,7 @@
     - [Using a self-signed certificate](#using-a-self-signed-certificate)
   - [External authentication](#external-authentication)
   - [HTTPS](#https)
-  - [Securely accessing development web services](#securely-accessing-development-web-services)
+    - [Self Signed Certificate](#self-signed-certificate)
     - [Using a subdomain](#using-a-subdomain)
     - [Using a subpath](#using-a-subpath)
     - [Stripping `/proxy/<port>` from the request path](#stripping-proxyport-from-the-request-path)
@@ -202,6 +202,10 @@ At this point, you should be able to access code-server via
 At this point, you should be able to access code-server via
 `https://mydomain.com`.
 
+> If you set `proxy_set_header Host $host;` in your reverse proxy config, it
+> will change the address displayed in the green section of code-server in the
+> bottom left to show the correct address.
+
 ### Using a self-signed certificate
 
 > Self signed certificates do not work with iPad; see [./ipad.md](./ipad.md) for
@@ -276,7 +280,7 @@ redirect all HTTP requests to HTTPS.
 > You can use [Let's Encrypt](https://letsencrypt.org/) to get a TLS certificate
 for free.
 
-## Securely accessing development web services
+### Self Signed Certificate
 
 If you're working on a web service and want to access it locally, code-server
 can proxy to any port using either a subdomain or a subpath, allowing you to

docs/install.md

@@ -2,6 +2,7 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # Install
 
+<<<<<<< HEAD
 - [Install](#install)
   - [install.sh](#installsh)
     - [Detection reference](#detection-reference)
@@ -16,6 +17,22 @@
   - [Raspberry Pi](#raspberry-pi)
   - [Termux](#termux)
   - [Cloud providers](#cloud-providers)
+=======
+- [Install](#install)
+  - [install.sh](#installsh)
+    - [Detection reference](#detection-reference)
+  - [yarn, npm](#yarn-npm)
+  - [Standalone releases](#standalone-releases)
+  - [Debian, Ubuntu](#debian-ubuntu)
+  - [Fedora, CentOS, RHEL, SUSE](#fedora-centos-rhel-suse)
+  - [Arch Linux](#arch-linux)
+  - [macOS](#macos)
+  - [Docker](#docker)
+  - [Helm](#helm)
+  - [Raspberry Pi](#raspberry-pi)
+  - [Termux](#termux)
+  - [Cloud providers](#cloud-providers)
+>>>>>>> main
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -247,3 +264,4 @@ information.
 We maintain [one-click apps and install scripts for cloud
 providers](https://github.com/cdr/deploy-code-server) such as DigitalOcean,
 Railway, Heroku, and Azure.
+[https://github.com/cdr/deploy-code-server](https://github.com/cdr/deploy-code-server)

docs/npm.md

@@ -9,6 +9,7 @@
   - [Alpine](#alpine)
   - [macOS](#macos)
   - [FreeBSD](#freebsd)
+  - [Issues with Node.js after version upgrades](#issues-with-nodejs-after-version-upgrades)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -63,3 +64,23 @@ xcode-select --install
 pkg install -y git python npm-node14 yarn-node14 pkgconf
 pkg install -y libinotify
 ```
+
+## Issues with Node.js after version upgrades
+
+Occasionally, you may run into issues with Node.js.
+
+If you install code-server using `yarn` or `npm`, and you upgrade your Node.js
+version, you may need to reinstall code-server to recompile native modules.
+Sometimes, you can get around this by navigating into code-server's `lib/vscode`
+directory and running `npm rebuild` to recompile the modules.
+
+A step-by-step example of how you might do this is:
+
+1. Install code-server: `brew install code-server`
+2. Navigate into the directory: `cd
+   /usr/local/Cellar/code-server/<version>/libexec/lib/vscode/`
+3. Recompile the native modules: `npm rebuild`
+4. Restart code-server
+
+If you need further assistance, post on our [GitHub Discussions
+page](https://github.com/cdr/code-server/discussions).

install.sh

@@ -2,7 +2,7 @@
 set -eu
 
 # code-server's automatic install script.
-# See https://github.com/cdr/code-server/blob/main/docs/install.md
+# See https://coder.com/docs/code-server/v3.10.2/install
 
 usage() {
   arg0="$0"
@@ -58,7 +58,7 @@ Usage:
   - If Homebrew is not installed it will install the latest standalone release
     into ~/.local
 
-- For FreeBSD, it will install the npm package with yarn or npm.
+- For FreeBSD or Alpine, it will install the npm package with yarn or npm.
 
 - If ran on an architecture with no releases, it will install the
   npm package with yarn or npm.
@@ -67,7 +67,7 @@ Usage:
 
 It will cache all downloaded assets into ~/.cache/code-server
 
-More installation docs are at https://github.com/cdr/code-server/blob/main/docs/install.md
+More installation docs are at https://coder.com/docs/code-server/v3.10.2/install
 EOF
 }
 
@@ -238,6 +238,17 @@ main() {
     return
   fi
 
+  if [ "$OS" = "linux" ] && [ "$(distro)" = "alpine" ]; then
+    if [ "$METHOD" = standalone ]; then
+      echoerr "No precompiled releases available for alpine."
+      echoerr 'Please rerun without the "--method standalone" flag to install from npm.'
+      exit 1
+    fi
+    echoh "No precompiled releases available for alpine."
+    install_npm
+    return
+  fi
+
   CACHE_DIR="$(echo_cache_dir)"
 
   if [ "$METHOD" = standalone ]; then
@@ -419,7 +430,7 @@ install_npm() {
   echoh
   echoerr "Please install npm or yarn to install code-server!"
   echoerr "You will need at least node v12 and a few C dependencies."
-  echoerr "See the docs https://github.com/cdr/code-server/blob/v3.10.2/docs/install.md#yarn-npm"
+  echoerr "See the docs https://coder.com/docs/code-server/v3.10.2/install#yarn-npm"
   exit 1
 }
 

lib/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.ts

@@ -303,9 +303,15 @@ viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
 	order: 1
 });
 
+// NOTE@coder:
+// We use OpenFolderAction.ID instead of commandId
+// because for some reason, the command openFileFolder
+// does not work as expected and causes the "Open Folder"
+// command to not work
+// See: https://github.com/cdr/code-server/issues/3457
 viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
 	content: localize({ key: 'noFolderHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
-		"You have not yet opened a folder.\n[Open Folder](command:{0})", commandId),
+		"You have not yet opened a folder.\n[Open Folder](command:{0})", OpenFolderAction.ID),
 	when: ContextKeyExpr.or(ContextKeyExpr.and(WorkbenchStateContext.notEqualsTo('workspace'), RemoteNameContext.isEqualTo('')), ContextKeyExpr.and(WorkbenchStateContext.notEqualsTo('workspace'), IsWebContext)),
 	group: ViewContentGroups.Open,
 	order: 1

package.json

@@ -52,7 +52,6 @@
     "@types/tar-fs": "^2.0.0",
     "@types/tar-stream": "^2.1.0",
     "@types/ws": "^7.2.6",
-    "@types/wtfnode": "^0.7.0",
     "@typescript-eslint/eslint-plugin": "^4.7.0",
     "@typescript-eslint/parser": "^4.7.0",
     "audit-ci": "^4.0.0",
@@ -64,15 +63,13 @@
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-prettier": "^3.1.0",
-    "leaked-handles": "^5.2.0",
     "prettier": "^2.2.1",
     "prettier-plugin-sh": "^0.7.1",
     "shellcheck": "^1.0.0",
     "stylelint": "^13.0.0",
     "stylelint-config-recommended": "^5.0.0",
     "ts-node": "^10.0.0",
-    "typescript": "^4.1.3",
-    "wtfnode": "^0.9.0"
+    "typescript": "^4.1.3"
   },
   "resolutions": {
     "normalize-package-data": "^3.0.0",
@@ -95,7 +92,6 @@
     "httpolyglot": "^0.1.2",
     "js-yaml": "^4.0.0",
     "limiter": "^1.1.5",
-    "node-fetch": "^2.6.1",
     "pem": "^1.14.2",
     "proxy-agent": "^4.0.0",
     "proxy-from-env": "^1.1.0",
@@ -106,7 +102,6 @@
     "semver": "^7.1.3",
     "split2": "^3.2.2",
     "tar-fs": "^2.0.0",
-    "tar-stream": "^2.2.0",
     "ws": "^7.2.0",
     "xdg-basedir": "^4.0.0",
     "yarn": "^1.22.4"

src/browser/pages/vscode.ts

@@ -95,8 +95,64 @@ try {
   console.error(error)
 }
 
+export function setBodyBackgroundToThemeBackgroundColor(document: Document, localStorage: Storage) {
+  const errorMsgPrefix = "[vscode]"
+
+  if (!document) {
+    throw new Error(`${errorMsgPrefix} Could not set body background to theme background color. Document is undefined.`)
+  }
+
+  if (!localStorage) {
+    throw new Error(
+      `${errorMsgPrefix} Could not set body background to theme background color. localStorage is undefined.`,
+    )
+  }
+
+  const colorThemeData = localStorage.getItem("colorThemeData")
+
+  if (!colorThemeData) {
+    throw new Error(
+      `${errorMsgPrefix} Could not set body background to theme background color. Could not find colorThemeData in localStorage.`,
+    )
+  }
+
+  let _colorThemeData
+  try {
+    // We wrap this JSON.parse logic in a try/catch
+    // because it can throw if the JSON is invalid.
+    // and instead of throwing a random error
+    // we can throw our own error, which will be more helpful
+    // to the end user.
+    _colorThemeData = JSON.parse(colorThemeData)
+  } catch {
+    throw new Error(
+      `${errorMsgPrefix} Could not set body background to theme background color. Could not parse colorThemeData from localStorage.`,
+    )
+  }
+
+  const hasColorMapProperty = Object.prototype.hasOwnProperty.call(_colorThemeData, "colorMap")
+  if (!hasColorMapProperty) {
+    throw new Error(
+      `${errorMsgPrefix} Could not set body background to theme background color. colorThemeData is missing colorMap.`,
+    )
+  }
+
+  const editorBgColor = _colorThemeData.colorMap["editor.background"]
+
+  if (!editorBgColor) {
+    throw new Error(
+      `${errorMsgPrefix} Could not set body background to theme background color. colorThemeData.colorMap["editor.background"] is undefined.`,
+    )
+  }
+
+  document.body.style.background = editorBgColor
+
+  return null
+}
+
 try {
-  document.body.style.background = JSON.parse(localStorage.getItem("colorThemeData")!).colorMap["editor.background"]
+  setBodyBackgroundToThemeBackgroundColor(document, localStorage)
 } catch (error) {
-  // Oh well.
+  console.error("Something went wrong setting the body background to the theme background color.")
+  console.error(error)
 }

src/node/http.ts

@@ -7,7 +7,7 @@ import { normalize, Options } from "../common/util"
 import { AuthType, DefaultedArgs } from "./cli"
 import { commit, rootPath } from "./constants"
 import { Heart } from "./heart"
-import { getPasswordMethod, IsCookieValidArgs, isCookieValid, sanitizeString } from "./util"
+import { getPasswordMethod, IsCookieValidArgs, isCookieValid, sanitizeString, escapeHtml } from "./util"
 
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
@@ -35,7 +35,7 @@ export const replaceTemplates = <T extends object>(
     ...extraOpts,
   }
   return content
-    .replace(/{{TO}}/g, (typeof req.query.to === "string" && req.query.to) || "/")
+    .replace(/{{TO}}/g, (typeof req.query.to === "string" && escapeHtml(req.query.to)) || "/")
     .replace(/{{BASE}}/g, options.base)
     .replace(/{{CS_STATIC_BASE}}/g, options.csStaticBase)
     .replace(/"{{OPTIONS}}"/, `'${JSON.stringify(options)}'`)
@@ -100,7 +100,8 @@ export const relativeRoot = (req: express.Request): string => {
 }
 
 /**
- * Redirect relatively to `/${to}`. Query variables will be preserved.
+ * Redirect relatively to `/${to}`. Query variables on the current URI will be preserved.
+ * `to` should be a simple path without any query parameters
  * `override` will merge with the existing query (use `undefined` to unset).
  */
 export const redirect = (