Skip to content

Commit 4b1d4a8

Browse files
eneuschildeneuschild
committed
Merge branch 'master' into issue_13171
2 parents 7019096 + ce43d38 commit 4b1d4a8

File tree

9 files changed

+46
-19
lines changed

9 files changed

+46
-19
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.14
55
require (
66
code.gitea.io/gitea-vet v0.2.1
77
code.gitea.io/sdk/gitea v0.13.1
8-
gitea.com/go-chi/session v0.0.0-20201218134809-7209fa084f27
8+
gitea.com/go-chi/session v0.0.0-20210108030337-0cb48c5ba8ee
99
gitea.com/lunny/levelqueue v0.3.0
1010
gitea.com/macaron/binding v0.0.0-20190822013154-a5f53841ed2b
1111
gitea.com/macaron/cache v0.0.0-20200924044943-905232fba10b

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ code.gitea.io/gitea-vet v0.2.1/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFj
4040
code.gitea.io/sdk/gitea v0.13.1 h1:Y7bpH2iO6Q0KhhMJfjP/LZ0AmiYITeRQlCD8b0oYqhk=
4141
code.gitea.io/sdk/gitea v0.13.1/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY=
4242
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
43-
gitea.com/go-chi/session v0.0.0-20201218134809-7209fa084f27 h1:cdb1OTNXGLwQ55gg+9tIPWufdsnrHWcIq8Qs+j/E8JU=
44-
gitea.com/go-chi/session v0.0.0-20201218134809-7209fa084f27/go.mod h1:Ozg8IchVNb/Udg+ui39iHRYqVHSvf3C99ixdpLR8Vu0=
43+
gitea.com/go-chi/session v0.0.0-20210108030337-0cb48c5ba8ee h1:9U6HuKUBt/cGK6T/64dEuz0r7Yp97WAAEJvXHDlY3ws=
44+
gitea.com/go-chi/session v0.0.0-20210108030337-0cb48c5ba8ee/go.mod h1:Ozg8IchVNb/Udg+ui39iHRYqVHSvf3C99ixdpLR8Vu0=
4545
gitea.com/lunny/levelqueue v0.3.0 h1:MHn1GuSZkxvVEDMyAPqlc7A3cOW+q8RcGhRgH/xtm6I=
4646
gitea.com/lunny/levelqueue v0.3.0/go.mod h1:HBqmLbz56JWpfEGG0prskAV97ATNRoj5LDmPicD22hU=
4747
gitea.com/lunny/log v0.0.0-20190322053110-01b5df579c4e h1:r1en/D7xJmcY24VkHkjkcJFa+7ZWubVWPBrvsHkmHxk=

‎options/locale/locale_cs-CZ.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ my_mirrors=Má zrcadla
216216
view_home=Zobrazit %s
217217
search_repos=Nalézt repozitář…
218218
filter=Ostatní filtry
219+
filter_by_team_repositories=Filtrovat podle repozitářů týmu
219220

220221
show_archived=Archivováno
221222
show_both_archived_unarchived=Zobrazeny jak archivované tak nearchivované
@@ -555,6 +556,7 @@ principal_state_desc=Tento SSH Principal certifikát byl použit během posledn
555556
show_openid=Zobrazit na profilu
556557
hide_openid=Odstranit z profilu
557558
ssh_disabled=SSH zakázáno
559+
ssh_externally_managed=Tento SSH klíč je spravován externě pro tohoto uživatele
558560
manage_social=Správa propojených účtů sociálních sítí
559561
social_desc=Tyto účty sociálních síti jsou propojeny s vaším Gitea účtem. Ujistěte se, že je všechny znáte, protože mohou být použity k přihlášení do vašeho Gitea účtu.
560562
unbind=Odpojit
@@ -2113,6 +2115,7 @@ users.delete_account=Smazat uživatelský účet
21132115
users.still_own_repo=Tento uživatel stále vlastní jeden nebo více repozitářů. Tyto repozitáře nejprve smažte nebo je převeďte.
21142116
users.still_has_org=Uživatel je člen organizace. Nejprve odstraňte uživatele ze všech organizací.
21152117
users.deletion_success=Uživatelský účet byl smazán.
2118+
users.reset_2fa=Resetovat 2FA
21162119

21172120
emails.email_manage_panel=Správa e-mailů uživatele
21182121
emails.primary=Hlavní
@@ -2200,6 +2203,7 @@ auths.enable_tls=Povolit šifrování TLS
22002203
auths.skip_tls_verify=Přeskočit ověření TLS
22012204
auths.pam_service_name=Název služby PAM
22022205
auths.oauth2_provider=Poskytovatel OAuth2
2206+
auths.oauth2_icon_url=URL ikony
22032207
auths.oauth2_clientID=Klientské ID (klíč)
22042208
auths.oauth2_clientSecret=Tajný klíč klienta
22052209
auths.openIdConnectAutoDiscoveryURL=OpenID URL pro automatické objevování
@@ -2491,6 +2495,7 @@ mirror_sync_delete=synchronizoval(a) a smazal(a) referenci <code>%[2]s</code> v
24912495
approve_pull_request=`schválil(a) <a href="%s/pulls/%s">%s#%[2]s</a>`
24922496
reject_pull_request=`navrhl(a) změny pro <a href="%s/pulls/%s">%s#%[2]s</a>`
24932497
publish_release=`vydána značka <a href="%s/releases/tag/%s"> "%[4]s" </a> v <a href="%[1]s">%[3]s</a>`
2498+
create_branch=vytvořena větev <a href="%[1]s/src/branch/%[2]s">%[3]s</a> v <a href="%[1]s">%[4]s</a>
24942499

24952500
[tool]
24962501
ago=před %s

‎options/locale/locale_ja-JP.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2115,6 +2115,7 @@ users.delete_account=ユーザーアカウントを削除
21152115
users.still_own_repo=このユーザーはまだ1つ以上のリポジトリを所有しています。 先にそれらのリポジトリを削除するか移転してください。
21162116
users.still_has_org=このユーザーは組織のメンバーになっています。 先に組織からこのユーザーを削除してください。
21172117
users.deletion_success=ユーザーアカウントを削除しました。
2118+
users.reset_2fa=2要素認証をリセット
21182119

21192120
emails.email_manage_panel=ユーザーメールアドレスの管理
21202121
emails.primary=プライマリー
@@ -2494,6 +2495,7 @@ mirror_sync_delete=が <a href="%[1]s">%[3]s</a> の参照 <code>%[2]s</code>
24942495
approve_pull_request=`が <a href="%s/pulls/%s">%s#%[2]s</a> を承認しました`
24952496
reject_pull_request=`が <a href="%s/pulls/%s">%s#%[2]s</a> について変更を求めました`
24962497
publish_release=`が <a href="%[1]s">%[3]s</a> の <a href="%[1]s/releases/tag/%[2]s"> "%[4]s" </a> をリリースしました`
2498+
create_branch=が <a href="%[1]s">%[4]s</a> にブランチ <a href="%[1]s/src/branch/%[2]s">%[3]s</a> を作成しました
24972499

24982500
[tool]
24992501
ago=%s前

‎routers/routes/chi.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ func storageHandler(storageSetting setting.Storage, prefix string, objStore stor
176176
}
177177
}
178178

179+
var (
180+
sessionManager *session.Manager
181+
)
182+
179183
// NewChi creates a chi Router
180184
func NewChi() chi.Router {
181185
c := chi.NewRouter()
@@ -185,7 +189,8 @@ func NewChi() chi.Router {
185189
c.Use(LoggerHandler(setting.RouterLogLevel))
186190
}
187191
}
188-
c.Use(session.Sessioner(session.Options{
192+
193+
var opt = session.Options{
189194
Provider: setting.SessionConfig.Provider,
190195
ProviderConfig: setting.SessionConfig.ProviderConfig,
191196
CookieName: setting.SessionConfig.CookieName,
@@ -194,7 +199,14 @@ func NewChi() chi.Router {
194199
Maxlifetime: setting.SessionConfig.Maxlifetime,
195200
Secure: setting.SessionConfig.Secure,
196201
Domain: setting.SessionConfig.Domain,
197-
}))
202+
}
203+
opt = session.PrepareOptions([]session.Options{opt})
204+
205+
var err error
206+
sessionManager, err = session.NewManager(opt.Provider, opt)
207+
if err != nil {
208+
panic(err)
209+
}
198210

199211
c.Use(Recovery())
200212
if setting.EnableAccessLog {

‎routers/routes/macaron.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,15 @@ func NewMacaron() *macaron.Macaron {
8383
}
8484

8585
m.Use(i18n.I18n(i18n.Options{
86-
SubURL: setting.AppSubURL,
87-
Files: localFiles,
88-
Langs: setting.Langs,
89-
Names: setting.Names,
90-
DefaultLang: "en-US",
91-
Redirect: false,
92-
CookieDomain: setting.SessionConfig.Domain,
86+
SubURL: setting.AppSubURL,
87+
Files: localFiles,
88+
Langs: setting.Langs,
89+
Names: setting.Names,
90+
DefaultLang: "en-US",
91+
Redirect: false,
92+
CookieHttpOnly: true,
93+
Secure: setting.SessionConfig.Secure,
94+
CookieDomain: setting.SessionConfig.Domain,
9395
}))
9496
m.Use(cache.Cacher(cache.Options{
9597
Adapter: setting.CacheService.Adapter,

‎routers/routes/recovery.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"code.gitea.io/gitea/modules/setting"
1515
"code.gitea.io/gitea/modules/templates"
1616

17-
"gitea.com/go-chi/session"
1817
"github.com/unrolled/render"
1918
)
2019

@@ -64,7 +63,13 @@ func Recovery() func(next http.Handler) http.Handler {
6463
log.Error("%v", combinedErr)
6564

6665
lc := middlewares.Locale(w, req)
67-
sess := session.GetSession(req)
66+
67+
// TODO: this should be replaced by real session after macaron removed totally
68+
sessionStore, err := sessionManager.Start(w, req)
69+
if err != nil {
70+
// Just invoke the above recover catch
71+
panic("session(start): " + err.Error())
72+
}
6873

6974
var store = dataStore{
7075
Data: templates.Vars{
@@ -75,7 +80,7 @@ func Recovery() func(next http.Handler) http.Handler {
7580
}
7681

7782
// Get user from session if logged in.
78-
user, _ := sso.SignedInUser(req, w, &store, sess)
83+
user, _ := sso.SignedInUser(req, w, &store, sessionStore)
7984
if user != nil {
8085
store.Data["IsSigned"] = true
8186
store.Data["SignedUser"] = user
@@ -92,7 +97,7 @@ func Recovery() func(next http.Handler) http.Handler {
9297
if setting.RunMode != "prod" {
9398
store.Data["ErrMsg"] = combinedErr
9499
}
95-
err := rnd.HTML(w, 500, "status/500", templates.BaseVars().Merge(store.Data))
100+
err = rnd.HTML(w, 500, "status/500", templates.BaseVars().Merge(store.Data))
96101
if err != nil {
97102
log.Error("%v", err)
98103
}

‎vendor/gitea.com/go-chi/session/session.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ code.gitea.io/gitea-vet/checks
77
# code.gitea.io/sdk/gitea v0.13.1
88
## explicit
99
code.gitea.io/sdk/gitea
10-
# gitea.com/go-chi/session v0.0.0-20201218134809-7209fa084f27
10+
# gitea.com/go-chi/session v0.0.0-20210108030337-0cb48c5ba8ee
1111
## explicit
1212
gitea.com/go-chi/session
1313
gitea.com/go-chi/session/couchbase

0 commit comments

Comments
 (0)