From 09a4364b2197520c3c6bb0fbcac26eed77c3af2f Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Wed, 21 Jul 2021 04:37:00 +0200
Subject: [PATCH] Add TestPrepareWikiFileName (#16487) (#16498)

* Add TestPrepareWikiFileName

* use LsTree as LsFiles is index only

* ajust other tests

Co-authored-by: Andrew Thornton <art27@cantab.net>
---
 .../0d/ca5bd9b5d7ef937710e056f575e86c0184ba85 | Bin 0 -> 820 bytes
 .../89/43a1d5f93c00439d5ffc0f8e36f5d60abae46c | Bin 0 -> 206 bytes
 .../user2/repo1.wiki.git/refs/heads/master    |   2 +-
 modules/git/tree.go                           |  21 ++++++++
 routers/web/repo/wiki_test.go                 |   4 +-
 services/wiki/wiki.go                         |   2 +-
 services/wiki/wiki_test.go                    |  51 ++++++++++++++++++
 7 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 integrations/gitea-repositories-meta/user2/repo1.wiki.git/objects/0d/ca5bd9b5d7ef937710e056f575e86c0184ba85
 create mode 100644 integrations/gitea-repositories-meta/user2/repo1.wiki.git/objects/89/43a1d5f93c00439d5ffc0f8e36f5d60abae46c

diff --git a/integrations/gitea-repositories-meta/user2/repo1.wiki.git/objects/0d/ca5bd9b5d7ef937710e056f575e86c0184ba85 b/integrations/gitea-repositories-meta/user2/repo1.wiki.git/objects/0d/ca5bd9b5d7ef937710e056f575e86c0184ba85
new file mode 100644
index 0000000000000000000000000000000000000000..a46c1925ece0ae2f91ef1421487c87707a484509
GIT binary patch
literal 820
zcmb<m?49g+ezBWGOYyVtFS4p8d1l@-17{tTke+q6V)w@PW@(!rUO#Ux{B+vkD+@zb
zUDDn=UA=Bwt|gNg*CF}j`O6$`6=|dh+udFy;l!7_KS}JckJrQrA3GTiYxr0yF59)i
zUtalv8OKJAZXuO}x?M_QY6jCLsHk0>)@sAPedC0U(T!ZoH&%Recwou$@88S+HjB69
zFaNY&<u6}EqH@QZG;NNCHffHPKdvVy|N1RnIh{Y1@82KI$jiJ;GItsGEflWdvUwZs
z&&V}p-NsWAr@4-uTz6%QVep=ApL6P0r`-JQ9QkhYp~sG%ta<IxQ)>&&*F4$!JKn!>
zeX31D+qTIcOt(rTCg$tDD?5DRR`se0a_Q?2-0*!}`lj-v!mR`E-`+cW?#;^W?}7~j
z7F>M0HTr(!vUd;8*lxX>eLW*_=EPMi7Mfpp_S5d&s-J&0-m@w^vvIYW?mJ)ZSK`(?
zO{KYFw8Xl5gSs{xSQA;a{M7~4-+I<lgaRKIIW04;HkE6?eY|<)<qPj#pAwBadt`cW
z*0OM}n7`i5SCgh#{kytr`K`X4*VZnv&Mp79dBY)_%{#d6O$rs=eSM*>S)y}N6Z_ZA
zpN>@R*AST7`*Pin(nTvvtIqn0cP?CdqBP{t?XCAhzVv!3FS)8-nHU~#CcaRnoVBq1
z_(YcHG0P9!{u<ZW!E051<?wR#cYGJ^VxMR$zVf?tzp;Mfefg-}?5BP&3yBn-waqZp
zCw-IQwmvo11ctrJR;SnuCEnY9yjrsH&%Y&H;Tt!wWgC2c@@qrOp9Qk7AAQ}zwfn-U
zH#hWm)|@GcUV5NPF2B70yXo=uv)FF^GFf{2*)s)I@xHS2W%Jn`eNVqsD~_IfX+fq@
zhJmW|-iTYxCcz0U=@XsXS?b$1-JQSwOl0})b91&fK5@@ZY`T`aFJOjiAV=C24cYP=
z9GbD$PClwWdMdyn;oPjP^S^C2)%#PNzfDiq-t(D*&++LeBKivZ%6D!yio13;^2Lsw
zs$N^_IfEas+gak@xN`1dhnKz1cOU%bJ;-@{`Rih>Bav#mo-g;7ozb~&TGnQl-nA<n
s57jO{u)WUe?#lX^7dw8{9|=gD)bMg5U*V0VoF`7HEv;iH^7N|&0NvxL7XSbN

literal 0
HcmV?d00001

diff --git a/integrations/gitea-repositories-meta/user2/repo1.wiki.git/objects/89/43a1d5f93c00439d5ffc0f8e36f5d60abae46c b/integrations/gitea-repositories-meta/user2/repo1.wiki.git/objects/89/43a1d5f93c00439d5ffc0f8e36f5d60abae46c
new file mode 100644
index 0000000000000000000000000000000000000000..062641bee7da16a4831be6464c6f1373f097cb40
GIT binary patch
literal 206
zcmb<m)YkO!4K*+_OgAtwFfcX@{BYvD@72@3i4|ABEZ<u*(fs$q9PRh|{az(Ay5EL5
zPi0YAw)|CF`m~f6RnM4aDqMBj=w7$S<fHfLA1Ybfa`N`9xgR?FsKlyfZlTG+!6ko%
z6wO5bdUDxJzGQyUy&-Yk!p(mc9lyI-WI>hF=b-M%!rVc@B6p063#^VGVc-xka?I06
z)7ZJ|!LGOG=DuGY=J)>gzJzCO|0ZY`23+366?FOQCaz18T<Tu+nf}&#iduye<_1qF
P{Fm3(ThAcRnOF({8OdP4

literal 0
HcmV?d00001

diff --git a/integrations/gitea-repositories-meta/user2/repo1.wiki.git/refs/heads/master b/integrations/gitea-repositories-meta/user2/repo1.wiki.git/refs/heads/master
index 1b1d96a1f0..38984b12b7 100644
--- a/integrations/gitea-repositories-meta/user2/repo1.wiki.git/refs/heads/master
+++ b/integrations/gitea-repositories-meta/user2/repo1.wiki.git/refs/heads/master
@@ -1 +1 @@
-423313fbd38093bb10d0c8387db9105409c6f196
+0dca5bd9b5d7ef937710e056f575e86c0184ba85
diff --git a/modules/git/tree.go b/modules/git/tree.go
index 059f0a8287..3671f421e9 100644
--- a/modules/git/tree.go
+++ b/modules/git/tree.go
@@ -6,6 +6,7 @@
 package git
 
 import (
+	"bytes"
 	"strings"
 )
 
@@ -45,3 +46,23 @@ func (t *Tree) SubTree(rpath string) (*Tree, error) {
 	}
 	return g, nil
 }
+
+// LsTree checks if the given filenames are in the tree
+func (repo *Repository) LsTree(ref string, filenames ...string) ([]string, error) {
+	cmd := NewCommand("ls-tree", "-z", "--name-only", "--", ref)
+	for _, arg := range filenames {
+		if arg != "" {
+			cmd.AddArguments(arg)
+		}
+	}
+	res, err := cmd.RunInDirBytes(repo.Path)
+	if err != nil {
+		return nil, err
+	}
+	filelist := make([]string, 0, len(filenames))
+	for _, line := range bytes.Split(res, []byte{'\000'}) {
+		filelist = append(filelist, string(line))
+	}
+
+	return filelist, err
+}
diff --git a/routers/web/repo/wiki_test.go b/routers/web/repo/wiki_test.go
index 8934a6619f..bcdb8023ac 100644
--- a/routers/web/repo/wiki_test.go
+++ b/routers/web/repo/wiki_test.go
@@ -81,7 +81,7 @@ func TestWiki(t *testing.T) {
 	Wiki(ctx)
 	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
 	assert.EqualValues(t, "Home", ctx.Data["Title"])
-	assertPagesMetas(t, []string{"Home", "Page With Image", "Page With Spaced Name"}, ctx.Data["Pages"])
+	assertPagesMetas(t, []string{"Home", "Page With Image", "Page With Spaced Name", "Unescaped File"}, ctx.Data["Pages"])
 }
 
 func TestWikiPages(t *testing.T) {
@@ -91,7 +91,7 @@ func TestWikiPages(t *testing.T) {
 	test.LoadRepo(t, ctx, 1)
 	WikiPages(ctx)
 	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
-	assertPagesMetas(t, []string{"Home", "Page With Image", "Page With Spaced Name"}, ctx.Data["Pages"])
+	assertPagesMetas(t, []string{"Home", "Page With Image", "Page With Spaced Name", "Unescaped File"}, ctx.Data["Pages"])
 }
 
 func TestNewWiki(t *testing.T) {
diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go
index 94f36ea2f2..f1632c6bf7 100644
--- a/services/wiki/wiki.go
+++ b/services/wiki/wiki.go
@@ -88,7 +88,7 @@ func prepareWikiFileName(gitRepo *git.Repository, wikiName string) (bool, string
 	escaped := NameToFilename(wikiName)
 
 	// Look for both files
-	filesInIndex, err := gitRepo.LsFiles(unescaped, escaped)
+	filesInIndex, err := gitRepo.LsTree("master", unescaped, escaped)
 	if err != nil {
 		log.Error("%v", err)
 		return false, escaped, err
diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go
index b35b86d655..a1614b509c 100644
--- a/services/wiki/wiki_test.go
+++ b/services/wiki/wiki_test.go
@@ -210,3 +210,54 @@ func TestRepository_DeleteWikiPage(t *testing.T) {
 	_, err = masterTree.GetTreeEntryByPath(wikiPath)
 	assert.Error(t, err)
 }
+
+func TestPrepareWikiFileName(t *testing.T) {
+	models.PrepareTestEnv(t)
+	repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
+	gitRepo, err := git.OpenRepository(repo.WikiPath())
+	defer gitRepo.Close()
+	assert.NoError(t, err)
+
+	tests := []struct {
+		name      string
+		arg       string
+		existence bool
+		wikiPath  string
+		wantErr   bool
+	}{{
+		name:      "add suffix",
+		arg:       "Home",
+		existence: true,
+		wikiPath:  "Home.md",
+		wantErr:   false,
+	}, {
+		name:      "test special chars",
+		arg:       "home of and & or wiki page!",
+		existence: false,
+		wikiPath:  "home-of-and-%26-or-wiki-page%21.md",
+		wantErr:   false,
+	}, {
+		name:      "fount unescaped cases",
+		arg:       "Unescaped File",
+		existence: true,
+		wikiPath:  "Unescaped File.md",
+		wantErr:   false,
+	}}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			existence, newWikiPath, err := prepareWikiFileName(gitRepo, tt.arg)
+			if (err != nil) != tt.wantErr {
+				assert.NoError(t, err)
+				return
+			}
+			if existence != tt.existence {
+				if existence {
+					t.Errorf("expect to find no escaped file but we detect one")
+				} else {
+					t.Errorf("expect to find an escaped file but we could not detect one")
+				}
+			}
+			assert.Equal(t, tt.wikiPath, newWikiPath)
+		})
+	}
+}