Skip to content

Commit cb77de6

Browse files
silverwindsilverwind
authored
Merge branch 'main' into tooldeps2
2 parents 20d2add + 8995046 commit cb77de6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1299
-924
lines changed

‎docker/root/etc/s6/gitea/setup

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22

33
if [ ! -d /data/git/.ssh ]; then
44
mkdir -p /data/git/.ssh
5-
chmod 700 /data/git/.ssh
5+
fi
6+
7+
# Set the correct permissions on the .ssh directory and authorized_keys file,
8+
# or sshd will refuse to use them and lead to clone/push/pull failures.
9+
# It could happen when users have copied their data to a new volume and changed the file permission by accident,
10+
# and it would be very hard to troubleshoot unless users know how to check the logs of sshd which is started by s6.
11+
chmod 700 /data/git/.ssh
12+
if [ -f /data/git/.ssh/authorized_keys ]; then
13+
chmod 600 /data/git/.ssh/authorized_keys
614
fi
715

816
if [ ! -f /data/git/.ssh/environment ]; then

‎models/asymkey/gpg_key_commit_verification.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,9 @@ func hashAndVerifyForKeyID(sig *packet.Signature, payload string, committer *use
455455

456456
// CalculateTrustStatus will calculate the TrustStatus for a commit verification within a repository
457457
// There are several trust models in Gitea
458-
func CalculateTrustStatus(verification *CommitVerification, repoTrustModel repo_model.TrustModelType, isOwnerMemberCollaborator func(*user_model.User) (bool, error), keyMap *map[string]bool) (err error) {
458+
func CalculateTrustStatus(verification *CommitVerification, repoTrustModel repo_model.TrustModelType, isOwnerMemberCollaborator func(*user_model.User) (bool, error), keyMap *map[string]bool) error {
459459
if !verification.Verified {
460-
return
460+
return nil
461461
}
462462

463463
// In the Committer trust model a signature is trusted if it matches the committer
@@ -475,7 +475,7 @@ func CalculateTrustStatus(verification *CommitVerification, repoTrustModel repo_
475475
verification.SigningUser.Email == verification.CommittingUser.Email) {
476476
verification.TrustStatus = "trusted"
477477
}
478-
return
478+
return nil
479479
}
480480

481481
// Now we drop to the more nuanced trust models...
@@ -490,10 +490,11 @@ func CalculateTrustStatus(verification *CommitVerification, repoTrustModel repo_
490490
verification.SigningUser.Email != verification.CommittingUser.Email) {
491491
verification.TrustStatus = "untrusted"
492492
}
493-
return
493+
return nil
494494
}
495495

496496
// Check we actually have a GPG SigningKey
497+
var err error
497498
if verification.SigningKey != nil {
498499
var isMember bool
499500
if keyMap != nil {

‎models/auth/oauth2.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,10 @@ func (code *OAuth2AuthorizationCode) TableName() string {
306306
}
307307

308308
// GenerateRedirectURI generates a redirect URI for a successful authorization request. State will be used if not empty.
309-
func (code *OAuth2AuthorizationCode) GenerateRedirectURI(state string) (redirect *url.URL, err error) {
310-
if redirect, err = url.Parse(code.RedirectURI); err != nil {
311-
return
309+
func (code *OAuth2AuthorizationCode) GenerateRedirectURI(state string) (*url.URL, error) {
310+
redirect, err := url.Parse(code.RedirectURI)
311+
if err != nil {
312+
return nil, err
312313
}
313314
q := redirect.Query()
314315
if state != "" {

‎models/migrations/v1_11/v106.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ type Watch struct {
1616
Mode RepoWatchMode `xorm:"SMALLINT NOT NULL DEFAULT 1"`
1717
}
1818

19-
func AddModeColumnToWatch(x *xorm.Engine) (err error) {
20-
if err = x.Sync2(new(Watch)); err != nil {
21-
return
19+
func AddModeColumnToWatch(x *xorm.Engine) error {
20+
if err := x.Sync2(new(Watch)); err != nil {
21+
return err
2222
}
23-
_, err = x.Exec("UPDATE `watch` SET `mode` = 1")
23+
_, err := x.Exec("UPDATE `watch` SET `mode` = 1")
2424
return err
2525
}

‎models/migrations/v1_13/v143.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@ func RecalculateStars(x *xorm.Engine) (err error) {
2323

2424
for start := 0; ; start += batchSize {
2525
users := make([]User, 0, batchSize)
26-
if err = sess.Limit(batchSize, start).Where("type = ?", 0).Cols("id").Find(&users); err != nil {
27-
return
26+
if err := sess.Limit(batchSize, start).Where("type = ?", 0).Cols("id").Find(&users); err != nil {
27+
return err
2828
}
2929
if len(users) == 0 {
3030
break
3131
}
3232

33-
if err = sess.Begin(); err != nil {
34-
return
33+
if err := sess.Begin(); err != nil {
34+
return err
3535
}
3636

3737
for _, user := range users {
38-
if _, err = sess.Exec("UPDATE `user` SET num_stars=(SELECT COUNT(*) FROM `star` WHERE uid=?) WHERE id=?", user.ID, user.ID); err != nil {
39-
return
38+
if _, err := sess.Exec("UPDATE `user` SET num_stars=(SELECT COUNT(*) FROM `star` WHERE uid=?) WHERE id=?", user.ID, user.ID); err != nil {
39+
return err
4040
}
4141
}
4242

43-
if err = sess.Commit(); err != nil {
44-
return
43+
if err := sess.Commit(); err != nil {
44+
return err
4545
}
4646
}
4747

‎models/migrations/v1_15/v180.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,25 @@ func DeleteMigrationCredentials(x *xorm.Engine) (err error) {
4444

4545
for start := 0; ; start += batchSize {
4646
tasks := make([]*Task, 0, batchSize)
47-
if err = sess.Limit(batchSize, start).Where(cond, 0).Find(&tasks); err != nil {
48-
return
47+
if err := sess.Limit(batchSize, start).Where(cond, 0).Find(&tasks); err != nil {
48+
return err
4949
}
5050
if len(tasks) == 0 {
5151
break
5252
}
53-
if err = sess.Begin(); err != nil {
54-
return
53+
if err := sess.Begin(); err != nil {
54+
return err
5555
}
5656
for _, t := range tasks {
5757
if t.PayloadContent, err = removeCredentials(t.PayloadContent); err != nil {
58-
return
58+
return err
5959
}
60-
if _, err = sess.ID(t.ID).Cols("payload_content").Update(t); err != nil {
61-
return
60+
if _, err := sess.ID(t.ID).Cols("payload_content").Update(t); err != nil {
61+
return err
6262
}
6363
}
64-
if err = sess.Commit(); err != nil {
65-
return
64+
if err := sess.Commit(); err != nil {
65+
return err
6666
}
6767
}
6868
return err

‎models/migrations/v1_15/v181.go

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"xorm.io/xorm"
1010
)
1111

12-
func AddPrimaryEmail2EmailAddress(x *xorm.Engine) (err error) {
12+
func AddPrimaryEmail2EmailAddress(x *xorm.Engine) error {
1313
type User struct {
1414
ID int64 `xorm:"pk autoincr"`
1515
Email string `xorm:"NOT NULL"`
@@ -26,12 +26,12 @@ func AddPrimaryEmail2EmailAddress(x *xorm.Engine) (err error) {
2626
}
2727

2828
// Add lower_email and is_primary columns
29-
if err = x.Table("email_address").Sync2(new(EmailAddress1)); err != nil {
30-
return
29+
if err := x.Table("email_address").Sync2(new(EmailAddress1)); err != nil {
30+
return err
3131
}
3232

33-
if _, err = x.Exec("UPDATE email_address SET lower_email=LOWER(email), is_primary=?", false); err != nil {
34-
return
33+
if _, err := x.Exec("UPDATE email_address SET lower_email=LOWER(email), is_primary=?", false); err != nil {
34+
return err
3535
}
3636

3737
type EmailAddress struct {
@@ -44,8 +44,8 @@ func AddPrimaryEmail2EmailAddress(x *xorm.Engine) (err error) {
4444
}
4545

4646
// change lower_email as unique
47-
if err = x.Sync2(new(EmailAddress)); err != nil {
48-
return
47+
if err := x.Sync2(new(EmailAddress)); err != nil {
48+
return err
4949
}
5050

5151
sess := x.NewSession()
@@ -55,34 +55,33 @@ func AddPrimaryEmail2EmailAddress(x *xorm.Engine) (err error) {
5555

5656
for start := 0; ; start += batchSize {
5757
users := make([]*User, 0, batchSize)
58-
if err = sess.Limit(batchSize, start).Find(&users); err != nil {
59-
return
58+
if err := sess.Limit(batchSize, start).Find(&users); err != nil {
59+
return err
6060
}
6161
if len(users) == 0 {
6262
break
6363
}
6464

6565
for _, user := range users {
66-
var exist bool
67-
exist, err = sess.Where("email=?", user.Email).Table("email_address").Exist()
66+
exist, err := sess.Where("email=?", user.Email).Table("email_address").Exist()
6867
if err != nil {
69-
return
68+
return err
7069
}
7170
if !exist {
72-
if _, err = sess.Insert(&EmailAddress{
71+
if _, err := sess.Insert(&EmailAddress{
7372
UID: user.ID,
7473
Email: user.Email,
7574
LowerEmail: strings.ToLower(user.Email),
7675
IsActivated: user.IsActive,
7776
IsPrimary: true,
7877
}); err != nil {
79-
return
78+
return err
8079
}
8180
} else {
82-
if _, err = sess.Where("email=?", user.Email).Cols("is_primary").Update(&EmailAddress{
81+
if _, err := sess.Where("email=?", user.Email).Cols("is_primary").Update(&EmailAddress{
8382
IsPrimary: true,
8483
}); err != nil {
85-
return
84+
return err
8685
}
8786
}
8887
}

‎models/organization/org.go

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -532,27 +532,6 @@ func GetOrgsCanCreateRepoByUserID(userID int64) ([]*Organization, error) {
532532
Find(&orgs)
533533
}
534534

535-
// GetOrgUsersByUserID returns all organization-user relations by user ID.
536-
func GetOrgUsersByUserID(uid int64, opts *SearchOrganizationsOptions) ([]*OrgUser, error) {
537-
ous := make([]*OrgUser, 0, 10)
538-
sess := db.GetEngine(db.DefaultContext).
539-
Join("LEFT", "`user`", "`org_user`.org_id=`user`.id").
540-
Where("`org_user`.uid=?", uid)
541-
if !opts.All {
542-
// Only show public organizations
543-
sess.And("is_public=?", true)
544-
}
545-
546-
if opts.PageSize != 0 {
547-
sess = db.SetSessionPagination(sess, opts)
548-
}
549-
550-
err := sess.
551-
Asc("`user`.name").
552-
Find(&ous)
553-
return ous, err
554-
}
555-
556535
// GetOrgUsersByOrgID returns all organization-user relations by organization ID.
557536
func GetOrgUsersByOrgID(ctx context.Context, opts *FindOrgMembersOpts) ([]*OrgUser, error) {
558537
sess := db.GetEngine(ctx).Where("org_id=?", opts.OrgID)

‎models/organization/org_test.go

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -207,42 +207,6 @@ func TestFindOrgs(t *testing.T) {
207207
assert.EqualValues(t, 1, total)
208208
}
209209

210-
func TestGetOrgUsersByUserID(t *testing.T) {
211-
assert.NoError(t, unittest.PrepareTestDatabase())
212-
213-
orgUsers, err := organization.GetOrgUsersByUserID(5, &organization.SearchOrganizationsOptions{All: true})
214-
assert.NoError(t, err)
215-
if assert.Len(t, orgUsers, 3) {
216-
assert.Equal(t, organization.OrgUser{
217-
ID: orgUsers[0].ID,
218-
OrgID: 23,
219-
UID: 5,
220-
IsPublic: false,
221-
}, *orgUsers[0])
222-
assert.Equal(t, organization.OrgUser{
223-
ID: orgUsers[1].ID,
224-
OrgID: 6,
225-
UID: 5,
226-
IsPublic: true,
227-
}, *orgUsers[1])
228-
assert.Equal(t, organization.OrgUser{
229-
ID: orgUsers[2].ID,
230-
OrgID: 7,
231-
UID: 5,
232-
IsPublic: false,
233-
}, *orgUsers[2])
234-
}
235-
236-
publicOrgUsers, err := organization.GetOrgUsersByUserID(5, &organization.SearchOrganizationsOptions{All: false})
237-
assert.NoError(t, err)
238-
assert.Len(t, publicOrgUsers, 1)
239-
assert.Equal(t, *orgUsers[1], *publicOrgUsers[0])
240-
241-
orgUsers, err = organization.GetOrgUsersByUserID(1, &organization.SearchOrganizationsOptions{All: true})
242-
assert.NoError(t, err)
243-
assert.Len(t, orgUsers, 0)
244-
}
245-
246210
func TestGetOrgUsersByOrgID(t *testing.T) {
247211
assert.NoError(t, unittest.PrepareTestDatabase())
248212

‎models/user/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ func GetUserFollowers(ctx context.Context, u, viewer *User, listOptions db.ListO
336336

337337
// GetUserFollowing returns range of user's following.
338338
func GetUserFollowing(ctx context.Context, u, viewer *User, listOptions db.ListOptions) ([]*User, int64, error) {
339-
sess := db.GetEngine(db.DefaultContext).
339+
sess := db.GetEngine(ctx).
340340
Select("`user`.*").
341341
Join("LEFT", "follow", "`user`.id=follow.follow_id").
342342
Where("follow.user_id=?", u.ID).

‎modules/context/org.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
161161
}
162162
ctx.Data["IsOrganizationOwner"] = ctx.Org.IsOwner
163163
ctx.Data["IsOrganizationMember"] = ctx.Org.IsMember
164-
ctx.Data["IsProjectEnabled"] = true
165164
ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
166165
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
167166
ctx.Data["IsPublicMember"] = func(uid int64) bool {

0 commit comments

Comments
 (0)