Request 1699 (accepted)

guam.spec Changed

@@ -18,30 +18,72 @@
 %{!?_unitdir: %global _unitdir /usr/lib/systemd/system}
 
 Name:               guam
-Version:            0.7.2
-Release:            1%{?dist}
+Version:            0.8
+Release:            0.20160219.git%{?dist}
 Summary:            A Smart Reverse IMAP Proxy
 
 Group:              System Environment/Daemons
 License:            GPLv3+
 URL:                https://kolab.org/about/guam
 
-# From refs/tags/guam-0.7.2
-Source0:            guam-0.7.2.tar.gz
-
-BuildRequires:      erlang
-BuildRequires:      erlang-eimap >= 0.1.5
-BuildRequires:      erlang-goldrush
-BuildRequires:      erlang-lager >= 2.1.0
+# From 3e4a3da61124e9c79b7f7f49516e6e86aa072051
+Source0:            guam-0.8.tar.gz
+
+Patch9991:          guam-0.8-T1312-set-HOME-environment-variable-in-sysvinit-script.patch
+
+Patch0001:          0001-introduce-net_iface-for-listeners.patch
+Patch0002:          0002-lets-start-keeping-a-changelog.patch
+Patch0003:          0003-enable-ipv6-by-default.patch
+Patch0004:          0004-update-this-function-for-the-data-structure-change-i.patch
+Patch0005:          0005-correct-version-of-eimap-though-this-is-like-to-bump.patch
+Patch0006:          0006-fix-typo.patch
+Patch0007:          0007-Correct-the-actual-version-back-to-0.8.patch
+Patch0008:          0008-Relax-dependency-on-lager.patch
+Patch0009:          0001-make-add_starttls_to_capabilities-work-also-on-the-f.patch
+Patch0010:          0006-correct-response-for-mplicit_tls-listeners.patch
+Patch0011:          0007-do-a-full-OK-CAPABILITY-banner-for-all-correct_hello.patch
+Patch0012:          0008-remove-AUTH-entries-put-LOGINDISABLED-if-we-put-up-a.patch
+Patch0013:          0011-switch-to-triggering-on-any-list-where-the-last-two-.patch
+
+BuildRequires:      erlang >= 17.4
+BuildRequires:      erlang-asn1
+BuildRequires:      erlang-common_test
+BuildRequires:      erlang-compiler
+BuildRequires:      erlang-crypto
+BuildRequires:      erlang-debugger
+BuildRequires:      erlang-eimap >= 0.2.4
+BuildRequires:      erlang-erts
+BuildRequires:      erlang-et
+BuildRequires:      erlang-goldrush >= 0.1.8
+BuildRequires:      erlang-kernel
+BuildRequires:      erlang-lager >= 3.1.0
+BuildRequires:      erlang-lager_syslog >= 2.0.3
+BuildRequires:      erlang-mnesia
+BuildRequires:      erlang-observer
+BuildRequires:      erlang-public_key
 BuildRequires:      erlang-rebar >= 2.5.1
+BuildRequires:      erlang-runtime_tools
+BuildRequires:      erlang-sasl
+BuildRequires:      erlang-snmp
+BuildRequires:      erlang-ssh
+BuildRequires:      erlang-ssl
+BuildRequires:      erlang-stdlib
+BuildRequires:      erlang-syntax_tools
+BuildRequires:      erlang-syslog >= 1.0.3
+BuildRequires:      erlang-test_server
+BuildRequires:      erlang-tools
+BuildRequires:      erlang-webtool
+BuildRequires:      erlang-wx
+BuildRequires:      erlang-xmerl
 
 Requires(pre):      shadow-utils
 Requires(postun):   shadow-utils
 
-Requires:           erlang
+Requires:           erlang >= 17.4
 Requires:           erlang-eimap >= 0.1.2
 Requires:           erlang-goldrush
 Requires:           erlang-lager >= 2.1.0
+Requires:           erlang-lager_syslog >= 1.0.3
 
 %if 0%{?with_systemd}
 %if 0%{?suse_version}
@@ -69,6 +111,22 @@
 %prep
 %setup -q
 
+%patch9991 -p1
+
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1
+%patch0005 -p1
+%patch0006 -p1
+%patch0007 -p1
+%patch0008 -p1
+%patch0009 -p1
+%patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
+
 %build
 rebar compile
 mkdir -p deps
@@ -84,12 +142,17 @@
     %{buildroot}%{_sysconfdir}/guam/ \
 %if 0%{?with_systemd}
     %{buildroot}%{_unitdir}/ \
+%else
+    %{buildroot}%{_initddir}/ \
 %endif
     %{buildroot}%{_var}/log/
 
 %if 0%{?with_systemd}
-install -p -m 644 guam.service \
+install -p -m 644 contrib/guam.service \
     %{buildroot}%{_unitdir}/guam.service
+%else
+install -p -m 755 %{SOURCE1} \
+    %{buildroot}%{_initddir}/guam
 %endif
 
 cp -a rel/%{realname} %{buildroot}/opt/.
@@ -108,9 +171,28 @@
 mv %{buildroot}/opt/%{realname}/log %{buildroot}%{_var}/log/guam
 ln -s ../..%{_var}/log/guam %{buildroot}/opt/%{realname}/log
 
+pushd %{buildroot}/opt/%{realname}/lib
+for dir in $(ls -d */ | grep -v kolab_guam); do
+    dir=$(basename ${dir})
+    if [ ! -d %{_libdir}/erlang/lib/${dir} ]; then
+        echo "Skipping deletion of ${dir}, no equivalent in %{_libdir}/erlang/lib/"
+    else
+        rm -rvf ${dir}
+        ln -sv ../../..%{_libdir}/erlang/lib/${dir} ${dir}
+    fi
+done
+popd
+
 %check
 rebar skip_deps=true eunit -v
 
+%pretrans
+pushd /opt/kolab_guam/lib
+for dir in $(ls -d */ | grep -v kolab_guam); do
+    dir=$(basename ${dir})
+    rm -rf -- ${dir}
+done
+
 %pre
 if [ $1 == 1 ]; then
     /usr/sbin/groupadd --system %{guam_group} 2> /dev/null || :
@@ -138,6 +220,13 @@
 test -f /etc/sysconfig/guam-disable-posttrans || \
     systemctl try-restart guam.service 2>&1 || :
 
+%else
+%post
+chkconfig --add guam >/dev/null 2>&1 || :
+
+%posttrans
+test -f /etc/sysconfig/guam-disable-posttrans || \
+    %{_bindir}/service restart guam 2>&1 || :
 %endif
 
 %files
@@ -147,16 +236,15 @@
 
 %if 0%{?with_systemd}
 %{_unitdir}/%{name}.service
+%else
+%{_initddir}/%{name}
 %endif
 
 /opt/%{realname}/
 
 %changelog
-* Wed Mar  2 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.2-1
-- Release 0.7.2
-
-* Thu Feb  4 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.1-2
-- Add environment variable HOME
+* Fri Jun 10 2016 Aaron Seigo <seigo@kolabsystems.com>
+- Package version 0.8
 
 * Tue Feb  2 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.1-1
 - Check in systemd init script fixes

0001-introduce-net_iface-for-listeners.patch Added

@@ -0,0 +1,89 @@
+From f527fde7a659f67314adb161025965b242655b83 Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Tue, 5 Jan 2016 10:49:13 +0100
+Subject: [PATCH 1/8] introduce net_iface for listeners
+
+---
+ apps/kolab_guam/src/kolab_guam_listener.erl | 17 +++++++++++++----
+ docs/deployment.md                          | 16 ++++++++++++++--
+ 2 files changed, 27 insertions(+), 6 deletions(-)
+
+diff --git a/apps/kolab_guam/src/kolab_guam_listener.erl b/apps/kolab_guam/src/kolab_guam_listener.erl
+index 7b7a283..c50b4b1 100644
+--- a/apps/kolab_guam/src/kolab_guam_listener.erl
++++ b/apps/kolab_guam/src/kolab_guam_listener.erl
+@@ -35,11 +35,12 @@ start_link(Name, Config) -> supervisor:start_link(?MODULE, [Name, Config]).
+ %% gen_server API
+ init([Name, Config]) ->
+     Host = proplists:get_value(host, Config, none),
++    NetIface = proplists:get_value(net_iface, Config, none),
+     Port = proplists:get_value(port, Config, ?DEFAULT_IMAP_PORT),
+     ImplicitTLS = proplists:get_value(implicit_tls, Config, false),
+     TLSConfig = proplists:get_value(tls_config, Config, []),
+     Rules = proplists:get_value(rules, Config, []),
+-    Options = listen_options(Host, ImplicitTLS, TLSConfig),
++    Options = listen_options(NetIface, Host, ImplicitTLS, TLSConfig),
+     lager:info("Starting listener \"~p\" on port ~B (~p) with ~B rules", [Name, Port, Options, length(Rules)]),
+     { ok, ListenSocket } = listen(ImplicitTLS, Port, Options),
+     spawn_link(?MODULE, cleanup, [ListenSocket]),
+@@ -55,13 +56,21 @@ init([Name, Config]) ->
+ imap_config(none) -> kolab_guam_sup:default_imap_server_config();
+ imap_config(Backend) -> kolab_guam_sup:imap_server_config(Backend).
+ 
+-listen_options(none, ImplicitTLS, TLSConfig) -> default_listen_options(ImplicitTLS, TLSConfig);
+-listen_options(Hostname, ImplicitTLS, TLSConfig) ->
++listen_options(none, none, ImplicitTLS, TLSConfig) -> default_listen_options(ImplicitTLS, TLSConfig);
++listen_options(none, Hostname, ImplicitTLS, TLSConfig) ->
+     case inet:gethostbyname(Hostname) of
+         { ok, { hostent, _HostName, _Unused, inet, _Ver, [IP] } } ->
+             [ { ip, IP } | default_listen_options(ImplicitTLS, TLSConfig) ];
+         _ ->
+-            listen_options(none, ImplicitTLS, TLSConfig)
++            listen_options(none, none, ImplicitTLS, TLSConfig)
++    end;
++listen_options(Iface, Hostname, ImplicitTLS, TLSConfig) ->
++    { ok, Ifaces } = inet:getifaddrs(),
++    case proplists:get_value(Iface, Ifaces) of
++        undefined -> listen_options(none, Hostname, ImplicitTLS, TLSConfig);
++        Info -> Addr = proplists:get_value(addr, Info, none),
++                lager:info("YEAH! ~p", [Addr]),
++                listen_options(none, Addr, ImplicitTLS, TLSConfig)
+     end.
+ 
+ default_listen_options(true, TLSConfig) -> [ { reuseaddr, true }, {active, once } | TLSConfig ];
+diff --git a/docs/deployment.md b/docs/deployment.md
+index 33cd450..484d0ed 100644
+--- a/docs/deployment.md
++++ b/docs/deployment.md
+@@ -84,14 +84,26 @@ contains the configuration specifics. Example:
+                 { rules, [ { filter_groupware, [] } ] },
+                 { tls_config, [ { certfile, "/etc/ssl/sample.pem" } ] }
+             ]
++       },
++       { default, [
++                { net_iface, "eth0" },
++                { port, 1993 },
++                { imap_server, default },
++                { implicit_tls, true },
++                { rules, [ { filter_groupware, [] } ] },
++                { tls_config, [ { certfile, "/etc/ssl/sample.pem" } ] }
++            ]
+         }
+     }
+ 
+ The host entry is optional, and is used to bind the connection to a specific
+-network interface. Leaving it empty will cause Guam to bind to the port accross
++network interface by ip address. Alternatively, the net_iface may be defined and
++guam will attempt to bind to an address on that network device. net_iface overrides
++host, though host will be used as a fallback if net_iface does not produce a network
++interface. Leaving host and net_iface empty will cause Guam to bind to the port accross
+ all network interfaces available to it.
+ 
+-port defines the port it is listening on.
++port defines the port the listener is active on.
+ 
+ imap_server refers to the entry in the imap_servers block. If not provided, the
+ default entry in the imap_servers configuration is used.
+-- 
+2.5.5
+

0001-make-add_starttls_to_capabilities-work-also-on-the-f.patch Added

@@ -0,0 +1,37 @@
+From f1df1fe2766912652a57c4c2cc1706e8eecf529f Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Tue, 28 Jun 2016 08:47:19 +0200
+Subject: [PATCH] make add_starttls_to_capabilities work also on the first
+ hello response
+
+.. which does not have a CAPABILITIES clause. do try to be put it after the
+the IMAP4v1 clause, though, for neatness
+---
+ apps/kolab_guam/src/kolab_guam_session.erl | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/apps/kolab_guam/src/kolab_guam_session.erl b/apps/kolab_guam/src/kolab_guam_session.erl
+index 9439018..1f3869b 100644
+--- a/apps/kolab_guam/src/kolab_guam_session.erl
++++ b/apps/kolab_guam/src/kolab_guam_session.erl
+@@ -296,7 +296,16 @@ ensure_hello_has_starttls(ServerResponse) ->
+ 
+ add_starttls_to_capabilities(ServerHello) ->
+     case binary:match(ServerHello, <<"CAPABILITY ">>) of
+-        nomatch -> ServerHello;
++        nomatch -> add_starttls_after_imap4_atom(ServerHello);
++        { Start, End } ->
++            Prefix = binary:part(ServerHello, 0, Start + End),
++            Suffix = binary:part(ServerHello, Start + End, size(ServerHello) - Start - End),
++            <<Prefix/binary, "STARTTLS ", Suffix/binary>>
++    end.
++
++add_starttls_after_imap4_atom(ServerHello) ->
++    case binary:match(ServerHello, <<"IMAP4rev1 ">>) of
++        nomatch -> <<"STARTTLS ", ServerHello/binary>>;
+         { Start, End } ->
+             Prefix = binary:part(ServerHello, 0, Start + End),
+             Suffix = binary:part(ServerHello, Start + End, size(ServerHello) - Start - End),
+-- 
+2.5.5
+

0002-lets-start-keeping-a-changelog.patch Added

@@ -0,0 +1,44 @@
+From fde09ae6dd5b38642d8712893f39066d8f4f2091 Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Mon, 13 Jun 2016 10:28:02 +0200
+Subject: [PATCH 2/8] lets start keeping a changelog
+
+---
+ CHANGELOG.md | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+ create mode 100644 CHANGELOG.md
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+new file mode 100644
+index 0000000..5f04931
+--- /dev/null
++++ b/CHANGELOG.md
+@@ -0,0 +1,25 @@
++# Changelog
++All notable changes to this project will be documented in this file.
++
++This project adheres to [Semantic Versioning](http://semver.org/).
++
++## [Unreleased]
++### Added
++- bind to a network interface (rather than an IP/host) with net_iface
++### Changed
++- upgraded build to rebar3
++### Deprecated
++### Removed
++### Fixed
++### Security
++
++
++## [0.8.0] - 2016-06-08
++### Added
++- systemd service module
++- sysv init script
++### Changed
++- Upgraded eimap to 0.2.4
++### Fixed
++- Support more variations of the LIST command args in the filter_groupware rule
++
+-- 
+2.5.5
+

0003-enable-ipv6-by-default.patch Added

@@ -0,0 +1,51 @@
+From 86b9e66beabe4b61e7d091b8df7ad30e293c0cca Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Mon, 20 Jun 2016 12:20:06 +0200
+Subject: [PATCH 3/8] enable ipv6 by default
+
+Summary:
+Set the listen socket to ipv6 mode always
+
+Tested and works with ipv4 addresses as well
+
+Reviewers: #guam_developers, vanmeeuwen
+
+Reviewed By: vanmeeuwen
+
+Differential Revision: https://git.kolab.org/D185
+---
+ apps/kolab_guam/src/kolab_guam_listener.erl | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/apps/kolab_guam/src/kolab_guam_listener.erl b/apps/kolab_guam/src/kolab_guam_listener.erl
+index c50b4b1..ebb0c99 100644
+--- a/apps/kolab_guam/src/kolab_guam_listener.erl
++++ b/apps/kolab_guam/src/kolab_guam_listener.erl
+@@ -56,6 +56,7 @@ init([Name, Config]) ->
+ imap_config(none) -> kolab_guam_sup:default_imap_server_config();
+ imap_config(Backend) -> kolab_guam_sup:imap_server_config(Backend).
+ 
++-spec listen_options(Iface :: string(), Hostname :: string(), ImplicitTLS :: boolean(), TLSConfig :: list()) -> list().
+ listen_options(none, none, ImplicitTLS, TLSConfig) -> default_listen_options(ImplicitTLS, TLSConfig);
+ listen_options(none, Hostname, ImplicitTLS, TLSConfig) ->
+     case inet:gethostbyname(Hostname) of
+@@ -69,12 +70,13 @@ listen_options(Iface, Hostname, ImplicitTLS, TLSConfig) ->
+     case proplists:get_value(Iface, Ifaces) of
+         undefined -> listen_options(none, Hostname, ImplicitTLS, TLSConfig);
+         Info -> Addr = proplists:get_value(addr, Info, none),
+-                lager:info("YEAH! ~p", [Addr]),
++                %lager:info("YEAH! ~p", [Addr]),
+                 listen_options(none, Addr, ImplicitTLS, TLSConfig)
+     end.
+ 
+-default_listen_options(true, TLSConfig) -> [ { reuseaddr, true }, {active, once } | TLSConfig ];
+-default_listen_options(_ImplicitTLS, _Config) ->  [ { active, once }, { reuseaddr, true } ].
++default_listen_options(true, TLSConfig) -> default_listen_options() ++ TLSConfig;
++default_listen_options(_ImplicitTLS, _Config) -> default_listen_options().
++default_listen_options() -> [ { reuseaddr, true }, {active, once }, inet6 ].
+ 
+ create_initial_listeners(PID) when is_pid(PID) ->
+     lager:debug("Creating session pool for listener ~p", [PID]),
+-- 
+2.5.5
+

0004-update-this-function-for-the-data-structure-change-i.patch Added

@@ -0,0 +1,27 @@
+From 130349adeef36dcbcf65e5435d16e66974f60804 Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Mon, 20 Jun 2016 13:31:59 +0200
+Subject: [PATCH 4/8] update this function for the data structure change in
+ eimap 0.2
+
+---
+ apps/kolab_guam/src/kolab_guam_session.erl | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/apps/kolab_guam/src/kolab_guam_session.erl b/apps/kolab_guam/src/kolab_guam_session.erl
+index 60a28cb..69e239c 100644
+--- a/apps/kolab_guam/src/kolab_guam_session.erl
++++ b/apps/kolab_guam/src/kolab_guam_session.erl
+@@ -303,7 +303,8 @@ add_starttls_to_capabilities(ServerHello) ->
+             <<Prefix/binary, "STARTTLS ", Suffix/binary>>
+     end.
+ 
+-ensure_hello_does_not_have_starttls(ServerHello) ->
++ensure_hello_does_not_have_starttls(ServerResponse) ->
++    ServerHello = proplists:get_value(capabilities, ServerResponse, <<>>),
+     case binary:match(ServerHello, <<"STARTTLS">>) of
+         nomatch -> ServerHello;
+         { Start, End } ->
+-- 
+2.5.5
+

0005-correct-version-of-eimap-though-this-is-like-to-bump.patch Added

@@ -0,0 +1,26 @@
+From 1341368e92efcda4d98d0a12a61ce14a102c324b Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Mon, 20 Jun 2016 16:57:34 +0200
+Subject: [PATCH 5/8] correct version of eimap (though this is like to bump
+ again to 0.2.5)
+
+---
+ rebar.config | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rebar.config b/rebar.config
+index bd55f4e..3dafb5a 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -5,7 +5,7 @@
+ { deps, [
+     { lager, "(2.0|2.1|2.2).*", { git, "git://github.com/basho/lager.git", { tag, "2.2.0" } } },
+     { lager_syslog, "2.*", { git, "git://github.com/basho/lager_syslog.git", { tag, "2.1.3" } } },
+-    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.2.2" } } }
++    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.2.4" } } }
+     %% pull in the proper version of meck before jobs 0.3 gets around to pulling in the wrong version
+    ]
+ }.
+-- 
+2.5.5
+

0006-correct-response-for-mplicit_tls-listeners.patch Added

@@ -0,0 +1,58 @@
+From 18bd1abb8a1221b16b2ec53641b07d8ef49130ea Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Fri, 1 Jul 2016 12:40:04 +0200
+Subject: [PATCH 6/8] correct response for mplicit_tls listeners
+
+---
+ apps/kolab_guam/src/kolab_guam_session.erl | 20 ++++++++++++++------
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/apps/kolab_guam/src/kolab_guam_session.erl b/apps/kolab_guam/src/kolab_guam_session.erl
+index 1f3869b..df195a1 100644
+--- a/apps/kolab_guam/src/kolab_guam_session.erl
++++ b/apps/kolab_guam/src/kolab_guam_session.erl
+@@ -71,8 +71,8 @@ handle_info({ tcp, Socket, Data }, #state{ client_tls_active = false } = State)
+ handle_info({ ssl, Socket, Data }, State) ->
+     %lager:debug("Data coming in from client over SSL, ~p", [Data]),
+     process_client_data(Socket, Data, State);
+-handle_info({ server_hello, ServerHello }, #state{ imap_session = ImapSession, tls_config = TLSConfig, socket = Socket, client_tls_active = TLSActive, deflator = Deflator } = State) ->
+-    CorrectedHello = correct_hello(TLSActive, TLSConfig, ServerHello),
++handle_info({ server_hello, ServerHello }, #state{ imap_session = ImapSession, tls_config = TLSConfig, socket = Socket, client_implicit_tls = ImplicitTLS, client_tls_active = TLSActive, deflator = Deflator } = State) ->
++    CorrectedHello = correct_hello(TLSActive, ImplicitTLS, TLSConfig, ServerHello),
+     eimap:start_passthrough(ImapSession, self()),
+     relay_response(Socket, postprocess_server_data(Deflator, <<CorrectedHello/binary, "\r\n">>), TLSActive),
+     { noreply, State };
+@@ -275,18 +275,26 @@ start_client_compression(Socket, TLS, Tag) ->
+ set_socket_active(true, Socket) -> ssl:setopts(Socket, [{ active, once }]);
+ set_socket_active(_, Socket) -> inet:setopts(Socket, [{ active, once }]).
+ 
+--spec correct_hello(TLSActive :: true | false, TlSConfig :: [] | list(), ServerHello :: binary()) -> CorrectedHello :: binary().
+-correct_hello(true, _TLSConfig, ServerHello) ->
++-spec correct_hello(TLSActive :: true | false, ImplicitTLS :: true | false, TlSConfig :: [] | list(), ServerHello :: binary()) -> CorrectedHello :: binary().
++correct_hello(true, true, _TLSConfig, ServerHello) ->
++    % the connection is already secured, so don't advertise starttls to the client
++    build_hello_for_implicit_tls(ServerHello);
++correct_hello(true, _ImplicitTLS, _TLSConfig, ServerHello) ->
+     % the connection is already secured, so don't advertise starttls to the client
+     ensure_hello_does_not_have_starttls(ServerHello);
+-correct_hello(_TLSActive, [], ServerHello) ->
++correct_hello(_TLSActive, _ImplicitTLS, [], ServerHello) ->
+     % guam does not have a TLS config and so can not provide TLS to the client
+     ensure_hello_does_not_have_starttls(ServerHello);
+-correct_hello(_TLSActive, _TLSConfig, ServerHello) ->
++correct_hello(_TLSActive, _ImplicitTLS, _TLSConfig, ServerHello) ->
+     % guam has a TLS config, and it is not currently active, so make sure to include
+     % STARTTLS in our response regardless of what the backend says
+     ensure_hello_has_starttls(ServerHello).
+ 
++build_hello_for_implicit_tls(ServerResponse) ->
++    NoTLSCapabilities = ensure_hello_does_not_have_starttls(ServerResponse),
++    ServerIdent = proplists:get_value(server_id, ServerResponse, <<>>),
++    <<"* OK [CAPABILITIES ", NoTLSCapabilities/binary, "] ", ServerIdent/binary>>.
++
+ ensure_hello_has_starttls(ServerResponse) ->
+     ServerHello = proplists:get_value(capabilities, ServerResponse, <<>>),
+     case binary:match(ServerHello, <<"STARTTLS">>) of
+-- 
+2.5.5
+

0006-fix-typo.patch Added

@@ -0,0 +1,25 @@
+From 06f22152fbb0daf5b1d5cc471cf5de5c587246f7 Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Mon, 20 Jun 2016 16:57:58 +0200
+Subject: [PATCH 6/8] fix typo
+
+---
+ apps/kolab_guam/src/kolab_guam_session.erl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apps/kolab_guam/src/kolab_guam_session.erl b/apps/kolab_guam/src/kolab_guam_session.erl
+index 69e239c..9439018 100644
+--- a/apps/kolab_guam/src/kolab_guam_session.erl
++++ b/apps/kolab_guam/src/kolab_guam_session.erl
+@@ -282,7 +282,7 @@ correct_hello(true, _TLSConfig, ServerHello) ->
+ correct_hello(_TLSActive, [], ServerHello) ->
+     % guam does not have a TLS config and so can not provide TLS to the client
+     ensure_hello_does_not_have_starttls(ServerHello);
+-correct_hello(_TLSAcive, _TLSConfig, ServerHello) ->
++correct_hello(_TLSActive, _TLSConfig, ServerHello) ->
+     % guam has a TLS config, and it is not currently active, so make sure to include
+     % STARTTLS in our response regardless of what the backend says
+     ensure_hello_has_starttls(ServerHello).
+-- 
+2.5.5
+

0007-Correct-the-actual-version-back-to-0.8.patch Added

0007-do-a-full-OK-CAPABILITY-banner-for-all-correct_hello.patch Added

@@ -0,0 +1,62 @@
+From 75ce99f2226438cab4cf57cb8b7dbbe6e4d22885 Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Fri, 1 Jul 2016 12:44:09 +0200
+Subject: [PATCH 7/8] do a full "* OK [CAPABILITY" banner for all correct_hello
+ paths
+
+---
+ apps/kolab_guam/src/kolab_guam_session.erl | 25 +++++++++++--------------
+ 1 file changed, 11 insertions(+), 14 deletions(-)
+
+diff --git a/apps/kolab_guam/src/kolab_guam_session.erl b/apps/kolab_guam/src/kolab_guam_session.erl
+index df195a1..fb9c72b 100644
+--- a/apps/kolab_guam/src/kolab_guam_session.erl
++++ b/apps/kolab_guam/src/kolab_guam_session.erl
+@@ -73,8 +73,10 @@ handle_info({ ssl, Socket, Data }, State) ->
+     process_client_data(Socket, Data, State);
+ handle_info({ server_hello, ServerHello }, #state{ imap_session = ImapSession, tls_config = TLSConfig, socket = Socket, client_implicit_tls = ImplicitTLS, client_tls_active = TLSActive, deflator = Deflator } = State) ->
+     CorrectedHello = correct_hello(TLSActive, ImplicitTLS, TLSConfig, ServerHello),
++    ServerIdent = proplists:get_value(server_id, ServerHello, <<>>),
++    FullGreeting = <<"* OK [CAPABILITIES ", CorrectedHello/binary, "] ", ServerIdent/binary, "\r\n">>,
+     eimap:start_passthrough(ImapSession, self()),
+-    relay_response(Socket, postprocess_server_data(Deflator, <<CorrectedHello/binary, "\r\n">>), TLSActive),
++    relay_response(Socket, postprocess_server_data(Deflator, FullGreeting), TLSActive),
+     { noreply, State };
+ handle_info({ { rule_data, Module, ResponseToken }, Data }, #state{ rules_active = ActiveRules } = State) ->
+     %lager:debug("Got back data requested by rule ~p: ~p", [Module, Data]),
+@@ -276,24 +278,19 @@ set_socket_active(true, Socket) -> ssl:setopts(Socket, [{ active, once }]);
+ set_socket_active(_, Socket) -> inet:setopts(Socket, [{ active, once }]).
+ 
+ -spec correct_hello(TLSActive :: true | false, ImplicitTLS :: true | false, TlSConfig :: [] | list(), ServerHello :: binary()) -> CorrectedHello :: binary().
+-correct_hello(true, true, _TLSConfig, ServerHello) ->
++correct_hello(true, true, _TLSConfig, ServerResponse) ->
+     % the connection is already secured, so don't advertise starttls to the client
+-    build_hello_for_implicit_tls(ServerHello);
+-correct_hello(true, _ImplicitTLS, _TLSConfig, ServerHello) ->
++    ensure_hello_does_not_have_starttls(ServerResponse);
++correct_hello(true, _ImplicitTLS, _TLSConfig, ServerResponse) ->
+     % the connection is already secured, so don't advertise starttls to the client
+-    ensure_hello_does_not_have_starttls(ServerHello);
+-correct_hello(_TLSActive, _ImplicitTLS, [], ServerHello) ->
++    ensure_hello_does_not_have_starttls(ServerResponse);
++correct_hello(_TLSActive, _ImplicitTLS, [], ServerResponse) ->
+     % guam does not have a TLS config and so can not provide TLS to the client
+-    ensure_hello_does_not_have_starttls(ServerHello);
+-correct_hello(_TLSActive, _ImplicitTLS, _TLSConfig, ServerHello) ->
++    ensure_hello_does_not_have_starttls(ServerResponse);
++correct_hello(_TLSActive, _ImplicitTLS, _TLSConfig, ServerResponse) ->
+     % guam has a TLS config, and it is not currently active, so make sure to include
+     % STARTTLS in our response regardless of what the backend says
+-    ensure_hello_has_starttls(ServerHello).
+-
+-build_hello_for_implicit_tls(ServerResponse) ->
+-    NoTLSCapabilities = ensure_hello_does_not_have_starttls(ServerResponse),
+-    ServerIdent = proplists:get_value(server_id, ServerResponse, <<>>),
+-    <<"* OK [CAPABILITIES ", NoTLSCapabilities/binary, "] ", ServerIdent/binary>>.
++    ensure_hello_has_starttls(ServerResponse).
+ 
+ ensure_hello_has_starttls(ServerResponse) ->
+     ServerHello = proplists:get_value(capabilities, ServerResponse, <<>>),
+-- 
+2.5.5
+

0008-Relax-dependency-on-lager.patch Added

0008-remove-AUTH-entries-put-LOGINDISABLED-if-we-put-up-a.patch Added

@@ -0,0 +1,63 @@
+From 4cb9fd2e94f7746e5ec05f0cd3c1c7cca895efa3 Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Fri, 1 Jul 2016 13:16:16 +0200
+Subject: [PATCH 8/8] remove AUTH= entries, put LOGINDISABLED if we put up a
+ STARTTLS
+
+---
+ apps/kolab_guam/src/kolab_guam_session.erl | 28 ++++++++++++++++++++++++++--
+ 1 file changed, 26 insertions(+), 2 deletions(-)
+
+diff --git a/apps/kolab_guam/src/kolab_guam_session.erl b/apps/kolab_guam/src/kolab_guam_session.erl
+index fb9c72b..79114b1 100644
+--- a/apps/kolab_guam/src/kolab_guam_session.erl
++++ b/apps/kolab_guam/src/kolab_guam_session.erl
+@@ -305,7 +305,8 @@ add_starttls_to_capabilities(ServerHello) ->
+         { Start, End } ->
+             Prefix = binary:part(ServerHello, 0, Start + End),
+             Suffix = binary:part(ServerHello, Start + End, size(ServerHello) - Start - End),
+-            <<Prefix/binary, "STARTTLS ", Suffix/binary>>
++            CorrectHello = <<Prefix/binary, "STARTTLS ", Suffix/binary>>,
++            remove_auth_offers(CorrectHello)
+     end.
+ 
+ add_starttls_after_imap4_atom(ServerHello) ->
+@@ -314,7 +315,8 @@ add_starttls_after_imap4_atom(ServerHello) ->
+         { Start, End } ->
+             Prefix = binary:part(ServerHello, 0, Start + End),
+             Suffix = binary:part(ServerHello, Start + End, size(ServerHello) - Start - End),
+-            <<Prefix/binary, "STARTTLS ", Suffix/binary>>
++            CorrectHello = <<Prefix/binary, "STARTTLS ", Suffix/binary>>,
++            remove_auth_offers(CorrectHello)
+     end.
+ 
+ ensure_hello_does_not_have_starttls(ServerResponse) ->
+@@ -327,3 +329,25 @@ ensure_hello_does_not_have_starttls(ServerResponse) ->
+             <<Prefix/binary, Suffix/binary>>
+     end.
+ 
++remove_auth_offers(ServerHello) ->
++    case binary:match(ServerHello, <<"AUTH=">>) of
++        nomatch -> ensure_advertise_login_disabled(ServerHello);
++        { Start, End } ->
++            Prefix = binary:part(ServerHello, 0, Start),
++            Suffix =
++            case binary:match(ServerHello, <<" ">>, [{ scope, { Start, size(ServerHello) - Start } }]) of
++                nomatch ->
++                    %% end of the line, so no suffix
++                    <<>>;
++                { SpaceStart, SpaceEnd } ->
++                    binary:part(ServerHello, SpaceStart + SpaceEnd, size(ServerHello) - SpaceStart - SpaceEnd)
++            end,
++            remove_auth_offers(<<Prefix/binary, Suffix/binary>>)
++    end.
++
++ensure_advertise_login_disabled(ServerHello) ->
++    case binary:match(ServerHello, <<"LOGINDISABLED">>) of
++        nomatch -> <<ServerHello/binary, " LOGINDISABLED">>;
++        _ -> ServerHello
++    end.
++
+-- 
+2.5.5
+

0011-switch-to-triggering-on-any-list-where-the-last-two-.patch Added

@@ -0,0 +1,61 @@
+From 7a96caca1d8f8db6f6d7bd625867d5eb292694f0 Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Mon, 4 Jul 2016 09:47:46 +0200
+Subject: [PATCH 11/11] switch to triggering on any list where the last two
+ bytes are not ""
+
+if the suffix of the command is "" that means "this is not really a LIST
+command, rather I am wanting the root and separator" .. otherwise known
+as IMAP's poorly considered attempt at a poor man's NAMESPACE command
+---
+ .../src/rules/kolab_guam_rule_filter_groupware.erl       | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl b/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl
+index a383ad9..49211aa 100644
+--- a/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl
++++ b/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl
+@@ -27,14 +27,12 @@ new(_Config) -> #state { blacklist = undefined }.
+ applies(_ConnectionDetails, Buffer, State) ->
+     { _Tag, Command, Data } = eimap_utils:split_command_into_components(Buffer),
+     %lager:debug("********** Checking ...~n    Command: ~s ~s", [Command, Data]),
+-    { apply_if_id_matches(Command, Data, State#state.trigger_commands), State }.
++    { apply_if_id_matches(Command, Data, State), State }.
+ 
+ apply_to_client_message(ImapSession, Buffer, State) ->
+     { Tag, Command, Data } = eimap_utils:split_command_into_components(Buffer),
+     { Active, StateTag }=
+-    case lists:any(fun(T) -> (Command =:= T) andalso
+-                             ((binary:match(Data, <<"*">>) =/= nomatch) orelse (binary:match(Data, <<"%">>) =/= nomatch)) end,
+-                   State#state.trigger_commands) of
++    case is_triggering_command(Command, Data, State) of
+         true -> fetch_metadata(ImapSession, State), { true, Tag };
+         _ -> { false, <<>> }
+     end,
+@@ -55,16 +53,20 @@ imap_data(blacklist, Response, State) ->
+     State#state{ blacklist = Blacklist }.
+ 
+ %%PRIVATE
++is_triggering_command(Command, Data, #state{ trigger_commands = TriggerCommands }) ->
++    lists:any(fun(T) -> (Command =:= T) andalso (binary:longest_common_suffix([Data, <<"\"\"">>]) =:= 2) end,
++              TriggerCommands).
++
+ 
+ fetch_metadata(none, #state{ blacklist = undefined }) -> ok;
+ fetch_metadata(ImapSession, #state{ blacklist = undefined }) ->
+     eimap:get_folder_metadata(ImapSession, self(), { rule_data, ?MODULE, blacklist }, "*", ["/shared/vendor/kolab/folder-type"]);
+ fetch_metadata(_ImapSession, _State) -> ok.
+ 
+-apply_if_id_matches(<<"ID">>, Data, _TriggerCommands) ->
++apply_if_id_matches(<<"ID">>, Data, _State) ->
+     apply_if_found_kolab(binary:match(Data, <<"/Kolab">>));
+-apply_if_id_matches(Command, _Data, TriggerCommands) ->
+-    case lists:any(fun(T) -> Command =:= T end, TriggerCommands) of
++apply_if_id_matches(Command, Data, State) ->
++    case is_triggering_command(Command, Data, State) of
+         true -> true;
+         _ -> notyet
+     end.
+-- 
+2.5.5
+

guam-0.8-T1312-set-HOME-environment-variable-in-sysvinit-script.patch Added

guam-0.8-debian-concat.patch Added

@@ -0,0 +1,225 @@
+diff -ur guam-0.8.orig/apps/kolab_guam/src/kolab_guam_listener.erl guam-0.8/apps/kolab_guam/src/kolab_guam_listener.erl
+--- guam-0.8.orig/apps/kolab_guam/src/kolab_guam_listener.erl	2016-06-08 14:18:58.000000000 +0200
++++ guam-0.8/apps/kolab_guam/src/kolab_guam_listener.erl	2016-07-01 13:33:11.784314048 +0200
+@@ -35,11 +35,12 @@
+ %% gen_server API
+ init([Name, Config]) ->
+     Host = proplists:get_value(host, Config, none),
++    NetIface = proplists:get_value(net_iface, Config, none),
+     Port = proplists:get_value(port, Config, ?DEFAULT_IMAP_PORT),
+     ImplicitTLS = proplists:get_value(implicit_tls, Config, false),
+     TLSConfig = proplists:get_value(tls_config, Config, []),
+     Rules = proplists:get_value(rules, Config, []),
+-    Options = listen_options(Host, ImplicitTLS, TLSConfig),
++    Options = listen_options(NetIface, Host, ImplicitTLS, TLSConfig),
+     lager:info("Starting listener \"~p\" on port ~B (~p) with ~B rules", [Name, Port, Options, length(Rules)]),
+     { ok, ListenSocket } = listen(ImplicitTLS, Port, Options),
+     spawn_link(?MODULE, cleanup, [ListenSocket]),
+@@ -55,17 +56,27 @@
+ imap_config(none) -> kolab_guam_sup:default_imap_server_config();
+ imap_config(Backend) -> kolab_guam_sup:imap_server_config(Backend).
+ 
+-listen_options(none, ImplicitTLS, TLSConfig) -> default_listen_options(ImplicitTLS, TLSConfig);
+-listen_options(Hostname, ImplicitTLS, TLSConfig) ->
++-spec listen_options(Iface :: string(), Hostname :: string(), ImplicitTLS :: boolean(), TLSConfig :: list()) -> list().
++listen_options(none, none, ImplicitTLS, TLSConfig) -> default_listen_options(ImplicitTLS, TLSConfig);
++listen_options(none, Hostname, ImplicitTLS, TLSConfig) ->
+     case inet:gethostbyname(Hostname) of
+         { ok, { hostent, _HostName, _Unused, inet, _Ver, [IP] } } ->
+             [ { ip, IP } | default_listen_options(ImplicitTLS, TLSConfig) ];
+         _ ->
+-            listen_options(none, ImplicitTLS, TLSConfig)
++            listen_options(none, none, ImplicitTLS, TLSConfig)
++    end;
++listen_options(Iface, Hostname, ImplicitTLS, TLSConfig) ->
++    { ok, Ifaces } = inet:getifaddrs(),
++    case proplists:get_value(Iface, Ifaces) of
++        undefined -> listen_options(none, Hostname, ImplicitTLS, TLSConfig);
++        Info -> Addr = proplists:get_value(addr, Info, none),
++                %lager:info("YEAH! ~p", [Addr]),
++                listen_options(none, Addr, ImplicitTLS, TLSConfig)
+     end.
+ 
+-default_listen_options(true, TLSConfig) -> [ { reuseaddr, true }, {active, once } | TLSConfig ];
+-default_listen_options(_ImplicitTLS, _Config) ->  [ { active, once }, { reuseaddr, true } ].
++default_listen_options(true, TLSConfig) -> default_listen_options() ++ TLSConfig;
++default_listen_options(_ImplicitTLS, _Config) -> default_listen_options().
++default_listen_options() -> [ { reuseaddr, true }, {active, once }, inet6 ].
+ 
+ create_initial_listeners(PID) when is_pid(PID) ->
+     lager:debug("Creating session pool for listener ~p", [PID]),
+diff -ur guam-0.8.orig/apps/kolab_guam/src/kolab_guam_session.erl guam-0.8/apps/kolab_guam/src/kolab_guam_session.erl
+--- guam-0.8.orig/apps/kolab_guam/src/kolab_guam_session.erl	2016-06-08 14:18:58.000000000 +0200
++++ guam-0.8/apps/kolab_guam/src/kolab_guam_session.erl	2016-07-01 13:34:12.008992665 +0200
+@@ -71,10 +71,12 @@
+ handle_info({ ssl, Socket, Data }, State) ->
+     %lager:debug("Data coming in from client over SSL, ~p", [Data]),
+     process_client_data(Socket, Data, State);
+-handle_info({ server_hello, ServerHello }, #state{ imap_session = ImapSession, tls_config = TLSConfig, socket = Socket, client_tls_active = TLSActive, deflator = Deflator } = State) ->
+-    CorrectedHello = correct_hello(TLSActive, TLSConfig, ServerHello),
++handle_info({ server_hello, ServerHello }, #state{ imap_session = ImapSession, tls_config = TLSConfig, socket = Socket, client_implicit_tls = ImplicitTLS, client_tls_active = TLSActive, deflator = Deflator } = State) ->
++    CorrectedHello = correct_hello(TLSActive, ImplicitTLS, TLSConfig, ServerHello),
++    ServerIdent = proplists:get_value(server_id, ServerHello, <<>>),
++    FullGreeting = <<"* OK [CAPABILITIES ", CorrectedHello/binary, "] ", ServerIdent/binary, "\r\n">>,
+     eimap:start_passthrough(ImapSession, self()),
+-    relay_response(Socket, postprocess_server_data(Deflator, <<CorrectedHello/binary, "\r\n">>), TLSActive),
++    relay_response(Socket, postprocess_server_data(Deflator, FullGreeting), TLSActive),
+     { noreply, State };
+ handle_info({ { rule_data, Module, ResponseToken }, Data }, #state{ rules_active = ActiveRules } = State) ->
+     %lager:debug("Got back data requested by rule ~p: ~p", [Module, Data]),
+@@ -275,17 +277,20 @@
+ set_socket_active(true, Socket) -> ssl:setopts(Socket, [{ active, once }]);
+ set_socket_active(_, Socket) -> inet:setopts(Socket, [{ active, once }]).
+ 
+--spec correct_hello(TLSActive :: true | false, TlSConfig :: [] | list(), ServerHello :: binary()) -> CorrectedHello :: binary().
+-correct_hello(true, _TLSConfig, ServerHello) ->
++-spec correct_hello(TLSActive :: true | false, ImplicitTLS :: true | false, TlSConfig :: [] | list(), ServerHello :: binary()) -> CorrectedHello :: binary().
++correct_hello(true, true, _TLSConfig, ServerResponse) ->
+     % the connection is already secured, so don't advertise starttls to the client
+-    ensure_hello_does_not_have_starttls(ServerHello);
+-correct_hello(_TLSActive, [], ServerHello) ->
++    ensure_hello_does_not_have_starttls(ServerResponse);
++correct_hello(true, _ImplicitTLS, _TLSConfig, ServerResponse) ->
++    % the connection is already secured, so don't advertise starttls to the client
++    ensure_hello_does_not_have_starttls(ServerResponse);
++correct_hello(_TLSActive, _ImplicitTLS, [], ServerResponse) ->
+     % guam does not have a TLS config and so can not provide TLS to the client
+-    ensure_hello_does_not_have_starttls(ServerHello);
+-correct_hello(_TLSAcive, _TLSConfig, ServerHello) ->
++    ensure_hello_does_not_have_starttls(ServerResponse);
++correct_hello(_TLSActive, _ImplicitTLS, _TLSConfig, ServerResponse) ->
+     % guam has a TLS config, and it is not currently active, so make sure to include
+     % STARTTLS in our response regardless of what the backend says
+-    ensure_hello_has_starttls(ServerHello).
++    ensure_hello_has_starttls(ServerResponse).
+ 
+ ensure_hello_has_starttls(ServerResponse) ->
+     ServerHello = proplists:get_value(capabilities, ServerResponse, <<>>),
+@@ -296,14 +301,26 @@
+ 
+ add_starttls_to_capabilities(ServerHello) ->
+     case binary:match(ServerHello, <<"CAPABILITY ">>) of
+-        nomatch -> ServerHello;
++        nomatch -> add_starttls_after_imap4_atom(ServerHello);
++        { Start, End } ->
++            Prefix = binary:part(ServerHello, 0, Start + End),
++            Suffix = binary:part(ServerHello, Start + End, size(ServerHello) - Start - End),
++            CorrectHello = <<Prefix/binary, "STARTTLS ", Suffix/binary>>,
++            remove_auth_offers(CorrectHello)
++    end.
++
++add_starttls_after_imap4_atom(ServerHello) ->
++    case binary:match(ServerHello, <<"IMAP4rev1 ">>) of
++        nomatch -> <<"STARTTLS ", ServerHello/binary>>;
+         { Start, End } ->
+             Prefix = binary:part(ServerHello, 0, Start + End),
+             Suffix = binary:part(ServerHello, Start + End, size(ServerHello) - Start - End),
+-            <<Prefix/binary, "STARTTLS ", Suffix/binary>>
++            CorrectHello = <<Prefix/binary, "STARTTLS ", Suffix/binary>>,
++            remove_auth_offers(CorrectHello)
+     end.
+ 
+-ensure_hello_does_not_have_starttls(ServerHello) ->
++ensure_hello_does_not_have_starttls(ServerResponse) ->
++    ServerHello = proplists:get_value(capabilities, ServerResponse, <<>>),
+     case binary:match(ServerHello, <<"STARTTLS">>) of
+         nomatch -> ServerHello;
+         { Start, End } ->
+@@ -312,3 +329,25 @@
+             <<Prefix/binary, Suffix/binary>>
+     end.
+ 
++remove_auth_offers(ServerHello) ->
++    case binary:match(ServerHello, <<"AUTH=">>) of
++        nomatch -> ensure_advertise_login_disabled(ServerHello);
++        { Start, End } ->
++            Prefix = binary:part(ServerHello, 0, Start),
++            Suffix =
++            case binary:match(ServerHello, <<" ">>, [{ scope, { Start, size(ServerHello) - Start } }]) of
++                nomatch ->
++                    %% end of the line, so no suffix
++                    <<>>;
++                { SpaceStart, SpaceEnd } ->
++                    binary:part(ServerHello, SpaceStart + SpaceEnd, size(ServerHello) - SpaceStart - SpaceEnd)
++            end,
++            remove_auth_offers(<<Prefix/binary, Suffix/binary>>)
++    end.
++
++ensure_advertise_login_disabled(ServerHello) ->
++    case binary:match(ServerHello, <<"LOGINDISABLED">>) of
++        nomatch -> <<ServerHello/binary, " LOGINDISABLED">>;
++        _ -> ServerHello
++    end.
++
+Only in guam-0.8: CHANGELOG.md
+diff -ur guam-0.8.orig/contrib/guam.sysvinit guam-0.8/contrib/guam.sysvinit
+--- guam-0.8.orig/contrib/guam.sysvinit	2016-06-08 14:18:58.000000000 +0200
++++ guam-0.8/contrib/guam.sysvinit	2016-07-01 13:33:49.086734379 +0200
+@@ -11,6 +11,8 @@
+ 
+ name=`basename $0`
+ 
++export HOME=/opt/kolab_guam/
++
+ start_cmd="$name start"
+ restart_cmd="$name restart"
+ stop_cmd="$name stop"
+diff -ur guam-0.8.orig/docs/deployment.md guam-0.8/docs/deployment.md
+--- guam-0.8.orig/docs/deployment.md	2016-06-08 14:18:58.000000000 +0200
++++ guam-0.8/docs/deployment.md	2016-07-01 13:32:52.850100693 +0200
+@@ -84,14 +84,26 @@
+                 { rules, [ { filter_groupware, [] } ] },
+                 { tls_config, [ { certfile, "/etc/ssl/sample.pem" } ] }
+             ]
++       },
++       { default, [
++                { net_iface, "eth0" },
++                { port, 1993 },
++                { imap_server, default },
++                { implicit_tls, true },
++                { rules, [ { filter_groupware, [] } ] },
++                { tls_config, [ { certfile, "/etc/ssl/sample.pem" } ] }
++            ]
+         }
+     }
+ 
+ The host entry is optional, and is used to bind the connection to a specific
+-network interface. Leaving it empty will cause Guam to bind to the port accross
++network interface by ip address. Alternatively, the net_iface may be defined and
++guam will attempt to bind to an address on that network device. net_iface overrides
++host, though host will be used as a fallback if net_iface does not produce a network
++interface. Leaving host and net_iface empty will cause Guam to bind to the port accross
+ all network interfaces available to it.
+ 
+-port defines the port it is listening on.
++port defines the port the listener is active on.
+ 
+ imap_server refers to the entry in the imap_servers block. If not provided, the
+ default entry in the imap_servers configuration is used.
+diff -ur guam-0.8.orig/rebar.config guam-0.8/rebar.config
+--- guam-0.8.orig/rebar.config	2016-06-08 14:18:58.000000000 +0200
++++ guam-0.8/rebar.config	2016-07-01 13:33:41.190645404 +0200
+@@ -3,9 +3,9 @@
+ 
+ { deps_dir, "deps" }.
+ { deps, [
+-    { lager, "(2.0|2.1|2.2).*", { git, "git://github.com/basho/lager.git", { tag, "2.2.0" } } },
++    { lager, "3.*", { git, "git://github.com/basho/lager.git" } },
+     { lager_syslog, "2.*", { git, "git://github.com/basho/lager_syslog.git", { tag, "2.1.3" } } },
+-    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.2.2" } } }
++    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.2.4" } } }
+     %% pull in the proper version of meck before jobs 0.3 gets around to pulling in the wrong version
+    ]
+ }.
+diff -ur guam-0.8.orig/rel/reltool.config guam-0.8/rel/reltool.config
+--- guam-0.8.orig/rel/reltool.config	2016-06-08 14:18:58.000000000 +0200
++++ guam-0.8/rel/reltool.config	2016-07-01 13:33:35.894585727 +0200
+@@ -4,7 +4,7 @@
+        {lib_dirs, ["../deps"]},
+        {erts, [{mod_cond, derived}, {app_file, strip}]},
+        {app_file, strip},
+-       {rel, "kolab_guam", "0.9",
++       {rel, "kolab_guam", "0.8",
+         [
+          kernel,
+          stdlib,

debian.changelog Added

debian.control Added

debian.rules Added

@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpkg/pkg-info.mk
+
+DESTDIR = $(CURDIR)/debian/guam
+
+%:
+	dh $@ --with=systemd
+
+override_dh_auto_build:
+	rebar compile
+	mkdir -p deps
+	cd rel && ENABLE_STATIC=no rebar generate
+
+override_dh_auto_test:
+	rebar skip_deps=true eunit -v
+
+override_dh_auto_install:
+	mkdir -p $(DESTDIR)/opt $(DESTDIR)/usr/sbin $(DESTDIR)/etc/guam \
+	      $(DESTDIR)/lib/systemd/system $(DESTDIR)/var/log
+	install -p -m 644 contrib/guam.service \
+	        $(DESTDIR)/lib/systemd/system/guam.service
+	cp -a rel/kolab_guam $(DESTDIR)/opt/
+	chmod +x $(DESTDIR)/opt/kolab_guam/bin/install_upgrade.escript
+	echo '#!/bin/bash' > $(DESTDIR)/usr/sbin/guam
+	echo 'exec /opt/kolab_guam/bin/kolab_guam $$*' \
+	     >> $(DESTDIR)/usr/sbin/guam
+	mv $(DESTDIR)/opt/kolab_guam/releases/$(DEB_VERSION_UPSTREAM)/sys.config \
+	   $(DESTDIR)/etc/guam/sys.config
+	ln -s ../../../../etc/guam/sys.config \
+	   $(DESTDIR)/opt/kolab_guam/releases/$(DEB_VERSION_UPSTREAM)/sys.config
+	mv $(DESTDIR)/opt/kolab_guam/log $(DESTDIR)/var/log/guam
+	ln -s ../../var/log/guam $(DESTDIR)/opt/kolab_guam/log

debian.series Added

debian.tar.gz Added

guam-0.7.2.tar.gz/cover.spec Deleted

guam-0.7.2.tar.gz/.gitignore -> guam-0.8.tar.gz/.gitignore Changed

guam-0.7.2.tar.gz/Makefile -> guam-0.8.tar.gz/Makefile Changed

guam-0.7.2.tar.gz/app.config -> guam-0.8.tar.gz/app.config Changed

@@ -6,6 +6,68 @@
          {error_logger_mf_dir, "log/sasl"},      % Log directory
          {error_logger_mf_maxbytes, 10485760},   % 10 MB max file size
          {error_logger_mf_maxfiles, 5}           % 5 files max
-        ]}
+        ]},
+{ kolab_guam,
+  [
+    { imap_servers, [
+                { default, [
+                                { host, "192.168.56.101" },
+                                { port, 143 },
+                                { tls, no }
+                           ]
+                },
+                { kolabsys, [
+                                { host, "imap.kolabsys.com" },
+                                { port, 143 },
+                                { tls, starttls }
+                           ]
+                }
+            ]
+    },
+    { listeners, [
+            { default, [
+                         { port, 1143 },
+                         { imap_server, default },
+                         { rules, [
+                                   { filter_groupware, [] }
+                                  ]
+                         },
+                         { tls_config, [ { certfile, "/etc/ssl/sample.pem" } ] }
+                       ]
+            },
+            { default_tls, [
+                         { port, 1993 },
+                         { imap_server, default },
+                         { rules, [
+                                   { filter_groupware, [] }
+                                  ]
+                         },
+                         { implicit_tls, true },
+                         { tls_config, [ { certfile, "/etc/ssl/sample.cert" }, { keyfile, "/etc/ssl/sample.key" } ] }
+                       ]
+            },
+            { kolabsys, [
+                         { port, 1994 },
+                         { imap_server, kolabsys },
+                         { rules, [
+                                   { filter_groupware, [] }
+                                  ]
+                         }
+                       ]
+            }
+        ]
+    }
+  ]
+},
+{ lager,
+  [
+    {
+        handlers,
+        [
+            { lager_console_backend, debug },
+            { lager_file_backend, [ { file, "log/error.log"}, { level, error } ] },
+            { lager_file_backend, [ { file, "log/console.log"}, { level, debug } ] }
+        ] }
+  ] }
 ].

guam-0.7.2.tar.gz/apps/kolab_guam/src/kolab_guam.app.src -> guam-0.8.tar.gz/apps/kolab_guam/src/kolab_guam.app.src Changed

guam-0.7.2.tar.gz/apps/kolab_guam/src/kolab_guam_session.erl -> guam-0.8.tar.gz/apps/kolab_guam/src/kolab_guam_session.erl Changed

@@ -18,7 +18,6 @@
 -module(kolab_guam_session).
 
 -behaviour(gen_server).
--include_lib("eimap/src/eimap.hrl").
 
 %% API
 -export([ start_link/6 ]).
@@ -27,21 +26,21 @@
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
 
 %% state record definition
--record(state, { socket, super_pid, tls_config = [], client_implicit_tls = false, client_tls_active = false, server_config = #eimap_server_config{},
+-record(state, { socket, super_pid, tls_config = [], client_implicit_tls = false, client_tls_active = false, server_config = [],
                  rules_active = [], rules_deciding = [], imap_session, inflator, deflator }).
 
 %% public API
 start_link(SupervisorPID, ListenSocket, ImapConfig, ImplicitTLS, TLSConfig, Rules) -> gen_server:start_link(?MODULE, [SupervisorPID, ListenSocket, ImapConfig, ImplicitTLS, TLSConfig, Rules], []).
 
 %% gen_server API
-init([SupervisorPID, ListenSocket, ImapConfig, ImplicitTLS, TLSConfig, Rules]) ->
+init([SupervisorPID, ListenSocket, ServerConfig, ImplicitTLS, TLSConfig, Rules]) ->
     %% accepting a connection is blocking .. so do it async
     %% lager:debug("Starting a session handler on socket ~p for listener ~p", [ListenSocket, SupervisorPID]),
     process_flag(trap_exit, true),
     ActiveRules = init_rules(Rules),
     gen_server:cast(self(), accept),
     %% lager:debug("Rules are ~p from ~p", [ActiveRules, Rules]),
-    { ok, #state{ socket = ListenSocket, super_pid = SupervisorPID, client_implicit_tls = ImplicitTLS, tls_config = TLSConfig, server_config = ImapConfig, rules_deciding = ActiveRules } }.
+    { ok, #state{ socket = ListenSocket, super_pid = SupervisorPID, client_implicit_tls = ImplicitTLS, tls_config = TLSConfig, server_config = ServerConfig, rules_deciding = ActiveRules } }.
 
 handle_call(_Request, _From, State) ->
     { reply, ok, State }.
@@ -75,7 +74,7 @@
 handle_info({ server_hello, ServerHello }, #state{ imap_session = ImapSession, tls_config = TLSConfig, socket = Socket, client_tls_active = TLSActive, deflator = Deflator } = State) ->
     CorrectedHello = correct_hello(TLSActive, TLSConfig, ServerHello),
     eimap:start_passthrough(ImapSession, self()),
-    relay_response(Socket, postprocess_server_data(Deflator, CorrectedHello), TLSActive),
+    relay_response(Socket, postprocess_server_data(Deflator, <<CorrectedHello/binary, "\r\n">>), TLSActive),
     { noreply, State };
 handle_info({ { rule_data, Module, ResponseToken }, Data }, #state{ rules_active = ActiveRules } = State) ->
     %lager:debug("Got back data requested by rule ~p: ~p", [Module, Data]),
@@ -140,7 +139,7 @@
 close_socket(true, Socket) -> ssl:close(Socket);
 close_socket(_TLS, Socket) -> gen_tcp:close(Socket).
 
-process_client_data(Socket, Data, #state{ rules_deciding = UndecidedRules, tls_config = TLSConfig, client_tls_active = TLS, rules_active = ActiveRules, socket = Socket, imap_session = ImapSession, inflator = Inflator, deflator = Deflator, server_config = #eimap_server_config{ tls = BackendTls } } = State) ->
+process_client_data(Socket, Data, #state{ rules_deciding = UndecidedRules, tls_config = TLSConfig, client_tls_active = TLS, rules_active = ActiveRules, socket = Socket, imap_session = ImapSession, inflator = Inflator, deflator = Deflator, server_config = ServerConfig } = State) ->
     %%TODO: multipacket input from clients
     % TODO: refactor so starttls and compress commands can be made into rules
     PreprocessData = preprocess_client_data(Inflator, Data),
@@ -149,7 +148,7 @@
     case check_for_transmission_change_commands(TLS, TLSConfig, PreprocessData, Deflator, Socket) of
         { socket_upgraded, SSLSocket } ->
             %% if we have upgraded our socket, then do so to the backend if that hasn't happened auomatically
-            case BackendTls of
+            case proplists:get_value(implicit_tls, ServerConfig, false) of
                 false -> eimap:starttls(ImapSession, undefined, undefined);
                 _ -> ok
             end,
@@ -288,7 +287,8 @@
     % STARTTLS in our response regardless of what the backend says
     ensure_hello_has_starttls(ServerHello).
 
-ensure_hello_has_starttls(ServerHello) ->
+ensure_hello_has_starttls(ServerResponse) ->
+    ServerHello = proplists:get_value(capabilities, ServerResponse, <<>>),
     case binary:match(ServerHello, <<"STARTTLS">>) of
         nomatch -> add_starttls_to_capabilities(ServerHello);
         _ -> ServerHello

guam-0.7.2.tar.gz/apps/kolab_guam/src/kolab_guam_sup.erl -> guam-0.8.tar.gz/apps/kolab_guam/src/kolab_guam_sup.erl Changed

@@ -18,10 +18,9 @@
 -module(kolab_guam_sup).
 
 -behaviour(supervisor).
--include_lib("eimap/src/eimap.hrl").
 
 %% API
--export([start_link/0, default_imap_server_config/0, imap_server_config/1, imap_server_settings_to_config/1]).
+-export([start_link/0, default_imap_server_config/0, imap_server_config/1]).
 
 %% Supervisor callbacks
 -export([init/1]).
@@ -37,18 +36,7 @@
 
 imap_server_config(DefinitionName) when is_atom(DefinitionName) ->
     ServerDefinitions = application:get_env(kolab_guam, imap_servers, []),
-    case proplists:get_value(DefinitionName, ServerDefinitions, none) of
-        none -> default_imap_server_config();
-        RawConfig -> imap_server_settings_to_config(RawConfig)
-    end.
-
-imap_server_settings_to_config(Config) when is_list(Config) ->
-    Defaults = #eimap_server_config{ },
-    #eimap_server_config{
-        host = proplists:get_value(host, Config, Defaults#eimap_server_config.host),
-        port = proplists:get_value(port, Config, Defaults#eimap_server_config.port),
-        tls = proplists:get_value(tls, Config, Defaults#eimap_server_config.tls)
-    }.
+    proplists:get_value(DefinitionName, ServerDefinitions, []).
 
 %% ===================================================================
 %% Supervisor callbacks

guam-0.7.2.tar.gz/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl -> guam-0.8.tar.gz/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl Changed

@@ -19,31 +19,24 @@
 -export([new/1, applies/3, imap_data/3, apply_to_client_message/3, apply_to_server_message/3]).
 -behavior(kolab_guam_rule).
 
--record(state, { blacklist = [], tag = <<>>, active = false, last_chunk = <<>> }).
+-record(state, { blacklist = [], tag = <<>>, active = false, last_chunk = <<>>,
+                 trigger_commands = [<<"LIST">>, <<"list">>, <<"XLIST">>, <<"xlist">>, <<"LSUB">>, <<"lsub">>]}).
 
 new(_Config) -> #state { blacklist = undefined }.
 
 applies(_ConnectionDetails, Buffer, State) ->
     { _Tag, Command, Data } = eimap_utils:split_command_into_components(Buffer),
     %lager:debug("********** Checking ...~n    Command: ~s ~s", [Command, Data]),
-    { apply_if_id_matches(Command, Data), State }.
+    { apply_if_id_matches(Command, Data, State#state.trigger_commands), State }.
 
 apply_to_client_message(ImapSession, Buffer, State) ->
     { Tag, Command, Data } = eimap_utils:split_command_into_components(Buffer),
     { Active, StateTag }=
-    if Command =:= <<"LIST">>;
-        Command =:= <<"list">>;
-        Command =:= <<"XLIST">>;
-        Command =:= <<"xlist">>;
-        Command =:= <<"LSUB">>;
-        Command =:= <<"lsub">> ->
-           case binary:match(Data, <<"*">>) of
-                nomatch -> { false, <<>> };
-                _ ->
-                   fetch_metadata(ImapSession, State),
-                   { true, Tag }
-           end;
-       true -> { false, <<>> }
+    case lists:any(fun(T) -> (Command =:= T) andalso
+                             ((binary:match(Data, <<"*">>) =/= nomatch) orelse (binary:match(Data, <<"%">>) =/= nomatch)) end,
+                   State#state.trigger_commands) of
+        true -> fetch_metadata(ImapSession, State), { true, Tag };
+        _ -> { false, <<>> }
     end,
     %lager:info("Client sent: ~s ~s ~p", [Command, Data, Active]),
     { Buffer, State#state{ active = Active, tag = StateTag }}.
@@ -52,6 +45,7 @@
     filter_folders(Buffer, State);
 apply_to_server_message(_ImapSession, Buffer, State) -> { Buffer, State }.
 
+imap_data(blacklist, { error, _Reason }, State) -> State;
 imap_data(blacklist, Response, State) ->
     %TODO: we don't need Foo/Bar if we already have Foo, so filter folders-of-groupwarefolders
     Blacklist = lists:foldl(fun({ _Folder, [ { _Property, null } ]}, Acc) -> Acc;
@@ -62,25 +56,18 @@
 
 %%PRIVATE
 
+fetch_metadata(none, #state{ blacklist = undefined }) -> ok;
 fetch_metadata(ImapSession, #state{ blacklist = undefined }) ->
     eimap:get_folder_metadata(ImapSession, self(), { rule_data, ?MODULE, blacklist }, "*", ["/shared/vendor/kolab/folder-type"]);
 fetch_metadata(_ImapSession, _State) -> ok.
 
-apply_if_id_matches(<<"LIST">>, _Data) ->
-    true;
-apply_if_id_matches(<<"XLIST">>, _Data) ->
-    true;
-apply_if_id_matches(<<"LSUB">>, _Data) ->
-    true;
-apply_if_id_matches(<<"list">>, _Data) ->
-    true;
-apply_if_id_matches(<<"xlist">>, _Data) ->
-    true;
-apply_if_id_matches(<<"lsub">>, _Data) ->
-    true;
-apply_if_id_matches(<<"ID">>, Data) ->
+apply_if_id_matches(<<"ID">>, Data, _TriggerCommands) ->
     apply_if_found_kolab(binary:match(Data, <<"/Kolab">>));
-apply_if_id_matches(_Command, _Data) -> notyet.
+apply_if_id_matches(Command, _Data, TriggerCommands) ->
+    case lists:any(fun(T) -> Command =:= T end, TriggerCommands) of
+        true -> true;
+        _ -> notyet
+    end.
 
 apply_if_found_kolab(nomatch) -> true;
 apply_if_found_kolab(_) -> false.
@@ -138,6 +125,7 @@
 add_response(Response, <<>>) -> Response;
 add_response(Response, Acc) -> <<Acc/binary, "\r\n", Response/binary>>.
 
+in_blacklist(_Folder, undefined) -> false;
 in_blacklist(_Folder, []) -> false;
 in_blacklist(Folder, [{ Literal, Prefix }|List]) ->
     case Literal =:= Folder of

guam-0.7.2.tar.gz/apps/kolab_guam/test/kolab_guam_rules_SUITE.erl -> guam-0.8.tar.gz/apps/kolab_guam/test/kolab_guam_rules_SUITE.erl Changed

guam-0.7.2.tar.gz/apps/kolab_guam/test/kolab_guam_sup_SUITE.erl -> guam-0.8.tar.gz/apps/kolab_guam/test/kolab_guam_sup_SUITE.erl Changed

guam-0.8.tar.gz/contrib Added

guam-0.8.tar.gz/contrib/guam.service Changed

guam-0.8.tar.gz/contrib/guam.sysvinit Added

@@ -0,0 +1,103 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start daemon at boot time
+# Description:       Enable service provided by daemon.
+### END INIT INFO
+
+name=`basename $0`
+
+start_cmd="$name start"
+restart_cmd="$name restart"
+stop_cmd="$name stop"
+ping_cmd="$name ping"
+user=""
+
+
+get_pid() {
+    cat "$pid_file"
+}
+
+is_running() {
+    $ping_cmd > /dev/null 2>&1
+}
+
+case "$1" in
+    start)
+    if is_running; then
+        echo "Already started"
+    else
+        echo "Starting $name"
+        if [ -z "$user" ]; then
+            $start_cmd
+        else
+            sudo -u "$user" $start_cmd
+        fi
+        sleep 2
+        
+        for i in {1..10}
+        do
+            if is_running; then
+                break;
+            fi
+            
+            echo -n "."
+            sleep 1
+        done
+        
+        if ! is_running; then
+            echo "Unable to start"
+            exit 1
+        fi
+    fi
+    ;;
+    stop)
+    if is_running; then
+        echo -n "Stopping $name.."
+        $stop_cmd
+        for i in {1..10}
+        do
+            if ! is_running; then
+                break
+            fi
+
+            echo -n "."
+            sleep 1
+        done
+        echo
+
+        if is_running; then
+            echo "Not stopped; may still be shutting down or shutdown may have failed"
+            exit 1
+        else
+            echo "Stopped"
+            if [ -f "$pid_file" ]; then
+                rm "$pid_file"
+            fi
+        fi
+    else
+        echo "Not running"
+    fi
+    ;;
+    restart)
+    $restart_cmd
+    ;;
+    status)
+    if is_running; then
+        echo "Running"
+    else
+        echo "Stopped"
+        exit 1
+    fi
+    ;;
+    *)
+    echo "Usage: $0 {start|stop|restart|status}"
+    exit 1
+    ;;
+esac
+
+exit 0

guam-0.8.tar.gz/cover.spec.in Added

guam-0.7.2.tar.gz/rebar.config -> guam-0.8.tar.gz/rebar.config Changed

guam-0.7.2.tar.gz/rel/reltool.config -> guam-0.8.tar.gz/rel/reltool.config Changed

guam.dsc Added

Overview

Request 1699 (accepted)

Request History