Renderer works

mtojek · mtojek · commit f13919111cf0 · 2024-02-01T13:02:07.000+01:00
diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -1255,6 +1255,8 @@ type httpError struct {
 	msg              string
 	detail           string
 	renderStaticPage bool
+
+	renderDetailMarkdown bool
 }
 
 func (e httpError) Write(rw http.ResponseWriter, r *http.Request) {
@@ -1266,6 +1268,8 @@ func (e httpError) Write(rw http.ResponseWriter, r *http.Request) {
 			Description:  e.detail,
 			RetryEnabled: false,
 			DashboardURL: "/login",
+
+			RenderDescriptionMarkdown: e.renderDetailMarkdown,
 		})
 		return
 	}
@@ -1325,6 +1329,8 @@ func (api *API) oauthLogin(r *http.Request, params *oauthLoginParams) ([]*http.C
 				msg:              "Signups are disabled",
 				detail:           signupsDisabledText,
 				renderStaticPage: true,
+
+				renderDetailMarkdown: true,
 			}
 		}
 
diff --git a/site/site.go b/site/site.go
@@ -773,6 +773,8 @@ type ErrorPageData struct {
 	RetryEnabled bool
 	DashboardURL string
 	Warnings     []string
+
+	RenderDescriptionMarkdown bool
 }
 
 // RenderStaticErrorPage renders the static error page. This is used by app
@@ -781,12 +783,17 @@ type ErrorPageData struct {
 func RenderStaticErrorPage(rw http.ResponseWriter, r *http.Request, data ErrorPageData) {
 	type outerData struct {
 		Error ErrorPageData
+
+		ErrorDescriptionHTML htmltemplate.HTML
 	}
 
 	rw.Header().Set("Content-Type", "text/html; charset=utf-8")
 	rw.WriteHeader(data.Status)
 
-	err := errorTemplate.Execute(rw, outerData{Error: data})
+	err := errorTemplate.Execute(rw, outerData{
+		Error:                data,
+		ErrorDescriptionHTML: htmltemplate.HTML(data.Description), //nolint:gosec // gosec thinks this is user-input, but it is from Coder deployment configuration.
+	})
 	if err != nil {
 		httpapi.Write(r.Context(), rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Failed to render error page: " + err.Error(),
diff --git a/site/static/error.html b/site/static/error.html
@@ -167,7 +167,11 @@ <h1>
         {{- if not .Error.HideStatus }}{{ .Error.Status }} - {{end}}{{
         .Error.Title }}
       </h1>
+      {{- if .Error.RenderDescriptionMarkdown }}
+      {{ .ErrorDescriptionHTML }}
+      {{ else }}
       <p>{{ .Error.Description }}</p>
+      {{ end }}
       {{- if .Error.Warnings }}
       <div class="warning">
         <div class="warning-title">

Original file line number	Diff line number	Diff line change
`@@ -1255,6 +1255,8 @@ type httpError struct {`
`1255`	`1255`	`msg string`
`1256`	`1256`	`detail string`
`1257`	`1257`	`renderStaticPage bool`
	`1258`	`+`
	`1259`	`+ renderDetailMarkdown bool`
`1258`	`1260`	`}`
`1259`	`1261`
`1260`	`1262`	`func (e httpError) Write(rw http.ResponseWriter, r *http.Request) {`
`@@ -1266,6 +1268,8 @@ func (e httpError) Write(rw http.ResponseWriter, r *http.Request) {`
`1266`	`1268`	`Description: e.detail,`
`1267`	`1269`	`RetryEnabled: false,`
`1268`	`1270`	`DashboardURL: "/login",`
	`1271`	`+`
	`1272`	`+ RenderDescriptionMarkdown: e.renderDetailMarkdown,`
`1269`	`1273`	`})`
`1270`	`1274`	`return`
`1271`	`1275`	`}`
`@@ -1325,6 +1329,8 @@ func (api API) oauthLogin(r http.Request, params oauthLoginParams) ([]http.C`
`1325`	`1329`	`msg: "Signups are disabled",`
`1326`	`1330`	`detail: signupsDisabledText,`
`1327`	`1331`	`renderStaticPage: true,`
	`1332`	`+`
	`1333`	`+ renderDetailMarkdown: true,`
`1328`	`1334`	`}`
`1329`	`1335`	`}`
`1330`	`1336`