Description Philipp Hahn 2015-03-13 11:46:53 CET

Created attachment 6757 [details]
UMC Screenshot

<, &, > are not escaped in UCRV descriptions

# ucr info mail/postfix/masquerade/domains
mail/postfix/masquerade/domains: $mydomain
 This variable can be used to strip a subdomain from an e-mail-adress, so that e.g. user@server.example.com can be rewritten to user@example.com. The format is described at <http://www.postfix.org/postconf.5.html#masquerade_domains>. If the variable is unset, the fully qualified hostname of the server is used.
 Categories: service-mail

# umc-command -U Administrator -P univention -r ucr/get -o mail/postfix/masquerade/domains=
10.03.15 02:45:13.523  DEBUG_INIT
Response: COMMAND
  data length   :  916
  message length:  851
  ---
  ARGUMENTS: ['ucr/get']
MIMETYPE   : application/json
  STATUS   : 200
  MESSAGE  : None
  RESULT   : [ { 'categories': 'service-mail',
    'description[de]': u'Mit dieser Variable kann eine Unterdom\xe4ne aus E-Mail-Adressen entfernt werden, so dass z.B. user@server.example.com nach user@example.com umgeschrieben wird. Das Format ist unter <http://www.postfix.org/postconf.5.html#masquerade_domains> beschrieben. Ist die Variable nicht gesetzt, gilt der vollqualifizierte Rechnername des Servers.',
    'description[en]': 'This variable can be used to strip a subdomain from an e-mail-adress, so that e.g. user@server.example.com can be rewritten to user@example.com. The format is described at <http://www.postfix.org/postconf.5.html#masquerade_domains>. If the variable is unset, the fully qualified hostname of the server is used.',
    'key': 'mail/postfix/masquerade/domains',
    'type': 'str',
    'value': '$mydomain'}]


In UMC:

This variable can be used to strip a subdomain from an e-mail-adress, so that e.g. user@server.example.com can be rewritten to user@example.com. The format is described at . If the variable is unset, the fully qualified hostname of the server is used.


diff --git a/branches/ucs-4.0/ucs-4.0-1/management/univention-management-console-module-ucr/umc/js/ucr.js b/branches/ucs-4.0/ucs-4.0-1/management/univention-management-console-module-ucr/umc/js/ucr.js
index 909217d..d6433c5 100644
--- a/branches/ucs-4.0/ucs-4.0-1/management/univention-management-console-module-ucr/umc/js/ucr.js
+++ b/branches/ucs-4.0/ucs-4.0-1/management/univention-management-console-module-ucr/umc/js/ucr.js
@@ -35,6 +35,7 @@ define([
        "dojo/_base/array",
        "dojo/aspect",
        "dojo/sniff",
+       "dojox/html/entities",
        "dijit/Dialog",
        "dijit/form/_TextBoxMixin",
        "umc/tools",
@@ -52,7 +53,7 @@ define([
        "umc/widgets/Tooltip",
        "umc/i18n!umc/modules/ucr",
        "xstyle/css!./ucr.css"
-], function(declare, lang, kernel, array, aspect, has, Dialog, _TextBoxMixin, tools, dialog, Form, Grid, Module, Page, SearchForm, StandbyMixin, TextBox, Text, HiddenInput, ComboBox, Tooltip, _) {
+], function(declare, lang, kernel, array, aspect, has, entities, Dialog, _TextBoxMixin, tools, dialog, Form, Grid, Module, Page, SearchForm, StandbyMixin, TextBox, Text, HiddenInput, ComboBox, Tooltip, _) {
 
        var _DetailDialog = declare([Dialog, StandbyMixin], {
                _form: null,
@@ -135,7 +136,7 @@ define([
                                if (text) {
                                        // we have description, update the description field
                                        descWidget.set('visible', true);
-                                       descWidget.set('content', '<i>' + text + '</i>');
+                                       descWidget.set('content', '<i>' + entities.encode(text) + '</i>');
                                }
                                else {
                                        // no description -> hide widget and label