CLOUDSTACK-4346 uses of parseInt and parseLong secured

DaanHoogland · DaanHoogland · commit 25c8cee01a45 · 2013-09-09T22:19:59.000+02:00
diff --git a/plugins/network-elements/bigswitch-vns/src/com/cloud/network/guru/BigSwitchVnsGuestNetworkGuru.java b/plugins/network-elements/bigswitch-vns/src/com/cloud/network/guru/BigSwitchVnsGuestNetworkGuru.java
@@ -165,6 +165,8 @@ public Network implement(Network network, NetworkOffering offering,
             throw new InsufficientVirtualNetworkCapcityException("Unable to allocate vnet as a " +
                         "part of network " + network + " implement ", DataCenter.class, dcId);
         }
+        // when supporting more types of networks this need to become
+//        int vlan = Integer.parseInt(BroadcastDomainType.getValue(vnet));
         int vlan = Integer.parseInt(vnet);
 
         // Name is either the given name or the uuid
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -65,6 +65,7 @@
 import com.cloud.agent.api.to.PortForwardingRuleTO;
 import com.cloud.agent.api.to.StaticNatRuleTO;
 import com.cloud.host.Host;
+import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.FirewallRule.Purpose;
 import com.cloud.resource.ServerResource;
@@ -698,8 +699,7 @@ private Answer execute(IpAssocCommand cmd, int numRetries) {
             Long publicVlanTag = null;
             if (ip.getVlanId() != null && !ip.getVlanId().equals("untagged")) {
             	try {
-                    // TODO BroadcastDomain.getValue(ip.getVlanId) ???
-            		publicVlanTag = Long.parseLong(ip.getVlanId());
+                    publicVlanTag = Long.parseLong(BroadcastDomainType.getValue(ip.getVlanId()));
             	} catch (Exception e) {
             		throw new ExecutionException("Could not parse public VLAN tag: " + ip.getVlanId());
             	}
@@ -3581,7 +3581,8 @@ private Long getVlanTag(String vlan) throws ExecutionException {
     	Long publicVlanTag = null;
     	if (!vlan.equals("untagged")) {
     		try {
-    			publicVlanTag = Long.parseLong(vlan);
+                // make sure this vlan is numeric
+                publicVlanTag = Long.parseLong(BroadcastDomainType.getValue(vlan));
     		} catch (Exception e) {
     			throw new ExecutionException("Unable to parse VLAN tag: " + vlan);
     		}
diff --git a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
@@ -143,6 +143,8 @@ public Network implement(Network config, NetworkOffering offering, DeployDestina
                 UseSystemGuestVlans.valueIn(config.getAccountId()));
 
             try {
+                // when supporting more types of networks this need to become
+//              int vlantag = Integer.parseInt(BroadcastDomainType.getValue(vnet));
                 vlanTag = Integer.parseInt(vnet);
             } catch (NumberFormatException e) {
                 throw new CloudRuntimeException("Obtained an invalid guest vlan tag. Exception: " + e.getMessage());
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
@@ -499,10 +499,10 @@ public static Pair<ManagedObjectReference, String> prepareNetwork(String physica
 
             if(vlanId != null && !UNTAGGED_VLAN_NAME.equalsIgnoreCase(vlanId)) {
                 createGCTag = true;
-                vid = Integer.parseInt(vlanId);
+                vid = Integer.parseInt(BroadcastDomainType.getValue(vlanId));
             }
             if (secondaryvlanId != null) {
-                spvlanid = Integer.parseInt(secondaryvlanId);
+                spvlanid = Integer.parseInt(BroadcastDomainType.getValue(secondaryvlanId));
             }
         }
 
@@ -937,7 +937,7 @@ public static Pair<ManagedObjectReference, String> prepareNetwork(String vSwitch
 
             if(vlanId != null && !UNTAGGED_VLAN_NAME.equalsIgnoreCase(vlanId) ) {
                 createGCTag = true;
-                vid = Integer.parseInt(vlanId);
+                vid = Integer.parseInt(BroadcastDomainType.getValue(vlanId));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,8 @@ public Network implement(Network network, NetworkOffering offering,`
`165`	`165`	`throw new InsufficientVirtualNetworkCapcityException("Unable to allocate vnet as a " +`
`166`	`166`	`"part of network " + network + " implement ", DataCenter.class, dcId);`
`167`	`167`	`}`
	`168`	`+ // when supporting more types of networks this need to become`
	`169`	`+// int vlan = Integer.parseInt(BroadcastDomainType.getValue(vnet));`
`168`	`170`	`int vlan = Integer.parseInt(vnet);`
`169`	`171`
`170`	`172`	`// Name is either the given name or the uuid`
Original file line number	Diff line number	Diff line change
`@@ -499,10 +499,10 @@ public static Pair<ManagedObjectReference, String> prepareNetwork(String physica`
`499`	`499`
`500`	`500`	`if(vlanId != null && !UNTAGGED_VLAN_NAME.equalsIgnoreCase(vlanId)) {`
`501`	`501`	`createGCTag = true;`
`502`		`- vid = Integer.parseInt(vlanId);`
	`502`	`+ vid = Integer.parseInt(BroadcastDomainType.getValue(vlanId));`
`503`	`503`	`}`
`504`	`504`	`if (secondaryvlanId != null) {`
`505`		`- spvlanid = Integer.parseInt(secondaryvlanId);`
	`505`	`+ spvlanid = Integer.parseInt(BroadcastDomainType.getValue(secondaryvlanId));`
`506`	`506`	`}`
`507`	`507`	`}`
`508`	`508`
`@@ -937,7 +937,7 @@ public static Pair<ManagedObjectReference, String> prepareNetwork(String vSwitch`
`937`	`937`
`938`	`938`	`if(vlanId != null && !UNTAGGED_VLAN_NAME.equalsIgnoreCase(vlanId) ) {`
`939`	`939`	`createGCTag = true;`
`940`		`- vid = Integer.parseInt(vlanId);`
	`940`	`+ vid = Integer.parseInt(BroadcastDomainType.getValue(vlanId));`
`941`	`941`	`}`
`942`	`942`	`}`
`943`	`943`