You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2017/05/17 17:05:01 UTC

nifi git commit: [NIFI-3906] Introduce additional validation when handling user-supplied input to ensure appropriate values and output encoding within SlickGrid tables. This closes #1818

Repository: nifi
Updated Branches:
  refs/heads/master 9198bee03 -> 2dde48002


[NIFI-3906] Introduce additional validation when handling user-supplied input to ensure appropriate values and output encoding within SlickGrid tables. This closes #1818


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2dde4800
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2dde4800
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2dde4800

Branch: refs/heads/master
Commit: 2dde48002953b490d3ce487082831ba5349e8395
Parents: 9198bee
Author: Scott Aslan <sc...@gmail.com>
Authored: Wed May 17 11:32:33 2017 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed May 17 13:04:31 2017 -0400

----------------------------------------------------------------------
 .../nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js | 3 ++-
 .../nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/2dde4800/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
index 0192b49..ac66249 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
@@ -681,7 +681,8 @@
                 sortable: true,
                 resizable: true,
                 cssClass: 'cell-right',
-                headerCssClass: 'header-right'
+                headerCssClass: 'header-right',
+                formatter: nfCommon.genericValueFormatter
             },
             {
                 id: 'nonHeapUsed',

http://git-wip-us.apache.org/repos/asf/nifi/blob/2dde4800/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js
index 503be42..7623234 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js
@@ -643,7 +643,7 @@
                 markup += dataContext.component.action;
             }
 
-            return markup;
+            return nfCommon.escapeHtml(markup);
         };
 
         var userPoliciesColumns = [