From 14de23c6008e7a9f801f3321ba6e523d6b4fc8dd Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Mon, 7 Dec 2020 19:09:47 -0500 Subject: [PATCH 01/17] Change to display SVG files as images --- modules/base/tool.go | 42 ++++++++++++++++++++++++++++++++++----- modules/base/tool_test.go | 38 +++++++++++++++++++++++++++++++++++ routers/repo/download.go | 5 +++++ 3 files changed, 80 insertions(+), 5 deletions(-) diff --git a/modules/base/tool.go b/modules/base/tool.go index 7ac572b85bb4a..2a2a4e570ccaf 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -15,6 +15,7 @@ import ( "net/http" "os" "path/filepath" + "regexp" "runtime" "strconv" "strings" @@ -28,6 +29,15 @@ import ( "github.com/dustin/go-humanize" ) +// Use at most this many bytes to determine Content Type. +const sniffLen = 512 + +// SVGMimeType MIME type of SVG images. +const SVGMimeType = "image/svg+xml" + +var svgTagRegex = regexp.MustCompile(`(?s)\A\s*(?:\s*)*\s*(?:\s*)*= 0x80 && unicode.IsLetter(ch) } +// DetectContentType extends http.DetectContentType with more content types. +func DetectContentType(data []byte) string { + ct := http.DetectContentType(data) + + if len(data) > sniffLen { + data = data[:sniffLen] + } + + if (strings.Contains(ct, "text/plain") || strings.Contains(ct, "text/html")) && svgTagRegex.Match(data) || + strings.Contains(ct, "text/xml") && svgTagInXMLRegex.Match(data) { + + // SVG is unsupported. https://github.com/golang/go/issues/15888 + return SVGMimeType + } + return ct +} + // IsTextFile returns true if file content format is plain text or empty. func IsTextFile(data []byte) bool { if len(data) == 0 { return true } - return strings.Contains(http.DetectContentType(data), "text/") + return strings.Contains(DetectContentType(data), "text/") } // IsImageFile detects if data is an image format func IsImageFile(data []byte) bool { - return strings.Contains(http.DetectContentType(data), "image/") + return strings.Contains(DetectContentType(data), "image/") +} + +// IsSVGImageFile detects if data is an SVG image format +func IsSVGImageFile(data []byte) bool { + return strings.Contains(DetectContentType(data), SVGMimeType) } // IsPDFFile detects if data is a pdf format func IsPDFFile(data []byte) bool { - return strings.Contains(http.DetectContentType(data), "application/pdf") + return strings.Contains(DetectContentType(data), "application/pdf") } // IsVideoFile detects if data is an video format func IsVideoFile(data []byte) bool { - return strings.Contains(http.DetectContentType(data), "video/") + return strings.Contains(DetectContentType(data), "video/") } // IsAudioFile detects if data is an video format func IsAudioFile(data []byte) bool { - return strings.Contains(http.DetectContentType(data), "audio/") + return strings.Contains(DetectContentType(data), "audio/") } // EntryIcon returns the octicon class for displaying files/directories diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go index 0b708dafdb11b..c3d15923c8744 100644 --- a/modules/base/tool_test.go +++ b/modules/base/tool_test.go @@ -188,6 +188,44 @@ func TestIsTextFile(t *testing.T) { assert.True(t, IsTextFile([]byte("lorem ipsum"))) } +func TestIsSVGImageFile(t *testing.T) { + assert.True(t, IsSVGImageFile([]byte(""))) + assert.True(t, IsSVGImageFile([]byte(" "))) + assert.True(t, IsSVGImageFile([]byte(``))) + assert.True(t, IsSVGImageFile([]byte(""))) + assert.True(t, IsSVGImageFile([]byte(``))) + assert.True(t, IsSVGImageFile([]byte(` + `))) + assert.True(t, IsSVGImageFile([]byte(` + + `))) + assert.True(t, IsSVGImageFile([]byte(` + `))) + assert.True(t, IsSVGImageFile([]byte(` + + `))) + assert.True(t, IsSVGImageFile([]byte(` + + + `))) + assert.True(t, IsSVGImageFile([]byte(` + + `))) + assert.False(t, IsSVGImageFile([]byte{})) + assert.False(t, IsSVGImageFile([]byte("svg"))) + assert.False(t, IsSVGImageFile([]byte(""))) + assert.False(t, IsSVGImageFile([]byte("text"))) + assert.False(t, IsSVGImageFile([]byte(""))) + assert.False(t, IsSVGImageFile([]byte(``))) + assert.False(t, IsSVGImageFile([]byte(` + `))) + assert.False(t, IsSVGImageFile([]byte(` + + `))) +} + func TestFormatNumberSI(t *testing.T) { assert.Equal(t, "125", FormatNumberSI(int(125))) assert.Equal(t, "1.3k", FormatNumberSI(int64(1317))) diff --git a/routers/repo/download.go b/routers/repo/download.go index 2f1f2d3c47e52..f04dac6aa5146 100644 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -46,6 +46,11 @@ func ServeData(ctx *context.Context, name string, reader io.Reader) error { } else if base.IsImageFile(buf) || base.IsPDFFile(buf) { ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, name)) ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition") + if base.IsSVGImageFile(buf) { + ctx.Resp.Header().Set("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline'; sandbox") + ctx.Resp.Header().Set("X-Content-Type-Options", "nosniff") + ctx.Resp.Header().Set("Content-Type", base.SVGMimeType) + } } else { ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, name)) ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition") From 97a786833a6653aa3cebfe9e3ddb2a6e1a6469e4 Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Thu, 10 Dec 2020 15:48:09 -0500 Subject: [PATCH 02/17] Remove unsafe styles from SVG CSP --- routers/repo/download.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/download.go b/routers/repo/download.go index f04dac6aa5146..34ed7bf50d584 100644 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -47,7 +47,7 @@ func ServeData(ctx *context.Context, name string, reader io.Reader) error { ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, name)) ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition") if base.IsSVGImageFile(buf) { - ctx.Resp.Header().Set("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline'; sandbox") + ctx.Resp.Header().Set("Content-Security-Policy", "default-src 'none'; sandbox") ctx.Resp.Header().Set("X-Content-Type-Options", "nosniff") ctx.Resp.Header().Set("Content-Type", base.SVGMimeType) } From e9ddc12ef965510ea06aebccc166a5c4eb32b62a Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 15 Dec 2020 15:32:49 -0500 Subject: [PATCH 03/17] Add integration test to test SVG headers --- integrations/download_test.go | 28 +++ .../user2/repo2.git/HEAD | 1 + .../user2/repo2.git/config | 4 + .../user2/repo2.git/description | 1 + .../repo2.git/hooks/applypatch-msg.sample | 15 ++ .../user2/repo2.git/hooks/commit-msg.sample | 24 +++ .../user2/repo2.git/hooks/post-update.sample | 8 + .../repo2.git/hooks/pre-applypatch.sample | 14 ++ .../user2/repo2.git/hooks/pre-commit.sample | 49 +++++ .../user2/repo2.git/hooks/pre-push.sample | 53 ++++++ .../user2/repo2.git/hooks/pre-rebase.sample | 169 ++++++++++++++++++ .../repo2.git/hooks/prepare-commit-msg.sample | 36 ++++ .../user2/repo2.git/hooks/update.sample | 128 +++++++++++++ .../user2/repo2.git/info/exclude | 6 + .../user2/repo2.git/info/refs | 1 + .../0a/7d8b41ae9763e9a1743917396839d1791d49d0 | Bin 0 -> 188 bytes .../0c/f15c3f66ec8384480ed9c3cf87c9e97fbb0ec3 | 2 + .../1c/887eaa8d81fa86da7695d8f635cf17813eb422 | 1 + .../32/5dc4f8e9344e6668f21536a69d5f1d4ed53ca3 | Bin 0 -> 63 bytes .../36/fff01c8c9f722d49d53186abd27b5be8d85338 | Bin 0 -> 155 bytes .../42/3313fbd38093bb10d0c8387db9105409c6f196 | Bin 0 -> 830 bytes .../71/911bf48766c7181518c1070911019fbb00b1fc | 1 + .../72/fc6251cc648e914c10009d31431fa2e38b9a20 | Bin 0 -> 94 bytes .../74/d5a0d73db9b9ef7aa9978eb7a099b08f54d45e | Bin 0 -> 53 bytes .../7c/d7c8fa852973c72c66eb120a6677c54a8697f7 | Bin 0 -> 95 bytes .../c1/0d10b7e655b3dab1f53176db57c8219a5488d6 | 2 + .../c4/b38c3e1395393f75bbbc2ed10c7eeb577d3b64 | Bin 0 -> 189 bytes .../f5/05ec9b5c7a45a10259c1dda7f18434e5d55940 | Bin 0 -> 157 bytes .../user2/repo2.git/objects/info/commit-graph | Bin 0 -> 1212 bytes .../user2/repo2.git/objects/info/packs | 2 + ...d943b3d857eb3ebdb4b35eeef38f63cf5d2.bitmap | Bin 0 -> 248 bytes ...f7ad943b3d857eb3ebdb4b35eeef38f63cf5d2.idx | Bin 0 -> 1240 bytes ...7ad943b3d857eb3ebdb4b35eeef38f63cf5d2.pack | Bin 0 -> 637 bytes .../user2/repo2.git/packed-refs | 2 + .../user2/repo2.git/refs/heads/master | 1 + 35 files changed, 548 insertions(+) create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/HEAD create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/config create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/description create mode 100755 integrations/gitea-repositories-meta/user2/repo2.git/hooks/applypatch-msg.sample create mode 100755 integrations/gitea-repositories-meta/user2/repo2.git/hooks/commit-msg.sample create mode 100755 integrations/gitea-repositories-meta/user2/repo2.git/hooks/post-update.sample create mode 100755 integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-applypatch.sample create mode 100755 integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-commit.sample create mode 100755 integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-push.sample create mode 100755 integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-rebase.sample create mode 100755 integrations/gitea-repositories-meta/user2/repo2.git/hooks/prepare-commit-msg.sample create mode 100755 integrations/gitea-repositories-meta/user2/repo2.git/hooks/update.sample create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/info/exclude create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/info/refs create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/0a/7d8b41ae9763e9a1743917396839d1791d49d0 create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/0c/f15c3f66ec8384480ed9c3cf87c9e97fbb0ec3 create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/1c/887eaa8d81fa86da7695d8f635cf17813eb422 create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/32/5dc4f8e9344e6668f21536a69d5f1d4ed53ca3 create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/36/fff01c8c9f722d49d53186abd27b5be8d85338 create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/42/3313fbd38093bb10d0c8387db9105409c6f196 create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/71/911bf48766c7181518c1070911019fbb00b1fc create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/72/fc6251cc648e914c10009d31431fa2e38b9a20 create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/74/d5a0d73db9b9ef7aa9978eb7a099b08f54d45e create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/7c/d7c8fa852973c72c66eb120a6677c54a8697f7 create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/c1/0d10b7e655b3dab1f53176db57c8219a5488d6 create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/c4/b38c3e1395393f75bbbc2ed10c7eeb577d3b64 create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/f5/05ec9b5c7a45a10259c1dda7f18434e5d55940 create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/info/commit-graph create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/info/packs create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/pack/pack-a2f7ad943b3d857eb3ebdb4b35eeef38f63cf5d2.bitmap create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/pack/pack-a2f7ad943b3d857eb3ebdb4b35eeef38f63cf5d2.idx create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/objects/pack/pack-a2f7ad943b3d857eb3ebdb4b35eeef38f63cf5d2.pack create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/packed-refs create mode 100644 integrations/gitea-repositories-meta/user2/repo2.git/refs/heads/master diff --git a/integrations/download_test.go b/integrations/download_test.go index 6bc5e5a9afdc9..6c105421cc42d 100644 --- a/integrations/download_test.go +++ b/integrations/download_test.go @@ -23,6 +23,20 @@ func TestDownloadByID(t *testing.T) { assert.Equal(t, "# repo1\n\nDescription for repo1", resp.Body.String()) } +func TestDownloadByIDForSVGUsesSecureHeaders(t *testing.T) { + defer prepareTestEnv(t)() + + session := loginUser(t, "user2") + + // Request raw blob + req := NewRequest(t, "GET", "/user2/repo2/raw/blob/6395b68e1feebb1e4c657b4f9f6ba2676a283c0b") + resp := session.MakeRequest(t, req, http.StatusOK) + + assert.Equal(t, "default-src 'none'; sandbox", resp.HeaderMap.Get("Content-Security-Policy")) + assert.Equal(t, "image/svg+xml", resp.HeaderMap.Get("Content-Type")) + assert.Equal(t, "nosniff", resp.HeaderMap.Get("X-Content-Type-Options")) +} + func TestDownloadByIDMedia(t *testing.T) { defer prepareTestEnv(t)() @@ -34,3 +48,17 @@ func TestDownloadByIDMedia(t *testing.T) { assert.Equal(t, "# repo1\n\nDescription for repo1", resp.Body.String()) } + +func TestDownloadByIDMediaForSVGUsesSecureHeaders(t *testing.T) { + defer prepareTestEnv(t)() + + session := loginUser(t, "user2") + + // Request raw blob + req := NewRequest(t, "GET", "/user2/repo2/media/blob/6395b68e1feebb1e4c657b4f9f6ba2676a283c0b") + resp := session.MakeRequest(t, req, http.StatusOK) + + assert.Equal(t, "default-src 'none'; sandbox", resp.HeaderMap.Get("Content-Security-Policy")) + assert.Equal(t, "image/svg+xml", resp.HeaderMap.Get("Content-Type")) + assert.Equal(t, "nosniff", resp.HeaderMap.Get("X-Content-Type-Options")) +} diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/HEAD b/integrations/gitea-repositories-meta/user2/repo2.git/HEAD new file mode 100644 index 0000000000000..cb089cd89a7d7 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/config b/integrations/gitea-repositories-meta/user2/repo2.git/config new file mode 100644 index 0000000000000..07d359d07cf1e --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/config @@ -0,0 +1,4 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/description b/integrations/gitea-repositories-meta/user2/repo2.git/description new file mode 100644 index 0000000000000..498b267a8c781 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/hooks/applypatch-msg.sample b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/applypatch-msg.sample new file mode 100755 index 0000000000000..a5d7b84a67345 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/hooks/commit-msg.sample b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/commit-msg.sample new file mode 100755 index 0000000000000..b58d1184a9d43 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/hooks/post-update.sample b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/post-update.sample new file mode 100755 index 0000000000000..ec17ec1939b7c --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-applypatch.sample b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-applypatch.sample new file mode 100755 index 0000000000000..4142082bcb939 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-commit.sample b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-commit.sample new file mode 100755 index 0000000000000..68d62d5446d96 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-push.sample b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-push.sample new file mode 100755 index 0000000000000..6187dbf4390fc --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-rebase.sample b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-rebase.sample new file mode 100755 index 0000000000000..33730ca647cb2 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/hooks/prepare-commit-msg.sample b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000000000..f093a02ec4991 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/hooks/update.sample b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/update.sample new file mode 100755 index 0000000000000..80ba94135cc37 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/info/exclude b/integrations/gitea-repositories-meta/user2/repo2.git/info/exclude new file mode 100644 index 0000000000000..a5196d1be8fb5 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/info/refs b/integrations/gitea-repositories-meta/user2/repo2.git/info/refs new file mode 100644 index 0000000000000..044e52e0f9d57 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/info/refs @@ -0,0 +1 @@ +205ac761f3326a7ebe416e8673760016450b5cec refs/heads/master diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/0a/7d8b41ae9763e9a1743917396839d1791d49d0 b/integrations/gitea-repositories-meta/user2/repo2.git/objects/0a/7d8b41ae9763e9a1743917396839d1791d49d0 new file mode 100644 index 0000000000000000000000000000000000000000..d62e3c623e938905f035b21e4edbaa87b71cc71d GIT binary patch literal 188 zcmV;t07L(H0V^p=O;s>5Fk&z?FfcPQQSivmP1VayVR+T_r@efUH~XP%EAKClN_3cu z?N&pT1SF=X>V{{QWaxV40+}GyMzKeJyfpDk%lIT}wrp;^tlw3e#TcrC3lfu4Q*`|j zAvP5KNeVoZ(l^mZfMKqov;3mR-Ln)-41ho(6J%^LgG@)=s@}$5ZMVv%-uPyEUcAw6 qixSk(tb){Zy{v+ChQf)`U)s}-ONdGwWakuQoWGl4;~xN-%1&qN8(j7P literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/0c/f15c3f66ec8384480ed9c3cf87c9e97fbb0ec3 b/integrations/gitea-repositories-meta/user2/repo2.git/objects/0c/f15c3f66ec8384480ed9c3cf87c9e97fbb0ec3 new file mode 100644 index 0000000000000..c0314c558428f --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/objects/0c/f15c3f66ec8384480ed9c3cf87c9e97fbb0ec3 @@ -0,0 +1,2 @@ +x���m� D�M��Y����(�J�`�5�ɜ-�K*Ki,Hi!?��<�i�Vki0Z��XH�D(Z6ĨG�Sb��3�JD�h��!�uB��DaJp� ���F�Lƹ4+~��v�;��� +e����[Nx>K�����_s�q�/�]09MHpѤ��k���_d�-%�풇۞�� v�_�]��^�/�I[t \ No newline at end of file diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/1c/887eaa8d81fa86da7695d8f635cf17813eb422 b/integrations/gitea-repositories-meta/user2/repo2.git/objects/1c/887eaa8d81fa86da7695d8f635cf17813eb422 new file mode 100644 index 0000000000000..34fa593277d80 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/objects/1c/887eaa8d81fa86da7695d8f635cf17813eb422 @@ -0,0 +1 @@ +x+)JMU07b040031Q�*HM��*Hg(�(��=�����AvNA���6������K�+.KgH���O��n9��j��ًҳ4l��� \ No newline at end of file diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/32/5dc4f8e9344e6668f21536a69d5f1d4ed53ca3 b/integrations/gitea-repositories-meta/user2/repo2.git/objects/32/5dc4f8e9344e6668f21536a69d5f1d4ed53ca3 new file mode 100644 index 0000000000000000000000000000000000000000..d52aa8e1ff18454d3079d249bfb7900779fff7fc GIT binary patch literal 63 zcmV-F0Korv0ZYosPf{?kWKdQJNK8*v2+u6ZQ1HwJGP$@Equn!0QWF(?^3(HUHT3k0 V63g|o3R2VcvI^2Qxd87p5qfeO9YO#A literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/36/fff01c8c9f722d49d53186abd27b5be8d85338 b/integrations/gitea-repositories-meta/user2/repo2.git/objects/36/fff01c8c9f722d49d53186abd27b5be8d85338 new file mode 100644 index 0000000000000000000000000000000000000000..fc0c8654b5dbad73be0950ca834e3cd7e75036e8 GIT binary patch literal 155 zcmV;M0A&Ao0gcW<3c@fD06@=q#eP89?WRc_DZTi5vr7+Ms68GDQYb89M zZ|dKi00hWgb5mqlImj~7a#fw`m`x-|L9GbX(K2TtIq9tRfqbjU6+iiHD<9I*{g)G8 z=enUuDe>^SYAf&KIW=I`ltB|F6nu&btD;rwk`xzxChes)B41oA-cFvONDJyu1fZDX z^$9n44<3WDj;Vdq8H(OAwTP$pedOjnHrHGpHq(`3j(=WQv`KXlC>O1DwD&}S2Z<(2 zkjX;RTaL+c&tR0+`?y79cm2QST(~azM7+#vyZUUcmrMP;fX%UcPy?l}^mnoh;;T{8GMZQTy66N@^7*ZPGxNq6oKw$6l8dwsB};kv2a!>es-nT7_NWd_p8DBR<@j-h#U-NRf1=s_XIeYx8p#C{rQ?#?>jXv zr&r#aN&tf)z(MYnw12TtW4hyn{j?3&{7{s0dF87p@26fNfN(6r&pI0;yXh&SE%ifb zg=EhAcA-;5jY?mgpFYi18+*2yk9@igPUm{NJ1S>kf4mbweb5%lyYIL14r|zCn2?T~ zAjfCzo5MFo({F(&P(rWzqL-DV`)Yp>;76xy2Jug3RQvc}i6J6{z%a#KG-e>LqZALs IPp$}Hf}aFNK8*v2+u6ZPzWwaOioQv@Jq~1<>Cs-$ShU>qC|xP zkb-iMf<%Qppd5r<3{qUIpi!QYnVbO>%E?hkN>wOIEyw{I0#>iCtFFlf03OpKVH4IR AzyJUM literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/74/d5a0d73db9b9ef7aa9978eb7a099b08f54d45e b/integrations/gitea-repositories-meta/user2/repo2.git/objects/74/d5a0d73db9b9ef7aa9978eb7a099b08f54d45e new file mode 100644 index 0000000000000000000000000000000000000000..bcb0e0075c7f18769b25eb9bb639e743e9565f51 GIT binary patch literal 53 zcmV-50LuS(0V^p=O;s>9V=y!@Ff%bx$SO!p*UKtMXDFN~{iQwaxP++0L3U0-#`(J$ LHvRzsDiRKo_5~D3 literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/7c/d7c8fa852973c72c66eb120a6677c54a8697f7 b/integrations/gitea-repositories-meta/user2/repo2.git/objects/7c/d7c8fa852973c72c66eb120a6677c54a8697f7 new file mode 100644 index 0000000000000000000000000000000000000000..9c264956058d3ff89dbc06f2827f281603892050 GIT binary patch literal 95 zcmV-l0HFVP0V^p=O;xZkXD~D{Ff%bx@W{_i)yqv`c-8c$y?l{3`=M+r?=O!^beN0n zRzsBpB&Mh8hG&*!=mr-gCa0$8`Xxg26#YpGJd@Hl(MNz`uA#I1qQ~8{6aX>eB7Gjp BEph+= literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/c1/0d10b7e655b3dab1f53176db57c8219a5488d6 b/integrations/gitea-repositories-meta/user2/repo2.git/objects/c1/0d10b7e655b3dab1f53176db57c8219a5488d6 new file mode 100644 index 0000000000000..8a6345dfa50f0 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/objects/c1/0d10b7e655b3dab1f53176db57c8219a5488d6 @@ -0,0 +1,2 @@ +x���m�0���)n���t2�S����`ņ���e�,VY�/H�#�[)��E��@N�q��툎�r2�)D��0�j�C���L��aC��&�4B�v]$E����Iӑe����P�r�I�s�e�z�˳~_ +���[y��v��W��V=헛�˘�H vZ~s�@݉%����?T�ZH \ No newline at end of file diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/c4/b38c3e1395393f75bbbc2ed10c7eeb577d3b64 b/integrations/gitea-repositories-meta/user2/repo2.git/objects/c4/b38c3e1395393f75bbbc2ed10c7eeb577d3b64 new file mode 100644 index 0000000000000000000000000000000000000000..6dcfc9667644d517a48b0b24e3c975afe97bb4cb GIT binary patch literal 189 zcmV;u07CzG0V^p=O;s>5Fk&z?FfcPQQSivmP1VayVR+T_r@efUH~XP%EAKClN_3cu z?N&pT1SF=X>V{{QWaxV40+}GyMzKeJyfpDk%lIT}wrp;^tlw3e#TcrC3lfu4Q*`|j zAvP5KNeVoZ(l^mZfMKqov;3mR-Ln)-41ho(6J%^LL&?7vt%$dFfcPQQSivmP1VayVR+T_r@efUH~XP%EAKClN_3cu z?N&pT1SF=X>V{{QWaxV40+}GyMzKeJyfpDk%lIT}wrp;^tlw3e#TcrC3lfu4Q*`|j zAvP5KNeVoZ(l^mZfMKqov;3mR-Ln*+da?>q)Ah0n(isXTN`GljJ1!wAagd!;ka7NQ LhK+v!Aca6I!9qzZ literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/info/commit-graph b/integrations/gitea-repositories-meta/user2/repo2.git/objects/info/commit-graph new file mode 100644 index 0000000000000000000000000000000000000000..67dae50e838ba9c96cda8819a719cd200094e01d GIT binary patch literal 1212 zcmZ>E5Aa}QWM=U9ba7*V01F`72f}2raCUJFfwB`IG>BwbfnX09ixFruDVPbUeiV;} z!Dt$wLK;wrI-dC1D64LtV_sWv8H1QBcg!1|kY8_dTrbN=?O%6xwY%J!G~?nfZ-%tp zlUlP3_6UC8qP$>H4|mDKO`v>R04X*&;%`dpKec6_7a_m@-a_`MkgMAiUv1#z3j)bQ g)v!cKPZf)}DVo{4M%dQrOX!v3TzQE<8Z#yX0Fg8~%>V!Z literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/info/packs b/integrations/gitea-repositories-meta/user2/repo2.git/objects/info/packs new file mode 100644 index 0000000000000..9eb91c8e0eb5f --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/objects/info/packs @@ -0,0 +1,2 @@ +P pack-a2f7ad943b3d857eb3ebdb4b35eeef38f63cf5d2.pack + diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/pack/pack-a2f7ad943b3d857eb3ebdb4b35eeef38f63cf5d2.bitmap b/integrations/gitea-repositories-meta/user2/repo2.git/objects/pack/pack-a2f7ad943b3d857eb3ebdb4b35eeef38f63cf5d2.bitmap new file mode 100644 index 0000000000000000000000000000000000000000..8ecce324f4b953ed428e8228b7736735ca03a320 GIT binary patch literal 248 zcmZ?r4Dn@PWME}rU|?GGeeD!$+t#|xuWx&szI$)+&F1SRkT?WAQ9K$3tiW`Dj@f`>RL2TY#}hvr zW!3F-%xfzyV-R!Yj(MXK^6O2G>tz|K{p-%Ic9&a|W?bCm&5*WxQfrpM9>MQhlou@O z;VyZ&DS7I)KKXaM<$O}B{pV*dO3%`;;eKk%J}*Lk|GkCmQ6X2iDZbjk$rtph=}&w4 zB5(FX*;d|P9+l`Y7u&7Athen`|GAyXGg_behAX~5cj0O0&hMeUcYuE60pf+gB0(OA zCj+y(HIU9-^nL9VYunbk&985Jo4$K*@y+JzC1trl)-+yoJIe{PY?E>yCwJ$`J_i62 CfngB< literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/objects/pack/pack-a2f7ad943b3d857eb3ebdb4b35eeef38f63cf5d2.pack b/integrations/gitea-repositories-meta/user2/repo2.git/objects/pack/pack-a2f7ad943b3d857eb3ebdb4b35eeef38f63cf5d2.pack new file mode 100644 index 0000000000000000000000000000000000000000..9d10156ca773ce85a773fbc3b887b06004f049aa GIT binary patch literal 637 zcmWG=boORoU|<4bwmCc%b9zsEa~(1eV7O50H<4Roay^&QE}=VI@6y$Rd$;(m{P^z? zZ_K`}Mgb53=7;KSwix0kKYz1SWe?PuZpe(R<;+16RYiq0jO2372g4u!Ly-`f30_R3C? z+THObb3ZD+;x@OmemIM}V$R$%zFdbKcpM)7oueeaLFKANu)xJug^I2o&)bg6nN{!I zpRc^*&%H-Kv)GPBAGMHBm-@Uytz}|s`KikLlRe#JF6`j{^l9hXf{&46J4~Zbv9SL> zC2v1>nby;rccX2Y3dxEujuxvAZ4G_Bs?FSMx@GoqmWnyXCI$w^ zhJhbWocFzY+BdP{>X+qvYbKiiUYMi(UccX~WJdSfFlnbLPg0&OeI+`5sj-Ux-D~Rq z^S00N&)WL`&l}g5ky2)N7*?4{ZQsIFF()_-WKgJvhmZf$M_eaQ=!7vWn$#20$}?kw zk~qUTS#FnY{1tOr`yD~i;QHP6sKIZwOc$M{nFm|dF9_e5z+yU4&E(@ZKkiqTjvDOw z|Nq0xI-P!NovJ>)idJ4>j$84EpX>>&u$=!&?D)c0kCU_*7HsI3ZFHJ_Y4c;7=Vw0k zwcaeyY9hyn61&m&dy=|CH!*Vr24&VQ=qR^Y7iBwo4OQKP)PB z(3qqbK1KSNN&D<|_M$ocbL1jdx0@fac3HR>=o@0fhMD2^bKaeczOS8PZQEM6`SopY N(|7MJzS(@e1OQ8LH`xFH literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/packed-refs b/integrations/gitea-repositories-meta/user2/repo2.git/packed-refs new file mode 100644 index 0000000000000..f785d91022c90 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +205ac761f3326a7ebe416e8673760016450b5cec refs/heads/master diff --git a/integrations/gitea-repositories-meta/user2/repo2.git/refs/heads/master b/integrations/gitea-repositories-meta/user2/repo2.git/refs/heads/master new file mode 100644 index 0000000000000..10967a9b8a0b9 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo2.git/refs/heads/master @@ -0,0 +1 @@ +205ac761f3326a7ebe416e8673760016450b5cec From 703591814f992a7a5c25198e7e9a07bf121f1e5a Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 15 Dec 2020 18:35:24 -0500 Subject: [PATCH 04/17] Add config setting to disable SVG rendering --- custom/conf/app.example.ini | 4 ++++ modules/base/tool.go | 5 +++-- modules/setting/setting.go | 9 +++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index e26e9e4d5690e..ee8af7d3afca5 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -258,6 +258,10 @@ CUSTOM_URL_SCHEMES = ; Separate the extensions with a comma. To render files without any extension as markdown, just put a comma FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd +[svg_render] +; Disable rendering of SVG images and render as text instead. +DISABLE_SVG_RENDER = false + [server] ; The protocol the server listens on. One of 'http', 'https', 'unix' or 'fcgi'. PROTOCOL = http diff --git a/modules/base/tool.go b/modules/base/tool.go index 2a2a4e570ccaf..28458422c0886 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -283,8 +283,9 @@ func DetectContentType(data []byte) string { data = data[:sniffLen] } - if (strings.Contains(ct, "text/plain") || strings.Contains(ct, "text/html")) && svgTagRegex.Match(data) || - strings.Contains(ct, "text/xml") && svgTagInXMLRegex.Match(data) { + if !setting.SVGRender.Disabled && + ((strings.Contains(ct, "text/plain") || strings.Contains(ct, "text/html")) && svgTagRegex.Match(data) || + strings.Contains(ct, "text/xml") && svgTagInXMLRegex.Match(data)) { // SVG is unsupported. https://github.com/golang/go/issues/15888 return SVGMimeType diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 8a4d7acc4d138..94c2403c1a17c 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -269,6 +269,13 @@ var ( FileExtensions: strings.Split(".md,.markdown,.mdown,.mkd", ","), } + // SVG settings + SVGRender = struct { + Disabled bool `ini:"DISABLE_SVG_RENDER"` + }{ + Disabled: false, + } + // Admin settings Admin struct { DisableRegularOrgCreation bool @@ -876,6 +883,8 @@ func NewContext() { log.Fatal("Failed to map UI settings: %v", err) } else if err = Cfg.Section("markdown").MapTo(&Markdown); err != nil { log.Fatal("Failed to map Markdown settings: %v", err) + } else if err = Cfg.Section("svg_render").MapTo(&SVGRender); err != nil { + log.Fatal("Failed to map SVGRender settings: %v", err) } else if err = Cfg.Section("admin").MapTo(&Admin); err != nil { log.Fatal("Fail to map Admin settings: %v", err) } else if err = Cfg.Section("api").MapTo(&API); err != nil { From 5b97a1fb411204888f14c601bc8b49a0450344f3 Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Thu, 17 Dec 2020 18:31:15 -0500 Subject: [PATCH 05/17] Add test for img tag when loading SVG image --- integrations/view_test.go | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 integrations/view_test.go diff --git a/integrations/view_test.go b/integrations/view_test.go new file mode 100644 index 0000000000000..f1a603c9272b1 --- /dev/null +++ b/integrations/view_test.go @@ -0,0 +1,26 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package integrations + +import ( + "net/http" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestRenderFileSVGIsInImgTag(t *testing.T) { + defer prepareTestEnv(t)() + + session := loginUser(t, "user2") + + req := NewRequest(t, "GET", "/user2/repo2/src/branch/master/line.svg") + resp := session.MakeRequest(t, req, http.StatusOK) + + doc := NewHTMLParser(t, resp.Body) + src, exists := doc.doc.Find(".file-view img").Attr("src") + assert.True(t, exists, "The SVG image should be in an tag so that scripts in the SVG are not run") + assert.Equal(t, "/user2/repo2/raw/branch/master/line.svg", src) +} From e1ddf33bc27432155e09c4be63dc38122d954855 Mon Sep 17 00:00:00 2001 From: Kyle D Date: Fri, 18 Dec 2020 15:13:37 -0700 Subject: [PATCH 06/17] Remove the Raw view button for svg files since we don't fully support this --- routers/repo/lfs.go | 3 +++ routers/repo/view.go | 3 +++ templates/repo/view_file.tmpl | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/routers/repo/lfs.go b/routers/repo/lfs.go index dc3ab4f54c335..429e46aefc202 100644 --- a/routers/repo/lfs.go +++ b/routers/repo/lfs.go @@ -325,6 +325,9 @@ func LFSFileGet(ctx *context.Context) { ctx.Data["IsVideoFile"] = true case base.IsAudioFile(buf): ctx.Data["IsAudioFile"] = true + case base.IsSVGImageFile(buf): + ctx.Data["IsImageFile"] = true + ctx.Data["IsSvgImageFile"] = true case base.IsImageFile(buf): ctx.Data["IsImageFile"] = true } diff --git a/routers/repo/view.go b/routers/repo/view.go index 8f010490c3fb8..c6e11b4a6307e 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -504,6 +504,9 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st ctx.Data["IsVideoFile"] = true case base.IsAudioFile(buf): ctx.Data["IsAudioFile"] = true + case base.IsSVGImageFile(buf): + ctx.Data["IsImageFile"] = true + ctx.Data["IsSVGImageFile"] = true case base.IsImageFile(buf): ctx.Data["IsImageFile"] = true default: diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 86de599fb27c4..b154c8455b810 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -33,7 +33,9 @@ {{if not .ReadmeInList}}
- {{.i18n.Tr "repo.file_raw"}} + {{if not .IsSVGImageFile}} + {{.i18n.Tr "repo.file_raw"}} + {{end}} {{if not .IsViewCommit}} {{.i18n.Tr "repo.file_permalink"}} {{end}} From cf867ce37b913b80186ee6b47fe303e6257b77c4 Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 22 Dec 2020 01:03:33 -0500 Subject: [PATCH 07/17] Fix copyright year --- integrations/view_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/view_test.go b/integrations/view_test.go index f1a603c9272b1..180cf2e50a463 100644 --- a/integrations/view_test.go +++ b/integrations/view_test.go @@ -1,4 +1,4 @@ -// Copyright 2017 The Gitea Authors. All rights reserved. +// Copyright 2020 The Gitea Authors. All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. From e68dfbaa3728ecf5b16f452c27d03139f62920bf Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 22 Dec 2020 01:50:46 -0500 Subject: [PATCH 08/17] Rename and move config setting --- custom/conf/app.example.ini | 8 ++++---- modules/base/tool.go | 2 +- modules/setting/setting.go | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index ee8af7d3afca5..1b16cc7a27a9b 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -242,6 +242,10 @@ TIMEOUT_STEP = 10s ; If the browser client supports EventSource and SharedWorker, a SharedWorker will be used in preference to polling notification. Set to -1 to disable the EventSource EVENT_SOURCE_UPDATE_TIME = 10s +[ui.svg] +; Enable rendering of SVG files as images instead of as text. +ENABLE_RENDER = true + [markdown] ; Render soft line breaks as hard line breaks, which means a single newline character between ; paragraphs will cause a line break and adding trailing whitespace to paragraphs is not @@ -258,10 +262,6 @@ CUSTOM_URL_SCHEMES = ; Separate the extensions with a comma. To render files without any extension as markdown, just put a comma FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd -[svg_render] -; Disable rendering of SVG images and render as text instead. -DISABLE_SVG_RENDER = false - [server] ; The protocol the server listens on. One of 'http', 'https', 'unix' or 'fcgi'. PROTOCOL = http diff --git a/modules/base/tool.go b/modules/base/tool.go index 28458422c0886..a9f108a78b305 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -283,7 +283,7 @@ func DetectContentType(data []byte) string { data = data[:sniffLen] } - if !setting.SVGRender.Disabled && + if setting.UI.SVG.Enabled && ((strings.Contains(ct, "text/plain") || strings.Contains(ct, "text/html")) && svgTagRegex.Match(data) || strings.Contains(ct, "text/xml") && svgTagInXMLRegex.Match(data)) { diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 94c2403c1a17c..851a9b18db8f7 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -190,6 +190,10 @@ var ( EventSourceUpdateTime time.Duration } `ini:"ui.notification"` + SVG struct { + Enabled bool `ini:"ENABLE_RENDER"` + } `ini:"ui.svg"` + Admin struct { UserPagingNum int RepoPagingNum int @@ -230,6 +234,11 @@ var ( MaxTimeout: 60 * time.Second, EventSourceUpdateTime: 10 * time.Second, }, + SVG: struct { + Enabled bool `ini:"ENABLE_RENDER"` + }{ + Enabled: true, + }, Admin: struct { UserPagingNum int RepoPagingNum int @@ -269,13 +278,6 @@ var ( FileExtensions: strings.Split(".md,.markdown,.mdown,.mkd", ","), } - // SVG settings - SVGRender = struct { - Disabled bool `ini:"DISABLE_SVG_RENDER"` - }{ - Disabled: false, - } - // Admin settings Admin struct { DisableRegularOrgCreation bool @@ -883,8 +885,6 @@ func NewContext() { log.Fatal("Failed to map UI settings: %v", err) } else if err = Cfg.Section("markdown").MapTo(&Markdown); err != nil { log.Fatal("Failed to map Markdown settings: %v", err) - } else if err = Cfg.Section("svg_render").MapTo(&SVGRender); err != nil { - log.Fatal("Failed to map SVGRender settings: %v", err) } else if err = Cfg.Section("admin").MapTo(&Admin); err != nil { log.Fatal("Fail to map Admin settings: %v", err) } else if err = Cfg.Section("api").MapTo(&API); err != nil { From e7f781956c16d95931e120238c5e378fa9be8b3e Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 22 Dec 2020 02:08:21 -0500 Subject: [PATCH 09/17] Add setting to cheat sheet in docs --- docs/content/doc/advanced/config-cheat-sheet.en-us.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 43f42b95e02f1..af23c17bd4f1f 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -194,6 +194,10 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `TIMEOUT_STEP`: **10s**. - `EVENT_SOURCE_UPDATE_TIME`: **10s**: This setting determines how often the database is queried to update notification counts. If the browser client supports `EventSource` and `SharedWorker`, a `SharedWorker` will be used in preference to polling notification endpoint. Set to **-1** to disable the `EventSource`. +### UI - SVG Images (`ui.svg`) + +- `ENABLE_RENDER`: **true**: Whether to render SVG files as images. If SVG rendering is disabled, SVG files are displayed as text and cannot be embedded in markdown files as images. + ## Markdown (`markdown`) - `ENABLE_HARD_LINE_BREAK_IN_COMMENTS`: **true**: Render soft line breaks as hard line breaks in comments, which From e9feea7cbda0a7d5e9e3ab726e1a61cffaca7ba1 Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 22 Dec 2020 18:16:28 -0500 Subject: [PATCH 10/17] Fix so that comment matches cheat sheet --- custom/conf/app.example.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 1b16cc7a27a9b..b26720be0d365 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -243,7 +243,7 @@ TIMEOUT_STEP = 10s EVENT_SOURCE_UPDATE_TIME = 10s [ui.svg] -; Enable rendering of SVG files as images instead of as text. +; Whether to render SVG files as images. If SVG rendering is disabled, SVG files are displayed as text and cannot be embedded in markdown files as images. ENABLE_RENDER = true [markdown] From 8cbd84a259130884cd55122194b7978fff3fc05b Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 22 Dec 2020 19:23:41 -0500 Subject: [PATCH 11/17] Add allowing styles in CSP based on pull request feedback --- integrations/download_test.go | 4 ++-- routers/repo/download.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integrations/download_test.go b/integrations/download_test.go index 6c105421cc42d..305155e9ace48 100644 --- a/integrations/download_test.go +++ b/integrations/download_test.go @@ -32,7 +32,7 @@ func TestDownloadByIDForSVGUsesSecureHeaders(t *testing.T) { req := NewRequest(t, "GET", "/user2/repo2/raw/blob/6395b68e1feebb1e4c657b4f9f6ba2676a283c0b") resp := session.MakeRequest(t, req, http.StatusOK) - assert.Equal(t, "default-src 'none'; sandbox", resp.HeaderMap.Get("Content-Security-Policy")) + assert.Equal(t, "default-src 'none'; style-src 'unsafe-inline'; sandbox", resp.HeaderMap.Get("Content-Security-Policy")) assert.Equal(t, "image/svg+xml", resp.HeaderMap.Get("Content-Type")) assert.Equal(t, "nosniff", resp.HeaderMap.Get("X-Content-Type-Options")) } @@ -58,7 +58,7 @@ func TestDownloadByIDMediaForSVGUsesSecureHeaders(t *testing.T) { req := NewRequest(t, "GET", "/user2/repo2/media/blob/6395b68e1feebb1e4c657b4f9f6ba2676a283c0b") resp := session.MakeRequest(t, req, http.StatusOK) - assert.Equal(t, "default-src 'none'; sandbox", resp.HeaderMap.Get("Content-Security-Policy")) + assert.Equal(t, "default-src 'none'; style-src 'unsafe-inline'; sandbox", resp.HeaderMap.Get("Content-Security-Policy")) assert.Equal(t, "image/svg+xml", resp.HeaderMap.Get("Content-Type")) assert.Equal(t, "nosniff", resp.HeaderMap.Get("X-Content-Type-Options")) } diff --git a/routers/repo/download.go b/routers/repo/download.go index 34ed7bf50d584..f04dac6aa5146 100644 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -47,7 +47,7 @@ func ServeData(ctx *context.Context, name string, reader io.Reader) error { ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, name)) ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition") if base.IsSVGImageFile(buf) { - ctx.Resp.Header().Set("Content-Security-Policy", "default-src 'none'; sandbox") + ctx.Resp.Header().Set("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline'; sandbox") ctx.Resp.Header().Set("X-Content-Type-Options", "nosniff") ctx.Resp.Header().Set("Content-Type", base.SVGMimeType) } From 87601359c1dfa7cf62af7de33bed0fc0096c9e58 Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Wed, 23 Dec 2020 14:48:51 -0500 Subject: [PATCH 12/17] Re-enable raw button since we show SVG styles now --- templates/repo/view_file.tmpl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index b154c8455b810..86de599fb27c4 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -33,9 +33,7 @@ {{if not .ReadmeInList}}
- {{if not .IsSVGImageFile}} - {{.i18n.Tr "repo.file_raw"}} - {{end}} + {{.i18n.Tr "repo.file_raw"}} {{if not .IsViewCommit}} {{.i18n.Tr "repo.file_permalink"}} {{end}} From 881061ce106318e29baab56f0c2db2208620d9ef Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Thu, 24 Dec 2020 03:23:46 -0500 Subject: [PATCH 13/17] Change so that SVG files are editable --- modules/base/tool.go | 6 ++++++ routers/repo/editor.go | 6 +++--- routers/repo/lfs.go | 14 ++++++++------ routers/repo/view.go | 14 +++++++++----- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/modules/base/tool.go b/modules/base/tool.go index a9f108a78b305..c497bee44ae4f 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -293,6 +293,12 @@ func DetectContentType(data []byte) string { return ct } +// IsRepresentableAsText returns true if file content can be represented as +// plain text or is empty. +func IsRepresentableAsText(data []byte) bool { + return IsTextFile(data) || IsSVGImageFile(data) +} + // IsTextFile returns true if file content format is plain text or empty. func IsTextFile(data []byte) bool { if len(data) == 0 { diff --git a/routers/repo/editor.go b/routers/repo/editor.go index 1ee557a4fdf1e..7538c4cdaac2e 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -114,9 +114,9 @@ func editFile(ctx *context.Context, isNewFile bool) { n, _ := dataRc.Read(buf) buf = buf[:n] - // Only text file are editable online. - if !base.IsTextFile(buf) { - ctx.NotFound("base.IsTextFile", nil) + // Only some file types are editable online as text. + if !base.IsRepresentableAsText(buf) { + ctx.NotFound("base.IsRepresentableAsText", nil) return } diff --git a/routers/repo/lfs.go b/routers/repo/lfs.go index 429e46aefc202..5af02499b3b02 100644 --- a/routers/repo/lfs.go +++ b/routers/repo/lfs.go @@ -273,14 +273,19 @@ func LFSFileGet(ctx *context.Context) { } buf = buf[:n] - isTextFile := base.IsTextFile(buf) - ctx.Data["IsTextFile"] = isTextFile + ctx.Data["IsTextFile"] = base.IsTextFile(buf) + isRepresentableAsText := base.IsRepresentableAsText(buf) fileSize := meta.Size ctx.Data["FileSize"] = meta.Size ctx.Data["RawFileLink"] = fmt.Sprintf("%s%s.git/info/lfs/objects/%s/%s", setting.AppURL, ctx.Repo.Repository.FullName(), meta.Oid, "direct") switch { - case isTextFile: + case isRepresentableAsText: + // This will be true for SVGs. + if base.IsImageFile(buf) { + ctx.Data["IsImageFile"] = true + } + if fileSize >= setting.UI.MaxDisplayFileSize { ctx.Data["IsFileTooLarge"] = true break @@ -325,9 +330,6 @@ func LFSFileGet(ctx *context.Context) { ctx.Data["IsVideoFile"] = true case base.IsAudioFile(buf): ctx.Data["IsAudioFile"] = true - case base.IsSVGImageFile(buf): - ctx.Data["IsImageFile"] = true - ctx.Data["IsSvgImageFile"] = true case base.IsImageFile(buf): ctx.Data["IsImageFile"] = true } diff --git a/routers/repo/view.go b/routers/repo/view.go index c6e11b4a6307e..ca640e784d832 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -396,6 +396,8 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st isLFSFile := false ctx.Data["IsTextFile"] = isTextFile + isRepresentableAsText := base.IsRepresentableAsText(buf) + //Check for LFS meta file if isTextFile && setting.LFS.StartServer { meta := lfs.IsPointerFile(&buf) @@ -451,12 +453,17 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st // Assume file is not editable first. if isLFSFile { ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.cannot_edit_lfs_files") - } else if !isTextFile { + } else if !isRepresentableAsText { ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.cannot_edit_non_text_files") } switch { - case isTextFile: + case isRepresentableAsText: + // This will be true for SVGs. + if base.IsImageFile(buf) { + ctx.Data["IsImageFile"] = true + } + if fileSize >= setting.UI.MaxDisplayFileSize { ctx.Data["IsFileTooLarge"] = true break @@ -504,9 +511,6 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st ctx.Data["IsVideoFile"] = true case base.IsAudioFile(buf): ctx.Data["IsAudioFile"] = true - case base.IsSVGImageFile(buf): - ctx.Data["IsImageFile"] = true - ctx.Data["IsSVGImageFile"] = true case base.IsImageFile(buf): ctx.Data["IsImageFile"] = true default: From 7e41788e3e77c56743f42568ec81893d7013e0fb Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Mon, 28 Dec 2020 17:39:51 -0500 Subject: [PATCH 14/17] Add UI to toggle between source and rendered image for SVGs --- options/locale/locale_en-US.ini | 2 ++ routers/repo/view.go | 12 ++++++++++++ templates/repo/view_file.tmpl | 10 ++++++++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ae72dff3ad210..aa1e21717e9e3 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -822,6 +822,8 @@ tag = Tag released_this = released this file_raw = Raw file_history = History +file_view_source = View Source +file_view_rendered = View Rendered file_view_raw = View Raw file_permalink = Permalink file_too_large = The file is too large to be shown. diff --git a/routers/repo/view.go b/routers/repo/view.go index ca640e784d832..7330bc484f462 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -396,7 +396,18 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st isLFSFile := false ctx.Data["IsTextFile"] = isTextFile + isDisplayingSource := ctx.Query("display") == "source" + ctx.Data["IsDisplayingSource"] = isDisplayingSource + isDisplayingRendered := !isDisplayingSource + ctx.Data["IsDisplayingRendered"] = isDisplayingRendered isRepresentableAsText := base.IsRepresentableAsText(buf) + if !isRepresentableAsText { + // If we can't show plain text, always try to render. + isDisplayingSource = false + isDisplayingRendered = true + } + + ctx.Data["IsTextSource"] = isTextFile || isDisplayingSource //Check for LFS meta file if isTextFile && setting.LFS.StartServer { @@ -462,6 +473,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st // This will be true for SVGs. if base.IsImageFile(buf) { ctx.Data["IsImageFile"] = true + ctx.Data["HasSourceRenderedToggle"] = true } if fileSize >= setting.UI.MaxDisplayFileSize { diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 86de599fb27c4..5b13d849cb57e 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -32,6 +32,12 @@
{{if not .ReadmeInList}}
+ {{if .HasSourceRenderedToggle}} +
+ {{svg "octicon-code"}} + {{svg "octicon-file"}} +
+ {{end}}
{{.i18n.Tr "repo.file_raw"}} {{if not .IsViewCommit}} @@ -58,12 +64,12 @@ {{end}}
-
+
{{if .IsMarkup}} {{if .FileContent}}{{.FileContent | Safe}}{{end}} {{else if .IsRenderedHTML}} 
{{if .FileContent}}{{.FileContent | Str2html}}{{end}}
- {{else if not .IsTextFile}} + {{else if not .IsTextSource}}
{{if .IsImageFile}} From af16115618ff9fc8ca502b5f353c83e10c66ee1a Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 29 Dec 2020 14:56:41 -0500 Subject: [PATCH 15/17] Change to show blame button for SVG images --- routers/repo/view.go | 1 + templates/repo/view_file.tmpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/routers/repo/view.go b/routers/repo/view.go index 7330bc484f462..d1f88828240ba 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -401,6 +401,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st isDisplayingRendered := !isDisplayingSource ctx.Data["IsDisplayingRendered"] = isDisplayingRendered isRepresentableAsText := base.IsRepresentableAsText(buf) + ctx.Data["IsRepresentableAsText"] = isRepresentableAsText if !isRepresentableAsText { // If we can't show plain text, always try to render. isDisplayingSource = false diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 5b13d849cb57e..15a8a589f120c 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -43,7 +43,7 @@ {{if not .IsViewCommit}} {{.i18n.Tr "repo.file_permalink"}} {{end}} - {{if .IsTextFile}} + {{if .IsRepresentableAsText}} {{.i18n.Tr "repo.blame"}} {{end}} {{.i18n.Tr "repo.file_history"}} From eeb7bf4b1912b1b933d3220d5452488fdfcad6e0 Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 5 Jan 2021 22:38:09 -0500 Subject: [PATCH 16/17] Fix to update ctx data --- routers/repo/view.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/repo/view.go b/routers/repo/view.go index d1f88828240ba..fdb8d5f136a2c 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -397,9 +397,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st ctx.Data["IsTextFile"] = isTextFile isDisplayingSource := ctx.Query("display") == "source" - ctx.Data["IsDisplayingSource"] = isDisplayingSource isDisplayingRendered := !isDisplayingSource - ctx.Data["IsDisplayingRendered"] = isDisplayingRendered isRepresentableAsText := base.IsRepresentableAsText(buf) ctx.Data["IsRepresentableAsText"] = isRepresentableAsText if !isRepresentableAsText { @@ -407,6 +405,8 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st isDisplayingSource = false isDisplayingRendered = true } + ctx.Data["IsDisplayingSource"] = isDisplayingSource + ctx.Data["IsDisplayingRendered"] = isDisplayingRendered ctx.Data["IsTextSource"] = isTextFile || isDisplayingSource From 953a6679bb3d72169c5b65e462d202d93054fea7 Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Sun, 10 Jan 2021 21:42:40 -0500 Subject: [PATCH 17/17] Add test for DetectContentType when file is longer than sniffLen --- modules/base/tool_test.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go index c3d15923c8744..cda1685da7629 100644 --- a/modules/base/tool_test.go +++ b/modules/base/tool_test.go @@ -183,6 +183,20 @@ func TestIsLetter(t *testing.T) { assert.False(t, IsLetter('$')) } +func TestDetectContentTypeLongerThanSniffLen(t *testing.T) { + // Pre-condition: Shorter than sniffLen detects SVG. + assert.Equal(t, "image/svg+xml", DetectContentType([]byte(``))) + // Longer than sniffLen detects something else. + assert.Equal(t, "text/plain; charset=utf-8", DetectContentType([]byte(``))) +} + func TestIsTextFile(t *testing.T) { assert.True(t, IsTextFile([]byte{})) assert.True(t, IsTextFile([]byte("lorem ipsum")))