Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initial commit for update to ACL for REST module; NEEDS TESTING

This commit is contained in:
Duncan Sommerville 2015-01-21 15:34:15 -05:00
parent 52a66632c6
commit 2c2f7ebc5f
2 changed files with 6 additions and 6 deletions
airtime_mvc/application
configs
ACL.php
controllers/plugins
Acl_plugin.php

7
airtime_mvc/application/configs/ACL.php
View File

@ -29,7 +29,10 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
->add(new Zend_Acl_Resource('audiopreview'))
->add(new Zend_Acl_Resource('webstream'))
->add(new Zend_Acl_Resource('locale'))
->add(new Zend_Acl_Resource('upgrade'));
->add(new Zend_Acl_Resource('upgrade'))
->add(new Zend_Acl_Resource('downgrade'))
->add(new Zend_Acl_Resource('rest:media'))
->add(new Zend_Acl_Resource('billing'));
/** Creating permissions */
$ccAcl->allow('G', 'index')
@ -44,6 +47,8 @@ $ccAcl->allow('G', 'index')
->allow('G', 'webstream')
->allow('G', 'locale')
->allow('G', 'upgrade')
->allow('G', 'downgrade')
->allow('G', 'rest:media')
->allow('H', 'preference', 'is-import-in-progress')
->allow('H', 'usersettings')
->allow('H', 'plupload')

5
airtime_mvc/application/controllers/plugins/Acl_plugin.php
View File

@ -113,11 +113,6 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
//Ignore authentication for all access to the rest API. We do auth via API keys for this
//and/or by OAuth.
if (strtolower($request->getModuleName()) == "rest")
{
return;
}
if (in_array($controller, array("api", "auth", "locale", "upgrade"))) {
$this->setRoleName("G");
} elseif (!Zend_Auth::getInstance()->hasIdentity()) {