`)
for _, icon := range p.IconSVGs {
sb.WriteString(string(icon))
}
diff --git a/modules/git/hook.go b/modules/git/hook.go
index 548a59971dbb4..9a2dfae2e3c11 100644
--- a/modules/git/hook.go
+++ b/modules/git/hook.go
@@ -47,30 +47,16 @@ func GetHook(repoPath, name string) (*Hook, error) {
name: name,
path: filepath.Join(repoPath, "hooks", name+".d", name),
}
- isFile, err := util.IsFile(h.path)
- if err != nil {
- return nil, err
- }
- if isFile {
- data, err := os.ReadFile(h.path)
- if err != nil {
- return nil, err
- }
+ if data, err := os.ReadFile(h.path); err == nil {
h.IsActive = true
h.Content = string(data)
return h, nil
+ } else if !os.IsNotExist(err) {
+ return nil, err
}
samplePath := filepath.Join(repoPath, "hooks", name+".sample")
- isFile, err = util.IsFile(samplePath)
- if err != nil {
- return nil, err
- }
- if isFile {
- data, err := os.ReadFile(samplePath)
- if err != nil {
- return nil, err
- }
+ if data, err := os.ReadFile(samplePath); err == nil {
h.Sample = string(data)
}
return h, nil
diff --git a/modules/git/tree_entry_gogit.go b/modules/git/tree_entry_gogit.go
index e6845f1c776fe..1e6eec8ed4aae 100644
--- a/modules/git/tree_entry_gogit.go
+++ b/modules/git/tree_entry_gogit.go
@@ -19,12 +19,17 @@ type TreeEntry struct {
gogitTreeEntry *object.TreeEntry
ptree *Tree
+ fullName string
+
size int64
sized bool
}
// Name returns the name of the entry
func (te *TreeEntry) Name() string {
+ if te.fullName != "" {
+ return te.fullName
+ }
return te.gogitTreeEntry.Name
}
diff --git a/modules/git/tree_gogit.go b/modules/git/tree_gogit.go
index 272b018ffdd18..421b0ecb0f0f9 100644
--- a/modules/git/tree_gogit.go
+++ b/modules/git/tree_gogit.go
@@ -69,7 +69,7 @@ func (t *Tree) ListEntriesRecursiveWithSize() (Entries, error) {
seen := map[plumbing.Hash]bool{}
walker := object.NewTreeWalker(t.gogitTree, true, seen)
for {
- _, entry, err := walker.Next()
+ fullName, entry, err := walker.Next()
if err == io.EOF {
break
}
@@ -84,6 +84,7 @@ func (t *Tree) ListEntriesRecursiveWithSize() (Entries, error) {
ID: ParseGogitHash(entry.Hash),
gogitTreeEntry: &entry,
ptree: t,
+ fullName: fullName,
}
entries = append(entries, convertedEntry)
}
diff --git a/modules/git/url/url_test.go b/modules/git/url/url_test.go
index 6655c20be32bc..76aa74a128740 100644
--- a/modules/git/url/url_test.go
+++ b/modules/git/url/url_test.go
@@ -34,12 +34,12 @@ func TestParseGitURLs(t *testing.T) {
},
},
{
- kase: "git@[fe80:14fc:cec5:c174:d88%2510]:go-gitea/gitea.git",
+ kase: "git@[fe80::14fc:cec5:c174:d88%2510]:go-gitea/gitea.git",
expected: &GitURL{
URL: &url.URL{
Scheme: "ssh",
User: url.User("git"),
- Host: "[fe80:14fc:cec5:c174:d88%10]",
+ Host: "[fe80::14fc:cec5:c174:d88%10]",
Path: "go-gitea/gitea.git",
},
extraMark: 1,
@@ -137,11 +137,11 @@ func TestParseGitURLs(t *testing.T) {
},
},
{
- kase: "https://[fe80:14fc:cec5:c174:d88%2510]:20/go-gitea/gitea.git",
+ kase: "https://[fe80::14fc:cec5:c174:d88%2510]:20/go-gitea/gitea.git",
expected: &GitURL{
URL: &url.URL{
Scheme: "https",
- Host: "[fe80:14fc:cec5:c174:d88%10]:20",
+ Host: "[fe80::14fc:cec5:c174:d88%10]:20",
Path: "/go-gitea/gitea.git",
},
extraMark: 0,
diff --git a/modules/git/utils.go b/modules/git/utils.go
index b5f188904a78e..e7d30ce9eee37 100644
--- a/modules/git/utils.go
+++ b/modules/git/utils.go
@@ -6,7 +6,6 @@ package git
import (
"crypto/sha1"
"encoding/hex"
- "io"
"strconv"
"strings"
"sync"
@@ -68,32 +67,6 @@ func ParseBool(value string) (result, valid bool) {
return intValue != 0, true
}
-// LimitedReaderCloser is a limited reader closer
-type LimitedReaderCloser struct {
- R io.Reader
- C io.Closer
- N int64
-}
-
-// Read implements io.Reader
-func (l *LimitedReaderCloser) Read(p []byte) (n int, err error) {
- if l.N <= 0 {
- _ = l.C.Close()
- return 0, io.EOF
- }
- if int64(len(p)) > l.N {
- p = p[0:l.N]
- }
- n, err = l.R.Read(p)
- l.N -= int64(n)
- return n, err
-}
-
-// Close implements io.Closer
-func (l *LimitedReaderCloser) Close() error {
- return l.C.Close()
-}
-
func HashFilePathForWebUI(s string) string {
h := sha1.New()
_, _ = h.Write([]byte(s))
diff --git a/modules/hcaptcha/hcaptcha_test.go b/modules/hcaptcha/hcaptcha_test.go
index 55e01ec5355ba..5906faf17ce0b 100644
--- a/modules/hcaptcha/hcaptcha_test.go
+++ b/modules/hcaptcha/hcaptcha_test.go
@@ -4,7 +4,10 @@
package hcaptcha
import (
+ "errors"
+ "io"
"net/http"
+ "net/url"
"os"
"strings"
"testing"
@@ -21,6 +24,33 @@ func TestMain(m *testing.M) {
os.Exit(m.Run())
}
+type mockTransport struct{}
+
+func (mockTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+ if req.URL.String() != verifyURL {
+ return nil, errors.New("unsupported url")
+ }
+
+ body, err := io.ReadAll(req.Body)
+ if err != nil {
+ return nil, err
+ }
+
+ bodyValues, err := url.ParseQuery(string(body))
+ if err != nil {
+ return nil, err
+ }
+
+ var responseText string
+ if bodyValues.Get("response") == dummyToken {
+ responseText = `{"success":true,"credit":false,"hostname":"dummy-key-pass","challenge_ts":"2025-10-08T16:02:56.136Z"}`
+ } else {
+ responseText = `{"success":false,"error-codes":["invalid-input-response"]}`
+ }
+
+ return &http.Response{Request: req, Body: io.NopCloser(strings.NewReader(responseText))}, nil
+}
+
func TestCaptcha(t *testing.T) {
tt := []struct {
Name string
@@ -54,7 +84,8 @@ func TestCaptcha(t *testing.T) {
for _, tc := range tt {
t.Run(tc.Name, func(t *testing.T) {
client, err := New(tc.Secret, WithHTTP(&http.Client{
- Timeout: time.Second * 5,
+ Timeout: time.Second * 5,
+ Transport: mockTransport{},
}))
if err != nil {
// The only error that can be returned from creating a client
diff --git a/modules/httplib/request.go b/modules/httplib/request.go
index 49ea6f4b73e50..8542a57d367b2 100644
--- a/modules/httplib/request.go
+++ b/modules/httplib/request.go
@@ -7,54 +7,53 @@ package httplib
import (
"bytes"
"context"
- "crypto/tls"
- "errors"
"fmt"
"io"
"net"
"net/http"
"net/url"
"strings"
+ "sync"
"time"
)
-var defaultSetting = Settings{"GiteaServer", 60 * time.Second, 60 * time.Second, nil, nil}
-
-// newRequest returns *Request with specific method
-func newRequest(url, method string) *Request {
- var resp http.Response
- req := http.Request{
- Method: method,
- Header: make(http.Header),
- Proto: "HTTP/1.1",
- ProtoMajor: 1,
- ProtoMinor: 1,
+var defaultTransport = sync.OnceValue(func() http.RoundTripper {
+ return &http.Transport{
+ Proxy: http.ProxyFromEnvironment,
+ DialContext: DialContextWithTimeout(10 * time.Second), // it is good enough in modern days
}
- return &Request{url, &req, map[string]string{}, defaultSetting, &resp, nil}
-}
+})
-// NewRequest returns *Request with specific method
-func NewRequest(url, method string) *Request {
- return newRequest(url, method)
+func DialContextWithTimeout(timeout time.Duration) func(ctx context.Context, network, address string) (net.Conn, error) {
+ return func(ctx context.Context, network, address string) (net.Conn, error) {
+ return (&net.Dialer{Timeout: timeout}).DialContext(ctx, network, address)
+ }
}
-// Settings is the default settings for http client
-type Settings struct {
- UserAgent string
- ConnectTimeout time.Duration
- ReadWriteTimeout time.Duration
- TLSClientConfig *tls.Config
- Transport http.RoundTripper
+func NewRequest(url, method string) *Request {
+ return &Request{
+ url: url,
+ req: &http.Request{
+ Method: method,
+ Header: make(http.Header),
+ Proto: "HTTP/1.1", // FIXME: from legacy httplib, it shouldn't be hardcoded
+ ProtoMajor: 1,
+ ProtoMinor: 1,
+ },
+ params: map[string]string{},
+
+ // ATTENTION: from legacy httplib, callers must pay more attention to it, it will cause annoying bugs when the response takes a long time
+ readWriteTimeout: 60 * time.Second,
+ }
}
-// Request provides more useful methods for requesting one url than http.Request.
type Request struct {
- url string
- req *http.Request
- params map[string]string
- setting Settings
- resp *http.Response
- body []byte
+ url string
+ req *http.Request
+ params map[string]string
+
+ readWriteTimeout time.Duration
+ transport http.RoundTripper
}
// SetContext sets the request's Context
@@ -63,36 +62,24 @@ func (r *Request) SetContext(ctx context.Context) *Request {
return r
}
-// SetTimeout sets connect time out and read-write time out for BeegoRequest.
-func (r *Request) SetTimeout(connectTimeout, readWriteTimeout time.Duration) *Request {
- r.setting.ConnectTimeout = connectTimeout
- r.setting.ReadWriteTimeout = readWriteTimeout
+// SetTransport sets the request transport, if not set, will use httplib's default transport with environment proxy support
+// ATTENTION: the http.Transport has a connection pool, so it should be reused as much as possible, do not create a lot of transports
+func (r *Request) SetTransport(transport http.RoundTripper) *Request {
+ r.transport = transport
return r
}
func (r *Request) SetReadWriteTimeout(readWriteTimeout time.Duration) *Request {
- r.setting.ReadWriteTimeout = readWriteTimeout
+ r.readWriteTimeout = readWriteTimeout
return r
}
-// SetTLSClientConfig sets tls connection configurations if visiting https url.
-func (r *Request) SetTLSClientConfig(config *tls.Config) *Request {
- r.setting.TLSClientConfig = config
- return r
-}
-
-// Header add header item string in request.
+// Header set header item string in request.
func (r *Request) Header(key, value string) *Request {
r.req.Header.Set(key, value)
return r
}
-// SetTransport sets transport to
-func (r *Request) SetTransport(transport http.RoundTripper) *Request {
- r.setting.Transport = transport
- return r
-}
-
// Param adds query param in to request.
// params build query string as ?key1=value1&key2=value2...
func (r *Request) Param(key, value string) *Request {
@@ -125,11 +112,9 @@ func (r *Request) Body(data any) *Request {
return r
}
-func (r *Request) getResponse() (*http.Response, error) {
- if r.resp.StatusCode != 0 {
- return r.resp, nil
- }
-
+// Response executes request client and returns the response.
+// Caller MUST close the response body if no error occurs.
+func (r *Request) Response() (*http.Response, error) {
var paramBody string
if len(r.params) > 0 {
var buf bytes.Buffer
@@ -160,59 +145,19 @@ func (r *Request) getResponse() (*http.Response, error) {
return nil, err
}
- trans := r.setting.Transport
- if trans == nil {
- // create default transport
- trans = &http.Transport{
- TLSClientConfig: r.setting.TLSClientConfig,
- Proxy: http.ProxyFromEnvironment,
- DialContext: TimeoutDialer(r.setting.ConnectTimeout),
- }
- } else if t, ok := trans.(*http.Transport); ok {
- if t.TLSClientConfig == nil {
- t.TLSClientConfig = r.setting.TLSClientConfig
- }
- if t.DialContext == nil {
- t.DialContext = TimeoutDialer(r.setting.ConnectTimeout)
- }
- }
-
client := &http.Client{
- Transport: trans,
- Timeout: r.setting.ReadWriteTimeout,
- }
-
- if len(r.setting.UserAgent) > 0 && len(r.req.Header.Get("User-Agent")) == 0 {
- r.req.Header.Set("User-Agent", r.setting.UserAgent)
+ Transport: r.transport,
+ Timeout: r.readWriteTimeout,
}
-
- resp, err := client.Do(r.req)
- if err != nil {
- return nil, err
+ if client.Transport == nil {
+ client.Transport = defaultTransport()
}
- r.resp = resp
- return resp, nil
-}
-// Response executes request client gets response manually.
-// Caller MUST close the response body if no error occurs
-func (r *Request) Response() (*http.Response, error) {
- if r == nil {
- return nil, errors.New("invalid request")
+ if r.req.Header.Get("User-Agent") == "" {
+ r.req.Header.Set("User-Agent", "GiteaHttpLib")
}
- return r.getResponse()
-}
-// TimeoutDialer returns functions of connection dialer with timeout settings for http.Transport Dial field.
-func TimeoutDialer(cTimeout time.Duration) func(ctx context.Context, net, addr string) (c net.Conn, err error) {
- return func(ctx context.Context, netw, addr string) (net.Conn, error) {
- d := net.Dialer{Timeout: cTimeout}
- conn, err := d.DialContext(ctx, netw, addr)
- if err != nil {
- return nil, err
- }
- return conn, nil
- }
+ return client.Do(r.req)
}
func (r *Request) GoString() string {
diff --git a/modules/httplib/serve.go b/modules/httplib/serve.go
index 7c1edf432d18f..b4c5e7fe1ebdf 100644
--- a/modules/httplib/serve.go
+++ b/modules/httplib/serve.go
@@ -126,6 +126,7 @@ func setServeHeadersByFile(r *http.Request, w http.ResponseWriter, mineBuf []byt
// no sandbox attribute for pdf as it breaks rendering in at least safari. this
// should generally be safe as scripts inside PDF can not escape the PDF document
// see https://bugs.chromium.org/p/chromium/issues/detail?id=413851 for more discussion
+ // HINT: PDF-RENDER-SANDBOX: PDF won't render in sandboxed context
w.Header().Set("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline'")
}
diff --git a/modules/indexer/code/indexer.go b/modules/indexer/code/indexer.go
index 6035ddfe95fa2..98df6944a6ba4 100644
--- a/modules/indexer/code/indexer.go
+++ b/modules/indexer/code/indexer.go
@@ -22,6 +22,7 @@ import (
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/queue"
"code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/modules/util"
)
var (
@@ -166,12 +167,12 @@ func Init() {
log.Fatal("PID: %d Unable to initialize the bleve Repository Indexer at path: %s Error: %v", os.Getpid(), setting.Indexer.RepoPath, err)
}
case "elasticsearch":
- log.Info("PID: %d Initializing Repository Indexer at: %s", os.Getpid(), setting.Indexer.RepoConnStr)
+ log.Info("PID: %d Initializing Repository Indexer at: %s", os.Getpid(), util.SanitizeCredentialURLs(setting.Indexer.RepoConnStr))
defer func() {
if err := recover(); err != nil {
log.Error("PANIC whilst initializing repository indexer: %v\nStacktrace: %s", err, log.Stack(2))
log.Error("The indexer files are likely corrupted and may need to be deleted")
- log.Error("You can completely remove the \"%s\" index to make Gitea recreate the indexes", setting.Indexer.RepoConnStr)
+ log.Error("You can completely remove the \"%s\" index to make Gitea recreate the indexes", util.SanitizeCredentialURLs(setting.Indexer.RepoConnStr))
}
}()
@@ -181,7 +182,7 @@ func Init() {
cancel()
(*globalIndexer.Load()).Close()
close(waitChannel)
- log.Fatal("PID: %d Unable to initialize the elasticsearch Repository Indexer connstr: %s Error: %v", os.Getpid(), setting.Indexer.RepoConnStr, err)
+ log.Fatal("PID: %d Unable to initialize the elasticsearch Repository Indexer connstr: %s Error: %v", os.Getpid(), util.SanitizeCredentialURLs(setting.Indexer.RepoConnStr), err)
}
default:
diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go
index bbc78aecbe522..52b25c1794af0 100644
--- a/modules/indexer/issues/indexer.go
+++ b/modules/indexer/issues/indexer.go
@@ -25,6 +25,7 @@ import (
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/queue"
"code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/modules/util"
)
// IndexerMetadata is used to send data to the queue, so it contains only the ids.
@@ -100,7 +101,7 @@ func InitIssueIndexer(syncReindex bool) {
issueIndexer = elasticsearch.NewIndexer(setting.Indexer.IssueConnStr, setting.Indexer.IssueIndexerName)
existed, err = issueIndexer.Init(ctx)
if err != nil {
- log.Fatal("Unable to issueIndexer.Init with connection %s Error: %v", setting.Indexer.IssueConnStr, err)
+ log.Fatal("Unable to issueIndexer.Init with connection %s Error: %v", util.SanitizeCredentialURLs(setting.Indexer.IssueConnStr), err)
}
case "db":
issueIndexer = db.GetIndexer()
@@ -108,7 +109,7 @@ func InitIssueIndexer(syncReindex bool) {
issueIndexer = meilisearch.NewIndexer(setting.Indexer.IssueConnStr, setting.Indexer.IssueConnAuth, setting.Indexer.IssueIndexerName)
existed, err = issueIndexer.Init(ctx)
if err != nil {
- log.Fatal("Unable to issueIndexer.Init with connection %s Error: %v", setting.Indexer.IssueConnStr, err)
+ log.Fatal("Unable to issueIndexer.Init with connection %s Error: %v", util.SanitizeCredentialURLs(setting.Indexer.IssueConnStr), err)
}
default:
log.Fatal("Unknown issue indexer type: %s", setting.Indexer.IssueType)
diff --git a/modules/issue/template/unmarshal.go b/modules/issue/template/unmarshal.go
index 1d8e9dd02d995..ceab6babf4c44 100644
--- a/modules/issue/template/unmarshal.go
+++ b/modules/issue/template/unmarshal.go
@@ -5,7 +5,6 @@ package template
import (
"fmt"
- "io"
"path"
"strconv"
@@ -76,7 +75,7 @@ func unmarshalFromEntry(entry *git.TreeEntry, filename string) (*api.IssueTempla
}
defer r.Close()
- content, err := io.ReadAll(r)
+ content, err := util.ReadWithLimit(r, 1024*1024)
if err != nil {
return nil, fmt.Errorf("read all: %w", err)
}
diff --git a/modules/lfstransfer/backend/backend.go b/modules/lfstransfer/backend/backend.go
index dd4108ea564f2..f4e6157091aab 100644
--- a/modules/lfstransfer/backend/backend.go
+++ b/modules/lfstransfer/backend/backend.go
@@ -157,7 +157,7 @@ func (g *GiteaBackend) Batch(_ string, pointers []transfer.BatchItem, args trans
}
// Download implements transfer.Backend. The returned reader must be closed by the caller.
-func (g *GiteaBackend) Download(oid string, args transfer.Args) (io.ReadCloser, int64, error) {
+func (g *GiteaBackend) Download(oid string, args transfer.Args) (_ io.ReadCloser, _ int64, retErr error) {
idMapStr, exists := args[argID]
if !exists {
return nil, 0, ErrMissingID
@@ -188,7 +188,15 @@ func (g *GiteaBackend) Download(oid string, args transfer.Args) (io.ReadCloser,
if err != nil {
return nil, 0, fmt.Errorf("failed to get response: %w", err)
}
- // no need to close the body here by "defer resp.Body.Close()", see below
+ // We must return the ReaderCloser but not "ReadAll", to avoid OOM.
+ // "transfer.Backend" will check io.Closer interface and close the Body reader.
+ // So only close the Body when error occurs
+ defer func() {
+ if retErr != nil {
+ _ = resp.Body.Close()
+ }
+ }()
+
if resp.StatusCode != http.StatusOK {
return nil, 0, statusCodeToErr(resp.StatusCode)
}
@@ -197,7 +205,6 @@ func (g *GiteaBackend) Download(oid string, args transfer.Args) (io.ReadCloser,
if err != nil {
return nil, 0, fmt.Errorf("failed to parse content length: %w", err)
}
- // transfer.Backend will check io.Closer interface and close this Body reader
return resp.Body, respSize, nil
}
diff --git a/modules/markup/external/external.go b/modules/markup/external/external.go
index 39861ade121ee..3cbe14b86a898 100644
--- a/modules/markup/external/external.go
+++ b/modules/markup/external/external.go
@@ -15,6 +15,8 @@ import (
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
+
+ "github.com/kballard/go-shellquote"
)
// RegisterRenderers registers all supported third part renderers according settings
@@ -56,14 +58,11 @@ func (p *Renderer) SanitizerRules() []setting.MarkupSanitizerRule {
return p.MarkupSanitizerRules
}
-// SanitizerDisabled disabled sanitize if return true
-func (p *Renderer) SanitizerDisabled() bool {
- return p.RenderContentMode == setting.RenderContentModeNoSanitizer || p.RenderContentMode == setting.RenderContentModeIframe
-}
-
-// DisplayInIFrame represents whether render the content with an iframe
-func (p *Renderer) DisplayInIFrame() bool {
- return p.RenderContentMode == setting.RenderContentModeIframe
+func (p *Renderer) GetExternalRendererOptions() (ret markup.ExternalRendererOptions) {
+ ret.SanitizerDisabled = p.RenderContentMode == setting.RenderContentModeNoSanitizer || p.RenderContentMode == setting.RenderContentModeIframe
+ ret.DisplayInIframe = p.RenderContentMode == setting.RenderContentModeIframe
+ ret.ContentSandbox = p.RenderContentSandbox
+ return ret
}
func envMark(envName string) string {
@@ -81,7 +80,10 @@ func (p *Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.
envMark("GITEA_PREFIX_SRC"), baseLinkSrc,
envMark("GITEA_PREFIX_RAW"), baseLinkRaw,
).Replace(p.Command)
- commands := strings.Fields(command)
+ commands, err := shellquote.Split(command)
+ if err != nil || len(commands) == 0 {
+ return fmt.Errorf("%s invalid command %q: %w", p.Name(), p.Command, err)
+ }
args := commands[1:]
if p.IsInputFile {
diff --git a/modules/markup/html_emoji.go b/modules/markup/html_emoji.go
index c63806542524c..91ba26c6769e3 100644
--- a/modules/markup/html_emoji.go
+++ b/modules/markup/html_emoji.go
@@ -5,6 +5,7 @@ package markup
import (
"strings"
+ "unicode"
"code.gitea.io/gitea/modules/emoji"
"code.gitea.io/gitea/modules/setting"
@@ -66,26 +67,31 @@ func emojiShortCodeProcessor(ctx *RenderContext, node *html.Node) {
}
m[0] += start
m[1] += start
-
start = m[1]
alias := node.Data[m[0]:m[1]]
- alias = strings.ReplaceAll(alias, ":", "")
- converted := emoji.FromAlias(alias)
- if converted == nil {
- // check if this is a custom reaction
- if _, exist := setting.UI.CustomEmojisMap[alias]; exist {
- replaceContent(node, m[0], m[1], createCustomEmoji(ctx, alias))
- node = node.NextSibling.NextSibling
- start = 0
- continue
- }
+
+ var nextChar byte
+ if m[1] < len(node.Data) {
+ nextChar = node.Data[m[1]]
+ }
+ if nextChar == ':' || unicode.IsLetter(rune(nextChar)) || unicode.IsDigit(rune(nextChar)) {
continue
}
- replaceContent(node, m[0], m[1], createEmoji(ctx, converted.Emoji, converted.Description))
- node = node.NextSibling.NextSibling
- start = 0
+ alias = strings.Trim(alias, ":")
+ converted := emoji.FromAlias(alias)
+ if converted != nil {
+ // standard emoji
+ replaceContent(node, m[0], m[1], createEmoji(ctx, converted.Emoji, converted.Description))
+ node = node.NextSibling.NextSibling
+ start = 0 // restart searching start since node has changed
+ } else if _, exist := setting.UI.CustomEmojisMap[alias]; exist {
+ // custom reaction
+ replaceContent(node, m[0], m[1], createCustomEmoji(ctx, alias))
+ node = node.NextSibling.NextSibling
+ start = 0 // restart searching start since node has changed
+ }
}
}
diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go
index 5fdbf43f7cb22..08b050baae15c 100644
--- a/modules/markup/html_test.go
+++ b/modules/markup/html_test.go
@@ -357,12 +357,9 @@ func TestRender_emoji(t *testing.T) {
`
😎🤪🔐🤑❓
`)
// should match nothing
- test(
- "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
- `
2001:0db8:85a3:0000:0000:8a2e:0370:7334
`)
- test(
- ":not exist:",
- `
:not exist:
`)
+ test(":100:200", `
:100:200
`)
+ test("std::thread::something", `
std::thread::something
`)
+ test(":not exist:", `
:not exist:
`)
}
func TestRender_ShortLinks(t *testing.T) {
diff --git a/modules/markup/internal/finalprocessor.go b/modules/markup/internal/finalprocessor.go
index 14d46a161f0b8..4442afa0c9ee3 100644
--- a/modules/markup/internal/finalprocessor.go
+++ b/modules/markup/internal/finalprocessor.go
@@ -5,11 +5,13 @@ package internal
import (
"bytes"
+ "html/template"
"io"
)
type finalProcessor struct {
renderInternal *RenderInternal
+ extraHeadHTML template.HTML
output io.Writer
buf bytes.Buffer
@@ -25,6 +27,32 @@ func (p *finalProcessor) Close() error {
// because "postProcess" already does so. In the future we could optimize the code to process data on the fly.
buf := p.buf.Bytes()
buf = bytes.ReplaceAll(buf, []byte(` data-attr-class="`+p.renderInternal.secureIDPrefix), []byte(` class="`))
- _, err := p.output.Write(buf)
+
+ tmp := bytes.TrimSpace(buf)
+ isLikelyHTML := len(tmp) != 0 && tmp[0] == '<' && tmp[len(tmp)-1] == '>' && bytes.Index(tmp, []byte(` 0
+ if !isLikelyHTML {
+ // not HTML, write back directly
+ _, err := p.output.Write(buf)
+ return err
+ }
+
+ // add our extra head HTML into output
+ headBytes := []byte("")
+ posHead := bytes.Index(buf, headBytes)
+ var part1, part2 []byte
+ if posHead >= 0 {
+ part1, part2 = buf[:posHead+len(headBytes)], buf[posHead+len(headBytes):]
+ } else {
+ part1, part2 = nil, buf
+ }
+ if len(part1) > 0 {
+ if _, err := p.output.Write(part1); err != nil {
+ return err
+ }
+ }
+ if _, err := io.WriteString(p.output, string(p.extraHeadHTML)); err != nil {
+ return err
+ }
+ _, err := p.output.Write(part2)
return err
}
diff --git a/modules/markup/internal/internal_test.go b/modules/markup/internal/internal_test.go
index 590bcbb67f3bd..a216d75203f3a 100644
--- a/modules/markup/internal/internal_test.go
+++ b/modules/markup/internal/internal_test.go
@@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/assert"
)
-func TestRenderInternal(t *testing.T) {
+func TestRenderInternalAttrs(t *testing.T) {
cases := []struct {
input, protected, recovered string
}{
@@ -30,7 +30,7 @@ func TestRenderInternal(t *testing.T) {
for _, c := range cases {
var r RenderInternal
out := &bytes.Buffer{}
- in := r.init("sec", out)
+ in := r.init("sec", out, "")
protected := r.ProtectSafeAttrs(template.HTML(c.input))
assert.EqualValues(t, c.protected, protected)
_, _ = io.WriteString(in, string(protected))
@@ -41,7 +41,7 @@ func TestRenderInternal(t *testing.T) {
var r1, r2 RenderInternal
protected := r1.ProtectSafeAttrs(`
`)
assert.EqualValues(t, `
`, protected, "non-initialized RenderInternal should not protect any attributes")
- _ = r1.init("sec", nil)
+ _ = r1.init("sec", nil, "")
protected = r1.ProtectSafeAttrs(`
`)
assert.EqualValues(t, `
`, protected)
assert.Equal(t, "data-attr-class", r1.SafeAttr("class"))
@@ -54,8 +54,37 @@ func TestRenderInternal(t *testing.T) {
assert.Empty(t, recovered)
out2 := &bytes.Buffer{}
- in2 := r2.init("sec-other", out2)
+ in2 := r2.init("sec-other", out2, "")
_, _ = io.WriteString(in2, string(protected))
_ = in2.Close()
assert.Equal(t, `
`, out2.String(), "different secureID should not recover the value")
}
+
+func TestRenderInternalExtraHead(t *testing.T) {
+ t.Run("HeadExists", func(t *testing.T) {
+ out := &bytes.Buffer{}
+ var r RenderInternal
+ in := r.init("sec", out, `
`)
+ _, _ = io.WriteString(in, `any`)
+ _ = in.Close()
+ assert.Equal(t, `any`, out.String())
+ })
+
+ t.Run("HeadNotExists", func(t *testing.T) {
+ out := &bytes.Buffer{}
+ var r RenderInternal
+ in := r.init("sec", out, ``)
+ _, _ = io.WriteString(in, ``)
+ _ = in.Close()
+ assert.Equal(t, ``, out.String())
+ })
+
+ t.Run("NotHTML", func(t *testing.T) {
+ out := &bytes.Buffer{}
+ var r RenderInternal
+ in := r.init("sec", out, ``)
+ _, _ = io.WriteString(in, ``)
+ _ = in.Close()
+ assert.Equal(t, ``, out.String())
+ })
+}
diff --git a/modules/markup/internal/renderinternal.go b/modules/markup/internal/renderinternal.go
index 7a3e37b120f82..9fd9a1c0e83a2 100644
--- a/modules/markup/internal/renderinternal.go
+++ b/modules/markup/internal/renderinternal.go
@@ -29,19 +29,19 @@ type RenderInternal struct {
secureIDPrefix string
}
-func (r *RenderInternal) Init(output io.Writer) io.WriteCloser {
+func (r *RenderInternal) Init(output io.Writer, extraHeadHTML template.HTML) io.WriteCloser {
buf := make([]byte, 12)
_, err := rand.Read(buf)
if err != nil {
panic("unable to generate secure id")
}
- return r.init(base64.URLEncoding.EncodeToString(buf), output)
+ return r.init(base64.URLEncoding.EncodeToString(buf), output, extraHeadHTML)
}
-func (r *RenderInternal) init(secID string, output io.Writer) io.WriteCloser {
+func (r *RenderInternal) init(secID string, output io.Writer, extraHeadHTML template.HTML) io.WriteCloser {
r.secureID = secID
r.secureIDPrefix = r.secureID + ":"
- return &finalProcessor{renderInternal: r, output: output}
+ return &finalProcessor{renderInternal: r, output: output, extraHeadHTML: extraHeadHTML}
}
func (r *RenderInternal) RecoverProtectedValue(v string) (string, bool) {
diff --git a/modules/markup/render.go b/modules/markup/render.go
index 79f1f473c2c6f..c6457490656d8 100644
--- a/modules/markup/render.go
+++ b/modules/markup/render.go
@@ -6,12 +6,14 @@ package markup
import (
"context"
"fmt"
+ "html/template"
"io"
"net/url"
"strconv"
"strings"
"time"
+ "code.gitea.io/gitea/modules/htmlutil"
"code.gitea.io/gitea/modules/markup/internal"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
@@ -120,31 +122,38 @@ func (ctx *RenderContext) WithHelper(helper RenderHelper) *RenderContext {
return ctx
}
-// Render renders markup file to HTML with all specific handling stuff.
-func Render(ctx *RenderContext, input io.Reader, output io.Writer) error {
+// FindRendererByContext finds renderer by RenderContext
+// TODO: it should be merged with other similar functions like GetRendererByFileName, DetectMarkupTypeByFileName, etc
+func FindRendererByContext(ctx *RenderContext) (Renderer, error) {
if ctx.RenderOptions.MarkupType == "" && ctx.RenderOptions.RelativePath != "" {
ctx.RenderOptions.MarkupType = DetectMarkupTypeByFileName(ctx.RenderOptions.RelativePath)
if ctx.RenderOptions.MarkupType == "" {
- return util.NewInvalidArgumentErrorf("unsupported file to render: %q", ctx.RenderOptions.RelativePath)
+ return nil, util.NewInvalidArgumentErrorf("unsupported file to render: %q", ctx.RenderOptions.RelativePath)
}
}
renderer := renderers[ctx.RenderOptions.MarkupType]
if renderer == nil {
- return util.NewInvalidArgumentErrorf("unsupported markup type: %q", ctx.RenderOptions.MarkupType)
+ return nil, util.NewNotExistErrorf("unsupported markup type: %q", ctx.RenderOptions.MarkupType)
}
- if ctx.RenderOptions.RelativePath != "" {
- if externalRender, ok := renderer.(ExternalRenderer); ok && externalRender.DisplayInIFrame() {
- if !ctx.RenderOptions.InStandalonePage {
- // for an external "DisplayInIFrame" render, it could only output its content in a standalone page
- // otherwise, a `,
- setting.AppSubURL,
+func renderIFrame(ctx *RenderContext, sandbox string, output io.Writer) error {
+ src := fmt.Sprintf("%s/%s/%s/render/%s/%s", setting.AppSubURL,
url.PathEscape(ctx.RenderOptions.Metas["user"]),
url.PathEscape(ctx.RenderOptions.Metas["repo"]),
- ctx.RenderOptions.Metas["RefTypeNameSubURL"],
- url.PathEscape(ctx.RenderOptions.RelativePath),
- ))
+ util.PathEscapeSegments(ctx.RenderOptions.Metas["RefTypeNameSubURL"]),
+ util.PathEscapeSegments(ctx.RenderOptions.RelativePath),
+ )
+
+ var sandboxAttrValue template.HTML
+ if sandbox != "" {
+ sandboxAttrValue = htmlutil.HTMLFormat(`sandbox="%s"`, sandbox)
+ }
+ iframe := htmlutil.HTMLFormat(``, src, sandboxAttrValue)
+ _, err := io.WriteString(output, string(iframe))
return err
}
@@ -185,13 +190,34 @@ func pipes() (io.ReadCloser, io.WriteCloser, func()) {
}
}
-func render(ctx *RenderContext, renderer Renderer, input io.Reader, output io.Writer) error {
+func getExternalRendererOptions(renderer Renderer) (ret ExternalRendererOptions, _ bool) {
+ if externalRender, ok := renderer.(ExternalRenderer); ok {
+ return externalRender.GetExternalRendererOptions(), true
+ }
+ return ret, false
+}
+
+func RenderWithRenderer(ctx *RenderContext, renderer Renderer, input io.Reader, output io.Writer) error {
+ var extraHeadHTML template.HTML
+ if extOpts, ok := getExternalRendererOptions(renderer); ok && extOpts.DisplayInIframe {
+ if !ctx.RenderOptions.InStandalonePage {
+ // for an external "DisplayInIFrame" render, it could only output its content in a standalone page
+ // otherwise, a