Page MenuHomePhabricator
Differential D8231

[identity] add optional keyserver public key to config
ClosedPublic
Actions

Authored by varun on Jun 15 2023, 9:36 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 12:52 AM
Unknown Object (File)
Wed, Apr 9, 12:07 AM
Unknown Object (File)
Tue, Apr 8, 11:21 PM
Unknown Object (File)
Tue, Apr 8, 10:18 PM
Unknown Object (File)
Tue, Apr 8, 9:53 PM
Unknown Object (File)
Wed, Apr 2, 3:47 PM
Unknown Object (File)
Mar 11 2025, 4:14 PM
Unknown Object (File)
Mar 9 2025, 5:33 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
• jon
bartek
Commits
rCOMM030847d2da2e: [identity] add optional keyserver public key to config
Summary

in production, we will hardcode the content ed25519 public key for ashoat's keyserver in the identity service config.

this will let us verify signed messages from ashoat's keyserver.

Test Plan

successfully printed the public key in main when i set the environment variable

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
services/
identity/
src/
8 lines
1 line

Diff 27850

View Options

services/identity/src/config.rs

use curve25519_dalek::ristretto::RistrettoPoint; use curve25519_dalek::ristretto::RistrettoPoint;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use opaque_ke::{errors::PakeError, keypair::KeyPair}; use opaque_ke::{errors::PakeError, keypair::KeyPair};
use std::{collections::HashSet, env, fmt, fs, io, path}; use std::{collections::HashSet, env, fmt, fs, io, path};
use crate::constants::{ use crate::constants::{
AUTH_TOKEN, LOCALSTACK_ENDPOINT, SECRETS_DIRECTORY, SECRETS_FILE_EXTENSION, AUTH_TOKEN, KEYSERVER_PUBLIC_KEY, LOCALSTACK_ENDPOINT, SECRETS_DIRECTORY,
SECRETS_FILE_NAME, SECRETS_SETUP_FILE, SECRETS_FILE_EXTENSION, SECRETS_FILE_NAME, SECRETS_SETUP_FILE,
}; };
pub static CONFIG: Lazy<Config> = pub static CONFIG: Lazy<Config> =
Lazy::new(|| Config::load().expect("failed to load config")); Lazy::new(|| Config::load().expect("failed to load config"));
pub(super) fn load_config() { pub(super) fn load_config() {
Lazy::force(&CONFIG); Lazy::force(&CONFIG);
} }
#[derive(Clone)] #[derive(Clone)]
pub struct Config { pub struct Config {
// Opaque 1.2 server secrets // Opaque 1.2 server secrets
pub server_keypair: KeyPair<RistrettoPoint>, pub server_keypair: KeyPair<RistrettoPoint>,
// this is temporary, while the only authorized caller is ashoat's keyserver // this is temporary, while the only authorized caller is ashoat's keyserver
pub keyserver_auth_token: String, pub keyserver_auth_token: String,
pub localstack_endpoint: Option<String>, pub localstack_endpoint: Option<String>,
// Opaque 2.0 server secrets // Opaque 2.0 server secrets
pub server_setup: comm_opaque2::ServerSetup<comm_opaque2::Cipher>, pub server_setup: comm_opaque2::ServerSetup<comm_opaque2::Cipher>,
// Reserved usernames // Reserved usernames
pub reserved_usernames: HashSet<String>, pub reserved_usernames: HashSet<String>,
pub keyserver_public_key: Option<String>,
} }
impl Config { impl Config {
fn load() -> Result<Self, Error> { fn load() -> Result<Self, Error> {
let mut path = path::PathBuf::new(); let mut path = path::PathBuf::new();
path.push(SECRETS_DIRECTORY); path.push(SECRETS_DIRECTORY);
path.push(SECRETS_FILE_NAME); path.push(SECRETS_FILE_NAME);
path.set_extension(SECRETS_FILE_EXTENSION); path.set_extension(SECRETS_FILE_EXTENSION);
let server_keypair = get_keypair_from_file(path)?; let server_keypair = get_keypair_from_file(path)?;
let keyserver_auth_token = let keyserver_auth_token =
env::var(AUTH_TOKEN).unwrap_or_else(|_| String::from("test")); env::var(AUTH_TOKEN).unwrap_or_else(|_| String::from("test"));
let localstack_endpoint = env::var(LOCALSTACK_ENDPOINT).ok(); let localstack_endpoint = env::var(LOCALSTACK_ENDPOINT).ok();
let mut path = path::PathBuf::new(); let mut path = path::PathBuf::new();
path.push(SECRETS_DIRECTORY); path.push(SECRETS_DIRECTORY);
path.push(SECRETS_SETUP_FILE); path.push(SECRETS_SETUP_FILE);
let server_setup = get_server_setup_from_file(&path)?; let server_setup = get_server_setup_from_file(&path)?;
let reserved_usernames = get_reserved_usernames_set()?; let reserved_usernames = get_reserved_usernames_set()?;
let keyserver_public_key = env::var(KEYSERVER_PUBLIC_KEY).ok();
Ok(Self { Ok(Self {
server_keypair, server_keypair,
keyserver_auth_token, keyserver_auth_token,
localstack_endpoint, localstack_endpoint,
server_setup, server_setup,
reserved_usernames, reserved_usernames,
keyserver_public_key,
}) })
} }
} }
impl fmt::Debug for Config { impl fmt::Debug for Config {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("Config") f.debug_struct("Config")
.field("server_keypair", &"** redacted **") .field("server_keypair", &"** redacted **")
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines
View Options

services/identity/src/constants.rs

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Lines
// Token // Token
pub const ACCESS_TOKEN_LENGTH: usize = 512; pub const ACCESS_TOKEN_LENGTH: usize = 512;
// Temporary config // Temporary config
pub const AUTH_TOKEN: &str = "COMM_IDENTITY_SERVICE_AUTH_TOKEN"; pub const AUTH_TOKEN: &str = "COMM_IDENTITY_SERVICE_AUTH_TOKEN";
pub const KEYSERVER_PUBLIC_KEY: &str = "KEYSERVER_PUBLIC_KEY";
// Nonce // Nonce
pub const NONCE_LENGTH: usize = 17; pub const NONCE_LENGTH: usize = 17;
// LocalStack // LocalStack
pub const LOCALSTACK_ENDPOINT: &str = "LOCALSTACK_ENDPOINT"; pub const LOCALSTACK_ENDPOINT: &str = "LOCALSTACK_ENDPOINT";