-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request '[SECURITY] Fix XSS vulnerabilities' (#2434) from …
…earl-warren/forgejo:wip-v1.21-xss into v1.21/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2434 Reviewed-by: Gusted <[email protected]> Reviewed-by: Otto <[email protected]>
- Loading branch information
Showing
8 changed files
with
115 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
tests/integration/fixtures/TestXSSReviewDismissed/comment.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| - | ||
| id: 1000 | ||
| type: 32 # dismiss review | ||
| poster_id: 2 | ||
| issue_id: 2 # in repo_id 1 | ||
| content: "XSS time!" | ||
| review_id: 1000 | ||
| created_unix: 1700000000 | ||
| updated_unix: 1700000000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| - | ||
| id: 1000 | ||
| type: 1 | ||
| issue_id: 2 | ||
| original_author: "Otto <script class='evil'>alert('Oh no!')</script>" | ||
| content: "XSS time!" | ||
| updated_unix: 1700000000 | ||
| created_unix: 1700000000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,14 +4,25 @@ | |
| package integration | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "net/http" | ||
| "net/url" | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
| "time" | ||
|
|
||
| issues_model "code.gitea.io/gitea/models/issues" | ||
| "code.gitea.io/gitea/models/unittest" | ||
| user_model "code.gitea.io/gitea/models/user" | ||
| "code.gitea.io/gitea/modules/git" | ||
| "code.gitea.io/gitea/tests" | ||
|
|
||
| gogit "github.com/go-git/go-git/v5" | ||
| "github.com/go-git/go-git/v5/plumbing/object" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestXSSUserFullName(t *testing.T) { | ||
|
|
@@ -37,3 +48,82 @@ func TestXSSUserFullName(t *testing.T) { | |
| htmlDoc.doc.Find("div.content").Find(".header.text.center").Text(), | ||
| ) | ||
| } | ||
|
|
||
| func TestXSSWikiLastCommitInfo(t *testing.T) { | ||
| onGiteaRun(t, func(t *testing.T, u *url.URL) { | ||
| // Prepare the environment. | ||
| dstPath := t.TempDir() | ||
| r := fmt.Sprintf("%suser2/repo1.wiki.git", u.String()) | ||
| u, err := url.Parse(r) | ||
| assert.NoError(t, err) | ||
| u.User = url.UserPassword("user2", userPassword) | ||
| assert.NoError(t, git.CloneWithArgs(context.Background(), git.AllowLFSFiltersArgs(), u.String(), dstPath, git.CloneRepoOptions{})) | ||
|
|
||
| // Use go-git here, because using git wouldn't work, it has code to remove | ||
| // `<`, `>` and `\n` in user names. Even though this is permitted and | ||
| // wouldn't result in a error by a Git server. | ||
| gitRepo, err := gogit.PlainOpen(dstPath) | ||
| require.NoError(t, err) | ||
|
|
||
| w, err := gitRepo.Worktree() | ||
| require.NoError(t, err) | ||
|
|
||
| filename := filepath.Join(dstPath, "Home.md") | ||
| err = os.WriteFile(filename, []byte("Oh, a XSS attack?"), 0o644) | ||
| require.NoError(t, err) | ||
|
|
||
| _, err = w.Add("Home.md") | ||
| require.NoError(t, err) | ||
|
|
||
| _, err = w.Commit("Yay XSS", &gogit.CommitOptions{ | ||
| Author: &object.Signature{ | ||
| Name: `Gusted<script class="evil">alert('Oh no!');</script>`, | ||
| Email: "[email protected]", | ||
| When: time.Date(2024, time.January, 31, 0, 0, 0, 0, time.UTC), | ||
| }, | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| // Push. | ||
| _, _, err = git.NewCommand(git.DefaultContext, "push").AddArguments(git.ToTrustedCmdArgs([]string{"origin", "master"})...).RunStdString(&git.RunOpts{Dir: dstPath}) | ||
| require.NoError(t, err) | ||
|
|
||
| // Check on page view. | ||
| t.Run("Page view", func(t *testing.T) { | ||
| defer tests.PrintCurrentTest(t)() | ||
|
|
||
| req := NewRequest(t, http.MethodGet, "/user2/repo1/wiki/Home") | ||
| resp := MakeRequest(t, req, http.StatusOK) | ||
| htmlDoc := NewHTMLParser(t, resp.Body) | ||
|
|
||
| htmlDoc.AssertElement(t, "script.evil", false) | ||
| assert.Contains(t, htmlDoc.Find(".ui.sub.header").Text(), `Gusted<script class="evil">alert('Oh no!');</script> edited this page 2024-01-31`) | ||
| }) | ||
|
|
||
| // Check on revisions page. | ||
| t.Run("Revision page", func(t *testing.T) { | ||
| defer tests.PrintCurrentTest(t)() | ||
|
|
||
| req := NewRequest(t, http.MethodGet, "/user2/repo1/wiki/Home?action=_revision") | ||
| resp := MakeRequest(t, req, http.StatusOK) | ||
| htmlDoc := NewHTMLParser(t, resp.Body) | ||
|
|
||
| htmlDoc.AssertElement(t, "script.evil", false) | ||
| assert.Contains(t, htmlDoc.Find(".ui.sub.header").Text(), `Gusted<script class="evil">alert('Oh no!');</script> edited this page 2024-01-31`) | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| func TestXSSReviewDismissed(t *testing.T) { | ||
| defer tests.AddFixtures("tests/integration/fixtures/TestXSSReviewDismissed/")() | ||
| defer tests.PrepareTestEnv(t)() | ||
|
|
||
| review := unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: 1000}) | ||
|
|
||
| req := NewRequest(t, http.MethodGet, fmt.Sprintf("/user2/repo1/pulls/%d", +review.IssueID)) | ||
| resp := MakeRequest(t, req, http.StatusOK) | ||
| htmlDoc := NewHTMLParser(t, resp.Body) | ||
|
|
||
| htmlDoc.AssertElement(t, "script.evil", false) | ||
| assert.Contains(t, htmlDoc.Find("#issuecomment-1000 .dismissed-message").Text(), `dismissed Otto <script class='evil'>alert('Oh no!')</script>’s review`) | ||
| } | ||