Kolab Groupware OBS

roundcubemail-plugins-kolab.spec Changed

debian.changelog Changed

roundcubemail-plugins-kolab-3.1.2.tar.gz/plugins/kolab_auth/kolab_auth.php -> roundcubemail-plugins-kolab-3.1.3.tar.gz/plugins/kolab_auth/kolab_auth.php Changed

@@ -63,25 +63,28 @@
             $rcmail->config->set('ldap_debug', true);
             $rcmail->config->set('smtp_debug', true);
         }
-
     }
 
     public function startup($args)
     {
-        // Arguments are task / action, not interested
-        if (!empty($_SESSION['user_roledns'])) {
-            $this->load_user_role_plugins_and_settings($_SESSION['user_roledns']);
-        }
+        $this->load_user_role_plugins_and_settings();
 
         return $args;
     }
 
-    public function load_user_role_plugins_and_settings($role_dns)
+    /**
+     * Modifies list of plugins and settings according to
+     * specified LDAP roles
+     */
+    public function load_user_role_plugins_and_settings()
     {
+        if (empty($_SESSION['user_roledns'])) {
+            return;
+        }
+
         $rcmail = rcube::get_instance();
         $this->load_config();
 
-        // Check role dependent plugins to enable and settings to modify
 
         // Example 'kolab_auth_role_plugins' =
         //
@@ -109,25 +112,19 @@
 
         $role_settings = $rcmail->config->get('kolab_auth_role_settings');
 
-        $ldap = self::ldap();
-        if (!$ldap || !$ldap->ready) {
-            $args['abort'] = true;
-            return $args;
-        }
-
         if (!empty($role_plugins)) {
             foreach ($role_plugins as $role_dn => $plugins) {
-                $role_plugins[$ldap->parse_vars($role_dn)] = $plugins;
+                $role_plugins[self::parse_ldap_vars($role_dn)] = $plugins;
             }
         }
 
         if (!empty($role_settings)) {
             foreach ($role_settings as $role_dn => $settings) {
-                $role_settings[$ldap->parse_vars($role_dn)] = $settings;
+                $role_settings[self::parse_ldap_vars($role_dn)] = $settings;
             }
         }
 
-        foreach ($role_dns as $role_dn) {
+        foreach ($_SESSION['user_roledns'] as $role_dn) {
             if (isset($role_plugins[$role_dn]) && is_array($role_plugins[$role_dn])) {
                 foreach ($role_plugins[$role_dn] as $plugin) {
                     $this->require_plugin($plugin);
@@ -326,11 +323,21 @@
         $email_attr  = $rcmail->config->get('kolab_auth_email');
         $org_attr    = $rcmail->config->get('kolab_auth_organization');
         $role_attr   = $rcmail->config->get('kolab_auth_role');
+        $imap_attr   = $rcmail->config->get('kolab_auth_mailhost');
 
         if (!empty($role_attr) && !empty($record[$role_attr])) {
             $_SESSION['user_roledns'] = (array)($record[$role_attr]);
         }
 
+        if (!empty($imap_attr) && !empty($record[$role_attr])) {
+            $default_host = $rcmail->config->get('default_host');
+            if (!empty($default_host)) {
+                rcube::write_log("errors", "Both default host and kolab_auth_mailhost set. Incompatible.");
+            } else {
+                $args['host'] = "tls://" . $record[$role_attr];
+            }
+        }
+
         // Login As...
         if (!empty($loginas) && $admin_login) {
             // Authenticate to LDAP
@@ -394,6 +401,12 @@
         $_SESSION['kolab_uid'] = is_array($record['uid']) ? $record['uid'][0] : $record['uid'];
         $_SESSION['kolab_dn']  = $record['dn'];
 
+        // Store LDAP replacement variables used for current user
+        // This improves performance of load_user_role_plugins_and_settings()
+        // which is executed on every request (via startup hook) and where
+        // we don't like to use LDAP (connection + bind + search)
+        $_SESSION['kolab_auth_vars'] = $ldap->get_parse_vars();
+
         // Set user login
         if ($login_attr) {
             $this->data['user_login'] = is_array($record[$login_attr]) ? $record[$login_attr][0] : $record[$login_attr];
@@ -475,13 +488,20 @@
      */
     public function identity_form($args)
     {
+        $rcmail      = rcube::get_instance();
+        $ident_level = intval($rcmail->config->get('identities_level', 0));
+
+        // do nothing if email address modification is disabled
+        if ($ident_level == 1 || $ident_level == 3) {
+            return $args;
+        }
+
         $ldap = self::ldap();
         if (!$ldap || !$ldap->ready || empty($_SESSION['kolab_dn'])) {
             return $args;
         }
 
-        $emails = array();
-        $rcmail = rcube::get_instance();
+        $emails      = array();
         $user_record = $ldap->get_record($_SESSION['kolab_dn']);
 
         foreach ((array)$rcmail->config->get('kolab_auth_email', array()) as $col) {
@@ -490,6 +510,10 @@
                 $emails = array_merge($emails, array_filter($values));
         }
 
+        // kolab_delegation might want to modify this addresses list
+        $plugin = $rcmail->plugins->exec_hook('kolab_auth_emails', array('emails' => $emails));
+        $emails = $plugin['emails'];
+
         if (!empty($emails)) {
             $args['form']['addressing']['content']['email'] = array(
                 'type' => 'select',
@@ -538,4 +562,21 @@
 
         return self::$ldap;
     }
+
+    /**
+     * Parses LDAP DN string with replacing supported variables.
+     * See kolab_auth_ldap::parse_vars()
+     *
+     * @param string $str LDAP DN string
+     *
+     * @return string Parsed DN string
+     */
+    public static function parse_ldap_vars($str)
+    {
+        if (!empty($_SESSION['kolab_auth_vars'])) {
+            $str = strtr($str, $_SESSION['kolab_auth_vars']);
+        }
+
+        return $str;
+    }
 }

roundcubemail-plugins-kolab-3.1.2.tar.gz/plugins/kolab_auth/kolab_auth_ldap.php -> roundcubemail-plugins-kolab-3.1.3.tar.gz/plugins/kolab_auth/kolab_auth_ldap.php Changed

@@ -119,6 +119,7 @@
                 $entries = $result->entries(true);
                 $dn      = key($entries);
                 $entry   = array_pop($entries);
+                $entry   = rcube_ldap_generic::normalize_entry($entry);
                 $entry   = $this->field_mapping($dn, $entry);
 
                 return $entry;
@@ -287,7 +288,8 @@
                 if ($limit && $limit <= $i) {
                     break;
                 }
-                $dn = $result->get_dn();
+                $dn        = $result->get_dn();
+                $entry     = rcube_ldap_generic::normalize_entry($entry);
                 $list[$dn] = $this->field_mapping($dn, $entry);
                 $i++;
             }
@@ -369,7 +371,8 @@
         if (!$user) {
             $user = $_SESSION['username'];
         }
-        else if (isset($this->icache[$user])) {
+
+        if (isset($this->icache[$user])) {
             list($user, $dc) = $this->icache[$user];
         }
         else {
@@ -412,6 +415,8 @@
 
         $replaces = array('%dc' => $dc, '%d' => $d, '%fu' => $user, '%u' => $u);
 
+        $this->parse_replaces = $replaces;
+
         return strtr($str, $replaces);
     }
 
@@ -459,6 +464,16 @@
     }
 
     /**
+     * Returns variables used for replacement in (last) parse_vars() call
+     *
+     * @return array Variable-value hash array
+     */
+    public function get_parse_vars()
+    {
+        return $this->parse_replaces;
+    }
+
+    /**
      * HTML-safe DN string encoding
      *
      * @param string $str DN string

roundcubemail-plugins-kolab-3.1.2.tar.gz/plugins/kolab_delegation/kolab_delegation.php -> roundcubemail-plugins-kolab-3.1.3.tar.gz/plugins/kolab_delegation/kolab_delegation.php Changed

@@ -55,6 +55,9 @@
         $this->add_hook('calendar_list_filter', array($this, 'calendar_list_filter'));
         $this->add_hook('calendar_load_itip', array($this, 'calendar_load_itip'));
 
+        // delegation support in kolab_auth plugin
+        $this->add_hook('kolab_auth_emails', array($this, 'kolab_auth_emails'));
+
         if ($this->rc->task == 'settings') {
             // delegation management interface
             $this->register_action('plugin.delegation',              array($this, 'controller_ui'));
@@ -241,6 +244,27 @@
     }
 
     /**
+     * Delegation support in kolab_auth plugin
+     */
+    public function kolab_auth_emails($args)
+    {
+        // Add delegators addresses to address selector in user identity form
+
+        if (!empty($_SESSION['delegators'])) {
+            // @TODO: Consider not adding all delegator addresses to the list.
+            // Instead add only address of currently edited identity
+            foreach ($_SESSION['delegators'] as $emails) {
+                $args['emails'] = array_merge($args['emails'], $emails);
+            }
+
+            $args['emails'] = array_unique($args['emails']);
+            sort($args['emails']);
+        }
+
+        return $args;
+    }
+
+    /**
      * Delegation UI handler
      */
     public function controller_ui()

roundcubemail-plugins-kolab-3.1.2.tar.gz/plugins/libcalendaring/libcalendaring.php -> roundcubemail-plugins-kolab-3.1.3.tar.gz/plugins/libcalendaring/libcalendaring.php Changed

roundcubemail-plugins-kolab-3.1.2.tar.gz/plugins/libcalendaring/libvcalendar.php -> roundcubemail-plugins-kolab-3.1.3.tar.gz/plugins/libcalendaring/libvcalendar.php Changed

@@ -23,6 +23,11 @@
 
 use \Sabre\VObject;
 
+// load Sabre\VObject classes
+if (!class_exists('\Sabre\VObject\Reader')) {
+    require_once __DIR__ . '/lib/Sabre/VObject/includes.php';
+}
+
 /**
  * Class to parse and build vCalendar (iCalendar) files
  *
@@ -41,6 +46,7 @@
     private $attendee_keymap = array('name' => 'CN', 'status' => 'PARTSTAT', 'role' => 'ROLE', 'cutype' => 'CUTYPE', 'rsvp' => 'RSVP');
 
     public $method;
+    public $agent = '';
     public $objects = array();
     public $freebusy = array();
 
@@ -49,11 +55,6 @@
      */
     function __construct($tz = null)
     {
-        // load Sabre\VObject classes
-        if (!class_exists('\Sabre\VObject\Reader')) {
-            require_once(__DIR__ . '/lib/Sabre/VObject/includes.php');
-        }
-
         $this->timezone = $tz;
         $this->prodid = '-//Roundcube//Roundcube libcalendaring ' . RCUBE_VERSION . '//Sabre//Sabre VObject ' . VObject\Version::VERSION . '//EN';
     }
@@ -83,6 +84,14 @@
     }
 
     /**
+     * Setter for a user-agent string to tweak input/output accordingly
+     */
+    public function set_agent($agent)
+    {
+        $this->agent = $agent;
+    }
+
+    /**
      * Free resources by clearing member vars
      */
     public function reset()
@@ -96,9 +105,10 @@
     *
     * @param  string vCalendar input
     * @param  string Input charset (from envelope)
+    * @param  boolean True if parsing exceptions should be forwarded to the caller
     * @return array List of events extracted from the input
     */
-    public function import($vcal, $charset = 'UTF-8')
+    public function import($vcal, $charset = 'UTF-8', $forward_exceptions = false)
     {
         // TODO: convert charset to UTF-8 if other
 
@@ -113,6 +123,10 @@
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "iCal data parse error: " . $e->getMessage()),
                 true, false);
+
+            if ($forward_exceptions) {
+                throw $e;
+            }
         }
 
         return array();
@@ -121,10 +135,12 @@
     /**
     * Read iCalendar events from a file
     *
-    * @param string File path to read from
+    * @param  string File path to read from
+    * @param  string Input charset (from envelope)
+    * @param  boolean True if parsing exceptions should be forwarded to the caller
     * @return array List of events extracted from the file
     */
-    public function import_from_file($filepath)
+    public function import_from_file($filepath, $charset = 'UTF-8', $forward_exceptions = false)
     {
         $this->objects = array();
         $fp = fopen($filepath, 'r');
@@ -136,7 +152,7 @@
         }
         fclose($fp);
 
-        return $this->import(file_get_contents($filepath));
+        return $this->import(file_get_contents($filepath), $charset, $forward_exceptions);
     }
 
     /**
@@ -151,6 +167,7 @@
 
         if ($vobject->name == 'VCALENDAR') {
             $this->method = strval($vobject->METHOD);
+            $this->agent  = strval($vobject->PRODID);
 
             foreach ($vobject->getBaseComponents() as $ve) {
                 if ($ve->name == 'VEVENT' || $ve->name == 'VTODO') {
@@ -195,6 +212,16 @@
     }
 
     /**
+     * Helper method to determine whether the connected client is an Apple device
+     */
+    private function is_apple()
+    {
+        return stripos($this->agent, 'Apple') !== false
+            || stripos($this->agent, 'Mac OS X') !== false
+            || stripos($this->agent, 'iOS/') !== false;
+    }
+
+    /**
      * Convert the given VEvent object to a libkolab compatible array representation
      *
      * @param object Vevent object to convert
@@ -209,6 +236,7 @@
             // set defaults
             'priority' => 0,
             'attendees' => array(),
+            'x-custom' => array(),
         );
 
         // Catch possible exceptions when date is invalid (Bug #2144)
@@ -290,8 +318,14 @@
                 $event['complete'] = intval($prop->value);
                 break;
 
-            case 'DESCRIPTION':
             case 'LOCATION':
+            case 'DESCRIPTION':
+                if ($this->is_apple()) {
+                    $event[strtolower($prop->name)] = str_replace('\,', ',', $prop->value);
+                    break;
+                }
+                // else: fall through
+
             case 'URL':
                 $event[strtolower($prop->name)] = $prop->value;
                 break;
@@ -381,10 +415,7 @@
             }
 
             // sanity-check and fix end date
-            if (empty($event['end'])) {
-                $event['end'] = clone $event['start'];
-            }
-            else if ($event['end'] < $event['start']) {
+            if (!empty($event['end']) && $event['end'] < $event['start']) {
                 $event['end'] = clone $event['start'];
             }
         }
@@ -409,7 +440,7 @@
                         }
                     }
                     if (!$trigger) {
-                        $trigger = preg_replace('/PT/', '', $prop->value);
+                        $trigger = preg_replace('/PT?/', '', $prop->value);
                     }
                     break;
 
@@ -441,7 +472,7 @@
         }
 
         // minimal validation
-        if (empty($event['uid']) || empty($event['start']) != empty($event['end'])) {
+        if (empty($event['uid']) || ($event['_type'] == 'event' && empty($event['start']) != empty($event['end']))) {
             throw new VObject\ParseException('Object validation failed: missing mandatory object properties');
         }
 
@@ -543,10 +574,10 @@
      * @param string Property name
      * @param object DateTime
      */
-    public static function datetime_prop($name, $dt, $utc = false)
+    public static function datetime_prop($name, $dt, $utc = false, $dateonly = null)
     {
         $vdt = new VObject\Property\DateTime($name);
-        $vdt->setDateTime($dt, $dt->_dateonly ? VObject\Property\DateTime::DATE :
+        $vdt->setDateTime($dt, $dt->_dateonly || $dateonly ? VObject\Property\DateTime::DATE :
             ($utc ? VObject\Property\DateTime::UTC : VObject\Property\DateTime::LOCALTZ));
         return $vdt;
     }
@@ -645,9 +676,9 @@
         if (!empty($event['changed']))
             $ve->add(self::datetime_prop('DTSTAMP', $event['changed'], true));
         if (!empty($event['start']))
-            $ve->add(self::datetime_prop('DTSTART', $event['start'], false));
+            $ve->add(self::datetime_prop('DTSTART', $event['start'], false, $event['allday']));
         if (!empty($event['end']))
-            $ve->add(self::datetime_prop('DTEND',   $event['end'], false));
+            $ve->add(self::datetime_prop('DTEND',   $event['end'], false, $event['allday']));
         if (!empty($event['due']))
             $ve->add(self::datetime_prop('DUE',   $event['due'], false));
 
@@ -657,7 +688,7 @@
         $ve->add('SUMMARY', $event['title']);

roundcubemail-plugins-kolab-3.1.2.tar.gz/plugins/libcalendaring/tests/libvcalendar.php -> roundcubemail-plugins-kolab-3.1.3.tar.gz/plugins/libcalendaring/tests/libvcalendar.php Changed

@@ -85,6 +85,14 @@
         $this->assertFalse(array_key_exists('changed', $event), "No changed date field");
     }
 
+    function test_invalid_vevent()
+    {
+        $this->setExpectedException('\Sabre\VObject\ParseException');
+
+        $ical = new libvcalendar();
+        $events = $ical->import_from_file(__DIR__ . '/resources/invalid-event.ics', 'UTF-8', true);
+    }
+
     /**
      * Test some extended ical properties such as attendees, recurrence rules, alarms and attachments
      *
@@ -170,6 +178,18 @@
         $this->assertContains('dummy', $freebusy['comment'], "Parse comment");
     }
 
+    function test_vtodo()
+    {
+        $ical = new libvcalendar();
+        $tasks = $ical->import_from_file(__DIR__ . '/resources/vtodo.ics', 'UTF-8', true);
+        $task = $tasks[0];
+
+        $this->assertInstanceOf('DateTime', $task['start'],   "'start' property is DateTime object");
+        $this->assertInstanceOf('DateTime', $task['due'],     "'due' property is DateTime object");
+        $this->assertEquals('-1D:DISPLAY',  $task['alarms'],  "Taks alarm value");
+        $this->assertEquals(1, count($task['x-custom']),      "Custom properties");
+    }
+
     /**
      * Test for iCal export from internal hash array representation
      *

roundcubemail-plugins-kolab-3.1.3.tar.gz/plugins/libcalendaring/tests/resources/invalid-event.ics Added

roundcubemail-plugins-kolab-3.1.3.tar.gz/plugins/libcalendaring/tests/resources/vtodo.ics Added

roundcubemail-plugins-kolab-3.1.2.tar.gz/plugins/libkolab/lib/kolab_format.php -> roundcubemail-plugins-kolab-3.1.3.tar.gz/plugins/libkolab/lib/kolab_format.php Changed

roundcubemail-plugins-kolab-3.1.2.tar.gz/plugins/libkolab/lib/kolab_format_xcal.php -> roundcubemail-plugins-kolab-3.1.3.tar.gz/plugins/libkolab/lib/kolab_format_xcal.php Changed

roundcubemail-plugins-kolab.dsc Changed

Changes of Revision 12