Request 858 (accepted)

Overview

Request 858 (accepted)

No description set

Created by dhoffend about 9 years ago
In state accepted

Submit kolab-webadmin

Submit package Kolab:Development / kolab-webadmin to package Kolab:3.4:Updates / kolab-webadmin

kolab-webadmin.spec Changed

@@ -35,7 +35,7 @@
 
 Name:           kolab-webadmin
 Version:        3.2.6
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Kolab Groupware Server Web Administration Interface
 License:        AGPLv3+
 Group:          Productivity/Office/Organizers
@@ -44,6 +44,8 @@
 Source0:        http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
 
 Patch0:         feature-autogenerate-kolabtargetfolder.patch
+Patch1:         hotfix-get-valid-domains.patch
+Patch2:         adding-default-acl-for-domainrelated-object.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -82,6 +84,8 @@
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 for file in `find . -type f -name "*.enterprise"`; do
     if [ 0%{?kolab_enterprise} -gt 0 ]; then
@@ -171,7 +175,13 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
-* Thu Feb 19 2015 Daniel Hoffend <dh@dotlan.net> - 3.2.6-1
+* Thu Feb 26 2015 Daniel Hoffend <dh@dotlan.net> - 3.3.6.4
+- adding default acl for domainrelated object. fixes #4731
+
+* Wed Feb 25 2015 Daniel Hoffend <dh@dotlan.net> - 3.2.6.3
+- Applied fix for get_valid_domains #4731
+
+* Thu Feb 19 2015 Daniel Hoffend <dh@dotlan.net> - 3.2.6-2
 - Feature: Autogenerated kolabtargetfolder for shared mail folders #3335
 
 * Fri Jan 23 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.2.6-1

adding-default-acl-for-domainrelated-object.patch Added

@@ -0,0 +1,49 @@
+From 4d06bf5dd18f1d21213b9e7b958cbc967fb03dd1 Mon Sep 17 00:00:00 2001
+From: Daniel Hoffend <dh@dotlan.net>
+Date: Thu, 26 Feb 2015 23:17:21 +0100
+Subject: [PATCH] adding default acl for domainrelated object. finally fixes
+ #4731
+
+---
+ lib/Auth/LDAP.php | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
+index b0027be..a2d0ba3 100644
+--- a/lib/Auth/LDAP.php
++++ b/lib/Auth/LDAP.php
+@@ -176,12 +176,6 @@ class LDAP extends Net_LDAP3 {
+ 
+         $domain_dn = $domain_name_attribute . '=' . $domain . ',' . $domain_base_dn;
+ 
+-        $result = $this->add_entry($domain_dn, $attributes);
+-
+-        if (!$result) {
+-            return false;
+-        }
+-
+         if (!empty($attributes['inetdomainbasedn'])) {
+             $inetdomainbasedn = $attributes['inetdomainbasedn'];
+         }
+@@ -189,6 +183,18 @@ class LDAP extends Net_LDAP3 {
+             $inetdomainbasedn = $this->_standard_root_dn($domain);
+         }
+ 
++        if (empty($attributes['aci'])) {
++            $attributes['aci'] = array(
++                "(targetattr = \"*\") (version 3.0;acl \"Read Access for {$domain} Users\";allow (read,compare,search)(userdn = \"ldap:///{$inetdomainbasedn}??sub?(objectclass=*)\");)"
++            );
++        }
++
++        $result = $this->add_entry($domain_dn, $attributes);
++
++        if (!$result) {
++            return false;
++        }
++
+         // Query the ACI for the primary domain
+         if ($domain_entry = $this->_find_domain($primary_domain)) {
+             $domain_entry = array_shift($domain_entry);
+-- 
+1.9.1
+

hotfix-get-valid-domains.patch Added

@@ -0,0 +1,34 @@
+From e951e4657a7fa527166d6fc814ffb3484576217e Mon Sep 17 00:00:00 2001
+From: Daniel Hoffend <dh@dotlan.net>
+Date: Wed, 25 Feb 2015 23:35:25 +0100
+Subject: [PATCH] Hotfix to validate sharedfolders #4731
+
+---
+ lib/api/kolab_api_service_form_value.php | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/api/kolab_api_service_form_value.php b/lib/api/kolab_api_service_form_value.php
+index 320acf9..10dd39c 100644
+--- a/lib/api/kolab_api_service_form_value.php
++++ b/lib/api/kolab_api_service_form_value.php
+@@ -1611,7 +1611,7 @@ class kolab_api_service_form_value extends kolab_api_service
+         Log::trace("__get_valid_domains( " . $my_primary_domain . ")");
+         Log::trace("\$all_domains includes: " . var_export($all_domains, TRUE) . " (must include domain for \$my_primary_domain)");
+ 
+-        $valid_domains = array();
++        $valid_domains = $my_primary_domain ? array($my_primary_domain) : array();
+         foreach ($all_domains as $domain_id => $domain_attrs) {
+             if (!is_array($domain_attrs[$dna])) {
+                 $domain_attrs[$dna] = (array)($domain_attrs[$dna]);
+@@ -1622,7 +1622,7 @@ class kolab_api_service_form_value extends kolab_api_service
+             }
+         }
+ 
+-        return $valid_domains;
++        return array_unique($valid_domains);
+     }
+ 
+     private function _validate_email_address_in_any_of_my_domains($mail_address)
+-- 
+1.9.1
+

debian.changelog Changed

debian.series Changed

kolab-webadmin.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 858 0

Request History

dhoffend created request about 9 years ago

dhoffend accepted request about 9 years ago

Please add a comment