jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355618 )
Change subject: Remove two unused special pages.
......................................................................
Remove two unused special pages.
NovaSecurityGroups has long-since been replaced by better Horizon functions.
NovaRole was pretty much never used -- I don't have permission to access it
even.
Bug: T161553
Change-Id: I21aab0ec033b624910dc85f1b408cc241b059aec
---
M OpenStackManager.php
D special/SpecialNovaRole.php
D special/SpecialNovaSecurityGroup.php
3 files changed, 0 insertions(+), 849 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/OpenStackManager.php b/OpenStackManager.php
index 9cc2c70..f72049c 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -189,8 +189,6 @@
$wgAutoloadClasses['SpecialNovaProject'] = $dir .
'special/SpecialNovaProject.php';
$wgAutoloadClasses['SpecialNovaDomain'] = $dir .
'special/SpecialNovaDomain.php';
$wgAutoloadClasses['SpecialNovaAddress'] = $dir .
'special/SpecialNovaAddress.php';
-$wgAutoloadClasses['SpecialNovaSecurityGroup'] = $dir .
'special/SpecialNovaSecurityGroup.php';
-$wgAutoloadClasses['SpecialNovaRole'] = $dir . 'special/SpecialNovaRole.php';
$wgAutoloadClasses['SpecialNovaServiceGroup'] = $dir .
'special/SpecialNovaServiceGroup.php';
$wgAutoloadClasses['SpecialNovaVolume'] = $dir .
'special/SpecialNovaVolume.php';
$wgAutoloadClasses['SpecialNovaSudoer'] = $dir .
'special/SpecialNovaSudoer.php';
@@ -209,9 +207,7 @@
$wgAutoloadClasses['OpenStackManagerEvent'] = $dir .
'OpenStackManagerEvent.php';
$wgSpecialPages['NovaKey'] = 'SpecialNovaKey';
$wgSpecialPages['NovaProject'] = 'SpecialNovaProject';
-$wgSpecialPages['NovaSecurityGroup'] = 'SpecialNovaSecurityGroup';
$wgSpecialPages['NovaServiceGroup'] = 'SpecialNovaServiceGroup';
-$wgSpecialPages['NovaRole'] = 'SpecialNovaRole';
$wgSpecialPages['NovaVolume'] = 'SpecialNovaVolume';
$wgSpecialPages['NovaSudoer'] = 'SpecialNovaSudoer';
$wgSpecialPages['NovaResources'] = 'SpecialNovaResources';
diff --git a/special/SpecialNovaRole.php b/special/SpecialNovaRole.php
deleted file mode 100644
index 1a1615f..0000000
--- a/special/SpecialNovaRole.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-
-/**
- * todo comment me
- *
- * @file
- * @ingroup Extensions
- */
-
-class SpecialNovaRole extends SpecialNova {
- public $userLDAP;
-
- function __construct() {
- parent::__construct( 'NovaRole', 'manageproject' );
-
- $this->userLDAP = new OpenStackNovaUser();
- }
-
- function execute( $par ) {
- if ( !$this->getUser()->isLoggedIn() ) {
- $this->notLoggedIn();
- return;
- }
- $this->checkTwoFactor();
- $this->userLDAP = new OpenStackNovaUser();
- $action = $this->getRequest()->getVal( 'action' );
- if ( $action === "addmember" ) {
- $this->addMember();
- } elseif ( $action === "deletemember" ) {
- $this->deleteMember();
- } else {
- $this->displayRestrictionError();
- }
- }
-
- /**
- * @return bool
- */
- function addMember() {
- $this->setHeaders();
- $this->getOutput()->setPageTitle( $this->msg(
'openstackmanager-addmember' ) );
-
- $roleInfo = array();
- $roleid = $this->getRequest()->getText( 'roleid' );
- $projectid = $this->getRequest()->getText( 'projectid' );
-
- if ( $projectid ) {
- $project = new OpenStackNovaProject( $projectid );
- $role = new OpenStackNovaRole( $roleid, $project );
- $projectname = $project->getProjectName();
- $rolename = $role->getRoleName();
-
- if ( !$this->userCanExecute( $this->getUser() ) &&
!$this->userLDAP->inRole( $rolename, $projectname ) ) {
- $this->displayRestrictionError();
- return false;
- }
- $projectmembers = $project->getMembers();
- natcasesort( $projectmembers );
- $role = new OpenStackNovaRole( $roleid, $project );
- $rolemembers = $role->getMembers();
- $member_keys = array();
- foreach ( $projectmembers as $projectmember ) {
- if ( ! in_array( $projectmember, $rolemembers )
) {
- $member_keys[$projectmember] =
$projectmember;
- }
- }
- if ( ! $member_keys ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-nomemberstoadd' );
- return true;
- }
- $roleInfo['members'] = array(
- 'type' => 'multiselect',
- 'label-message' => 'openstackmanager-member',
- 'options' => $member_keys,
- 'section' => 'role/info',
- 'name' => 'members',
- );
- } else {
- //TODO: display error
- }
- $roleInfo['action'] = array(
- 'type' => 'hidden',
- 'default' => 'addmember',
- 'name' => 'action',
- );
- $roleInfo['roleid'] = array(
- 'type' => 'hidden',
- 'default' => $roleid,
- 'name' => 'roleid',
- );
- $roleInfo['projectid'] = array(
- 'type' => 'hidden',
- 'default' => $projectid,
- 'name' => 'projectid',
- );
- $roleInfo['returnto'] = array(
- 'type' => 'hidden',
- 'default' => $this->getRequest()->getText('returnto'),
- 'name' => 'returnto',
- );
-
- $roleForm = new HTMLForm(
- $roleInfo,
- $this->getContext(),
- 'openstackmanager-novarole'
- );
- $roleForm->setSubmitID( 'novarole-form-addmembersubmit' );
- $roleForm->setSubmitCallback( array( $this,
'tryAddMemberSubmit' ) );
- $roleForm->show();
-
- return true;
- }
-
- /**
- * @return bool
- */
- function deleteMember() {
- $this->setHeaders();
- $this->getOutput()->setPageTitle( $this->msg(
'openstackmanager-removerolemember' ) );
-
- $roleid = $this->getRequest()->getText( 'roleid' );
- $projectid = $this->getRequest()->getText( 'projectid' );
-
- if ( $projectid ) {
- $project = new OpenStackNovaProject( $projectid );
- $role = new OpenStackNovaRole( $roleid, $project );
- $projectname = $project->getProjectName();
- $rolename = $role->getRoleName();
- if ( !$this->userCanExecute( $this->getUser() ) &&
!$this->userLDAP->inRole( $rolename, $projectname ) ) {
- $this->displayRestrictionError();
- return false;
- }
- $projectmembers = $project->getMembers();
- natcasesort( $projectmembers );
- $role = new OpenStackNovaRole( $roleid, $project );
- $rolemembers = $role->getMembers();
- $member_keys = array();
- foreach ( $projectmembers as $projectmember ) {
- if ( in_array( $projectmember, $rolemembers ) )
{
- $member_keys[$projectmember] =
$projectmember;
- }
- }
- } else {
- //TODO: display error
- }
- if ( ! $member_keys ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-nomemberstoremove' );
- return true;
- }
- $roleInfo = array();
- $roleInfo['members'] = array(
- 'type' => 'multiselect',
- 'label-message' => 'openstackmanager-member',
- 'options' => $member_keys,
- 'section' => 'role/info',
- 'name' => 'members',
- );
- $roleInfo['action'] = array(
- 'type' => 'hidden',
- 'default' => 'deletemember',
- 'name' => 'action',
- );
- $roleInfo['roleid'] = array(
- 'type' => 'hidden',
- 'default' => $roleid,
- 'name' => 'roleid',
- );
- $roleInfo['projectid'] = array(
- 'type' => 'hidden',
- 'default' => $projectid,
- 'name' => 'projectid',
- );
- $roleInfo['returnto'] = array(
- 'type' => 'hidden',
- 'default' => $this->getRequest()->getText('returnto'),
- 'name' => 'returnto',
- );
-
- $roleForm = new HTMLForm(
- $roleInfo,
- $this->getContext(),
- 'openstackmanager-novarole'
- );
- $roleForm->setSubmitID( 'novarole-form-deletemembersubmit' );
- $roleForm->setSubmitCallback( array( $this,
'tryDeleteMemberSubmit' ) );
- $roleForm->show();
-
- return true;
- }
-
- /**
- * @param $formData
- * @param string $entryPoint
- * @return bool
- */
- function tryAddMemberSubmit( $formData, $entryPoint = 'internal' ) {
- $projectid = $formData['projectid'];
- if ( $projectid ) {
- $project = OpenStackNovaProject::getProjectById(
$projectid );
- if ( ! $project ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-nonexistentproject' );
- return true;
- }
- $role = new OpenStackNovaRole( $formData['roleid'],
$project );
- $rolename = $role->getRoleName();
- $members = $formData['members'];
- } else {
- //TODO: display error
- }
- if ( ! $role ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-nonexistentrole' );
- return true;
- }
- foreach ( $members as $member ) {
- $success = $role->addMember( $member );
- if ( $success ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-addedto', $member, $rolename );
- } else {
- $this->getOutput()->addWikiMsg(
'openstackmanager-failedtoadd', $member, $rolename );
- }
- }
-
- $out = '<br />';
- $returnto = Title::newFromText( $formData['returnto'] );
- $out .= Linker::link(
- $returnto,
- $this->msg( 'openstackmanager-backprojectlist'
)->escaped()
- );
- $this->getOutput()->addHTML( $out );
-
- return true;
- }
-
- /**
- * @param $formData
- * @param string $entryPoint
- * @return bool
- */
- function tryDeleteMemberSubmit( $formData, $entryPoint = 'internal' ) {
- $projectid = $formData['projectid'];
- if ( $projectid ) {
- $project = OpenStackNovaProject::getProjectById(
$projectid );
- if ( ! $project ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-nonexistentproject' );
- return true;
- }
- $role = new OpenStackNovaRole( $formData['roleid'],
$project );
- $rolename = $role->getRoleName();
- } else {
- //TODO: display error
- }
- if ( ! $role ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-nonexistentrole' );
- return true;
- }
- foreach ( $formData['members'] as $member ) {
- $success = $role->deleteMember( $member );
- if ( $success ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-removedfrom', $member, $rolename );
- } else {
- $this->getOutput()->addWikiMsg(
'openstackmanager-failedtoremove', $member, $rolename );
- }
- }
-
- $out = '<br />';
- $returnto = Title::newFromText( $formData['returnto'] );
- $out .= Linker::link(
- $returnto,
- $this->msg( 'openstackmanager-backprojectlist'
)->escaped()
- );
- $this->getOutput()->addHTML( $out );
-
- return true;
- }
-
- protected function getGroupName() {
- return 'nova';
- }
-}
diff --git a/special/SpecialNovaSecurityGroup.php
b/special/SpecialNovaSecurityGroup.php
deleted file mode 100644
index 0899c34..0000000
--- a/special/SpecialNovaSecurityGroup.php
+++ /dev/null
@@ -1,566 +0,0 @@
-<?php
-
-/**
- * todo comment me
- *
- * @file
- * @ingroup Extensions
- */
-
-class SpecialNovaSecurityGroup extends SpecialNova {
- /**
- * @var OpenStackNovaController
- */
- public $userNova;
-
- /**
- * @var OpenStackNovaUser
- */
- public $userLDAP;
-
- function __construct() {
- parent::__construct( 'NovaSecurityGroup', 'listall' );
- }
-
- function execute( $par ) {
- if ( !$this->getUser()->isLoggedIn() ) {
- $this->notLoggedIn();
- return;
- }
- $this->userLDAP = new OpenStackNovaUser();
- if ( ! $this->userLDAP->exists() ) {
- $this->noCredentials();
- return;
- }
- $this->checkTwoFactor();
- $project = $this->getRequest()->getText( 'project' );
- $region = $this->getRequest()->getText( 'region' );
- $this->userNova = OpenStackNovaController::newFromUser(
$this->userLDAP );
- $this->userNova->setProject( $project );
- $this->userNova->setRegion( $region );
-
- $action = $this->getRequest()->getVal( 'action' );
-
- if ( $action === "create" ) {
- $this->createSecurityGroup();
- } elseif ( $action === "delete" ) {
- $this->deleteSecurityGroup();
- } elseif ( $action === "addrule" ) {
- $this->addRule();
- } elseif ( $action === "removerule" ) {
- $this->removeRule();
- } else {
- $this->listSecurityGroups();
- }
- }
-
- /**
- * @return bool
- */
- function createSecurityGroup() {
- $this->setHeaders();
- $this->getOutput()->setPageTitle( $this->msg(
'openstackmanager-createsecuritygroup' ) );
-
- $project = $this->getRequest()->getText( 'project' );
- $region = $this->getRequest()->getText( 'region' );
- if ( ! $this->userLDAP->inRole( 'projectadmin', $project ) ) {
- $this->notInRole( 'projectadmin', $project );
- return false;
- }
- $securityGroupInfo = array();
- $securityGroupInfo['groupname'] = array(
- 'type' => 'text',
- 'label-message' => 'openstackmanager-securitygroupname',
- 'default' => '',
- 'name' => 'groupname',
- );
- $securityGroupInfo['description'] = array(
- 'type' => 'text',
- 'label-message' =>
'openstackmanager-securitygroupdescription',
- 'default' => '',
- 'name' => 'description',
- );
- $securityGroupInfo['project'] = array(
- 'type' => 'hidden',
- 'default' => $project,
- 'name' => 'project',
- );
- $securityGroupInfo['region'] = array(
- 'type' => 'hidden',
- 'default' => $region,
- 'name' => 'region',
- );
- $securityGroupInfo['action'] = array(
- 'type' => 'hidden',
- 'default' => 'create',
- 'name' => 'action',
- );
-
- $securityGroupForm = new HTMLForm(
- $securityGroupInfo,
- $this->getContext(),
- 'openstackmanager-novasecuritygroup'
- );
- $securityGroupForm->setSubmitID(
'openstackmanager-novainstance-createsecuritygroupsubmit' );
- $securityGroupForm->setSubmitCallback( array( $this,
'tryCreateSubmit' ) );
- $securityGroupForm->show();
-
- return true;
-
- }
-
- /**
- * @return bool
- */
- function deleteSecurityGroup() {
- $this->setHeaders();
- $this->getOutput()->setPageTitle( $this->msg(
'openstackmanager-deletesecuritygroup' ) );
-
- $project = $this->getRequest()->getText( 'project' );
- $region = $this->getRequest()->getText( 'region' );
- if ( ! $this->userLDAP->inRole( 'projectadmin', $project ) ) {
- $this->notInRole( 'projectadmin', $project );
- return false;
- }
- $securitygroupid = $this->getRequest()->getText( 'groupid' );
- if ( ! $this->getRequest()->wasPosted() ) {
- $securitygroup = $this->userNova->getSecurityGroup(
$securitygroupid );
- if ( $securitygroup ) {
- $securitygroupname =
$securitygroup->getGroupName();
- $this->getOutput()->addWikiMsg(
'openstackmanager-deletesecuritygroup-confirm', $securitygroupname );
- } else {
- $this->getOutput()->addWikiMsg(
'openstackmanager-nonexistantsecuritygroup' );
- return false;
- }
- }
- $securityGroupInfo = array();
- $securityGroupInfo['groupid'] = array(
- 'type' => 'hidden',
- 'default' => $securitygroupid,
- 'name' => 'groupname',
- );
- $securityGroupInfo['project'] = array(
- 'type' => 'hidden',
- 'default' => $project,
- 'name' => 'project',
- );
- $securityGroupInfo['region'] = array(
- 'type' => 'hidden',
- 'default' => $region,
- 'name' => 'region',
- );
- $securityGroupInfo['action'] = array(
- 'type' => 'hidden',
- 'default' => 'delete',
- 'name' => 'action',
- );
- $securityGroupForm = new HTMLForm(
- $securityGroupInfo,
- $this->getContext(),
- 'openstackmanager-novasecuritygroup'
- );
- $securityGroupForm->setSubmitID(
'novainstance-form-deletesecuritygroupsubmit' );
- $securityGroupForm->setSubmitCallback( array( $this,
'tryDeleteSubmit' ) );
- $securityGroupForm->show();
-
- return true;
- }
-
- /**
- * @return bool
- */
- function listSecurityGroups() {
- $this->setHeaders();
- $this->getOutput()->addModuleStyles( 'ext.openstack' );
- $this->getOutput()->setPageTitle( $this->msg(
'openstackmanager-securitygrouplist' ) );
-
- if ( $this->userCanExecute( $this->getUser() ) ) {
- $projects = OpenStackNovaProject::getAllProjects();
- } else {
- $projects = OpenStackNovaProject::getProjectsByName(
$this->userLDAP->getProjects() );
- }
- $this->showProjectFilter( $projects );
- $projectfilter = $this->getProjectFilter();
- if ( !$projectfilter ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-setprojectfilter' );
- return null;
- }
-
- $out = '';
- foreach ( $projects as $project ) {
- $projectName = $project->getProjectName();
- if ( !in_array( $projectName, $projectfilter ) ) {
- continue;
- }
- $projectactions = array( 'projectadmin' => array() );
- $regions = '';
- $this->userNova->setProject( $projectName );
- foreach ( $this->userNova->getRegions( 'compute' ) as
$region ) {
- $this->userNova->setRegion( $region );
- $regionactions = array( 'projectadmin' =>
array( $this->createActionLink( 'openstackmanager-createnewsecuritygroup',
array( 'action' => 'create', 'project' => $projectName, 'region' => $region ) )
) );
- $securityGroups = $this->getSecurityGroups(
$projectName, $region );
- $regions .= $this->createRegionSection(
$region, $projectName, $regionactions, $securityGroups );
- }
- $out .= $this->createProjectSection( $projectName,
$projectactions, $regions );
- }
-
- $this->getOutput()->addHTML( $out );
- return true;
- }
-
- function getSecurityGroups( $projectName, $region ) {
- $groupHeaders = array( 'openstackmanager-securitygroupname',
'openstackmanager-securitygroupdescription',
- 'openstackmanager-securitygrouprule',
'openstackmanager-actions' );
- $ruleHeaders = array(
'openstackmanager-securitygrouprule-fromport',
'openstackmanager-securitygrouprule-toport',
- 'openstackmanager-securitygrouprule-protocol',
'openstackmanager-securitygrouprule-ipranges',
- 'openstackmanager-securitygrouprule-groups',
'openstackmanager-actions' );
- $securityGroups = $this->userNova->getSecurityGroups();
- $groupRows = array();
- foreach ( $securityGroups as $group ) {
- $groupRow = array();
- $project = $group->getProject();
- $groupname = $group->getGroupName();
- $groupid = $group->getGroupId();
- $this->pushResourceColumn( $groupRow, $groupname );
- $this->pushResourceColumn( $groupRow,
$group->getGroupDescription() );
- # Add rules
- $rules = $group->getRules();
- if ( $rules ) {
- $ruleRows = array();
- foreach ( $rules as $rule ) {
- $ruleRow = array();
- $fromport = $rule->getFromPort();
- $toport = $rule->getToPort();
- $ipprotocol = $rule->getIPProtocol();
- $ruleid = $rule->getId();
- $this->pushResourceColumn( $ruleRow,
$fromport );
- $this->pushResourceColumn( $ruleRow,
$toport );
- $this->pushResourceColumn( $ruleRow,
$ipprotocol );
- $range = $rule->getIPRange();
- if ( $range ) {
- $this->pushResourceColumn(
$ruleRow, $range );
- } else {
- $this->pushResourceColumn(
$ruleRow, '' );
- }
- $sourcegroup = $rule->getGroup();
- if ( $sourcegroup ) {
- $sourcegroupinfo =
$sourcegroup['groupname'] . ' (' . $sourcegroup['project'] . ')';
- $this->pushResourceColumn(
$ruleRow, $sourcegroupinfo );
- } else {
- $this->pushRawResourceColumn(
$ruleRow, '' );
- }
- $actions = '';
- if ( $this->userLDAP->inRole(
'projectadmin', $project ) ) {
- $args = array( 'action' =>
'removerule',
- 'project' =>
$project,
- 'region' =>
$region,
- 'groupid' =>
$groupid,
- 'ruleid' =>
$ruleid );
- $link =
$this->createActionLink( 'openstackmanager-removerule-action', $args );
- $actions =
$this->createResourceList( array( $link ) );
- }
- $this->pushRawResourceColumn( $ruleRow,
$actions );
- $ruleRows[] = $ruleRow;
- }
- $this->pushRawResourceColumn( $groupRow,
$this->createResourceTable( $ruleHeaders, $ruleRows ) );
- } else {
- $this->pushRawResourceColumn( $groupRow, '' );
- }
- $actions = array();
- if ( $this->userLDAP->inRole( 'projectadmin', $project
) ) {
- $actions[] = $this->createActionLink(
'openstackmanager-delete',
- array( 'action' => 'delete', 'project'
=> $project, 'region' => $region, 'groupid' => $groupid )
- );
- $actions[] = $this->createActionLink(
'openstackmanager-addrule-action',
- array( 'action' => 'addrule', 'project'
=> $project, 'region' => $region, 'groupid' => $groupid )
- );
- }
- $this->pushRawResourceColumn( $groupRow,
$this->createResourceList( $actions ) );
- $groupRows[] = $groupRow;
- }
- if ( $groupRows ) {
- return $this->createResourceTable( $groupHeaders,
$groupRows );
- } else {
- return '';
- }
- }
-
- /**
- * @return bool
- */
- function addRule() {
- $this->setHeaders();
- $this->getOutput()->setPageTitle( $this->msg(
'openstackmanager-addrule' ) );
-
- $project = $this->getRequest()->getText( 'project' );
- $region = $this->getRequest()->getText( 'region' );
- $groupid = $this->getRequest()->getText( 'groupid' );
-
- if ( ! $this->userLDAP->inRole( 'projectadmin', $project ) ) {
- $this->notInRole( 'projectadmin', $project );
- return false;
- }
- $securitygroup = $this->userNova->getSecurityGroup( $groupid );
- if ( ! $securitygroup ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-nonexistantsecuritygroup' );
- return false;
- }
-
- $group_keys = array( '' => '' );
- $securityGroups = $this->userNova->getSecurityGroups();
- foreach ( $securityGroups as $securityGroup ) {
- $securityGroupName = $securityGroup->getGroupName();
- $group_keys[$securityGroupName] = $securityGroupName;
- }
- $securityGroupInfo = array();
- $securityGroupInfo['groupid'] = array(
- 'type' => 'hidden',
- 'default' => $groupid,
- 'name' => 'groupid',
- );
- $securityGroupInfo['project'] = array(
- 'type' => 'hidden',
- 'default' => $project,
- 'section' => 'rule/singlerule',
- 'name' => 'project',
- );
- $securityGroupInfo['region'] = array(
- 'type' => 'hidden',
- 'default' => $region,
- 'name' => 'region',
- );
- $securityGroupInfo['fromport'] = array(
- 'type' => 'text',
- 'label-message' =>
'openstackmanager-securitygrouprule-fromport',
- 'default' => '',
- 'section' => 'rule/singlerule',
- 'name' => 'fromport',
- );
- $securityGroupInfo['toport'] = array(
- 'type' => 'text',
- 'label-message' =>
'openstackmanager-securitygrouprule-toport',
- 'default' => '',
- 'section' => 'rule/singlerule',
- 'name' => 'toport',
- );
- $securityGroupInfo['protocol'] = array(
- 'type' => 'select',
- 'label-message' =>
'openstackmanager-securitygrouprule-protocol',
- 'options' => array( '' => '', 'icmp' => 'icmp', 'tcp'
=> 'tcp', 'udp' => 'udp' ),
- 'section' => 'rule/singlerule',
- 'name' => 'protocol',
- );
- $securityGroupInfo['range'] = array(
- 'type' => 'text',
- 'label-message' =>
'openstackmanager-securitygrouprule-ranges',
- 'help-message' =>
'openstackmanager-securitygrouprule-ranges-help',
- 'default' => '',
- 'section' => 'rule/singlerule',
- 'name' => 'range',
- );
- $securityGroupInfo['group'] = array(
- 'type' => 'select',
- 'label-message' =>
'openstackmanager-securitygrouprule-groups',
- 'help-message' =>
'openstackmanager-securitygrouprule-groups-help',
- 'options' => $group_keys,
- 'section' => 'rule/group',
- 'name' => 'group',
- );
- $securityGroupInfo['action'] = array(
- 'type' => 'hidden',
- 'default' => 'addrule',
- 'name' => 'action',
- );
- $securityGroupForm = new HTMLForm(
- $securityGroupInfo,
- $this->getContext(),
- 'openstackmanager-novasecuritygroup'
- );
- $securityGroupForm->addHeaderText( $this->msg(
'openstackmanager-securitygrouprule-group-exclusive' )->text(), 'rule' );
- $securityGroupForm->setSubmitID(
'novainstance-form-removerulesubmit' );
- $securityGroupForm->setSubmitCallback( array( $this,
'tryAddRuleSubmit' ) );
- $securityGroupForm->show();
-
- return true;
- }
-
- /**
- * @return bool
- */
- function removeRule() {
- $this->setHeaders();
- $this->getOutput()->setPageTitle( $this->msg(
'openstackmanager-removerule' ) );
-
- $project = $this->getRequest()->getText( 'project' );
- $region = $this->getRequest()->getText( 'region' );
- if ( ! $this->userLDAP->inRole( 'projectadmin', $project ) ) {
- $this->notInRole( 'projectadmin', $project );
- return false;
- }
- $groupid = $this->getRequest()->getText( 'groupid' );
- $ruleid = $this->getRequest()->getText( 'ruleid' );
- if ( ! $this->getRequest()->wasPosted() ) {
- $securitygroup = $this->userNova->getSecurityGroup(
$groupid );
- if ( $securitygroup ) {
- $securitygroupname =
$securitygroup->getGroupName();
- $this->getOutput()->addWikiMsg(
'openstackmanager-removerule-confirm', $securitygroupname );
- } else {
- $this->getOutput()->addWikiMsg(
'openstackmanager-nonexistantsecuritygroup' );
- return false;
- }
- }
- $securityGroupInfo = array();
- $securityGroupInfo['groupid'] = array(
- 'type' => 'hidden',
- 'default' => $groupid,
- 'name' => 'groupid',
- );
- $securityGroupInfo['ruleid'] = array(
- 'type' => 'hidden',
- 'default' => $ruleid,
- 'name' => 'ruleid',
- );
- $securityGroupInfo['project'] = array(
- 'type' => 'hidden',
- 'default' => $project,
- 'name' => 'project',
- );
- $securityGroupInfo['region'] = array(
- 'type' => 'hidden',
- 'default' => $region,
- 'name' => 'region',
- );
- $securityGroupInfo['action'] = array(
- 'type' => 'hidden',
- 'default' => 'removerule',
- 'name' => 'action',
- );
- $securityGroupForm = new HTMLForm(
- $securityGroupInfo,
- $this->getContext(),
- 'openstackmanager-novasecuritygroup'
- );
- $securityGroupForm->setSubmitID(
'novainstance-form-removerulesubmit' );
- $securityGroupForm->setSubmitCallback( array( $this,
'tryRemoveRuleSubmit' ) );
- $securityGroupForm->show();
-
- return true;
- }
-
- /**
- * @param $formData
- * @param string $entryPoint
- * @return bool
- */
- function tryCreateSubmit( $formData, $entryPoint = 'internal' ) {
- $groupname = $formData['groupname'];
- $description = $formData['description'];
- $securitygroup = $this->userNova->createSecurityGroup(
$groupname, $description );
- if ( $securitygroup ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-createdsecuritygroup' );
- } else {
- $this->getOutput()->addWikiMsg(
'openstackmanager-createsecuritygroupfailed' );
- }
-
- $out = '<br />';
- $out .= Linker::link(
- $this->getPageTitle(),
- $this->msg( 'openstackmanager-backsecuritygrouplist'
)->escaped()
- );
-
- $this->getOutput()->addHTML( $out );
- return true;
- }
-
- /**
- * @param $formData
- * @param string $entryPoint
- * @return bool
- */
- function tryDeleteSubmit( $formData, $entryPoint = 'internal' ) {
- $groupid = $formData['groupid'];
- $success = $this->userNova->deleteSecurityGroup( $groupid );
- if ( $success ) {
- # TODO: Ensure group isn't being used
- $this->getOutput()->addWikiMsg(
'openstackmanager-deletedsecuritygroup' );
- } else {
- $this->getOutput()->addWikiMsg(
'openstackmanager-deletesecuritygroupfailed' );
- }
-
- $out = '<br />';
- $out .= Linker::link(
- $this->getPageTitle(),
- $this->msg( 'openstackmanager-backsecuritygrouplist'
)->escaped()
- );
-
- $this->getOutput()->addHTML( $out );
- return true;
- }
-
- /**
- * @param $formData
- * @param string $entryPoint
- * @return bool
- */
- function tryAddRuleSubmit( $formData, $entryPoint = 'internal' ) {
- $fromport = $formData['fromport'];
- $toport = $formData['toport'];
- $protocol = $formData['protocol'];
- $range = $formData['range'];
- $group = $formData['group'];
- $groupid = $formData['groupid'];
- $sourcegroupid = '';
- if ( $group ) {
- $securityGroups = $this->userNova->getSecurityGroups();
- foreach ( $securityGroups as $securityGroup ) {
- if ( $group === $securityGroup->getGroupName()
) {
- $sourcegroupid =
$securityGroup->getGroupId();
- }
- }
- }
- $success = $this->userNova->addSecurityGroupRule( $groupid,
$fromport, $toport, $protocol, $range, $sourcegroupid );
- if ( $success ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-addedrule' );
- } else {
- $this->getOutput()->addWikiMsg(
'openstackmanager-addrulefailed' );
- }
-
- $out = '<br />';
- $out .= Linker::link(
- $this->getPageTitle(),
- $this->msg( 'openstackmanager-backsecuritygrouplist'
)->escaped()
- );
-
- $this->getOutput()->addHTML( $out );
- return true;
- }
-
- /**
- * @param $formData
- * @param string $entryPoint
- * @return bool
- */
- function tryRemoveRuleSubmit( $formData, $entryPoint = 'internal' ) {
- $ruleid = $formData['ruleid'];
- $success = $this->userNova->removeSecurityGroupRule( $ruleid );
- if ( $success ) {
- # TODO: Ensure group isn't being used
- $this->getOutput()->addWikiMsg(
'openstackmanager-removedrule' );
- } else {
- $this->getOutput()->addWikiMsg(
'openstackmanager-removerulefailed' );
- }
-
- $out = '<br />';
- $out .= Linker::link(
- $this->getPageTitle(),
- $this->msg( 'openstackmanager-backsecuritygrouplist'
)->escaped()
- );
-
- $this->getOutput()->addHTML( $out );
- return true;
- }
-
- protected function getGroupName() {
- return 'nova';
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/355618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21aab0ec033b624910dc85f1b408cc241b059aec
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Chasemp <r...@wikimedia.org>
Gerrit-Reviewer: Madhuvishy <mviswanat...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
