Merge pull request #151 from owncloud/support-empty-passwords

Support empty password in basic auth
owncloud-archive · Jan 23, 2015 · a32d392 · a32d392
2 parents 05f9188 + 450e3aa
commit a32d392
Show file tree

Hide file tree

Showing 205 changed files with 389 additions and 333 deletions.
diff --git a/autoload.php b/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInitcc785212584c5b126e08c4edfd274300::getLoader();
+return ComposerAutoloaderInite74b4316c3262a1612fa2917f82871a7::getLoader();
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
 		}
 	],
 	"require": {
-		"sabre/dav" : "1.8.10",
+		"sabre/dav" : "1.8.12",
 		"doctrine/dbal": "2.5.0",
 		"mcnetic/phpzipstreamer": "dev-master",
 		"kriswallsmith/assetic": "1.2.*@dev",

diff --git a/composer.lock b/composer.lock
diff --git a/composer/autoload_real.php b/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitcc785212584c5b126e08c4edfd274300
+class ComposerAutoloaderInite74b4316c3262a1612fa2917f82871a7
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitcc785212584c5b126e08c4edfd274300', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInite74b4316c3262a1612fa2917f82871a7', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitcc785212584c5b126e08c4edfd274300', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInite74b4316c3262a1612fa2917f82871a7', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         array_push($includePaths, get_include_path());
@@ -46,14 +46,14 @@ public static function getLoader()
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            composerRequirecc785212584c5b126e08c4edfd274300($file);
+            composerRequiree74b4316c3262a1612fa2917f82871a7($file);
         }
 
         return $loader;
     }
 }
 
-function composerRequirecc785212584c5b126e08c4edfd274300($file)
+function composerRequiree74b4316c3262a1612fa2917f82871a7($file)
 {
     require $file;
 }
diff --git a/composer/installed.json b/composer/installed.json
@@ -339,83 +339,6 @@
             "x509"
         ]
     },
-    {
-        "name": "sabre/dav",
-        "version": "1.8.10",
-        "version_normalized": "1.8.10.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fruux/sabre-dav.git",
-            "reference": "0d064536ed3c7974e486b6ebb5b17ad7a974fe18"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/0d064536ed3c7974e486b6ebb5b17ad7a974fe18",
-            "reference": "0d064536ed3c7974e486b6ebb5b17ad7a974fe18",
-            "shasum": ""
-        },
-        "require": {
-            "ext-ctype": "*",
-            "ext-date": "*",
-            "ext-dom": "*",
-            "ext-iconv": "*",
-            "ext-libxml": "*",
-            "ext-mbstring": "*",
-            "ext-pcre": "*",
-            "ext-simplexml": "*",
-            "ext-spl": "*",
-            "php": ">=5.3.1",
-            "sabre/vobject": "~2.1.0"
-        },
-        "provide": {
-            "evert/sabredav": "1.7.*"
-        },
-        "require-dev": {
-            "evert/phpdoc-md": "~0.0.7",
-            "phpunit/phpunit": "~4.0.0"
-        },
-        "suggest": {
-            "ext-apc": "*",
-            "ext-curl": "*",
-            "ext-pdo": "*"
-        },
-        "time": "2014-05-16 00:14:02",
-        "bin": [
-            "bin/sabredav"
-        ],
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Sabre\\DAV": "lib/",
-                "Sabre\\HTTP": "lib/",
-                "Sabre\\DAVACL": "lib/",
-                "Sabre\\CalDAV": "lib/",
-                "Sabre\\CardDAV": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Evert Pot",
-                "email": "me@evertpot.com",
-                "homepage": "http://evertpot.com/",
-                "role": "Developer"
-            }
-        ],
-        "description": "WebDAV Framework for PHP",
-        "homepage": "http://code.google.com/p/sabredav/",
-        "keywords": [
-            "CalDAV",
-            "CardDAV",
-            "WebDAV",
-            "framework",
-            "iCalendar"
-        ]
-    },
     {
         "name": "symfony/event-dispatcher",
         "version": "v2.5.0",
@@ -1950,5 +1873,82 @@
             "persistence",
             "queryobject"
         ]
+    },
+    {
+        "name": "sabre/dav",
+        "version": "1.8.12",
+        "version_normalized": "1.8.12.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/fruux/sabre-dav.git",
+            "reference": "78b0a55ae126666b49ec9ac88582d453b971967d"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/78b0a55ae126666b49ec9ac88582d453b971967d",
+            "reference": "78b0a55ae126666b49ec9ac88582d453b971967d",
+            "shasum": ""
+        },
+        "require": {
+            "ext-ctype": "*",
+            "ext-date": "*",
+            "ext-dom": "*",
+            "ext-iconv": "*",
+            "ext-libxml": "*",
+            "ext-mbstring": "*",
+            "ext-pcre": "*",
+            "ext-simplexml": "*",
+            "ext-spl": "*",
+            "php": ">=5.3.1",
+            "sabre/vobject": "~2.1.0"
+        },
+        "provide": {
+            "evert/sabredav": "1.7.*"
+        },
+        "require-dev": {
+            "evert/phpdoc-md": "~0.0.7",
+            "phpunit/phpunit": "~4.0.0"
+        },
+        "suggest": {
+            "ext-apc": "*",
+            "ext-curl": "*",
+            "ext-pdo": "*"
+        },
+        "time": "2015-01-21 21:01:09",
+        "bin": [
+            "bin/sabredav"
+        ],
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Sabre\\DAV": "lib/",
+                "Sabre\\HTTP": "lib/",
+                "Sabre\\DAVACL": "lib/",
+                "Sabre\\CalDAV": "lib/",
+                "Sabre\\CardDAV": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Evert Pot",
+                "email": "me@evertpot.com",
+                "homepage": "http://evertpot.com/",
+                "role": "Developer"
+            }
+        ],
+        "description": "WebDAV Framework for PHP",
+        "homepage": "http://code.google.com/p/sabredav/",
+        "keywords": [
+            "CalDAV",
+            "CardDAV",
+            "WebDAV",
+            "framework",
+            "iCalendar"
+        ]
     }
 ]
diff --git a/sabre/dav/.travis.yml b/sabre/dav/.travis.yml
@@ -8,21 +8,26 @@ php:
   - hhvm
 
 matrix:
+  fast_finish: true
   allow_failures:
-    - php: 5.6
     - php: hhvm
 
+env:
+  matrix:
+    - VOBJECT=2 LOWEST_DEPS=""
+    - VOBJECT=2 LOWEST_DEPS="--prefer-lowest"
+    - VOBJECT=3 LOWEST_DEPS=""
+    - VOBJECT=3 LOWEST_DEPS="--prefer-lowest"
+
 services:
   - mysql
 
+
 before_script:
   - mysql -e 'create database sabredav'
   - composer self-update
-  - composer install --prefer-source
-#  - echo "zend.enable_gc=0" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+  - if [ "$VOBJECT" == "3" ]; then cp tests/composer.vobject3.json composer.json; fi
+  - composer update --prefer-source $LOWEST_DEPS
 
 script:
   - phpunit --configuration tests/phpunit.xml
-  - cp tests/composer.vobject3.json composer.json
-  - composer update --no-dev
-  - phpunit --configuration tests/phpunit.xml
diff --git a/sabre/dav/ChangeLog b/sabre/dav/ChangeLog
@@ -1,3 +1,13 @@
+1.8.12-stable (2015-01-21)
+	* The zip release ships with sabre/vobject 2.1.7.
+    * #568: Support empty usernames and passwords in basic auth.
+
+1.8.11-stable (2014-12-10)
+	* The zip release ships with sabre/vobject 2.1.6.
+	* Updated: MySQL database schema optimized by using more efficient column
+	  types.
+	* #516: The DAV client will now only redirect to HTTP and HTTPS urls.
+
 1.8.10-stable (2014-05-15)
 	* The zip release ships with sabre/vobject 2.1.4.
 	* includes changes from version 1.7.12.
@@ -61,7 +71,8 @@
 	* Added: The Proxy principal classes now both implement an interface, for
 	  greater flexiblity.
 
-1.7.13-stable (????-??-??)
+1.7.13-stable (2014-07-28)
+	* The zip release ships with sabre/vobject 2.1.4.
 	* Changed: Removed phing and went with a custom build script for now.
 
 1.7.12-stable (2014-05-15)

diff --git a/sabre/dav/LICENSE b/sabre/dav/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
 
 All rights reserved.
 

diff --git a/sabre/dav/examples/sql/mysql.addressbook.sql b/sabre/dav/examples/sql/mysql.addressbook.sql
@@ -5,7 +5,7 @@ CREATE TABLE addressbooks (
     uri VARCHAR(200),
     description TEXT,
     ctag INT(11) UNSIGNED NOT NULL DEFAULT '1',
-    UNIQUE(principaluri, uri)
+    UNIQUE(principaluri(100), uri(100))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE cards (

diff --git a/sabre/dav/examples/sql/mysql.calendars.sql b/sabre/dav/examples/sql/mysql.calendars.sql
@@ -1,28 +1,28 @@
 CREATE TABLE calendarobjects (
     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
     calendardata MEDIUMBLOB,
-    uri VARCHAR(200),
+    uri VARBINARY(200),
     calendarid INTEGER UNSIGNED NOT NULL,
     lastmodified INT(11) UNSIGNED,
-    etag VARCHAR(32),
+    etag VARBINARY(32),
     size INT(11) UNSIGNED NOT NULL,
-    componenttype VARCHAR(8),
+    componenttype VARBINARY(8),
     firstoccurence INT(11) UNSIGNED,
     lastoccurence INT(11) UNSIGNED,
     UNIQUE(calendarid, uri)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE calendars (
     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    principaluri VARCHAR(100),
+    principaluri VARBINARY(100),
     displayname VARCHAR(100),
-    uri VARCHAR(200),
+    uri VARBINARY(200),
     ctag INTEGER UNSIGNED NOT NULL DEFAULT '0',
     description TEXT,
     calendarorder INTEGER UNSIGNED NOT NULL DEFAULT '0',
-    calendarcolor VARCHAR(10),
+    calendarcolor VARBINARY(10),
     timezone TEXT,
-    components VARCHAR(20),
+    components VARBINARY(20),
     transparent TINYINT(1) NOT NULL DEFAULT '0',
     UNIQUE(principaluri, uri)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/sabre/dav/examples/sql/mysql.locks.sql b/sabre/dav/examples/sql/mysql.locks.sql
@@ -3,11 +3,11 @@ CREATE TABLE locks (
     owner VARCHAR(100),
     timeout INTEGER UNSIGNED,
     created INTEGER,
-    token VARCHAR(100),
+    token VARBINARY(100),
     scope TINYINT,
     depth TINYINT,
-    uri VARCHAR(1000),
+    uri VARBINARY(1000),
     INDEX(token),
-    INDEX(uri)
+    INDEX(uri(100))
 );