update deps; experiment: log security

vendor/gitlab.com/etke.cc/linkpearl/store/crypto.go

@@ -42,43 +42,43 @@ func (s *Store) GetAccount() (*crypto.OlmAccount, error) {
 
 // HasSession returns whether there is an Olm session for the given sender key.
 func (s *Store) HasSession(key id.SenderKey) bool {
-	s.log.Debug("check if olm session exists for the key %s", key)
+	s.log.Debug("check if olm session exists for the key %q", key)
 	return s.s.HasSession(key)
 }
 
 // GetSessions returns all the known Olm sessions for a sender key.
 func (s *Store) GetSessions(key id.SenderKey) (crypto.OlmSessionList, error) {
-	s.log.Debug("loading olm session for the key %s", key)
+	s.log.Debug("loading olm session for the key %q", key)
 	return s.s.GetSessions(key)
 }
 
 // GetLatestSession retrieves the Olm session for a given sender key from the database that has the largest ID.
 func (s *Store) GetLatestSession(key id.SenderKey) (*crypto.OlmSession, error) {
-	s.log.Debug("loading latest session for the key %s", key)
+	s.log.Debug("loading latest session for the key %q", key)
 	return s.s.GetLatestSession(key)
 }
 
 // AddSession persists an Olm session for a sender in the database.
 func (s *Store) AddSession(key id.SenderKey, session *crypto.OlmSession) error {
-	s.log.Debug("adding new olm session for the key %s", key)
+	s.log.Debug("adding new olm session for the key %q", key)
 	return s.s.AddSession(key, session)
 }
 
 // UpdateSession replaces the Olm session for a sender in the database.
 func (s *Store) UpdateSession(key id.SenderKey, session *crypto.OlmSession) error {
-	s.log.Debug("update olm session for the key %s", key)
+	s.log.Debug("update olm session for the key %q", key)
 	return s.s.UpdateSession(key, session)
 }
 
 // PutGroupSession stores an inbound Megolm group session for a room, sender and session.
 func (s *Store) PutGroupSession(roomID id.RoomID, senderKey id.SenderKey, sessionID id.SessionID, session *crypto.InboundGroupSession) error {
-	s.log.Debug("storing inbound group session for the room %s", roomID)
+	s.log.Debug("storing inbound group session for the room %q", roomID)
 	return s.s.PutGroupSession(roomID, senderKey, sessionID, session)
 }
 
 // GetGroupSession retrieves an inbound Megolm group session for a room, sender and session.
 func (s *Store) GetGroupSession(roomID id.RoomID, senderKey id.SenderKey, sessionID id.SessionID) (*crypto.InboundGroupSession, error) {
-	s.log.Debug("loading inbound group session for the room %s", roomID)
+	s.log.Debug("loading inbound group session for the room %q", roomID)
 	return s.s.GetGroupSession(roomID, senderKey, sessionID)
 }
 
@@ -98,7 +98,7 @@ func (s *Store) GetWithheldGroupSession(roomID id.RoomID, senderKey id.SenderKey
 // GetGroupSessionsForRoom gets all the inbound Megolm sessions for a specific room. This is used for creating key
 // export files. Unlike GetGroupSession, this should not return any errors about withheld keys.
 func (s *Store) GetGroupSessionsForRoom(roomID id.RoomID) ([]*crypto.InboundGroupSession, error) {
-	s.log.Debug("loading group session for the room %s", roomID)
+	s.log.Debug("loading group session for the room %q", roomID)
 	return s.s.GetGroupSessionsForRoom(roomID)
 }
 
@@ -143,31 +143,31 @@ func (s *Store) ValidateMessageIndex(senderKey id.SenderKey, sessionID id.Sessio
 
 // GetDevices returns a map of device IDs to device identities, including the identity and signing keys, for a given user ID.
 func (s *Store) GetDevices(userID id.UserID) (map[id.DeviceID]*id.Device, error) {
-	s.log.Debug("loading devices of the %s", userID)
+	s.log.Debug("loading devices of the %q", userID)
 	return s.s.GetDevices(userID)
 }
 
 // GetDevice returns the device dentity for a given user and device ID.
 func (s *Store) GetDevice(userID id.UserID, deviceID id.DeviceID) (*id.Device, error) {
-	s.log.Debug("loading device %s for the %s", deviceID, userID)
+	s.log.Debug("loading device %q for the %q", deviceID, userID)
 	return s.s.GetDevice(userID, deviceID)
 }
 
 // FindDeviceByKey finds a specific device by its sender key.
 func (s *Store) FindDeviceByKey(userID id.UserID, identityKey id.IdentityKey) (*id.Device, error) {
-	s.log.Debug("loading device of the %s by the key %s", userID, identityKey)
+	s.log.Debug("loading device of the %q by the key %q", userID, identityKey)
 	return s.s.FindDeviceByKey(userID, identityKey)
 }
 
 // PutDevice stores a single device for a user, replacing it if it exists already.
 func (s *Store) PutDevice(userID id.UserID, device *id.Device) error {
-	s.log.Debug("storing device of the %s", userID)
+	s.log.Debug("storing device of the %q", userID)
 	return s.s.PutDevice(userID, device)
 }
 
 // PutDevices stores the device identity information for the given user ID.
 func (s *Store) PutDevices(userID id.UserID, devices map[id.DeviceID]*id.Device) error {
-	s.log.Debug("storing devices of the %s", userID)
+	s.log.Debug("storing devices of the %q", userID)
 	return s.s.PutDevices(userID, devices)
 }
 
@@ -179,13 +179,13 @@ func (s *Store) FilterTrackedUsers(users []id.UserID) ([]id.UserID, error) {
 
 // PutCrossSigningKey stores a cross-signing key of some user along with its usage.
 func (s *Store) PutCrossSigningKey(userID id.UserID, usage id.CrossSigningUsage, key id.Ed25519) error {
-	s.log.Debug("storing crosssigning key of the %s", userID)
+	s.log.Debug("storing crosssigning key of the %q", userID)
 	return s.s.PutCrossSigningKey(userID, usage, key)
 }
 
 // GetCrossSigningKeys retrieves a user's stored cross-signing keys.
 func (s *Store) GetCrossSigningKeys(userID id.UserID) (map[id.CrossSigningUsage]id.CrossSigningKey, error) {
-	s.log.Debug("loading crosssigning keys of the %s", userID)
+	s.log.Debug("loading crosssigning keys of the %q", userID)
 	return s.s.GetCrossSigningKeys(userID)
 }
 
@@ -209,6 +209,6 @@ func (s *Store) IsKeySignedBy(userID id.UserID, key id.Ed25519, signerID id.User
 
 // DropSignaturesByKey deletes the signatures made by the given user and key from the store. It returns the number of signatures deleted.
 func (s *Store) DropSignaturesByKey(userID id.UserID, key id.Ed25519) (int64, error) {
-	s.log.Debug("removing signatures by the %s/%s", userID, key)
+	s.log.Debug("removing signatures by the %q/%q", userID, key)
 	return s.s.DropSignaturesByKey(userID, key)
 }

vendor/gitlab.com/etke.cc/linkpearl/store/linkpearl.go

@@ -20,7 +20,7 @@ func (s *Store) IsEncrypted(roomID id.RoomID) bool {
 		return false
 	}
 
-	s.log.Debug("checking if room %s is encrypted", roomID)
+	s.log.Debug("checking if room %q is encrypted", roomID)
 	return s.GetEncryptionEvent(roomID) != nil
 }
 
@@ -79,7 +79,7 @@ func (s *Store) SetEncryptionEvent(evt *event.Event) {
 
 // SetMembership saves room members
 func (s *Store) SetMembership(evt *event.Event) {
-	s.log.Debug("saving membership event for %s", evt.RoomID)
+	s.log.Debug("saving membership event for %q", evt.RoomID)
 	tx, err := s.db.Begin()
 	if err != nil {
 		s.log.Error("cannot begin transaction: %v", err)
@@ -127,7 +127,7 @@ func (s *Store) SetMembership(evt *event.Event) {
 
 // GetRoomMembers ...
 func (s *Store) GetRoomMembers(roomID id.RoomID) []id.UserID {
-	s.log.Debug("loading room members of %s", roomID)
+	s.log.Debug("loading room members of %q", roomID)
 	query := "SELECT user_id FROM room_members WHERE room_id = $1"
 	rows, err := s.db.Query(query, roomID)
 	users := make([]id.UserID, 0)
@@ -148,7 +148,7 @@ func (s *Store) GetRoomMembers(roomID id.RoomID) []id.UserID {
 
 // SaveSession to DB
 func (s *Store) SaveSession(userID id.UserID, deviceID id.DeviceID, accessToken string) {
-	s.log.Debug("saving session credentials of %s/%s", userID, deviceID)
+	s.log.Debug("saving session credentials of %q/%q", userID, deviceID)
 	tx, err := s.db.Begin()
 	if err != nil {
 		s.log.Error("cannot begin transaction: %v", err)

vendor/gitlab.com/etke.cc/linkpearl/store/state.go

@@ -16,7 +16,7 @@ func (s *Store) GetEncryptionEvent(roomID id.RoomID) *event.EncryptionEventConte
 	if !s.encryption {
 		return nil
 	}
-	s.log.Debug("finding encryption event of %s", roomID)
+	s.log.Debug("finding encryption event of %q", roomID)
 	query := "SELECT encryption_event FROM rooms WHERE room_id = $1"
 	row := s.db.QueryRow(query, roomID)
 
@@ -28,7 +28,7 @@ func (s *Store) GetEncryptionEvent(roomID id.RoomID) *event.EncryptionEventConte
 	}
 	var encryptionEvent event.EncryptionEventContent
 	if err := json.Unmarshal(encryptionEventJSON, &encryptionEvent); err != nil {
-		s.log.Debug("cannot unmarshal encryption event: %s", err)
+		s.log.Debug("cannot unmarshal encryption event: %q", err)
 		return nil
 	}
 
@@ -40,12 +40,12 @@ func (s *Store) FindSharedRooms(userID id.UserID) []id.RoomID {
 	if !s.encryption {
 		return nil
 	}
-	s.log.Debug("loading shared rooms for %s", userID)
+	s.log.Debug("loading shared rooms for %q", userID)
 	query := "SELECT room_id FROM room_members WHERE user_id = $1"
 	rows, queryErr := s.db.Query(query, userID)
 	rooms := make([]id.RoomID, 0)
 	if queryErr != nil {
-		s.log.Error("cannot load room members: %s", queryErr)
+		s.log.Error("cannot load room members: %q", queryErr)
 		return rooms
 	}
 	defer rows.Close()

vendor/gitlab.com/etke.cc/linkpearl/store/storer.go

@@ -10,7 +10,7 @@ import (
 
 // SaveFilterID to DB
 func (s *Store) SaveFilterID(userID id.UserID, filterID string) {
-	s.log.Debug("saving filter ID %s for %s", filterID, userID)
+	s.log.Debug("saving filter ID %q for %q", filterID, userID)
 	tx, err := s.db.Begin()
 	if err != nil {
 		s.log.Error("cannot begin transaction: %v", err)
@@ -52,12 +52,12 @@ func (s *Store) SaveFilterID(userID id.UserID, filterID string) {
 
 // LoadFilterID from DB
 func (s *Store) LoadFilterID(userID id.UserID) string {
-	s.log.Debug("loading filter ID for %s", userID)
+	s.log.Debug("loading filter ID for %q", userID)
 	query := "SELECT filter_id FROM user_filter_ids WHERE user_id = $1"
 	row := s.db.QueryRow(query, userID)
 	var filterID string
 	if err := row.Scan(&filterID); err != nil {
-		s.log.Error("cannot load filter ID: %s", err)
+		s.log.Error("cannot load filter ID: %q", err)
 		return ""
 	}
 	return filterID
@@ -65,7 +65,7 @@ func (s *Store) LoadFilterID(userID id.UserID) string {
 
 // SaveNextBatch to DB
 func (s *Store) SaveNextBatch(userID id.UserID, nextBatchToken string) {
-	s.log.Debug("saving next batch token for %s", userID)
+	s.log.Debug("saving next batch token for %q", userID)
 	tx, err := s.db.Begin()
 	if err != nil {
 		s.log.Error("cannot begin transaction: %v", err)
@@ -103,7 +103,7 @@ func (s *Store) SaveNextBatch(userID id.UserID, nextBatchToken string) {
 
 // LoadNextBatch from DB
 func (s *Store) LoadNextBatch(userID id.UserID) string {
-	s.log.Debug("loading next batch token for %s", userID)
+	s.log.Debug("loading next batch token for %q", userID)
 	query := "SELECT next_batch_token FROM user_batch_tokens WHERE user_id = $1"
 	row := s.db.QueryRow(query, userID)
 	var batchToken string
@@ -116,11 +116,11 @@ func (s *Store) LoadNextBatch(userID id.UserID) string {
 
 // SaveRoom to DB, not implemented
 func (s *Store) SaveRoom(room *mautrix.Room) {
-	s.log.Debug("saving room %s (stub, not implemented)", room.ID)
+	s.log.Debug("saving room %q (stub, not implemented)", room.ID)
 }
 
 // LoadRoom from DB, not implemented
 func (s *Store) LoadRoom(roomID id.RoomID) *mautrix.Room {
-	s.log.Debug("loading room %s (stub, not implemented)", roomID)
+	s.log.Debug("loading room %q (stub, not implemented)", roomID)
 	return mautrix.NewRoom(roomID)
 }