From 24ae22b781652fd3d2d76755704b14841bdb39aa Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 3 Mar 2022 13:48:36 +0100 Subject: move values specific to a test instance to a separate file --- integration/config | 18 ++++++++++++++++++ integration/run | 7 +++---- integration/start_sigsum_serv | 12 +++++------- 3 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 integration/config (limited to 'integration') diff --git a/integration/config b/integration/config new file mode 100644 index 0000000..5631589 --- /dev/null +++ b/integration/config @@ -0,0 +1,18 @@ +# Use createtree to create a trillian tree and set tree_id. +tree_id= + +# Use sigsum_keygen to generate a key pair for the log and set log_sk. +log_sk= + +# Use sigsum_keygen to generate a key pair for the witness and set wit_sk. +wit_sk= + +# Use sigsum_keygen to generate a key pair for submission and set submit_sk. +# Add a TXT record named $domain_hint with the hash of the vk as its value. +submit_sk= +domain_hint=_label.example.com + + +log_vk=$(echo $log_sk | cut -c 65-) +wit_vk=$(echo $wit_sk | cut -c 65-) +submit_vk=$(echo $submit_sk | cut -c 65-) diff --git a/integration/run b/integration/run index 1e3e82c..d3ae6ce 100755 --- a/integration/run +++ b/integration/run @@ -37,13 +37,12 @@ # Warning: the get-inclusion-proof endpoint is not poked. # Warning: this needs to be replaced, see issues/add-integration-test.md. # + +. "$(dirname $0)/config" + now=$(date +%s) url=http://localhost:6965/testonly/sigsum/v0 -log_vk=8cf3ac85aadd42891c5ae9aef27244cb2a546a2312f80020aad3f2ae1af73314 -wit_sk=e1d7c494dacb0ddf809a17e4528b01f584af22e3766fa740ec52a1711c59500d711090dd2286040b50961b0fe09f58aa665ccee5cb7ee042d819f18f6ab5046b -submit_sk=094277235c42f5f8cba2b63cb14506938b4408730732e3e82e1473e63217767c5aed7ffc3bc088221f6579567b2e6e3c4ac3579bd5e77670755179052c68d5d3 shard_hint=$(date +%s) -domain_hint=sigsum.rgdd.se wait_seconds=5 diff --git a/integration/start_sigsum_serv b/integration/start_sigsum_serv index b5768e9..c4552c2 100755 --- a/integration/start_sigsum_serv +++ b/integration/start_sigsum_serv @@ -1,17 +1,15 @@ #!/bin/bash -sk=5f69afebc2d6f23c5e56fcbd5bab45b0bf76d70b3f82f8f071a72ceb75c277a48cf3ac85aadd42891c5ae9aef27244cb2a546a2312f80020aad3f2ae1af73314 -vk=8cf3ac85aadd42891c5ae9aef27244cb2a546a2312f80020aad3f2ae1af73314 -wit=711090dd2286040b50961b0fe09f58aa665ccee5cb7ee042d819f18f6ab5046b -tree_id=4251255065613170469 +. "$(dirname $0)/config" + shard_start=1 prefix=testonly -echo "running sigsum-log-go with vk: $vk" +echo "running sigsum-log-go with vk: $log_vk" $GOPATH/bin/sigsum_log_go \ --logtostderr --v 3\ --prefix $prefix \ - --key $sk \ + --key $log_sk \ --trillian_id $tree_id \ - --witnesses $wit \ + --witnesses $wit_vk \ --shard_interval_start $shard_start -- cgit v1.2.3