From 6d8128b5c1083d65082b6b2b945bf229484ec5a3 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 20 Aug 2015 17:36:39 +0200 Subject: Change internal HTTP API URL. Change 'ct/' and 'catlfish/' to 'plop/'. Add 'v1/' after 'plop/'. Closes CATLFISH-59. --- src/frontend.erl | 22 +++++++++++----------- src/signing.erl | 4 ++-- src/storage.erl | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/frontend.erl b/src/frontend.erl index ccaf811..f0c0614 100644 --- a/src/frontend.erl +++ b/src/frontend.erl @@ -7,7 +7,7 @@ %% API (URL) -export([request/3]). -request(post, "ct/frontend/sendentry", Input) -> +request(post, "plop/v1/frontend/sendentry", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -19,7 +19,7 @@ request(post, "ct/frontend/sendentry", Input) -> success({[{result, <<"ok">>}]}) end; -request(post, "ct/frontend/sendlog", Input) -> +request(post, "plop/v1/frontend/sendlog", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -38,7 +38,7 @@ request(post, "ct/frontend/sendlog", Input) -> success({[{result, <<"ok">>}]}) end; -request(post, "ct/frontend/sendsth", Input) -> +request(post, "plop/v1/frontend/sendsth", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -76,12 +76,12 @@ request(post, "ct/frontend/sendsth", Input) -> end; -request(get, "ct/frontend/currentposition", _Query) -> +request(get, "plop/v1/frontend/currentposition", _Query) -> Size = db:size(), success({[{result, <<"ok">>}, {position, Size}]}); -request(get, "ct/frontend/missingentries", _Query) -> +request(get, "plop/v1/frontend/missingentries", _Query) -> Size = db:size(), Missing = fetchmissingentries(Size), lager:debug("missingentries: ~p", [Missing]), @@ -89,7 +89,7 @@ request(get, "ct/frontend/missingentries", _Query) -> {entries, lists:map(fun (Entry) -> base64:encode(Entry) end, Missing)}]}); -request(post, "catlfish/merge/sendentry", Input) -> +request(post, "plop/v1/merge/sendentry", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -101,7 +101,7 @@ request(post, "catlfish/merge/sendentry", Input) -> success({[{result, <<"ok">>}]}) end; -request(post, "catlfish/merge/sendlog", Input) -> +request(post, "plop/v1/merge/sendlog", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -117,7 +117,7 @@ request(post, "catlfish/merge/sendlog", Input) -> success({[{result, <<"ok">>}]}) end; -request(post, "catlfish/merge/verifyroot", Input) -> +request(post, "plop/v1/merge/verifyroot", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -147,12 +147,12 @@ request(post, "catlfish/merge/verifyroot", Input) -> end end; -request(get, "catlfish/merge/verifiedsize", _Query) -> +request(get, "plop/v1/merge/verifiedsize", _Query) -> Size = db:verifiedsize(), success({[{result, <<"ok">>}, {size, Size}]}); -request(post, "catlfish/merge/setverifiedsize", Input) -> +request(post, "plop/v1/merge/setverifiedsize", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("setverifiedsize: bad input:", E); @@ -173,7 +173,7 @@ request(post, "catlfish/merge/setverifiedsize", Input) -> end; -request(get, "catlfish/merge/missingentries", _Query) -> +request(get, "plop/v1/merge/missingentries", _Query) -> Size = db:verifiedsize(), Missing = fetchmissingentries(Size), lager:debug("missingentries: ~p", [Missing]), diff --git a/src/signing.erl b/src/signing.erl index eb63b8d..eedf8f7 100644 --- a/src/signing.erl +++ b/src/signing.erl @@ -7,7 +7,7 @@ %% API (URL) -export([request/3]). -request(post, "ct/signing/sct", Input) -> +request(post, "plop/v1/signing/sct", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -17,7 +17,7 @@ request(post, "ct/signing/sct", Input) -> Result = sign:sign_sct(Data), success({[{result, base64:encode(Result)}]}) end; -request(post, "ct/signing/sth", Input) -> +request(post, "plop/v1/signing/sth", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); diff --git a/src/storage.erl b/src/storage.erl index 5774f2a..a663c39 100644 --- a/src/storage.erl +++ b/src/storage.erl @@ -7,7 +7,7 @@ %% API (URL) -export([request/3]). -request(post, "ct/storage/sendentry", Input) -> +request(post, "plop/v1/storage/sendentry", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("sendentry: bad input:", E); @@ -19,7 +19,7 @@ request(post, "ct/storage/sendentry", Input) -> ok = storagedb:add(TreeLeafHash), success({[{result, <<"ok">>}]}) end; -request(post, "ct/storage/entrycommitted", Input) -> +request(post, "plop/v1/storage/entrycommitted", Input) -> case (catch mochijson2:decode(Input)) of {error, E} -> html("entrycommitted: bad input:", E); @@ -29,7 +29,7 @@ request(post, "ct/storage/entrycommitted", Input) -> db:add_entryhash(LeafHash, EntryHash), success({[{result, <<"ok">>}]}) end; -request(get, "ct/storage/fetchnewentries", _Input) -> +request(get, "plop/v1/storage/fetchnewentries", _Input) -> {LastIndexOrZero, LastHash} = storagedb:lastverifiednewentry(), LastVerifiedAndNewHashes = storagedb:fetchnewhashes(LastIndexOrZero), NewHashes = case {LastHash, LastVerifiedAndNewHashes} of @@ -45,7 +45,7 @@ request(get, "ct/storage/fetchnewentries", _Input) -> end, NewHashes), success({[{result, <<"ok">>}, {entries, Entries}]}); -request(get, "ct/storage/getentry", Query) -> +request(get, "plop/v1/storage/getentry", Query) -> Hashes = [base64:decode(Value) || {Key, Value} <- Query, Key == "hash"], Entries = lists:map(fun(LeafHash) -> {[{hash, base64:encode(LeafHash)}, -- cgit v1.1