Skip to content

CLOUDSTACK-8749: Add checks to prevent malformed/unexpected input#735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Aug 26, 2015
Merged

CLOUDSTACK-8749: Add checks to prevent malformed/unexpected input #735

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@

import javax.naming.ConfigurationException;

import com.google.common.base.Strings;
import org.apache.log4j.Logger;
import org.libvirt.LibvirtException;

Expand DownExpand Up@@ -275,7 +276,7 @@ private void createControlNetwork() throws LibvirtException {
createControlNetwork(_bridges.get("linklocal"));
}

private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
private void deleteExistingLinkLocalRouteTable(String linkLocalBr) {
Script command = new Script("/bin/bash", _timeout);
command.add("-c");
command.add("ip route | grep " + NetUtils.getLinkLocalCIDR());
Expand All@@ -286,7 +287,11 @@ private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
String[] lines = parser.getLines().split("\\n");
for (String line : lines) {
String[] tokens = line.split(" ");
if (!tokens[2].equalsIgnoreCase(linkLocalBr)) {
if (tokens != null && tokens.length < 2) {
continue;
}
final String device = tokens[2];
if (!Strings.isNullOrEmpty(device) && !device.equalsIgnoreCase(linkLocalBr)) {

@jburwelljburwellAug 25, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reading through this block, it feels like lines 289-293 should be extracted to a private method:

static parseDevice(final String line) {
final String[] tokens = line.split( " ");
if (tokens != null && tokens.length < 2) {
return "";
}
final String device = tokens[2];
return Strings.isNullOrEmpty(device) : " " ? device;
}

The extraction of this method would not only shorten the deleteExitingLinkLocalLocalRoutetTable method, but clearly express the intent. It also allows a unit test to be written to verify that parsing works as expected for different types of input.

@yadvryadvrAug 26, 2015

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With respect to this specific code, I would like do this the next time we do a round of refactoring, possibly factor such code to a util class that can be used as a general purpose line parsing static method and add unit tests. For now, at least the code takes care of malformed inputs.

Script.runSimpleBashScript("ip route del " + NetUtils.getLinkLocalCIDR() + " dev " + tokens[2]);
} else {
foundLinkLocalBr = true;
Expand All@@ -300,7 +305,7 @@ private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
}

private void createControlNetwork(String privBrName) {
deleteExitingLinkLocalRouteTable(privBrName);
deleteExistingLinkLocalRouteTable(privBrName);
if (!isBridgeExists(privBrName)) {
Script.runSimpleBashScript("brctl addbr " + privBrName + "; ip link set " + privBrName + " up; ip address add 169.254.0.1/16 dev " + privBrName, _timeout);
}
Expand Down