Changed static nonce to request.getAttribute

davverna · davverna · commit 93296a0cd96a · 2025-08-01T14:41:56.000+02:00
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/commons/angular/sbiModule.jspf b/knowage/src/main/webapp/WEB-INF/jsp/commons/angular/sbiModule.jspf
@@ -7,7 +7,7 @@
 <%@page import="it.eng.spagobi.commons.constants.SpagoBIConstants"%>
 <%@page import="it.eng.knowage.commons.utilities.urls.UrlBuilder"%>
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 var sbiM=angular.module('sbiModule',["toastr","ngSanitize","ngCookies"]);
 
 // sbiM.config(function($mdThemingProvider) {
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/commons/importSbiJS.jspf b/knowage/src/main/webapp/WEB-INF/jsp/commons/importSbiJS.jspf
@@ -212,7 +212,7 @@ create-debug in ant-files/SpagoBI-2.x-source/SpagoBIProject/ant/build.xml must b
 <script type="text/javascript"
 	src='<%=urlBuilder.getResourceLink(request, "/js/src/ext/sbi/execution/ExporterUtils.js")%>'></script>
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	// Session parameters manager must be initialized
 	document.onload = Sbi.execution.SessionParametersManager.init();
 </script>
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/commons/includeMessageResource.jspf b/knowage/src/main/webapp/WEB-INF/jsp/commons/includeMessageResource.jspf
@@ -21,7 +21,7 @@
 <%@page import="it.eng.knowage.commons.utilities.LocalePropertiesUtilities"%>
 
 
-<script type="text/javascript" type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 
 	//Function that gets the properties file's content in an synchronous way
 	getSynch=function(url, callback){
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/commons/portlet_base.jsp b/knowage/src/main/webapp/WEB-INF/jsp/commons/portlet_base.jsp
@@ -374,6 +374,6 @@ commented by Davide Zerbetto on 12/10/2009: there are problems with MIF (Ext Man
 		href='<%=urlBuilder.getResourceLink(request, "js/lib/ext-2.0.1/overrides/resources/css/"+extTheme)%>'
 		type='text/css' />
 
-	<script type="text/javascript" nonce="rAnd0m">
+	<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	document.onselectstart = function() { return true; }
 </script>
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/commons/portlet_base410.jsp b/knowage/src/main/webapp/WEB-INF/jsp/commons/portlet_base410.jsp
@@ -243,7 +243,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	lang="<%=locale != null ? locale.getLanguage() : GeneralUtilities.getDefaultLocale().getLanguage()%>" style="overflow-x:hidden">
 <head>
 <title>Knowage</title>
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	//SERVICE WORKER REGISTRATION
 	//if ('serviceWorker' in navigator) {
 	//	navigator.serviceWorker.register('../knowage-sw.js?version=' + "<%=it.eng.knowage.wapp.Version.getCompleteVersion()%>")
@@ -275,7 +275,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	    <![endif]-->
 <!--[if !IE]><!-->
 <body class="kn-main-body">
-	<script type="text/javascript" nonce="rAnd0m">  
+	<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">  
 			if (/*@cc_on!@*/false) {  
 				document.documentElement.className+=' ie10';  
 			}  
@@ -286,7 +286,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 
-	<script type="text/javascript" nonce="rAnd0m">
+	<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 
     Sbi = new Object();
     Sbi.config = function () {
@@ -385,7 +385,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	%>
 
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	document.onselectstart = function() { return true; }
 	
 	 var enableUIO = <%=enableUIO%>;
@@ -395,7 +395,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	
 </script>
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	var PleaseRotateOptions = {
 	    message: "Please Rotate Your Device",
 	    subMessage: "For a better mobile experience",
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/commons/preview.jsp b/knowage/src/main/webapp/WEB-INF/jsp/commons/preview.jsp
@@ -67,7 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     	
         <div id="myGrid" class="ag-theme-balham kn-preview-table-theme"></div>
         
-		<script type="text/javascript" nonce="rAnd0m" charset="utf-8">
+		<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>" charset="utf-8">
 			//GLOBAL VARIABLES
 			const   cookie = document.cookie.match(new RegExp('(^|)X-CSRF-TOKEN=([^;]+)'))[2];
 			const 	MAX_ROWS_CLIENT_PAGINATION = <%= SingletonConfig.getInstance().getConfigValue("dataset.preview.clientpagination.maxrows") %>;
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/commons/sessionExpired.jsp b/knowage/src/main/webapp/WEB-INF/jsp/commons/sessionExpired.jsp
@@ -52,7 +52,7 @@ if (header != null && header.equals("Ext")) {
 	--%>
 	
 	
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	var sessionExpiredSpagoBIJSFound = false;
 	try {
 		var currentWindow = window;
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/engines/kpi/default/kpiinclusions/kpiDefaultHeaderForSpagoBI.jsp b/knowage/src/main/webapp/WEB-INF/jsp/engines/kpi/default/kpiinclusions/kpiDefaultHeaderForSpagoBI.jsp
@@ -92,7 +92,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 			<input type="hidden" id="targetDocumentParameters<%= uuid %>" name="<%= ObjectsTreeConstants.PARAMETERS %>" value="" />
 		</form>
 		
-		<script nonce="rAnd0m">
+		<script nonce="<%= request.getAttribute("cspNonce") %>">
 			function execCrossNavigation(windowName, label, parameters) {
 				var uuid = "<%=uuid%>";
 				document.getElementById('targetDocumentLabel' + uuid).value = label;
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/internationalization/i18nAvailableLanguagesModule.jspf b/knowage/src/main/webapp/WEB-INF/jsp/internationalization/i18nAvailableLanguagesModule.jspf
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --%>
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 
 (function () {
 	angular.module('i18nAvailableLanguagesModule', []);
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/internationalization/i18nAvailableLanguagesService.jspf b/knowage/src/main/webapp/WEB-INF/jsp/internationalization/i18nAvailableLanguagesService.jspf
@@ -67,7 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   	i18nAvailableLanguages.put("languages", langs);
   %>
   
- <script type="text/javascript" nonce="rAnd0m">
+ <script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	(function () {
 		angular.module('i18nAvailableLanguagesModule')
 				.factory('i18nAvailableLanguagesService', function(){
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/internationalization/internationalization.jsp b/knowage/src/main/webapp/WEB-INF/jsp/internationalization/internationalization.jsp
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	boolean isTechnicalUser = UserUtilities.isTechnicalUser(userProfile);
   %>
    
-   <script type="text/javascript" nonce="rAnd0m">
+   <script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 		var isTechnicalUser = <%= isTechnicalUser %>
    </script>
         
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/tools/documentexecution/documentExecutionMaster.jsp b/knowage/src/main/webapp/WEB-INF/jsp/tools/documentexecution/documentExecutionMaster.jsp
@@ -51,7 +51,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <script type="text/javascript"
 	src="<%=urlBuilder.getResourceLink(request,
 					"js/src/angular_1.4/tools/documentexecution/documentExecutionMaster.js")%>"></script>
-<script type="text/javascript" nonce="rAnd0m" >
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>" >
 	angular.module('documentExecutionMasterModule').factory('sourceDocumentExecProperties', function() {
 		/*
 			EXEC_FROM added for the need of the Workspace Organizer as a starting point of the document execution.
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/tools/documentexecution/documentExecutionNg.jsp b/knowage/src/main/webapp/WEB-INF/jsp/tools/documentexecution/documentExecutionNg.jsp
@@ -167,7 +167,7 @@ if(executionRoleNames.size() > 0 && canExecuteDocument) {
 	//defining GLOBAL context url for following directives and template usage
 	_CURRENTCONTEXTURL="<%=urlBuilder.getResourceLink(request, "js/src/angular_1.4/tools/documentexecution")%>"
 </script>
-		<script type="text/javascript" nonce="rAnd0m">
+		<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 			if(!PleaseRotateOptions){
 				var PleaseRotateOptions = {
 				    message: "Please Rotate Your Device",
@@ -218,7 +218,7 @@ if(executionRoleNames.size() > 0 && canExecuteDocument) {
             of the document execution application (page). They will then be used for binding on this page, later on. 
             @author Danilo Ristovski (danristo, danilo.ristovski@mht.net) 
         -->
-        <script type="text/javascript" nonce="rAnd0m">
+        <script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
             var executedFrom = '<%=executedFrom%>';
             var isAdmin = <%=isAdmin%>;
             var isSuperAdmin = <%=isSuperAdmin%>;
@@ -513,7 +513,7 @@ if(executionRoleNames.size() > 0 && canExecuteDocument) {
         
         
 
-        <script type="text/javascript" nonce="rAnd0m">
+        <script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
         ///Module creation
         (function() {
             
@@ -714,7 +714,7 @@ if(executionRoleNames.size() > 0 && canExecuteDocument) {
         <%@include file="/WEB-INF/jsp/commons/angular/angularImport.jsp"%>
     </head>
     <body ng-app="cantExecuteDocumentModule" ng-controller="cantExecuteDocumentController">
-        <script type="text/javascript" nonce="rAnd0m">
+        <script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
         (function() {
             angular.module('cantExecuteDocumentModule', 
                     ['ngMaterial', 'sbiModule']);
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/tools/servermanager/importExportCommons/importExportCommonsConfig.jspf b/knowage/src/main/webapp/WEB-INF/jsp/tools/servermanager/importExportCommons/importExportCommonsConfig.jspf
@@ -1,5 +1,5 @@
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 (function(){
 	angular.module('importExportCommonsModule').config(function($provide){
 		$provide.constant("importExportCommonsModuleBasePath",'<%=urlBuilder.getResourceLink(request, "/js/src/angular_1.4/tools/servermanager/importExportCommons")%>')
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/wapp/changePwd.jsp b/knowage/src/main/webapp/WEB-INF/jsp/wapp/changePwd.jsp
@@ -110,7 +110,7 @@ String userId = (request.getParameter("user_id") == null) ? "" : request.getPara
       <link rel="stylesheet" href="<%=urlBuilder.getResourceLink(request,"/js/lib/angular/angular-material_1.1.0/angular-material.min.css")%>">
       <link rel="stylesheet" href="<%=urlBuilder.getResourceLink(request, "node_modules/bootstrap/dist/css/bootstrap.min.css")%>">
 	  <link rel='StyleSheet' href='<%=urlBuilder.getResourceLink(request, "themes/commons/css/customStyle.css")%>' type='text/css' />
-      <script type="text/javascript" nonce="rAnd0m">
+      <script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
          var app = angular.module('changePwdApp', ['ngMaterial']);
          
          app.controller('changePwdController', ['$scope', '$http', function($scope, $http) {
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/wapp/errorLogin.jsp b/knowage/src/main/webapp/WEB-INF/jsp/wapp/errorLogin.jsp
@@ -44,7 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %>
   
    	<html>
-	   	<script type="text/javascript" nonce="rAnd0m">
+	   	<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 		    function signup(){
 		    	var form = document.getElementById('formId');
 		    	var act = '<%=urlBuilder.getResourceLink(request, "/restful-services/signup/prepare")%>';
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/wapp/homeBase.jsp b/knowage/src/main/webapp/WEB-INF/jsp/wapp/homeBase.jsp
@@ -85,7 +85,7 @@ if(enableGlossary){
 }
 %>
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
    	function execCrossNavigation(frameid, doclabel, params, subobjid, title, target) {
 		var iframeDocElement = document.getElementById('iframeDoc');
 		if(!iframeDocElement) {
@@ -168,7 +168,7 @@ if(enableGlossary){
 
 
 <%-- Javascript object useful for session expired management (see also sessionExpired.jsp) --%>
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 sessionExpiredSpagoBIJS = 'sessionExpiredSpagoBIJS';
 </script>
 <%-- End javascript object useful for session expired management (see also sessionExpired.jsp) --%>
diff --git a/knowage/src/main/webapp/WEB-INF/jsp/wapp/logout.jsp b/knowage/src/main/webapp/WEB-INF/jsp/wapp/logout.jsp
@@ -77,7 +77,7 @@ else if (active != null && active.equalsIgnoreCase("true")) {
 	redirectUrl = urlLogout;
 } %>
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 function invalidateNoError(url) {
 	return new Promise(function(resolve, reject) {
 		var xhr = new XMLHttpRequest();
@@ -130,7 +130,7 @@ function invalidateAll() {
 <%-- Resources for Google Sign-In authentication --%>
 <script src="https://apis.google.com/js/platform.js?onload=onLoad" async defer></script>
 <meta name="google-signin-client_id" content="<%= GoogleSignInConfig.getClientId() %>">
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	function googleSignOut(callback, fail) {
 		var auth2 = gapi.auth2.getAuthInstance();
 		auth2.signOut().then(function() {
@@ -157,7 +157,7 @@ function invalidateAll() {
 	
 <% } else { %>
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	invalidateAll();
 </script>
 	
diff --git a/knowage/src/main/webapp/oauth2/authorization_code/flow.jsp b/knowage/src/main/webapp/oauth2/authorization_code/flow.jsp
@@ -29,7 +29,7 @@ String code = request.getParameter("code");
     <title>OAuth2 standard authorization code flow</title>
   </head>
   <body>
-    <script type="text/javascript" nonce="rAnd0m">
+    <script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
     var oauth2Config = null;
 	
     var xhrOAuth2C = new XMLHttpRequest();
diff --git a/knowage/src/main/webapp/oauth2/oidc_implicit/flow.jsp b/knowage/src/main/webapp/oauth2/oidc_implicit/flow.jsp
@@ -33,7 +33,7 @@ OAuth2Config oauth2Config = OAuth2Config.getInstance();
     <title>OIDC implicit flow</title>
   </head>
   <body>
-    <script type="text/javascript" nonce="rAnd0m">
+    <script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
     
     const authorizeEndpoint = '<%= StringEscapeUtils.escapeJavaScript(oauth2Config.getAuthorizeUrl()) %>';
     const clientId = '<%= StringEscapeUtils.escapeJavaScript(oauth2Config.getClientId()) %>';
diff --git a/knowage/src/main/webapp/oauth2/pkce/flow.jsp b/knowage/src/main/webapp/oauth2/pkce/flow.jsp
@@ -27,7 +27,7 @@ From https://github.com/curityio/pkce-javascript-example
     <title>OAuth2 PKCE flow</title>
   </head>
   <body>
-    <script type="text/javascript" nonce="rAnd0m">  
+    <script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">  
     	start();
         
         async function start() {
diff --git a/knowage/src/main/webapp/sessionStorageLogin.jsp b/knowage/src/main/webapp/sessionStorageLogin.jsp
@@ -14,7 +14,7 @@ if (session!=null) session.invalidate();
   <input type="hidden" name="<%=System.getProperty("JWT_LABEL", System.getenv("JWT_LABEL")) %>" value="">
 </form>
 </body>
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 
 function invalidateNoError(url) {
 	return new Promise(function(resolve, reject) {
diff --git a/knowage/src/main/webapp/themes/sbi_default/jsp/login.jsp b/knowage/src/main/webapp/themes/sbi_default/jsp/login.jsp
@@ -151,7 +151,7 @@
 		
 		<% if (AzureSignInConfig.isEnabled()) {%>
 		<%-- Resources for Azure Sign-In authentication --%>
-		<script type="text/javascript" nonce="rAnd0m">
+		<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 			var msalConfig = {
 				    auth: {
 				        clientId: "<%= AzureSignInConfig.getClientId() %>",
diff --git a/knowage/src/main/webapp/themes/sbi_default/jsp/signup/active.jsp b/knowage/src/main/webapp/themes/sbi_default/jsp/signup/active.jsp
@@ -93,7 +93,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   			</p>
   		</div>
   	</div>
-    <script type="text/javascript" nonce="rAnd0m">
+    <script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
    var baseUrl = "<%= baseUrl %>";
 
     angular.module('userActivation',[])
diff --git a/knowage/src/main/webapp/themes/sbi_default/jsp/signup/modify.jsp b/knowage/src/main/webapp/themes/sbi_default/jsp/signup/modify.jsp
@@ -106,7 +106,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	<script type="text/javascript" src="<%=urlBuilder.getResourceLink(request," /js/lib/angular/angular-material_1.1.0/angular-material.min.js ")%>"></script>
 	
 	<!-- Your application bootstrap  -->
-	<script type="text/javascript" nonce="rAnd0m" >    
+	<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>" >    
 
 	    angular.module('signUp', ['ngMaterial','sbiModule'])
 	    .controller('modifyCtrl', function($scope,$http,$window,$mdToast,$timeout,$mdDialog,sbiModule_messaging) {
diff --git a/knowage/src/main/webapp/themes/sbi_default/jsp/signup/signup.jsp b/knowage/src/main/webapp/themes/sbi_default/jsp/signup/signup.jsp
@@ -85,7 +85,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   	<script type="text/javascript" src="<%=urlBuilder.getResourceLink(request,"/js/lib/angular/angular-material_1.1.0/angular-material.min.js")%>"></script>
   
   	<!-- Your application bootstrap  -->
-  	<script type="text/javascript" type="text/javascript" nonce="rAnd0m">    
+  	<script type="text/javascript" type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">    
 
     angular.module('signUp', ['ngMaterial'])
     .controller('signUpCtrl', function($scope,$http,$window,$timeout) {
diff --git a/knowagecockpitengine/src/main/webapp/WEB-INF/jsp/chart/chart.jsp b/knowagecockpitengine/src/main/webapp/WEB-INF/jsp/chart/chart.jsp
@@ -188,7 +188,7 @@ author:
 <%@include file="commons/includeExtJS5.jspf"%>
 <%@include file="commons/includeMessageResource.jspf"%>
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	var sbiExecutionId = <%=esapiEncoder.encodeForJavaScript(request.getParameter("SBI_EXECUTION_ID")!=null? "'"+request.getParameter("SBI_EXECUTION_ID")+"'" : "null")%>;
 	//var sbiExecutionId = '<%=uuidO%>';
 	var userId = '<%=userId%>';
diff --git a/knowagecockpitengine/src/main/webapp/WEB-INF/jsp/chart/chartAngular.jsp b/knowagecockpitengine/src/main/webapp/WEB-INF/jsp/chart/chartAngular.jsp
@@ -65,7 +65,7 @@ author: Danilo Ristovski (danristo, danilo.ristovski@mht.net)
 		
 		<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 						
-		<script type="text/javascript" nonce="rAnd0m">
+		<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 		
 			/* Parameters needed for the WebServiceManagerFactory. esapi  */
 			var sbiExecutionId = <%=esapiEncoder.encodeForJavaScript( (request.getParameter("SBI_EXECUTION_ID")!=null? "'"+request.getParameter("SBI_EXECUTION_ID")+"'" : "null") )%>;
diff --git a/knowagecockpitengine/src/main/webapp/WEB-INF/jsp/chart/commons/angular/sbiModule.jspf b/knowagecockpitengine/src/main/webapp/WEB-INF/jsp/chart/commons/angular/sbiModule.jspf
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --%>
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	
 	var sbiM = angular.module('sbiModule',["toastr",'ngSanitize']);
 	
diff --git a/knowagecockpitengine/src/main/webapp/WEB-INF/jsp/commons/angular/angularImport.jsp b/knowagecockpitengine/src/main/webapp/WEB-INF/jsp/commons/angular/angularImport.jsp
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <!-- All internal/external cockpit specific libraries bundle -->
 <script type="text/javascript" src="<%=urlBuilder.getResourcePath(cockpitEngineContext, "/dist/knowagecockpit-lib-bundle.js")%>"></script>
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
     if(/MSIE \d|Trident.*rv:/.test(navigator.userAgent))
         document.write('<script type="text/javascript" src="<%= KnowageSystemConfiguration.getKnowageContext() %>/js/lib/rgbcolor/rgbcolor.js"><\/script>');
 </script>
diff --git a/knowagecockpitengine/src/main/webapp/WEB-INF/jsp/commons/angular/sbiModule.jspf b/knowagecockpitengine/src/main/webapp/WEB-INF/jsp/commons/angular/sbiModule.jspf
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <%@page import="java.util.regex.Matcher"%>
 <%@page import="java.util.regex.Pattern"%>
 <%@page import="org.apache.commons.lang.StringEscapeUtils"%>
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 
 var sbiM=angular.module('sbiModule',["ngSanitize","ngCookies"]);
 var _CURRENTLANGUAGE = '<%= curr_language%>';
diff --git a/knowagecockpitengine/src/main/webapp/WEB-INF/jsp/commons/includeMessageResource.jspf b/knowagecockpitengine/src/main/webapp/WEB-INF/jsp/commons/includeMessageResource.jspf
@@ -9,7 +9,7 @@
 
 <%@page import="it.eng.knowage.commons.utilities.LocalePropertiesUtilities"%>
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	//Function that gets the properties file's content in an synchronous way
 	getSynch=function(url, callback){
 		var xmlhttp;
diff --git a/knowagemeta/src/main/webapp/WEB-INF/jsp/commons/includeMessageResource.jspf b/knowagemeta/src/main/webapp/WEB-INF/jsp/commons/includeMessageResource.jspf
@@ -8,7 +8,7 @@
 
 <%@page import="it.eng.knowage.commons.utilities.LocalePropertiesUtilities"%>
 
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 	//Function that gets the properties file's content in an synchronous way
 	getSynch=function(url, callback){
 		var xmlhttp;
diff --git a/knowagemeta/src/main/webapp/WEB-INF/jsp/error.jsp b/knowagemeta/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -11,7 +11,7 @@
 
 
 <title>Error</title>
-<script type="text/javascript" nonce="rAnd0m">
+<script type="text/javascript" nonce="<%= request.getAttribute("cspNonce") %>">
 var app = angular.module('metaError', [ 'ngMaterial', 'sbiModule' ]);
 
 app.config([ '$mdThemingProvider', function($mdThemingProvider) {
diff --git a/knowageqbeengine/src/main/webapp/WEB-INF/jsp/commons/includeMessageResource.jspf b/knowageqbeengine/src/main/webapp/WEB-INF/jsp/commons/includeMessageResource.jspf
diff --git a/knowageqbeengine/src/main/webapp/WEB-INF/jsp/registry/registryConfig/registryConfigModule.jspf b/knowageqbeengine/src/main/webapp/WEB-INF/jsp/registry/registryConfig/registryConfigModule.jspf
diff --git a/knowageqbeengine/src/main/webapp/WEB-INF/jsp/registry/registryConfig/registryConfigService.jspf b/knowageqbeengine/src/main/webapp/WEB-INF/jsp/registry/registryConfig/registryConfigService.jspf
diff --git a/knowagewhatifengine/src/main/webapp/WEB-INF/jsp/commons/includeMessageResource.jspf b/knowagewhatifengine/src/main/webapp/WEB-INF/jsp/commons/includeMessageResource.jspf
diff --git a/knowagewhatifengine/src/main/webapp/WEB-INF/jsp/whatIf2.jsp b/knowagewhatifengine/src/main/webapp/WEB-INF/jsp/whatIf2.jsp
