NMS-15504: Prevent angular expr eval without app

Do not spawn a default app when there is no real app end prevent evaluation of angular expressions if no app is defined.
OpenNMS · Jul 19, 2023 · 0ae6a9b · 0ae6a9b
1 parent 5a3b0b6
commit 0ae6a9b
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 7 deletions.
diff --git a/...web-assets/src/main/assets/js/lib/onms-schedule-editor/templates/schedule-editor.tpl.html b/...web-assets/src/main/assets/js/lib/onms-schedule-editor/templates/schedule-editor.tpl.html
@@ -63,7 +63,7 @@
     </div>
 
     <!-- Daily Options -->
-    <div class="mt-2" ng-if="options.type === 'daily' || options.type === 'daysPerWeek'">
+    <div class="mt-2" ng-if="options.type === 'daily' || options.type === 'daysPerWeek'" ng-app="onms.default.apps">
         <div class="form-group">
             <label>Interval</label>
             <onms-schedule-interval ng-model="options.interval"></onms-schedule-interval>
@@ -96,7 +96,7 @@
     </div>
 
     <!-- Days per Month -->
-    <div class="" ng-if="options.type === 'daysPerMonth'">
+    <div class="" ng-if="options.type === 'daysPerMonth'" ng-app="onms.default.apps">
         <!-- Other options -->
         <div class="form-group">
             <label>At</label>

diff --git a/opennms-webapp/src/main/webapp/WEB-INF/templates/navbar.ftl b/opennms-webapp/src/main/webapp/WEB-INF/templates/navbar.ftl
@@ -32,7 +32,9 @@
             </ul>
         </#if>
 
-        <onms-central-search></onms-central-search>
+        <div ng-app="onms.default.apps">
+            <onms-central-search></onms-central-search>
+	</div>
 
         <ul class="navbar-nav ml-auto">
   		  <#if request.remoteUser?has_content >

diff --git a/opennms-webapp/src/main/webapp/admin/snmpInterfaces.jsp b/opennms-webapp/src/main/webapp/admin/snmpInterfaces.jsp
@@ -81,7 +81,7 @@
 	    <strong>Node Label</strong>: <%=nodeLabel%><br/>
         </p>
         <p>
-        <div id="onms-interfaces-config">
+        <div id="onms-interfaces-config" ng-app="onms.default.apps">
           <div growl></div>
           <onms-interfaces-config node="<%=nodeId%>"/>
         </div>

diff --git a/opennms-webapp/src/main/webapp/element/node.jsp b/opennms-webapp/src/main/webapp/element/node.jsp
@@ -541,7 +541,7 @@ function confirmAssetEdit() {
     </jsp:include>
   </c:if>
 
-  <div id="onms-interfaces" class="card">
+  <div id="onms-interfaces" class="card" ng-app="onms.default.apps">
     <div class="card-header">
         <span>Node Interfaces</span>
     </div>

diff --git a/opennms-webapp/src/main/webapp/includes/bootstrap.jsp b/opennms-webapp/src/main/webapp/includes/bootstrap.jsp
@@ -213,7 +213,7 @@
     ng-app="${param.ngapp}"
   </c:when>
   <c:otherwise>
-    ng-app="onms.default.apps"
+    ng-non-bindable
   </c:otherwise>
 </c:choose>
 <c:if test="${param.scrollSpy != null}">

diff --git a/opennms-webapp/src/main/webapp/includes/search-box.jsp b/opennms-webapp/src/main/webapp/includes/search-box.jsp
@@ -3,7 +3,7 @@
         session="true"
 %>
 
-<div id="onms-search">
+<div id="onms-search" ngapp="onms.default.apps">
 
   <div class="card">
     <div class="card-header">

diff --git a/opennms-webapp/src/main/webapp/locations/index.jsp b/opennms-webapp/src/main/webapp/locations/index.jsp
@@ -36,6 +36,7 @@
 	<jsp:param name="headTitle" value="Monitoring Locations" />
 	<jsp:param name="breadcrumb" value="<a href='admin/index.jsp'>Admin</a>" />
 	<jsp:param name="breadcrumb" value="Monitoring Locations" />
+	<jsp:param name="ngapp" value="onms.default.apps" />
 </jsp:include>
 
 <jsp:include page="/assets/load-assets.jsp" flush="false">

diff --git a/opennms-webapp/src/main/webapp/minion/index.jsp b/opennms-webapp/src/main/webapp/minion/index.jsp
@@ -36,6 +36,7 @@
 	<jsp:param name="headTitle" value="Manage Minions" />
 	<jsp:param name="breadcrumb" value="<a href='admin/index.jsp'>Admin</a>" />
 	<jsp:param name="breadcrumb" value="Manage Minions" />
+	<jsp:param name="ngapp" value="onms.default.apps" />
 </jsp:include>
 
 <jsp:include page="/assets/load-assets.jsp" flush="false">

diff --git a/opennms-webapp/src/main/webapp/report/index.jsp b/opennms-webapp/src/main/webapp/report/index.jsp
@@ -41,6 +41,7 @@
     <jsp:param name="headTitle" value="Reports" />
     <jsp:param name="location" value="report" />
     <jsp:param name="breadcrumb" value="Reports" />
+    <jsp:param name="ngapp" value="onms.default.apps" />
 </jsp:include>
 
 <div class="row">

diff --git a/opennms-webapp/src/main/webapp/status/index.jsp b/opennms-webapp/src/main/webapp/status/index.jsp
@@ -38,6 +38,7 @@
     <jsp:param name="title" value="<%= title %>" />
     <jsp:param name="headTitle" value="<%= title %>" />
     <jsp:param name="breadcrumb" value="<%= title %>" />
+    <jsp:param name="ngapp" value="onms.default.apps" />
 </jsp:include>
 
 <jsp:include page="/assets/load-assets.jsp" flush="false">