aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--_test/mock/AuthCaseInsensitivePlugin.php12
-rw-r--r--_test/mock/AuthDeletePlugin.php28
-rw-r--r--_test/tests/inc/auth_aclcheck_caseinsensitive.test.php10
-rw-r--r--_test/tests/inc/auth_admincheck.test.php9
-rw-r--r--_test/tests/inc/auth_deleteprofile.test.php34
-rw-r--r--_test/tests/inc/remote.test.php70
-rw-r--r--_test/tests/inc/remoteapicore.test.php3
-rw-r--r--inc/Remote/Api.php28
-rw-r--r--inc/Remote/ApiCore.php10
9 files changed, 135 insertions, 69 deletions
diff --git a/_test/mock/AuthCaseInsensitivePlugin.php b/_test/mock/AuthCaseInsensitivePlugin.php
new file mode 100644
index 000000000..cf71c0c8c
--- /dev/null
+++ b/_test/mock/AuthCaseInsensitivePlugin.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace dokuwiki\test\mock;
+
+/**
+ * Class dokuwiki\Plugin\DokuWiki_Auth_Plugin
+ */
+class AuthCaseInsensitivePlugin extends AuthPlugin {
+ function isCaseSensitive(){
+ return false;
+ }
+} \ No newline at end of file
diff --git a/_test/mock/AuthDeletePlugin.php b/_test/mock/AuthDeletePlugin.php
new file mode 100644
index 000000000..82e96f2a6
--- /dev/null
+++ b/_test/mock/AuthDeletePlugin.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace dokuwiki\test\mock;
+
+/**
+ * Class dokuwiki\Plugin\DokuWiki_Auth_Plugin
+ */
+class AuthDeletePlugin extends AuthPlugin {
+
+ public $loggedOff = false;
+
+ public function __construct($canDeleteUser = true) {
+ $this->cando['delUser'] = $canDeleteUser;
+ }
+
+ public function checkPass($user, $pass) {
+ return $pass == 'password';
+ }
+
+ public function deleteUsers($users) {
+ return in_array($_SERVER['REMOTE_USER'], $users);
+ }
+
+ public function logoff() {
+ $this->loggedOff = true;
+ }
+
+} \ No newline at end of file
diff --git a/_test/tests/inc/auth_aclcheck_caseinsensitive.test.php b/_test/tests/inc/auth_aclcheck_caseinsensitive.test.php
index 644675de4..af0f17223 100644
--- a/_test/tests/inc/auth_aclcheck_caseinsensitive.test.php
+++ b/_test/tests/inc/auth_aclcheck_caseinsensitive.test.php
@@ -1,12 +1,6 @@
<?php
-use dokuwiki\Extension\AuthPlugin;
-
-class auth_acl_caseinsensitive_auth extends AuthPlugin {
- function isCaseSensitive() {
- return false;
- }
-}
+use dokuwiki\test\mock\AuthCaseInsensitivePlugin;
class auth_acl_caseinsensitive_test extends DokuWikiTest {
protected $oldAuth;
@@ -20,7 +14,7 @@ class auth_acl_caseinsensitive_test extends DokuWikiTest {
$this->oldAuth = $auth;
$this->oldAuthAcl = $AUTH_ACL;
- $auth = new auth_acl_caseinsensitive_auth();
+ $auth = new AuthCaseInsensitivePlugin();
}
function tearDown() {
diff --git a/_test/tests/inc/auth_admincheck.test.php b/_test/tests/inc/auth_admincheck.test.php
index 82ddafcff..23e9b0035 100644
--- a/_test/tests/inc/auth_admincheck.test.php
+++ b/_test/tests/inc/auth_admincheck.test.php
@@ -1,12 +1,7 @@
<?php
use dokuwiki\test\mock\AuthPlugin;
-
-class auth_admin_test_AuthInSensitive extends AuthPlugin {
- function isCaseSensitive(){
- return false;
- }
-}
+use dokuwiki\test\mock\AuthCaseInsensitivePlugin;
class auth_admin_test extends DokuWikiTest {
@@ -25,7 +20,7 @@ class auth_admin_test extends DokuWikiTest {
function setInSensitive() {
global $auth;
- $auth = new auth_admin_test_AuthInSensitive();
+ $auth = new AuthCaseInsensitivePlugin();
}
function teardown() {
diff --git a/_test/tests/inc/auth_deleteprofile.test.php b/_test/tests/inc/auth_deleteprofile.test.php
index 2195ee97d..ebefae59d 100644
--- a/_test/tests/inc/auth_deleteprofile.test.php
+++ b/_test/tests/inc/auth_deleteprofile.test.php
@@ -1,29 +1,7 @@
<?php
use dokuwiki\Input\Input;
-use dokuwiki\Extension\AuthPlugin;
-
-class Mock_Auth_Plugin extends AuthPlugin {
-
- public $loggedOff = false;
-
- public function __construct($canDeleteUser = true) {
- $this->cando['delUser'] = $canDeleteUser;
- }
-
- public function checkPass($user, $pass) {
- return $pass == 'password';
- }
-
- public function deleteUsers($users) {
- return in_array($_SERVER['REMOTE_USER'], $users);
- }
-
- public function logoff() {
- $this->loggedOff = true;
- }
-
-}
+use dokuwiki\test\mock\AuthDeletePlugin;
class auth_deleteprofile_test extends DokuWikiTest {
@@ -56,7 +34,7 @@ class auth_deleteprofile_test extends DokuWikiTest {
$_REQUEST = $input;
$INPUT = new Input();
- $auth = new Mock_Auth_Plugin();
+ $auth = new AuthDeletePlugin();
$this->assertTrue(auth_deleteprofile());
$this->assertTrue($auth->loggedOff);
@@ -82,7 +60,7 @@ class auth_deleteprofile_test extends DokuWikiTest {
$_REQUEST = $input;
$INPUT = new Input();
- $auth = new Mock_Auth_Plugin();
+ $auth = new AuthDeletePlugin();
// password check required - it fails, so don't delete profile
$this->assertFalse(auth_deleteprofile());
@@ -112,7 +90,7 @@ class auth_deleteprofile_test extends DokuWikiTest {
$_REQUEST = $input;
$INPUT = new Input();
- $auth = new Mock_Auth_Plugin(false);
+ $auth = new AuthDeletePlugin(false);
$conf['disableactions'] = '';
$this->assertFalse(auth_deleteprofile());
}
@@ -136,7 +114,7 @@ class auth_deleteprofile_test extends DokuWikiTest {
$_REQUEST = $input;
$INPUT = new Input();
- $auth = new Mock_Auth_Plugin();
+ $auth = new AuthDeletePlugin();
$conf['disableactions'] = 'profile_delete';
$this->assertFalse(actionOK('profile_delete'));
@@ -165,7 +143,7 @@ class auth_deleteprofile_test extends DokuWikiTest {
$_REQUEST = $input;
$input_foundation = new Input();
- $auth = new Mock_Auth_Plugin();
+ $auth = new AuthDeletePlugin();
$INPUT = clone $input_foundation;
$INPUT->remove('delete');
diff --git a/_test/tests/inc/remote.test.php b/_test/tests/inc/remote.test.php
index 6a9686b07..7f1ec4aff 100644
--- a/_test/tests/inc/remote.test.php
+++ b/_test/tests/inc/remote.test.php
@@ -1,12 +1,9 @@
<?php
-use dokuwiki\Extension\AuthPlugin;
+use dokuwiki\test\mock\AuthPlugin;
use dokuwiki\Extension\RemotePlugin;
use dokuwiki\Remote\Api;
-
-class MockAuth extends AuthPlugin {
- function isCaseSensitive() { return true; }
-}
+use dokuwiki\Remote\RemoteException;
class RemoteAPICoreTest {
@@ -168,7 +165,7 @@ class remote_test extends DokuWikiTest {
$this->userinfo = $USERINFO;
$this->remote = new Api();
- $auth = new MockAuth();
+ $auth = new AuthPlugin();
}
function tearDown() {
@@ -263,13 +260,16 @@ class remote_test extends DokuWikiTest {
$this->assertTrue(true); // avoid being marked as risky for having no assertion
}
- /**
- * @expectedException dokuwiki\Remote\RemoteException
- */
function test_forceAccessFail() {
global $conf;
$conf['remote'] = 0;
- $this->remote->forceAccess();
+
+ try {
+ $this->remote->forceAccess();
+ $this->fail('Expects RemoteException to be raised');
+ } catch (RemoteException $th) {
+ $this->assertEquals(-32604, $th->getCode());
+ }
}
function test_generalCoreFunctionWithoutArguments() {
@@ -290,16 +290,18 @@ class remote_test extends DokuWikiTest {
$this->assertEquals($remoteApi->call('wiki.voidTestMethod'), null);
}
- /**
- * @expectedException dokuwiki\Remote\RemoteException
- */
function test_generalCoreFunctionOnArgumentMismatch() {
global $conf;
$conf['remote'] = 1;
$remoteApi = new Api();
$remoteApi->getCoreMethods(new RemoteAPICoreTest());
- $remoteApi->call('wiki.voidTestMethod', array('something'));
+ try {
+ $remoteApi->call('wiki.voidTestMethod', array('something'));
+ $this->fail('Expects RemoteException to be raised');
+ } catch (RemoteException $th) {
+ $this->assertEquals(-32604, $th->getCode());
+ }
}
function test_generalCoreFunctionWithArguments() {
@@ -318,6 +320,21 @@ class remote_test extends DokuWikiTest {
$this->assertEquals($remoteApi->call('wiki.twoArgWithDefaultArg', array('string', 'another')), array('string', 'another'));
}
+ function test_generalCoreFunctionOnArgumentMissing() {
+ global $conf;
+ $conf['remote'] = 1;
+ $conf['remoteuser'] = '';
+ $remoteApi = new Api();
+ $remoteApi->getCoreMethods(new RemoteAPICoreTest());
+
+ try {
+ $remoteApi->call('wiki.twoArgWithDefaultArg', array());
+ $this->fail('Expects RemoteException to be raised');
+ } catch (RemoteException $th) {
+ $this->assertEquals(-32603, $th->getCode());
+ }
+ }
+
function test_pluginCallMethods() {
global $conf;
global $USERINFO;
@@ -332,15 +349,32 @@ class remote_test extends DokuWikiTest {
$this->assertEquals($remoteApi->call('plugin.testplugin.methodString'), 'success');
}
- /**
- * @expectedException dokuwiki\Remote\RemoteException
- */
+ function test_pluginCallMethodsOnArgumentMissing() {
+ global $conf;
+ $conf['remote'] = 1;
+ $conf['remoteuser'] = '';
+ $remoteApi = new Api();
+ $remoteApi->getCoreMethods(new RemoteAPICoreTest());
+
+ try {
+ $remoteApi->call('plugin.testplugin.method2', array());
+ $this->fail('Expects RemoteException to be raised');
+ } catch (RemoteException $th) {
+ $this->assertEquals(-32603, $th->getCode());
+ }
+ }
+
function test_notExistingCall() {
global $conf;
$conf['remote'] = 1;
$remoteApi = new Api();
- $remoteApi->call('dose not exist');
+ try {
+ $remoteApi->call('dose not exist');
+ $this->fail('Expects RemoteException to be raised');
+ } catch (RemoteException $th) {
+ $this->assertEquals(-32603, $th->getCode());
+ }
}
function test_publicCallCore() {
diff --git a/_test/tests/inc/remoteapicore.test.php b/_test/tests/inc/remoteapicore.test.php
index 70b7710e8..e152d4ac5 100644
--- a/_test/tests/inc/remoteapicore.test.php
+++ b/_test/tests/inc/remoteapicore.test.php
@@ -3,6 +3,7 @@
use dokuwiki\Remote\Api;
use dokuwiki\Remote\ApiCore;
use dokuwiki\test\mock\AuthPlugin;
+use dokuwiki\test\mock\AuthDeletePlugin;
/**
* Class remoteapicore_test
@@ -452,7 +453,7 @@ You can use up to five different levels of',
public function test_deleteUser()
{
global $conf, $auth;
- $auth = new Mock_Auth_Plugin();
+ $auth = new AuthDeletePlugin();
$conf['remote'] = 1;
$conf['remoteuser'] = 'testuser';
$_SERVER['REMOTE_USER'] = 'testuser';
diff --git a/inc/Remote/Api.php b/inc/Remote/Api.php
index 5d9def59a..3b526564d 100644
--- a/inc/Remote/Api.php
+++ b/inc/Remote/Api.php
@@ -166,7 +166,14 @@ class Api
}
$this->checkAccess($methods[$method]);
$name = $this->getMethodName($methods, $method);
- return call_user_func_array(array($plugin, $name), $args);
+ try {
+ set_error_handler(array($this, "argumentWarningHandler"), E_WARNING); // for PHP <7.1
+ return call_user_func_array(array($plugin, $name), $args);
+ } catch (\ArgumentCountError $th) {
+ throw new RemoteException('Method does not exist - wrong parameter count.', -32603);
+ } finally {
+ restore_error_handler();
+ }
}
/**
@@ -185,7 +192,14 @@ class Api
throw new RemoteException('Method does not exist', -32603);
}
$this->checkArgumentLength($coreMethods[$method], $args);
- return call_user_func_array(array($this->coreMethods, $this->getMethodName($coreMethods, $method)), $args);
+ try {
+ set_error_handler(array($this, "argumentWarningHandler"), E_WARNING); // for PHP <7.1
+ return call_user_func_array(array($this->coreMethods, $this->getMethodName($coreMethods, $method)), $args);
+ } catch (\ArgumentCountError $th) {
+ throw new RemoteException('Method does not exist - wrong parameter count.', -32603);
+ } finally {
+ restore_error_handler();
+ }
}
/**
@@ -383,4 +397,14 @@ class Api
{
$this->fileTransformation = $fileTransformation;
}
+
+ /**
+ * The error handler that catches argument-related warnings
+ */
+ public function argumentWarningHandler($errno, $errstr)
+ {
+ if (substr($errstr, 0, 17) == 'Missing argument ') {
+ throw new RemoteException('Method does not exist - wrong parameter count.', -32603);
+ }
+ }
}
diff --git a/inc/Remote/ApiCore.php b/inc/Remote/ApiCore.php
index 12a32b8a4..ffee37acf 100644
--- a/inc/Remote/ApiCore.php
+++ b/inc/Remote/ApiCore.php
@@ -336,7 +336,7 @@ class ApiCore
* $opts['hash'] do md5 sum of content?
* @return array
*/
- public function readNamespace($ns, $opts)
+ public function readNamespace($ns, $opts = array())
{
global $conf;
@@ -508,7 +508,7 @@ class ApiCore
* @throws AccessDeniedException no write access for page
* @throws RemoteException no id, empty new page or locked
*/
- public function putPage($id, $text, $params)
+ public function putPage($id, $text, $params = array())
{
global $TEXT;
global $lang;
@@ -571,7 +571,7 @@ class ApiCore
* @return bool|string
* @throws RemoteException
*/
- public function appendPage($id, $text, $params)
+ public function appendPage($id, $text, $params = array())
{
$currentpage = $this->rawPage($id);
if (!is_string($currentpage)) {
@@ -610,7 +610,7 @@ class ApiCore
* @return false|string
* @throws RemoteException
*/
- public function putAttachment($id, $file, $params)
+ public function putAttachment($id, $file, $params = array())
{
$id = cleanID($id);
$auth = auth_quickaclcheck(getNS($id) . ':*');
@@ -836,7 +836,7 @@ class ApiCore
* @throws AccessDeniedException no read access for page
* @throws RemoteException empty id
*/
- public function pageVersions($id, $first)
+ public function pageVersions($id, $first = 0)
{
$id = $this->resolvePageId($id);
if (auth_quickaclcheck($id) < AUTH_READ) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-01 00:45:21 +0000