mirror of
https://gitee.com/gitea/gitea.git
synced 2024-12-15 18:10:50 +08:00
bbffcc3aec
There are multiple places where Gitea does not properly escape URLs that it is building and there are multiple places where it builds urls when there is already a simpler function available to use this.
This is an extensive PR attempting to fix these issues.
1. The first commit in this PR looks through all href, src and links in the Gitea codebase and has attempted to catch all the places where there is potentially incomplete escaping.
2. Whilst doing this we will prefer to use functions that create URLs over recreating them by hand.
3. All uses of strings should be directly escaped - even if they are not currently expected to contain escaping characters. The main benefit to doing this will be that we can consider relaxing the constraints on user names and reponames in future.
4. The next commit looks at escaping in the wiki and re-considers the urls that are used there. Using the improved escaping here wiki files containing '/'. (This implementation will currently still place all of the wiki files the root directory of the repo but this would not be difficult to change.)
5. The title generation in feeds is now properly escaped.
6. EscapePound is no longer needed - urls should be PathEscaped / QueryEscaped as necessary but then re-escaped with Escape when creating html with locales Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
91 lines
2.9 KiB
Go
91 lines
2.9 KiB
Go
// 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.
|
|
|
|
package convert
|
|
|
|
import (
|
|
"net/url"
|
|
|
|
"code.gitea.io/gitea/models"
|
|
api "code.gitea.io/gitea/modules/structs"
|
|
)
|
|
|
|
// ToNotificationThread convert a Notification to api.NotificationThread
|
|
func ToNotificationThread(n *models.Notification) *api.NotificationThread {
|
|
result := &api.NotificationThread{
|
|
ID: n.ID,
|
|
Unread: !(n.Status == models.NotificationStatusRead || n.Status == models.NotificationStatusPinned),
|
|
Pinned: n.Status == models.NotificationStatusPinned,
|
|
UpdatedAt: n.UpdatedUnix.AsTime(),
|
|
URL: n.APIURL(),
|
|
}
|
|
|
|
//since user only get notifications when he has access to use minimal access mode
|
|
if n.Repository != nil {
|
|
result.Repository = ToRepo(n.Repository, models.AccessModeRead)
|
|
}
|
|
|
|
//handle Subject
|
|
switch n.Source {
|
|
case models.NotificationSourceIssue:
|
|
result.Subject = &api.NotificationSubject{Type: api.NotifySubjectIssue}
|
|
if n.Issue != nil {
|
|
result.Subject.Title = n.Issue.Title
|
|
result.Subject.URL = n.Issue.APIURL()
|
|
result.Subject.HTMLURL = n.Issue.HTMLURL()
|
|
result.Subject.State = n.Issue.State()
|
|
comment, err := n.Issue.GetLastComment()
|
|
if err == nil && comment != nil {
|
|
result.Subject.LatestCommentURL = comment.APIURL()
|
|
result.Subject.LatestCommentHTMLURL = comment.HTMLURL()
|
|
}
|
|
}
|
|
case models.NotificationSourcePullRequest:
|
|
result.Subject = &api.NotificationSubject{Type: api.NotifySubjectPull}
|
|
if n.Issue != nil {
|
|
result.Subject.Title = n.Issue.Title
|
|
result.Subject.URL = n.Issue.APIURL()
|
|
result.Subject.HTMLURL = n.Issue.HTMLURL()
|
|
result.Subject.State = n.Issue.State()
|
|
comment, err := n.Issue.GetLastComment()
|
|
if err == nil && comment != nil {
|
|
result.Subject.LatestCommentURL = comment.APIURL()
|
|
result.Subject.LatestCommentHTMLURL = comment.HTMLURL()
|
|
}
|
|
|
|
pr, _ := n.Issue.GetPullRequest()
|
|
if pr != nil && pr.HasMerged {
|
|
result.Subject.State = "merged"
|
|
}
|
|
}
|
|
case models.NotificationSourceCommit:
|
|
url := n.Repository.HTMLURL() + "/commit/" + url.PathEscape(n.CommitID)
|
|
result.Subject = &api.NotificationSubject{
|
|
Type: api.NotifySubjectCommit,
|
|
Title: n.CommitID,
|
|
URL: url,
|
|
HTMLURL: url,
|
|
}
|
|
case models.NotificationSourceRepository:
|
|
result.Subject = &api.NotificationSubject{
|
|
Type: api.NotifySubjectRepository,
|
|
Title: n.Repository.FullName(),
|
|
// FIXME: this is a relative URL, rather useless and inconsistent, but keeping for backwards compat
|
|
URL: n.Repository.Link(),
|
|
HTMLURL: n.Repository.HTMLURL(),
|
|
}
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
// ToNotifications convert list of Notification to api.NotificationThread list
|
|
func ToNotifications(nl models.NotificationList) []*api.NotificationThread {
|
|
var result = make([]*api.NotificationThread, 0, len(nl))
|
|
for _, n := range nl {
|
|
result = append(result, ToNotificationThread(n))
|
|
}
|
|
return result
|
|
}
|