diff options
| author | zeripath <art27@cantab.net> | 2023-02-19 07:35:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-19 15:35:52 +0800 |
| commit | c702e7995da6f1a6f5ab5137aea965a5f10e08e5 (patch) | |
| tree | 7d3bc3ad65321aef8b6da624565d7b9218320e8c /routers | |
| parent | b2e58edd74f8d9bb530335e9b1ee2e356d4dacb4 (diff) | |
| download | gitea-c702e7995da6f1a6f5ab5137aea965a5f10e08e5.tar.gz gitea-c702e7995da6f1a6f5ab5137aea965a5f10e08e5.zip | |
Provide the ability to set password hash algorithm parameters (#22942) (#22943)
Backport #22942
This PR refactors and improves the password hashing code within gitea
and makes it possible for server administrators to set the password
hashing parameters
In addition it takes the opportunity to adjust the settings for `pbkdf2`
in order to make the hashing a little stronger.
The majority of this work was inspired by PR #14751 and I would like to
thank @boppy for their work on this.
Thanks to @gusted for the suggestion to adjust the `pbkdf2` hashing
parameters.
Close #14751
---------
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/api/v1/admin/user.go | 2 | ||||
| -rw-r--r-- | routers/install/install.go | 3 | ||||
| -rw-r--r-- | routers/web/admin/users.go | 2 | ||||
| -rw-r--r-- | routers/web/auth/auth.go | 2 | ||||
| -rw-r--r-- | routers/web/auth/password.go | 2 | ||||
| -rw-r--r-- | routers/web/user/setting/account.go | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 1a4b020011..3faca09404 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -16,10 +16,10 @@ import ( "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/auth/password" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/convert" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/password" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" diff --git a/routers/install/install.go b/routers/install/install.go index d5a40c859c..25b272b854 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -21,6 +21,7 @@ import ( "code.gitea.io/gitea/models/migrations" system_model "code.gitea.io/gitea/models/system" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/auth/password/hash" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/generate" @@ -80,7 +81,7 @@ func Init(ctx goctx.Context) func(next http.Handler) http.Handler { "AllLangs": translation.AllLangs(), "PageStartTime": startTime, - "PasswordHashAlgorithms": user_model.AvailableHashAlgorithms, + "PasswordHashAlgorithms": hash.RecommendedHashAlgorithms, }, } defer ctx.Close() diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 5cdfb8142e..ef3645e478 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -15,10 +15,10 @@ import ( "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/auth/password" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/password" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index 0f8128946c..dad297925e 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -14,13 +14,13 @@ import ( "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/auth/password" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/eventsource" "code.gitea.io/gitea/modules/hcaptcha" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/mcaptcha" - "code.gitea.io/gitea/modules/password" "code.gitea.io/gitea/modules/recaptcha" "code.gitea.io/gitea/modules/session" "code.gitea.io/gitea/modules/setting" diff --git a/routers/web/auth/password.go b/routers/web/auth/password.go index c21ca9cf69..c5a41d24fe 100644 --- a/routers/web/auth/password.go +++ b/routers/web/auth/password.go @@ -10,10 +10,10 @@ import ( "code.gitea.io/gitea/models/auth" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/auth/password" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/password" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/web" diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go index 8b95caf2fc..552b1119bd 100644 --- a/routers/web/user/setting/account.go +++ b/routers/web/user/setting/account.go @@ -12,10 +12,10 @@ import ( "code.gitea.io/gitea/models" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/auth/password" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/password" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/web" |