Fix admin queue page title and fix CI failures (#26409) (#26421)

Backport #26409

* Fix #26408
* Bypass the data race issue in "ssh" package

diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go
index 923fa51d228a7206b2b55d5b78b6b45dea224b38..a5af5c129b8b84707f3fd08a10cd10329c551bec 100644 (file)
--- 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())

diff --git a/routers/web/admin/queue.go b/routers/web/admin/queue.go
index 4e01846ba8baba44b30eb3255e585e05fe78ca71..18a8d7d3e6834c99ab750da3560fedc9611901e2 100644 (file)
--- a/routers/web/admin/queue.go
+++ b/routers/web/admin/queue.go
@@ -16,7 +16,7 @@ func Queues(ctx *context.Context) {
        if !setting.IsProd {
                initTestQueueOnce()
        }
-       ctx.Data["Title"] = ctx.Tr("admin.monitor.queue")
+       ctx.Data["Title"] = ctx.Tr("admin.monitor.queues")
        ctx.Data["PageIsAdminMonitorQueue"] = true
        ctx.Data["Queues"] = queue.GetManager().ManagedQueues()
        ctx.HTML(http.StatusOK, tplQueue)