Projects
Kolab:16
kolab-freebusy
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 11
View file
kolab-freebusy.spec
Changed
@@ -23,8 +23,8 @@ %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name} Name: kolab-freebusy -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Kolab Free/Busy Web Presentation Layer Group: Applications/Internet @@ -163,6 +163,9 @@ %attr(0770,root,%{httpd_group}) %{_localstatedir}/log/%{name} %changelog +* Mon Apr 15 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.1.2-1 +- Release of version 1.1.2 + * Sat Dec 1 2018 Timotheus Pokorra <tp@tbits.net> - 1.1.1-2 - require php-kolab-net-ldap3 because it was upgraded in EPEL
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +kolab-freebusy (1.1.2-0~kolab1) unstable; urgency=low + + * Release of version 1.1.2 + + -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Mon, 15 Apr 2019 12:00:22 +0200 + kolab-freebusy (1.1.1-0~kolab1) unstable; urgency=low * Release of version 1.1.1
View file
kolab-freebusy-1.1.1.tar.gz/config/config.ini.sample -> kolab-freebusy-1.1.2.tar.gz/config/config.ini.sample
Changed
@@ -35,7 +35,7 @@ ; %dc = domain root dn, %u = username part, %s = the full username base_dn = "ou=People,dc=example,dc=org" filter = "(&(objectClass=kolabInetOrgPerson)(|(mail=%s)(alias=%s))" -attributes = mail +mail_attributes = mail lc_attributes = mail primary_domain = "example.org" ; set domain_* options to enforce the resolving of the domain root dn (%dc) through LDAP @@ -48,7 +48,7 @@ expires = 10m ;; -;; resolve Kolab resources from LDAP and fetch calendar from IMAP +;; Resolve Kolab resources from LDAP and fetch calendar from IMAP ;; [directory "kolab-resources"] type = ldap @@ -57,7 +57,7 @@ bind_pw = "SomePassword" base_dn = "ou=Resources,dc=example,dc=org" filter = "(&(objectClass=kolabsharedfolder)(kolabfoldertype=event)(mail=%s))" -attributes = mail, kolabtargetfolder +mail_attributes = mail primary_domain = "example.org" ; Use the Free/Busy daemon that separates the abuse of credentials @@ -79,7 +79,7 @@ bind_pw = "SomePassword" base_dn = "ou=Resources,dc=example,dc=org" filter = "(&(objectClass=kolabgroupofuniquenames)(mail=%s))" -attributes = uniquemember, mail +mail_attributes = mail resolve_dn = uniquemember resolve_attribute = mail ; the 'aggregate' source takes one parameter
View file
kolab-freebusy-1.1.1.tar.gz/lib/Kolab/FreeBusy/DirectoryLDAP.php -> kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/DirectoryLDAP.php
Changed
@@ -111,11 +111,19 @@ $dc = 'dc=' . str_replace('.', ',dc=', $d); } + // result attributes + $attribs = array_unique(array_merge( + Config::convert($this->config['mail_attributes'], Config::ARR), + Config::convert($this->config['attributes'], Config::ARR), // deprecated + Config::convert($this->config['resolve_dn'], Config::ARR), + Config::convert($this->config['resolve_attribute'], Config::ARR) + )); + // search with configured base_dn and filter $replaces = array('%dc' => $dc, '%u' => $u); $base_dn = strtr($this->config['base_dn'], $replaces); $filter = str_replace('%s', Net_LDAP3::quote_string($user), strtr($this->config['filter'], $replaces)); - $ldapresult = $this->ldap->search($base_dn, $filter, 'sub', Config::convert($this->config['attributes'], Config::ARR)); + $ldapresult = $this->ldap->search($base_dn, $filter, 'sub', $attribs); // got a valid result if ($ldapresult && $ldapresult->count()) {
View file
kolab-freebusy-1.1.1.tar.gz/lib/Kolab/FreeBusy/HTTPAuth.php -> kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/HTTPAuth.php
Changed
@@ -44,7 +44,7 @@ // First try token authentication if enabled and user/token detected in the URL if (!empty($_SERVER['FREEBUSY_URI']) && Config::boolean($config['allow_token']) - && preg_match('|([^@/]+@[^@/]+)/([a-f0-9]{32})/[^/]+$|', $_SERVER['FREEBUSY_URI'], $matches) + && preg_match('|([^@/]+@[^@/]+)/([a-f0-9]{32})$|', $_SERVER['FREEBUSY_URI'], $matches) && self::checkToken($config, $matches[1], $matches[2]) ) { return true; @@ -155,6 +155,7 @@ } } + $_SERVER['FREEBUSY_USER'] = $user; $status = $valid ? 'SUCCESS' : 'FAILURE'; Logger::get('httpauth')->addInfo("Token: authenticating user $user/$token/$ip: $status");
View file
kolab-freebusy-1.1.1.tar.gz/lib/Kolab/FreeBusy/SourceIMAP.php -> kolab-freebusy-1.1.2.tar.gz/lib/Kolab/FreeBusy/SourceIMAP.php
Changed
@@ -40,7 +40,17 @@ public function __construct($config) { - parent::__construct($config + array('mail_attributes' => 'mail')); + if (empty($config['mail_attributes'])) { + if (!empty($config['attributes'])) { + Logger::get('imap')->addWarning("Use of deprecated 'attributes' option. Switch to 'mail_attributes'!"); + $config['mail_attributes'] = $config['attributes']; + } + else { + $config['mail_attributes'] = 'mail'; + } + } + + parent::__construct($config); // load the Roundcube framework with its autoloader require_once KOLAB_FREEBUSY_ROOT . '/lib/Roundcube/bootstrap.php';
View file
kolab-freebusy-1.1.1.tar.gz/public_html/index.php -> kolab-freebusy-1.1.2.tar.gz/public_html/index.php
Changed
@@ -84,14 +84,18 @@ header('Content-type: text/plain; charset=utf-8', true); // analyse request - $url = array_filter(explode('/', $uri)); - $user = strtolower(array_pop($url)); - $extended = false; - - // remove file extension - if (preg_match('/^(.+)\.([ipx]fb)$/i', $user, $m)) { - $user = urldecode($m[1]); - $extended = $m[2] == 'xfb'; + $user = $_SERVER['FREEBUSY_USER']; + $extended = !empty($_SERVER['FREEBUSY_EXTENDED']); + + if (!$user) { + $url = array_filter(explode('/', $uri)); + $user = strtolower(array_pop($url)); + + // remove file extension + if (preg_match('/^(.+)\.([ipx]fb)$/i', $user, $m)) { + $user = urldecode($m[1]); + $extended = $m[2] == 'xfb'; + } } // iterate over directories
View file
kolab-freebusy.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-freebusy Binary: kolab-freebusy Architecture: all -Version: 1.1.1-0~kolab1 +Version: 1.1.2-0~kolab1 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Homepage: http://www.kolab.org Standards-Version: 3.9.3 @@ -12,5 +12,5 @@ Package-List: kolab-freebusy deb mail extra Files: - 00000000000000000000000000000000 0 kolab-freebusy-1.1.1.tar.gz + 00000000000000000000000000000000 0 kolab-freebusy-1.1.2.tar.gz 00000000000000000000000000000000 0 debian.tar.gz
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.