Added authentication between frontend and storage nodes

10 files changed, 86 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 56064ad..08f6584 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,8 @@ tests-prepare:
 	mkdir -p test/nodes/storage-2/log
 	cp test/config/frontend-1.config rel
 	cp test/config/storage-1.config rel
+	cp -r test/config/privatekeys rel
+	cp -r test/config/publickeys rel
 	rm -r rel/tests || true
 	mkdir -p rel/tests/machine/machine-1/db
 	printf "0" > rel/tests/machine/machine-1/db/treesize
diff --git a/src/catlfish_web.erl b/src/catlfish_web.erl
index 9869b21..5ee5743 100644
--- a/src/catlfish_web.erl
+++ b/src/catlfish_web.erl
@@ -11,15 +11,31 @@ start(Options, Module) ->
            end,
     mochiweb_http:start([{name, Module}, {loop, Loop} | Options]).
 
+
+add_auth(Path, {Code, Headers, Data}) ->
+    AuthHeader = http_auth:create_auth("REPLY", Path, Data),
+    lager:debug("sent auth header: ~p", [AuthHeader]),
+    {Code, [{"X-Catlfish-Auth", AuthHeader} | Headers], Data}.
+
 loop(Req, Module) ->
     "/" ++ Path = Req:get(path),
     try
         Starttime = os:timestamp(),
+        AuthHeader = Req:get_header_value("X-Catlfish-Auth"),
         case Req:get(method) of
             'GET' ->
                 Query = Req:parse_qs(),
-                lager:debug("GET ~p ~p", [Path, Query]),
-                Result = Module:request(get, Path, Query),
+                {_, RawQuery, _} = mochiweb_util:urlsplit_path(Req:get(raw_path)),
+                Result = case http_auth:verify_auth(AuthHeader, "GET", "/" ++ Path, RawQuery) of
+                             failure ->
+                                 {403, [{"Content-Type", "text/plain"}], "Invalid credentials"};
+                             success ->
+                                 lager:debug("GET ~p ~p", [Path, Query]),
+                                 add_auth("/" ++ Path, Module:request(get, Path, Query));
+                             noauth ->
+                                 lager:debug("GET ~p ~p", [Path, Query]),
+                                 Module:request(get, Path, Query)
+                         end,
                 lager:debug("GET finished: ~p us", [timer:now_diff(os:timestamp(), Starttime)]),
                 case Result of
                     none ->
@@ -29,8 +45,16 @@ loop(Req, Module) ->
                 end;
             'POST' ->
                 Body = Req:recv_body(),
-                lager:debug("POST ~p ~p", [Path, Body]),
-                Result = Module:request(post, Path, Body),
+                Result = case http_auth:verify_auth(AuthHeader, "POST", "/" ++ Path, Body) of
+                             failure ->
+                                 {403, [{"Content-Type", "text/plain"}], "Invalid credentials"};
+                             success ->
+                                 lager:debug("POST ~p ~p", [Path, Body]),
+                                 add_auth("/" ++ Path, Module:request(post, Path, Body));
+                             noauth ->
+                                 lager:debug("POST ~p ~p", [Path, Body]),
+                                 Module:request(post, Path, Body)
+                         end,
                 lager:debug("POST finished: ~p us", [timer:now_diff(os:timestamp(), Starttime)]),
                 case Result of
                     none ->
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}
+                     ]}
+]}].