Merge branch 'server-side-events'

Author: summitt

.dockerignore

@@ -1 +1,25 @@
-**/node_modules
+# Docker ignore file for memory testing builds
+
+# Ignore test results and heap dumps (will be mounted as volumes)
+memory-test-results/
+heap-dumps/
+logs/
+
+# Ignore Git
+.git
+.gitignore
+
+# Ignore IDE files
+.idea/
+.vscode/
+*.iml
+
+# Ignore build artifacts (except target/faction.war which we need)
+target/*
+!target/faction.war
+
+# Ignore OS files
+.DS_Store
+
+# Ignore documentation (not needed in container)
+*.md

WebContent/WEB-INF/jsp/assessment/AddVuln.jsp

@@ -150,7 +150,7 @@ td:first-child {
 	border-left-style: dotted;
 }
 
-.userEdit {
+.userEditText {
 	background: #f39c12;
 	color: white;
 	font-weight: bold;
@@ -159,7 +159,6 @@ td:first-child {
 	padding-right: 7px;
 	padding-top: 2px;
 	padding-bottom: 4px;
-	margin-left: 30px;
 }
 
 .cvsstrue {

WebContent/WEB-INF/jsp/assessment/Finalize.jsp

@@ -8,6 +8,7 @@
 <bs:mco colsize="12">
 <bs:box type="success" title="Controls">
 <div style="padding-bottom:60px">
+<s:if test="hasTemplate">
   <bs:button color="success" size="md" colsize="3" text="Generate Report" id="genreport"></bs:button>
   <s:if test="assessment.finalReport != null">
     <s:if test="prEnabled">
@@ -16,6 +17,14 @@
     <bs:button color="primary" size="md" colsize="3" text="Download Report" id="dlreport"></bs:button>
     <bs:button color="danger" size="md" colsize="3" text="Finalize Assessment" id="finalize"></bs:button>
   </s:if>
+  </s:if>
+  <s:else>
+  <div class="alert alert-danger">
+                  <h5><i class="icon fas fa-ban"></i> Alert!</h5>
+  	No Report Template Configured for this Assessment Type. 
+  	Contact Your Administrator.
+                </div>
+  </s:else>
 </div>
 </bs:box>
 </bs:mco>

WebContent/WEB-INF/jsp/engagement/AssessorSearch.jsp

@@ -141,7 +141,7 @@ div[id^='rtCust']{
 	  </bs:row>
 	 <bs:row>
 		 <bs:select name="Engagement Contact: <b></b>" colsize="4" id="engName">
-		 	<s:iterator value="engagement">
+		 	<s:iterator value="eng_users">
                       <option value="<s:property value="id"/>"><s:property value="fname"/> <s:property value="lname"/></option>
             </s:iterator>
 		 </bs:select>

WebContent/WEB-INF/web.xml

@@ -90,6 +90,7 @@
         	<param-name>struts.i18n.encoding</param-name>
         	<param-value>UTF-8</param-value>
     	</init-param>
+    	<async-supported>true</async-supported>
 	</filter>
 	<filter-mapping>
 		<filter-name>struts2</filter-name>
@@ -259,6 +260,13 @@
 		<servlet-name>uploadAssessment</servlet-name>
 		<servlet-class>com.fuse.servlets.uploadAssessment</servlet-class>
 	</servlet>
+	<servlet>
+		<description>Server-Side Events stream endpoint</description>
+		<display-name>EventStreamServlet</display-name>
+		<servlet-name>EventStreamServlet</servlet-name>
+		<servlet-class>com.fuse.servlets.EventStreamServlet</servlet-class>
+		<async-supported>true</async-supported>
+	</servlet>
 	<servlet-mapping>
 		<servlet-name>test</servlet-name>
 		<url-pattern>/service/test</url-pattern>
@@ -335,6 +343,10 @@
 		<servlet-name>uploadAssessment</servlet-name>
 		<url-pattern>/service/uploadAssessment</url-pattern>
 	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>EventStreamServlet</servlet-name>
+		<url-pattern>/service/events/stream</url-pattern>
+	</servlet-mapping>
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>
 	</welcome-file-list>