Request 2725 (accepted)

Overview

Request 2725 (accepted)

Check in 0.4.2

Created by vanmeeuwen over 4 years ago
In state accepted

Submit erlang-eimap

Submit package Kolab:Winterfell / erlang-eimap to package Kolab:16 / erlang-eimap

erlang-eimap.spec Changed

@@ -8,7 +8,7 @@
 %define lock_version() %{1}%{?_isa} = %(rpm -q --queryformat "%%{VERSION}" %{1})
 
 Name:           erlang-%{realname}
-Version:        0.4.0
+Version:        0.4.2
 Release:        1%{?dist}
 Summary:        Erlang IMAP client
 Group:          Development/Libraries
@@ -19,16 +19,16 @@
 %endif
 Source0:        erlang-eimap-%{version}.tar.gz
 
-Patch1:         untagged-commands.patch
-Patch2:         eimap-0.4.0-otp-20.patch
-Patch3:         make-things-easy-for-rebar3.patch
+# Keep rebar3 from downloading dependencies, we want package provide ones.
+Patch1:         nodeps.patch
 
 BuildRequires:	erlang-goldrush
-BuildRequires:	erlang-lager
+BuildRequires:	erlang-lager >= 3.1.0
 BuildRequires:	erlang-rebar3 >= 3.3.2
 
 Requires:       %lock_version erlang-erts
 Requires:       %lock_version erlang-stdlib
+Requires:       %lock_version erlang-lager
 
 %description
 IMAP client library for Erlang
@@ -37,8 +37,6 @@
 %setup -q -n eimap-%{version}
 
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 DEBUG=1
@@ -78,6 +76,13 @@
 %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/*.beam
 
 %changelog
+
+* Wed Apr 15 2020 Christian Mollekopf <mollekopf@kolabsys.com> - 0.4.2-1
+- Upstream release 0.4.2
+
+* Sat Mar 28 2020 Christian Mollekopf <mollekopf@kolabsys.com> - 0.4.1-1
+- Upstream release 0.4.1
+
 * Sun Apr 08 2018 Christoph Erhardt <kolab@sicherha.de> - 0.4.0-1
 - Upstream release 0.4.0

eimap-0.4.0-otp-20.patch Deleted

make-things-easy-for-rebar3.patch Deleted

nodeps.patch Added

untagged-commands.patch Deleted

@@ -1,43 +0,0 @@
-diff --git a/src/eimap_utils.erl b/src/eimap_utils.erl
-index 163229b..230ab60 100644
---- a/src/eimap_utils.erl
-+++ b/src/eimap_utils.erl
-@@ -156,14 +156,20 @@ remove_tag_from_response(Buffer, Tag, trust) ->
- %% Private
- split_command(<<>>) -> { <<>>, <<>>, <<>> };
- split_command(Buffer) ->
--    End = eol_found(Buffer, binary:match(Buffer, <<"\r\n">>)),
-+    {Terminated, End} = eol_found(Buffer, binary:match(Buffer, <<"\r\n">>)),
-     { Tag, CommandStart } = searched_in_buffer(Buffer, 0, End, binary:match(Buffer, <<" ">>, [ { scope, { 0, End } } ])),
--    { Command, DataStart } = searched_in_buffer(Buffer, CommandStart, End, binary:match(Buffer, <<" ">>, [ { scope, { CommandStart, End - CommandStart  } } ])),
--    Data = binary:part(Buffer, DataStart, End - (DataStart)),
--    { Tag, Command, Data }.
-+    case Terminated of
-+         true when End == CommandStart ->
-+            %% when we have a newline, and the tag takes the entire line, the "tag" is actually the command
-+            {<<>>, Tag, <<>>};
-+         _ ->
-+            { Command, DataStart } = searched_in_buffer(Buffer, CommandStart, End, binary:match(Buffer, <<" ">>, [ { scope, { CommandStart, End - CommandStart  } } ])),
-+            Data = binary:part(Buffer, DataStart, End - (DataStart)),
-+            { Tag, Command, Data }
-+    end.
- 
--eol_found(Buffer, nomatch) -> size(Buffer);
--eol_found(_Buffer, { MatchStart, _MatchLength }) -> MatchStart.
-+eol_found(Buffer, nomatch) -> {false, size(Buffer)};
-+eol_found(_Buffer, { MatchStart, _MatchLength }) -> {true, MatchStart}.
- 
- searched_in_buffer(Buffer, Start, End, nomatch) -> { binary:part(Buffer, Start, End - Start), End };
- searched_in_buffer(Buffer, Start, _End, { MatchStart, MatchLength } ) -> { binary:part(Buffer, Start, MatchStart - Start), MatchStart + MatchLength }.
-diff --git a/test/eimap_utils_tests.erl b/test/eimap_utils_tests.erl
-index 389be6f..81631c1 100644
---- a/test/eimap_utils_tests.erl
-+++ b/test/eimap_utils_tests.erl
-@@ -79,6 +79,7 @@ split_command_into_components_test_() ->
-     Data =
-     [
-         { { <<>>, <<>>, <<>> }, <<>> },
-+        { { <<>>, <<"DONE">>, <<>> }, <<"DONE\r\n">> },
-         { { <<".">>, <<"LIST">>, <<"\"\" \"*\"">> }, <<". LIST \"\" \"*\"">> },
-         { { <<"1">>, <<"STARTTLS">>, <<>> }, <<"1 STARTTLS">> },
-         { { <<"1">>, <<"STARTTLS">>, <<>> }, <<"1 STARTTLS\r\n">> },

debian.changelog Changed

debian.series Changed

erlang-eimap-0.4.2.tar.gz/.arcconfig Added

erlang-eimap-0.4.0.tar.gz/CHANGELOG.md -> erlang-eimap-0.4.2.tar.gz/CHANGELOG.md Changed

erlang-eimap-0.4.0.tar.gz/rebar.config -> erlang-eimap-0.4.2.tar.gz/rebar.config Changed

erlang-eimap-0.4.0.tar.gz/rebar3 -> erlang-eimap-0.4.2.tar.gz/rebar3 Changed

erlang-eimap-0.4.0.tar.gz/src/eimap.app.src -> erlang-eimap-0.4.2.tar.gz/src/eimap.app.src Changed

erlang-eimap-0.4.0.tar.gz/src/eimap.erl -> erlang-eimap-0.4.2.tar.gz/src/eimap.erl Changed

@@ -211,6 +211,21 @@
 wait_response({ data, Data }, #state{ current_command = #command{ response_type = ResponseType, parse_state = CommandState , tag = Tag } } = State) ->
     Response = eimap_command:parse_response(ResponseType, Data, Tag, CommandState),
     %%lager:info("Response from parser was ~p ~p, size of queue ~p", [More, Response, queue:len(State#state.command_queue)]),
+    % FIXME
+    % Because several commands can be in flight at the same time, it can happen that we have something like:
+    % * Client send: CMD1, CMD2 (triggering a request for metadata)
+    % * Because we immediately after processing CMD2 from the client request metadata and start waiting for the response,
+    % a response that actually still belongs to CMD1 will not be recognized as such (will end up in here).
+    %
+    % Below is a workaround for that case; If we fail to parse the repsonse we simply assume it's none of our business and pass it trough.
+    %
+    % For a proper fix more work would be required, here are some ideas:
+    % * Track pending tags and only start associating with this command once we have all outstanding tags completed. The problem is that we don't know about pending tags because normally we don't look for them while passing through.
+    % * Buffer data and watch out for any tag. If its not ours pass the data through (would result in performance penalty only while waiting for the command).
+    case Response of
+        {more,{<<>>,[],_}} -> passthrough({data, Data}, State);
+        _ -> {}
+    end,
     NewState = cancel_timeout(State),
     next_command_after_response(Response, NewState);
 wait_response(process_command_queue, State) ->
@@ -404,7 +419,7 @@
 create_socket(Host, Port, _, _Receiver, _ResponseToken, CommandQueue) ->
     { gen_tcp:connect(Host, Port, socket_options(), ?TCP_CONNECT_TIMEOUT), false, self(), CommandQueue }.
 
-socket_options() -> [binary, { active, once }, { send_timeout, 5000 }].
+socket_options() -> [binary, { active, once }, { send_timeout, 5000 }, { keepalive, true }].
 
 upgrade_socket(#state{ socket = Socket, tls_state = true, current_command = Command }) ->
     notify_of_response(starttls_complete, Command),
@@ -478,13 +493,10 @@
     State#state { command_queue = queue:in_r(Command, State#state.command_queue) }.
 
 inflated(Data, #state{ inflator = undefined }) -> Data;
-inflated(Data, #state{ inflator = Inflator }) ->  joined(zlib:inflate(Inflator, Data), <<>>).
+inflated(Data, #state{ inflator = Inflator }) ->  iolist_to_binary(zlib:inflate(Inflator, Data)).
 
 deflated(Data, #state{ deflator = undefined }) -> Data;
-deflated(Data, #state{ deflator = Deflator }) ->  joined(zlib:deflate(Deflator, Data, sync), <<>>).
-
-joined([], Binary) -> Binary;
-joined([H|Rest], Binary) -> joined(Rest, <<Binary/binary, H/binary>>).
+deflated(Data, #state{ deflator = Deflator }) ->  iolist_to_binary(zlib:deflate(Deflator, Data, sync)).
 
 reset_timeout(#state{ command_timeout = Timeout } = State) ->
     cancel_timeout(State),

erlang-eimap-0.4.0.tar.gz/src/eimap_utils.erl -> erlang-eimap-0.4.2.tar.gz/src/eimap_utils.erl Changed

@@ -156,14 +156,20 @@
 %% Private
 split_command(<<>>) -> { <<>>, <<>>, <<>> };
 split_command(Buffer) ->
-    End = eol_found(Buffer, binary:match(Buffer, <<"\r\n">>)),
+    {Terminated, End} = eol_found(Buffer, binary:match(Buffer, <<"\r\n">>)),
     { Tag, CommandStart } = searched_in_buffer(Buffer, 0, End, binary:match(Buffer, <<" ">>, [ { scope, { 0, End } } ])),
-    { Command, DataStart } = searched_in_buffer(Buffer, CommandStart, End, binary:match(Buffer, <<" ">>, [ { scope, { CommandStart, End - CommandStart  } } ])),
-    Data = binary:part(Buffer, DataStart, End - (DataStart)),
-    { Tag, Command, Data }.
+    case Terminated of
+         true when End == CommandStart ->
+            %% when we have a newline, and the tag takes the entire line, the "tag" is actually the command
+            {<<>>, Tag, <<>>};
+         _ ->
+            { Command, DataStart } = searched_in_buffer(Buffer, CommandStart, End, binary:match(Buffer, <<" ">>, [ { scope, { CommandStart, End - CommandStart  } } ])),
+            Data = binary:part(Buffer, DataStart, End - (DataStart)),
+            { Tag, Command, Data }
+    end.
 
-eol_found(Buffer, nomatch) -> size(Buffer);
-eol_found(_Buffer, { MatchStart, _MatchLength }) -> MatchStart.
+eol_found(Buffer, nomatch) -> {false, size(Buffer)};
+eol_found(_Buffer, { MatchStart, _MatchLength }) -> {true, MatchStart}.
 
 searched_in_buffer(Buffer, Start, End, nomatch) -> { binary:part(Buffer, Start, End - Start), End };
 searched_in_buffer(Buffer, Start, _End, { MatchStart, MatchLength } ) -> { binary:part(Buffer, Start, MatchStart - Start), MatchStart + MatchLength }.

erlang-eimap-0.4.0.tar.gz/test/eimap_utils_tests.erl -> erlang-eimap-0.4.2.tar.gz/test/eimap_utils_tests.erl Changed

erlang-eimap.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2725 0

Request History

vanmeeuwen created request over 4 years ago

Check in 0.4.2

vanmeeuwen accepted review over 4 years ago

vanmeeuwen approved review over 4 years ago

vanmeeuwen accepted request over 4 years ago