nickva commented on a change in pull request #470: Scheduling Replicator URL: https://github.com/apache/couchdb/pull/470#discussion_r110443989
########## File path: src/couch_replicator/src/couch_replicator_connection.erl ########## @@ -0,0 +1,211 @@ +% Licensed under the Apache License, Version 2.0 (the "License"); you may not +% use this file except in compliance with the License. You may obtain a copy of +% the License at +% +% http://www.apache.org/licenses/LICENSE-2.0 +% +% Unless required by applicable law or agreed to in writing, software +% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +% License for the specific language governing permissions and limitations under +% the License. + +-module(couch_replicator_connection). + +-behavior(gen_server). +-behavior(config_listener). + +-export([start_link/0]). +-export([init/1, handle_call/3, handle_cast/2, handle_info/2]). +-export([code_change/3, terminate/2]). + +-export([acquire/1, relinquish/1]). + +-export([handle_config_change/5, handle_config_terminate/3]). + +-define(DEFAULT_CLOSE_INTERVAL, 90000). +-define(RELISTEN_DELAY, 5000). + +-record(state, { + close_interval, + timer +}). + +-record(connection, { + worker, + host, + port, + mref +}). + +-include_lib("ibrowse/include/ibrowse.hrl"). + + +start_link() -> + gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). + + +init([]) -> + process_flag(trap_exit, true), + ?MODULE = ets:new(?MODULE, [named_table, public, {keypos, #connection.worker}]), + ok = config:listen_for_changes(?MODULE, nil), + Interval = config:get_integer("replicator", "connection_close_interval", ?DEFAULT_CLOSE_INTERVAL), + {ok, Timer} = timer:send_after(Interval, close_idle_connections), + ibrowse:add_config([{inactivity_timeout, Interval}]), + {ok, #state{close_interval=Interval, timer=Timer}}. + + +acquire(URL) when is_binary(URL) -> + acquire(binary_to_list(URL)); + +acquire(URL) -> + case gen_server:call(?MODULE, {acquire, URL}) of + {ok, Worker} -> + link(Worker), + {ok, Worker}; + {error, all_allocated} -> + {ok, Pid} = ibrowse:spawn_link_worker_process(URL), + ok = gen_server:call(?MODULE, {create, URL, Pid}), + {ok, Pid}; + {error, Reason} -> + {error, Reason} + end. + + +relinquish(Worker) -> + unlink(Worker), + gen_server:cast(?MODULE, {relinquish, Worker}). + + +handle_call({acquire, URL}, From, State) -> + {Pid, _Ref} = From, + case ibrowse_lib:parse_url(URL) of + #url{host=Host, port=Port} -> Review comment: After a worker is released I don't see the credentials in it anymore Here is a state of relinquished `ibrowse_http_client:init/1` worker ``` {state,"localhost",15984,infinity,#Ref<0.0.2.22525>,false,undefined,undefined, undefined,undefined,undefined,[],false,#Port<0.32462>,false,[], {[],[]}, undefined,idle,undefined, <<>>, 0,0,[],undefined,undefined,undefined,undefined,false,undefined, undefined, <<>>, undefined,false,undefined,0,undefined} ``` While it was making a request it had adm:pass in there. In other words it doesn't seem like credentials are cached in the worker process after it is released. Dictionary had these fields: ``` my_trace_flag: false ibrowse_trace_token: ["localhost",58,"15984"] http_prot_vsn: "HTTP/1.1" conn_close:"false" '$initial_call': {ibrowse_http_client,init,1} '$ancestors': [<0.23517.1>,0.23508.1>,couch_replicator_scheduler_sup,couch_replicator_sup, <0.369.0>] ``` So I think we might be ok here. It basically has the same issue as current code where worker crashing could spill its credentials in the log sometimes. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
