CC-5781: Upgrade script for new storage quota implementation
cleaned up upgrade controller
This commit is contained in:
parent
b9b3e95caa
commit
819862c37b
|
@ -9,35 +9,15 @@ class UpgradeController extends Zend_Controller_Action
|
||||||
$this->view->layout()->disableLayout();
|
$this->view->layout()->disableLayout();
|
||||||
$this->_helper->viewRenderer->setNoRender(true);
|
$this->_helper->viewRenderer->setNoRender(true);
|
||||||
|
|
||||||
//TODO: check api key
|
if (!$this->verifyAuth()) {
|
||||||
//The API key is passed in via HTTP "basic authentication":
|
retrun;
|
||||||
//http://en.wikipedia.org/wiki/Basic_access_authentication
|
}
|
||||||
|
|
||||||
$CC_CONFIG = Config::getConfig();
|
if (!$this->verifyAirtimeVersion()) {
|
||||||
|
|
||||||
//Decode the API key that was passed to us in the HTTP request.
|
|
||||||
$authHeader = $this->getRequest()->getHeader("Authorization");
|
|
||||||
|
|
||||||
$encodedRequestApiKey = substr($authHeader, strlen("Basic "));
|
|
||||||
$encodedStoredApiKey = base64_encode($CC_CONFIG["apiKey"][0] . ":");
|
|
||||||
|
|
||||||
if ($encodedRequestApiKey !== $encodedStoredApiKey)
|
|
||||||
{
|
|
||||||
$this->getResponse()
|
|
||||||
->setHttpResponseCode(401)
|
|
||||||
->appendBody("Bad Authorization.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//check current airtime version
|
|
||||||
$airtime_version = Application_Model_Preference::GetAirtimeVersion();
|
|
||||||
if ($airtime_version != '2.5.2') {
|
|
||||||
$this->getResponse()
|
|
||||||
->setHttpResponseCode(400)
|
|
||||||
->appendBody("Upgrade to Airtime 2.5.3 FAILED. You must be using Airtime 2.5.2 to upgrade.");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Begin upgrade
|
||||||
$filename = "/etc/airtime/airtime.conf";
|
$filename = "/etc/airtime/airtime.conf";
|
||||||
$values = parse_ini_file($filename, true);
|
$values = parse_ini_file($filename, true);
|
||||||
|
|
||||||
|
@ -65,5 +45,42 @@ class UpgradeController extends Zend_Controller_Action
|
||||||
->appendBody("Upgrade to Airtime 2.5.3 OK");
|
->appendBody("Upgrade to Airtime 2.5.3 OK");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function verifyAuth()
|
||||||
|
{
|
||||||
|
//The API key is passed in via HTTP "basic authentication":
|
||||||
|
//http://en.wikipedia.org/wiki/Basic_access_authentication
|
||||||
|
|
||||||
|
$CC_CONFIG = Config::getConfig();
|
||||||
|
|
||||||
|
//Decode the API key that was passed to us in the HTTP request.
|
||||||
|
$authHeader = $this->getRequest()->getHeader("Authorization");
|
||||||
|
|
||||||
|
$encodedRequestApiKey = substr($authHeader, strlen("Basic "));
|
||||||
|
$encodedStoredApiKey = base64_encode($CC_CONFIG["apiKey"][0] . ":");
|
||||||
|
|
||||||
|
if ($encodedRequestApiKey !== $encodedStoredApiKey)
|
||||||
|
{
|
||||||
|
$this->getResponse()
|
||||||
|
->setHttpResponseCode(401)
|
||||||
|
->appendBody("Error: Incorrect API key.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function verifyAirtimeVersion()
|
||||||
|
{
|
||||||
|
$pref = CcPrefQuery::create()
|
||||||
|
->filterByKeystr('system_version')
|
||||||
|
->findOne();
|
||||||
|
$airtime_version = $pref->getValStr();
|
||||||
|
|
||||||
|
if ($airtime_version != '2.5.2') {
|
||||||
|
$this->getResponse()
|
||||||
|
->setHttpResponseCode(400)
|
||||||
|
->appendBody("Upgrade to Airtime 2.5.3 FAILED. You must be using Airtime 2.5.2 to upgrade.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue