Commit46cd47d

committed

fix test

1 parentf563bdf commit46cd47dCopy full SHA for 46cd47d

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ func HasOrgOrUserVisible(ctx context.Context, orgOrUser, user *user_model.User)`
`429`	`429`	`returntrue`
`430`	`430`	`}`
`431`	`431`
`432`		`-iforgOrUser.Visibility==structs.VisibleTypePublic {`
	`432`	`+if!setting.Service.RequireSignInViewStrict&&orgOrUser.Visibility==structs.VisibleTypePublic {`
`433`	`433`	`returntrue`
`434`	`434`	`}`
`435`	`435`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import (`
`13`	`13`	`"code.gitea.io/gitea/models/perm"`
`14`	`14`	`repo_model"code.gitea.io/gitea/models/repo"`
`15`	`15`	`user_model"code.gitea.io/gitea/models/user"`
	`16`	`+"code.gitea.io/gitea/modules/setting"`
`16`	`17`	`"code.gitea.io/gitea/modules/structs"`
`17`	`18`
`18`	`19`	`"xorm.io/builder"`
`@@ -46,7 +47,7 @@ func accessLevel(ctx context.Context, user user_model.User, repo repo_model.Re`
`46`	`47`	`returnmode,err`
`47`	`48`	`}`
`48`	`49`
`49`		`-repoIsFullyPublic:=repo.Owner.Visibility==structs.VisibleTypePublic&&!repo.IsPrivate`
	`50`	`+repoIsFullyPublic:=!setting.Service.RequireSignInViewStrict&&repo.Owner.Visibility==structs.VisibleTypePublic&&!repo.IsPrivate`
`50`	`51`	`if (restricted&&repoIsFullyPublic)\|\| (!restricted&&!repo.IsPrivate) {`
`51`	`52`	`mode=perm.AccessModeRead`
`52`	`53`	`}`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import (`
`12`	`12`	`repo_model"code.gitea.io/gitea/models/repo"`
`13`	`13`	`"code.gitea.io/gitea/models/unittest"`
`14`	`14`	`user_model"code.gitea.io/gitea/models/user"`
	`15`	`+"code.gitea.io/gitea/modules/setting"`
`15`	`16`
`16`	`17`	`"github.com/stretchr/testify/assert"`
`17`	`18`	`)`
`@@ -51,7 +52,14 @@ func TestAccessLevel(t *testing.T) {`
`51`	`52`	`assert.NoError(t,err)`
`52`	`53`	`assert.Equal(t,perm_model.AccessModeNone,level)`
`53`	`54`
`54`		`-// restricted user has no access to a public repo`
	`55`	`+// restricted user has no access to a public repo if no sign-in is required`
	`56`	`+setting.Service.RequireSignInViewStrict=false`
	`57`	`+level,err=access_model.AccessLevel(t.Context(),user29,repo1)`
	`58`	`+assert.NoError(t,err)`
	`59`	`+assert.Equal(t,perm_model.AccessModeRead,level)`
	`60`	`+`
	`61`	`+// restricted user has no access to a public repo if sign-in is required`
	`62`	`+setting.Service.RequireSignInViewStrict=true`
`55`	`63`	`level,err=access_model.AccessLevel(t.Context(),user29,repo1)`
`56`	`64`	`assert.NoError(t,err)`
`57`	`65`	`assert.Equal(t,perm_model.AccessModeNone,level)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -687,7 +687,7 @@ func AccessibleRepositoryCondition(user *user_model.User, unitType unit.Type) bu`
`687`	`687`	`if!user.IsRestricted {`
`688`	`688`	`// 5. Be able to see all public repos in private organizations that we are an org_user of`
`689`	`689`	`cond=cond.Or(userOrgPublicRepoCond(user.ID))`
`690`		`-}else {`
	`690`	`+}elseif!setting.Service.RequireSignInViewStrict{`
`691`	`691`	`orgVisibilityLimit:= []structs.VisibleType{structs.VisibleTypePrivate,structs.VisibleTypeLimited}`
`692`	`692`	`cond=userAllPublicRepoCond(cond,orgVisibilityLimit)`
`693`	`693`	`}`

Comments

(0)