Merge branch 'master' into fix-go-gitea#6716

Author: lafriks

docs/content/doc/help/faq.en-us.md

@@ -18,6 +18,7 @@ menu:
 This page contains some common questions and answers.  
 Also see [Support Options]({{< relref "doc/help/seek-help.en-us.md" >}})
 
+* [Difference between 1.x and 1.x.x downloads](#difference-between-1-x-and-1-x-x-downloads)
 * [How to migrate from Gogs/GitHub/etc. to Gitea](#how-to-migrate-from-gogs-github-etc-to-gitea)
 * [Where does Gitea store "x" file](#where-does-gitea-store-x-file)
 * [Not seeing a clone URL or the clone URL being incorrect](#not-seeing-a-clone-url-or-the-clone-url-being-incorrect)
@@ -42,6 +43,17 @@ Also see [Support Options]({{< relref "doc/help/seek-help.en-us.md" >}})
 * [LFS Issues](#lfs-issues)
 
 
+## Difference between 1.x and 1.x.x downloads
+Version 1.7.x will be used for this example.  
+**NOTE:** this example applies to Docker images as well!  
+
+On our [downloads page](https://dl.gitea.io/gitea/) you will see a 1.7 directory, as well as directories for 1.7.0, 1.7.1, 1.7.2, 1.7.3, 1.7.4, 1.7.5, and 1.7.6.  
+The 1.7 and 1.7.0 directories are **not** the same. The 1.7 directory is built on each merged commit to the [`release/v1.7`](https://github.com/go-gitea/gitea/tree/release/v1.7) branch.  
+The 1.7.0 directory, however, is a build that was created when the [`v1.7.0`](https://github.com/go-gitea/gitea/releases/tag/v1.7.0) tag was created.  
+
+This means that 1.x downloads will change as commits are merged to their respective branch (think of it as a separate "master" branch for each release).  
+On the other hand, 1.x.x downloads should never change.
+
 ## How to migrate from Gogs/GitHub/etc. to Gitea
 To migrate from Gogs to Gitea:
 

integrations/api_org_test.go

@@ -6,43 +6,87 @@ package integrations
 
 import (
 	"net/http"
+	"net/url"
 	"strings"
 	"testing"
 
 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/sdk/gitea"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestAPIOrg(t *testing.T) {
-	prepareTestEnv(t)
-
-	session := loginUser(t, "user1")
-
-	token := getTokenForLoggedInUser(t, session)
-	var org = api.CreateOrgOption{
-		UserName:    "user1_org",
-		FullName:    "User1's organization",
-		Description: "This organization created by user1",
-		Website:     "https://try.gitea.io",
-		Location:    "Shanghai",
-	}
-	req := NewRequestWithJSON(t, "POST", "/api/v1/orgs?token="+token, &org)
-	resp := session.MakeRequest(t, req, http.StatusCreated)
-
-	var apiOrg api.Organization
-	DecodeJSON(t, resp, &apiOrg)
-
-	assert.Equal(t, org.UserName, apiOrg.UserName)
-	assert.Equal(t, org.FullName, apiOrg.FullName)
-	assert.Equal(t, org.Description, apiOrg.Description)
-	assert.Equal(t, org.Website, apiOrg.Website)
-	assert.Equal(t, org.Location, apiOrg.Location)
-
-	models.AssertExistsAndLoadBean(t, &models.User{
-		Name:      org.UserName,
-		LowerName: strings.ToLower(org.UserName),
-		FullName:  org.FullName,
+	onGiteaRun(t, func(*testing.T, *url.URL) {
+		session := loginUser(t, "user1")
+
+		token := getTokenForLoggedInUser(t, session)
+		var org = api.CreateOrgOption{
+			UserName:    "user1_org",
+			FullName:    "User1's organization",
+			Description: "This organization created by user1",
+			Website:     "https://try.gitea.io",
+			Location:    "Shanghai",
+		}
+		req := NewRequestWithJSON(t, "POST", "/api/v1/orgs?token="+token, &org)
+		resp := session.MakeRequest(t, req, http.StatusCreated)
+
+		var apiOrg api.Organization
+		DecodeJSON(t, resp, &apiOrg)
+
+		assert.Equal(t, org.UserName, apiOrg.UserName)
+		assert.Equal(t, org.FullName, apiOrg.FullName)
+		assert.Equal(t, org.Description, apiOrg.Description)
+		assert.Equal(t, org.Website, apiOrg.Website)
+		assert.Equal(t, org.Location, apiOrg.Location)
+
+		models.AssertExistsAndLoadBean(t, &models.User{
+			Name:      org.UserName,
+			LowerName: strings.ToLower(org.UserName),
+			FullName:  org.FullName,
+		})
+
+		req = NewRequestf(t, "GET", "/api/v1/orgs/%s", org.UserName)
+		resp = session.MakeRequest(t, req, http.StatusOK)
+		DecodeJSON(t, resp, &apiOrg)
+		assert.EqualValues(t, org.UserName, apiOrg.UserName)
+
+		req = NewRequestf(t, "GET", "/api/v1/orgs/%s/repos", org.UserName)
+		resp = session.MakeRequest(t, req, http.StatusOK)
+
+		var repos []*api.Repository
+		DecodeJSON(t, resp, &repos)
+		for _, repo := range repos {
+			assert.False(t, repo.Private)
+		}
+
+		req = NewRequestf(t, "GET", "/api/v1/orgs/%s/members", org.UserName)
+		resp = session.MakeRequest(t, req, http.StatusOK)
+
+		// user1 on this org is public
+		var users []*api.User
+		DecodeJSON(t, resp, &users)
+		assert.EqualValues(t, 1, len(users))
+		assert.EqualValues(t, "user1", users[0].UserName)
+	})
+}
+
+func TestAPIOrgDeny(t *testing.T) {
+	onGiteaRun(t, func(*testing.T, *url.URL) {
+		setting.Service.RequireSignInView = true
+		defer func() {
+			setting.Service.RequireSignInView = false
+		}()
+
+		var orgName = "user1_org"
+		req := NewRequestf(t, "GET", "/api/v1/orgs/%s", orgName)
+		MakeRequest(t, req, http.StatusNotFound)
+
+		req = NewRequestf(t, "GET", "/api/v1/orgs/%s/repos", orgName)
+		MakeRequest(t, req, http.StatusNotFound)
+
+		req = NewRequestf(t, "GET", "/api/v1/orgs/%s/members", orgName)
+		MakeRequest(t, req, http.StatusNotFound)
 	})
 }

integrations/api_team_test.go

@@ -16,6 +16,7 @@ import (
 
 func TestAPITeam(t *testing.T) {
 	prepareTestEnv(t)
+
 	teamUser := models.AssertExistsAndLoadBean(t, &models.TeamUser{}).(*models.TeamUser)
 	team := models.AssertExistsAndLoadBean(t, &models.Team{ID: teamUser.TeamID}).(*models.Team)
 	user := models.AssertExistsAndLoadBean(t, &models.User{ID: teamUser.UID}).(*models.User)
@@ -29,4 +30,16 @@ func TestAPITeam(t *testing.T) {
 	DecodeJSON(t, resp, &apiTeam)
 	assert.EqualValues(t, team.ID, apiTeam.ID)
 	assert.Equal(t, team.Name, apiTeam.Name)
+
+	// non team member user will not access the teams details
+	teamUser2 := models.AssertExistsAndLoadBean(t, &models.TeamUser{ID: 3}).(*models.TeamUser)
+	user2 := models.AssertExistsAndLoadBean(t, &models.User{ID: teamUser2.UID}).(*models.User)
+
+	session = loginUser(t, user2.Name)
+	token = getTokenForLoggedInUser(t, session)
+	req = NewRequestf(t, "GET", "/api/v1/teams/%d?token="+token, teamUser.TeamID)
+	resp = session.MakeRequest(t, req, http.StatusForbidden)
+
+	req = NewRequestf(t, "GET", "/api/v1/teams/%d", teamUser.TeamID)
+	resp = session.MakeRequest(t, req, http.StatusUnauthorized)
 }

integrations/org_test.go

@@ -0,0 +1,43 @@
+// Copyright 2019 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 integrations
+
+import (
+	"net/http"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestOrgRepos(t *testing.T) {
+	prepareTestEnv(t)
+
+	var (
+		users = []string{"user1", "user2"}
+		cases = map[string][]string{
+			"alphabetically":        {"repo21", "repo3", "repo5"},
+			"reversealphabetically": {"repo5", "repo3", "repo21"},
+		}
+	)
+
+	for _, user := range users {
+		t.Run(user, func(t *testing.T) {
+			session := loginUser(t, user)
+			for sortBy, repos := range cases {
+				req := NewRequest(t, "GET", "/user3?sort="+sortBy)
+				resp := session.MakeRequest(t, req, http.StatusOK)
+
+				htmlDoc := NewHTMLParser(t, resp.Body)
+
+				sel := htmlDoc.doc.Find("a.name")
+				assert.EqualValues(t, len(repos), len(sel.Nodes))
+				for i := 0; i < len(repos); i++ {
+					assert.EqualValues(t, repos[i], strings.TrimSpace(sel.Eq(i).Text()))
+				}
+			}
+		})
+	}
+}

models/migrations/v78.go

@@ -33,9 +33,19 @@ func renameRepoIsBareToIsEmpty(x *xorm.Engine) error {
 		_, err = sess.Exec("DROP INDEX IF EXISTS IDX_repository_is_bare")
 	} else if models.DbCfg.Type == core.MSSQL {
 		_, err = sess.Exec("DROP INDEX IF EXISTS IDX_repository_is_bare ON repository")
+	} else if models.DbCfg.Type == core.MYSQL {
+		indexes, err := sess.QueryString(`SHOW INDEX FROM repository WHERE KEY_NAME = 'IDX_repository_is_bare'`)
+		if err != nil {
+			return err
+		}
+
+		if len(indexes) >= 1 {
+			_, err = sess.Exec("DROP INDEX IDX_repository_is_bare ON repository")
+		}
 	} else {
 		_, err = sess.Exec("DROP INDEX IDX_repository_is_bare ON repository")
 	}
+
 	if err != nil {
 		return fmt.Errorf("Drop index failed: %v", err)
 	}

models/org.go

@@ -657,6 +657,7 @@ type AccessibleReposEnvironment interface {
 	Repos(page, pageSize int) ([]*Repository, error)
 	MirrorRepos() ([]*Repository, error)
 	AddKeyword(keyword string)
+	SetSort(SearchOrderBy)
 }
 
 type accessibleReposEnv struct {
@@ -665,6 +666,7 @@ type accessibleReposEnv struct {
 	teamIDs []int64
 	e       Engine
 	keyword string
+	orderBy SearchOrderBy
 }
 
 // AccessibleReposEnv an AccessibleReposEnvironment for the repositories in `org`
@@ -683,6 +685,7 @@ func (org *User) accessibleReposEnv(e Engine, userID int64) (AccessibleReposEnvi
 		userID:  userID,
 		teamIDs: teamIDs,
 		e:       e,
+		orderBy: SearchOrderByRecentUpdated,
 	}, nil
 }
 
@@ -722,8 +725,8 @@ func (env *accessibleReposEnv) RepoIDs(page, pageSize int) ([]int64, error) {
 		Table("repository").
 		Join("INNER", "team_repo", "`team_repo`.repo_id=`repository`.id").
 		Where(env.cond()).
-		GroupBy("`repository`.id,`repository`.updated_unix").
-		OrderBy("updated_unix DESC").
+		GroupBy("`repository`.id,`repository`."+strings.Fields(string(env.orderBy))[0]).
+		OrderBy(string(env.orderBy)).
 		Limit(pageSize, (page-1)*pageSize).
 		Cols("`repository`.id").
 		Find(&repoIDs)
@@ -742,6 +745,7 @@ func (env *accessibleReposEnv) Repos(page, pageSize int) ([]*Repository, error)
 
 	return repos, env.e.
 		In("`repository`.id", repoIDs).
+		OrderBy(string(env.orderBy)).
 		Find(&repos)
 }
 
@@ -752,7 +756,7 @@ func (env *accessibleReposEnv) MirrorRepoIDs() ([]int64, error) {
 		Join("INNER", "team_repo", "`team_repo`.repo_id=`repository`.id AND `repository`.is_mirror=?", true).
 		Where(env.cond()).
 		GroupBy("`repository`.id, `repository`.updated_unix").
-		OrderBy("updated_unix DESC").
+		OrderBy(string(env.orderBy)).
 		Cols("`repository`.id").
 		Find(&repoIDs)
 }
@@ -776,3 +780,7 @@ func (env *accessibleReposEnv) MirrorRepos() ([]*Repository, error) {
 func (env *accessibleReposEnv) AddKeyword(keyword string) {
 	env.keyword = keyword
 }
+
+func (env *accessibleReposEnv) SetSort(orderBy SearchOrderBy) {
+	env.orderBy = orderBy
+}

models/unit.go

@@ -25,6 +25,11 @@ const (
 	UnitTypeExternalTracker                     // 7 ExternalTracker
 )
 
+// Value returns integer value for unit type
+func (u UnitType) Value() int {
+	return int(u)
+}
+
 func (u UnitType) String() string {
 	switch u {
 	case UnitTypeCode:

modules/context/repo.go

@@ -223,6 +223,9 @@ func RedirectToRepo(ctx *Context, redirectRepoID int64) {
 		fmt.Sprintf("%s/%s", repo.MustOwnerName(), repo.Name),
 		1,
 	)
+	if ctx.Req.URL.RawQuery != "" {
+		redirectPath += "?" + ctx.Req.URL.RawQuery
+	}
 	ctx.Redirect(redirectPath)
 }
 

modules/markup/html.go

@@ -63,7 +63,7 @@ var (
 	// well as the HTML5 spec:
 	//   http://spec.commonmark.org/0.28/#email-address
 	//   https://html.spec.whatwg.org/multipage/input.html#e-mail-state-(type%3Demail)
-	emailRegex = regexp.MustCompile("(?:\\s|^|\\(|\\[)([a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)(?:\\s|$|\\)|\\]|\\.(\\s|$))")
+	emailRegex = regexp.MustCompile("(?:\\s|^|\\(|\\[)([a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9]{2,}(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+)(?:\\s|$|\\)|\\]|\\.(\\s|$))")
 
 	linkRegex, _ = xurls.StrictMatchingScheme("https?://")
 )

modules/markup/html_test.go

@@ -176,6 +176,9 @@ func TestRender_email(t *testing.T) {
 	test(
 		"[email protected].",
 		`<p><a href="mailto:[email protected]" rel="nofollow">[email protected]</a>.</p>`)
+	test(
+		"[email protected]",
+		`<p><a href="mailto:[email protected]" rel="nofollow">[email protected]</a></p>`)
 	test(
 		"send email to [email protected].",
 		`<p>send email to <a href="mailto:[email protected]" rel="nofollow">[email protected]</a>.</p>`)
@@ -190,6 +193,18 @@ func TestRender_email(t *testing.T) {
 	test(
 		"[email protected]:go-gitea/gitea.git",
 		`<p>[email protected]:go-gitea/gitea.git</p>`)
+	test(
+		"gitea@3",
+		`<p>gitea@3</p>`)
+	test(
+		"[email protected]",
+		`<p>[email protected]</p>`)
+	test(
+		"email@[email protected]",
+		`<p>email@[email protected]</p>`)
+	test(
+		"[email protected]",
+		`<p>[email protected]</p>`)
 }
 
 func TestRender_ShortLinks(t *testing.T) {