Skip to content

Commit 1dfa9b4

Browse files
committed
yahoo#7 db group name case issue when saving db credential
1 parent 55e18aa commit 1dfa9b4

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

myperf/src/main/java/com/yahoo/dba/perf/myperf/meta/MetaDB.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ public void upsertDBCredential(DBCredential cred)
717717
{
718718
pstmt = conn.prepareStatement(sql2);
719719
pstmt.setString(1, cred.getAppUser());
720-
pstmt.setString(2, cred.getDbGroupName());
720+
pstmt.setString(2, cred.getDbGroupName().toLowerCase());
721721
pstmt.setString(3, cred.getUsername());
722722
pstmt.setString(4, keyTool.encrypt(pString));
723723
pstmt.execute();

myperf/src/main/java/com/yahoo/dba/perf/myperf/springmvc/DbController.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,12 @@ private DBInstanceInfo parseRequest(HttpServletRequest request)
3333
{
3434
DBInstanceInfo db = new DBInstanceInfo();
3535
db.setDbType(request.getParameter("dbtype"));
36-
db.setDbGroupName(request.getParameter("dbGroupName"));
37-
db.setHostName(request.getParameter("hostName"));
36+
String grp = request.getParameter("dbGroupName");
37+
if(grp != null)grp = grp.trim().toLowerCase();
38+
db.setDbGroupName(grp);
39+
String host = request.getParameter("hostName");
40+
if(host != null)host = host.trim().toLowerCase();
41+
db.setHostName(host);
3842
db.setPort(request.getParameter("port"));
3943
db.setDatabaseName(request.getParameter("databaseName"));
4044
db.setUseTunneling("1".equals(request.getParameter("useTunneling")));

myperf/src/main/java/com/yahoo/dba/perf/myperf/springmvc/VarhistoryController.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ else if(key.startsWith("-"))
140140
rList.addRow(row);
141141

142142
}
143-
}
143+
}
144+
if(ch != null)
144145
{
145146
ConfigBlock cb = ch.getStartingConfig();
146147

@@ -170,6 +171,10 @@ else if(key.startsWith("-"))
170171
rList.addRow(row);
171172
}
172173

174+
}else
175+
{
176+
status = Constants.STATUS_BAD;
177+
message = "No variable configuration history has been recorded yet.";
173178
}
174179

175180
}catch(Throwable ex)

0 commit comments

Comments
 (0)