Update master (#17)

* APM-107: Handle tokens in digital wallets (#6)

* Add valitydev/tds-proto@48bca49 dependency
* Rename `api_deadlines` config option
* Bump to empayre/swag-wallets@c64e4c9
* Bump to valitydev/bouncer-client-erlang@b6c7be0
# Conflicts:
#	apps/wapi/test/wapi_destination_tests_SUITE.erl
#	rebar.lock

* fixed after merge

* fixed

Author: WWWcool

Dockerfile

@@ -2,13 +2,12 @@ ARG OTP_VERSION
 
 # Build the release
 FROM docker.io/library/erlang:${OTP_VERSION} AS builder
-
-ARG BUILDARCH
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Install thrift compiler
 ARG THRIFT_VERSION
-
-RUN wget -q -O- "https://github.com/valitydev/thrift/releases/download/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}-linux-${BUILDARCH}.tar.gz" \
+ARG TARGETARCH
+RUN wget -q -O- "https://github.com/valitydev/thrift/releases/download/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}-linux-${TARGETARCH}.tar.gz" \
     | tar -xvz -C /usr/local/bin/
 
 # Copy sources
@@ -17,8 +16,8 @@ COPY . /build/
 
 # Build the release
 WORKDIR /build
-RUN rebar3 compile
-RUN rebar3 as prod release
+RUN rebar3 compile && \
+    rebar3 as prod release
 
 # Make a runner image
 FROM docker.io/library/erlang:${OTP_VERSION}-slim
@@ -29,15 +28,15 @@ ARG SERVICE_NAME
 ENV CHARSET=UTF-8
 ENV LANG=C.UTF-8
 
-# Expose SERVICE_NAME as env so CMD expands properly on start
-ENV SERVICE_NAME=${SERVICE_NAME}
-
 # Set runtime
 WORKDIR /opt/${SERVICE_NAME}
 
 COPY --from=builder /build/_build/prod/rel/${SERVICE_NAME} /opt/${SERVICE_NAME}
 
+RUN echo "#!/bin/sh" >> /entrypoint.sh && \
+    echo "exec /opt/${SERVICE_NAME}/bin/${SERVICE_NAME} foreground" >> /entrypoint.sh && \
+    chmod +x /entrypoint.sh
 ENTRYPOINT []
-CMD /opt/${SERVICE_NAME}/bin/${SERVICE_NAME} foreground
+CMD ["/entrypoint.sh"]
 
-EXPOSE 8022
+EXPOSE 8022

Dockerfile.dev

@@ -1,18 +1,17 @@
 ARG OTP_VERSION
 
 FROM docker.io/library/erlang:${OTP_VERSION}
-
-ARG BUILDARCH
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Install thrift compiler
 ARG THRIFT_VERSION
-
-RUN wget -q -O- "https://github.com/valitydev/thrift/releases/download/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}-linux-${BUILDARCH}.tar.gz" \
+ARG TARGETARCH
+RUN wget -q -O- "https://github.com/valitydev/thrift/releases/download/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}-linux-${TARGETARCH}.tar.gz" \
     | tar -xvz -C /usr/local/bin/
 
 # Set env
 ENV CHARSET=UTF-8
 ENV LANG=C.UTF-8
 
 # Set runtime
-CMD /bin/bash
+CMD ["/bin/bash"]

Makefile

@@ -25,7 +25,7 @@ dev-image: .image.dev
 
 .image.dev: Dockerfile.dev .env
 	$(DOCKER) build $(DOTENV:%=--build-arg %) -f Dockerfile.dev -t $(DEV_IMAGE_TAG) .
-	$(DOCKER) image ls -q -f "reference=$(DEV_IMAGE_ID)" | head -n1 > $@
+	$(DOCKER) image ls -q -f "reference=$(DEV_IMAGE_TAG)" | head -n1 > $@
 
 clean-dev-image:
 ifneq ($(DEV_IMAGE_ID),)

apps/wapi/src/wapi.app.src

@@ -30,7 +30,8 @@
         token_keeper_client,
         thrift,
         wapi_core,
-        dmt_client
+        dmt_client,
+        tds_proto
     ]},
     {env, []}
 ]}.

apps/wapi/src/wapi_backend_utils.erl

@@ -1,7 +1,5 @@
 -module(wapi_backend_utils).
 
--include_lib("fistful_proto/include/ff_proto_base_thrift.hrl").
--include_lib("fistful_proto/include/ff_proto_identity_thrift.hrl").
 -include_lib("fistful_proto/include/ff_proto_wallet_thrift.hrl").
 -include_lib("fistful_proto/include/ff_proto_destination_thrift.hrl").
 -include_lib("fistful_proto/include/ff_proto_w2w_transfer_thrift.hrl").

apps/wapi/src/wapi_codec.erl

@@ -1,9 +1,7 @@
 -module(wapi_codec).
 
 -include_lib("fistful_proto/include/ff_proto_base_thrift.hrl").
--include_lib("fistful_proto/include/ff_proto_repairer_thrift.hrl").
 -include_lib("fistful_proto/include/ff_proto_account_thrift.hrl").
--include_lib("fistful_proto/include/ff_proto_msgpack_thrift.hrl").
 
 -export([unmarshal/2]).
 -export([unmarshal/3]).

apps/wapi/src/wapi_destination_backend.erl

@@ -27,7 +27,9 @@
         | {external_id_conflict, {id(), external_id()}}.
 create(Params, HandlerContext) ->
     do(fun() ->
-        ResourceThrift = unwrap(construct_resource(maps:get(<<"resource">>, Params))),
+        ResourceIn = maps:get(<<"resource">>, Params),
+        Resource = secure_resource(ResourceIn, HandlerContext),
+        ResourceThrift = unwrap(construct_resource(Resource)),
         ID = unwrap(generate_id(Params, ResourceThrift, HandlerContext)),
         unwrap(create_request(ID, Params, ResourceThrift, HandlerContext))
     end).
@@ -114,16 +116,27 @@ get_by_external_id(ExternalID, HandlerContext = #{woody_context := WoodyContext}
 %% Internal
 %%
 
-construct_resource(#{
-    <<"token">> := Token,
-    <<"type">> := Type
-}) ->
+secure_resource(
+    #{<<"type">> := <<"DigitalWalletDestinationResource">>, <<"token">> := Token} = Resource,
+    #{woody_context := WoodyContext}
+) ->
+    TokenID = wapi_token_storage:put(Token, WoodyContext),
+    Resource#{<<"token">> => TokenID};
+secure_resource(Resource, _HandlerContext) ->
+    Resource.
+
+construct_resource(
+    #{
+        <<"type">> := <<"BankCardDestinationResource">> = Type,
+        <<"token">> := Token
+    }
+) ->
     case wapi_backend_utils:decode_resource(Token) of
         {ok, Resource} ->
             {bank_card, BankCard} = Resource,
             {ok, {bank_card, #'fistful_base_ResourceBankCard'{bank_card = BankCard}}};
         {error, Error} ->
-            logger:warning("~p token decryption failed: ~p", [Type, Error]),
+            _ = logger:warning("BankCardDestinationResource token decryption failed: ~p", [Error]),
             {error, {invalid_resource_token, Type}}
     end;
 construct_resource(
@@ -145,20 +158,19 @@ construct_resource(
         <<"type">> := <<"DigitalWalletDestinationResource">>,
         <<"id">> := DigitalWalletID,
         <<"provider">> := Provider
-    }
+    } = Resource
 ) ->
     ConstructedResource =
         {digital_wallet, #{
             digital_wallet => #{
                 id => marshal(string, DigitalWalletID),
-                payment_service => #{id => marshal(string, Provider)}
+                payment_service => #{id => marshal(string, Provider)},
+                token => maybe_marshal(string, maps:get(<<"token">>, Resource, undefined))
             }
         }},
     {ok, wapi_codec:marshal(resource, ConstructedResource)};
 construct_resource(
-    Resource = #{
-        <<"type">> := GenericResourceType
-    }
+    Resource = #{<<"type">> := GenericResourceType}
 ) ->
     case prepare_generic_resource_data(GenericResourceType, Resource) of
         {ok, Data} ->
@@ -176,6 +188,16 @@ construct_resource(
 
 tokenize_resource({bank_card, #'fistful_base_ResourceBankCard'{bank_card = BankCard}}) ->
     wapi_backend_utils:tokenize_resource({bank_card, BankCard});
+tokenize_resource({digital_wallet, Resource}) ->
+    % NOTE
+    % Deliberately excluding `token` from hashing because at this point it contains random string
+    % and would break conflict detection otherwise.
+    DigitalWallet = Resource#'fistful_base_ResourceDigitalWallet'.digital_wallet,
+    wapi_backend_utils:tokenize_resource(
+        {digital_wallet, Resource#'fistful_base_ResourceDigitalWallet'{
+            digital_wallet = DigitalWallet#'fistful_base_DigitalWallet'{token = undefined}
+        }}
+    );
 tokenize_resource(Value) ->
     wapi_backend_utils:tokenize_resource(Value).
 

apps/wapi/src/wapi_handler.erl

@@ -1,14 +1,12 @@
 -module(wapi_handler).
 
 %% API
--export([handle_request/5]).
+-export([handle_request/4]).
 -export([throw_result/1]).
 -export([respond_if_forbidden/2]).
 
 %% Behaviour definition
 
--type tag() :: wallet | payres.
-
 -type operation_id() :: swag_server_wallet:operation_id().
 
 -type swagger_context() :: swag_server_wallet:request_context().
@@ -58,31 +56,28 @@
 %% API
 
 -define(REQUEST_RESULT, wapi_req_result).
--define(APP, wapi).
 
--spec handle_request(tag(), operation_id(), req_data(), swagger_context(), opts()) -> request_result().
-handle_request(Tag, OperationID, Req, SwagContext, Opts) ->
+-spec handle_request(operation_id(), req_data(), swagger_context(), opts()) -> request_result().
+handle_request(OperationID, Req, SwagContext, Opts) ->
     #{'X-Request-Deadline' := Header} = Req,
     case wapi_utils:parse_deadline(Header) of
         {ok, Deadline} ->
-            WoodyContext = attach_deadline(Deadline, create_woody_context(Tag, Req)),
-            process_request(Tag, OperationID, Req, SwagContext, Opts, WoodyContext);
+            WoodyContext = attach_deadline(Deadline, create_woody_context(Req)),
+            process_request(OperationID, Req, SwagContext, Opts, WoodyContext);
         _ ->
-            _ = logger:warning("Operation ~p failed due to invalid deadline header ~p", [OperationID, Header]),
             wapi_handler_utils:reply_ok(400, #{
                 <<"errorType">> => <<"SchemaViolated">>,
                 <<"name">> => <<"X-Request-Deadline">>,
                 <<"description">> => <<"Invalid data in X-Request-Deadline header">>
             })
     end.
 
-process_request(Tag, OperationID, Req, SwagContext0, Opts, WoodyContext) ->
+process_request(OperationID, Req, SwagContext0, Opts, WoodyContext) ->
     _ = logger:info("Processing request ~p", [OperationID]),
     try
         SwagContext = do_authorize_api_key(SwagContext0, WoodyContext),
         Context = create_handler_context(OperationID, SwagContext, WoodyContext),
-        Handler = get_handler(Tag),
-        {ok, RequestState} = Handler:prepare(OperationID, Req, Context, Opts),
+        {ok, RequestState} = wapi_wallet_handler:prepare(OperationID, Req, Context, Opts),
         #{authorize := Authorize, process := Process} = RequestState,
         {ok, Resolution} = Authorize(),
         case Resolution of
@@ -114,15 +109,11 @@ respond_if_forbidden(forbidden, Response) ->
 respond_if_forbidden(allowed, _Response) ->
     allowed.
 
-get_handler(wallet) -> wapi_wallet_handler;
-get_handler(payres) -> wapi_payres_handler.
-
--spec create_woody_context(tag(), req_data()) -> woody_context:ctx().
-create_woody_context(Tag, #{'X-Request-ID' := RequestID}) ->
+-spec create_woody_context(req_data()) -> woody_context:ctx().
+create_woody_context(#{'X-Request-ID' := RequestID}) ->
     RpcID = #{trace_id := TraceID} = woody_context:new_rpc_id(genlib:to_binary(RequestID)),
     ok = scoper:add_meta(#{request_id => RequestID, trace_id => TraceID}),
-    _ = logger:debug("Created TraceID for the request"),
-    woody_context:new(RpcID, undefined, wapi_woody_client:get_service_deadline(Tag)).
+    woody_context:new(RpcID, undefined, wapi_woody_client:get_service_deadline(wallet)).
 
 attach_deadline(undefined, Context) ->
     Context;

apps/wapi/src/wapi_redact_event_handler.erl

@@ -0,0 +1,67 @@
+-module(wapi_redact_event_handler).
+
+-export([new/2]).
+
+-behaviour(woody_event_handler).
+-export([handle_event/4]).
+
+-type secret() :: binary().
+-type options() :: {[secret()], woody:ev_handlers()}.
+
+-spec new([secret()], woody:ev_handlers()) ->
+    woody:handler(options()).
+new(Secrets, Handlers) ->
+    {?MODULE, {lists:usort(Secrets), Handlers}}.
+
+-spec handle_event(Event, RpcId, Meta, Opts) -> ok when
+    Event :: woody_event_handler:event(),
+    RpcId :: woody:rpc_id() | undefined,
+    Meta :: woody_event_handler:event_meta(),
+    Opts :: options().
+handle_event(Event, RpcID, Meta, {Secrets, Handlers}) ->
+    FilteredMeta = filter_meta(Meta, Secrets),
+    woody_event_handler:handle_event(Handlers, Event, RpcID, FilteredMeta).
+
+-define(REDACTED, <<"***">>).
+-define(FALLBACK, <<"*FALLBACK*">>).
+
+filter_meta(Meta, Secrets) ->
+    maps:map(fun(Name, Value) -> filter(Name, Value, Secrets) end, Meta).
+
+filter(Meta, Value, Secrets) when
+    Meta == args;
+    Meta == result;
+    Meta == reason;
+    Meta == error;
+    Meta == stack
+->
+    filter(Value, Secrets);
+filter(_, Value, _Secrets) ->
+    Value.
+
+%% common
+filter(L, Secrets) when is_list(L) ->
+    [filter(E, Secrets) || E <- L];
+filter(T, Secrets) when is_tuple(T) ->
+    list_to_tuple(filter(tuple_to_list(T), Secrets));
+filter(M, Secrets) when is_map(M) ->
+    genlib_map:truemap(fun(K, V) -> {filter(K, Secrets), filter(V, Secrets)} end, M);
+filter(B, Secrets) when is_binary(B) ->
+    binary:replace(B, Secrets, ?REDACTED, [global]);
+filter(V, _) when is_atom(V) ->
+    V;
+filter(V, _) when is_number(V) ->
+    V;
+filter(P, _) when is_pid(P) ->
+    P;
+filter(P, _) when is_port(P) ->
+    P;
+filter(F, _) when is_function(F) ->
+    F;
+filter(R, _) when is_reference(R) ->
+    R;
+%% NOTE
+%% Fallback. Notably covers «bitstrings-but-not-binaries» which are unexpected in
+%% the context of Woody RPC anyway.
+filter(_V, _) ->
+    ?FALLBACK.

apps/wapi/src/wapi_stream_h.erl

@@ -63,11 +63,8 @@ handle_response({response, Code, Headers, Body}) when Code >= 500 ->
 handle_response({response, _, _, _} = Resp) ->
     Resp.
 
-%% cowboy_req:reply/4 has a faulty spec in case of response body fun.
-%-dialyzer({[no_contracts, no_fail_call], send_oops_resp/4}).
-
 send_oops_resp(Code, Headers, undefined, Req) ->
-    {Code, Headers, Req};
+    {response, Code, Headers, Req};
 send_oops_resp(Code, Headers0, File, _) ->
     FileSize = filelib:file_size(File),
     Headers = maps:merge(Headers0, #{