Kolab Groupware OBS

guam.spec Changed

buildtarball.sh Changed

guam-0.9.11.tar.gz/CHANGELOG.md -> guam-0.9.12.tar.gz/CHANGELOG.md Changed

guam-0.9.11.tar.gz/_checkouts/eimap/CHANGELOG.md -> guam-0.9.12.tar.gz/_checkouts/eimap/CHANGELOG.md Changed

guam-0.9.11.tar.gz/_checkouts/eimap/rebar.config -> guam-0.9.12.tar.gz/_checkouts/eimap/rebar.config Changed

guam-0.9.11.tar.gz/_checkouts/eimap/src/eimap.app.src -> guam-0.9.12.tar.gz/_checkouts/eimap/src/eimap.app.src Changed

guam-0.9.11.tar.gz/_checkouts/eimap/src/eimap_command.erl -> guam-0.9.12.tar.gz/_checkouts/eimap/src/eimap_command.erl Changed

@@ -38,29 +38,29 @@
 
 process_lines(_ParseTaggedLine, _Tag, LastPartialLine, , Acc, Module) -> { more, { LastPartialLine, Acc, Module } };
 process_lines(ParseTaggedLine, Tag, LastPartialLine, Line|MoreLines, Acc, Module) ->
-    { FirstLine, ContinuationBytes } = eimap_utils:num_literal_continuation_bytes(Line),
-    process_line(ContinuationBytes, ParseTaggedLine, eimap_utils:is_tagged_response(FirstLine, Tag), Tag, LastPartialLine, FirstLine, MoreLines, Acc, Module).
+    { FirstLine, ContinuationBytes, Result } = eimap_utils:num_literal_continuation_bytes(Line),
+    process_line(Result, ContinuationBytes, ParseTaggedLine, eimap_utils:is_tagged_response(FirstLine, Tag), Tag, LastPartialLine, FirstLine, MoreLines, Acc, Module).
 
 
-process_line(ContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, Line, <<>>|MoreLines, Acc, Module) ->
+process_line(Result, ContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, Line, <<>>|MoreLines, Acc, Module) ->
     %% skip empty lines
-    process_line(ContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, Line, MoreLines, Acc, Module);
-process_line(0, ParseTaggedLine, tagged, Tag, _LastPartialLine, Line, _MoreLines, Acc, Module) ->
+    process_line(Result, ContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, Line, MoreLines, Acc, Module);
+process_line(none, _ContinuationBytes, ParseTaggedLine, tagged, Tag, _LastPartialLine, Line, _MoreLines, Acc, Module) ->
     Checked = eimap_utils:check_response_for_failure(Line, Tag),
     Module:formulate_response(Checked, parse_tagged(Checked, ParseTaggedLine, Line, Acc, Module));
-process_line(0, ParseTaggedLine, untagged, Tag, LastPartialLine, Line, MoreLines, Acc, Module) ->
     %io:format("Calling it here with ~p~n~n...", Line),
+process_line(none, _ContinuationBytes, ParseTaggedLine, untagged, Tag, LastPartialLine, Line, MoreLines, Acc, Module) ->
     process_lines(ParseTaggedLine, Tag, LastPartialLine, MoreLines, Module:process_line(Line, Acc), Module);
-process_line(ContinuationBytes, ParseTaggedLine, _IsTagged, Tag, LastPartialLine, Line, , Acc, Module) ->
+process_line(_Result, ContinuationBytes, ParseTaggedLine, _IsTagged, Tag, LastPartialLine, Line, , Acc, Module) ->
     %% the line was continued, but there is no more lines ... so this line is now our last partial line. more must be on its way
     io:format("Missing lines!~p~n~n", Acc),
     BytesAsBinary = integer_to_binary(ContinuationBytes),
     process_lines(ParseTaggedLine, Tag, <<Line/binary, ${, BytesAsBinary/binary, $}, LastPartialLine/binary>>, , Acc, Module);
-process_line(_ContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, Line, NextLine|MoreLines, Acc, Module) ->
-    { StrippedNextLine, NextContinuationBytes } = eimap_utils:num_literal_continuation_bytes(NextLine),
+process_line(_Result, _ContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, Line, NextLine|MoreLines, Acc, Module) ->
+    { StrippedNextLine, NextContinuationBytes, Result } = eimap_utils:num_literal_continuation_bytes(NextLine),
     io:format("Connected up the next line: ~p ~i~n", StrippedNextLine, NextContinuationBytes),
     FullLine = <<Line/binary, StrippedNextLine/binary>>,
-    process_line(NextContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, FullLine, MoreLines, Acc, Module).
+    process_line(Result, NextContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, FullLine, MoreLines, Acc, Module).
 
 formulate_response(ok, Data) -> { fini, Data };
 formulate_response({ _, Reason }, _Data) -> { error, Reason }.

guam-0.9.11.tar.gz/_checkouts/eimap/src/eimap_utils.erl -> guam-0.9.12.tar.gz/_checkouts/eimap/src/eimap_utils.erl Changed

@@ -25,7 +25,9 @@
          new_imap_compressors/0,
          only_full_lines/1,
          binary_to_atom/1,
-         num_literal_continuation_bytes/1
+         num_literal_continuation_bytes/1,
+         split_lines/1,
+         split_lines_with_literals/1
         ).
 
 %% Translate the folder name in to a fully qualified folder path such as it
@@ -98,13 +100,13 @@
         _ -> untagged
     end.
 
--spec num_literal_continuation_bytes(Buffer :: binary()) -> { BufferSansContinuation :: binary(), NumberBytes :: integer() }.
+-spec num_literal_continuation_bytes(Buffer :: binary()) -> { BufferSansContinuation :: binary(), NumberBytes :: integer(), found|none }.
 num_literal_continuation_bytes(Buffer) when size(Buffer) < 4 ->
-    { Buffer, 0 };
+    { Buffer, 0, none };
 num_literal_continuation_bytes(Buffer) ->
     case binary:last(Buffer) =:= $} of
         true -> number_of_bytes_in_continuation(Buffer);
-        false -> { Buffer, 0 }
+        false -> { Buffer, 0, none }
     end.
 
 number_of_bytes_in_continuation(Buffer) ->
@@ -120,7 +122,7 @@
     end.
 
 confirm_continuation(Buffer, -1) ->
-    { Buffer, 0 };
+    { Buffer, 0, none };
 confirm_continuation(Buffer, OpenBracePos) ->
     BufferSize = size(Buffer),
     % Strip any '+' following the literal size (due to LITERAL+)
@@ -130,9 +132,9 @@
     end,
 
     try binary_to_integer(LiteralSize) of
-        Result -> { binary:part(Buffer, 0, OpenBracePos), Result }
+        Result -> { binary:part(Buffer, 0, OpenBracePos), Result, found }
     catch
-        _:_ -> { Buffer, 0 }
+        _:_ -> { Buffer, 0, none }
     end.
 
 -spec remove_tag_from_response(Buffer :: binary(), Tag :: undefine | binary(), Check :: check | trust) -> Command :: binary().
@@ -237,6 +239,38 @@
 ensure_binary(Arg) when is_atom(Arg) -> atom_to_binary(Arg, latin1);
 ensure_binary(_Arg) -> <<>>.
 
+% Split Data into a list of lines separated by \r\n (each entry including the \r\n)
+-spec split_lines_with_literals(Buffer :: binary()) -> {CompleteLines :: binary(), TrailingFragmentaryLine :: binary()}.
+split_lines_with_literals(Data) ->
+    Result = split_with_literals(, Data, binary:compile_pattern(<<"\r\n">>), 0),
+    Result.
+
+split_with_literals(Lines, Data, Pattern, Offset) ->
+    case binary:match(Data, Pattern, {scope, {Offset, size(Data) - Offset}}) of
+         nomatch -> {lists:reverse(Lines), Data};
+         { Start, Length } ->
+              case binary:at(Data, max(0, Start - 1)) of
+                  $} -> split_with_literals(Lines, Data, Pattern, Start + 1);
+                  _ -> Num = Start + Length,
+                      <<Line:Num/binary, Remainder/binary>> = Data,
+                      split_with_literals(Line|Lines, Remainder, Pattern, 0)
+              end
+     end.
+
+% Split Data into a list of lines separated by \r\n (each entry including the \r\n)
+-spec split_lines(Buffer :: binary()) -> {CompleteLines :: binary(), TrailingFragmentaryLine :: binary()}.
+split_lines(Data) ->
+    split(, Data, binary:compile_pattern(<<"\r\n">>)).
+
+split(Lines, Data, Pattern) ->
+     case binary:match(Data, Pattern) of
+         nomatch -> {lists:reverse(Lines), Data};
+         { Start, Length } ->
+             Num = Start + Length,
+             <<Line:Num/binary, Remainder/binary>> = Data,
+             split(Line|Lines, Remainder, Pattern)
+     end.
+
 new_imap_compressors() ->
     Inflator = zlib:open(),
     ok = zlib:inflateInit(Inflator, -15),

guam-0.9.11.tar.gz/_checkouts/eimap/test/eimap_command_getmetadata_tests.erl -> guam-0.9.12.tar.gz/_checkouts/eimap/test/eimap_command_getmetadata_tests.erl Changed

guam-0.9.11.tar.gz/_checkouts/eimap/test/eimap_command_tests.erl -> guam-0.9.12.tar.gz/_checkouts/eimap/test/eimap_command_tests.erl Changed

guam-0.9.11.tar.gz/_checkouts/eimap/test/eimap_utils_tests.erl -> guam-0.9.12.tar.gz/_checkouts/eimap/test/eimap_utils_tests.erl Changed

@@ -183,18 +183,34 @@
 num_literal_continuation_bytes_test_() ->
     Data =
     
-        { <<"abcd">>, { <<"abcd">>, 0 } },
-        { <<"abcd{5}">>, { <<"abcd">>, 5 } },
-        { <<"abcd{100}">>, { <<"abcd">>, 100 } },
-        { <<"123abcd{100}">>, { <<"123abcd">>, 100  } },
-        { <<"ab{123abcd{100}">>, { <<"ab{123abcd">>, 100  } },
-        { <<"ab{123abcd{1{00}">>, { <<"ab{123abcd{1">>, 0 } },
-        { <<"abcd{aa0}">>, { <<"abcd{aa0}">>, 0 } },
-        { <<"abcd{10aa0}">>, { <<"abcd{10aa0}">>, 0 } },
-        { <<"abcd100}">>, { <<"abcd100}">>, 0 } },
-        { <<"abcd100}">>, { <<"abcd100}">>, 0 } },
-        { <<"abcd{5+}">>, { <<"abcd">>, 5 } }
+        { <<"abcd">>, { <<"abcd">>, 0, none } },
+        { <<"abcd{0}">>, { <<"abcd">>, 0, found } },
+        { <<"abcd{5}">>, { <<"abcd">>, 5, found } },
+        { <<"abcd{100}">>, { <<"abcd">>, 100, found } },
+        { <<"123abcd{100}">>, { <<"123abcd">>, 100, found  } },
+        { <<"ab{123abcd{100}">>, { <<"ab{123abcd">>, 100, found  } },
+        { <<"ab{123abcd{1{00}">>, { <<"ab{123abcd{1">>, 0, found } },
+        { <<"abcd{aa0}">>, { <<"abcd{aa0}">>, 0, none } },
+        { <<"abcd{10aa0}">>, { <<"abcd{10aa0}">>, 0, none } },
+        { <<"abcd100}">>, { <<"abcd100}">>, 0, none } },
+        { <<"abcd100}">>, { <<"abcd100}">>, 0, none } },
+        { <<"abcd{5+}">>, { <<"abcd">>, 5, found } }
     ,
     lists:foldl(fun({ Input, Output}, Acc) -> ?_assertEqual(Output, eimap_utils:num_literal_continuation_bytes(Input)) | Acc end, , Data).
 
+split_lines_test_() ->
+    Data =
+    
+        { <<"abcd\r\nabcd">>, { <<"abcd\r\n">>, <<"abcd">> } },
+        { <<"\r\nabcd\r\nabcd\r\n\r\n">>, { <<"\r\n">>, <<"abcd\r\n">>, <<"abcd\r\n">>, <<"\r\n">>, <<"">> } }
+    ,
+    lists:foldl(fun({ Input, Output}, Acc) -> ?_assertEqual(Output, eimap_utils:split_lines(Input)) | Acc end, , Data).
 
+split_lines_with_literals_test_() ->
+    Data =
+    
+        { <<"abcd\r\nabcd">>, { <<"abcd\r\n">>, <<"abcd">> } },
+        { <<"\r\nabcd\r\nabcd\r\n\r\n">>, { <<"\r\n">>, <<"abcd\r\n">>, <<"abcd\r\n">>, <<"\r\n">>, <<"">> } },
+        { <<"abcd{5}\r\n12345\r\nabcd{3}">>, { <<"abcd{5}\r\n12345\r\n">>, <<"abcd{3}">> } }
+    ,
+    lists:foldl(fun({ Input, Output}, Acc) -> ?_assertEqual(Output, eimap_utils:split_lines_with_literals(Input)) | Acc end, , Data).

guam-0.9.11.tar.gz/apps/kolab_guam/src/kolab_guam.app.src -> guam-0.9.12.tar.gz/apps/kolab_guam/src/kolab_guam.app.src Changed

guam-0.9.11.tar.gz/apps/kolab_guam/src/kolab_guam_session.erl -> guam-0.9.12.tar.gz/apps/kolab_guam/src/kolab_guam_session.erl Changed

@@ -234,7 +234,7 @@
 process_lines(_Socket, State, , ContinuationBytes, Acc) ->
     {Acc, State#state{ continuation_bytes = ContinuationBytes }};
 process_lines(Socket, State, Line|MoreLines, 0, Acc) ->
-    { _StrippedNextLine, NextContinuationBytes } = eimap_utils:num_literal_continuation_bytes(binary:part(Line, 0, byte_size(Line)-2)),
+    { _StrippedNextLine, NextContinuationBytes, _Result } = eimap_utils:num_literal_continuation_bytes(binary:part(Line, 0, byte_size(Line)-2)),
     {NewAcc, NewState} = process_client_line(Line, Socket, State, Acc),
     process_lines(Socket, NewState, MoreLines, NextContinuationBytes, NewAcc);
 process_lines(Socket, State, Line|MoreLines, ContinuationBytes, Acc) ->
@@ -246,20 +246,6 @@
     end,
     process_lines(Socket, State, Lines, ContinuationBytes - size(LiteralPartOfLine), <<Acc/binary, LiteralPartOfLine/binary>>).
 
-split(Lines, Data, Pattern) ->
-     case binary:match(Data, Pattern) of
-         nomatch -> {lists:reverse(Lines), Data};
-         { Start, Length } ->
-             Num = Start + Length,
-             <<Line:Num/binary, Remainder/binary>> = Data,
-             split(Line|Lines, Remainder, Pattern)
-     end.
-split(Lines, Data) ->
-    split(Lines, Data, binary:compile_pattern(<<"\r\n">>)).
-
-split_lines(Data) ->
-    split(, Data).
-
 % Client data is processed as it comes in, but split up by lines if more than one line comes in at a time.
 % The processing internally buffers data as necessary if it encounters incomplete lines.
 process_client_data(Socket, Data, #state{ inflator = Inflator, continuation_bytes = ContinuationBytes } = State) ->
@@ -267,7 +253,7 @@
     PreprocessData = preprocess_client_data(Inflator, Data, State),
     lager:debug("FROM CLIENT: ~p", PreprocessData),
 
-    {Lines, NewLastPartialLine} = split_lines(PreprocessData),
+    {Lines, NewLastPartialLine} = eimap_utils:split_lines(PreprocessData),
     {Acc, NewState} = process_lines(Socket, State#state{ buffered_client_data = <<>> }, Lines, ContinuationBytes, <<>>),
     #state{ buffered_client_data = DataToBuffer, continuation_bytes = NewContinuationBytes} = NewState,

guam-0.9.11.tar.gz/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl -> guam-0.9.12.tar.gz/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl Changed

@@ -77,22 +77,17 @@
 apply_if_found_kolab(0) -> true;
 apply_if_found_kolab(_) -> false.
 
-possibly_append_newline(<<>>) -> <<>> ;
-possibly_append_newline(Response) -> <<Response/binary, "\r\n">> .
-
 filter_folders(<<>>, State) ->
     { <<>>, State#state{ active = true } };
 filter_folders(Buffer, #state{ last_chunk = LeftOvers } = State) ->
     % Add the left overs from the previous buffer to the current buffer
     FullBuffer = <<LeftOvers/binary, Buffer/binary>>,
-    % From that buffer, only take the complete lines and save off the remainder.
-    { FullLinesBuffer, LastChunk } = eimap_utils:only_full_lines(FullBuffer),
-    % Create a list so we can filter the individual folders
-    ListResponses = binary:split(FullLinesBuffer, <<"\r\n">>,  global ),
-    { Response, More } = filter_folders(State, ListResponses, { <<>>, true }),
-    %io:format("Filtered ... ~p~n", Response),
-    %Note that the last list item does not contain \r\n, so that needs to be added unless we filtered the complete content.
-    { possibly_append_newline(Response), State#state { active = More, last_chunk = LastChunk } }.
+
+    {FullLines, LastChunk} = eimap_utils:split_lines_with_literals(FullBuffer),
+
+    { Response, More } = filter_folders(State, FullLines, { <<>>, true }),
+
+    {<<Response/binary>>, State#state{ active = More, last_chunk = LastChunk}}.
 
 filter_folders(_State, , Return) -> Return;
 filter_folders(_State, _Folders, { Acc, false }) -> { Acc, false };
@@ -129,7 +124,7 @@
             { _Delimiter, Rest, _} = pop_token(binary:part(Details, Pos + 2, byte_size(Details) - Pos - 2)),
             Rest
     end,
-    { Folder, _, _ } = pop_token(list_to_binary(Suffix, <<"\r\n">>)),
+    { Folder, _, _ } = pop_token(Suffix),
 
     %% Check the folder in blacklist
     %% io:format("COMPARING ~p ??? ~p~n", Folder, in_blacklist(Folder, Blacklist)),
@@ -139,7 +134,7 @@
     end.
 
 add_response(Response, <<>>) -> Response;
-add_response(Response, Acc) -> <<Acc/binary, "\r\n", Response/binary>>.
+add_response(Response, Acc) -> <<Acc/binary, Response/binary>>.
 
 in_blacklist(_Folder, undefined) -> false;
 in_blacklist(_Folder, ) -> false;

guam-0.9.11.tar.gz/apps/kolab_guam/test/kolab_guam_rules_SUITE.erl -> guam-0.9.12.tar.gz/apps/kolab_guam/test/kolab_guam_rules_SUITE.erl Changed

guam-0.9.11.tar.gz/apps/kolab_guam/test/kolab_guam_session_SUITE.erl -> guam-0.9.12.tar.gz/apps/kolab_guam/test/kolab_guam_session_SUITE.erl Changed

@@ -154,6 +154,29 @@
       continuation_bytes = 0
      }} = kolab_guam_session:process_client_data(Socket, <<"\r\n">>, IntermediateState8),
 
+    % 0 length literal
+    {<<"y1 APPEND INBOX {0}\r\n\r\n">>, #state{
+      server_config = ServerConfig,
+      buffered_client_data = <<>>,
+      current_command_split = {<<"y1">>,<<"APPEND">>,<<"INBOX {0}">>},
+      command_split_reset_trigger = reset_for_next_client_command
+     }} = kolab_guam_session:process_client_data(Socket, <<"y1 APPEND INBOX {0}\r\n\r\n">>, State#state{ rules_deciding = ActiveRules }),
+
+    % 0 length literal in two lines
+    {<<"y1 APPEND INBOX {0}\r\n">>, #state{
+      server_config = ServerConfig,
+      buffered_client_data = <<>>,
+      current_command_split = {<<"y1">>,<<"APPEND">>,<<"INBOX {0}">>},
+      command_split_reset_trigger = reset_for_next_client_command
+     } = IntermediateState9} = kolab_guam_session:process_client_data(Socket, <<"y1 APPEND INBOX {0}\r\n">>, State#state{ rules_deciding = ActiveRules }),
+
+    {<<"\r\n">>, #state{
+      server_config = ServerConfig,
+      buffered_client_data = <<>>, %This ensures we aren't buffering during the continuation
+      current_command_split = {<<"y1">>,<<"APPEND">>,<<"INBOX {0}">>},
+      command_split_reset_trigger = reset_for_next_client_command,
+      continuation_bytes = 0
+     }} = kolab_guam_session:process_client_data(Socket, <<"\r\n">>, IntermediateState9),
 
     % Don't activate filtering
     {<<"y1 ID (\"name\" \"Test/KOLAB\")\r\n">>, #state{

guam-0.9.12.tar.gz/cache/rebar3/hex/hexpm/packages/pc-1.14.0.etag Added

guam-0.9.12.tar.gz/cache/rebar3/hex/hexpm/packages/pc-1.14.0.tar Added

guam-0.9.11.tar.gz/cache/rebar3/hex/packages.idx -> guam-0.9.12.tar.gz/cache/rebar3/hex/packages.idx Changed

guam-0.9.11.tar.gz/rebar.config -> guam-0.9.12.tar.gz/rebar.config Changed

@@ -10,8 +10,10 @@
 }.
 { deps, 
     lager,
-    { lager_syslog, "3.*", { git, "git://github.com/basho/lager_syslog.git", { tag, "3.0.1" } } },
-    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.4.4" } } }
+    % We pull in syslog to adjust the git url. It's just a dependency of lager_syslog
+    {'syslog', "1.0.*", {git, "https://github.com/Vagabond/erlang-syslog", {branch, "master"} } },
+    { lager_syslog, "3.*", { git, "https://github.com/basho/lager_syslog.git", { tag, "3.0.1" } } },
+    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.4.6" } } }
     %% pull in the proper version of meck before jobs 0.3 gets around to pulling in the wrong version
    
 }.
@@ -23,7 +25,7 @@
 { eunit_opts, verbose, {skip_deps, true } }.
 { eunit_exclude_deps, true }.
 { cover_enabled, true }.
-{ relx,  { release, { guam, "0.9.11" }, kolab_guam},
+{ relx,  { release, { guam, "0.9.12" }, kolab_guam},
                 { dev_mode, false },
                 { include_erts, false },
                 { extended_start_script, true },

Changes of Revision 11