You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/06/15 11:18:18 UTC
[1/4] git commit: updated refs/heads/master to 0f4aac7
Repository: cloudstack
Updated Branches:
refs/heads/master 7a57ce333 -> 0f4aac735
Fix findbugs SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING warning in Upgrade2214to30.java There was no risk of sql injection here, nor any need to use PreparedStatement, still this fixes the warninG
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #441
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/869cc0c9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/869cc0c9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/869cc0c9
Branch: refs/heads/master
Commit: 869cc0c9f2a3ba9a5cfa07807e7331649605ab5e
Parents: 7a57ce3
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 19:13:10 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:17:47 2015 +0300
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/869cc0c9/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
index b2b5e78..eb4e8c7 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
@@ -272,7 +272,8 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade {
addDefaultSGProvider(conn, physicalNetworkId, zoneId, networkType, false);
//for all networks with this tag, add physical_network_id
- PreparedStatement pstmt3 = conn.prepareStatement("SELECT network_id FROM `cloud`.`network_tags` where tag = '" + guestNetworkTag + "'");
+ PreparedStatement pstmt3 = conn.prepareStatement("SELECT network_id FROM `cloud`.`network_tags` where tag= ?");
+ pstmt3.setString(1,guestNetworkTag);
ResultSet rsNet = pstmt3.executeQuery();
s_logger.debug("Adding PhysicalNetwork to VLAN");
s_logger.debug("Adding PhysicalNetwork to user_ip_address");
[2/4] git commit: updated refs/heads/master to 0f4aac7
Posted by bh...@apache.org.
Fix findbugs SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING warning in Upgrade30xBase.java There was no risk of sql injection here, nor any need to use PreparedStatement, still, this fixes the warning
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #442
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4eaa613a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4eaa613a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4eaa613a
Branch: refs/heads/master
Commit: 4eaa613a0b78283bfeffa68a499df720a9fe45bf
Parents: 869cc0c
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 19:17:14 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:17:49 2015 +0300
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/dao/Upgrade30xBase.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4eaa613a/engine/schema/src/com/cloud/upgrade/dao/Upgrade30xBase.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade30xBase.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade30xBase.java
index 4a41857..aacede0 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade30xBase.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade30xBase.java
@@ -32,12 +32,13 @@ public abstract class Upgrade30xBase implements DbUpgrade {
final static Logger s_logger = Logger.getLogger(Upgrade30xBase.class);
protected String getNetworkLabelFromConfig(Connection conn, String name) {
- String sql = "SELECT value FROM `cloud`.`configuration` where name = '" + name + "'";
+ String sql = "SELECT value FROM `cloud`.`configuration` where name = ?";
String networkLabel = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
try {
pstmt = conn.prepareStatement(sql);
+ pstmt.setString(1,name);
rs = pstmt.executeQuery();
if (rs.next()) {
networkLabel = rs.getString(1);
[4/4] git commit: updated refs/heads/master to 0f4aac7
Posted by bh...@apache.org.
Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in AgentManagerImpl.java Assert isn't used in runtime, null is properly checked in method
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #444
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0f4aac73
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0f4aac73
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0f4aac73
Branch: refs/heads/master
Commit: 0f4aac7359dd7010509643d8d7cc2b5bb1b27dc9
Parents: 117870c
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 21:12:35 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:17:53 2015 +0300
----------------------------------------------------------------------
.../orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f4aac73/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
index 918476c..f4952b5 100644
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -457,7 +457,6 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
}
protected AgentAttache getAttache(final Long hostId) throws AgentUnavailableException {
- assert (hostId != null) : "Who didn't check their id value?";
if (hostId == null) {
return null;
}
[3/4] git commit: updated refs/heads/master to 0f4aac7
Posted by bh...@apache.org.
Fix 3 findbugs SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING warnings in Upgrade410to420.java There was no risk of sql injection here, nor any need to use PreparedStatement, still this fixes the warnings
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #443
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/117870c1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/117870c1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/117870c1
Branch: refs/heads/master
Commit: 117870c1213c2ff0d5e34f0cf713a2b94502033d
Parents: 4eaa613
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 19:27:06 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:17:51 2015 +0300
----------------------------------------------------------------------
.../src/com/cloud/upgrade/dao/Upgrade410to420.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/117870c1/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index b32947a..51da73f 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -250,8 +250,10 @@ public class Upgrade410to420 implements DbUpgrade {
private String getConfigurationParameter(Connection conn, String category, String paramName) {
try (PreparedStatement pstmt =
- conn.prepareStatement("select value from `cloud`.`configuration` where category='" + category + "' and value is not NULL and name = '" + paramName + "';");)
+ conn.prepareStatement("select value from `cloud`.`configuration` where category=? and value is not NULL and name = ?;");)
{
+ pstmt.setString(1, category);
+ pstmt.setString(2, paramName);
try(ResultSet rs = pstmt.executeQuery();) {
while (rs.next()) {
return rs.getString("value");
@@ -266,8 +268,10 @@ public class Upgrade410to420 implements DbUpgrade {
}
private void setConfigurationParameter(Connection conn, String category, String paramName, String paramVal) {
- try (PreparedStatement pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = '" + paramVal + "' WHERE name = '" + paramName + "';");)
+ try (PreparedStatement pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = ?;");)
{
+ pstmt.setString(1, paramVal);
+ pstmt.setString(2, paramName);
s_logger.debug("Updating global configuration parameter " + paramName + " with value " + paramVal + ". Update SQL statement is " + pstmt);
pstmt.executeUpdate();
} catch (SQLException e) {
@@ -683,8 +687,8 @@ public class Upgrade410to420 implements DbUpgrade {
trafficType = "Guest";
}
try(PreparedStatement sel_pstmt =
- conn.prepareStatement("select physical_network_id, traffic_type, vmware_network_label from physical_network_traffic_types where vmware_network_label is not NULL and traffic_type='" +
- trafficType + "';");) {
+ conn.prepareStatement("select physical_network_id, traffic_type, vmware_network_label from physical_network_traffic_types where vmware_network_label is not NULL and traffic_type=?;");) {
+ pstmt.setString(1, trafficType);
try(ResultSet rsLabel = sel_pstmt.executeQuery();) {
newLabel = getNewLabel(rsLabel, trafficTypeVswitchParamValue);
try(PreparedStatement update_pstmt =