diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-12-10 16:14:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-10 16:14:24 +0800 |
| commit | 3ca5dc7e32b372d14ff80d96f14b8f6a805862f1 (patch) | |
| tree | 50d193ed0dacf2888d57b193a9b0d36065aff205 /cmd | |
| parent | 0a9fcf63a49799ad3b0f146c54879161bac61e10 (diff) | |
| download | gitea-3ca5dc7e32b372d14ff80d96f14b8f6a805862f1.tar.gz gitea-3ca5dc7e32b372d14ff80d96f14b8f6a805862f1.zip | |
Move keys to models/asymkey (#17917)
* Move keys to models/keys
* Rename models/keys -> models/asymkey
* change the missed package name
* Fix package alias
* Fix test
* Fix docs
* Fix test
* Fix test
* merge
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/admin.go | 3 | ||||
| -rw-r--r-- | cmd/serv.go | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/cmd/admin.go b/cmd/admin.go index d11b824fa1..f36e9f5de7 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -14,6 +14,7 @@ import ( "text/tabwriter" "code.gitea.io/gitea/models" + asymkey_model "code.gitea.io/gitea/models/asymkey" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/login" user_model "code.gitea.io/gitea/models/user" @@ -625,7 +626,7 @@ func runRegenerateKeys(_ *cli.Context) error { if err := initDB(ctx); err != nil { return err } - return models.RewriteAllPublicKeys() + return asymkey_model.RewriteAllPublicKeys() } func parseOAuth2Config(c *cli.Context) *oauth2.Source { diff --git a/cmd/serv.go b/cmd/serv.go index e34e300cbe..c3c9eff195 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -17,6 +17,7 @@ import ( "time" "code.gitea.io/gitea/models" + asymkey_model "code.gitea.io/gitea/models/asymkey" "code.gitea.io/gitea/models/perm" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/json" @@ -129,9 +130,9 @@ func runServ(c *cli.Context) error { return fail("Internal error", "Failed to check provided key: %v", err) } switch key.Type { - case models.KeyTypeDeploy: + case asymkey_model.KeyTypeDeploy: println("Hi there! You've successfully authenticated with the deploy key named " + key.Name + ", but Gitea does not provide shell access.") - case models.KeyTypePrincipal: + case asymkey_model.KeyTypePrincipal: println("Hi there! You've successfully authenticated with the principal " + key.Content + ", but Gitea does not provide shell access.") default: println("Hi there, " + user.Name + "! You've successfully authenticated with the key named " + key.Name + ", but Gitea does not provide shell access.") |