From 22b4bb12df2afc9b99ba3b790eff35973ccc629c Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Sun, 1 Mar 2015 13:33:08 +0100 Subject: Make sign and ht optional processes. Move sign args to config. --- test/config/frontend-1.config | 3 +++ 1 file changed, 3 insertions(+) (limited to 'test') diff --git a/test/config/frontend-1.config b/test/config/frontend-1.config index 9d7e37c..2ae1904 100644 --- a/test/config/frontend-1.config +++ b/test/config/frontend-1.config @@ -33,6 +33,9 @@ {storage_nodes, ["https://127.0.0.1:8081/ct/storage/"]}, {storage_nodes_quorum, 1}, {publickey_path, "publickeys"}, + {services, [ht, sign]}, + {log_private_key, "test/eckey.pem"}, + {log_public_key, "test/eckey-public.pem"}, {own_key, {"frontend-1", "privatekeys/frontend-1-private.pem"}}, {allowed_clients, [{"/ct/frontend/sendentry", ["merge-1"]}, {"/ct/frontend/sendlog", ["merge-1"]}, -- cgit v1.1 From 06987aac6ea50e40915a59c0d3d52c84ae7e5498 Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Mon, 2 Mar 2015 19:11:16 +0100 Subject: Move to external signing --- test/config/frontend-1.config | 8 +++--- test/config/privatekeys/signing-1-private.pem | 5 ++++ test/config/publickeys/signing-1.pem | 4 +++ test/config/signing-1.config | 35 +++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 test/config/privatekeys/signing-1-private.pem create mode 100644 test/config/publickeys/signing-1.pem create mode 100644 test/config/signing-1.config (limited to 'test') diff --git a/test/config/frontend-1.config b/test/config/frontend-1.config index 2ae1904..585efd8 100644 --- a/test/config/frontend-1.config +++ b/test/config/frontend-1.config @@ -33,10 +33,10 @@ {storage_nodes, ["https://127.0.0.1:8081/ct/storage/"]}, {storage_nodes_quorum, 1}, {publickey_path, "publickeys"}, - {services, [ht, sign]}, - {log_private_key, "test/eckey.pem"}, + {services, [ht]}, {log_public_key, "test/eckey-public.pem"}, {own_key, {"frontend-1", "privatekeys/frontend-1-private.pem"}}, + {signing_node, "https://127.0.0.1:8088/ct/signing/"}, {allowed_clients, [{"/ct/frontend/sendentry", ["merge-1"]}, {"/ct/frontend/sendlog", ["merge-1"]}, {"/ct/frontend/sendsth", ["merge-1"]}, @@ -52,6 +52,8 @@ {"/ct/v1/get-roots", noauth} ]}, {allowed_servers, [{"/ct/storage/sendentry", ["storage-1"]}, - {"/ct/storage/entrycommitted", ["storage-1"]} + {"/ct/storage/entrycommitted", ["storage-1"]}, + {"/ct/signing/sct", ["signing-1"]}, + {"/ct/signing/sth", ["signing-1"]} ]} ]}]. diff --git a/test/config/privatekeys/signing-1-private.pem b/test/config/privatekeys/signing-1-private.pem new file mode 100644 index 0000000..0c9f1ac --- /dev/null +++ b/test/config/privatekeys/signing-1-private.pem @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEICQ+kchWtj3ZwGhzz+QkKl/CM0fsfQCDtI+1Cb3GID+moAoGCCqGSM49 +AwEHoUQDQgAEeVsqn8x1CWv4BK9+o6qQqVt+lQ7+dI6VoiwwNOT2CAvocdYHzzqW +2/dstQZIiYSdUw1SWQMR+7fTTRDZh5bDoQ== +-----END EC PRIVATE KEY----- diff --git a/test/config/publickeys/signing-1.pem b/test/config/publickeys/signing-1.pem new file mode 100644 index 0000000..cc5f472 --- /dev/null +++ b/test/config/publickeys/signing-1.pem @@ -0,0 +1,4 @@ +-----BEGIN PUBLIC KEY----- +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEeVsqn8x1CWv4BK9+o6qQqVt+lQ7+ +dI6VoiwwNOT2CAvocdYHzzqW2/dstQZIiYSdUw1SWQMR+7fTTRDZh5bDoQ== +-----END PUBLIC KEY----- diff --git a/test/config/signing-1.config b/test/config/signing-1.config new file mode 100644 index 0000000..3b553a4 --- /dev/null +++ b/test/config/signing-1.config @@ -0,0 +1,35 @@ +%% catlfish configuration file (-*- erlang -*-) + +[{sasl, + [{sasl_error_logger, false}, + {errlog_type, error}, + {error_logger_mf_dir, "log"}, + {error_logger_mf_maxbytes, 10485760}, % 10 MB + {error_logger_mf_maxfiles, 10}]}, + {catlfish, + [{known_roots_path, "known_roots"}, + {https_servers, + [{signing_https_api, "127.0.0.1", 8088, signing} + ]}, + {https_certfile, "catlfish/webroot/certs/webcert.pem"}, + {https_keyfile, "catlfish/webroot/keys/webkey.pem"}, + {https_cacertfile, "catlfish/webroot/certs/webcert.pem"} + ]}, + {lager, + [{handlers, + [{lager_console_backend, info}, + {lager_file_backend, [{file, "signing-1-error.log"}, {level, error}]}, + {lager_file_backend, [{file, "signing-1-debug.log"}, {level, debug}]}, + {lager_file_backend, [{file, "signing-1-console.log"}, {level, info}]} + ]} + ]}, + {plop, + [{publickey_path, "publickeys"}, + {services, [sign]}, + {log_private_key, "test/eckey.pem"}, + {log_public_key, "test/eckey-public.pem"}, + {own_key, {"signing-1", "privatekeys/signing-1-private.pem"}}, + {allowed_clients, [{"/ct/signing/sct", ["frontend-1"]}, + {"/ct/signing/sth", ["frontend-1"]} + ]} + ]}]. -- cgit v1.1 From ff18e0fdd57a6b485f427173fe7febee03345037 Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Tue, 3 Mar 2015 15:33:39 +0100 Subject: merge.py: use external signing --- test/config/signing-1.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/config/signing-1.config b/test/config/signing-1.config index 3b553a4..189843b 100644 --- a/test/config/signing-1.config +++ b/test/config/signing-1.config @@ -30,6 +30,6 @@ {log_public_key, "test/eckey-public.pem"}, {own_key, {"signing-1", "privatekeys/signing-1-private.pem"}}, {allowed_clients, [{"/ct/signing/sct", ["frontend-1"]}, - {"/ct/signing/sth", ["frontend-1"]} + {"/ct/signing/sth", ["frontend-1", "merge-1"]} ]} ]}]. -- cgit v1.1 From e0f11a58033d52c70bc76b4b5611cb88485d4653 Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Wed, 4 Mar 2015 15:42:59 +0100 Subject: Save STH instead of calculating a new one each time. --- test/config/frontend-1.config | 1 + test/config/signing-1.config | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/config/frontend-1.config b/test/config/frontend-1.config index 585efd8..e7e8af2 100644 --- a/test/config/frontend-1.config +++ b/test/config/frontend-1.config @@ -30,6 +30,7 @@ {entryhash_root_path, "tests/machine/machine-1/db/entryhash/"}, {treesize_path, "tests/machine/machine-1/db/treesize"}, {indexforhash_root_path, "tests/machine/machine-1/db/certindex/"}, + {sth_path, "tests/machine/machine-1/db/sth"}, {storage_nodes, ["https://127.0.0.1:8081/ct/storage/"]}, {storage_nodes_quorum, 1}, {publickey_path, "publickeys"}, diff --git a/test/config/signing-1.config b/test/config/signing-1.config index 189843b..a11bdeb 100644 --- a/test/config/signing-1.config +++ b/test/config/signing-1.config @@ -30,6 +30,6 @@ {log_public_key, "test/eckey-public.pem"}, {own_key, {"signing-1", "privatekeys/signing-1-private.pem"}}, {allowed_clients, [{"/ct/signing/sct", ["frontend-1"]}, - {"/ct/signing/sth", ["frontend-1", "merge-1"]} + {"/ct/signing/sth", ["merge-1"]} ]} ]}]. -- cgit v1.1 From e2404caabb5ce3f7dca21cdedddbf744f47e6c3e Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Sun, 8 Mar 2015 12:39:40 +0100 Subject: Test more --- test/config/frontend-1.config | 1 + 1 file changed, 1 insertion(+) (limited to 'test') diff --git a/test/config/frontend-1.config b/test/config/frontend-1.config index e7e8af2..8215027 100644 --- a/test/config/frontend-1.config +++ b/test/config/frontend-1.config @@ -8,6 +8,7 @@ {error_logger_mf_maxfiles, 10}]}, {catlfish, [{known_roots_path, "known_roots"}, + {sctcache_root_path, "tests/machine/machine-1/db/sctcache/"}, {https_servers, [{external_https_api, "127.0.0.1", 8080, v1}, {frontend_https_api, "127.0.0.1", 8082, frontend} -- cgit v1.1