Commit 09bc0fab authored by Dionysis Grigoropoulos's avatar Dionysis Grigoropoulos Committed by Christos Stavrakakis
Browse files

cyclades: Handle invalid user input in neutron api

* Try to convert floating-ip/port IDs to integers, in order to catch
two unhandled exceptions
parent c9d3bdc2
......@@ -150,6 +150,11 @@ def get_subnet(subnet_id, for_update=True):
def get_port(port_id, for_update=True):
"""Get a port object by its ID."""
port_id = int(port_id)
except (ValueError, TypeError):
raise CommandError("Invalid port ID: %s" % port_id)
ports = NetworkInterface.objects
if for_update:
......@@ -193,13 +198,18 @@ def get_floating_ip_log_by_address(address):
def get_floating_ip_by_id(floating_ip_id, for_update=False):
floating_ip_id = int(floating_ip_id)
except (ValueError, TypeError):
raise CommandError("Invalid floating-ip ID: %s" % floating_ip_id)
objects = IPAddress.objects
if for_update:
objects = objects.select_for_update()
return objects.get(floating_ip=True, id=floating_ip_id, deleted=False)
except IPAddress.DoesNotExist:
raise CommandError("Floating IP does not exist.")
raise CommandError("Floating IP %s does not exist." % floating_ip_id)
def check_backend_credentials(clustername, port, username, password):
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment