Request 2142 (superseded)

kolab-autoconf.spec Changed

@@ -15,33 +15,24 @@
 %global httpd_name apache2
 %global httpd_user wwwrun
 %else
-%if 0%{?plesk}
-%global httpd_group roundcube_sysgroup
-%global httpd_name httpd
-%global httpd_user roundcube_sysuser
-%else
 %global httpd_group apache
 %global httpd_name httpd
 %global httpd_user apache
 %endif
-%endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
 Name:       kolab-autoconf
-Version:    1.3.5
+Version:    0.3
 Release:    1%{?dist}
 Summary:    Autodiscovery for clients of Kolab Groupware
 
 Group:      Applications/Internet
 License:    GPLv3+
 URL:        https://kolab.org
-
 Source0:    http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
 
-Requires:       roundcubemail(core) >= 1.5
-BuildRequires:  roundcubemail(core) >= 1.5
-
+Requires:   php-pear(Net_LDAP3)
 Obsoletes:  kolab-autodiscover < %{version}-%{release}
 Provides:   kolab-autodiscover = %{version}-%{release}
 BuildArch:  noarch
@@ -64,56 +55,20 @@
 
 pushd %{buildroot}/%{_datadir}/%{name}/
 ln -s ../../..%{_var}/log/%{name} logs
-rm -rf vendor
-ln -s ../roundcubemail/vendor vendor
 popd
 
-%if 0%{?plesk} < 1
 %{__install} -pm 644 docs/%{name}.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/%{name}.conf
-%endif
-
-%pretrans
-# upgrade path for `vendor` directory -> symlink change. Is just a vendor directory, so we don't do the rpmmoved dance.
-if  -d "/usr/share/kolab-autoconf/vendor" -a ! -L "/usr/share/kolab-autoconf/vendor" ; then
-    rm -rf /usr/share/kolab-autoconf/vendor
-fi
 
 %files
 %defattr(-,root,root,-)
 %doc docs/*
-%if 0%{?plesk} < 1
 %dir %{_ap_sysconfdir}
 %dir %{_ap_sysconfdir}/conf.d
 %config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf
-%endif
 %{_datadir}/%{name}
 %attr(0750,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
-* Wed Sep  1 2021 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 1.3.4-1
-- Release of version 1.3.4
-
-* Thu Jun 24 2021 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 1.3.3-1
-- Release of version 1.3.3
-
-* Tue May 26 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.3.2-2
-- Allow without LDAP authentication
-
-* Mon Mar  2 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.3.2-1
-- Release of version 1.3.2
-
-* Wed Apr 10 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.1-2
-- Fix init_ldap()
-
-* Mon Mar 18 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.1-1
-- Release 1.3.1
-
-* Wed Jun 27 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.3.0-1
-- Release version 1.3.0
-
-* Mon Oct  9 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.3-1
-- Release version 1.3
-
 * Tue Sep 26 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.2-1
 - Release of version 0.2

buildtarball.sh Deleted

debian.changelog Changed

@@ -1,78 +1,6 @@
-kolab-autoconf (1.3.5-1) unstable; urgency=medium
+kolab-autoconf (0.3-1) unstable; urgency=medium
 
-  * PHP 8 fixes
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Thu,  22 Dec 2022 16:24:02 +0100
-
-kolab-autoconf (1.3.4-2) unstable; urgency=medium
-
-  * Symlink to roundcube vendor directory
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Thu,  22 Dec 2022 16:24:02 +0100
-
-kolab-autoconf (1.3.4-1) unstable; urgency=medium
-
-  * Release 1.3.4
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Wed,  1 Sep 2021 16:24:02 +0100
-
-kolab-autoconf (1.3.3-1) unstable; urgency=medium
-
-  * Fix LDAP authentication regression
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Thu, 24 Jun 2021 16:24:02 +0100
-
-kolab-autoconf (1.3.2-3) unstable; urgency=medium
-
-  * Allow without LDAP authentication
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Tue, 26 May 2020 16:24:02 +0100
-
-kolab-autoconf (1.3.2-2) unstable; urgency=medium
-
-  * Release of version 1.3.2
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Mon,  2 Mar 2020 16:24:02 +0100
-
-kolab-autoconf (1.3.1-3) unstable; urgency=medium
-
-  * Create log folder, install autodiscover apache configuration
-
- -- Daniel Hoffend <dh@dotlan.net>  Fri, 31 Jan 2020 23:04:00 +0100
-
-kolab-autoconf (1.3.1-2) unstable; urgency=medium
-
-  * Fix init_ldap()
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Wed, 10 Apr 2019 16:24:02 +0100
-
-kolab-autoconf (1.3.1-1) unstable; urgency=medium
-
-  * Release of version 1.3.1.
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Mon, 18 Mar 2019 16:24:02 +0100
-
-kolab-autoconf (1.3.0-3) unstable; urgency=medium
-
-  * Fix dependency - the Debian package is called php-net-ldap3
-
- -- Christoph Erhardt <kolab@sicherha.de>  Mon, 24 Sep 2018 08:30:49 +0200
-
-kolab-autoconf (1.3.0-2) unstable; urgency=medium
-
-  * Omit requiring php-kolab-net-ldap3 on systems that do not use LDAP
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Wed,  4 Jul 2018 16:24:02 +0100
-
-kolab-autoconf (1.3.0-1) unstable; urgency=medium
-
-  * Adjust dependencies and build dependencies.
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Wed, 27 Jun 2018 16:24:02 +0100
-
-kolab-autoconf (1.3-1) unstable; urgency=medium
-
-  * Release of version 1.3.
+  * Release of version 0.3.
 
  -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Mon,  9 Oct 2017 16:24:02 +0100

debian.control Changed

debian.rules Changed

debian.series Deleted

debian.tar.gz/dirs Deleted

debian.tar.gz/install Changed

debian.tar.gz/links Deleted

debian.tar.gz/logrotate Deleted

debian.tar.gz/postinst Deleted

debian.tar.gz/prerm Deleted

kolab-autoconf-1.3.5.tar.gz/lib/Autodiscover.php -> kolab-autoconf-0.3.tar.gz/lib/Autodiscover.php Changed

@@ -48,11 +48,6 @@
                 $type = 'Microsoft';
                 break;
             }
-            // Microsoft Autodiscover V2
-            elseif (stripos($uri, 'autodiscover.json') !== false) {
-                $type = 'Json';
-                break;
-            }
             // Mozilla Thunderbird (Kmail/Kontact/Evolution)
             else if (strpos($uri, 'config-v1.1.xml') !== false) {
                 $type = 'Mozilla';
@@ -122,18 +117,6 @@
     }
 
     /**
-     * Send 401 Unauthorized to the client end exit
-     */
-    protected function unauthorized($basicauth = true)
-    {
-        if ($basicauth) {
-            header('WWW-Authenticate: Basic realm="'.$_SERVER'HTTP_HOST'.'"');
-        }
-        header('HTTP/1.0 401 Unauthorized');
-        exit;
-    }
-
-    /**
      * Get services configuration
      */
     protected function configure()
@@ -156,7 +139,7 @@
             if ($value = $this->conf->get('autodiscover', $type)) {
                 $params = explode(';', $value);
 
-                $pass_secure = in_array($params1 ?? null, array('CRAM-MD5', 'DIGEST-MD5'));
+                $pass_secure = in_array($params1, array('CRAM-MD5', 'DIGEST-MD5'));
 
                 $host = $params0;
                 $host = str_replace('%d', $this->config'domain', $host);
@@ -165,8 +148,8 @@
                 $this->config$type = array(
                     'hostname'        => $url'host',
                     'port'            => $url'port',
-                    'socketType'      => ($proto_map$url'scheme' ?? false) ?: 'plain',
-                    'username'        => ($this->config'login' ?? false) ?:  $this->config'email',
+                    'socketType'      => $proto_map$url'scheme' ?: 'plain',
+                    'username'        => $this->config'login' ?: $this->config'email',
                     'authentication'  => 'password-' . ($pass_secure ? 'encrypted' : 'cleartext'),
                 );
             }
@@ -186,16 +169,7 @@
     protected function get_user($email, $domain)
     {
         // initialize LDAP connection
-        $result = $this->init_ldap();
-
-        if (!$result) {
-            $this->config = array_merge(
-                $this->config,
-                Array('mail' => $email, 'domain' => $domain)
-            );
-
-            return;
-        }
+        $this->ldap();
 
         // find domain
         if (!$this->ldap->find_domain($domain)) {
@@ -212,17 +186,11 @@
     /**
      * Initialize LDAP connection
      */
-    protected function init_ldap()
+    protected function ldap()
     {
-        $ldap_uri = $this->conf->get('ldap_uri', false);
+        $uri = parse_url($this->conf->get('ldap_uri'));
 
-        if (!$ldap_uri) {
-            return false;
-        }
-
-        $uri = parse_url($ldap_uri);
-
-        $this->_ldap_server  = ($uri'scheme' === 'ldaps' ? 'ldaps://' : '') . $uri'host';
+        $this->_ldap_server  = $uri'host';
         $this->_ldap_port    = $uri'port';
         $this->_ldap_scheme  = $uri'scheme';
         $this->_ldap_bind_dn = $this->conf->get('ldap', 'service_bind_dn');
@@ -233,6 +201,8 @@
             $this->_ldap_port = $this->_ldap_scheme == 'ldaps' ? 636 : 389;
         }
 
+        require_once 'Net/LDAP3.php';
+
         $this->ldap = new Net_LDAP3(array(
             'debug'           => in_array(strtolower($this->conf->get('autodiscover', 'debug_mode')), array('trace', 'debug')),
             'log_hook'        => array($this, 'ldap_log'),
@@ -251,16 +221,12 @@
         // connect to LDAP
         if (!$this->ldap->connect()) {
             $this->error("Storage connection failed");
-            return false;
         }
 
         // bind as the service user
         if (!$this->ldap->bind($this->_ldap_bind_dn, $this->_ldap_bind_pw)) {
             $this->error("Storage connection failed");
-            return false;
         }
-
-        return true;
     }
 
     /**
@@ -314,7 +280,7 @@
         $entries = $result->entries(true);
         $dn      = key($entries);
         $entry   = $entries$dn;
-        $result  = array('dn' => $dn);
+        $result  = array();
 
         foreach ($attributes as $idx => $attr) {
             $result$idx = is_array($entry$attr) ? current($entry$attr) : $entry$attr;
@@ -324,39 +290,6 @@
     }
 
     /**
-     * authenticate a user by his given dn and password
-     */
-    protected function authenticate($dn, $password)
-    {
-        if (empty($this->_ldap_server)) {
-            return false;
-        }
-
-        $ldap = new Net_LDAP3(array(
-            'debug'           => in_array(strtolower($this->conf->get('autodiscover', 'debug_mode')), array('trace', 'debug')),
-            'log_hook'        => array($this, 'ldap_log'),
-            'hosts'           => array($this->_ldap_server),
-            'port'            => $this->_ldap_port,
-            'use_tls'         => $this->_ldap_scheme == 'tls'
-        ));
-
-        // connect to LDAP
-        if (!$ldap->connect()) {
-            $this->error("Storage connection failed");
-            return false;
-        }
-
-        // bind as given userdn
-        if (!$ldap->bind($dn, $password)) {
-            $this->unauthorized();
-            return false;
-        }
-
-        $ldap->close();
-        return true;
-    }
-
-    /**
      * LDAP logging handler
      */
     public function ldap_log($level, $msg)
@@ -367,23 +300,23 @@
 
         switch ($level) {
             case LOG_DEBUG:
-                Log::debug($msg);
+                Log::debug($str . $msg);
                 break;
             case LOG_ERR:
-                Log::error($msg);
+                Log::error($str . $msg);
                 break;
             case LOG_INFO:
-                Log::info($msg);
+                Log::info($str . $msg);
                 break;
             case LOG_WARNING:
-                Log::warning($msg);
+                Log::warning($str . $msg);
                 break;
             case LOG_ALERT:
             case LOG_CRIT:
             case LOG_EMERG:
             case LOG_NOTICE:
             default:
-                Log::trace($msg);
+                Log::trace($str . $msg);
                 break;
         }
     }

kolab-autoconf-1.3.5.tar.gz/lib/AutodiscoverMicrosoft.php -> kolab-autoconf-0.3.tar.gz/lib/AutodiscoverMicrosoft.php Changed

@@ -33,7 +33,6 @@
     const MOBILESYNC_NS = "http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006";
 
     private $type = 'outlook';
-    private $password;
 
     /**
      * Handle request parameters (find email address)
@@ -42,8 +41,8 @@
     {
         $post = $_SERVER'REQUEST_METHOD' == 'POST' ? file_get_contents('php://input') : null;
 
-        // check for request object
         Log::debug('Request microsoft: ' . $post);
+
         if (empty($post)) {
             $this->error("Invalid input");
         }
@@ -74,26 +73,6 @@
         catch (Exception $e) {
             $this->error("Invalid input");
         }
-
-        if ($this->conf->get('autodiscover', 'mobilesync_only') && $this->type != 'mobilesync') {
-            $this->error("Only mobilesync schema supported");
-        }
-
-        // check for basic authentication if ldap is available
-        if ($this->conf->get('ldap_uri', false)) {
-            Log::debug('Request microsoft: Basic Auth Username: ' . ($_SERVER'PHP_AUTH_USER' ?: 'none'));
-            if (empty($_SERVER'PHP_AUTH_USER') || empty($_SERVER'PHP_AUTH_PW')) {
-                $this->unauthorized();
-            }
-
-            // basic auth username must match with given email address
-            if (strcasecmp($_SERVER'PHP_AUTH_USER', $this->email) != 0) {
-                Log::debug("The submitted user {$_SERVER'PHP_AUTH_USER'} does not match the email address {$this->email}");
-                $this->unauthorized();
-            }
-
-            $this->password = $_SERVER'PHP_AUTH_PW';
-        }
     }
 
     /**
@@ -101,14 +80,8 @@
      */
     public function handle_response()
     {
-        if (!empty($this->_ldap_server)) {
-            // authenticate the user found during configure() against ldap
-            if (empty($this->config'dn') || !$this->authenticate($this->config'dn', $this->password)) {
-                $this->unauthorized();
-            }
-        }
-
         $method = $this->type . '_response';
+
         $xml = $this->$method();
         $xml->formatOutput = true;
 
@@ -159,11 +132,11 @@
 
         $dispname = $xml->createElement('DisplayName');
         $dispname = $user->appendChild($dispname);
-        $dispname->appendChild($xml->createTextNode($this->config'username' ?? null));
+        $dispname->appendChild($xml->createTextNode($this->config'username'));
 
         $email = $xml->createElement('EMailAddress');
         $email = $user->appendChild($email);
-        $email->appendChild($xml->createTextNode(($this->config'login' ?? false) ?: $this->config'email'));
+        $email->appendChild($xml->createTextNode($this->config'login' ?: $this->config'email'));
 
         $element = $xml->createElement('Type');
         $element = $server->appendChild($element);
@@ -212,11 +185,11 @@
 
         $dispname = $xml->createElement('DisplayName');
         $dispname = $user->appendChild($dispname);
-        $dispname->appendChild($xml->createTextNode($this->config'username' ?? null));
+        $dispname->appendChild($xml->createTextNode($this->config'username'));
 
         $email = $xml->createElement('AutoDiscoverSMTPAddress');
         $email = $user->appendChild($email);
-        $email->appendChild($xml->createTextNode(($this->config'login' ?? false) ?: $this->config'email'));
+        $email->appendChild($xml->createTextNode($this->config'email'));
 
         // @TODO: Microsoft supports also DAV protocol here
         foreach (array('imap', 'pop3', 'smtp') as $type) {

kolab-autoconf-1.3.5.tar.gz/lib/Conf.php -> kolab-autoconf-0.3.tar.gz/lib/Conf.php Changed

@@ -54,16 +54,6 @@
     {
         // Do some magic configuration loading here.
         if (!file_exists(self::CONFIG_FILE)) {
-            $this->_conf = Array(
-                'autodiscover' => Array(
-                    'activesync' => '%d',
-                    'imap' => 'ssl://%d:993',
-                    'smtp' => 'ssl://%d:465',
-                    'service_name' => 'Kolab Groupware',
-                    'service_short' => 'Kolab',
-                )
-            );
-
             return;
         }
 
@@ -95,7 +85,7 @@
         return (string) $value;
     }
 
-    public function get_list($key1, $key2 = null)
+    public function get_list($key1, $key2 = NULL)
     {
         $list  = array();
         $value = $this->get($key1, $key2);
@@ -111,7 +101,7 @@
         return $list;
     }
 
-    public function get_raw($key1, $key2 = null)
+    public function get_raw($key1, $key2 = NULL)
     {
         if (isset($this->_conf$key1)) {
             if ($key2) {
@@ -139,24 +129,22 @@
 
         // Fall back to whatever is the equivalent of auth_mechanism as the
         // section (i.e. 'ldap', or 'sql')
-        if (isset($this->_conf'kolab')) {
-            $auth_mech = $this->_conf'kolab''auth_mechanism' ?? null;
-            if ($auth_mech && isset($this->_conf$auth_mech)) {
-                if (isset($this->_conf$auth_mech$key1)) {
-                    return $this->_conf$auth_mech$key1;
-                }
+        $auth_mech = $this->_conf'kolab''auth_mechanism';
+        if (isset($this->_conf$auth_mech)) {
+            if (isset($this->_conf$auth_mech$key1)) {
+                return $this->_conf$auth_mech$key1;
             }
+        }
 
-            // Fall back to global settings in the 'kolab' section.
-            if (isset($this->_conf'kolab'$key1)) {
-                return $this->_conf'kolab'$key1;
-            }
+        // Fall back to global settings in the 'kolab' section.
+        if (isset($this->_conf'kolab'$key1)) {
+            return $this->_conf'kolab'$key1;
         }
 
         return null;
     }
 
-    public function expand($str, $custom = false)
+    public function expand($str, $custom = FALSE)
     {
         if (preg_match_all('/%$(?P<variable>\w+)$s/', $str, $matches)) {
             if (isset($matches'variable') && !empty($matches'variable')) {

kolab-autoconf-1.3.5.tar.gz/lib/Log.php -> kolab-autoconf-0.3.tar.gz/lib/Log.php Changed

kolab-autoconf-1.3.5.tar.gz/public_html/index.php -> kolab-autoconf-0.3.tar.gz/public_html/index.php Changed

kolab-autoconf-1.3.5.tar.gz/.arcconfig Deleted

kolab-autoconf-1.3.5.tar.gz/composer.json Deleted

kolab-autoconf-1.3.5.tar.gz/lib/AutodiscoverJson.php Deleted

@@ -1,98 +0,0 @@
-<?php
-
-/**
- +--------------------------------------------------------------------------+
- | Kolab Autodiscover Service                                               |
- |                                                                          |
- | Copyright (C) 2011-2014, Kolab Systems AG <contact@kolabsys.com>         |
- |                                                                          |
- | This program is free software: you can redistribute it and/or modify     |
- | it under the terms of the GNU General Public License as published by     |
- | the Free Software Foundation, either version 3 of the License, or        |
- | (at your option) any later version.                                      |
- |                                                                          |
- | This program is distributed in the hope that it will be useful,          |
- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |
- | GNU General Public License for more details.                             |
- |                                                                          |
- | You should have received a copy of the GNU General Public License        |
- | along with this program. If not, see http://www.gnu.org/licenses/.       |
- +--------------------------------------------------------------------------+
- | Author: Daniel Hoffend <dh@dotlan.net>                                   |
- +--------------------------------------------------------------------------+
-*/
-
-/**
- * Autodiscover Service class for Microsoft Autodiscover V2
- */
-class AutodiscoverJson extends Autodiscover
-{
-
-    public function handle_request()
-    {
-        Log::debug('Request json: ' . $_SERVER'REQUEST_URI');
-
-        $supportedProtocols = array('autodiscoverv1' => 'AutodiscoverV1');
-        if ($this->conf->get('autodiscover', 'activesync')) {
-            $supportedProtocols'activesync' = 'ActiveSync';
-        }
-
-        $protocol = isset($_GET'Protocol') ? $_GET'Protocol' : '';
-
-        // Exit early on unsupported protocol
-        if (empty($protocol) || !isset($supportedProtocolsstrtolower($protocol))) {
-            $json = array(
-                'ErrorCode' => 'ProtocolNotSupported',
-                'ErrorMessage' => 'The given protocol value \u0027' . $protocol . '\u0027 is invalid.'
-                    . ' Supported values are \u0027' . implode(',', $supportedProtocols) . '\u0027'
-            );
-
-            $response = json_encode($json, JSON_PRETTY_PRINT);
-            Log::debug('Response json: ' . $response);
-
-            http_response_code(400);
-            header('Content-Type: application/json; charset=' . Autodiscover::CHARSET);
-            echo $response;
-            exit;
-        }
-
-        if (preg_match('|autodiscover.json/v1.0/(^\?+)|', $_SERVER'REQUEST_URI', $regs)) {
-            $this->email = $regs1;
-        }
-        else if (!empty($_GET'Email')) {
-            $this->email = $_GET'Email';
-        }
-    }
-
-    /**
-     * Generates JSON response
-     */
-    protected function handle_response()
-    {
-        if (strtolower($_GET'Protocol') == 'activesync'
-            && !empty($this->config'activesync')
-        ) {
-            if (!preg_match('/^https?:/i', $this->config'activesync')) {
-                $this->config'activesync' = 'https://' . $this->config'activesync' . '/Microsoft-Server-ActiveSync';
-            }
-            $json = array(
-                'Protocol' => 'ActiveSync',
-                'Url' => $this->config'activesync'
-            );
-        }
-        elseif (strtolower($_GET'Protocol') == 'autodiscoverv1') {
-            $json = array(
-                'Protocol' => 'AutodiscoverV1',
-                'Url' => 'https://' . $_SERVER'HTTP_HOST' . '/Autodiscover/Autodiscover.xml'
-            );
-        }
-
-        $response = json_encode($json, JSON_PRETTY_PRINT);
-        Log::debug('Response json: ' . $response);
-
-        header('Content-Type: application/json; charset=' . Autodiscover::CHARSET);
-        echo $response;
-        exit;
-    }
-}

kolab-autoconf.dsc Changed

Overview

Request 2142 (superseded)

Request History