Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added Airtime255 class in Upgrades

This commit is contained in:
Duncan Sommerville 2014-09-18 16:33:01 -04:00
parent 5e18e1881f
commit 5af735654c
2 changed files with 27 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
airtime_mvc/application/controllers/UpgradeController.php
View File

@ -16,6 +16,7 @@ class UpgradeController extends Zend_Controller_Action
$upgraders = array(); $upgraders = array();
array_push($upgraders, new AirtimeUpgrader253()); array_push($upgraders, new AirtimeUpgrader253());
array_push($upgraders, new AirtimeUpgrader254()); array_push($upgraders, new AirtimeUpgrader254());
array_push($upgraders, new AirtimeUpgrader255());
$didWePerformAnUpgrade = false; $didWePerformAnUpgrade = false;
try try
@ -28,8 +29,8 @@ class UpgradeController extends Zend_Controller_Action
$upgrader->upgrade(); //This will throw an exception if the upgrade fails. $upgrader->upgrade(); //This will throw an exception if the upgrade fails.
$didWePerformAnUpgrade = true; $didWePerformAnUpgrade = true;
$this->getResponse() $this->getResponse()
->setHttpResponseCode(200) ->setHttpResponseCode(200)
->appendBody("Upgrade to Airtime " . $upgrader->getNewVersion() . " OK<br>"); ->appendBody("Upgrade to Airtime " . $upgrader->getNewVersion() . " OK<br>");
$i = 0; //Start over, in case the upgrade handlers are not in ascending order. $i = 0; //Start over, in case the upgrade handlers are not in ascending order.
} }
} }
@ -37,15 +38,15 @@ class UpgradeController extends Zend_Controller_Action
if (!$didWePerformAnUpgrade) if (!$didWePerformAnUpgrade)
{ {
$this->getResponse() $this->getResponse()
->setHttpResponseCode(200) ->setHttpResponseCode(200)
->appendBody("No upgrade was performed. The current Airtime version is " . AirtimeUpgrader::getCurrentVersion() . ".<br>"); ->appendBody("No upgrade was performed. The current Airtime version is " . AirtimeUpgrader::getCurrentVersion() . ".<br>");
} }
} }
catch (Exception $e) catch (Exception $e)
{ {
$this->getResponse() $this->getResponse()
->setHttpResponseCode(400) ->setHttpResponseCode(400)
->appendBody($e->getMessage()); ->appendBody($e->getMessage());
} }
} }
@ -65,8 +66,8 @@ class UpgradeController extends Zend_Controller_Action
if ($encodedRequestApiKey !== $encodedStoredApiKey) if ($encodedRequestApiKey !== $encodedStoredApiKey)
{ {
$this->getResponse() $this->getResponse()
->setHttpResponseCode(401) ->setHttpResponseCode(401)
->appendBody("Error: Incorrect API key.<br>"); ->appendBody("Error: Incorrect API key.<br>");
return false; return false;
} }
return true; return true;

62
airtime_mvc/application/upgrade/Upgrades.php
View File

@ -221,61 +221,35 @@ class AirtimeUpgrader255 extends AirtimeUpgrader {
public function upgrade() { public function upgrade() {
Cache::clear(); Cache::clear();
assert ( $this->checkIfUpgradeSupported () ); assert($this->checkIfUpgradeSupported());
$newVersion = $this->getNewVersion (); $newVersion = $this->getNewVersion();
$con = Propel::getConnection ();
// $con->beginTransaction();
try { try {
$this->toggleMaintenanceScreen ( true ); $this->toggleMaintenanceScreen(true);
Cache::clear (); Cache::clear();
// Begin upgrade // Begin upgrade
$airtimeConf = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf";
$values = parse_ini_file($airtimeConf, true);
// First, ensure there are no superadmins already. $username = $values['database']['dbuser'];
$numberOfSuperAdmins = CcSubjsQuery::create ()->filterByDbType ( UTYPE_SUPERADMIN )->filterByDbLogin ( "sourcefabric_admin", Criteria::NOT_EQUAL )-> // Ignore sourcefabric_admin users $password = $values['database']['dbpass'];
count (); $host = $values['database']['host'];
$database = $values['database']['dbname'];
$dir = __DIR__;
// Only create a super admin if there isn't one already. passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/upgrade_sql/airtime_"
if ($numberOfSuperAdmins == 0) { .$this->getNewVersion()."/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\"");
// Find the "admin" user and promote them to superadmin.
$adminUser = CcSubjsQuery::create ()->filterByDbLogin ( 'admin' )->findOne ();
if (! $adminUser) {
// TODO: Otherwise get the user with the lowest ID that is of type administrator:
//
$adminUser = CcSubjsQuery::create ()->filterByDbType ( UTYPE_ADMIN )->orderByDbId ( Criteria::ASC )->findOne ();
if (! $adminUser) {
throw new Exception ( "Failed to find any users of type 'admin' ('A')." );
}
}
$adminUser = new Application_Model_User ( $adminUser->getDbId () );
$adminUser->setType ( UTYPE_SUPERADMIN );
$adminUser->save ();
Logging::info ( $_SERVER ['HTTP_HOST'] . ': ' . $newVersion . " Upgrade: Promoted user " . $adminUser->getLogin () . " to be a Super Admin." );
// Also try to promote the sourcefabric_admin user
$sofabAdminUser = CcSubjsQuery::create ()->filterByDbLogin ( 'sourcefabric_admin' )->findOne ();
if ($sofabAdminUser) {
$sofabAdminUser = new Application_Model_User ( $sofabAdminUser->getDbId () );
$sofabAdminUser->setType ( UTYPE_SUPERADMIN );
$sofabAdminUser->save ();
Logging::info ( $_SERVER ['HTTP_HOST'] . ': ' . $newVersion . " Upgrade: Promoted user " . $sofabAdminUser->getLogin () . " to be a Super Admin." );
}
}
// $con->commit(); Application_Model_Preference::SetAirtimeVersion($newVersion);
Application_Model_Preference::SetAirtimeVersion ( $newVersion ); Cache::clear();
Cache::clear ();
$this->toggleMaintenanceScreen ( false ); $this->toggleMaintenanceScreen(false);
return true; return true;
} catch ( Exception $e ) { } catch(Exception $e) {
// $con->rollback(); $this->toggleMaintenanceScreen(false);
$this->toggleMaintenanceScreen ( false );
throw $e; throw $e;
} }
} }