diff options
| author | Linus Nordberg <linus@nordu.net> | 2016-11-25 14:29:00 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2016-11-25 14:37:29 +0100 |
| commit | 616be2a18cea1ecfee327105a58f4f397a7e28f1 (patch) | |
| tree | 520ea9a3fbe29ac78ce76c4b4527a70e8a70ae1d /src | |
| parent | d8ce0c149f10d841dc19cbc32c8fc844aa4d65fb (diff) | |
Manual rebase onto master with map/robust-distribution.
Diffstat (limited to 'src')
| -rw-r--r-- | src/catlfish_compat.erl | 10 | ||||
| -rw-r--r-- | src/catlfish_web.erl | 8 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/catlfish_compat.erl b/src/catlfish_compat.erl index 6dab325..183eb44 100644 --- a/src/catlfish_compat.erl +++ b/src/catlfish_compat.erl @@ -10,11 +10,6 @@ poison_val(Value) -> poison_val(erlang:system_info(otp_release), Value). %% @doc Dig out alg, params and key from issuer. -unpack_issuer("R16" ++ _, Issuer) -> - #'SubjectPublicKeyInfo'{ - algorithm = #'AlgorithmIdentifier'{algorithm = Alg, parameters = Params}, - subjectPublicKey = {0, Key}} = Issuer, - {Alg, Params, Key}; unpack_issuer("17", Issuer) -> #'SubjectPublicKeyInfo'{ algorithm = #'AlgorithmIdentifier'{algorithm = Alg, parameters = Params}, @@ -27,9 +22,6 @@ unpack_issuer("18", Issuer) -> {Alg, Params, Key}. %% @doc Unpack a #'Certificate'.signature, return the signature. -unpack_signature("R16" ++ _, Signature) -> - {_, Sig} = Signature, - Sig; unpack_signature("17", Signature) -> {_, Sig} = Signature, Sig; @@ -37,8 +29,6 @@ unpack_signature("18", Signature) -> Signature. %% Use a list for R17 and a binary for newer versions. -poison_val("R16" ++ _, Val) -> - Val; poison_val("17", Val) -> Val; poison_val("18", Val) -> diff --git a/src/catlfish_web.erl b/src/catlfish_web.erl index 12441cf..f44745d 100644 --- a/src/catlfish_web.erl +++ b/src/catlfish_web.erl @@ -43,16 +43,14 @@ loop(Req, Module) -> {403, [{"Content-Type", "text/plain"}], "Invalid credentials"}; success -> - lager:info("GET ~p", [Path]), lager:debug("GET ~p ~p", [Path, Query]), add_auth(Path, Module:request(get, App, Fun, Query)); noauth -> - lager:info("GET ~p", [Path]), lager:debug("GET ~p ~p", [Path, Query]), Module:request(get, App, Fun, Query) end, - lager:info("GET finished: ~p us", + lager:debug("GET finished: ~p us", [timer:now_diff(os:timestamp(), Starttime)]), case Result of none -> @@ -69,16 +67,14 @@ loop(Req, Module) -> {403, [{"Content-Type", "text/plain"}], "Invalid credentials"}; success -> - lager:info("POST ~p", [Path]), lager:debug("POST ~p ~p", [Path, Body]), add_auth(Path, Module:request(post, App, Fun, Body)); noauth -> - lager:info("POST ~p", [Path]), lager:debug("POST ~p ~p", [Path, Body]), Module:request(post, App, Fun, Body) end, - lager:info("POST finished: ~p us", + lager:debug("POST finished: ~p us", [timer:now_diff(os:timestamp(), Starttime)]), case Result of none -> |