summaryrefslogtreecommitdiffstats
path: root/modules/references
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-08-06 20:20:05 +0100
committerGitHub <noreply@github.com>2020-08-06 20:20:05 +0100
commite770c2b850b6e1ce6a6b554cf376c0f7575f80eb (patch)
treee3ee3694b36fa091e14d31678a115cbf5aa739f1 /modules/references
parente17e3f71f4e7d2b5e0eac3a55f1b143f2d5a667e (diff)
downloadgitea-e770c2b850b6e1ce6a6b554cf376c0f7575f80eb.tar.gz
gitea-e770c2b850b6e1ce6a6b554cf376c0f7575f80eb.zip
Detect full references to issues and pulls in commit messages (#12399)
Fix #10269 Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'modules/references')
-rw-r--r--modules/references/references.go54
1 files changed, 51 insertions, 3 deletions
diff --git a/modules/references/references.go b/modules/references/references.go
index c9dabb06ba..ce08dcc7ab 100644
--- a/modules/references/references.go
+++ b/modules/references/references.go
@@ -41,8 +41,9 @@ var (
issueCloseKeywordsPat, issueReopenKeywordsPat *regexp.Regexp
issueKeywordsOnce sync.Once
- giteaHostInit sync.Once
- giteaHost string
+ giteaHostInit sync.Once
+ giteaHost string
+ giteaIssuePullPattern *regexp.Regexp
)
// XRefAction represents the kind of effect a cross reference has once is resolved
@@ -152,13 +153,25 @@ func getGiteaHostName() string {
giteaHostInit.Do(func() {
if uapp, err := url.Parse(setting.AppURL); err == nil {
giteaHost = strings.ToLower(uapp.Host)
+ giteaIssuePullPattern = regexp.MustCompile(
+ `(\s|^|\(|\[)` +
+ regexp.QuoteMeta(strings.TrimSpace(setting.AppURL)) +
+ `([0-9a-zA-Z-_\.]+/[0-9a-zA-Z-_\.]+)/` +
+ `((?:issues)|(?:pulls))/([0-9]+)(?:\s|$|\)|\]|[:;,.?!]\s|[:;,.?!]$)`)
} else {
giteaHost = ""
+ giteaIssuePullPattern = nil
}
})
return giteaHost
}
+// getGiteaIssuePullPattern
+func getGiteaIssuePullPattern() *regexp.Regexp {
+ getGiteaHostName()
+ return giteaIssuePullPattern
+}
+
// FindAllMentionsMarkdown matches mention patterns in given content and
// returns a list of found unvalidated user names **not including** the @ prefix.
func FindAllMentionsMarkdown(content string) []string {
@@ -219,7 +232,42 @@ func findAllIssueReferencesMarkdown(content string) []*rawReference {
// FindAllIssueReferences returns a list of unvalidated references found in a string.
func FindAllIssueReferences(content string) []IssueReference {
- return rawToIssueReferenceList(findAllIssueReferencesBytes([]byte(content), []string{}))
+ // Need to convert fully qualified html references to local system to #/! short codes
+ contentBytes := []byte(content)
+ if re := getGiteaIssuePullPattern(); re != nil {
+ pos := 0
+ for {
+ match := re.FindSubmatchIndex(contentBytes[pos:])
+ if match == nil {
+ break
+ }
+ // match[0]-match[1] is whole string
+ // match[2]-match[3] is preamble
+ pos += match[3]
+ // match[4]-match[5] is owner/repo
+ endPos := pos + match[5] - match[4]
+ copy(contentBytes[pos:endPos], contentBytes[match[4]:match[5]])
+ pos = endPos
+ // match[6]-match[7] == 'issues'
+ contentBytes[pos] = '#'
+ if string(contentBytes[match[6]:match[7]]) == "pulls" {
+ contentBytes[pos] = '!'
+ }
+ pos++
+ // match[8]-match[9] is the number
+ endPos = pos + match[9] - match[8]
+ copy(contentBytes[pos:endPos], contentBytes[match[8]:match[9]])
+ copy(contentBytes[endPos:], contentBytes[match[9]:])
+ // now we reset the length
+ // our new section has length endPos - match[3]
+ // our old section has length match[9] - match[3]
+ contentBytes = contentBytes[:len(contentBytes)-match[9]+endPos]
+ pos = endPos
+ }
+ } else {
+ log.Debug("No GiteaIssuePullPattern pattern")
+ }
+ return rawToIssueReferenceList(findAllIssueReferencesBytes(contentBytes, []string{}))
}
// FindRenderizableReferenceNumeric returns the first unvalidated reference found in a string.