Page MenuHomePhabricator
Differential D11184

[lib] Compute hashes only from one keyserver
ClosedPublic
Actions

Authored by tomek on Feb 27 2024, 5:59 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 18, 8:02 PM
Unknown Object (File)
Feb 15 2025, 11:32 PM
Unknown Object (File)
Feb 15 2025, 11:32 PM
Unknown Object (File)
Feb 15 2025, 11:32 PM
Unknown Object (File)
Feb 15 2025, 11:32 PM
Unknown Object (File)
Feb 15 2025, 11:31 PM
Unknown Object (File)
Feb 14 2025, 4:06 PM
Unknown Object (File)
Feb 11 2025, 3:29 PM
View All 76 Files
Subscribers
ashoat

Details

Reviewers
michal
atul
inka
kamil
Commits
rCOMMacec0aca765a: [lib] Compute hashes only from one keyserver
Summary

When doing state check we should only compute hashes for entities from a keyserver performing the check.

https://linear.app/comm/issue/ENG-3915/refactor-generating-a-response-to-serverrequesttypescheck-state

Depends on D11183

Test Plan

Checked that the state sync still works - modified a thread and an entry and verified that the sync updates values properly on the client side.
Modified state selectors in entries and threads specs to return one more entity from a different keyserver and verified that the hashes were still correct (also performed the test mentioned earlier with the modified code).

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

tomek created this revision.Feb 27 2024, 5:59 AM
Herald added a subscriber: ashoat. · View Herald TranscriptFeb 27 2024, 5:59 AM
Harbormaster completed remote builds in B27200: Diff 37649.Feb 27 2024, 6:27 AM
tomek requested review of this revision.Feb 27 2024, 6:27 AM
tomek added a child revision: D11185: [lib] Check keyserver connection in request-response-handler.Feb 27 2024, 6:27 AM
michal accepted this revision.Feb 28 2024, 6:06 AM
michal added inline comments.
lib/shared/state-sync/threads-state-sync-spec.js
45 ↗(On Diff #37649)

Nit: this isn't a threadInfo but a thread hash.

This revision is now accepted and ready to land.Feb 28 2024, 6:06 AM
tomek updated this revision to Diff 37700.Feb 29 2024, 7:11 AM
tomek marked an inline comment as done.

Fix prop name

Harbormaster failed remote builds in B27238: Diff 37700!Feb 29 2024, 7:24 AM
Harbormaster completed remote builds in B27238: Diff 37700.Feb 29 2024, 7:32 AM
Closed by commit rCOMMacec0aca765a: [lib] Compute hashes only from one keyserver (authored by tomek). · Explain WhyFeb 29 2024, 7:42 AM
This revision was automatically updated to reflect the committed changes.
tomek added a commit: rCOMMacec0aca765a: [lib] Compute hashes only from one keyserver.

Revision Contents
Changeset List

PathSize
lib/
selectors/
12 lines
shared/
state-sync/
30 lines
6 lines
20 lines

Diff 37705

View Options

lib/selectors/socket-selectors.js

locals {
mariadb_database_name = local.local_with_default_environment_vars.COMM_DATABASE_DATABASE
mariadb_username = local.local_with_default_environment_vars.COMM_DATABASE_USER
mariadb_password = local.local_with_default_environment_vars.COMM_DATABASE_PASSWORD
mariadb_port = jsondecode(local.local_with_default_environment_vars.COMM_DATABASE_PORT)
}
# MariaDB Security Group # MariaDB Security Group
resource "aws_security_group" "keyserver_mariadb_security_group" { resource "aws_security_group" "keyserver_mariadb_security_group" {
name = "keyserver-mariadb-sg" name = "keyserver-mariadb-sg"
description = "Allow inbound traffic on port 3307 and all outbound traffic" description = "Allow inbound traffic on port 3307 and all outbound traffic"
vpc_id = local.vpc_id vpc_id = local.vpc_id
# Inbound rules # Inbound rules
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
security_groups = [aws_security_group.keyserver_service.id] security_groups = [aws_security_group.keyserver_service.id]
} }
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
cidr_blocks = ["${var.allowed_ip}/32"] cidr_blocks = ["${var.allowed_ip}/32"]
} }
# Outbound rules # Outbound rules
egress { egress {
from_port = 0 from_port = 0
to_port = 0 to_port = 0
Show All 9 Linesresource "aws_db_instance" "mariadb" {
storage_type = "gp3" storage_type = "gp3"
db_name = "mariadb" db_name = "mariadb"
identifier = "mariadb-instance" identifier = "mariadb-instance"
engine = "mariadb" engine = "mariadb"
engine_version = "10.11" engine_version = "10.11"
instance_class = "db.m6g.large" instance_class = "db.m6g.large"
db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name
vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id] vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id]
username = var.mariadb_username username = local.mariadb_username
password = var.mariadb_password password = local.mariadb_password
parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name
storage_encrypted = true storage_encrypted = true
publicly_accessible = true publicly_accessible = true
port = 3307 port = local.mariadb_port
skip_final_snapshot = true skip_final_snapshot = true
} }
# MariaDB Parameter Group # MariaDB Parameter Group
resource "aws_db_parameter_group" "mariadb_parameter_group" { resource "aws_db_parameter_group" "mariadb_parameter_group" {
name = "mariadb-parameter-group" name = "mariadb-parameter-group"
family = "mariadb10.11" family = "mariadb10.11"
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Linesresource "aws_db_parameter_group" "mariadb_parameter_group" {
} }
} }
resource "null_resource" "create_comm_database" { resource "null_resource" "create_comm_database" {
depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group] depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group]
provisioner "local-exec" { provisioner "local-exec" {
command = <<EOT command = <<EOT
mysql --user=${var.mariadb_username} \ mysql --user=${local.mariadb_username} \
--port=3307 \ --port=${local.mariadb_port} \
--host=${aws_db_instance.mariadb.address} \ --host=${aws_db_instance.mariadb.address} \
--execute="CREATE DATABASE IF NOT EXISTS comm;" \ --execute="CREATE DATABASE IF NOT EXISTS ${local.mariadb_database_name};" \
--password=${var.mariadb_password} --password=${local.mariadb_password}
EOT EOT
} }
} }
View Options

lib/shared/state-sync/entries-state-sync-spec.js

locals {
mariadb_database_name = local.local_with_default_environment_vars.COMM_DATABASE_DATABASE
mariadb_username = local.local_with_default_environment_vars.COMM_DATABASE_USER
mariadb_password = local.local_with_default_environment_vars.COMM_DATABASE_PASSWORD
mariadb_port = jsondecode(local.local_with_default_environment_vars.COMM_DATABASE_PORT)
}
# MariaDB Security Group # MariaDB Security Group
resource "aws_security_group" "keyserver_mariadb_security_group" { resource "aws_security_group" "keyserver_mariadb_security_group" {
name = "keyserver-mariadb-sg" name = "keyserver-mariadb-sg"
description = "Allow inbound traffic on port 3307 and all outbound traffic" description = "Allow inbound traffic on port 3307 and all outbound traffic"
vpc_id = local.vpc_id vpc_id = local.vpc_id
# Inbound rules # Inbound rules
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
security_groups = [aws_security_group.keyserver_service.id] security_groups = [aws_security_group.keyserver_service.id]
} }
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
cidr_blocks = ["${var.allowed_ip}/32"] cidr_blocks = ["${var.allowed_ip}/32"]
} }
# Outbound rules # Outbound rules
egress { egress {
from_port = 0 from_port = 0
to_port = 0 to_port = 0
Show All 9 Linesresource "aws_db_instance" "mariadb" {
storage_type = "gp3" storage_type = "gp3"
db_name = "mariadb" db_name = "mariadb"
identifier = "mariadb-instance" identifier = "mariadb-instance"
engine = "mariadb" engine = "mariadb"
engine_version = "10.11" engine_version = "10.11"
instance_class = "db.m6g.large" instance_class = "db.m6g.large"
db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name
vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id] vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id]
username = var.mariadb_username username = local.mariadb_username
password = var.mariadb_password password = local.mariadb_password
parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name
storage_encrypted = true storage_encrypted = true
publicly_accessible = true publicly_accessible = true
port = 3307 port = local.mariadb_port
skip_final_snapshot = true skip_final_snapshot = true
} }
# MariaDB Parameter Group # MariaDB Parameter Group
resource "aws_db_parameter_group" "mariadb_parameter_group" { resource "aws_db_parameter_group" "mariadb_parameter_group" {
name = "mariadb-parameter-group" name = "mariadb-parameter-group"
family = "mariadb10.11" family = "mariadb10.11"
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Linesresource "aws_db_parameter_group" "mariadb_parameter_group" {
} }
} }
resource "null_resource" "create_comm_database" { resource "null_resource" "create_comm_database" {
depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group] depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group]
provisioner "local-exec" { provisioner "local-exec" {
command = <<EOT command = <<EOT
mysql --user=${var.mariadb_username} \ mysql --user=${local.mariadb_username} \
--port=3307 \ --port=${local.mariadb_port} \
--host=${aws_db_instance.mariadb.address} \ --host=${aws_db_instance.mariadb.address} \
--execute="CREATE DATABASE IF NOT EXISTS comm;" \ --execute="CREATE DATABASE IF NOT EXISTS ${local.mariadb_database_name};" \
--password=${var.mariadb_password} --password=${local.mariadb_password}
EOT EOT
} }
} }
View Options

lib/shared/state-sync/state-sync-spec.js

locals {
mariadb_database_name = local.local_with_default_environment_vars.COMM_DATABASE_DATABASE
mariadb_username = local.local_with_default_environment_vars.COMM_DATABASE_USER
mariadb_password = local.local_with_default_environment_vars.COMM_DATABASE_PASSWORD
mariadb_port = jsondecode(local.local_with_default_environment_vars.COMM_DATABASE_PORT)
}
# MariaDB Security Group # MariaDB Security Group
resource "aws_security_group" "keyserver_mariadb_security_group" { resource "aws_security_group" "keyserver_mariadb_security_group" {
name = "keyserver-mariadb-sg" name = "keyserver-mariadb-sg"
description = "Allow inbound traffic on port 3307 and all outbound traffic" description = "Allow inbound traffic on port 3307 and all outbound traffic"
vpc_id = local.vpc_id vpc_id = local.vpc_id
# Inbound rules # Inbound rules
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
security_groups = [aws_security_group.keyserver_service.id] security_groups = [aws_security_group.keyserver_service.id]
} }
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
cidr_blocks = ["${var.allowed_ip}/32"] cidr_blocks = ["${var.allowed_ip}/32"]
} }
# Outbound rules # Outbound rules
egress { egress {
from_port = 0 from_port = 0
to_port = 0 to_port = 0
Show All 9 Linesresource "aws_db_instance" "mariadb" {
storage_type = "gp3" storage_type = "gp3"
db_name = "mariadb" db_name = "mariadb"
identifier = "mariadb-instance" identifier = "mariadb-instance"
engine = "mariadb" engine = "mariadb"
engine_version = "10.11" engine_version = "10.11"
instance_class = "db.m6g.large" instance_class = "db.m6g.large"
db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name
vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id] vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id]
username = var.mariadb_username username = local.mariadb_username
password = var.mariadb_password password = local.mariadb_password
parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name
storage_encrypted = true storage_encrypted = true
publicly_accessible = true publicly_accessible = true
port = 3307 port = local.mariadb_port
skip_final_snapshot = true skip_final_snapshot = true
} }
# MariaDB Parameter Group # MariaDB Parameter Group
resource "aws_db_parameter_group" "mariadb_parameter_group" { resource "aws_db_parameter_group" "mariadb_parameter_group" {
name = "mariadb-parameter-group" name = "mariadb-parameter-group"
family = "mariadb10.11" family = "mariadb10.11"
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Linesresource "aws_db_parameter_group" "mariadb_parameter_group" {
} }
} }
resource "null_resource" "create_comm_database" { resource "null_resource" "create_comm_database" {
depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group] depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group]
provisioner "local-exec" { provisioner "local-exec" {
command = <<EOT command = <<EOT
mysql --user=${var.mariadb_username} \ mysql --user=${local.mariadb_username} \
--port=3307 \ --port=${local.mariadb_port} \
--host=${aws_db_instance.mariadb.address} \ --host=${aws_db_instance.mariadb.address} \
--execute="CREATE DATABASE IF NOT EXISTS comm;" \ --execute="CREATE DATABASE IF NOT EXISTS ${local.mariadb_database_name};" \
--password=${var.mariadb_password} --password=${local.mariadb_password}
EOT EOT
} }
} }
View Options

lib/shared/state-sync/threads-state-sync-spec.js

locals {
mariadb_database_name = local.local_with_default_environment_vars.COMM_DATABASE_DATABASE
mariadb_username = local.local_with_default_environment_vars.COMM_DATABASE_USER
mariadb_password = local.local_with_default_environment_vars.COMM_DATABASE_PASSWORD
mariadb_port = jsondecode(local.local_with_default_environment_vars.COMM_DATABASE_PORT)
}
# MariaDB Security Group # MariaDB Security Group
resource "aws_security_group" "keyserver_mariadb_security_group" { resource "aws_security_group" "keyserver_mariadb_security_group" {
name = "keyserver-mariadb-sg" name = "keyserver-mariadb-sg"
description = "Allow inbound traffic on port 3307 and all outbound traffic" description = "Allow inbound traffic on port 3307 and all outbound traffic"
vpc_id = local.vpc_id vpc_id = local.vpc_id
# Inbound rules # Inbound rules
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
security_groups = [aws_security_group.keyserver_service.id] security_groups = [aws_security_group.keyserver_service.id]
} }
ingress { ingress {
from_port = 3307 from_port = local.mariadb_port
to_port = 3307 to_port = local.mariadb_port
protocol = "tcp" protocol = "tcp"
cidr_blocks = ["${var.allowed_ip}/32"] cidr_blocks = ["${var.allowed_ip}/32"]
} }
# Outbound rules # Outbound rules
egress { egress {
from_port = 0 from_port = 0
to_port = 0 to_port = 0
Show All 9 Linesresource "aws_db_instance" "mariadb" {
storage_type = "gp3" storage_type = "gp3"
db_name = "mariadb" db_name = "mariadb"
identifier = "mariadb-instance" identifier = "mariadb-instance"
engine = "mariadb" engine = "mariadb"
engine_version = "10.11" engine_version = "10.11"
instance_class = "db.m6g.large" instance_class = "db.m6g.large"
db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name db_subnet_group_name = aws_db_subnet_group.public_db_subnet_group.name
vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id] vpc_security_group_ids = [aws_security_group.keyserver_mariadb_security_group.id]
username = var.mariadb_username username = local.mariadb_username
password = var.mariadb_password password = local.mariadb_password
parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name parameter_group_name = aws_db_parameter_group.mariadb_parameter_group.name
storage_encrypted = true storage_encrypted = true
publicly_accessible = true publicly_accessible = true
port = 3307 port = local.mariadb_port
skip_final_snapshot = true skip_final_snapshot = true
} }
# MariaDB Parameter Group # MariaDB Parameter Group
resource "aws_db_parameter_group" "mariadb_parameter_group" { resource "aws_db_parameter_group" "mariadb_parameter_group" {
name = "mariadb-parameter-group" name = "mariadb-parameter-group"
family = "mariadb10.11" family = "mariadb10.11"
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Linesresource "aws_db_parameter_group" "mariadb_parameter_group" {
} }
} }
resource "null_resource" "create_comm_database" { resource "null_resource" "create_comm_database" {
depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group] depends_on = [aws_db_instance.mariadb, aws_security_group.keyserver_mariadb_security_group]
provisioner "local-exec" { provisioner "local-exec" {
command = <<EOT command = <<EOT
mysql --user=${var.mariadb_username} \ mysql --user=${local.mariadb_username} \
--port=3307 \ --port=${local.mariadb_port} \
--host=${aws_db_instance.mariadb.address} \ --host=${aws_db_instance.mariadb.address} \
--execute="CREATE DATABASE IF NOT EXISTS comm;" \ --execute="CREATE DATABASE IF NOT EXISTS ${local.mariadb_database_name};" \
--password=${var.mariadb_password} --password=${local.mariadb_password}
EOT EOT
} }
} }