Skip to content

fix: resolve JSP syntax errors in multiple files #169

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
yingbull merged 8 commits into from
May 12, 2025
Merged

fix: resolve JSP syntax errors in multiple files #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e4e8a19
fix: resolve JSP syntax errors in multiple files
AlexSilveira1 May 9, 2025
0b90b0d
refactor: improve security checks and enhance backup file listing in …
AlexSilveira1 May 12, 2025
32e2364
refactor: reorganize import statements for clarity in admin backup do…
AlexSilveira1 May 12, 2025
d9b7aac
Update src/main/webapp/admin/adminbackupdownload.jsp
AlexSilveira1 May 12, 2025
52f747e
refactor: enhance security checks and improve error handling in admin…
AlexSilveira1 May 12, 2025
f086bc4
Consolidate duplicate errorPage directives
AlexSilveira1 May 12, 2025
bd3c132
refactor: enhance error handling and security checks in admin backup …
AlexSilveira1 May 12, 2025
27ffe81
Merge branch 'develop/coyote' into 158-jsp-with-compile-time-issues-b…
yingbull May 12, 2025
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
198 changes: 121 additions & 77 deletions src/main/webapp/admin/adminbackupdownload.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,97 +25,141 @@

--%>

<%@ page contentType="text/html; charset=UTF-8" errorPage="/errorpage.jsp" %>
<%@ page import="
java.util.*,
java.io.*,
java.net.*,
org.apache.commons.io.FileUtils,
org.apache.commons.text.StringEscapeUtils,
oscar.OscarProperties,
oscar.util.FileSortByDate
" %>

<%@ taglib uri="/WEB-INF/security.tld" prefix="security" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>

<%
String roleName$ = (String) session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
// 1) Null-safe session check
String userRoleAttr = (String) session.getAttribute("userrole");
String userNameAttr = (String) session.getAttribute("user");
if (userRoleAttr == null || userNameAttr == null) {
// no session info → bounce to login
response.sendRedirect(request.getContextPath() + "/login.jsp");
return;
}
String roleName$ = userRoleAttr + "," + userNameAttr;
boolean authed = true;
%>
<security:oscarSec roleName="<%=roleName$%>"
objectName="_admin,_admin.backup" rights="r" reverse="<%=true%>">
<%authed = false; %>
<%response.sendRedirect("../securityError.jsp?type=_admin&type=_admin.backup");%>
<security:oscarSec
roleName="<%= roleName$ %>"
objectName="_admin,_admin.backup"
rights="r"
reverse="true">
<%
authed = false;
response.sendRedirect("../securityError.jsp?type=_admin&type=_admin.backup");
%>
</security:oscarSec>
<%
if (!authed) {
return;
}
%>
<%
boolean bodd = false;
%>

<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="java.util.*,oscar.*,java.io.*,java.net.*,oscar.util.*,org.apache.commons.io.FileUtils"
errorPage="/errorpage.jsp" %>
<% java.util.Properties oscarVariables = OscarProperties.getInstance(); %>

<html>
<head>

<title>ADMIN PAGE</title>

<link href="<%=request.getContextPath() %>/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="<%=request.getContextPath() %>/css/font-awesome.min.css">
</head>
<body>

<h3><fmt:setBundle basename="oscarResources"/><fmt:message key="admin.admin.btnAdminBackupDownload"/></h3>

<%
String backuppath = oscarVariables.getProperty("backup_path");
// Load backup_path
Properties oscarVars = OscarProperties.getInstance();
String backuppath = oscarVars.getProperty("backup_path");
session.setAttribute("backupfilepath", backuppath);

File dir = new File(backuppath);
boolean exists = dir.exists();

if (exists) {
%>
<div class="well">
<table class="table table-striped table-condensed">
<thead>
<tr>
<th>File Name</th>
<th>Size</th>
</tr>
</thead>

<tbody>
<%

if (backuppath == null || backuppath.equals("")) {
Exception e = new Exception("Unable to find the key backup_path in the properties file. Please check the value of this key or add it if it is missing.");
throw e;
}
session.setAttribute("backupfilepath", backuppath);

File f = new File(backuppath);
File[] contents = f.listFiles();

Arrays.sort(contents, new FileSortByDate());
if (contents == null) {
Exception e = new Exception("Unable to find any files in the directory " + backuppath + ". (If this is the incorrect directory, please modify the value of backup_path in your properties file to reflect the correct directory).");
throw e;
}
for (int i = 0; i < contents.length; i++) {
bodd = bodd ? false : true;
if (contents[i].isDirectory() || contents[i].getName().equals("BackupClient.class") || contents[i].getName().startsWith("."))
continue;
out.println("<tr><td><a href="<%= request.getContextPath() %>/servlet/BackupDownload?filename=" + URLEncoder.encode(contents[i].getName()) + "'>" + contents[i].getName() + "</a></td>");
long bytes = contents[i].length();
String display = FileUtils.byteCountToDisplaySize(bytes);

out.println("<td align='right' title=\"" + bytes + " by\">" + display + "</td></tr>"); //+System.getProperty("file.separator")
}
%>
</tbody>
</table>
</div>
<%} else {%>

<div class="alert alert-error">
<strong>Warning!</strong> It appears that your backup directory does not exist or there is a problem with the path.
Please check <i>backup_path</i> in your properties file.
</div>

<%}%>
</body>

<c:set var="calendarLangKey">
<fmt:message key="global.javascript.calendar"/>
</c:set>
<c:url value="/share/calendar/lang/${calendarLangKey}" var="calendarLangUrl"/>

<html>
<head>
<title>Admin Backup Download</title>
<link href="<%= request.getContextPath() %>/css/bootstrap.min.css" rel="stylesheet"/>
<link href="<%= request.getContextPath() %>/css/font-awesome.min.css" rel="stylesheet"/>
<script type="text/javascript"
src="${pageContext.request.contextPath}${calendarLangUrl}">
</script>
</head>
<body>
<h3>
<fmt:setBundle basename="oscarResources"/>
<fmt:message key="admin.admin.btnAdminBackupDownload"/>
</h3>

<% if (exists) { %>
<div class="well">
<table class="table table-striped table-condensed">
<thead>
<tr><th>File Name</th><th>Size</th></tr>
</thead>
<tbody>
<%
// missing or empty path → forward to error
if (backuppath == null || backuppath.isEmpty()) {
request.setAttribute("errorMessage",
"backup_path missing in properties; please configure.");
request.getRequestDispatcher("/error.jsp")
.forward(request, response);
return;
}

File[] contents = dir.listFiles();
if (contents == null || contents.length == 0) {
throw new Exception(
"No files found in " + backuppath +
". Please correct backup_path."
);
}
Arrays.sort(contents, new FileSortByDate());

for (File f : contents) {
String name = f.getName();
if (f.isDirectory() ||
name.equals("BackupClient.class") ||
name.startsWith(".")) {
continue;
}

// 2) XSS-safe name
String safeName = StringEscapeUtils.escapeHtml4(name);

String encoded = URLEncoder.encode(name, "UTF-8");
long bytes = f.length();
String displaySize = FileUtils.byteCountToDisplaySize(bytes);

out.println(
"<tr>" +
"<td><a href=\"" + request.getContextPath() +
"/servlet/BackupDownload?filename=" + encoded + "\">" +
safeName +
"</a></td>" +
"<td align=\"right\" title=\"" + bytes + " bytes\">" +
displaySize +
"</td>" +
"</tr>"
);
}
%>
</tbody>
</table>
</div>
<% } else { %>
<div class="alert alert-error">
<strong>Warning!</strong>
Backup directory not found—check <i>backup_path</i> in your properties.
</div>
<% } %>
</body>
</html>
2 changes: 1 addition & 1 deletion src/main/webapp/documentManager/MultiPageDocDisplay.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<script type="text/javascript" src="<%= request.getContextPath() %>/share/calendar/calendar.js"></script>
<!-- language for the calendar -->
<script type="text/javascript"
src="<%= request.getContextPath() %>/share/calendar/lang/<fmt:setBundle basename="oscarResources'/><fmt:message key='global.javascript.calendar'/>"></script>
src="<%= request.getContextPath() %>/share/calendar/lang/<fmt:message key='global.javascript.calendar'/>"></script>
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
<!-- the following script defines the Calendar.setup helper function, which makes
adding a calendar a matter of 1 or 2 lines of code. -->
<script type="text/javascript" src="<%= request.getContextPath() %>/share/calendar/calendar-setup.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/oscarRx/ChooseAllergy2.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
<c:if test="${not empty allergyResults[type]}">
<div class="DivContentSectionHead">
<a href="javascript:void(0)" onclick="toggleSection('${type}');return false;">
<img border="0" id="${type}_img" src="<%= request.getContextPath() %>/images/${type == 8 || type == 10 || type == 13 || type == 14 ? "collapser' : 'expander'}.png"/>
<img border="0" id="${type}_img" src="<%= request.getContextPath() %>/images/${type == 8 || type == 10 || type == 13 || type == 14 ? 'collapser' : 'expander'}.png"/>
</a>
${type == 8 ? 'ATC Class' : type == 10 ? 'AHFS Class' : type == 13 ? 'Brand Name' : type == 11 ? 'Generic Name' : type == 12 ? 'Compound' : 'Ingredient'}
</div>
Expand Down Expand Up @@ -327,4 +327,4 @@

</body>

</html>
</html>
Loading