From d33f6b9af6bf4bb33e24280f93645d842f8000e2 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 27 Apr 2013 17:45:23 +0100 Subject: [PATCH 1/4] Use correct variable when checking auth --- lib/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/api.php b/lib/api.php index 8d6bbb7cc0..be30894b75 100644 --- a/lib/api.php +++ b/lib/api.php @@ -89,7 +89,7 @@ class OC_API { $responses = array(); foreach(self::$actions[$name] as $action) { // Check authentication and availability - if(!self::isAuthorised(self::$actions[$name])) { + if(!self::isAuthorised($action)) { $responses[] = array( 'app' => $action['app'], 'response' => new OC_OCS_Result(null, OC_API::RESPOND_UNAUTHORISED, 'Unauthorised'), From 59db762dfa7194e07f63bad5cb8397b8646afe18 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 27 Apr 2013 17:45:44 +0100 Subject: [PATCH 2/4] Change app identifier for core api routes --- ocs/routes.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ocs/routes.php b/ocs/routes.php index 81beae2f88..638a694392 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -6,16 +6,16 @@ */ // Config -OC_API::register('get', '/config', array('OC_OCS_Config', 'apiConfig'), 'ocs', OC_API::GUEST_AUTH); +OC_API::register('get', '/config', array('OC_OCS_Config', 'apiConfig'), 'core', OC_API::GUEST_AUTH); // Person -OC_API::register('post', '/person/check', array('OC_OCS_Person', 'check'), 'ocs', OC_API::GUEST_AUTH); +OC_API::register('post', '/person/check', array('OC_OCS_Person', 'check'), 'core', OC_API::GUEST_AUTH); // Activity -OC_API::register('get', '/activity', array('OC_OCS_Activity', 'activityGet'), 'ocs', OC_API::USER_AUTH); +OC_API::register('get', '/activity', array('OC_OCS_Activity', 'activityGet'), 'core', OC_API::USER_AUTH); // Privatedata -OC_API::register('get', '/privatedata/getattribute', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH, array('app' => '', 'key' => '')); -OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH, array('key' => '')); -OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH); -OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'ocs', OC_API::USER_AUTH); -OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'ocs', OC_API::USER_AUTH); +OC_API::register('get', '/privatedata/getattribute', array('OC_OCS_Privatedata', 'get'), 'core', OC_API::USER_AUTH, array('app' => '', 'key' => '')); +OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Privatedata', 'get'), 'core', OC_API::USER_AUTH, array('key' => '')); +OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'core', OC_API::USER_AUTH); +OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'core', OC_API::USER_AUTH); +OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'core', OC_API::USER_AUTH); // cloud OC_API::register('get', '/cloud/capabilities', array('OC_OCS_Cloud', 'getCapabilities'), 'core', OC_API::USER_AUTH); \ No newline at end of file From 66053693f8032d9e2de8d809620ecd79e2c89e2a Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 27 Apr 2013 17:51:36 +0100 Subject: [PATCH 3/4] Code style for ocs/routes.php --- ocs/routes.php | 74 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 9 deletions(-) diff --git a/ocs/routes.php b/ocs/routes.php index 638a694392..ed54758fae 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -6,16 +6,72 @@ */ // Config -OC_API::register('get', '/config', array('OC_OCS_Config', 'apiConfig'), 'core', OC_API::GUEST_AUTH); +OC_API::register( + 'get', + '/config', + array('OC_OCS_Config', 'apiConfig'), + 'core', + OC_API::GUEST_AUT + ); // Person -OC_API::register('post', '/person/check', array('OC_OCS_Person', 'check'), 'core', OC_API::GUEST_AUTH); +OC_API::register( + 'post', + '/person/check', + array('OC_OCS_Person', 'check'), + 'core', + OC_API::GUEST_AUTH + ); // Activity -OC_API::register('get', '/activity', array('OC_OCS_Activity', 'activityGet'), 'core', OC_API::USER_AUTH); +OC_API::register( + 'get', + '/activity', + array('OC_OCS_Activity', 'activityGet'), + 'core', + OC_API::USER_AUTH + ); // Privatedata -OC_API::register('get', '/privatedata/getattribute', array('OC_OCS_Privatedata', 'get'), 'core', OC_API::USER_AUTH, array('app' => '', 'key' => '')); -OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Privatedata', 'get'), 'core', OC_API::USER_AUTH, array('key' => '')); -OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'core', OC_API::USER_AUTH); -OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'core', OC_API::USER_AUTH); -OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'core', OC_API::USER_AUTH); +OC_API::register( + 'get', + '/privatedata/getattribute', + array('OC_OCS_Privatedata', 'get'), + 'core', + OC_API::USER_AUTH, + array('app' => '', 'key' => '') + ); +OC_API::register( + 'get', + '/privatedata/getattribute/{app}', + array('OC_OCS_Privatedata', 'get'), + 'core', + OC_API::USER_AUTH, + array('key' => '') + ); +OC_API::register( + 'get', + '/privatedata/getattribute/{app}/{key}', + array('OC_OCS_Privatedata', 'get'), + 'core', + OC_API::USER_AUTH + ); +OC_API::register( + 'post', + '/privatedata/setattribute/{app}/{key}', + array('OC_OCS_Privatedata', 'set'), + 'core', + OC_API::USER_AUTH + ); +OC_API::register( + 'post', + '/privatedata/deleteattribute/{app}/{key}', + array('OC_OCS_Privatedata', 'delete'), + 'core', + OC_API::USER_AUTH + ); // cloud -OC_API::register('get', '/cloud/capabilities', array('OC_OCS_Cloud', 'getCapabilities'), 'core', OC_API::USER_AUTH); \ No newline at end of file +OC_API::register( + 'get', + '/cloud/capabilities', + array('OC_OCS_Cloud', 'getCapabilities'), + 'core', + OC_API::USER_AUTH + ); \ No newline at end of file From 1e1a8b2f3caf1c11ac031c5a34890bac0480989c Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 27 Apr 2013 17:52:37 +0100 Subject: [PATCH 4/4] Fix typo --- ocs/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocs/routes.php b/ocs/routes.php index ed54758fae..5fcf05e4f9 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -11,7 +11,7 @@ OC_API::register( '/config', array('OC_OCS_Config', 'apiConfig'), 'core', - OC_API::GUEST_AUT + OC_API::GUEST_AUTH ); // Person OC_API::register(