modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
| 4 ++--
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
| 2 +-
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
| 6 ++++--
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
| 4 ++--
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
| 4 ++--
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
| 4 ++--
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
| 2 +-
7 files changed, 14 insertions(+), 12 deletions(-)
New commits:
commit bf2ad7ab6e9532e4869f4373712fcbc0c04f8618
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Mar 24 05:04:01 2010 -0400
added null ptr check before retrieval for JSON population.
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
index 093c943..61a7505 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
@@ -67,9 +67,11 @@
%>
{ "start" : "<%=sdf.format(new
Date(installedPackage.getTimestamp()))%>",
- "title" : "<%=
(""+installedPackage.getPackageVersion().getDisplayName() + " " +
installedPackage.getPackageVersion().getDisplayVersion()).replaceAll("[\"']","").trim()%>",
+ "title" : "<% out.write(
+ (installedPackage.getPackageVersion().getDisplayName()==null ? null :
installedPackage.getPackageVersion().getDisplayName().replaceAll("[\"']",""))
+ " " +
+ (installedPackage.getPackageVersion().getDisplayVersion() ==null ? null :
installedPackage.getPackageVersion().getDisplayVersion().replaceAll("[\"']","")));%>",
"link" : "<%=link%>",
- "description" : "<b>User:</b> <%=
(""+installedPackage.getContentServiceRequest() == null ? "-Detected-"
:
installedPackage.getContentServiceRequest().getSubjectName()).replaceAll("[\"']","").trim()%><br/>
<b>Version: <%=
(""+installedPackage.getPackageVersion().getDisplayVersion()).replaceAll("[\"']","").trim()%></b>
<br/><b>Status:</b>
<%=(""+installedPackage.getStatus()).replaceAll("[\"']","").trim()%>",
+ "description" : "<b>User:</b> <%
out.write((installedPackage.getContentServiceRequest() == null ? "-Detected- " :
installedPackage.getContentServiceRequest().getSubjectName().replaceAll("[\"']","").trim())+"<br/>
<b>Version: "+(installedPackage.getPackageVersion().getDisplayVersion() ==null
? null
:installedPackage.getPackageVersion().getDisplayVersion().replaceAll("[\"']","").trim())+"
</b> <br/><b>Status:</b>
"+installedPackage.getStatus());%>",
"icon" : "<%=icon%>",
"color" : "<%=(installedPackage.getStatus() !=
InstalledPackageHistoryStatus.FAILED ? "#4EB84E" :
"#DD5656")%>"
}
commit 7002a02a713675e1deec633096094120838a6473
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Mar 23 18:59:22 2010 -0400
added single and double quote removal code to *JSON jsps to guard against creating
invalid runtime javascript
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
index 5cebe5d..2cc3da3 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp
@@ -59,9 +59,9 @@
%>
{ "start" : "<%=sdf.format(new Date(alert.getCtime()))%>",
- "title" : "<%=alert.getAlertDefinition().getName()%>",
+ "title" : "<%=
(""+alert.getAlertDefinition().getName()).replaceAll("[\"']","").trim()%>",
"link" : "<%=link%>",
- "description" : "<%=buf.toString()%>",
+ "description" : "<%=
(""+buf.toString()).replaceAll("[\"']","").trim()%>",
"icon" : "<%=icon%>",
"color" : "<%=(alert.getAlertDefinition().getPriority() ==
AlertPriority.LOW ? "#4EB84E" : "#DD5656")%>"
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
index b64cb55..6bb34c4 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp
@@ -49,7 +49,7 @@
{ "start" : "<%=sdf.format(configUpdate.getCreatedTime())%>",
"title" : "Configuration Change",
"link" : "<%=link%>",
- "description" : "<b>User:</b>
<%=configUpdate.getSubjectName()%><br/><b>Status:</b>
<%=configUpdate.getStatus()%>",
+ "description" : "<b>User:</b> <%=
(""+configUpdate.getSubjectName()).replaceAll("[\"']","").trim()%><br/><b>Status:</b>
<%=
(""+configUpdate.getStatus()).replaceAll("[\"']","").trim()%>",
"icon" : "<%=icon%>",
"color" : "<%=(configUpdate.getStatus() !=
ConfigurationUpdateStatus.FAILURE ? "#4EB84E" : "#DD5656")%>"
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
index ccb197b..093c943 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp
@@ -67,9 +67,9 @@
%>
{ "start" : "<%=sdf.format(new
Date(installedPackage.getTimestamp()))%>",
- "title" : "<%=installedPackage.getPackageVersion().getDisplayName() +
" " + installedPackage.getPackageVersion().getDisplayVersion()%>",
+ "title" : "<%=
(""+installedPackage.getPackageVersion().getDisplayName() + " " +
installedPackage.getPackageVersion().getDisplayVersion()).replaceAll("[\"']","").trim()%>",
"link" : "<%=link%>",
- "description" : "<b>User:</b> <%=
installedPackage.getContentServiceRequest() == null ? "-Detected-" :
installedPackage.getContentServiceRequest().getSubjectName()%><br/>
<b>Version:
<%=installedPackage.getPackageVersion().getDisplayVersion()%></b>
<br/><b>Status:</b> <%=installedPackage.getStatus()%>",
+ "description" : "<b>User:</b> <%=
(""+installedPackage.getContentServiceRequest() == null ? "-Detected-"
:
installedPackage.getContentServiceRequest().getSubjectName()).replaceAll("[\"']","").trim()%><br/>
<b>Version: <%=
(""+installedPackage.getPackageVersion().getDisplayVersion()).replaceAll("[\"']","").trim()%></b>
<br/><b>Status:</b>
<%=(""+installedPackage.getStatus()).replaceAll("[\"']","").trim()%>",
"icon" : "<%=icon%>",
"color" : "<%=(installedPackage.getStatus() !=
InstalledPackageHistoryStatus.FAILED ? "#4EB84E" :
"#DD5656")%>"
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
index 5e139db..46f3480 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp
@@ -65,7 +65,7 @@
{ "start" : "<%=sdf.format(entry.getCreatedTime())%>",
"title" : "Child resource created",
"link" : "<%=link%>",
- "description" : "<b>User:</b>
<%=entry.getSubjectName()%><br/><b>Status:</b>
<%=entry.getStatus()%>",
+ "description" : "<b>User:</b>
<%=(""+entry.getSubjectName()).replaceAll("[\"']","").trim()%><br/><b>Status:</b>
<%=(""+entry.getStatus()).replaceAll("[\"']","").trim()%>",
"icon" : "<%=icon%>",
"color" : "<%=(entry.getStatus() != CreateResourceStatus.FAILURE ?
"#4EB84E" : "#DD5656")%>"
}
@@ -101,7 +101,7 @@
{ "start" : "<%=sdf.format(entry.getCreatedTime())%>",
"title" : "Child resource deleted",
"link" : "<%=link%>",
- "description" : "<b>User:</b>
<%=entry.getSubjectName()%><br/><b>Status:</b>
<%=entry.getStatus()%>",
+ "description" : "<b>User:</b>
<%=(""+entry.getSubjectName()).replaceAll("[\"']","").trim()%><br/><b>Status:</b>
<%=(""+entry.getStatus()).replaceAll("[\"']","").trim()%>",
"icon" : "<%=icon%>",
"color" : "<%=(entry.getStatus() != DeleteResourceStatus.FAILURE ?
"#4EB84E" : "#DD5656")%>"
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
index e575df5..87a791d 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp
@@ -178,9 +178,9 @@
%>
{ "start" : "<%=sdf.format(event.getTimestamp())%>",
- "title" : "<%= title%>",
+ "title" : "<%=
(""+title).replaceAll("[\"']","").trim()%>",
"link" : "<%=link%>",
- "description" : "<%=detail%>",
+ "description" :
"<%=(""+detail).replaceAll("[\"']","").trim()%>",
"icon" : "<%=icon%>",
"color" : "<%=color%>"
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
index d42c09c..0846050 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp
@@ -58,9 +58,9 @@
%>
{ "start" : "<%=sdf.format(new
Date(operation.getCreatedTime()))%>",
- "title" : "Operation:
<%=operation.getOperationDefinition().getName()%>",
+ "title" : "Operation:
<%=(""+operation.getOperationDefinition().getName()).replaceAll("[\"']","").trim()%>",
"link" : "<%=link%>",
- "description" : "<b>User:</b>
<%=operation.getSubjectName()%><br/><b>Status:</b>
<%=operation.getStatus()%>",
+ "description" : "<b>User:</b>
<%=(""+operation.getSubjectName()).replaceAll("[\"']","").trim()%><br/><b>Status:</b>
<%=(""+operation.getStatus()).replaceAll("[\"']","").trim()%>",
"icon" : "<%=icon%>",
"color" : "<%=(operation.getStatus() ==
OperationRequestStatus.SUCCESS ? "#4EB84E" : "#DD5656")%>"
}
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
index 9f8ce1d..06ff3aa 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp
@@ -60,7 +60,7 @@
{ "start" : "<%=sdf.format(configUpdate.getCreatedTime())%>",
"title" : "Plugin Configuration Change",
"link" : "<%=link%>",
- "description" : "<b>User:</b>
<%=configUpdate.getSubjectName()%><br/><b>Status:</b>
<%=configUpdate.getStatus()%>",
+ "description" : "<b>User:</b>
<%=(""+configUpdate.getSubjectName()).replaceAll("[\"']","").trim()%><br/><b>Status:</b>
<%=(""+configUpdate.getStatus()).replaceAll("[\"']","").trim()%>",
"icon" : "<%=icon%>",
"color" : "<%=(configUpdate.getStatus() !=
ConfigurationUpdateStatus.FAILURE ? "#4EB84E" : "#DD5656")%>"
}