maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

finished DirProtections.add() and some basic tests

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-14 19:41:12 +01:00
parent 616fb77de5
commit f2809c47ac
4 changed files with 201 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
lib/classes/api/commands/class.DirProtections.php
View File

@@ -19,7 +19,85 @@ class DirProtections extends ApiCommand implements ResourceEntity
{
public function add()
{}
{
if ($this->isAdmin() == false && Settings::IsInList('panel.customer_hide_options', 'extras')) {
throw new Exception("You cannot access this resource", 405);
}
if ($this->isAdmin() == false && Settings::IsInList('panel.customer_hide_options', 'extras.directoryprotection')) {
throw new Exception("You cannot access this resource", 405);
}
// get needed customer info to reduce the email-address-counter by one
$customer = $this->getCustomerData();
// required parameters
$path = $this->getParam('path');
$username = $this->getParam('username');
$password = $this->getParam('directory_password');
// parameters
$authname = $this->getParam('directory_authname', true, '');
// validation
$path = makeCorrectDir(validate($path, 'path', '', '', array(), true));
$path = makeCorrectDir($customer['documentroot'] . '/' . $path);
$username = validate($username, 'username', '/^[a-zA-Z0-9][a-zA-Z0-9\-_]+\$?$/', '', array(), true);
$authname = validate($authname, 'directory_authname', '/^[a-zA-Z0-9][a-zA-Z0-9\-_ ]+\$?$/', '', array(), true);
validate($password, 'password', '', '', array(), true);
// check for duplicate usernames for the path
$username_path_check_stmt = Database::prepare("
SELECT `id`, `username`, `path` FROM `" . TABLE_PANEL_HTPASSWDS . "`
WHERE `username`= :username AND `path`= :path AND `customerid`= :customerid
");
$params = array(
"username" => $username,
"path" => $path,
"customerid" => $customer['customerid']
);
$username_path_check = Database::pexecute_first($username_path_check_stmt, $params, true, true);
// check whether we can used salted passwords
if (CRYPT_STD_DES == 1) {
$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
$password_enc = crypt($password, $saltfordescrypt);
} else {
$password_enc = crypt($password);
}
// duplicate check
if ($username_path_check['username'] == $username && $username_path_check['path'] == $path) {
standard_error('userpathcombinationdupe', '', true);
} elseif ($password == $username) {
standard_error('passwordshouldnotbeusername', '', true);
}
// insert the entry
$stmt = Database::prepare("
INSERT INTO `" . TABLE_PANEL_HTPASSWDS . "` SET
`customerid` = :customerid,
`username` = :username,
`password` = :password,
`path` = :path,
`authname` = :authname
");
$params = array(
"customerid" => $customer['customerid'],
"username" => $username,
"password" => $password_enc,
"path" => $path,
"authname" => $authname
);
Database::pexecute($stmt, $params, true, true);
$id = Database::lastInsertId();
$this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_INFO, "[API] added directory-protection for '" . $username . " (" . $path . ")'");
inserttask('1');
$result = $this->apiCall('DirProtections.get', array(
'id' => $id
));
return $this->response(200, "successfull", $result);
}
/**
* return a directory-protection entry by either id or username

1
phpunit.xml
View File

@@ -17,6 +17,7 @@
<directory>tests/Certificates</directory>
<directory>tests/Ftps</directory>
<directory>tests/Emails</directory>
<directory>tests/Extras</directory>
</testsuite>
</testsuites>

2
tests/Customers/CustomersTest.php
View File

@@ -268,7 +268,7 @@ class CustomersTest extends TestCase
/**
* @depends testAdminCustomersAdd
*/
public function testResellerCustomersUpdateAllocateMore()
public function testResellerCustomersAddAllocateMore()
{
global $admin_userdata;
// get reseller

120
tests/Extras/ExtrasTest.php Normal file
View File

@@ -0,0 +1,120 @@
<?php
use PHPUnit\Framework\TestCase;
/**
* @covers ApiCommand
* @covers ApiParameter
* @covers DirProtections
*/
class ExtrasTest extends TestCase
{
public function testCustomerDirProtectionsAdd()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'path' => '/test',
'username' => 'testing',
'directory_password' => generatePassword(),
'directory_authname' => 'test1'
];
$json_result = DirProtections::getLocal($customer_userdata, $data)->add();
$result = json_decode($json_result, true)['data'];
$this->assertEquals($customer_userdata['documentroot'] . 'test/', $result['path']);
$this->assertEquals('test1', $result['authname']);
}
public function testCustomerDirProtectionsAddSameUserPath()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'path' => '/test',
'username' => 'testing',
'directory_password' => generatePassword(),
'directory_authname' => 'test2'
];
$this->expectExceptionMessage("Combination of username and path already exists");
DirProtections::getLocal($customer_userdata, $data)->add();
}
public function testCustomerDirProtectionsAddPasswordEqualsUsername()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$up = generatePassword();
$data = [
'path' => '/test',
'username' => $up,
'directory_password' => $up,
'directory_authname' => 'test3'
];
$this->expectExceptionMessage("The password should not be the same as the username.");
DirProtections::getLocal($customer_userdata, $data)->add();
}
/**
* @depends testCustomerDirProtectionsAdd
*/
public function testAdminDirProtectionsGet()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'username' => 'testing',
'customerid' => 1
];
$json_result = DirProtections::getLocal($admin_userdata, $data)->get();
$result = json_decode($json_result, true)['data'];
$this->assertEquals($customer_userdata['documentroot'] . 'test/', $result['path']);
$this->assertEquals('test1', $result['authname']);
}
/**
* @depends testCustomerDirProtectionsAdd
*/
public function testResellerDirProtectionsGet()
{
global $admin_userdata;
// get customer
$json_result = Admins::getLocal($admin_userdata, array(
'loginname' => 'reseller'
))->get();
$reseller_userdata = json_decode($json_result, true)['data'];
$reseller_userdata['adminsession'] = 1;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'username' => 'testing'
];
$json_result = DirProtections::getLocal($reseller_userdata, $data)->get();
$result = json_decode($json_result, true)['data'];
$this->assertEquals($customer_userdata['documentroot'] . 'test/', $result['path']);
$this->assertEquals('test1', $result['authname']);
}
}