Request 2880 (accepted)

Overview

Request 2880 (accepted)

Release 3.2.16

Created by vanmeeuwen over 2 years ago
In state accepted

Submit kolab-webadmin

Submit package Kolab:Winterfell / kolab-webadmin to package Kolab:16 / kolab-webadmin

kolab-webadmin.spec Changed

@@ -34,8 +34,8 @@
 %global kolabr_group_id 414
 
 Name:           kolab-webadmin
-Version:        3.2.15
-Release:        2%{?dist}
+Version:        3.2.16
+Release:        1%{?dist}
 Summary:        Kolab Groupware Server Web Administration Interface
 License:        AGPLv3+
 Group:          Productivity/Office/Organizers
@@ -43,10 +43,6 @@
 
 Source0:        https://mirror.kolabenterprise.com/pub/releases/%{name}-%{version}.tar.gz
 
-Patch0:         0001-T5647-Fix-kolab-admin-role-created-in-wrong-base_dn-.patch
-Patch1:         0002-Fixed-T5653-and-support-domain_edit-in-hosted-mode.patch
-Patch2:         0003-check-for-mail-address-is-already-in-use.patch
-
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -92,10 +88,6 @@
     fi
 done
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
 %build
 
 %install
@@ -171,6 +163,9 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
+* Wed Nov 17 2021 Jeroen van Meeuwen (Apheleia IT) <vanmeeuwen@apheleia-it.ch> - 3.2.16-1
+- Release 3.2.16
+
 * Sun Dec 22 2019 Daniel Hoffend <dh@dotlan.net> - 3.2.15-2
 - Adding hotfixes for domain creation/edit in hosted mode

0001-T5647-Fix-kolab-admin-role-created-in-wrong-base_dn-.patch Deleted

0002-Fixed-T5653-and-support-domain_edit-in-hosted-mode.patch Deleted

@@ -1,41 +0,0 @@
-From 4ad311ebb6c1d98dae302617a5a9c4dd66219179 Mon Sep 17 00:00:00 2001
-From: Daniel Hoffend <dh@dotlan.net>
-Date: Tue, 26 Nov 2019 09:22:47 +0100
-Subject: [PATCH 2/3] Fixed T5653 and support domain_edit in hosted mode
-
-Summary:
-This patch fixed the domain_edit api call in hosted mode. The Bug is
-described in T5653
-
-Reviewers: #web_administration_panel_developers, vanmeeuwen
-
-Reviewed By: #web_administration_panel_developers, vanmeeuwen
-
-Subscribers: vanmeeuwen
-
-Tags: #web_administration_panel
-
-Differential Revision: https://git.kolab.org/D835
----
- lib/Auth/LDAP.php | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
-index 4bf2a8f..aac6df8 100644
---- a/lib/Auth/LDAP.php
-+++ b/lib/Auth/LDAP.php
-@@ -396,6 +396,11 @@ class LDAP extends Net_LDAP3 {
-             return false;
-         }
- 
-+        // remove invalid/hidden attributes
-+        if (isset($attributes['domainrelatedobject_only'])) {
-+            unset($attributes['domainrelatedobject_only']);
-+        }
-+
-         $domain_dn = key($domain);
- 
-         // We should start throwing stuff over the fence here.
--- 
-2.20.1
-

0003-check-for-mail-address-is-already-in-use.patch Deleted

@@ -1,39 +0,0 @@
-From fa1ff0c3a21bbceeca674858b72c9391187d3d74 Mon Sep 17 00:00:00 2001
-From: Daniel Hoffend <dh@dotlan.net>
-Date: Tue, 26 Nov 2019 09:29:53 +0100
-Subject: [PATCH 3/3] check for mail address is already in use
-
-Summary: This fixes issue T5704
-
-Reviewers: #web_administration_panel_developers, vanmeeuwen
-
-Reviewed By: #web_administration_panel_developers, vanmeeuwen
-
-Subscribers: vanmeeuwen
-
-Maniphest Tasks: T5704
-
-Differential Revision: https://git.kolab.org/D883
----
- lib/api/kolab_api_service_form_value.php | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/lib/api/kolab_api_service_form_value.php b/lib/api/kolab_api_service_form_value.php
-index 58799f6..2edee57 100644
---- a/lib/api/kolab_api_service_form_value.php
-+++ b/lib/api/kolab_api_service_form_value.php
-@@ -1276,6 +1276,11 @@ class kolab_api_service_form_value extends kolab_api_service
-             }
-         }
- 
-+        // Check if addresses are not already in use
-+        if ($validation_type == self::VALIDATE_EXTENDED) {
-+            $this->_email_addresses_in_use($value, 'mail', $postdata);
-+        }
-+
-         return 'OK';
-     }
- 
--- 
-2.20.1
-

debian.changelog Changed

debian.series Changed

kolab-webadmin-3.2.15.tar.gz/lib/Auth/LDAP.php -> kolab-webadmin-3.2.16.tar.gz/lib/Auth/LDAP.php Changed

kolab-webadmin-3.2.15.tar.gz/lib/api/kolab_api_service_domain.php -> kolab-webadmin-3.2.16.tar.gz/lib/api/kolab_api_service_domain.php Changed

@@ -174,7 +174,7 @@
 
         $attributes = $this->parse_input_attributes('domain', $postdata, $postdata['type_id']);
 
-        $this->_mod_domain_attrs(null, $attributes);
+        $this->_mod_domain_attrs(null, $attributes, $postdata['id']);
 
         $result = $auth->domain_edit($postdata['id'], $attributes, $postdata['type_id']);
 
@@ -278,7 +278,7 @@
     /**
      * Modify hosted domain attributes
      */
-    protected function _mod_domain_attrs($domain, &$attributes)
+    protected function _mod_domain_attrs($domain, &$attributes, $olddn = null)
     {
         // Generate attributes (aci, inetdomainbasedn) for hosted domains
         $conf = Conf::get_instance();
@@ -328,8 +328,31 @@
                 . 'ldap:///cn=kolab-admin,' . $mgmt_root_dn . '");)'
             );
 
-            $attributes['aci']              = $aci;
-            $attributes['inetdomainbasedn'] = $domain_root_dn;
+            // Preserve important old aci and inetdomainbasedn attributes of the
+            // management and hosted domain.
+            if (!empty($olddn)) {
+                $auth = Auth::get_instance();
+                $info = $auth->domain_info($olddn);
+                if (!empty($info)) {
+                    $oldattributes = reset($info);
+                    if (!empty($oldattributes['inetdomainbasedn'])
+                        && $oldattributes['inetdomainbasedn'] == $hosted_root_dn
+                        || "dc=".implode(",dc=",explode(".",$domain)) == $mgmt_root_dn
+                    ) {
+                        $aci = $oldattributes['aci'];
+                        if (!empty($oldattributes['inetdomainbasedn'])) {
+                            $domain_root_dn = $oldattributes['inetdomainbasedn'];
+                        } else {
+                            $domain_root_dn = null;
+                        }
+                    }
+                }
+            }
+
+            $attributes['aci'] = $aci;
+            if (!empty($domain_root_dn)) {
+                $attributes['inetdomainbasedn'] = $domain_root_dn;
+            }
 
             $this->is_hosted = true;
         }

kolab-webadmin-3.2.15.tar.gz/lib/api/kolab_api_service_form_value.php -> kolab-webadmin-3.2.16.tar.gz/lib/api/kolab_api_service_form_value.php Changed

@@ -1276,6 +1276,11 @@
             }
         }
 
+        // Check if addresses are not already in use
+        if ($validation_type == self::VALIDATE_EXTENDED) {
+            $this->_email_addresses_in_use($value, 'mail', $postdata);
+        }
+
         return 'OK';
     }
 
@@ -1649,6 +1654,7 @@
             }
         }
 
+        $domains = array_map('strtolower', $domains);
         $domains = array_unique($domains);
 
         Log::trace("_get_valid_domains result: " . var_export($domains, true));
@@ -1661,10 +1667,11 @@
         $at_index = strrpos($mail_address, "@");
         if (is_bool($at_index) && !$at_index) {
             throw new Exception("Invalid email address: No domain name space", 235);
-        } else {
-            $email_domain = substr($mail_address, $at_index+1);
         }
 
+        $email_domain = substr($mail_address, $at_index + 1);
+        $email_domain = strtolower($email_domain);
+
         $my_primary_domain = $_SESSION['user']->get_domain();
 
         if ($email_domain == $my_primary_domain) {
@@ -1672,7 +1679,7 @@
             return true;
         }
 
-        $valid         = false;
+        $valid = false;
         Log::trace("_validate_email_address_in_any_of_mydomains(\$mail_address = " . var_export($mail_address, TRUE) . ")");
 
         if (in_array($email_domain, $this->_get_valid_domains($my_primary_domain))) {
@@ -1687,5 +1694,4 @@
 
         return $valid;
     }
-
 }

kolab-webadmin-3.2.15.tar.gz/lib/kolab_api_service.php -> kolab-webadmin-3.2.16.tar.gz/lib/kolab_api_service.php Changed

kolab-webadmin.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2880 0

Request History

vanmeeuwen created request over 2 years ago

Release 3.2.16

vanmeeuwen accepted review over 2 years ago

vanmeeuwen approved review over 2 years ago

vanmeeuwen accepted request over 2 years ago