diff --git a/pkg/migrations/mls/20240814032323_remove-inbox-id-from-installation.down.sql b/pkg/migrations/mls/20240814032323_remove-inbox-id-from-installation.down.sql new file mode 100644 index 00000000..cc72f6bf --- /dev/null +++ b/pkg/migrations/mls/20240814032323_remove-inbox-id-from-installation.down.sql @@ -0,0 +1,7 @@ +SET statement_timeout = 0; + +--bun:split +ALTER TABLE installations + ADD COLUMN inbox_id BYTEA NOT NULL, + ADD COLUMN expiration BIGINT NOT NULL; + diff --git a/pkg/migrations/mls/20240814032323_remove-inbox-id-from-installation.up.sql b/pkg/migrations/mls/20240814032323_remove-inbox-id-from-installation.up.sql new file mode 100644 index 00000000..9b12bee1 --- /dev/null +++ b/pkg/migrations/mls/20240814032323_remove-inbox-id-from-installation.up.sql @@ -0,0 +1,7 @@ +SET statement_timeout = 0; + +--bun:split +ALTER TABLE installations + DROP COLUMN IF EXISTS inbox_id, + DROP COLUMN IF EXISTS expiration; + diff --git a/pkg/mls/api/v1/service.go b/pkg/mls/api/v1/service.go index 56c18c67..b3003ca1 100644 --- a/pkg/mls/api/v1/service.go +++ b/pkg/mls/api/v1/service.go @@ -113,6 +113,11 @@ func (s *Service) HandleIncomingWakuRelayMessage(wakuMsg *wakupb.WakuMessage) er return nil } +/* +* +DEPRECATED: Use UploadKeyPackage instead +* +*/ func (s *Service) RegisterInstallation(ctx context.Context, req *mlsv1.RegisterInstallationRequest) (*mlsv1.RegisterInstallationResponse, error) { if err := validateRegisterInstallationRequest(req); err != nil { return nil, err @@ -126,9 +131,9 @@ func (s *Service) RegisterInstallation(ctx context.Context, req *mlsv1.RegisterI if len(results) != 1 { return nil, status.Errorf(codes.Internal, "unexpected number of results: %d", len(results)) } + installationKey := results[0].InstallationKey - credential := results[0].Credential - if err = s.store.CreateInstallation(ctx, installationKey, credential.InboxId, req.KeyPackage.KeyPackageTlsSerialized, results[0].Expiration); err != nil { + if err = s.store.CreateOrUpdateInstallation(ctx, installationKey, req.KeyPackage.KeyPackageTlsSerialized); err != nil { return nil, err } return &mlsv1.RegisterInstallationResponse{ @@ -178,9 +183,8 @@ func (s *Service) UploadKeyPackage(ctx context.Context, req *mlsv1.UploadKeyPack } installationId := validationResults[0].InstallationKey - expiration := validationResults[0].Expiration - if err = s.store.UpdateKeyPackage(ctx, installationId, keyPackageBytes, expiration); err != nil { + if err = s.store.CreateOrUpdateInstallation(ctx, installationId, keyPackageBytes); err != nil { return nil, status.Errorf(codes.Internal, "failed to insert key packages: %s", err) } diff --git a/pkg/mls/api/v1/service_test.go b/pkg/mls/api/v1/service_test.go index 479bdd78..a02615ad 100644 --- a/pkg/mls/api/v1/service_test.go +++ b/pkg/mls/api/v1/service_test.go @@ -81,13 +81,13 @@ func TestRegisterInstallation(t *testing.T) { defer cleanup() installationId := test.RandomBytes(32) - inboxId := test.RandomInboxId() + keyPackage := []byte("test") - mockValidateInboxIdKeyPackages(mlsValidationService, installationId, inboxId) + mockValidateInboxIdKeyPackages(mlsValidationService, installationId, test.RandomInboxId()) res, err := svc.RegisterInstallation(ctx, &mlsv1.RegisterInstallationRequest{ KeyPackage: &mlsv1.KeyPackageUpload{ - KeyPackageTlsSerialized: []byte("test"), + KeyPackageTlsSerialized: keyPackage, }, IsInboxIdCredential: false, }) @@ -98,7 +98,8 @@ func TestRegisterInstallation(t *testing.T) { installation, err := queries.New(mlsDb.DB).GetInstallation(ctx, installationId) require.NoError(t, err) - require.Equal(t, inboxId, installation.InboxID) + require.Equal(t, installationId, installation.ID) + require.Equal(t, []byte("test"), installation.KeyPackage) } func TestRegisterInstallationError(t *testing.T) { diff --git a/pkg/mls/store/queries.sql b/pkg/mls/store/queries.sql index 561c69ae..d54a7e45 100644 --- a/pkg/mls/store/queries.sql +++ b/pkg/mls/store/queries.sql @@ -83,33 +83,24 @@ WHERE (address, inbox_id, association_sequence_id) =( address, inbox_id); --- name: CreateInstallation :exec -INSERT INTO installations(id, created_at, updated_at, inbox_id, key_package, expiration) - VALUES (@id, @created_at, @updated_at, decode(@inbox_id, 'hex'), @key_package, @expiration); +-- name: CreateOrUpdateInstallation :exec +INSERT INTO installations(id, created_at, updated_at, key_package) + VALUES (@id, @created_at, @updated_at, @key_package) +ON CONFLICT (id) + DO UPDATE SET + key_package = @key_package, updated_at = @updated_at; -- name: GetInstallation :one SELECT id, created_at, updated_at, - encode(inbox_id, 'hex') AS inbox_id, - key_package, - expiration + key_package FROM installations WHERE id = $1; --- name: UpdateKeyPackage :execrows -UPDATE - installations -SET - key_package = @key_package, - updated_at = @updated_at, - expiration = @expiration -WHERE - id = @id; - -- name: FetchKeyPackages :many SELECT id, diff --git a/pkg/mls/store/queries/models.go b/pkg/mls/store/queries/models.go index 462220c6..3943a55a 100644 --- a/pkg/mls/store/queries/models.go +++ b/pkg/mls/store/queries/models.go @@ -35,9 +35,7 @@ type Installation struct { ID []byte CreatedAt int64 UpdatedAt int64 - InboxID []byte KeyPackage []byte - Expiration int64 } type WelcomeMessage struct { diff --git a/pkg/mls/store/queries/queries.sql.go b/pkg/mls/store/queries/queries.sql.go index 33428a08..90b51b14 100644 --- a/pkg/mls/store/queries/queries.sql.go +++ b/pkg/mls/store/queries/queries.sql.go @@ -13,28 +13,27 @@ import ( "github.com/lib/pq" ) -const createInstallation = `-- name: CreateInstallation :exec -INSERT INTO installations(id, created_at, updated_at, inbox_id, key_package, expiration) - VALUES ($1, $2, $3, decode($4, 'hex'), $5, $6) +const createOrUpdateInstallation = `-- name: CreateOrUpdateInstallation :exec +INSERT INTO installations(id, created_at, updated_at, key_package) + VALUES ($1, $2, $3, $4) +ON CONFLICT (id) + DO UPDATE SET + key_package = $4, updated_at = $3 ` -type CreateInstallationParams struct { +type CreateOrUpdateInstallationParams struct { ID []byte CreatedAt int64 UpdatedAt int64 - InboxID string KeyPackage []byte - Expiration int64 } -func (q *Queries) CreateInstallation(ctx context.Context, arg CreateInstallationParams) error { - _, err := q.db.ExecContext(ctx, createInstallation, +func (q *Queries) CreateOrUpdateInstallation(ctx context.Context, arg CreateOrUpdateInstallationParams) error { + _, err := q.db.ExecContext(ctx, createOrUpdateInstallation, arg.ID, arg.CreatedAt, arg.UpdatedAt, - arg.InboxID, arg.KeyPackage, - arg.Expiration, ) return err } @@ -305,34 +304,21 @@ SELECT id, created_at, updated_at, - encode(inbox_id, 'hex') AS inbox_id, - key_package, - expiration + key_package FROM installations WHERE id = $1 ` -type GetInstallationRow struct { - ID []byte - CreatedAt int64 - UpdatedAt int64 - InboxID string - KeyPackage []byte - Expiration int64 -} - -func (q *Queries) GetInstallation(ctx context.Context, id []byte) (GetInstallationRow, error) { +func (q *Queries) GetInstallation(ctx context.Context, id []byte) (Installation, error) { row := q.db.QueryRowContext(ctx, getInstallation, id) - var i GetInstallationRow + var i Installation err := row.Scan( &i.ID, &i.CreatedAt, &i.UpdatedAt, - &i.InboxID, &i.KeyPackage, - &i.Expiration, ) return i, err } @@ -786,34 +772,3 @@ func (q *Queries) RevokeAddressFromLog(ctx context.Context, arg RevokeAddressFro _, err := q.db.ExecContext(ctx, revokeAddressFromLog, arg.RevocationSequenceID, arg.Address, arg.InboxID) return err } - -const updateKeyPackage = `-- name: UpdateKeyPackage :execrows -UPDATE - installations -SET - key_package = $1, - updated_at = $2, - expiration = $3 -WHERE - id = $4 -` - -type UpdateKeyPackageParams struct { - KeyPackage []byte - UpdatedAt int64 - Expiration int64 - ID []byte -} - -func (q *Queries) UpdateKeyPackage(ctx context.Context, arg UpdateKeyPackageParams) (int64, error) { - result, err := q.db.ExecContext(ctx, updateKeyPackage, - arg.KeyPackage, - arg.UpdatedAt, - arg.Expiration, - arg.ID, - ) - if err != nil { - return 0, err - } - return result.RowsAffected() -} diff --git a/pkg/mls/store/store.go b/pkg/mls/store/store.go index 0aa62af4..75cfec87 100644 --- a/pkg/mls/store/store.go +++ b/pkg/mls/store/store.go @@ -39,8 +39,7 @@ type IdentityStore interface { type MlsStore interface { IdentityStore - CreateInstallation(ctx context.Context, installationId []byte, inboxId string, keyPackage []byte, expiration uint64) error - UpdateKeyPackage(ctx context.Context, installationId, keyPackage []byte, expiration uint64) error + CreateOrUpdateInstallation(ctx context.Context, installationId []byte, keyPackage []byte) error FetchKeyPackages(ctx context.Context, installationIds [][]byte) ([]queries.FetchKeyPackagesRow, error) InsertGroupMessage(ctx context.Context, groupId []byte, data []byte) (*queries.GroupMessage, error) InsertWelcomeMessage(ctx context.Context, installationId []byte, data []byte, hpkePublicKey []byte) (*queries.WelcomeMessage, error) @@ -246,38 +245,17 @@ func (s *Store) GetInboxLogs(ctx context.Context, batched_req *identity.GetIdent } // Creates the installation and last resort key package -func (s *Store) CreateInstallation(ctx context.Context, installationId []byte, inboxId string, keyPackage []byte, expiration uint64) error { - createdAt := nowNs() +func (s *Store) CreateOrUpdateInstallation(ctx context.Context, installationId []byte, keyPackage []byte) error { + now := nowNs() - return s.queries.CreateInstallation(ctx, queries.CreateInstallationParams{ + return s.queries.CreateOrUpdateInstallation(ctx, queries.CreateOrUpdateInstallationParams{ ID: installationId, - CreatedAt: createdAt, - InboxID: inboxId, + CreatedAt: now, + UpdatedAt: now, KeyPackage: keyPackage, - Expiration: int64(expiration), }) } -// Insert a new key package, ignoring any that may already exist -func (s *Store) UpdateKeyPackage(ctx context.Context, installationId, keyPackage []byte, expiration uint64) error { - rowsUpdated, err := s.queries.UpdateKeyPackage(ctx, queries.UpdateKeyPackageParams{ - ID: installationId, - UpdatedAt: nowNs(), - KeyPackage: keyPackage, - Expiration: int64(expiration), - }) - - if err != nil { - return err - } - - if rowsUpdated == 0 { - return errors.New("installation id unknown") - } - - return nil -} - func (s *Store) FetchKeyPackages(ctx context.Context, installationIds [][]byte) ([]queries.FetchKeyPackagesRow, error) { return s.queries.FetchKeyPackages(ctx, installationIds) } diff --git a/pkg/mls/store/store_test.go b/pkg/mls/store/store_test.go index 1ff9f73d..8cc32ac2 100644 --- a/pkg/mls/store/store_test.go +++ b/pkg/mls/store/store_test.go @@ -169,9 +169,8 @@ func TestCreateInstallation(t *testing.T) { ctx := context.Background() installationId := test.RandomBytes(32) - inboxId := test.RandomInboxId() - err := store.CreateInstallation(ctx, installationId, inboxId, test.RandomBytes(32), 0) + err := store.CreateOrUpdateInstallation(ctx, installationId, test.RandomBytes(32)) require.NoError(t, err) installationFromDb, err := store.queries.GetInstallation(ctx, installationId) @@ -185,21 +184,23 @@ func TestUpdateKeyPackage(t *testing.T) { ctx := context.Background() installationId := test.RandomBytes(32) - inboxId := test.RandomInboxId() keyPackage := test.RandomBytes(32) - err := store.CreateInstallation(ctx, installationId, inboxId, keyPackage, 0) + err := store.CreateOrUpdateInstallation(ctx, installationId, keyPackage) + require.NoError(t, err) + afterCreate, err := store.queries.GetInstallation(ctx, installationId) require.NoError(t, err) keyPackage2 := test.RandomBytes(32) - err = store.UpdateKeyPackage(ctx, installationId, keyPackage2, 1) + err = store.CreateOrUpdateInstallation(ctx, installationId, keyPackage2) require.NoError(t, err) installationFromDb, err := store.queries.GetInstallation(ctx, installationId) require.NoError(t, err) require.Equal(t, keyPackage2, installationFromDb.KeyPackage) - require.Equal(t, int64(1), installationFromDb.Expiration) + require.Greater(t, installationFromDb.UpdatedAt, afterCreate.UpdatedAt) + require.Equal(t, installationFromDb.CreatedAt, afterCreate.CreatedAt) } func TestConsumeLastResortKeyPackage(t *testing.T) { @@ -209,9 +210,8 @@ func TestConsumeLastResortKeyPackage(t *testing.T) { ctx := context.Background() installationId := test.RandomBytes(32) keyPackage := test.RandomBytes(32) - inboxId := test.RandomInboxId() - err := store.CreateInstallation(ctx, installationId, inboxId, keyPackage, 0) + err := store.CreateOrUpdateInstallation(ctx, installationId, keyPackage) require.NoError(t, err) fetchResult, err := store.FetchKeyPackages(ctx, [][]byte{installationId}) diff --git a/pkg/mlsvalidate/service.go b/pkg/mlsvalidate/service.go index da16820a..af03ba84 100644 --- a/pkg/mlsvalidate/service.go +++ b/pkg/mlsvalidate/service.go @@ -87,11 +87,6 @@ func (s *MLSValidationServiceImpl) GetAssociationState(ctx context.Context, oldU }, nil } -type KeyAndExpiration struct { - InstallationId []byte - Expiration uint64 -} - func (s *MLSValidationServiceImpl) ValidateInboxIdKeyPackages(ctx context.Context, keyPackages [][]byte) ([]InboxIdValidationResult, error) { req := makeValidateKeyPackageRequest(keyPackages, true) @@ -100,69 +95,20 @@ func (s *MLSValidationServiceImpl) ValidateInboxIdKeyPackages(ctx context.Contex return nil, err } - keyPackageCredential := make(map[string]KeyAndExpiration, len(response.Responses)) - identityUpdatesRequest := make([]*identity.GetIdentityUpdatesRequest_Request, len(response.Responses)) - for i, response := range response.Responses { - if !response.IsOk { - return nil, fmt.Errorf("validation failed with error %s", response.ErrorMessage) - } - keyPackageCredential[response.Credential.InboxId] = KeyAndExpiration{ - InstallationId: response.InstallationPublicKey, - Expiration: response.Expiration, - } - identityUpdatesRequest[i] = &identity.GetIdentityUpdatesRequest_Request{ - InboxId: response.Credential.InboxId, - SequenceId: 0, - } - } - - // TODO: do we need to take sequence ID Into account? - request := &identity.GetIdentityUpdatesRequest{Requests: identityUpdatesRequest} - identity_updates, err := s.identityStore.GetInboxLogs(ctx, request) - if err != nil { - return nil, err - } - - validation_requests := make([]*svc.ValidateInboxIdsRequest_ValidationRequest, len(identity_updates.Responses)) - for i, response := range identity_updates.Responses { - validation_requests[i] = makeValidationRequest(response, keyPackageCredential) - } - - validation_request := svc.ValidateInboxIdsRequest{Requests: validation_requests} - validate_inbox_response, err := s.grpcClient.ValidateInboxIds(ctx, &validation_request) - if err != nil { - return nil, err - } - out := make([]InboxIdValidationResult, len(response.Responses)) - for i, response := range validate_inbox_response.Responses { + for i, response := range response.Responses { if !response.IsOk { return nil, fmt.Errorf("validation failed with error %s", response.ErrorMessage) } out[i] = InboxIdValidationResult{ - InstallationKey: keyPackageCredential[response.InboxId].InstallationId, - Credential: &identity_proto.MlsCredential{InboxId: response.InboxId}, - Expiration: keyPackageCredential[response.InboxId].Expiration, + InstallationKey: response.InstallationPublicKey, + Credential: nil, + Expiration: response.Expiration, } } return out, nil } -func makeValidationRequest(update *identity.GetIdentityUpdatesResponse_Response, pub_keys map[string]KeyAndExpiration) *svc.ValidateInboxIdsRequest_ValidationRequest { - identity_updates := make([]*associations.IdentityUpdate, len(update.Updates)) - for i, identity_log := range update.Updates { - identity_updates[i] = identity_log.Update - } - - out := svc.ValidateInboxIdsRequest_ValidationRequest{ - Credential: &identity_proto.MlsCredential{InboxId: update.InboxId}, - InstallationPublicKey: pub_keys[update.InboxId].InstallationId, - IdentityUpdates: identity_updates, - } - - return &out -} - func (s *MLSValidationServiceImpl) ValidateV3KeyPackages(ctx context.Context, keyPackages [][]byte) ([]IdentityValidationResult, error) { req := makeValidateKeyPackageRequest(keyPackages, false)