Skip to content

Commit 509dba8

Browse files
jclapisjclapis
committed
Signing IDs are no longer optional in the config
1 parent 9f72aff commit 509dba8

File tree

5 files changed

+31
-31
lines changed

5 files changed

+31
-31
lines changed

‎crates/common/src/config/module.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub struct StaticModuleConfig {
3939
#[serde(rename = "type")]
4040
pub kind: ModuleKind,
4141
/// Signing ID for the module to use when requesting signatures
42-
pub signing_id: Option<B256>,
42+
pub signing_id: B256,
4343
}
4444

4545
/// Runtime config to start a module

‎crates/common/src/config/signer.rs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -299,16 +299,12 @@ pub fn load_module_signing_configs(
299299
Some(secret) => secret.clone(),
300300
None => bail!("JWT secret for module {} is missing", module.id),
301301
};
302-
303-
// Make sure the signing ID is present
304-
let signing_id = match &module.signing_id {
305-
Some(id) => *id,
306-
None => bail!("Signing ID for module {} is missing", module.id),
307-
};
308-
309302
// Create the module signing config and validate it
310-
let module_signing_config =
311-
ModuleSigningConfig { module_name: module.id.clone(), jwt_secret, signing_id };
303+
let module_signing_config = ModuleSigningConfig {
304+
module_name: module.id.clone(),
305+
jwt_secret,
306+
signing_id: module.signing_id,
307+
};
312308
module_signing_config
313309
.validate()
314310
.wrap_err(format!("Invalid signing config for module {}", module.id))?;
@@ -336,7 +332,7 @@ pub fn load_module_signing_configs(
336332
}
337333
None => {
338334
seen_signing_ids.insert(module_signing_config.signing_id, &module.id);
339-
signing_id
335+
module.signing_id
340336
}
341337
};
342338

@@ -385,10 +381,10 @@ mod tests {
385381
}
386382
}
387383

388-
async fn create_module_config(id: &ModuleId, signing_id: &B256) -> StaticModuleConfig {
384+
async fn create_module_config(id: ModuleId, signing_id: B256) -> StaticModuleConfig {
389385
StaticModuleConfig {
390386
id: id.clone(),
391-
signing_id: Some(*signing_id),
387+
signing_id,
392388
docker_image: String::from(""),
393389
env: None,
394390
env_file: None,
@@ -407,8 +403,8 @@ mod tests {
407403
b256!("0202020202020202020202020202020202020202020202020202020202020202");
408404

409405
cfg.modules = Some(vec![
410-
create_module_config(&first_module_id, &first_signing_id).await,
411-
create_module_config(&second_module_id, &second_signing_id).await,
406+
create_module_config(first_module_id.clone(), first_signing_id).await,
407+
create_module_config(second_module_id.clone(), second_signing_id).await,
412408
]);
413409

414410
let jwts = HashMap::from([
@@ -466,8 +462,10 @@ mod tests {
466462
b256!("0202020202020202020202020202020202020202020202020202020202020202");
467463

468464
cfg.modules = Some(vec![
469-
create_module_config(&first_module_id, &first_signing_id).await,
470-
create_module_config(&first_module_id, &second_signing_id).await, /* Duplicate module name */
465+
create_module_config(first_module_id.clone(), first_signing_id).await,
466+
create_module_config(first_module_id.clone(), second_signing_id).await, /* Duplicate
467+
* module
468+
* name */
471469
]);
472470

473471
let jwts = HashMap::from([
@@ -498,8 +496,8 @@ mod tests {
498496
b256!("0202020202020202020202020202020202020202020202020202020202020202");
499497

500498
cfg.modules = Some(vec![
501-
create_module_config(&first_module_id, &first_signing_id).await,
502-
create_module_config(&second_module_id, &second_signing_id).await,
499+
create_module_config(first_module_id.clone(), first_signing_id).await,
500+
create_module_config(second_module_id.clone(), second_signing_id).await,
503501
]);
504502

505503
let jwts = HashMap::from([
@@ -530,8 +528,8 @@ mod tests {
530528
let second_module_id = ModuleId("2nd_test_module".to_string());
531529

532530
cfg.modules = Some(vec![
533-
create_module_config(&first_module_id, &first_signing_id).await,
534-
create_module_config(&second_module_id, &first_signing_id).await, /* Duplicate signing ID */
531+
create_module_config(first_module_id.clone(), first_signing_id).await,
532+
create_module_config(second_module_id.clone(), first_signing_id).await, /* Duplicate signing ID */
535533
]);
536534

537535
let jwts = HashMap::from([
@@ -564,8 +562,8 @@ mod tests {
564562
b256!("0202020202020202020202020202020202020202020202020202020202020202");
565563

566564
cfg.modules = Some(vec![
567-
create_module_config(&first_module_id, &first_signing_id).await,
568-
create_module_config(&second_module_id, &second_signing_id).await,
565+
create_module_config(first_module_id.clone(), first_signing_id).await,
566+
create_module_config(second_module_id.clone(), second_signing_id).await,
569567
]);
570568

571569
let jwts = HashMap::from([(second_module_id.clone(), "another-secret".to_string())]);
@@ -589,7 +587,8 @@ mod tests {
589587
let first_signing_id =
590588
b256!("0101010101010101010101010101010101010101010101010101010101010101");
591589

592-
cfg.modules = Some(vec![create_module_config(&first_module_id, &first_signing_id).await]);
590+
cfg.modules =
591+
Some(vec![create_module_config(first_module_id.clone(), first_signing_id).await]);
593592

594593
let jwts = HashMap::from([(first_module_id.clone(), "".to_string())]);
595594

@@ -610,7 +609,8 @@ mod tests {
610609
let first_signing_id =
611610
b256!("0000000000000000000000000000000000000000000000000000000000000000");
612611

613-
cfg.modules = Some(vec![create_module_config(&first_module_id, &first_signing_id).await]);
612+
cfg.modules =
613+
Some(vec![create_module_config(first_module_id.clone(), first_signing_id).await]);
614614

615615
let jwts = HashMap::from([(first_module_id.clone(), "supersecret".to_string())]);
616616

‎tests/src/utils.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ pub fn get_start_signer_config(
154154
}
155155
}
156156

157-
pub fn create_module_config(id: &ModuleId, signing_id: &B256) -> StaticModuleConfig {
157+
pub fn create_module_config(id: ModuleId, signing_id: B256) -> StaticModuleConfig {
158158
StaticModuleConfig {
159-
id: id.clone(),
160-
signing_id: Some(*signing_id),
159+
id,
160+
signing_id,
161161
docker_image: String::from(""),
162162
env: None,
163163
env_file: None,

‎tests/tests/signer_jwt_auth.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ async fn create_mod_signing_configs() -> HashMap<ModuleId, ModuleSigningConfig>
2424
let module_id = ModuleId(JWT_MODULE.to_string());
2525
let signing_id = b256!("0101010101010101010101010101010101010101010101010101010101010101");
2626

27-
cfg.modules = Some(vec![utils::create_module_config(&module_id, &signing_id)]);
27+
cfg.modules = Some(vec![utils::create_module_config(module_id.clone(), signing_id)]);
2828

2929
let jwts = HashMap::from([(module_id.clone(), "supersecret".to_string())]);
3030

‎tests/tests/signer_request_sig.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ async fn create_mod_signing_configs() -> HashMap<ModuleId, ModuleSigningConfig>
3535
let signing_id_2 = b256!("0x61fe00135d7b4912a8c63ada215ac2e62326e6e7b30f49a29fcf9779d7ad800d");
3636

3737
cfg.modules = Some(vec![
38-
utils::create_module_config(&module_id_1, &signing_id_1),
39-
utils::create_module_config(&module_id_2, &signing_id_2),
38+
utils::create_module_config(module_id_1.clone(), signing_id_1),
39+
utils::create_module_config(module_id_2.clone(), signing_id_2),
4040
]);
4141

4242
let jwts = HashMap::from([

0 commit comments

Comments
 (0)