diff --git a/changelog.d/fixed-18598-meetings-call-failures-logged.md b/changelog.d/fixed-18598-meetings-call-failures-logged.md new file mode 100644 index 0000000000..ec2094ffe3 --- /dev/null +++ b/changelog.d/fixed-18598-meetings-call-failures-logged.md @@ -0,0 +1 @@ +- **A failed meetings call now names its error in the hive log.** Every meetings API failure (join, approve, decline, leave, schedule, actions) is logged with its method, path, status and error, and a Discord `/hive join` request whose approval fails keeps the reason on the request and stays approvable. Before, a Quorum refusal such as `blocked: the bot has no permission to connect to that voice channel` reached a hosted owner only as the ingress's generic "hive unavailable" page and left no line in the spoke log The Meetings panel also stops calling a blocked Discord join "The meeting refused a guest bot" (Discord has no lobby): it says the bot lacks View Channel, Connect or Speak on that voice channel, and a pending join request shows why its approval failed ([#18598](https://github.com/hivecommons/hive/issues/18598)). diff --git a/src/docs/api-reference/knowledge.md b/src/docs/api-reference/knowledge.md index 33257dccbe..3acc90edcd 100644 --- a/src/docs/api-reference/knowledge.md +++ b/src/docs/api-reference/knowledge.md @@ -88,17 +88,17 @@ Part of the [Dashboard REST API reference](../api-reference.md); see that page f | `DELETE` | `/api/inbox/recordings/{id}` | The recorder, or an owner | Abort an in-progress recording and delete its chunks; audited as `inbox_recording_abort` (403, 404, 409 already ended) | `pkg/dashboard/api_inbox_recordings.go:23` | | `GET` | `/api/inbox/recordings/{id}/audio` | Owner or read-write | Play a finished recording from this hive's disk on the dashboard origin: `http.ServeContent` (Range, 206), `Content-Type` audio/webm or audio/mp4, `Cache-Control: no-store`, `Cross-Origin-Resource-Policy: same-origin`. Opening a playback is audited as `inbox_recording_audio` (seeks are not). `GET /api/inbox/hive-recording/{id}/audio/stream` serves the same file (404 unknown or not finished, 410 audio expired after `inbox.recording.retention_days`) | `pkg/dashboard/api_inbox_recordings.go:24` | | `DELETE` | `/api/inbox/hive-recording/{id}` | An owner, or the read-write member who recorded it | Delete a finished recording for good: its stored audio and chunks, the Inbox item and its state, and its Knowledge fact with the machine transcript. What was already shared from it (RFC, issues, DIBS ideas, spek seeds) is not touched. 200 `{id, deleted, fact_removed, shares_kept}`; audited as `inbox_recording_delete` (403 read role or someone else's recording, 404 unknown, 409 still in progress or being transcribed) | `pkg/dashboard/api_inbox_recordings.go:25` | -| `GET` | `/api/meetings/settings` | Owner only | Meetings settings: `enabled`, `enabled_env_override`, `running`, `vexa_url`, `vexa_key_set`, `discord_token_set`, `transcribe_token_set`, `tts_token_set` (secrets are never returned) and `effective` values of the other `meetings.*` keys ([env vars](../env-vars.md#meetings-quorum)) | `pkg/dashboard/api_meetings.go:123` | -| `POST` | `/api/meetings/settings` | Owner only | Update `meetings.enabled` and `meetings.vexa.url`, and write the Vexa tenant key, Discord bot token, transcription service token and TTS service token to keystore-sealed secret files (`""` clears one): `{enabled?, vexa_url?, vexa_api_key?, discord_token?, transcribe_token?, tts_token?}`. Returns the settings with `restart_required`; 400 on an invalid value. Audited as `meetings_settings` | `pkg/dashboard/api_meetings.go:124` | -| `POST` | `/api/meetings` | Owner only | Send hive to a meeting: `{url}` for Google Meet, Teams or Zoom, or `{platform: "discord", guild_id, channel_id}`, plus `title?` and `voice?`. Returns the meeting record; 400 invalid request, 502 Quorum refused, 503 meetings off. Audited as `meeting_join` | `pkg/dashboard/api_meetings.go:125` | -| `GET` | `/api/meetings` | Owner only | `{meetings: [...]}`, newest first | `pkg/dashboard/api_meetings.go:126` | -| `GET` | `/api/meetings/{id}` | Owner only | `{meeting, transcript, live}`: the record, stored final segments and chat, and the live-loop state (notes, research, asks, budget); 404 unknown | `pkg/dashboard/api_meetings.go:127` | -| `POST` | `/api/meetings/{id}/leave` | Owner only | Make hive leave; returns the record. Audited as `meeting_leave` | `pkg/dashboard/api_meetings.go:128` | -| `POST` | `/api/meetings/{id}/voice` | Owner only | `{enabled}`: allow hive to answer aloud when addressed (with `meetings.voice_on_address`). Audited as `meeting_voice` | `pkg/dashboard/api_meetings.go:129` | -| `POST` | `/api/meetings/{id}/research/{rid}/approve` | Owner only | Dispatch a research item waiting past the per-meeting cap; 409 when it is not waiting or the live session ended. Audited as `meeting_research_approve` | `pkg/dashboard/api_meetings.go:130` | -| `POST` | `/api/meetings/{id}/approve` | Owner only | Approve a platform join request (Discord `/hive join`): joins that channel; optional `{voice}`. 409 when the meeting is not a pending request. Audited as `meeting_request_approve` | `pkg/dashboard/api_meetings.go:131` | -| `POST` | `/api/meetings/{id}/decline` | Owner only | Decline a platform join request with `meeting.leave`. Audited as `meeting_request_decline` | `pkg/dashboard/api_meetings.go:132` | -| `GET` | `/api/meetings/{id}/ws` | Owner only | WebSocket live panel: a `snapshot` frame, then `meeting`, `line`, `intent`, `research`, `notes` and `dropped` frames for the meeting | `pkg/dashboard/api_meetings.go:133` | +| `GET` | `/api/meetings/settings` | Owner only | Meetings settings: `enabled`, `enabled_env_override`, `running`, `vexa_url`, `vexa_key_set`, `discord_token_set`, `transcribe_token_set`, `tts_token_set` (secrets are never returned) and `effective` values of the other `meetings.*` keys ([env vars](../env-vars.md#meetings-quorum)) | `pkg/dashboard/api_meetings.go:124` | +| `POST` | `/api/meetings/settings` | Owner only | Update `meetings.enabled` and `meetings.vexa.url`, and write the Vexa tenant key, Discord bot token, transcription service token and TTS service token to keystore-sealed secret files (`""` clears one): `{enabled?, vexa_url?, vexa_api_key?, discord_token?, transcribe_token?, tts_token?}`. Returns the settings with `restart_required`; 400 on an invalid value. Audited as `meetings_settings` | `pkg/dashboard/api_meetings.go:125` | +| `POST` | `/api/meetings` | Owner only | Send hive to a meeting: `{url}` for Google Meet, Teams or Zoom, or `{platform: "discord", guild_id, channel_id}`, plus `title?` and `voice?`. Returns the meeting record; 400 invalid request, 502 Quorum refused, 503 meetings off. Audited as `meeting_join` | `pkg/dashboard/api_meetings.go:126` | +| `GET` | `/api/meetings` | Owner only | `{meetings: [...]}`, newest first | `pkg/dashboard/api_meetings.go:127` | +| `GET` | `/api/meetings/{id}` | Owner only | `{meeting, transcript, live}`: the record, stored final segments and chat, and the live-loop state (notes, research, asks, budget); 404 unknown | `pkg/dashboard/api_meetings.go:128` | +| `POST` | `/api/meetings/{id}/leave` | Owner only | Make hive leave; returns the record. Audited as `meeting_leave` | `pkg/dashboard/api_meetings.go:129` | +| `POST` | `/api/meetings/{id}/voice` | Owner only | `{enabled}`: allow hive to answer aloud when addressed (with `meetings.voice_on_address`). Audited as `meeting_voice` | `pkg/dashboard/api_meetings.go:130` | +| `POST` | `/api/meetings/{id}/research/{rid}/approve` | Owner only | Dispatch a research item waiting past the per-meeting cap; 409 when it is not waiting or the live session ended. Audited as `meeting_research_approve` | `pkg/dashboard/api_meetings.go:131` | +| `POST` | `/api/meetings/{id}/approve` | Owner only | Approve a platform join request (Discord `/hive join`): joins that channel; optional `{voice}`. 409 when the meeting is not a pending request. Audited as `meeting_request_approve` | `pkg/dashboard/api_meetings.go:132` | +| `POST` | `/api/meetings/{id}/decline` | Owner only | Decline a platform join request with `meeting.leave`. Audited as `meeting_request_decline` | `pkg/dashboard/api_meetings.go:133` | +| `GET` | `/api/meetings/{id}/ws` | Owner only | WebSocket live panel: a `snapshot` frame, then `meeting`, `line`, `intent`, `research`, `notes` and `dropped` frames for the meeting | `pkg/dashboard/api_meetings.go:134` | | `GET` | `/api/meetings/schedule` | Owner or read-write | The Calendar: `{upcoming, recent, attendee_name}`; upcoming events (scheduled, awaiting approval, live) by start and events finished in the last 14 days, newest first. Each event carries its platform, source, status, next occurrences and the meeting it created; a passcode is shown only as `set`. See [Calendar](../meetings.md#calendar) | `pkg/dashboard/api_meetings_schedule.go:83` | | `POST` | `/api/meetings/schedule` | Owner or read-write | Schedule a meeting: `{url, start, end?, title?, rrule?, timezone?}` (RFC 3339 times, RFC 5545 `RRULE` expanded in an IANA `timezone`). The platform comes from the link (Google Meet, Teams, Zoom). The owner's add is scheduled; a read-write user's add awaits approval. 400 invalid or already ended. Audited as `meeting_schedule_add` | `pkg/dashboard/api_meetings_schedule.go:84` | | `POST` | `/api/meetings/schedule/{eid}/approve` | Owner only | Schedule an event awaiting approval. 409 when it is not awaiting approval. Audited as `meeting_schedule_approve` | `pkg/dashboard/api_meetings_schedule.go:85` | diff --git a/src/pkg/dashboard/api_meetings.go b/src/pkg/dashboard/api_meetings.go index db3d049ad1..3e16c62fb4 100644 --- a/src/pkg/dashboard/api_meetings.go +++ b/src/pkg/dashboard/api_meetings.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "errors" + "log/slog" "net/http" "strconv" "strings" @@ -133,17 +134,44 @@ func (s *Server) registerMeetingsRoutes() { s.mux.HandleFunc("GET /api/meetings/{id}/ws", s.handleMeetingsWS) } -func meetingsError(w http.ResponseWriter, err error) { +// meetingsErrorStatus maps a MeetingsService error to its HTTP status: the +// dashboard sentinels to 404/400/409, anything else (Quorum refusing or +// failing a call, a store error) to 502. +func meetingsErrorStatus(err error) int { switch { case errors.Is(err, ErrMeetingNotFound): - jsonError(w, err.Error(), http.StatusNotFound) + return http.StatusNotFound case errors.Is(err, ErrMeetingInvalid): - jsonError(w, err.Error(), http.StatusBadRequest) + return http.StatusBadRequest case errors.Is(err, ErrMeetingConflict): - jsonError(w, err.Error(), http.StatusConflict) + return http.StatusConflict default: - jsonError(w, err.Error(), http.StatusBadGateway) + return http.StatusBadGateway + } +} + +// meetingsError answers a failed meetings call with its mapped status. +func (s *Server) meetingsError(w http.ResponseWriter, r *http.Request, err error) { + s.writeMeetingsError(w, r, err, meetingsErrorStatus(err)) +} + +// writeMeetingsError logs a failed meetings call, then answers it. Every +// failure is logged with the error because the answer alone is not enough: +// the hosted ingress replaces a 502 body with its generic "hive unavailable" +// page, so a Discord join Quorum refused ("blocked: the bot has no +// permission...") reached the owner as "hive is restarting" and left no +// trace in the spoke log. A caller mistake (4xx) logs at Info, a dependency +// or store failure at Warn. +func (s *Server) writeMeetingsError(w http.ResponseWriter, r *http.Request, err error, status int) { + if s.logger != nil { + level := slog.LevelInfo + if status >= http.StatusInternalServerError { + level = slog.LevelWarn + } + s.logger.Log(r.Context(), level, "[meetings] call failed", + "method", r.Method, "path", r.URL.Path, "status", status, "error", err.Error()) } + jsonError(w, err.Error(), status) } func (s *Server) handleMeetingsJoin(w http.ResponseWriter, r *http.Request) { @@ -163,7 +191,7 @@ func (s *Server) handleMeetingsJoin(w http.ResponseWriter, r *http.Request) { defer cancel() m, err := svc.Join(ctx, req, strings.TrimSpace(r.Header.Get("X-Hive-User"))) if err != nil { - meetingsError(w, err) + s.meetingsError(w, r, err) return } s.auditFromRequest(r, "meeting_join", auditDetail("platform", req.Platform, "voice", boolString(req.Voice)), "") @@ -187,7 +215,7 @@ func (s *Server) handleMeetingsList(w http.ResponseWriter, r *http.Request) { } list, err := svc.List() if err != nil { - meetingsError(w, err) + s.meetingsError(w, r, err) return } jsonResponse(w, map[string]any{"meetings": list}) @@ -203,7 +231,7 @@ func (s *Server) handleMeetingsGet(w http.ResponseWriter, r *http.Request) { } m, err := svc.Live(r.PathValue("id")) if err != nil { - meetingsError(w, err) + s.meetingsError(w, r, err) return } jsonResponse(w, m) @@ -221,7 +249,7 @@ func (s *Server) handleMeetingsLeave(w http.ResponseWriter, r *http.Request) { defer cancel() m, err := svc.Leave(ctx, r.PathValue("id")) if err != nil { - meetingsError(w, err) + s.meetingsError(w, r, err) return } s.auditFromRequest(r, "meeting_leave", auditDetail("meeting", r.PathValue("id")), "") @@ -247,7 +275,7 @@ func (s *Server) handleMeetingsVoice(w http.ResponseWriter, r *http.Request) { } m, err := svc.SetVoice(r.PathValue("id"), *req.Enabled) if err != nil { - meetingsError(w, err) + s.meetingsError(w, r, err) return } s.auditFromRequest(r, "meeting_voice", auditDetail("meeting", r.PathValue("id"), "enabled", boolString(*req.Enabled)), "") @@ -264,7 +292,7 @@ func (s *Server) handleMeetingsApprove(w http.ResponseWriter, r *http.Request) { } id, rid := r.PathValue("id"), r.PathValue("rid") if err := svc.ApproveResearch(id, rid); err != nil { - meetingsError(w, err) + s.meetingsError(w, r, err) return } s.auditFromRequest(r, "meeting_research_approve", auditDetail("meeting", id, "rid", rid), "") @@ -297,7 +325,7 @@ func (s *Server) handleMeetingsRequestApprove(w http.ResponseWriter, r *http.Req defer cancel() m, err := svc.ApproveRequest(ctx, r.PathValue("id"), body.Voice) if err != nil { - meetingsError(w, err) + s.meetingsError(w, r, err) return } s.auditFromRequest(r, "meeting_request_approve", auditDetail("meeting", r.PathValue("id"), "voice", boolString(body.Voice)), "") @@ -316,7 +344,7 @@ func (s *Server) handleMeetingsRequestDecline(w http.ResponseWriter, r *http.Req defer cancel() m, err := svc.DeclineRequest(ctx, r.PathValue("id")) if err != nil { - meetingsError(w, err) + s.meetingsError(w, r, err) return } s.auditFromRequest(r, "meeting_request_decline", auditDetail("meeting", r.PathValue("id")), "") @@ -340,7 +368,7 @@ func (s *Server) handleMeetingsWS(w http.ResponseWriter, r *http.Request) { id := r.PathValue("id") snap, err := svc.Live(id) if err != nil { - meetingsError(w, err) + s.meetingsError(w, r, err) return } conn, err := meetingsUpgrader.Upgrade(w, r, nil) diff --git a/src/pkg/dashboard/api_meetings_actions.go b/src/pkg/dashboard/api_meetings_actions.go index 5c392349f0..91a8d655ce 100644 --- a/src/pkg/dashboard/api_meetings_actions.go +++ b/src/pkg/dashboard/api_meetings_actions.go @@ -74,12 +74,12 @@ func (s *Server) registerMeetingsActionsRoutes() { s.mux.HandleFunc("POST /api/meetings/actions/{aid}/reject", s.meetingsActionAct(MeetingActionReject)) } -func meetingsActionsError(w http.ResponseWriter, err error) { +func (s *Server) meetingsActionsError(w http.ResponseWriter, r *http.Request, err error) { if errors.Is(err, ErrMeetingActionsDisabled) { - jsonError(w, err.Error(), http.StatusConflict) + s.writeMeetingsError(w, r, err, http.StatusConflict) return } - meetingsError(w, err) + s.meetingsError(w, r, err) } // handleMeetingsActionsList is the "Drafts from meetings" list. @@ -93,7 +93,7 @@ func (s *Server) handleMeetingsActionsList(w http.ResponseWriter, r *http.Reques } out, err := svc.List() if err != nil { - meetingsActionsError(w, err) + s.meetingsActionsError(w, r, err) return } jsonResponse(w, out) @@ -115,7 +115,7 @@ func (s *Server) handleMeetingsActionEdit(w http.ResponseWriter, r *http.Request id := r.PathValue("aid") out, err := svc.Edit(r.Context(), id, req, strings.TrimSpace(r.Header.Get("X-Hive-User"))) if err != nil { - meetingsActionsError(w, err) + s.meetingsActionsError(w, r, err) return } s.auditFromRequest(r, "meeting_action_edit", auditDetail("draft", id), "") @@ -137,7 +137,7 @@ func (s *Server) meetingsActionAct(action string) http.HandlerFunc { id := r.PathValue("aid") out, err := svc.Act(r.Context(), id, action, strings.TrimSpace(r.Header.Get("X-Hive-User"))) if err != nil { - meetingsActionsError(w, err) + s.meetingsActionsError(w, r, err) return } s.auditFromRequest(r, "meeting_action_"+action, auditDetail("draft", id), "") diff --git a/src/pkg/dashboard/api_meetings_email.go b/src/pkg/dashboard/api_meetings_email.go index 78d477d36b..6aaa613a84 100644 --- a/src/pkg/dashboard/api_meetings_email.go +++ b/src/pkg/dashboard/api_meetings_email.go @@ -163,7 +163,7 @@ func (s *Server) handleMeetingsInvites(w http.ResponseWriter, r *http.Request) { jsonError(w, err.Error(), http.StatusUnprocessableEntity) return } - meetingsError(w, err) + s.meetingsError(w, r, err) return } s.webhookLogger().Info("email invite received", "delivery", d.ID, "invites", len(d.Invites), "trusted", trusted) diff --git a/src/pkg/dashboard/api_meetings_errorlog_test.go b/src/pkg/dashboard/api_meetings_errorlog_test.go new file mode 100644 index 0000000000..86aabdb7c6 --- /dev/null +++ b/src/pkg/dashboard/api_meetings_errorlog_test.go @@ -0,0 +1,73 @@ +package dashboard + +import ( + "bytes" + "errors" + "fmt" + "log/slog" + "net/http" + "strings" + "testing" +) + +// A failed meetings call is logged with its error: the hosted ingress +// replaces a 502 body with its generic page, so the spoke log is the only +// place the owner can read why a Discord join was refused. +func TestMeetingsCallFailureIsLogged(t *testing.T) { + s, _ := apiServer(t) + var buf bytes.Buffer + s.logger = slog.New(slog.NewTextHandler(&buf, &slog.HandlerOptions{Level: slog.LevelDebug})) + f := &fakeMeetingsService{} + s.SetMeetingsService(f) + + const refusal = "quorum meeting.join: blocked: the bot has no permission to connect to that voice channel" + f.err = errors.New(refusal) + for _, path := range []string{"/api/meetings/mtg-1/approve", "/api/meetings"} { + buf.Reset() + rec := meetingsOwnerPost(s, path, `{"platform":"discord","guild_id":"1","channel_id":"2","voice":true}`) + if rec.Code != http.StatusBadGateway || !strings.Contains(rec.Body.String(), refusal) { + t.Fatalf("POST %s = %d %s", path, rec.Code, rec.Body.String()) + } + got := buf.String() + for _, want := range []string{"level=WARN", "[meetings] call failed", "path=" + path, "status=502", "no permission to connect"} { + if !strings.Contains(got, want) { + t.Errorf("POST %s log missing %q:\n%s", path, want, got) + } + } + } + + // A caller mistake is logged too, at Info. + buf.Reset() + f.err = fmt.Errorf("%w: mtg-9", ErrMeetingNotFound) + if rec := meetingsOwnerPost(s, "/api/meetings/mtg-9/approve", ``); rec.Code != http.StatusNotFound { + t.Fatalf("approve unknown = %d", rec.Code) + } + if got := buf.String(); !strings.Contains(got, "level=INFO") || !strings.Contains(got, "status=404") || !strings.Contains(got, "mtg-9") { + t.Errorf("not-found log = %s", got) + } +} + +// meetingsActionsError keeps its 409 for disabled actions and logs it. +func TestMeetingsActionsErrorIsLogged(t *testing.T) { + s, _ := apiServer(t) + var buf bytes.Buffer + s.logger = slog.New(slog.NewTextHandler(&buf, nil)) + s.SetMeetingsActionsService(&fakeActionsService{err: fmt.Errorf("%w: off", ErrMeetingActionsDisabled)}) + if rec := actionsRequest(s, http.MethodPost, "/api/meetings/actions/act_1/approve", ``, "owner", true); rec.Code != http.StatusConflict { + t.Fatalf("approve disabled = %d", rec.Code) + } + if got := buf.String(); !strings.Contains(got, "[meetings] call failed") || !strings.Contains(got, "status=409") { + t.Errorf("actions log = %s", got) + } +} + +// A nil logger never panics. +func TestMeetingsErrorNilLogger(t *testing.T) { + s, _ := apiServer(t) + s.logger = nil + f := &fakeMeetingsService{err: errors.New("quorum down")} + s.SetMeetingsService(f) + if rec := meetingsOwnerPost(s, "/api/meetings/mtg-1/approve", ``); rec.Code != http.StatusBadGateway { + t.Fatalf("approve = %d", rec.Code) + } +} diff --git a/src/pkg/dashboard/api_meetings_schedule.go b/src/pkg/dashboard/api_meetings_schedule.go index 6912758ac0..e81125601a 100644 --- a/src/pkg/dashboard/api_meetings_schedule.go +++ b/src/pkg/dashboard/api_meetings_schedule.go @@ -119,7 +119,7 @@ func (s *Server) handleMeetingsScheduleList(w http.ResponseWriter, r *http.Reque } out, err := svc.List() if err != nil { - meetingsError(w, err) + s.meetingsError(w, r, err) return } jsonResponse(w, out) @@ -172,7 +172,7 @@ func (s *Server) handleMeetingsScheduleAdd(w http.ResponseWriter, r *http.Reques add.AddedBy, add.ByOwner = strings.TrimSpace(r.Header.Get("X-Hive-User")), byOwner ev, err := svc.Add(r.Context(), add) if err != nil { - meetingsError(w, err) + s.meetingsError(w, r, err) return } s.auditFromRequest(r, "meeting_schedule_add", auditDetail("by_owner", boolString(byOwner), "recurring", boolString(add.RRule != "")), "") @@ -193,7 +193,7 @@ func (s *Server) meetingsScheduleAction(action string) http.HandlerFunc { eid := r.PathValue("eid") ev, err := svc.Act(r.Context(), eid, action, strings.TrimSpace(r.Header.Get("X-Hive-User"))) if err != nil { - meetingsError(w, err) + s.meetingsError(w, r, err) return } s.auditFromRequest(r, "meeting_schedule_"+action, auditDetail("event", eid), "") diff --git a/src/pkg/dashboard/meetings_reason.test.js b/src/pkg/dashboard/meetings_reason.test.js new file mode 100644 index 0000000000..451136a98b --- /dev/null +++ b/src/pkg/dashboard/meetings_reason.test.js @@ -0,0 +1,48 @@ +// A blocked Discord join is the bot's server permissions on the voice +// channel, not a guest-bot refusal (Discord has no lobby), and a /hive join +// request whose approval failed shows why (hivecommons/hive#18598). The +// functions are lifted straight out of index.html so this runs against the +// shipped source. +const test = require('node:test'); +const assert = require('node:assert'); +const fs = require('node:fs'); +const path = require('node:path'); + +const html = fs.readFileSync(path.join(__dirname, 'static', 'index.html'), 'utf8'); + +function pick(re, what) { + const m = html.match(re); + assert.ok(m, what + ' not found in index.html'); + return m[0]; +} + +const src = [ + 'function escapeHtml(s) { return String(s).replace(/&/g, "&").replace(//g, ">").replace(/"/g, """); }', + pick(/const MEETINGS_ERROR_INLINE_CHARS = [^\n]*\n/, 'MEETINGS_ERROR_INLINE_CHARS'), + pick(/function meetingsFriendlyReason\(m\) \{[\s\S]*?\n \}\n/, 'meetingsFriendlyReason'), + pick(/function meetingsReasonHtml\(m\) \{[\s\S]*?\n \}\n/, 'meetingsReasonHtml'), + 'module.exports = { meetingsFriendlyReason, meetingsReasonHtml };', +].join('\n'); +const mod = { exports: {} }; +new Function('module', src)(mod); +const { meetingsFriendlyReason, meetingsReasonHtml } = mod.exports; + +const DISCORD_BLOCKED = 'quorum meeting.join: blocked: the bot has no permission to connect to that voice channel'; + +test('a blocked Discord join names the bot permissions, not a guest refusal', () => { + const line = meetingsFriendlyReason({ platform: 'discord', state: 'blocked', state_reason: DISCORD_BLOCKED }); + assert.match(line, /Connect/); + assert.doesNotMatch(line, /guest bot/); +}); + +test('a blocked Meet or Teams join is still a guest refusal', () => { + assert.strictEqual( + meetingsFriendlyReason({ platform: 'google_meet', state: 'blocked', state_reason: 'quorum meeting.join: blocked: denied' }), + 'The meeting refused a guest bot.'); +}); + +test('a pending request whose approval failed shows the reason', () => { + const html = meetingsReasonHtml({ platform: 'discord', state: 'requested', state_reason: DISCORD_BLOCKED }); + assert.match(html, /Discord bot cannot join/); + assert.match(html, /no permission to connect/); +}); diff --git a/src/pkg/dashboard/static-src/js/meetings.js b/src/pkg/dashboard/static-src/js/meetings.js index 24ec960ac6..7938c81d0f 100644 --- a/src/pkg/dashboard/static-src/js/meetings.js +++ b/src/pkg/dashboard/static-src/js/meetings.js @@ -88,6 +88,11 @@ function meetingsFriendlyReason(m) { const raw = String(m.state_reason || ''); if (!raw) return ''; + // Discord has no guest lobby: a blocked Discord join is the bot's own + // server permissions on that voice channel (#18598). + if (m.platform === 'discord' && (m.state === 'blocked' || /blocked|no permission/.test(raw))) { + return 'The Discord bot cannot join that voice channel. In the server, give the bot\'s role View Channel, Connect and Speak on the channel, then try again.'; + } if (m.state === 'blocked') return 'The meeting refused a guest bot.'; if (/lobby_timeout/.test(raw)) return 'Nobody admitted hive from the lobby in time.'; if (/platform_unavailable/.test(raw)) return 'This meeting platform is not available on this hive right now.'; @@ -114,7 +119,7 @@ if (request) { return '
' + '' + escapeHtml((m.requested_by.name || m.requested_by.id || 'someone') + ' asked hive into ' + meetingsLabel(m)) + '' + - 'join request
' + + 'join request
' + meetingsReasonHtml(m) + '' + '
' + '' + '
'; diff --git a/src/pkg/dashboard/static/index.html b/src/pkg/dashboard/static/index.html index bcd0387d4e..d3f341f062 100644 --- a/src/pkg/dashboard/static/index.html +++ b/src/pkg/dashboard/static/index.html @@ -50188,6 +50188,11 @@ function meetingsFriendlyReason(m) { const raw = String(m.state_reason || ''); if (!raw) return ''; + // Discord has no guest lobby: a blocked Discord join is the bot's own + // server permissions on that voice channel (#18598). + if (m.platform === 'discord' && (m.state === 'blocked' || /blocked|no permission/.test(raw))) { + return 'The Discord bot cannot join that voice channel. In the server, give the bot\'s role View Channel, Connect and Speak on the channel, then try again.'; + } if (m.state === 'blocked') return 'The meeting refused a guest bot.'; if (/lobby_timeout/.test(raw)) return 'Nobody admitted hive from the lobby in time.'; if (/platform_unavailable/.test(raw)) return 'This meeting platform is not available on this hive right now.'; @@ -50214,7 +50219,7 @@ if (request) { return '
' + '' + escapeHtml((m.requested_by.name || m.requested_by.id || 'someone') + ' asked hive into ' + meetingsLabel(m)) + '' + - 'join request
' + + 'join request
' + meetingsReasonHtml(m) + '' + '
' + '' + '
'; diff --git a/src/pkg/meetings/requests.go b/src/pkg/meetings/requests.go index 72973a8794..7c644d9ee8 100644 --- a/src/pkg/meetings/requests.go +++ b/src/pkg/meetings/requests.go @@ -141,6 +141,13 @@ func (m *Manager) ApproveRequest(ctx context.Context, id string, voice bool) (Me DisplayName: m.opts.BotName, Platform: mt.Platform, GuildID: mt.GuildID, ChannelID: mt.ChannelID, Voice: capable, }) if err != nil { + // The request stays open so the owner can approve again once the + // cause is fixed (a missing Discord permission, say); the reason is + // kept on it so the panel and the log both name the failure. + m.log.Warn("[meetings] approving a platform join request failed", "meeting", id, "platform", mt.Platform, "error", err) + if saved, uerr := m.update(id, nil, func(x *Meeting) { x.StateReason = err.Error() }); uerr == nil { + mt = saved + } return mt, err } mt, err = m.update(id, nil, func(x *Meeting) { @@ -148,7 +155,7 @@ func (m *Manager) ApproveRequest(ctx context.Context, id string, voice bool) (Me x.NativeID = res.MeetingID } x.VoiceEnabled, x.VoiceCapable = voice, capable - x.State = StateJoining + x.State, x.StateReason = StateJoining, "" if knownStates[res.State] && res.State != StateRequested { x.State = res.State } diff --git a/src/pkg/meetings/requests_test.go b/src/pkg/meetings/requests_test.go index a28a69ec9e..d5d91461da 100644 --- a/src/pkg/meetings/requests_test.go +++ b/src/pkg/meetings/requests_test.go @@ -139,7 +139,15 @@ func TestPlatformJoinRequests(t *testing.T) { if _, err := m.ApproveRequest(context.Background(), third.ID, false); err == nil { t.Fatal("want the join error") } + // The failed approval keeps the request open and names why. + if x, _ := m.Get(third.ID); x.State != StateRequested || x.StateReason != "join failed" { + t.Fatalf("after a failed approve = %+v", x) + } q.joinErr = nil + q.joinRes = JoinResult{MeetingID: "q-d3", State: StateJoining} + if x, err := m.ApproveRequest(context.Background(), third.ID, false); err != nil || x.State != StateJoining || x.StateReason != "" { + t.Fatalf("retried approve = %+v, %v", x, err) + } // A snapshot-only request (no requester) is still recorded. all <- Event{Type: EventState, MeetingID: "q-d5", State: StateRequested, GuildID: "g5", ChannelID: "c5"}