htmlEncode some comment fields

this adds Ext.String.htmlEncode as renderer
for some comment/description fields

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/www/manager6/data/PVEProxy.js b/www/manager6/data/PVEProxy.js
index 86fc95153c1bbecd833f7c1d94ca54b904d88fba..b66eeb6837d5307ef5d1a25d9afc2e79553d0e36 100644 (file)
--- a/www/manager6/data/PVEProxy.js
+++ b/www/manager6/data/PVEProxy.js
@@ -49,7 +49,7 @@ Ext.define('PVE.RestProxy', {
                              text += " (+ " + info.tfa + ")";
                          }
 
-                         return text;
+                         return Ext.String.htmlEncode(text);
                      }
                  }
                ],

diff --git a/www/manager6/form/GroupSelector.js b/www/manager6/form/GroupSelector.js
index 1bac2d17ee78ce9ad640b21559f646c0ca074f55..f243f3e738020032022cf58a583b8cff637d2a9a 100644 (file)
--- a/www/manager6/form/GroupSelector.js
+++ b/www/manager6/form/GroupSelector.js
@@ -18,6 +18,7 @@ Ext.define('PVE.form.GroupSelector', {
                header: gettext('Comment'),
                sortable: false,
                dataIndex: 'comment',
+               renderer: Ext.String.htmlEncode,
                flex: 1
            }
        ]

diff --git a/www/manager6/form/IPRefSelector.js b/www/manager6/form/IPRefSelector.js
index dd0123a70bad97308cf8dac839c178c38c03c642..728f5f7e2ec74be9cc9bc7adc62d2a107c2c70fe 100644 (file)
--- a/www/manager6/form/IPRefSelector.js
+++ b/www/manager6/form/IPRefSelector.js
@@ -66,7 +66,8 @@ Ext.define('PVE.form.IPRefSelector', {
            },
            {
                header: gettext('Comment'),  
-               dataIndex: 'comment', 
+               dataIndex: 'comment',
+               renderer: Ext.String.htmlEncode,
                flex: 1
            }
        );

diff --git a/www/manager6/form/PoolSelector.js b/www/manager6/form/PoolSelector.js
index 376468a3fc789c13ae0d18d364db6ccc121774fd..56ded507a54091435d9d01f4c4009da7b9a40731 100644 (file)
--- a/www/manager6/form/PoolSelector.js
+++ b/www/manager6/form/PoolSelector.js
@@ -28,6 +28,7 @@ Ext.define('PVE.form.PoolSelector', {
                        header: gettext('Comment'),
                        sortable: false,
                        dataIndex: 'comment',
+                       renderer: Ext.String.htmlEncode,
                        flex: 1
                    }
                ]

diff --git a/www/manager6/form/SecurityGroupSelector.js b/www/manager6/form/SecurityGroupSelector.js
index c3a42dc4c967f5e27d0c0736fdd3d43b9cb9fb10..b805c291dca9bdf8cfe36df40a9d2e813733cdb1 100644 (file)
--- a/www/manager6/form/SecurityGroupSelector.js
+++ b/www/manager6/form/SecurityGroupSelector.js
@@ -33,7 +33,8 @@ Ext.define('PVE.form.SecurityGroupsSelector', {
                    },
                    {
                        header: gettext('Comment'),  
-                       dataIndex: 'comment', 
+                       dataIndex: 'comment',
+                       renderer: Ext.String.htmlEncode,
                        flex: 1
                    }
                ]

diff --git a/www/manager6/form/UserSelector.js b/www/manager6/form/UserSelector.js
index d5c8a077502a11dec3ac647d9bb7bc780a9c9547..c84cef44815e3f16402b45c7e09130c640ced158 100644 (file)
--- a/www/manager6/form/UserSelector.js
+++ b/www/manager6/form/UserSelector.js
@@ -40,6 +40,7 @@ Ext.define('PVE.form.UserSelector', {
                        header: gettext('Comment'),
                        sortable: false,
                        dataIndex: 'comment',
+                       renderer: Ext.String.htmlEncode,
                        flex: 1
                    }
                ]

diff --git a/www/manager6/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js
index b483c9401411d8b8523ab0b2935f72c59c3485ae..09f107406347514c2ef844c2280d4c994b81ef4c 100644 (file)
--- a/www/manager6/grid/FirewallRules.js
+++ b/www/manager6/grid/FirewallRules.js
@@ -15,6 +15,7 @@ Ext.define('PVE.form.FWMacroSelector', {
            },
            {
                header: gettext('Description'),
+               renderer: Ext.String.htmlEncode,
                flex: 1,
                dataIndex: 'descr'
            }

diff --git a/www/manager6/ha/GroupSelector.js b/www/manager6/ha/GroupSelector.js
index 1f74b77d9acff39086af70e431f2c7c6a6bcc531..b55fc5685ebb48b4df79717e61ea0b785f947f2f 100644 (file)
--- a/www/manager6/ha/GroupSelector.js
+++ b/www/manager6/ha/GroupSelector.js
@@ -22,7 +22,8 @@ Ext.define('PVE.ha.GroupSelector', {
            {
                header: gettext('Comment'),
                flex: 1,
-               dataIndex: 'comment'
+               dataIndex: 'comment',
+               renderer: Ext.String.htmlEncode
            }
        ]
     },

diff --git a/www/manager6/node/APT.js b/www/manager6/node/APT.js
index 28301c3dc86eecc50c216ad58283aa176858e4c1..3afca02fed009344803f5798ed6725eaab668731 100644 (file)
--- a/www/manager6/node/APT.js
+++ b/www/manager6/node/APT.js
@@ -37,7 +37,7 @@ Ext.define('PVE.node.APT', {
                 var colspan = headerCt.getColumnCount();
                 // Usually you would style the my-body-class in CSS file
                 return {
-                    rowBody: '<div style="padding: 1em">' + data.Description + '</div>',
+                    rowBody: '<div style="padding: 1em">' + Ext.String.htmlEncode(data.Description) + '</div>',
                     rowBodyColspan: colspan
                 };
            }

diff --git a/www/manager6/node/ServiceView.js b/www/manager6/node/ServiceView.js
index a952aadd71aaafa1fa50a486482213797632b77f..dab98935a2c74612d14b6716de8caf843596c2df 100644 (file)
--- a/www/manager6/node/ServiceView.js
+++ b/www/manager6/node/ServiceView.js
@@ -137,6 +137,7 @@ Ext.define('PVE.node.ServiceView', {
                },
                {
                    header: gettext('Description'),
+                   renderer: Ext.String.htmlEncode,
                    dataIndex: 'desc',
                    flex: 1
                }

diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js
index 5f1c7be1fb937d4f8cc0a573507acc2b75a67daa..f551e7e0fa3fe36b73a49af78cb0173b740e8ebe 100644 (file)
--- a/www/manager6/storage/ContentView.js
+++ b/www/manager6/storage/ContentView.js
@@ -59,6 +59,7 @@ Ext.define('PVE.grid.TemplateSelector', {
                {
                    header: gettext('Description'),
                    flex: 1.5,
+                   renderer: Ext.String.htmlEncode,
                    dataIndex: 'headline'
                }
            ],