hmm

aslilac · aslilac · commit e1b467421456 · 2025-01-11T01:27:41.000Z
diff --git a/site/site.go b/site/site.go
@@ -162,7 +162,7 @@ func New(opts *Options) *Handler {
 
 	handler.installScript, err = parseInstallScript(opts.SiteFS, opts.BuildInfo)
 	if err != nil {
-		panic("failed to parse install script")
+		_ = fmt.Errorf("install.sh will be unavailabe: %w", err)
 	}
 
 	return handler
@@ -225,6 +225,10 @@ func (h *Handler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 	// If requesting the install.sh script, fill in the template with the
 	// appropriate hostname and version info.
 	case reqFile == "install.sh":
+		if h.installScript == nil {
+			http.NotFound(rw, r)
+			return
+		}
 		rw.Header().Add("Content-Type", "text/plain; charset=utf-8")
 		http.ServeContent(rw, r, reqFile, time.Time{}, bytes.NewReader(h.installScript))
 		return
@@ -552,22 +556,22 @@ type installScriptState struct {
 func parseInstallScript(files fs.FS, buildInfo codersdk.BuildInfoResponse) ([]byte, error) {
 	scriptFile, err := fs.ReadFile(files, "install.sh")
 	if err != nil {
-		return []byte{}, err
+		return nil, err
 	}
 
 	script, err := template.New("install.sh").Parse(string(scriptFile))
 	if err != nil {
-		return []byte{}, err
+		return nil, err
 	}
 
 	var buf bytes.Buffer
 	state := installScriptState{Origin: buildInfo.DashboardURL, Version: buildInfo.Version}
 	err = script.Execute(&buf, state)
 	if err != nil {
-		return []byte{}, err
+		return nil, err
 	}
 
-	return buf.Bytes(), err
+	return buf.Bytes(), nil
 }
 
 // ExtractOrReadBinFS checks the provided fs for compressed coder binaries and
diff --git a/site/site_test.go b/site/site_test.go
@@ -41,9 +41,6 @@ func TestInjection(t *testing.T) {
 		"index.html": &fstest.MapFile{
 			Data: []byte("{{ .User }}"),
 		},
-		"install.sh": &fstest.MapFile{
-			Data: []byte{},
-		},
 	}
 	binFs := http.FS(fstest.MapFS{})
 	db := dbmem.New()
@@ -102,9 +99,6 @@ func TestInjectionFailureProducesCleanHTML(t *testing.T) {
 		"index.html": &fstest.MapFile{
 			Data: []byte("<html>{{ .User }}</html>"),
 		},
-		"install.sh": &fstest.MapFile{
-			Data: []byte{},
-		},
 	}
 	handler := site.New(&site.Options{
 		BinFS:    binFs,
@@ -150,9 +144,6 @@ func TestCaching(t *testing.T) {
 		"terminal.html": &fstest.MapFile{
 			Data: []byte("folderFile"),
 		},
-		"install.sh": &fstest.MapFile{
-			Data: []byte{},
-		},
 	}
 	binFS := http.FS(fstest.MapFS{})
 
@@ -363,9 +354,6 @@ func TestServingBin(t *testing.T) {
 		"dashboard.css": &fstest.MapFile{
 			Data: []byte("dashboard-css-bytes"),
 		},
-		"install.sh": &fstest.MapFile{
-			Data: []byte{},
-		},
 	}
 
 	sampleBinFSCorrupted := sampleBinFS()
