From 7cbbfa7c7e0fba134838c5c9c58d2d3174232882 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Thu, 19 Feb 2015 16:17:01 +0100
Subject: Make unit tests work again.
Makefile target 'check' runs them.
---
test/config/check.config | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 test/config/check.config
(limited to 'test/config')
diff --git a/test/config/check.config b/test/config/check.config
new file mode 100644
index 0000000..fa84f34
--- /dev/null
+++ b/test/config/check.config
@@ -0,0 +1,4 @@
+%% -*- erlang -*-
+[{lager,
+ [{handlers,
+ [{lager_console_backend, debug}]}]}].
--
cgit v1.1
From ffe6f80e1696a4bb0c9378549661116650109662 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Fri, 20 Feb 2015 12:21:48 +0100
Subject: Use log level 'warning' for tests.
Debug is so messy.
---
test/config/check.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'test/config')
diff --git a/test/config/check.config b/test/config/check.config
index fa84f34..4180771 100644
--- a/test/config/check.config
+++ b/test/config/check.config
@@ -1,4 +1,4 @@
%% -*- erlang -*-
[{lager,
[{handlers,
- [{lager_console_backend, debug}]}]}].
+ [{lager_console_backend, warning}]}]}].
--
cgit v1.1
From 103e0ee850404a5c8dc69bbbf79b2508a9c55d7a Mon Sep 17 00:00:00 2001
From: Magnus Ahltorp <map@kth.se>
Date: Thu, 26 Feb 2015 16:54:26 +0100
Subject: Added authentication between frontend and storage nodes
---
test/config/frontend-1.config | 21 ++++++++++++++++++++-
test/config/privatekeys/frontend-1-private.pem | 5 +++++
test/config/privatekeys/merge-1-private.pem | 5 +++++
test/config/privatekeys/storage-1-private.pem | 5 +++++
test/config/publickeys/frontend-1.pem | 4 ++++
test/config/publickeys/merge-1.pem | 4 ++++
test/config/publickeys/storage-1.pem | 4 ++++
test/config/storage-1.config | 10 +++++++++-
8 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 test/config/privatekeys/frontend-1-private.pem
create mode 100644 test/config/privatekeys/merge-1-private.pem
create mode 100644 test/config/privatekeys/storage-1-private.pem
create mode 100644 test/config/publickeys/frontend-1.pem
create mode 100644 test/config/publickeys/merge-1.pem
create mode 100644 test/config/publickeys/storage-1.pem
(limited to 'test/config')
diff --git a/test/config/frontend-1.config b/test/config/frontend-1.config
index 79d887d..35631d1 100644
--- a/test/config/frontend-1.config
+++ b/test/config/frontend-1.config
@@ -31,5 +31,24 @@
{treesize_path, "tests/machine/machine-1/db/treesize"},
{indexforhash_root_path, "tests/machine/machine-1/db/certindex/"},
{storage_nodes, ["https://127.0.0.1:8081/ct/storage/"]},
- {storage_nodes_quorum, 1}
+ {storage_nodes_quorum, 1},
+ {publickey_path, "publickeys"},
+ {own_key, {"frontend-1", "privatekeys/frontend-1-private.pem"}},
+ {allowed_clients, [{"/ct/frontend/sendentry", noauth},
+ {"/ct/frontend/sendlog", noauth},
+ {"/ct/frontend/sendsth", noauth},
+ {"/ct/frontend/currentposition", noauth},
+ {"/ct/frontend/missingentries", noauth},
+ {"/ct/v1/add-chain", noauth},
+ {"/ct/v1/add-pre-chain", noauth},
+ {"/ct/v1/get-sth", noauth},
+ {"/ct/v1/get-sth-consistency", noauth},
+ {"/ct/v1/get-proof-by-hash", noauth},
+ {"/ct/v1/get-entries", noauth},
+ {"/ct/v1/get-entry-and-proof", noauth},
+ {"/ct/v1/get-roots", noauth}
+ ]},
+ {allowed_servers, [{"/ct/storage/sendentry", ["storage-1"]},
+ {"/ct/storage/entrycommitted", ["storage-1"]}
+ ]}
]}].
diff --git a/test/config/privatekeys/frontend-1-private.pem b/test/config/privatekeys/frontend-1-private.pem
new file mode 100644
index 0000000..718efda
--- /dev/null
+++ b/test/config/privatekeys/frontend-1-private.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIPER9WFIxLXvXDHTwPvGnNvBAKOB+/6ahpvuCjtlzOU8oAoGCCqGSM49
+AwEHoUQDQgAEibeLqrVV7QAE6Wytzpxi4sd0JtGNGRfXNZ9r9CNIVudDnNjtFRF5
+gwm/AxUWEuBXjnbVvq4HOLqZ0bP2qc+uRQ==
+-----END EC PRIVATE KEY-----
diff --git a/test/config/privatekeys/merge-1-private.pem b/test/config/privatekeys/merge-1-private.pem
new file mode 100644
index 0000000..55d50b1
--- /dev/null
+++ b/test/config/privatekeys/merge-1-private.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIBQcXtOVX29dno+aYqGddVOpg23FfhJmrMFOpOegyYZxoAoGCCqGSM49
+AwEHoUQDQgAExHAsjFFgKFlrcCveHhVdjE7A/Uh0gXdAeN9+P7SDGgRNe0WWDjCr
+0Da3c8X5JulA1cOLlQ0h2B67Yp3WZ9ONHg==
+-----END EC PRIVATE KEY-----
diff --git a/test/config/privatekeys/storage-1-private.pem b/test/config/privatekeys/storage-1-private.pem
new file mode 100644
index 0000000..b68d2a9
--- /dev/null
+++ b/test/config/privatekeys/storage-1-private.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIAjVa6lTbhiNUfrfTGELRXqHSHF0nuk13lKF8NSHzU07oAoGCCqGSM49
+AwEHoUQDQgAE1vFWiMT9PItJGvyhMKPF5TnFirHPSh5u5swetajmNLyClWIDGXql
+RlXlcPwuKxTISI4rFJATBkKhNjvSZ5L3oA==
+-----END EC PRIVATE KEY-----
diff --git a/test/config/publickeys/frontend-1.pem b/test/config/publickeys/frontend-1.pem
new file mode 100644
index 0000000..938ef29
--- /dev/null
+++ b/test/config/publickeys/frontend-1.pem
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEibeLqrVV7QAE6Wytzpxi4sd0JtGN
+GRfXNZ9r9CNIVudDnNjtFRF5gwm/AxUWEuBXjnbVvq4HOLqZ0bP2qc+uRQ==
+-----END PUBLIC KEY-----
diff --git a/test/config/publickeys/merge-1.pem b/test/config/publickeys/merge-1.pem
new file mode 100644
index 0000000..95a75f7
--- /dev/null
+++ b/test/config/publickeys/merge-1.pem
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAExHAsjFFgKFlrcCveHhVdjE7A/Uh0
+gXdAeN9+P7SDGgRNe0WWDjCr0Da3c8X5JulA1cOLlQ0h2B67Yp3WZ9ONHg==
+-----END PUBLIC KEY-----
diff --git a/test/config/publickeys/storage-1.pem b/test/config/publickeys/storage-1.pem
new file mode 100644
index 0000000..0b862a1
--- /dev/null
+++ b/test/config/publickeys/storage-1.pem
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE1vFWiMT9PItJGvyhMKPF5TnFirHP
+Sh5u5swetajmNLyClWIDGXqlRlXlcPwuKxTISI4rFJATBkKhNjvSZ5L3oA==
+-----END PUBLIC KEY-----
diff --git a/test/config/storage-1.config b/test/config/storage-1.config
index b176e1f..8770f88 100644
--- a/test/config/storage-1.config
+++ b/test/config/storage-1.config
@@ -28,4 +28,12 @@
{newentries_path, "tests/machine/machine-1/db/newentries"},
{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/"}]}].
+ {indexforhash_root_path, "tests/machine/machine-1/db/certindex/"},
+ {publickey_path, "publickeys"},
+ {own_key, {"storage-1", "privatekeys/storage-1-private.pem"}},
+ {allowed_clients, [{"/ct/storage/sendentry", ["frontend-1"]},
+ {"/ct/storage/entrycommitted", ["frontend-1"]},
+ {"/ct/storage/fetchnewentries", noauth},
+ {"/ct/storage/getentry", noauth}
+ ]}
+]}].
--
cgit v1.1
From 90bd73177964246a0e1a5d6c5e4255dcc8ec700d Mon Sep 17 00:00:00 2001
From: Magnus Ahltorp <map@kth.se>
Date: Fri, 27 Feb 2015 13:53:32 +0100
Subject: Require authentication for merge calls
---
test/config/frontend-1.config | 10 +++++-----
test/config/storage-1.config | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'test/config')
diff --git a/test/config/frontend-1.config b/test/config/frontend-1.config
index 35631d1..9d7e37c 100644
--- a/test/config/frontend-1.config
+++ b/test/config/frontend-1.config
@@ -34,11 +34,11 @@
{storage_nodes_quorum, 1},
{publickey_path, "publickeys"},
{own_key, {"frontend-1", "privatekeys/frontend-1-private.pem"}},
- {allowed_clients, [{"/ct/frontend/sendentry", noauth},
- {"/ct/frontend/sendlog", noauth},
- {"/ct/frontend/sendsth", noauth},
- {"/ct/frontend/currentposition", noauth},
- {"/ct/frontend/missingentries", noauth},
+ {allowed_clients, [{"/ct/frontend/sendentry", ["merge-1"]},
+ {"/ct/frontend/sendlog", ["merge-1"]},
+ {"/ct/frontend/sendsth", ["merge-1"]},
+ {"/ct/frontend/currentposition", ["merge-1"]},
+ {"/ct/frontend/missingentries", ["merge-1"]},
{"/ct/v1/add-chain", noauth},
{"/ct/v1/add-pre-chain", noauth},
{"/ct/v1/get-sth", noauth},
diff --git a/test/config/storage-1.config b/test/config/storage-1.config
index 8770f88..005a8ad 100644
--- a/test/config/storage-1.config
+++ b/test/config/storage-1.config
@@ -33,7 +33,7 @@
{own_key, {"storage-1", "privatekeys/storage-1-private.pem"}},
{allowed_clients, [{"/ct/storage/sendentry", ["frontend-1"]},
{"/ct/storage/entrycommitted", ["frontend-1"]},
- {"/ct/storage/fetchnewentries", noauth},
+ {"/ct/storage/fetchnewentries", ["merge-1"]},
{"/ct/storage/getentry", noauth}
]}
]}].
--
cgit v1.1
From 22b4bb12df2afc9b99ba3b790eff35973ccc629c Mon Sep 17 00:00:00 2001
From: Magnus Ahltorp <map@kth.se>
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/config')
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 <map@kth.se>
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/config')
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 <map@kth.se>
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/config')
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 <map@kth.se>
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/config')
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