Skip to content

caldav: handle shared calendar signature verification gracefully #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haurucknde wants to merge 1 commit into
base: main
Choose a base branch
from
Open

caldav: handle shared calendar signature verification gracefully #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions caldav/caldav.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"io"
"log"
"net/http"
"strings"
"sync"
Expand Down Expand Up @@ -59,7 +60,11 @@ func readEventCard(event *ical.Event, eventCard protonmail.CalendarEventCard, us
}*/

if err := md.SignatureError; err != nil {
return nil, fmt.Errorf("caldav/readEventCard: signature error: (%w)", err)
// Signature verification can fail for shared calendar events when
// the signer's key isn't available (e.g. different user, rotated
// keys). Log the error but continue — the event data is still
// readable, we just can't verify who signed it.
log.Printf("caldav/readEventCard: signature verification failed (non-fatal): %v", err)
}

children := decoded.Events()
Expand Down Expand Up @@ -359,14 +364,15 @@ func (b *backend) QueryCalendarObjects(ctx context.Context, path string, query *
return nil, fmt.Errorf("caldav/QueryCalendarObjects: error decrypting keyring: (%w)", err)
}

cos := make([]caldav.CalendarObject, len(events))
var cos []caldav.CalendarObject
for i, event := range events {
co, err := getCalendarObject(b, calId, calKr, event, bootstrap.CalendarSettings)
if err != nil {
return nil, fmt.Errorf("caldav/QueryCalendarObjects: error creating calendar object for event %d: (%w)", i, err)
log.Printf("caldav/QueryCalendarObjects: skipping event %d (ID: %s) due to error: %v", i, event.ID, err)
continue
}

cos[i] = *co
cos = append(cos, *co)
}

return cos, nil
Expand Down