Merge remote-tracking branch 'origin/main' into really-escape

.eslintrc

@@ -368,6 +368,7 @@ rules:
   unicorn/no-array-push-push: [2]
   unicorn/no-console-spaces: [0]
   unicorn/no-document-cookie: [2]
+  unicorn/no-empty-file: [2]
   unicorn/no-fn-reference-in-iterator: [0]
   unicorn/no-for-loop: [0]
   unicorn/no-hex-escape: [0]
@@ -404,6 +405,7 @@ rules:
   unicorn/prefer-date-now: [2]
   unicorn/prefer-default-parameters: [0]
   unicorn/prefer-event-key: [2]
+  unicorn/prefer-export-from: [2]
   unicorn/prefer-includes: [2]
   unicorn/prefer-math-trunc: [2]
   unicorn/prefer-modern-dom-apis: [0]

.golangci.yml

@@ -9,7 +9,6 @@ linters:
     - unused
     - structcheck
     - varcheck
-    - golint
     - dupl
     #- gocyclo # The cyclomatic complexety of a lot of functions is too high, we should refactor those another time.
     - gofmt

.stylelintrc

@@ -1,16 +1,31 @@
 extends: stylelint-config-standard
 
+overrides:
+  - files: ["**/*.less"]
+    customSyntax: postcss-less
+
 rules:
+  alpha-value-notation: null
   at-rule-empty-line-before: null
   block-closing-brace-empty-line-before: null
+  color-function-notation: null
   color-hex-length: null
   comment-empty-line-before: null
+  declaration-block-no-redundant-longhand-properties: null
   declaration-block-single-line-max-declarations: null
   declaration-empty-line-before: null
+  hue-degree-notation: null
   indentation: 2
+  max-line-length: null
   no-descending-specificity: null
+  no-invalid-position-at-import-rule: null
   number-leading-zero: never
+  number-max-precision: null
+  property-no-vendor-prefix: null
   rule-empty-line-before: null
+  selector-class-pattern: null
+  selector-id-pattern: null
   selector-pseudo-element-colon-notation: double
   shorthand-property-no-redundant-values: true
-  no-invalid-position-at-import-rule: null
+  string-quotes: null
+  value-no-vendor-prefix: null

models/consistency.go

@@ -10,15 +10,11 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/models/db"
+
 	"github.com/stretchr/testify/assert"
 	"xorm.io/builder"
 )
 
-// consistencyCheckable a type that can be tested for database consistency
-type consistencyCheckable interface {
-	checkForConsistency(t *testing.T)
-}
-
 // CheckConsistencyForAll test that the entire database is consistent
 func CheckConsistencyForAll(t *testing.T) {
 	CheckConsistencyFor(t,
@@ -46,17 +42,34 @@ func CheckConsistencyFor(t *testing.T, beansToCheck ...interface{}) {
 
 		for i := 0; i < sliceValue.Len(); i++ {
 			entity := sliceValue.Index(i).Interface()
-			checkable, ok := entity.(consistencyCheckable)
-			if !ok {
-				t.Errorf("Expected %+v (of type %T) to be checkable for consistency",
-					entity, entity)
-			} else {
-				checkable.checkForConsistency(t)
-			}
+			checkForConsistency(entity, t)
 		}
 	}
 }
 
+func checkForConsistency(bean interface{}, t *testing.T) {
+	switch b := bean.(type) {
+	case *User:
+		checkForUserConsistency(b, t)
+	case *Repository:
+		checkForRepoConsistency(b, t)
+	case *Issue:
+		checkForIssueConsistency(b, t)
+	case *PullRequest:
+		checkForPullRequestConsistency(b, t)
+	case *Milestone:
+		checkForMilestoneConsistency(b, t)
+	case *Label:
+		checkForLabelConsistency(b, t)
+	case *Team:
+		checkForTeamConsistency(b, t)
+	case *Action:
+		checkForActionConsistency(b, t)
+	default:
+		t.Errorf("unknown bean type: %#v", bean)
+	}
+}
+
 // getCount get the count of database entries matching bean
 func getCount(t *testing.T, e db.Engine, bean interface{}) int64 {
 	count, err := e.Count(bean)
@@ -70,7 +83,7 @@ func assertCount(t *testing.T, bean interface{}, expected int) {
 		"Failed consistency test, the counted bean (of type %T) was %+v", bean, bean)
 }
 
-func (user *User) checkForConsistency(t *testing.T) {
+func checkForUserConsistency(user *User, t *testing.T) {
 	assertCount(t, &Repository{OwnerID: user.ID}, user.NumRepos)
 	assertCount(t, &Star{UID: user.ID}, user.NumStars)
 	assertCount(t, &OrgUser{OrgID: user.ID}, user.NumMembers)
@@ -83,7 +96,7 @@ func (user *User) checkForConsistency(t *testing.T) {
 	}
 }
 
-func (repo *Repository) checkForConsistency(t *testing.T) {
+func checkForRepoConsistency(repo *Repository, t *testing.T) {
 	assert.Equal(t, repo.LowerName, strings.ToLower(repo.Name), "repo: %+v", repo)
 	assertCount(t, &Star{RepoID: repo.ID}, repo.NumStars)
 	assertCount(t, &Milestone{RepoID: repo.ID}, repo.NumMilestones)
@@ -117,7 +130,7 @@ func (repo *Repository) checkForConsistency(t *testing.T) {
 		"Unexpected number of closed milestones for repo %+v", repo)
 }
 
-func (issue *Issue) checkForConsistency(t *testing.T) {
+func checkForIssueConsistency(issue *Issue, t *testing.T) {
 	actual := getCount(t, db.GetEngine(db.DefaultContext).Where("type=?", CommentTypeComment), &Comment{IssueID: issue.ID})
 	assert.EqualValues(t, issue.NumComments, actual,
 		"Unexpected number of comments for issue %+v", issue)
@@ -127,13 +140,13 @@ func (issue *Issue) checkForConsistency(t *testing.T) {
 	}
 }
 
-func (pr *PullRequest) checkForConsistency(t *testing.T) {
+func checkForPullRequestConsistency(pr *PullRequest, t *testing.T) {
 	issue := db.AssertExistsAndLoadBean(t, &Issue{ID: pr.IssueID}).(*Issue)
 	assert.True(t, issue.IsPull)
 	assert.EqualValues(t, issue.Index, pr.Index)
 }
 
-func (milestone *Milestone) checkForConsistency(t *testing.T) {
+func checkForMilestoneConsistency(milestone *Milestone, t *testing.T) {
 	assertCount(t, &Issue{MilestoneID: milestone.ID}, milestone.NumIssues)
 
 	actual := getCount(t, db.GetEngine(db.DefaultContext).Where("is_closed=?", true), &Issue{MilestoneID: milestone.ID})
@@ -147,7 +160,7 @@ func (milestone *Milestone) checkForConsistency(t *testing.T) {
 	assert.Equal(t, completeness, milestone.Completeness)
 }
 
-func (label *Label) checkForConsistency(t *testing.T) {
+func checkForLabelConsistency(label *Label, t *testing.T) {
 	issueLabels := make([]*IssueLabel, 0, 10)
 	assert.NoError(t, db.GetEngine(db.DefaultContext).Find(&issueLabels, &IssueLabel{LabelID: label.ID}))
 	assert.EqualValues(t, label.NumIssues, len(issueLabels),
@@ -166,12 +179,12 @@ func (label *Label) checkForConsistency(t *testing.T) {
 		"Unexpected number of closed issues for label %+v", label)
 }
 
-func (team *Team) checkForConsistency(t *testing.T) {
+func checkForTeamConsistency(team *Team, t *testing.T) {
 	assertCount(t, &TeamUser{TeamID: team.ID}, team.NumMembers)
 	assertCount(t, &TeamRepo{TeamID: team.ID}, team.NumRepos)
 }
 
-func (action *Action) checkForConsistency(t *testing.T) {
+func checkForActionConsistency(action *Action, t *testing.T) {
 	repo := db.AssertExistsAndLoadBean(t, &Repository{ID: action.RepoID}).(*Repository)
 	assert.Equal(t, repo.IsPrivate, action.IsPrivate, "action: %+v", action)
 }

models/error.go

@@ -123,21 +123,6 @@ func (err ErrUserNotExist) Error() string {
 	return fmt.Sprintf("user does not exist [uid: %d, name: %s, keyid: %d]", err.UID, err.Name, err.KeyID)
 }
 
-// ErrUserRedirectNotExist represents a "UserRedirectNotExist" kind of error.
-type ErrUserRedirectNotExist struct {
-	Name string
-}
-
-// IsErrUserRedirectNotExist check if an error is an ErrUserRedirectNotExist.
-func IsErrUserRedirectNotExist(err error) bool {
-	_, ok := err.(ErrUserRedirectNotExist)
-	return ok
-}
-
-func (err ErrUserRedirectNotExist) Error() string {
-	return fmt.Sprintf("user redirect does not exist [name: %s]", err.Name)
-}
-
 // ErrUserProhibitLogin represents a "ErrUserProhibitLogin" kind of error.
 type ErrUserProhibitLogin struct {
 	UID  int64
@@ -170,66 +155,6 @@ func (err ErrUserInactive) Error() string {
 	return fmt.Sprintf("user is inactive [uid: %d, name: %s]", err.UID, err.Name)
 }
 
-// ErrEmailAlreadyUsed represents a "EmailAlreadyUsed" kind of error.
-type ErrEmailAlreadyUsed struct {
-	Email string
-}
-
-// IsErrEmailAlreadyUsed checks if an error is a ErrEmailAlreadyUsed.
-func IsErrEmailAlreadyUsed(err error) bool {
-	_, ok := err.(ErrEmailAlreadyUsed)
-	return ok
-}
-
-func (err ErrEmailAlreadyUsed) Error() string {
-	return fmt.Sprintf("e-mail already in use [email: %s]", err.Email)
-}
-
-// ErrEmailInvalid represents an error where the email address does not comply with RFC 5322
-type ErrEmailInvalid struct {
-	Email string
-}
-
-// IsErrEmailInvalid checks if an error is an ErrEmailInvalid
-func IsErrEmailInvalid(err error) bool {
-	_, ok := err.(ErrEmailInvalid)
-	return ok
-}
-
-func (err ErrEmailInvalid) Error() string {
-	return fmt.Sprintf("e-mail invalid [email: %s]", err.Email)
-}
-
-// ErrEmailAddressNotExist email address not exist
-type ErrEmailAddressNotExist struct {
-	Email string
-}
-
-// IsErrEmailAddressNotExist checks if an error is an ErrEmailAddressNotExist
-func IsErrEmailAddressNotExist(err error) bool {
-	_, ok := err.(ErrEmailAddressNotExist)
-	return ok
-}
-
-func (err ErrEmailAddressNotExist) Error() string {
-	return fmt.Sprintf("Email address does not exist [email: %s]", err.Email)
-}
-
-// ErrPrimaryEmailCannotDelete primary email address cannot be deleted
-type ErrPrimaryEmailCannotDelete struct {
-	Email string
-}
-
-// IsErrPrimaryEmailCannotDelete checks if an error is an ErrPrimaryEmailCannotDelete
-func IsErrPrimaryEmailCannotDelete(err error) bool {
-	_, ok := err.(ErrPrimaryEmailCannotDelete)
-	return ok
-}
-
-func (err ErrPrimaryEmailCannotDelete) Error() string {
-	return fmt.Sprintf("Primary email address cannot be deleted [email: %s]", err.Email)
-}
-
 // ErrOpenIDAlreadyUsed represents a "OpenIDAlreadyUsed" kind of error.
 type ErrOpenIDAlreadyUsed struct {
 	OpenID string

models/gpg_key.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/models/db"
+	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/timeutil"
 
@@ -36,7 +37,7 @@ type GPGKey struct {
 	ExpiredUnix       timeutil.TimeStamp
 	AddedUnix         timeutil.TimeStamp
 	SubsKey           []*GPGKey `xorm:"-"`
-	Emails            []*EmailAddress
+	Emails            []*user_model.EmailAddress
 	Verified          bool `xorm:"NOT NULL DEFAULT false"`
 	CanSign           bool
 	CanEncryptComms   bool
@@ -148,12 +149,12 @@ func parseGPGKey(ownerID int64, e *openpgp.Entity, verified bool) (*GPGKey, erro
 	}
 
 	// Check emails
-	userEmails, err := GetEmailAddresses(ownerID)
+	userEmails, err := user_model.GetEmailAddresses(ownerID)
 	if err != nil {
 		return nil, err
 	}
 
-	emails := make([]*EmailAddress, 0, len(e.Identities))
+	emails := make([]*user_model.EmailAddress, 0, len(e.Identities))
 	for _, ident := range e.Identities {
 		if ident.Revocation != nil {
 			continue
@@ -242,7 +243,7 @@ func DeleteGPGKey(doer *User, id int64) (err error) {
 
 func checkKeyEmails(email string, keys ...*GPGKey) (bool, string) {
 	uid := int64(0)
-	var userEmails []*EmailAddress
+	var userEmails []*user_model.EmailAddress
 	var user *User
 	for _, key := range keys {
 		for _, e := range key.Emails {
@@ -252,7 +253,7 @@ func checkKeyEmails(email string, keys ...*GPGKey) (bool, string) {
 		}
 		if key.Verified && key.OwnerID != 0 {
 			if uid != key.OwnerID {
-				userEmails, _ = GetEmailAddresses(key.OwnerID)
+				userEmails, _ = user_model.GetEmailAddresses(key.OwnerID)
 				uid = key.OwnerID
 				user = &User{ID: uid}
 				_, _ = GetUser(user)

models/gpg_key_commit_verification.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/models/db"
+	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
@@ -167,7 +168,7 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification {
 			}
 		}
 
-		committerEmailAddresses, _ := GetEmailAddresses(committer.ID)
+		committerEmailAddresses, _ := user_model.GetEmailAddresses(committer.ID)
 		activated := false
 		for _, e := range committerEmailAddresses {
 			if e.IsActivated && strings.EqualFold(e.Email, c.Committer.Email) {

models/issue.go

@@ -71,7 +71,7 @@ type Issue struct {
 	IsLocked bool `xorm:"NOT NULL DEFAULT false"`
 
 	// For view issue page.
-	ShowTag CommentTag `xorm:"-"`
+	ShowRole RoleDescriptor `xorm:"-"`
 }
 
 var (