Merge branch 'main' into fix_13283

Author: lunny

CHANGELOG.md

@@ -4,6 +4,25 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
+## [1.15.8](https://github.com/go-gitea/gitea/releases/tag/v1.15.8) - 2021-12-20
+
+* BUGFIXES
+  * Move POST /{username}/action/{action} to simply POST /{username} (#18045) (#18046)
+  * Fix delete u2f keys bug (#18040) (#18042)
+  * Reset Session ID on login (#18018) (#18041)
+  * Prevent off-by-one error on comments on newly appended lines (#18029) (#18035)
+  * Stop printing 03d after escaped characters in logs (#18030) (#18034)
+  * Reset locale on login (#18023) (#18025)
+  * Fix reset password email template (#17025) (#18022)
+  * Fix outType on gitea dump (#18000) (#18016)
+  * Ensure complexity, minlength and isPwned are checked on password setting (#18005) (#18015)
+  * Fix rename notification bug (#18011)
+  * Prevent double decoding of % in url params  (#17997) (#18001)
+  * Prevent hang in git cat-file if the repository is not a valid repository (Partial #17991) (#17992)
+  * Prevent deadlock in create issue (#17970) (#17982)
+* TESTING
+  * Use non-expiring key. (#17984) (#17985)
+
 ## [1.15.7](https://github.com/go-gitea/gitea/releases/tag/v1.15.7) - 2021-12-01
 
 * ENHANCEMENTS

Dockerfile

@@ -1,7 +1,7 @@
 
 ###################################
-#Build stage
-FROM golang:1.17-alpine3.13 AS build-env
+#Build stage - temporarily using techknowlogick image until we upgrade to latest official alpine/go image
+FROM techknowlogick/go:1.17-alpine3.13 AS build-env
 
 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}

Dockerfile.rootless

@@ -1,7 +1,7 @@
 
 ###################################
-#Build stage
-FROM golang:1.17-alpine3.13 AS build-env
+#Build stage - temporarily using techknowlogick image until we upgrade to latest official alpine/go image
+FROM techknowlogick/go:1.17-alpine3.13 AS build-env
 
 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}

docs/config.yaml

@@ -18,7 +18,7 @@ params:
   description: Git with a cup of tea
   author: The Gitea Authors
   website: https://docs.gitea.io
-  version: 1.15.7
+  version: 1.15.8
   minGoVersion: 1.16
   goVersion: 1.17
   minNodeVersion: 12.17

integrations/api_repo_lfs_test.go

@@ -278,6 +278,10 @@ func TestAPILFSBatch(t *testing.T) {
 			meta, err = models.GetLFSMetaObjectByOid(repo.ID, p.Oid)
 			assert.NoError(t, err)
 			assert.NotNil(t, meta)
+
+			// Cleanup
+			err = contentStore.Delete(p.RelativePath())
+			assert.NoError(t, err)
 		})
 
 		t.Run("AlreadyExists", func(t *testing.T) {
@@ -378,6 +382,10 @@ func TestAPILFSUpload(t *testing.T) {
 			assert.NoError(t, err)
 			assert.NotNil(t, meta)
 		})
+
+		// Cleanup
+		err = contentStore.Delete(p.RelativePath())
+		assert.NoError(t, err)
 	})
 
 	t.Run("MetaAlreadyExists", func(t *testing.T) {

integrations/mirror_push_test.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"strconv"
 	"testing"
 
 	"code.gitea.io/gitea/models"
@@ -68,6 +69,12 @@ func testMirrorPush(t *testing.T, u *url.URL) {
 	assert.NoError(t, err)
 
 	assert.Equal(t, srcCommit.ID, mirrorCommit.ID)
+
+	// Cleanup
+	doRemovePushMirror(ctx, fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(ctx.Username), url.PathEscape(mirrorRepo.Name)), user.LowerName, userPassword, int(mirrors[0].ID))(t)
+	mirrors, err = repo_model.GetPushMirrorsByRepoID(srcRepo.ID)
+	assert.NoError(t, err)
+	assert.Len(t, mirrors, 0)
 }
 
 func doCreatePushMirror(ctx APITestContext, address, username, password string) func(t *testing.T) {
@@ -89,3 +96,24 @@ func doCreatePushMirror(ctx APITestContext, address, username, password string)
 		assert.Contains(t, flashCookie.Value, "success")
 	}
 }
+
+func doRemovePushMirror(ctx APITestContext, address, username, password string, pushMirrorID int) func(t *testing.T) {
+	return func(t *testing.T) {
+		csrf := GetCSRF(t, ctx.Session, fmt.Sprintf("/%s/%s/settings", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame)))
+
+		req := NewRequestWithValues(t, "POST", fmt.Sprintf("/%s/%s/settings", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame)), map[string]string{
+			"_csrf":                csrf,
+			"action":               "push-mirror-remove",
+			"push_mirror_id":       strconv.Itoa(pushMirrorID),
+			"push_mirror_address":  address,
+			"push_mirror_username": username,
+			"push_mirror_password": password,
+			"push_mirror_interval": "0",
+		})
+		ctx.Session.MakeRequest(t, req, http.StatusFound)
+
+		flashCookie := ctx.Session.GetCookie("macaron_flash")
+		assert.NotNil(t, flashCookie)
+		assert.Contains(t, flashCookie.Value, "success")
+	}
+}

integrations/repo_tag_test.go

@@ -74,4 +74,24 @@ func TestCreateNewTagProtected(t *testing.T) {
 			assert.Contains(t, err.Error(), "Tag v-2 is protected")
 		})
 	})
+
+	// Cleanup
+	releases, err := models.GetReleasesByRepoID(repo.ID, models.FindReleasesOptions{
+		IncludeTags: true,
+		TagNames:    []string{"v-1", "v-1.1"},
+	})
+	assert.NoError(t, err)
+
+	for _, release := range releases {
+		err = models.DeleteReleaseByID(release.ID)
+		assert.NoError(t, err)
+	}
+
+	protectedTags, err := models.GetProtectedTags(repo.ID)
+	assert.NoError(t, err)
+
+	for _, protectedTag := range protectedTags {
+		err = models.DeleteProtectedTag(protectedTag)
+		assert.NoError(t, err)
+	}
 }

modules/git/repo_tag_test.go

@@ -50,9 +50,12 @@ func TestRepository_GetTag(t *testing.T) {
 	aTagID, _ := bareRepo1.GetTagID(aTagName)
 
 	lTag, err := bareRepo1.GetTag(lTagName)
-	lTag.repo = nil
 	assert.NoError(t, err)
 	assert.NotNil(t, lTag)
+	if lTag == nil {
+		assert.FailNow(t, "nil lTag: %s", lTagName)
+	}
+	lTag.repo = nil
 	assert.EqualValues(t, lTagName, lTag.Name)
 	assert.EqualValues(t, lTagCommitID, lTag.ID.String())
 	assert.EqualValues(t, lTagCommitID, lTag.Object.String())
@@ -61,6 +64,9 @@ func TestRepository_GetTag(t *testing.T) {
 	aTag, err := bareRepo1.GetTag(aTagName)
 	assert.NoError(t, err)
 	assert.NotNil(t, aTag)
+	if aTag == nil {
+		assert.FailNow(t, "nil aTag: %s", aTagName)
+	}
 	assert.EqualValues(t, aTagName, aTag.Name)
 	assert.EqualValues(t, aTagID, aTag.ID.String())
 	assert.NotEqual(t, aTagID, aTag.Object.String())

routers/api/v1/repo/transfer.go

@@ -98,6 +98,11 @@ func Transfer(ctx *context.APIContext) {
 		}
 	}
 
+	if ctx.Repo.GitRepo != nil {
+		ctx.Repo.GitRepo.Close()
+		ctx.Repo.GitRepo = nil
+	}
+
 	if err := repo_service.StartRepositoryTransfer(ctx.User, newOwner, ctx.Repo.Repository, teams); err != nil {
 		if models.IsErrRepoTransferInProgress(err) {
 			ctx.Error(http.StatusConflict, "CreatePendingRepositoryTransfer", err)

routers/web/repo/repo.go

@@ -323,6 +323,11 @@ func acceptOrRejectRepoTransfer(ctx *context.Context, accept bool) error {
 	}
 
 	if accept {
+		if ctx.Repo.GitRepo != nil {
+			ctx.Repo.GitRepo.Close()
+			ctx.Repo.GitRepo = nil
+		}
+
 		if err := repo_service.TransferOwnership(repoTransfer.Doer, repoTransfer.Recipient, ctx.Repo.Repository, repoTransfer.Teams); err != nil {
 			return err
 		}