philpennock / sieve-connect Goto Github PK

$ make
./repo-generate version > versionfile
./repo-generate date > datefile
perl -MFile::Slurp -p < sieve-connect.pre.pl > sieve-connect.pl -e ' \
                BEGIN { $newver = read_file("versionfile"); chomp $newver; }; \
                next unless /VERSION.*MAGIC LINE REPLACED IN DISTRIBUTION/; \
                $_ = qq{our \$VERSION = '"'"'$newver'"'"';\n}; \
        '
Can't modify single ref constructor in scalar assignment at -e line 4, near "qq{our \$VERSION = '$newver';\n};"
syntax error at -e line 5, at EOF
Execution of -e aborted due to compilation errors.
make: *** [sieve-connect.pl] Error 255

CHECKSCRIPT failed: NO "null"

Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.30), passed through in regex; marked by <-- HERE in m/^{ <-- HERE (\d+)\+?}\r?$/ at /usr/bin/sieve-connect line 926.
Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.30), passed through in regex; marked by <-- HERE in m/^{ <-- HERE (\d+)\+?}\r?$/ at /usr/bin/sieve-connect line 1509.
Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.30), passed through in regex; marked by <-- HERE in m/^{ <-- HERE \d+\+?}\r?\n?/ at /usr/bin/sieve-connect line 1525.

This patch adds support for the special case of patched Cyrus servers
which behave differently from what sieve-connect would infer from their
version numbers.

Some modern servers get patched to not resend their capabilities after
STARTTLS.  For example, Kolab's Cyrus gets patched this way to ensure
compatibility with older Kontact versions (Cyrus timsieved
v2.3.16-kolab-nocaps).

sieve-connect simply needs to do nothing in regards to compatibilities
after STARTTLS in this case.  This patch applies this behavior to any
Cyrus servers which carry "nocaps" in their version string.

---
 sieve-connect.pre.pl |   32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/sieve-connect.pre.pl b/sieve-connect.pre.pl
index 0474bcb..20bdb35 100755
--- a/sieve-connect.pre.pl
+++ b/sieve-connect.pre.pl
@@ -699,12 +699,34 @@ if (exists $capa{STARTTLS}) {
        # This means that if they don't support NOOP by 2.3.14, I have to
        # figure out how to decide what is safe and backtrack which version
        # precisely was the first to send the capability response correctly.
+       #
+       # There is also at least one special version which needs special
+       # treatment despite having a higher version number: Kolab's patched
+       # "nocaps" Cyrus version (see below).
        my $use_noop = 1;
-       if (exists $capa{"IMPLEMENTATION"} and
-               $capa{"IMPLEMENTATION"} =~ /^Cyrus timsieved v2\.3\.(\d+)\z/ and
-               $1 >= 13) {
+       my $timsieved_nocaps = 0;
+       my $cyrus_version_extension = '';
+       if (exists $capa{"IMPLEMENTATION"}) {
+           if ($capa{"IMPLEMENTATION"} =~ /^Cyrus timsieved v2\.3\.(\d+)\z/
+                   and $1 >= 13) {
                debug("--- Cyrus drops connection with dubious log msg if send NOOP, skip that");
                $use_noop = 0;
+           } elsif ($capa{"IMPLEMENTATION"} =~
+                   /^Cyrus timsieved v2\.3\.\d+-([\w-]*nocaps)\z/ ) {
+               $cyrus_version_extension = $1;
+               # Special case: Cyrus may have been patched to not resend its
+               # capabilities for compatibility with older Kontact versions.
+               # Kolab does this, for example; see
+               # https://roundup.kolab.org/issue2443.  This patch may even
+               # have been applied to more modern versions such as v2.3.16.
+               # For this reason, we need to specifically check for this case.
+               # If a nocaps server is detected, nothing needs to be done (see
+               # the $timsieved_nocaps check below).
+               debug("--- Special Cyrus server version detected:" .
+                       " $cyrus_version_extension");
+               $use_noop = 0;
+               $timsieved_nocaps = 1;
+           }
        }

        if ($use_noop) {
@@ -713,6 +735,10 @@ if (exists $capa{STARTTLS}) {
                parse_capabilities($sock,
                        sent_a_noop     => $noop_tag,
                        external_first  => $prioritise_auth_external);
+       } elsif ($timsieved_nocaps) {
+           # For the nocaps version of Cyrus, nothing should be done here.
+           debug("--- $cyrus_version_extension: using capabilities" .
+                   " transmitted before STARTTLS!");
        } else {
                parse_capabilities($sock,
                        external_first  => $prioritise_auth_external);

> brew install sieve-connect
==> Downloading https://ghcr.io/v2/homebrew/core/openssl/3/manifests/3.0.1
######################################################################## 100.0%
==> Downloading https://ghcr.io/v2/homebrew/core/openssl/3/blobs/sha256:331a18b7ac0b35d55adb422268c6b08190b378bdfec915a5f6d0b7
==> Downloading from https://pkg-containers.githubusercontent.com/ghcr1/blobs/sha256:331a18b7ac0b35d55adb422268c6b08190b378bdf
######################################################################## 100.0%
==> Downloading https://ghcr.io/v2/homebrew/core/Readline/manifests/8.1.2
curl: (22) The requested URL returned error: 404

Error: sieve-connect: Failed to download resource "Readline_bottle_manifest"
Download failed: https://ghcr.io/v2/homebrew/core/Readline/manifests/8.1.2

brew install sieve-connect --without-readline
==> Downloading https://ghcr.io/v2/homebrew/core/openssl/3/manifests/3.0.1
Already downloaded: /Users/redacted/Library/Caches/Homebrew/downloads/242b5104bb035508bc4a51aad45a97b19ccf3776c4a2d396d0b5e815bce690d1--openssl@3-3.0.1.bottle_manifest.json
[REDACTED]
==> make install
==> perl Makefile.PL INSTALL_BASE=/usr/local/Cellar/sieve-connect/0.90/libexec
==> make PERL5LIB=/usr/local/Cellar/sieve-connect/0.90/libexec/lib:/usr/local/Cellar/sieve-connect/0.90/libexec/lib/perl5
Last 15 lines from /Users/redacted/Library/Logs/Homebrew/sieve-connect/20.make:
	t_werasc (ERASEWORD) found in ltchars
Writing sgtty section of cchars.h... Done.
cc -c   -g -pipe -fno-strict-aliasing -fstack-protector-strong -DPERL_USE_SAFE_PUTENV -Os   -DVERSION=\"2.38\" -DXS_VERSION=\"2.38\"  -iwithsysroot "/System/Library/Perl/5.30/darwin-thread-multi-2level/CORE"   ReadKey.c
rm -f blib/arch/auto/Term/ReadKey/ReadKey.bundle
cc  -bundle -undefined dynamic_lookup -fstack-protector-strong  ReadKey.o  -o blib/arch/auto/Term/ReadKey/ReadKey.bundle  \
	      \

chmod 755 blib/arch/auto/Term/ReadKey/ReadKey.bundle
"/usr/bin/perl" "-Iblib/arch" "-Iblib/lib" ReadKey.pm.PL ReadKey.pm
Can't load 'blib/arch/auto/Term/ReadKey/ReadKey.bundle' for module Term::ReadKey: dlopen(blib/arch/auto/Term/ReadKey/ReadKey.bundle, 0x0001): tried: 'blib/arch/auto/Term/ReadKey/ReadKey.bundle' (relative path not allowed in hardened program), '/usr/lib/ReadKey.bundle' (no such file) at /System/Library/Perl/5.30/darwin-thread-multi-2level/DynaLoader.pm line 197.
 at /System/Library/Perl/5.30/darwin-thread-multi-2level/DynaLoader.pm line 95.
	DynaLoader::croak("Can't load 'blib/arch/auto/Term/ReadKey/ReadKey.bundle' for m"...) called at /System/Library/Perl/5.30/darwin-thread-multi-2level/DynaLoader.pm line 197
	DynaLoader::bootstrap("Term::ReadKey") called at ReadKey.pm.PL line 515
Creating ReadKey.pm
Bootstrapping the XS for blockoptions: make: *** [ReadKey.pm] Error 255

If reporting this issue please do so at (not Homebrew/brew or Homebrew/core):
  https://github.com/philpennock/homebrew-protocols/issues

==> Installing sieve-connect from philpennock/protocols
==> Downloading https://people.spodhuis.org/phil.pennock/software/sieve-connect-0.90.tar.bz2
Already downloaded: ....
Error: An exception occurred within a child process:
  NameError: uninitialized constant #<Class:0x00007fc5021ac6a0>::DATA
Did you mean?  Data
               Date

test@test4:~ >  echo password |  sieve-connect -s server -u user  --passwordfd 0  --localsieve --remotesieve sieve --upload
unable to read "--remotesieve": No such file or directory
test@test4:~ > echo $?
2

test@test4:~ >  echo password |  sieve-connect -s server -u user  --passwordfd 0  --localsieve /tmp/sieve_local --check 
CHECKSCRIPT failed: NO {101}
line 4: error: expecting ',' or end of string list ']', but found identifier.
error: parse failed.

test@test4:~ > echo $?
0

test@test4:~ >  echo password |  sieve-connect -s server -u user  --passwordfd 0  --localsieve --check 
ReadLine support enabled.
>