Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/282504

Change subject: OpenStackNovaUser::inRole: Return false if project doesn't exist
......................................................................

OpenStackNovaUser::inRole: Return false if project doesn't exist

Otherwise users making requests like
https://wikitech.wikimedia.org/wiki/Hiera:Deployment-memc04
will be given an HTTP 500 instead of HTTP 404, and an exception
gets logged because the OpenStackNovaRole code assumes you pass
a valid project object instead of null.

Change-Id: I7a25aed805823eb9e481c679837e0772e5082987
---
M nova/OpenStackNovaUser.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager 
refs/changes/04/282504/1

diff --git a/nova/OpenStackNovaUser.php b/nova/OpenStackNovaUser.php
index b3682ee..a791e89 100644
--- a/nova/OpenStackNovaUser.php
+++ b/nova/OpenStackNovaUser.php
@@ -242,6 +242,9 @@
                }
 
                $project = OpenStackNovaProject::getProjectByName( $projectname 
);
+               if ( !$project ) {
+                       return false;
+               }
                $role = OpenStackNovaRole::getProjectRoleByName( $role, 
$project );
                if ( ! $role ) {
                        return false;

-- 
To view, visit https://gerrit.wikimedia.org/r/282504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a25aed805823eb9e481c679837e0772e5082987
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to