Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion cmd/server/internal/api/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

contract "github.com/appthrust/appserver-go/appserver/contract/directory"
"github.com/appthrust/appserver-go/appserver/httpx"
"github.com/appthrust/appserver-go/appserver/requestlog"
"github.com/appthrust/peerbonus/cmd/server/internal/domain"
"github.com/appthrust/peerbonus/cmd/server/internal/store"
)
Expand Down Expand Up @@ -105,6 +106,9 @@ func (a *API) closeStatement(s *request) (any, int, error) {
return nil, 0, err
}
}
if refreshErr != nil {
requestlog.SetOutcome(s.r, "degraded", "directory_refresh_failed")
}
statement, err = a.store.CloseStatement(s.r.Context(), month, s.now, s.member.ID, refreshErr == nil && len(requested) == 0)
return a.renderStatement(statement), 200, err
}
Expand All @@ -122,7 +126,9 @@ func (a *API) exportCSV(s *request) (any, int, error) {
}
s.w.Header().Set("Content-Type", "text/csv; charset=utf-8")
s.w.Header().Set("Content-Disposition", `attachment; filename="peerbonus-`+month+`.csv"`)
_, _ = s.w.Write([]byte{0xef, 0xbb, 0xbf})
if _, err := s.w.Write([]byte{0xef, 0xbb, 0xbf}); err != nil {
requestlog.SetOutcome(s.r, "stream_failed", "csv_write_failed")
}
writer := csv.NewWriter(s.w)
_ = writer.Write([]string{"month", "person_id", "email", "display_name", "pending", "points", "unit_value", "currency", "amount"})
for _, line := range statement.Lines {
Expand All @@ -132,6 +138,7 @@ func (a *API) exportCSV(s *request) (any, int, error) {
}
writer.Flush()
if err := writer.Error(); err != nil {
requestlog.SetOutcome(s.r, "stream_failed", "csv_write_failed")
log.Printf("peerbonus CSV response failed: %v", err)
}
return nil, 0, nil
Expand All @@ -146,6 +153,9 @@ func (a *API) adminMembers(s *request) (any, int, error) {
return nil, 0, err
}
people, directoryErr := a.loadDirectoryPeople(s)
if directoryErr != nil {
requestlog.SetOutcome(s.r, "degraded", "directory_unavailable")
}
result := mergeParticipation(month, activity, people, directoryErr == nil)
return a.renderParticipation(result), 200, nil
}
Expand Down
18 changes: 10 additions & 8 deletions cmd/server/internal/api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/appthrust/appserver-go/appserver/identity"
"github.com/appthrust/appserver-go/appserver/link"
"github.com/appthrust/appserver-go/appserver/platformclient"
"github.com/appthrust/appserver-go/appserver/requestlog"
"github.com/appthrust/peerbonus/cmd/server/internal/directory"
"github.com/appthrust/peerbonus/cmd/server/internal/domain"
"github.com/appthrust/peerbonus/cmd/server/internal/slack"
Expand Down Expand Up @@ -119,7 +120,7 @@ func (a *API) route(pattern string, mutation, needsRoles bool, fn endpoint) {
if needsRoles {
s.access, err = a.platform.Access(ctx, s.subject, bearer)
if err != nil {
writeError(w, httpx.Fail(502, "upstream_unavailable", "The platform is temporarily unavailable"))
writeError(w, r, httpx.Fail(502, "upstream_unavailable", "The platform is temporarily unavailable"))
return
}
}
Expand All @@ -128,20 +129,20 @@ func (a *API) route(pattern string, mutation, needsRoles bool, fn endpoint) {
if r.ContentLength != 0 {
mediaType, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
if err != nil || mediaType != "application/json" {
writeError(w, httpx.Invalid("Content-Type must be application/json"))
writeError(w, r, httpx.Invalid("Content-Type must be application/json"))
return
}
}
r.Body = http.MaxBytesReader(w, r.Body, 64<<10)
}
s.member, err = a.store.MemberBySubject(ctx, s.subject)
if err != nil && !errors.Is(err, domain.ErrNotFound) {
writeError(w, err)
writeError(w, r, err)
return
}
body, status, err := fn(s)
if err != nil {
writeError(w, err)
writeError(w, r, err)
return
}
// CSV endpoints have already written the successful response.
Expand Down Expand Up @@ -175,11 +176,11 @@ func (a *API) authenticate(w http.ResponseWriter, r *http.Request) (identity.Ide
if err != nil {
switch {
case errors.Is(err, identity.ErrUnavailable):
writeError(w, httpx.Fail(503, "identity_unavailable", "The identity provider is temporarily unavailable"))
writeError(w, r, httpx.Fail(503, "identity_unavailable", "The identity provider is temporarily unavailable"))
case errors.Is(err, identity.ErrRawKeyNotAccepted):
writeError(w, httpx.Fail(401, "raw_key_not_accepted", "Exchange the access key for an assertion before calling this API"))
writeError(w, r, httpx.Fail(401, "raw_key_not_accepted", "Exchange the access key for an assertion before calling this API"))
default:
writeError(w, httpx.Fail(401, "unauthenticated", "A valid bearer token is required"))
writeError(w, r, httpx.Fail(401, "unauthenticated", "A valid bearer token is required"))
}
return identity.Identity{}, "", false
}
Expand Down Expand Up @@ -211,7 +212,7 @@ func decodeBody(s *request, target any, allowEmpty bool) error {
return nil
}

func writeError(w http.ResponseWriter, err error) {
func writeError(w http.ResponseWriter, r *http.Request, err error) {
var insufficient *domain.InsufficientPointsError
if errors.As(err, &insufficient) {
httpx.WriteJSON(w, 409, struct {
Expand All @@ -224,6 +225,7 @@ func writeError(w http.ResponseWriter, err error) {
}
var slackErr *slackAPIError
if errors.As(err, &slackErr) {
requestlog.SetError(r, httpx.Fail(slackErr.Status, slackErr.Code, slackErr.Message))
httpx.WriteJSON(w, slackErr.Status, slackErr)
return
}
Expand Down
5 changes: 3 additions & 2 deletions cmd/server/internal/api/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -676,10 +676,11 @@ func TestPostSearchAndNewestClappers(t *testing.T) {
func TestV2InputAndResponseContractWithoutDatabase(t *testing.T) {
a := &API{}
for _, query := range []string{strings.Repeat("a", 101), strings.Repeat("あ", 101)} {
_, _, err := a.posts(&request{r: httptest.NewRequest(http.MethodGet, "/posts?q="+url.QueryEscape(query), nil)})
r := httptest.NewRequest(http.MethodGet, "/posts?q="+url.QueryEscape(query), nil)
_, _, err := a.posts(&request{r: r})
require.Error(t, err)
w := httptest.NewRecorder()
writeError(w, err)
writeError(w, r, err)
require.Equal(t, 400, w.Code)
require.Contains(t, w.Body.String(), `"error":"invalid_request"`)
require.Contains(t, w.Body.String(), "Query must contain at most 100 characters")
Expand Down
4 changes: 4 additions & 0 deletions cmd/server/internal/api/members.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
contract "github.com/appthrust/appserver-go/appserver/contract/directory"
"github.com/appthrust/appserver-go/appserver/httpx"
"github.com/appthrust/appserver-go/appserver/link"
"github.com/appthrust/appserver-go/appserver/requestlog"
"github.com/appthrust/peerbonus/cmd/server/internal/domain"
"github.com/appthrust/peerbonus/cmd/server/internal/store"
)
Expand All @@ -31,6 +32,7 @@ func (a *API) resolveSelf(s *request) (bool, error) {
if s.member.ID == "" {
return false, directoryUnavailable()
}
requestlog.SetOutcome(s.r, "degraded", "directory_unavailable")
in := store.MemberInput{PersonID: s.member.PersonID, Subject: s.member.Subject, DisplayName: s.member.DisplayName, Email: s.member.Email, Pending: s.member.Subject == nil, AvatarVersion: s.member.AvatarVersion}
s.member, err = a.store.UpsertMember(s.r.Context(), in, s.now, true)
return false, err
Expand Down Expand Up @@ -79,6 +81,7 @@ func (a *API) me(s *request) (any, int, error) {
}
if linked {
if err := a.refreshMembers(s); err != nil {
requestlog.SetOutcome(s.r, "degraded", "member_refresh_failed")
slog.DebugContext(s.r.Context(), "peerbonus member refresh failed", "error", err)
}
}
Expand Down Expand Up @@ -171,6 +174,7 @@ func (a *API) recipient(s *request, personID string) (domain.Member, error) {
}
member, lookupErr := a.store.MemberByPersonID(s.r.Context(), personID)
if lookupErr == nil {
requestlog.SetOutcome(s.r, "degraded", "directory_unavailable")
return member, nil
}
if !errors.Is(lookupErr, domain.ErrNotFound) {
Expand Down
4 changes: 4 additions & 0 deletions cmd/server/internal/api/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (

contract "github.com/appthrust/appserver-go/appserver/contract/directory"
"github.com/appthrust/appserver-go/appserver/httpx"
"github.com/appthrust/appserver-go/appserver/requestlog"
"github.com/appthrust/peerbonus/cmd/server/internal/domain"
)

Expand Down Expand Up @@ -37,6 +38,9 @@ func (a *API) adminNetwork(s *request) (any, int, error) {
people, directoryErr = a.loadDirectoryPeople(s)
}
}
if directoryErr != nil {
requestlog.SetOutcome(s.r, "degraded", "directory_unavailable")
}
result := mergeNetwork(facts, people, groups, group, directoryErr == nil)
return renderNetwork(result), 200, nil
}
Expand Down
4 changes: 4 additions & 0 deletions cmd/server/internal/api/profile.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package api

import "github.com/appthrust/appserver-go/appserver/requestlog"

func (a *API) member(s *request) (any, int, error) {
member, err := a.store.MemberByID(s.r.Context(), s.r.PathValue("id"))
if err != nil {
Expand All @@ -12,6 +14,8 @@ func (a *API) member(s *request) (any, int, error) {
groups := []RecipientGroup{}
if profile, err := a.loadDirectoryProfile(s, member.PersonID); err == nil {
groups = directGroups(profile)
} else {
requestlog.SetOutcome(s.r, "degraded", "directory_profile_unavailable")
}
return map[string]any{"member": a.renderMember(member), "groups": groups, "stats": a.renderMemberStats(stats)}, 200, nil
}
2 changes: 2 additions & 0 deletions cmd/server/internal/api/recipients.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

contract "github.com/appthrust/appserver-go/appserver/contract/directory"
"github.com/appthrust/appserver-go/appserver/link"
"github.com/appthrust/appserver-go/appserver/requestlog"
"github.com/appthrust/peerbonus/cmd/server/internal/domain"
)

Expand Down Expand Up @@ -165,6 +166,7 @@ func (a *API) recipients(s *request) (any, int, error) {
if !errors.Is(err, link.ErrUnavailable) && !errors.Is(err, link.ErrAbsent) && !errors.As(err, &denied) {
return nil, 0, err
}
requestlog.SetOutcome(s.r, "degraded", "directory_unavailable")
personID := data.Me.PersonID
if personID == "" {
personID = s.member.PersonID
Expand Down
14 changes: 10 additions & 4 deletions cmd/server/internal/api/slack_admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"time"

"github.com/appthrust/appserver-go/appserver/httpx"
"github.com/appthrust/appserver-go/appserver/requestlog"
"github.com/appthrust/peerbonus/cmd/server/internal/domain"
"github.com/appthrust/peerbonus/cmd/server/internal/slack"
"github.com/appthrust/peerbonus/cmd/server/internal/store"
Expand Down Expand Up @@ -56,26 +57,31 @@ func newSlackInboundClient(origin, projectID string, transport http.RoundTripper
}
}

func unavailableSlackInbound(r *http.Request) *slackInboundResponse {
requestlog.SetOutcome(r, "degraded", "platform_unavailable")
return &slackInboundResponse{Reason: new("platform_unavailable")}
}

func (a *API) discoverSlackInbound(s *request) *slackInboundResponse {
if a.slackInbound == nil {
return nil
}
r, err := http.NewRequestWithContext(s.r.Context(), http.MethodGet, a.slackInbound.url, nil)
if err != nil {
return &slackInboundResponse{Reason: new("platform_unavailable")}
return unavailableSlackInbound(s.r)
}
r.Header.Set("Authorization", s.bearer)
r.Header.Set("Accept", "application/json")
response, err := a.slackInbound.http.Do(r)
if err != nil {
return &slackInboundResponse{Reason: new("platform_unavailable")}
return unavailableSlackInbound(s.r)
}
defer response.Body.Close()
if response.StatusCode == http.StatusNotFound {
return nil
}
if response.StatusCode != http.StatusOK {
return &slackInboundResponse{Reason: new("platform_unavailable")}
return unavailableSlackInbound(s.r)
}
var endpoint struct {
URL string `json:"url"`
Expand All @@ -86,7 +92,7 @@ func (a *API) discoverSlackInbound(s *request) *slackInboundResponse {
} `json:"conditions"`
}
if err := json.NewDecoder(io.LimitReader(response.Body, 8<<20)).Decode(&endpoint); err != nil {
return &slackInboundResponse{Reason: new("platform_unavailable")}
return unavailableSlackInbound(s.r)
}
result := &slackInboundResponse{Ready: endpoint.Ready}
if endpoint.URL != "" {
Expand Down
4 changes: 2 additions & 2 deletions cmd/server/internal/api/slack_admin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func slackAdminCall(t *testing.T, a *API, fn endpoint, method, path, body string
s := &request{r: r, w: w, bearer: r.Header.Get("Authorization"), now: a.now(), member: domain.Member{ID: "admin"}, access: platformclient.ProjectAccess{Roles: platformclient.Roles{IsConsoleAdmin: true}}}
result, code, err := a.admin(fn)(s)
if err != nil {
writeError(w, err)
writeError(w, r, err)
} else {
httpx.WriteJSON(w, code, result)
}
Expand Down Expand Up @@ -239,7 +239,7 @@ func TestSlackAdminVerifyFailures(t *testing.T) {
require.NotContains(t, string(body), "secret-token")
require.Contains(t, string(body), `"detail":"request_failed"`)
w := httptest.NewRecorder()
writeError(w, domain.ErrSlackTeamChanged)
writeError(w, httptest.NewRequest(http.MethodPost, "/admin/slack/verify", nil), domain.ErrSlackTeamChanged)
require.Equal(t, 409, w.Code)
slackAdminErrorCode(t, w.Body.Bytes(), "slack_team_changed")
}
Expand Down
8 changes: 8 additions & 0 deletions cmd/server/internal/slackinbound/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"strconv"
"strings"

"github.com/appthrust/appserver-go/appserver/requestlog"
"github.com/appthrust/peerbonus/cmd/server/internal/domain"
)

Expand All @@ -24,13 +25,15 @@ func (h *handler) command(w http.ResponseWriter, r *http.Request, locale domain.
return
}
if err != nil {
requestlog.SetOutcome(r, "failed", "member_lookup_failed")
http.Error(w, "Member unavailable", http.StatusServiceUnavailable)
return
}
switch strings.TrimSpace(form.Get("text")) {
case "balance":
remaining, err := h.store.GiveRemaining(r.Context(), member.ID, h.now())
if err != nil {
requestlog.SetOutcome(r, "failed", "balance_lookup_failed")
http.Error(w, "Balance unavailable", http.StatusServiceUnavailable)
return
}
Expand All @@ -43,20 +46,24 @@ func (h *handler) command(w http.ResponseWriter, r *http.Request, locale domain.
}
program, err := h.store.Program(r.Context())
if err != nil {
requestlog.SetOutcome(r, "failed", "program_lookup_failed")
http.Error(w, "Program unavailable", http.StatusServiceUnavailable)
return
}
period, err := h.store.CurrentPeriod(r.Context(), h.now())
if err != nil {
requestlog.SetOutcome(r, "failed", "period_lookup_failed")
http.Error(w, "Period unavailable", http.StatusServiceUnavailable)
return
}
view, err := json.Marshal(giveModal(member.ID, program, period, locale))
if err != nil {
requestlog.SetError(r, err)
http.Error(w, "Modal unavailable", http.StatusInternalServerError)
return
}
if err := h.slack.OpenView(r.Context(), form.Get("trigger_id"), view); err != nil {
requestlog.SetOutcome(r, "failed", "slack_open_view_failed")
http.Error(w, "Slack unavailable", http.StatusBadGateway)
return
}
Expand All @@ -76,6 +83,7 @@ type ephemeralResponse struct {

func (h *handler) commandReply(w http.ResponseWriter, r *http.Request, responseURL, text string) {
if err := h.respond(r.Context(), responseURL, ephemeralResponse{ResponseType: "ephemeral", Text: text}); err != nil {
requestlog.SetOutcome(r, "failed", "slack_response_failed")
http.Error(w, "Slack response unavailable", http.StatusBadGateway)
return
}
Expand Down
Loading