diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-08-10 10:05:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-10 02:05:37 +0000 |
| commit | a85a8628042c788ce2b372a29ca1cefab544f1ed (patch) | |
| tree | 79ed24c1e4597dd7b668435700532aeab2e29d7d /modules | |
| parent | 63ab92d7971e4931e98f014f2c5385d2242fa780 (diff) | |
| download | gitea-a85a8628042c788ce2b372a29ca1cefab544f1ed.tar.gz gitea-a85a8628042c788ce2b372a29ca1cefab544f1ed.zip | |
Fix admin queue page title (#26409)
Fix #26408
```
# locale_en-US.ini
[admin]
monitor.queues = Queues
```
---------
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ssh/ssh.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index 923fa51d22..a5af5c129b 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -17,6 +17,7 @@ import ( "os" "os/exec" "path/filepath" + "reflect" "strconv" "strings" "sync" @@ -164,6 +165,10 @@ func sessionHandler(session ssh.Session) { } func publicKeyHandler(ctx ssh.Context, key ssh.PublicKey) bool { + // FIXME: the "ssh.Context" is not thread-safe, so db operations should use the immutable parent "Context" + // TODO: Remove after https://github.com/gliderlabs/ssh/pull/211 + parentCtx := reflect.ValueOf(ctx).Elem().FieldByName("Context").Interface().(context.Context) + if log.IsDebug() { // <- FingerprintSHA256 is kinda expensive so only calculate it if necessary log.Debug("Handle Public Key: Fingerprint: %s from %s", gossh.FingerprintSHA256(key), ctx.RemoteAddr()) } @@ -189,7 +194,7 @@ func publicKeyHandler(ctx ssh.Context, key ssh.PublicKey) bool { // look for the exact principal principalLoop: for _, principal := range cert.ValidPrincipals { - pkey, err := asymkey_model.SearchPublicKeyByContentExact(ctx, principal) + pkey, err := asymkey_model.SearchPublicKeyByContentExact(parentCtx, principal) if err != nil { if asymkey_model.IsErrKeyNotExist(err) { log.Debug("Principal Rejected: %s Unknown Principal: %s", ctx.RemoteAddr(), principal) @@ -246,7 +251,7 @@ func publicKeyHandler(ctx ssh.Context, key ssh.PublicKey) bool { log.Debug("Handle Public Key: %s Fingerprint: %s is not a certificate", ctx.RemoteAddr(), gossh.FingerprintSHA256(key)) } - pkey, err := asymkey_model.SearchPublicKeyByContent(ctx, strings.TrimSpace(string(gossh.MarshalAuthorizedKey(key)))) + pkey, err := asymkey_model.SearchPublicKeyByContent(parentCtx, strings.TrimSpace(string(gossh.MarshalAuthorizedKey(key)))) if err != nil { if asymkey_model.IsErrKeyNotExist(err) { log.Warn("Unknown public key: %s from %s", gossh.FingerprintSHA256(key), ctx.RemoteAddr()) |