diff --git a/server/pages.go b/server/pages.go index 1fa3e34..60ae70f 100644 --- a/server/pages.go +++ b/server/pages.go @@ -318,7 +318,14 @@ func (s *Server) handleRaw(w http.ResponseWriter, r *http.Request, rs *repoState } h.Set("Content-Type", ct) h.Set("X-Content-Type-Options", "nosniff") - h.Set("Content-Security-Policy", "default-src 'none'; sandbox") + if ct == "application/pdf" { + // The CSP sandbox keyword makes Chromium refuse to instantiate + // its PDF viewer, so PDFs trade it for an embed restriction. + // Threat analysis in spec 2011 doc 18 section 4.3. + h.Set("Content-Security-Policy", "frame-ancestors 'self'") + } else { + h.Set("Content-Security-Policy", "default-src 'none'; sandbox") + } h.Set("Cache-Control", "no-cache") // ServeContent gives us Range, HEAD, and 206 handling for media; the // empty name and zero time keep it from guessing the type or etag. diff --git a/server/render.go b/server/render.go index cc81710..9f52147 100644 --- a/server/render.go +++ b/server/render.go @@ -33,7 +33,8 @@ func loadTemplates(opts Options) (*templates, error) { chromaCSS: viewer.ChromaCSS(), csp: "default-src 'none'; img-src 'self' data: https:; style-src 'self'; " + "script-src 'self' 'sha256-" + base64.StdEncoding.EncodeToString(hash[:]) + "'; " + - "connect-src 'self'; form-action 'self'; base-uri 'none'; frame-ancestors 'none'", + "connect-src 'self'; media-src 'self'; frame-src 'self'; " + + "form-action 'self'; base-uri 'none'; frame-ancestors 'none'", version: opts.Version, } diff --git a/server/server.go b/server/server.go index 569b1aa..9e0dce2 100644 --- a/server/server.go +++ b/server/server.go @@ -59,6 +59,9 @@ func New(ctx context.Context, repos []backend.Repo, opts Options) (*Server, erro // goes last and every text file always renders somehow. viewers: viewer.NewRegistry( viewer.Image(), + viewer.Audio(), + viewer.Video(), + viewer.PDF(), viewer.Markdown(), viewer.Code(), ), diff --git a/server/server_test.go b/server/server_test.go index 3e7e1ea..71c4737 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -817,3 +817,72 @@ func TestHostileContent(t *testing.T) { t.Errorf("raw nosniff header = %q", got) } } + +func TestMediaAndPDFViewers(t *testing.T) { + g := gittest.New(t) + g.Write("song.mp3", "ID3fakeaudio") + g.Write("clip.mp4", "fakevideo") + g.Write("paper.pdf", "%PDF-1.4 fake") + g.Commit("media fixtures") + g.SetOrigin("https://github.com/octo/media.git") + repo, err := local.New(context.Background(), g.Path()) + if err != nil { + t.Fatal(err) + } + s, err := New(context.Background(), []backend.Repo{repo}, Options{Dev: true}) + if err != nil { + t.Fatal(err) + } + + res, body := get(t, s, "/octo/media/blob/main/song.mp3") + mustContain(t, body, `data-kind="audio"`, "