aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/files/templates/index.php1
-rw-r--r--apps/files_sharing/templates/public.php1
-rw-r--r--lib/private/user.php4
-rw-r--r--lib/private/user/dummy.php4
-rw-r--r--tests/lib/user.php52
-rw-r--r--tests/lib/user/backend.php8
-rw-r--r--tests/lib/user/database.php9
7 files changed, 55 insertions, 24 deletions
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 5e7ad41b0f0..ebdca097e74 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -108,6 +108,7 @@
</div>
<!-- config hints for javascript -->
+<input type="hidden" name="filesApp" id="filesApp" value="1" />
<input type="hidden" name="ajaxLoad" id="ajaxLoad" value="<?php p($_['ajaxLoad']); ?>" />
<input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
<input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index e53887c3590..5d935f645e6 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -2,6 +2,7 @@
<div id="notification" style="display: none;"></div>
</div>
+<input type="hidden" id="filesApp" name="filesApp" value="1">
<input type="hidden" id="isPublic" name="isPublic" value="1">
<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
<input type="hidden" name="downloadURL" value="<?php p($_['downloadURL']) ?>" id="downloadURL">
diff --git a/lib/private/user.php b/lib/private/user.php
index 04cd06b08bd..b68786c773c 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -198,6 +198,10 @@ class OC_User {
// Delete user files in /data/
OC_Helper::rmdirr(OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid . '/');
+
+ return true;
+ } else {
+ return false;
}
}
diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php
index b5b7a6c3c7a..52be7edfa75 100644
--- a/lib/private/user/dummy.php
+++ b/lib/private/user/dummy.php
@@ -88,8 +88,8 @@ class OC_User_Dummy extends OC_User_Backend {
* returns the user id or false
*/
public function checkPassword($uid, $password) {
- if (isset($this->users[$uid])) {
- return ($this->users[$uid] == $password);
+ if (isset($this->users[$uid]) && $this->users[$uid] === $password) {
+ return $uid;
} else {
return false;
}
diff --git a/tests/lib/user.php b/tests/lib/user.php
index 66c7f3f0d74..fdf9e7a08e0 100644
--- a/tests/lib/user.php
+++ b/tests/lib/user.php
@@ -12,18 +12,26 @@ namespace Test;
use OC\Hooks\PublicEmitter;
class User extends \PHPUnit_Framework_TestCase {
-
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ private $backend;
+
+ protected function setUp(){
+ $this->backend = $this->getMock('\OC_User_Dummy');
+ $manager = \OC_User::getManager();
+ $manager->registerBackend($this->backend);
+ }
+
public function testCheckPassword() {
- /**
- * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
- */
- $backend = $this->getMock('\OC_User_Dummy');
- $backend->expects($this->once())
+
+ $this->backend->expects($this->once())
->method('checkPassword')
->with($this->equalTo('foo'), $this->equalTo('bar'))
- ->will($this->returnValue('foo'));
+ ->will($this->returnValue('foo'))
+ ;
- $backend->expects($this->any())
+ $this->backend->expects($this->any())
->method('implementsActions')
->will($this->returnCallback(function ($actions) {
if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) {
@@ -33,11 +41,33 @@ class User extends \PHPUnit_Framework_TestCase {
}
}));
- $manager = \OC_User::getManager();
- $manager->registerBackend($backend);
-
$uid = \OC_User::checkPassword('foo', 'bar');
$this->assertEquals($uid, 'foo');
}
+
+ public function testDeleteUser() {
+ $fail = \OC_User::deleteUser('victim');
+ $this->assertFalse($fail);
+
+ $success = \OC_User::createUser('victim', 'password');
+
+ $success = \OC_User::deleteUser('victim');
+ $this->assertTrue($success);
+ }
+
+ public function testCreateUser(){
+ $this->backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnCallback(function ($actions) {
+ if ($actions === \OC_USER_BACKEND_CREATE_USER) {
+ return true;
+ } else {
+ return false;
+ }
+ }));
+
+ $user = \OC_User::createUser('newuser', 'newpassword');
+ $this->assertEquals('newuser', $user->getUid());
+ }
} \ No newline at end of file
diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php
index 40674424c96..1384c54a921 100644
--- a/tests/lib/user/backend.php
+++ b/tests/lib/user/backend.php
@@ -39,7 +39,7 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
/**
* get a new unique user name
* test cases can override this in order to clean up created user
- * @return array
+ * @return string
*/
public function getUser() {
return uniqid('test_');
@@ -82,8 +82,8 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
$this->assertTrue($this->backend->userExists($name1));
$this->assertTrue($this->backend->userExists($name2));
- $this->assertTrue($this->backend->checkPassword($name1, 'pass1'));
- $this->assertTrue($this->backend->checkPassword($name2, 'pass2'));
+ $this->assertSame($name1, $this->backend->checkPassword($name1, 'pass1'));
+ $this->assertSame($name2, $this->backend->checkPassword($name2, 'pass2'));
$this->assertFalse($this->backend->checkPassword($name1, 'pass2'));
$this->assertFalse($this->backend->checkPassword($name2, 'pass1'));
@@ -93,7 +93,7 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
$this->backend->setPassword($name1, 'newpass1');
$this->assertFalse($this->backend->checkPassword($name1, 'pass1'));
- $this->assertTrue($this->backend->checkPassword($name1, 'newpass1'));
+ $this->assertSame($name1, $this->backend->checkPassword($name1, 'newpass1'));
$this->assertFalse($this->backend->checkPassword($name2, 'newpass1'));
}
}
diff --git a/tests/lib/user/database.php b/tests/lib/user/database.php
index fe7d87c44de..d7cc39ae387 100644
--- a/tests/lib/user/database.php
+++ b/tests/lib/user/database.php
@@ -21,19 +21,14 @@
*/
class Test_User_Database extends Test_User_Backend {
- /**
- * get a new unique user name
- * test cases can override this in order to clean up created user
- * @return array
- */
public function getUser() {
- $user=uniqid('test_');
+ $user = parent::getUser();
$this->users[]=$user;
return $user;
}
public function setUp() {
- $this->backend=new OC_User_Dummy();
+ $this->backend=new OC_User_Database();
}
public function tearDown() {
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-30 04:42:37 +0000