Add `MAX_ROWS` option for CSV rendering (#30268)

This solution implements a new config variable MAX_ROWS, which
corresponds to the “Maximum allowed rows to render CSV files. (0 for no
limit)” and rewrites the Render function for CSV files in markup module.
Now the render function only reads the file once, having MAX_FILE_SIZE+1
as a reader limit and MAX_ROWS as a row limit. When the file is larger
than MAX_FILE_SIZE or has more rows than MAX_ROWS, it only renders until
the limit, and displays a user-friendly warning informing that the
rendered data is not complete, in the user's language.

---

Previously, when a CSV file was larger than the limit, the render
function lost its function to render the code. There were also multiple
reads to the file, in order to determine its size and render or
pre-render.

The warning: ![image](https://s3.amazonaws.com/i.snag.gy/vcKh90.jpg)
pull/31211/head^2
Henrique Pimentel 6 months ago committed by GitHub
parent 24dace8f76
commit f7125ab61a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 3
      custom/conf/app.example.ini
  2. 94
      modules/markup/csv/csv.go
  3. 10
      modules/markup/csv/csv_test.go
  4. 3
      modules/setting/ui.go

@ -1334,6 +1334,9 @@ LEVEL = Info
;; ;;
;; Maximum allowed file size in bytes to render CSV files as table. (Set to 0 for no limit). ;; Maximum allowed file size in bytes to render CSV files as table. (Set to 0 for no limit).
;MAX_FILE_SIZE = 524288 ;MAX_FILE_SIZE = 524288
;;
;; Maximum allowed rows to render CSV files. (Set to 0 for no limit)
;MAX_ROWS = 2500
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

@ -5,8 +5,6 @@ package markup
import ( import (
"bufio" "bufio"
"bytes"
"fmt"
"html" "html"
"io" "io"
"regexp" "regexp"
@ -15,6 +13,8 @@ import (
"code.gitea.io/gitea/modules/csv" "code.gitea.io/gitea/modules/csv"
"code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/translation"
"code.gitea.io/gitea/modules/util"
) )
func init() { func init() {
@ -81,86 +81,38 @@ func writeField(w io.Writer, element, class, field string) error {
func (r Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error { func (r Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error {
tmpBlock := bufio.NewWriter(output) tmpBlock := bufio.NewWriter(output)
maxSize := setting.UI.CSV.MaxFileSize maxSize := setting.UI.CSV.MaxFileSize
maxRows := setting.UI.CSV.MaxRows
if maxSize == 0 { if maxSize != 0 {
return r.tableRender(ctx, input, tmpBlock) input = io.LimitReader(input, maxSize+1)
} }
rawBytes, err := io.ReadAll(io.LimitReader(input, maxSize+1))
if err != nil {
return err
}
if int64(len(rawBytes)) <= maxSize {
return r.tableRender(ctx, bytes.NewReader(rawBytes), tmpBlock)
}
return r.fallbackRender(io.MultiReader(bytes.NewReader(rawBytes), input), tmpBlock)
}
func (Renderer) fallbackRender(input io.Reader, tmpBlock *bufio.Writer) error {
_, err := tmpBlock.WriteString("<pre>")
if err != nil {
return err
}
scan := bufio.NewScanner(input)
scan.Split(bufio.ScanRunes)
for scan.Scan() {
switch scan.Text() {
case `&`:
_, err = tmpBlock.WriteString("&amp;")
case `'`:
_, err = tmpBlock.WriteString("&#39;") // "&#39;" is shorter than "&apos;" and apos was not in HTML until HTML5.
case `<`:
_, err = tmpBlock.WriteString("&lt;")
case `>`:
_, err = tmpBlock.WriteString("&gt;")
case `"`:
_, err = tmpBlock.WriteString("&#34;") // "&#34;" is shorter than "&quot;".
default:
_, err = tmpBlock.Write(scan.Bytes())
}
if err != nil {
return err
}
}
if err = scan.Err(); err != nil {
return fmt.Errorf("fallbackRender scan: %w", err)
}
_, err = tmpBlock.WriteString("</pre>")
if err != nil {
return err
}
return tmpBlock.Flush()
}
func (Renderer) tableRender(ctx *markup.RenderContext, input io.Reader, tmpBlock *bufio.Writer) error {
rd, err := csv.CreateReaderAndDetermineDelimiter(ctx, input) rd, err := csv.CreateReaderAndDetermineDelimiter(ctx, input)
if err != nil { if err != nil {
return err return err
} }
if _, err := tmpBlock.WriteString(`<table class="data-table">`); err != nil { if _, err := tmpBlock.WriteString(`<table class="data-table">`); err != nil {
return err return err
} }
row := 1
row := 0
for { for {
fields, err := rd.Read() fields, err := rd.Read()
if err == io.EOF { if err == io.EOF || (row >= maxRows && maxRows != 0) {
break break
} }
if err != nil { if err != nil {
continue continue
} }
if _, err := tmpBlock.WriteString("<tr>"); err != nil { if _, err := tmpBlock.WriteString("<tr>"); err != nil {
return err return err
} }
element := "td" element := "td"
if row == 1 { if row == 0 {
element = "th" element = "th"
} }
if err := writeField(tmpBlock, element, "line-num", strconv.Itoa(row)); err != nil { if err := writeField(tmpBlock, element, "line-num", strconv.Itoa(row+1)); err != nil {
return err return err
} }
for _, field := range fields { for _, field := range fields {
@ -174,8 +126,32 @@ func (Renderer) tableRender(ctx *markup.RenderContext, input io.Reader, tmpBlock
row++ row++
} }
if _, err = tmpBlock.WriteString("</table>"); err != nil { if _, err = tmpBlock.WriteString("</table>"); err != nil {
return err return err
} }
// Check if maxRows or maxSize is reached, and if true, warn.
if (row >= maxRows && maxRows != 0) || (rd.InputOffset() >= maxSize && maxSize != 0) {
warn := `<table class="data-table"><tr><td>`
rawLink := ` <a href="` + ctx.Links.RawLink() + `/` + util.PathEscapeSegments(ctx.RelativePath) + `">`
// Try to get the user translation
if locale, ok := ctx.Ctx.Value(translation.ContextKey).(translation.Locale); ok {
warn += locale.TrString("repo.file_too_large")
rawLink += locale.TrString("repo.file_view_raw")
} else {
warn += "The file is too large to be shown."
rawLink += "View Raw"
}
warn += rawLink + `</a></td></tr></table>`
// Write the HTML string to the output
if _, err := tmpBlock.WriteString(warn); err != nil {
return err
}
}
return tmpBlock.Flush() return tmpBlock.Flush()
} }

@ -4,8 +4,6 @@
package markup package markup
import ( import (
"bufio"
"bytes"
"strings" "strings"
"testing" "testing"
@ -31,12 +29,4 @@ func TestRenderCSV(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.EqualValues(t, v, buf.String()) assert.EqualValues(t, v, buf.String())
} }
t.Run("fallbackRender", func(t *testing.T) {
var buf bytes.Buffer
err := render.fallbackRender(strings.NewReader("1,<a>\n2,<b>"), bufio.NewWriter(&buf))
assert.NoError(t, err)
want := "<pre>1,&lt;a&gt;\n2,&lt;b&gt;</pre>"
assert.Equal(t, want, buf.String())
})
} }

@ -52,6 +52,7 @@ var UI = struct {
CSV struct { CSV struct {
MaxFileSize int64 MaxFileSize int64
MaxRows int
} `ini:"ui.csv"` } `ini:"ui.csv"`
Admin struct { Admin struct {
@ -107,8 +108,10 @@ var UI = struct {
}, },
CSV: struct { CSV: struct {
MaxFileSize int64 MaxFileSize int64
MaxRows int
}{ }{
MaxFileSize: 524288, MaxFileSize: 524288,
MaxRows: 2500,
}, },
Admin: struct { Admin: struct {
UserPagingNum int UserPagingNum int

Loading…
Cancel
Save