Request 3237 (accepted)

roundcubemail.spec Changed

debian.changelog Changed

roundcubemail-1.5.tar.gz/CHANGELOG.md Changed

roundcubemail-1.5.tar.gz/composer.lock Changed

@@ -1279,7 +1279,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
-                "reference": "480d977b4055e87ef144055f927e71d46c9be959"
+                "reference": "39a754269fe6e5d94b0fe87215e89232876bda01"
             },
             "require": {
                 "pear/net_ldap2": ">=2.0.12",
@@ -1319,7 +1319,7 @@
                 "pear",
                 "vlv"
             ,
-            "time": "2023-08-10T11:11:46+00:00"
+            "time": "2023-10-01T07:22:58+00:00"
         },
         {
             "name": "kolab/nextcloud_link",
@@ -2055,22 +2055,25 @@
         },
         {
             "name": "pear/net_ldap2",
-            "version": "v2.2.1",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Net_LDAP2.git",
-                "reference": "0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1"
+                "reference": "6eae6d20533469ffe1c01684923cd09f0fae3b77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Net_LDAP2/zipball/0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1",
-                "reference": "0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1",
+                "url": "https://api.github.com/repos/pear/Net_LDAP2/zipball/6eae6d20533469ffe1c01684923cd09f0fae3b77",
+                "reference": "6eae6d20533469ffe1c01684923cd09f0fae3b77",
                 "shasum": ""
             },
             "require": {
                 "ext-ldap": "*",
                 "pear/pear-core-minimal": "^1.10.1"
             },
+            "require-dev": {
+                "phpunit/phpunit": "^9 || ^10.3"
+            },
             "type": "library",
             "autoload": {
                 "classmap": 
@@ -2094,7 +2097,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=Net_LDAP2",
                 "source": "https://github.com/pear/Net_LDAP2"
             },
-            "time": "2023-02-08T07:25:31+00:00"
+            "time": "2023-10-12T20:00:01+00:00"
         },
         {
             "name": "pear/net_sieve",
@@ -4787,16 +4790,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.35",
+            "version": "1.10.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3"
+                "reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e730e5facb75ffe09dfb229795e8c01a459f26c3",
-                "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5302bb402c57f00fb3c2c015bac86e0827e4b691",
+                "reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691",
                 "shasum": ""
             },
             "require": {
@@ -4845,7 +4848,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-09-19T15:27:56+00:00"
+            "time": "2023-10-06T14:19:14+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/kolab_2fa.php Changed

@@ -90,6 +90,33 @@
         $hostname = $_SESSION'hostname' = $a_host'host' ?: $args'host';
         $username = !empty($_SESSION'kolab_auth_admin') ? $_SESSION'kolab_auth_admin' : $args'user';
 
+        // Check if we need to add/force domain to username
+        $username_domain = $rcmail->config->get('username_domain');
+        if (!empty($username_domain)) {
+            $domain = '';
+            if (is_array($username_domain)) {
+                if (!empty($username_domain$hostname)) {
+                    $domain = $username_domain$hostname;
+                }
+            }
+            else {
+                $domain = $username_domain;
+            }
+
+            if ($domain = rcube_utils::parse_host((string) $domain, $hostname)) {
+                $pos = strpos($username, '@');
+
+                // force configured domains
+                if ($pos !== false && $rcmail->config->get('username_domain_forced')) {
+                    $username = substr($username, 0, $pos) . '@' . $domain;
+                }
+                // just add domain if not specified
+                else if ($pos === false) {
+                    $username .= '@' . $domain;
+                }
+            }
+        }
+
         // Convert username to lowercase. Copied from rcmail::login()
         $login_lc = $rcmail->config->get('login_lc', 2);
         if ($login_lc) {
@@ -128,7 +155,7 @@
             $_SESSION'kolab_2fa_nonce'   = bin2hex(openssl_random_pseudo_bytes(32));
             $_SESSION'kolab_2fa_factors' = $factors;
 
-            $_SESSION'username' = $args'user';
+            $_SESSION'username' = $username;
             $_SESSION'host'     = $args'host';
             $_SESSION'password' = $rcmail->encrypt($args'pass');

roundcubemail-1.5.tar.gz/program/lib/Roundcube/rcube_washtml.php Changed

@@ -424,17 +424,18 @@
                 return $this->config'blocked_src';
             }
         }
-        else if ($is_image && preg_match('/^data:image\/(^,+),(.+)$/i', $uri, $matches)) { // RFC2397
+        else if ($is_image && preg_match('/^data:image\/(^,+),(.+)$/is', $uri, $matches)) { // RFC2397
+            $type = preg_replace('/\s/', '', $matches1);
+
             // svg images can be insecure, we'll sanitize them
-            if (stripos($matches1, 'svg') !== false) {
+            if (stripos($type, 'svg') !== false) {
                 $svg = $matches2;
 
-                if (stripos($matches1, ';base64') !== false) {
-                    $svg  = base64_decode($svg);
-                    $type = $matches1;
+                if (stripos($type, ';base64') !== false) {
+                    $svg = base64_decode($svg);
                 }
                 else {
-                    $type = $matches1 . ';base64';
+                    $type .= ';base64';
                 }
 
                 $washer = new self($this->config);

roundcubemail-1.5.tar.gz/temp/js_cache/tinymce-langs-5.8.2.zip Changed

roundcubemail-1.5.tar.gz/tests/Framework/Washtml.php Changed

@@ -435,6 +435,24 @@
                 '<svg><script href="data:text/javascript,alert(1)" /><text x="20" y="20">XSS</text></svg>',
                 '<svg><text x="20" y="20">XSS</text></svg>'
             ,
+            
+                '<html><svg><use href="data:image/s vg+xml;base64,' // space
+                    . 'PHN2ZyBpZD0ieCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4gPGltYWdlIGhy'
+                    . 'ZWY9IngiIG9uZXJyb3I9ImFsZXJ0KCcxJykiLz48L3N2Zz4=#x"></svg></html>',
+                '<svg xmlns="http://www.w3.org/1999/xhtml"><use x-washed="href"></use></svg>'
+            ,
+            
+                '<html><svg><use href="data:image/s' . "\n" . 'vg+xml;base64,' // new-line
+                    . 'PHN2ZyBpZD0ieCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4gPGltYWdlIGhy'
+                    . 'ZWY9IngiIG9uZXJyb3I9ImFsZXJ0KCcxJykiLz48L3N2Zz4=#x"></svg></html>',
+                '<svg xmlns="http://www.w3.org/1999/xhtml"><use x-washed="href"></use></svg>'
+            ,
+            
+                '<html><svg><use href="data:image/s	vg+xml;base64,' // tab
+                    . 'PHN2ZyBpZD0ieCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4gPGltYWdlIGhy'
+                    . 'ZWY9IngiIG9uZXJyb3I9ImFsZXJ0KCcxJykiLz48L3N2Zz4=#x"></svg></html>',
+                '<svg xmlns="http://www.w3.org/1999/xhtml"><use x-washed="href"></use></svg>'
+            ,
         ;
     }

roundcubemail-1.5.tar.gz/vendor/autoload.php Changed

roundcubemail-1.5.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit122854e0f2c6339ec1168e3ecb62d885
+class ComposerAutoloaderInita8b3f12939564f233eed25f6d692456d
 {
     private static $loader;
 
@@ -24,20 +24,20 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit122854e0f2c6339ec1168e3ecb62d885', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInita8b3f12939564f233eed25f6d692456d', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit122854e0f2c6339ec1168e3ecb62d885', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInita8b3f12939564f233eed25f6d692456d', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit122854e0f2c6339ec1168e3ecb62d885::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInita8b3f12939564f233eed25f6d692456d::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit122854e0f2c6339ec1168e3ecb62d885::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInita8b3f12939564f233eed25f6d692456d::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS'__composer_autoload_files'$fileIdentifier)) {
                 $GLOBALS'__composer_autoload_files'$fileIdentifier = true;

roundcubemail-1.5.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit122854e0f2c6339ec1168e3ecb62d885
+class ComposerStaticInita8b3f12939564f233eed25f6d692456d
 {
     public static $files = array (
         '383eaff206634a77a1be54e64e6459c7' => __DIR__ . '/..' . '/sabre/uri/lib/functions.php',
@@ -1145,11 +1145,11 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit122854e0f2c6339ec1168e3ecb62d885::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit122854e0f2c6339ec1168e3ecb62d885::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit122854e0f2c6339ec1168e3ecb62d885::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit122854e0f2c6339ec1168e3ecb62d885::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit122854e0f2c6339ec1168e3ecb62d885::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInita8b3f12939564f233eed25f6d692456d::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInita8b3f12939564f233eed25f6d692456d::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInita8b3f12939564f233eed25f6d692456d::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInita8b3f12939564f233eed25f6d692456d::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInita8b3f12939564f233eed25f6d692456d::$classMap;
 
         }, null, ClassLoader::class);
     }

roundcubemail-1.5.tar.gz/vendor/composer/installed.json Changed

@@ -1425,13 +1425,13 @@
             "source": {
                 "type": "git",
                 "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
-                "reference": "480d977b4055e87ef144055f927e71d46c9be959"
+                "reference": "39a754269fe6e5d94b0fe87215e89232876bda01"
             },
             "require": {
                 "pear/net_ldap2": ">=2.0.12",
                 "php": ">=5.3.3"
             },
-            "time": "2023-08-10T11:11:46+00:00",
+            "time": "2023-10-01T07:22:58+00:00",
             "default-branch": true,
             "type": "library",
             "installation-source": "source",
@@ -2307,24 +2307,27 @@
         },
         {
             "name": "pear/net_ldap2",
-            "version": "v2.2.1",
-            "version_normalized": "2.2.1.0",
+            "version": "v2.3.0",
+            "version_normalized": "2.3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Net_LDAP2.git",
-                "reference": "0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1"
+                "reference": "6eae6d20533469ffe1c01684923cd09f0fae3b77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Net_LDAP2/zipball/0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1",
-                "reference": "0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1",
+                "url": "https://api.github.com/repos/pear/Net_LDAP2/zipball/6eae6d20533469ffe1c01684923cd09f0fae3b77",
+                "reference": "6eae6d20533469ffe1c01684923cd09f0fae3b77",
                 "shasum": ""
             },
             "require": {
                 "ext-ldap": "*",
                 "pear/pear-core-minimal": "^1.10.1"
             },
-            "time": "2023-02-08T07:25:31+00:00",
+            "require-dev": {
+                "phpunit/phpunit": "^9 || ^10.3"
+            },
+            "time": "2023-10-12T20:00:01+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3044,17 +3047,17 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.35",
-            "version_normalized": "1.10.35.0",
+            "version": "1.10.38",
+            "version_normalized": "1.10.38.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3"
+                "reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e730e5facb75ffe09dfb229795e8c01a459f26c3",
-                "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5302bb402c57f00fb3c2c015bac86e0827e4b691",
+                "reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691",
                 "shasum": ""
             },
             "require": {
@@ -3063,7 +3066,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2023-09-19T15:27:56+00:00",
+            "time": "2023-10-06T14:19:14+00:00",
             "bin": 
                 "phpstan",
                 "phpstan.phar"

roundcubemail-1.5.tar.gz/vendor/composer/installed.php Changed

@@ -3,7 +3,7 @@
         'name' => 'roundcube/roundcubemail',
         'pretty_version' => 'dev-dev/kolab-1.5',
         'version' => 'dev-dev/kolab-1.5',
-        'reference' => 'e738d5400d458b376b6c97779dc50f2e8571c6d6',
+        'reference' => '02b3395aed1917fc6ccbfa779ba42f12b8a2ab78',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -258,7 +258,7 @@
         'kolab/net_ldap3' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '480d977b4055e87ef144055f927e71d46c9be959',
+            'reference' => '39a754269fe6e5d94b0fe87215e89232876bda01',
             'type' => 'library',
             'install_path' => __DIR__ . '/../kolab/net_ldap3',
             'aliases' => array(
@@ -402,9 +402,9 @@
             'dev_requirement' => false,
         ),
         'pear/net_ldap2' => array(
-            'pretty_version' => 'v2.2.1',
-            'version' => '2.2.1.0',
-            'reference' => '0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1',
+            'pretty_version' => 'v2.3.0',
+            'version' => '2.3.0.0',
+            'reference' => '6eae6d20533469ffe1c01684923cd09f0fae3b77',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/net_ldap2',
             'aliases' => array(),
@@ -510,9 +510,9 @@
             'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.10.35',
-            'version' => '1.10.35.0',
-            'reference' => 'e730e5facb75ffe09dfb229795e8c01a459f26c3',
+            'pretty_version' => '1.10.38',
+            'version' => '1.10.38.0',
+            'reference' => '5302bb402c57f00fb3c2c015bac86e0827e4b691',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
@@ -641,7 +641,7 @@
         'roundcube/roundcubemail' => array(
             'pretty_version' => 'dev-dev/kolab-1.5',
             'version' => 'dev-dev/kolab-1.5',
-            'reference' => 'e738d5400d458b376b6c97779dc50f2e8571c6d6',
+            'reference' => '02b3395aed1917fc6ccbfa779ba42f12b8a2ab78',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/ORIG_HEAD Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/index Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/info/refs Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD Changed

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 480d977b4055e87ef144055f927e71d46c9be959 default <default@c0ba38f31044.(none)> 1695854738 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
-480d977b4055e87ef144055f927e71d46c9be959 480d977b4055e87ef144055f927e71d46c9be959 default <default@c0ba38f31044.(none)> 1695854738 +0000	checkout: moving from master to master
-480d977b4055e87ef144055f927e71d46c9be959 480d977b4055e87ef144055f927e71d46c9be959 default <default@c0ba38f31044.(none)> 1695854738 +0000	reset: moving to 480d977b4055e87ef144055f927e71d46c9be959
+0000000000000000000000000000000000000000 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@69980b051fc7.(none)> 1697444298 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@69980b051fc7.(none)> 1697444298 +0000	checkout: moving from master to master
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@69980b051fc7.(none)> 1697444298 +0000	reset: moving to 39a754269fe6e5d94b0fe87215e89232876bda01

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/info/packs Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-5071ce79d8f518d56d4d77de8369f7db5a79f91d.idx Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-5071ce79d8f518d56d4d77de8369f7db5a79f91d.pack Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-9e5706eac1e3ad5e7ea1b4540504dd423b7937f2.idx Deleted

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-9e5706eac1e3ad5e7ea1b4540504dd423b7937f2.pack Deleted

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/packed-refs Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/refs/heads/master Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/lib/Net/LDAP3/Result.php Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/.gitignore Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/.travis.yml Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/Net/LDAP2.php Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/Net/LDAP2/Entry.php Changed

@@ -151,7 +151,7 @@
         parent::__construct('Net_LDAP2_Error');
 
         // set up entry resource or DN
-        if (is_resource($entry)) {
+        if (is_resource($entry) || $entry instanceof \LDAP\ResultEntry) {
             $this->_entry = $entry;
         } else {
             $this->_dn = $entry;
@@ -161,7 +161,7 @@
         if ($ldap instanceof Net_LDAP2) {
             $this->_ldap = $ldap;
             $this->_link = $ldap->getLink();
-        } elseif (is_resource($ldap)) {
+        } elseif (is_resource($ldap) || $ldap instanceof \LDAP\Connection) {
             $this->_link = $ldap;
         } elseif (is_array($ldap)) {
             // Special case: here $ldap is an array of attributes,
@@ -173,7 +173,9 @@
 
         // if this is an entry existing in the directory,
         // then set up as old and fetch attrs
-        if (is_resource($this->_entry) && is_resource($this->_link)) {
+        if ((is_resource($this->_entry) || $this->_entry instanceof \LDAP\ResultEntry)
+            && (is_resource($this->_link) || $this->_link instanceof \LDAP\Connection)
+        ) {
             $this->_new = false;
             $this->_dn  = @ldap_get_dn($this->_link, $this->_entry);
             $this->setAttributes();  // fetch attributes from server
@@ -235,7 +237,7 @@
         if (!$ldap instanceof Net_LDAP2) {
             return PEAR::raiseError("Unable to create connected entry: Parameter \$ldap needs to be a Net_LDAP2 object!");
         }
-        if (!is_resource($entry)) {
+        if (!is_resource($entry) && !$entry instanceof \LDAP\ResultEntry) {
             return PEAR::raiseError("Unable to create connected entry: Parameter \$entry needs to be a ldap entry resource!");
         }
 
@@ -354,7 +356,10 @@
         /*
         * fetch attributes from the server
         */
-        if (is_null($attributes) && is_resource($this->_entry) && is_resource($this->_link)) {
+        if (is_null($attributes)
+            && (is_resource($this->_entry) || $this->_entry instanceof \LDAP\ResultEntry)
+            && (is_resource($this->_link) || $this->_link instanceof \LDAP\Connection)
+        ) {
             // fetch schema
             if ($this->_ldap instanceof Net_LDAP2) {
                 $schema = $this->_ldap->schema();
@@ -768,7 +773,7 @@
 
         // Get and check link
         $link = $ldap->getLink();
-        if (!is_resource($link)) {
+        if (!is_resource($link) && !$link instanceof \LDAP\Connection) {
             return PEAR::raiseError("Could not update entry: internal LDAP link is invalid");
         }

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/Net/LDAP2/Search.php Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/package.xml Changed

@@ -26,9 +26,9 @@
     </lead>
 
     
-    <date>2023-02-23</date>
+    <date>2023-10-12</date>
     <version>
-        <release>2.2.1</release>
+        <release>2.3.0</release>
         <api>2.2.0</api>
     </version>
     <stability>
@@ -37,7 +37,9 @@
     </stability>
     <license>LGPLv3 License</license>
     <notes>
-     * Fix: remove unused $ber property
+     * Support PHP 8.1
+     * Fix unit tests on PHP 8.0.29
+     * Make tests compatible with PHPUnit 9
     </notes>
     <contents>
         <dir name="/">
@@ -527,7 +529,7 @@
 * New constructor factory for Entry objects: createExisting()
 * Several small improvements
 * New method Entry-&gt;isNew()
-* Net_LDAP2-&gt;search() and Net_LDAP2-&gt;dnExists() can handle entry objects now 
+* Net_LDAP2-&gt;search() and Net_LDAP2-&gt;dnExists() can handle entry objects now
 * Added &quot;present&quot; matching rule as stated by RFC 2254 (is an alias of the former &quot;any&quot;)
 * Bugfix in filter class for approx matching and not combination
 * Bugfix for Schema-&gt;isBinary() bug if unknown attribute type is requested
@@ -873,5 +875,22 @@
      * Improve unit tests
     </notes>
   </release>
+
+  <release>
+    <date>2023-02-23</date>
+    <version>
+        <release>2.2.1</release>
+        <api>2.2.0</api>
+    </version>
+    <stability>
+        <release>stable</release>
+        <api>stable</api>
+    </stability>
+    <license>LGPLv3 License</license>
+    <notes>
+     * Fix: remove unused $ber property
+    </notes>
+  </release>
+
  </changelog>
 </package>

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2Test.php Changed

@@ -18,20 +18,11 @@
      *
      * @access protected
      */
-    protected function setUp() {
+    protected function setUp(): void {
         $this->ldapcfg = $this->getTestConfig();
     }
 
     /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
      * This checks if a valid LDAP testconfig is present and loads it.
      *
      * If so, it is loaded and returned as array. If not, false is returned.
@@ -325,6 +316,10 @@
                     'postalAddress'   => 'someAddress',
                     'facsimileTelephoneNumber' => array('123','456')
                 ));
+
+            //remove data from previously failed test
+            $ldap->delete($local_entry->dn());
+
             $this->assertTrue($ldap->add($local_entry));
             $this->assertTrue($ldap->dnExists($local_entry->dn()));
 
@@ -415,6 +410,12 @@
                     'objectClass' => array('top','organizationalUnit'),
                     'ou' => 'Net_LDAP2_Test_search2'
                 ));
+
+            //remove data from previously failed test
+            $ldap->delete($ou1_1->dn());
+            $ldap->delete($ou1->dn());
+            $ldap->delete($ou2->dn());
+
             $this->assertTrue($ldap->add($ou1));
             $this->assertTrue($ldap->dnExists($ou1->dn()));
             $this->assertTrue($ldap->add($ou1_1));
@@ -647,6 +648,14 @@
                     'objectClass' => array('top','organizationalUnit'),
                     'ou' => 'target_otherdir'
                 ));
+
+            //remove data from previously failed test
+            $ldap->delete($ou_1_l1->dn());
+            $ldap->delete($ou_1->dn());
+            $ldap->delete($ou_2->dn());
+            $ldap->delete($ou_3->dn());
+            $ldap->delete($ou->dn());
+
             $this->assertTrue($ldap->add($ou));
             $this->assertTrue($ldap->add($ou_1));
             $this->assertTrue($ldap->add($ou_1_l1));
@@ -855,7 +864,12 @@
             $this->markTestSkipped('No ldapconfig.ini found. Skipping test!');
         } else {
             $ldap = $this->connect();
-            $this->assertTrue(is_resource($ldap->getLink()));
+
+            if (version_compare(PHP_VERSION, '8.1.0', '<')) {
+                $this->assertTrue(is_resource($ldap->getLink()));
+            } else {
+                $this->assertInstanceOf(\LDAP\Connection::class, $ldap->getLink());
+            }
         }
     }
 
@@ -878,6 +892,9 @@
                 'cn'          => $cn
             );
 
+            //remove data from previously failed test
+            $ldap->delete($dn);
+
             // Test case
             $entry = Net_LDAP2_Entry::createFresh($dn, $data);
             $this->assertInstanceOf('Net_LDAP2_Entry', $entry);
@@ -885,7 +902,7 @@
             $this->assertTrue( $ldap->add($entry) );
             $this->assertTrue( $entry->replace(array('uid' => 'Foo Bar')) );
             $this->assertTrue( $result = $entry->update() );
-    
+
             // cleanup
             $this->assertTrue($ldap->delete($entry),
                     'Cleanup of test entry failed. Please remove manually: '.$entry->dn());

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_EntryTest.php Changed

@@ -34,20 +34,11 @@
      *
      * @access protected
      */
-    protected function setUp() {
+    protected function setUp(): void {
         $this->ldapcfg = $this->getTestConfig();
     }
 
     /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
      * This checks if a valid LDAP testconfig is present and loads it.
      *
      * If so, it is loaded and returned as array. If not, false is returned.
@@ -112,7 +103,7 @@
         $this->assertTrue(Net_LDAP2::isError($t), 'Creating fresh entry succeeded but was supposed to fail!');
 
         // test failing creation
-        $t = Net_LDAP2_Entry::createFresh("cn=test", 
+        $t = Net_LDAP2_Entry::createFresh("cn=test",
             array(
                 'attr1' => 'single',
                 'attr2' => array('mv1', 'mv2')
@@ -190,7 +181,7 @@
                 'attr2' => array('mv1', 'mv2')
                 )
         );
-    
+
         // test default behavior
         $this->assertEquals('single', $entry->getValue('attr1'));
         $this->assertEquals(array('mv1', 'mv2'), $entry->getValue('attr2'));

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_FilterTest.php Changed

@@ -26,24 +26,6 @@
     }
 
     /**
-     * Sets up the fixture, for example, open a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     */
-    protected function setUp() {
-    }
-
-    /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
      * This tests the perl compatible creation of filters through parsing of an filter string
      */
     public function testCreatePerlCompatible() {
@@ -144,7 +126,7 @@
             $filter = Net_LDAP2_Filter::create($testattr, $match, $testval, false);
 
             $this->assertInstanceOf('Net_LDAP2_Filter', $filter);
-            $this->assertRegExp($regex, $filter->asString(), "Filter generation failed for MatchType: $match");
+            $this->assertMatchesRegularExpression($regex, $filter->asString(), "Filter generation failed for MatchType: $match");
         }
 
         // test creating failure
@@ -392,10 +374,10 @@
                 'height'         => '120',
                 'mail'           => 'bart@iHateSchool.com',
                 'objectClass'    => array('top', 'person', 'inetOrgPerson', 'myFancyTestClass'),
-                )   
+                )
         );
         $entry3 = Net_LDAP2_Entry::createFresh('cn=Brockman Kent,l=springfield,c=usa',
-            array(      
+            array(
                 'cn'             => 'Brockman Kent',
                 'sn'             => 'Brockman',
                 'givenName'      => 'Kent',
@@ -404,7 +386,7 @@
                 'height'         => '185',
                 'mail'           => 'kent.brockman@channel6.com',
                 'objectClass'    => array('top', 'person', 'inetOrgPerson', 'myFancyTestClass'),
-                )   
+                )
         );
 
         $allEntries = array($entry1, $entry2, $entry3);
@@ -455,7 +437,7 @@
 	$filterresult = array();
 	$this->assertEquals(1, $filter->matches($allEntries, $filterresult));
 	$this->assertEquals($entry1->dn(), array_shift($filterresult)->dn(), "Filtered entry does not equal expected entry! filter='".$filter->asString()."'");
-	
+
 	$filter = Net_LDAP2_Filter::combine('not', $filter); // all but homer consume donuts
         $this->assertEquals(count($allEntries)-1, $filter->matches($allEntries, $filterresult), "Filtered entry does not equal expected entry! filter='".$filter->asString()."'");
 
@@ -465,7 +447,7 @@
         $this->assertEquals(2, $filter->matches($allEntries, $filterresult));
         $this->assertEquals($entry2->dn(), array_shift($filterresult)->dn(), "Filtered entry does not equal expected entry! filter='".$filter->asString()."'");
         $this->assertEquals($entry3->dn(), array_shift($filterresult)->dn(), "Filtered entry does not equal expected entry! filter='".$filter->asString()."'");
-        
+
         // OR combination test
         $filter1 = Net_LDAP2_Filter::create('sn', 'equals', 'Simpson');
         $filter2 = Net_LDAP2_Filter::create('givenName', 'equals', 'Kent');
@@ -493,7 +475,7 @@
         $filterresult = array();
         $this->assertEquals(1, $filter_final->matches($allEntries, $filterresult)); // should leave only kent
         $this->assertEquals($entry3->dn(), array_shift($filterresult)->dn(), "Filtered entry does not equal expected entry! filter='".$filter_final->asString()."'");
-        
+
         // TODO: Further tests for >, <, >=, <= and ~=, when they are implemented.
         // ...until then: negative testing for those cases
         foreach (array('>', '<', '>=', '<=', '~=') as $to) {

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_LDIFTest.php Changed

@@ -100,7 +100,7 @@
      *
      * @access protected
      */
-    protected function setUp() {
+    protected function setUp(): void {
         // initialize test entries
         $this->testentries = array();
         foreach ($this->testentries_data as $dn => $attrs) {
@@ -120,7 +120,7 @@
      *
      * @access protected
      */
-    protected function tearDown() {
+    protected function tearDown(): void {
 	// uncomment this if you debug the test cases so you will have output available
 	if (file_exists($this->outfile)) @unlink($this->outfile);
     }
@@ -174,12 +174,15 @@
 
         // writing to existing file but without permission
         // note: chmod should succeed since we do that in setUp()
-        if (chmod($this->outfile, 0444)) {
+        if (!chmod($this->outfile, 0444)) {
+            $this->markTestSkipped("Could not chmod ".$this->outfile.", write test without permission skipped");
+        } else if (stat($this->outfile)'uid' === 0) {
+            $this->markTestSkipped("Running as root breaks this test");
+
+        } else {
             $ldif = new Net_LDAP2_LDIF($this->outfile, 'w', $this->defaultConfig);
             $this->assertNull($ldif->handle());
             $this->assertInstanceOf('Net_LDAP2_Error', $ldif->error());
-        } else {
-            $this->markTestSkipped("Could not chmod ".$this->outfile.", write test without permission skipped");
         }
     }
 
@@ -420,7 +423,7 @@
         $this->assertFalse((boolean)$ldif->error(), 'Failed writing entry to '.$this->outfile.': '.$ldif->error(true));
         $ldif->done();
         $this->assertEquals(0, filesize($this->outfile));
-   
+
     }
 
     /**
@@ -551,8 +554,8 @@
         $ldif = new Net_LDAP2_LDIF(dirname(__FILE__).'/some_not_existing/path/for/net_ldap_ldif', 'r', $this->defaultConfig);
         $this->assertTrue((boolean)$ldif->error());
         $this->assertInstanceOf('Net_LDAP2_Error', $ldif->error());
-        $this->assertInternalType('string', $ldif->error(true));
-        $this->assertInternalType('int', $ldif->error_lines());
+        $this->assertIsString($ldif->error(true));
+        $this->assertIsInt($ldif->error_lines());
         $this->assertThat(strlen($ldif->error(true)), $this->greaterThan(0));
 
         // Test for line number reporting

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_RootDSETest.php Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_SearchTest.php Changed

@@ -19,20 +19,11 @@
      *
      * @access protected
      */
-    protected function setUp() {
+    protected function setUp(): void {
         $this->ldapcfg = $this->getTestConfig();
     }
 
     /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
      * This checks if a valid LDAP testconfig is present and loads it.
      *
      * If so, it is loaded and returned as array. If not, false is returned.
@@ -257,6 +248,11 @@
                     'objectClass' => array('top','organizationalUnit'),
                     'ou' => 'Net_LDAP2_Test_search2'
                 ));
+
+            //remove data from previously failed test
+            $ldap->delete($ou1->dn());
+            $ldap->delete($ou2->dn());
+
             $this->assertTrue($ldap->add($ou1));
             $this->assertTrue($ldap->dnExists($ou1->dn()));
             $this->assertTrue($ldap->add($ou2));

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_TestBase.php Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_UtilTest.php Changed

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/phpstan.phar Changed

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/phpstan.phar.asc Changed

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmUJveMACgkQUcZzBf/C
-5cDJpw/9HY+cS4w3C3NI/NIuIDkMOwID2fyF3jGp89+HylnvRgdnM6DNWiF1smRX
-NuQUI55L6q6x9gamVOG+8VVaPdJO8fBbHx1uHqW4Kx+q8XShjCdGm0HiMkDceEZP
-GQFp06iPY/O+Nqz9ofNfJMR++SkaVQnrgDLws18+fhp29mkkGxAW3M2hcCz6kC/X
-yAjw12VsJErpCvtlYdXu3geBYiqfS095mTyjj9xmyYojzVDwiNI2nYhWvw1gzsM6
-PMb1k8HhkMThRsqxG+7kkZe1klWJ3KHQXsHyB4mQqUHzL0SYbSFtWOx4IsEZ90eb
-/Bm5GHfYso1pE5NzWcYzfyNKxRkcV8jPWu5YzzdkX6ncMR6sZ78CEFrhkYG9zhIy
-rfaU9Bccuy9jAmec8WHtpaHo+b23tzn/vpfnY4VboggpEsJWyiCKQnBLK/qlesbw
-UN41jPlXvzrWZZJNFZnDzFn/0rAma0qqiM3tz5BKwLtGZuHugwJ4RJ40MlrqYHN8
-CeazXTcEqeVywh1y6gRKTPoFf9WdFi46COwcU71av5V/9VewNzz6rzik51ryS/2m
-6sIlRWVYi31OTUkLyRmu6drYJSNjkrN/WOB935SyvFDVHpNH8OQbSP/HqOniCz/S
-h0eAWSJUbrDslJSc87rbdm/WA3jftbwI0w5ymKit7wqm/Dn5Q20=
-=rQp6
+iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmUgF0sACgkQUcZzBf/C
+5cA9pg/9G+QHFiTkxBu1LUiDhsxnBZqxj/GPQKjJUXtl/XGOxVK8w4R1zvJKn9Te
+Kd76wzc7qoif/dnyl7Pcr1CMvHvN8DG2Ke40dqNMv9TSFcYuYUtJG2f8H6mTMs1C
+F34dTlozorEoMG3R63W3kZ7QVJZE6LVPnCI6rjBjnqqhKJqYGsvb2rny2ogUtQoA
+mNaEcFHa3qOJ67FRJWDbn+quR2GzWQcuTh7htSRwGAFZc5LUY4cpbZqksy2c7Pmm
+B/c9CIsOp0rE9s7fmUiFDzVpNQx+EV74ZJddxZPn4FmoLN7+AzYwLg9T3YIujeWB
+a3J1HV7M1/BICxBl1OtjFz2leWrwkdnNZh9bXVRFGZayG2I5EWr4N2EySSJzDypz
+wD8Hdl1EVwYTVbt9yZhvff3LuDc6u5jIshlfDELtPsw2aQL0rb4268e9UB4RjOFn
+NFK7KBBmsdXCUrYGWwqyyZBSDM7UMlPFTpBvoQo9+t8QNOYFEj2CCPL4U3tKiWW1
+TiHCdzHjBlKrRQrMZnHmRzjGYfpeLpkdxAkxWNomKFImVxG9E/HwP3Sxf5vttOtm
+YHDrKChwDvmDRGlt6eqaqqDFfcnbkk6b3x6UEPt8rlxi2alVAqlCDiT0O6g+s7/I
+gZNJOvVcYmi+HgrwxvSCITfTJhK7RFrCsB+fbqmGesLIHIQklaE=
+=hdHc
 -----END PGP SIGNATURE-----

roundcubemail.dsc Changed

Overview

Request 3237 (accepted)

Request History