Avoiding admin page to crash if entering quote as value of a field #73

tomasbjerre · Oct 10, 2015 · 0e59f01 · 0e59f01
1 parent 6dbb299
commit 0e59f01
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 Changelog of Pull Request Notifier for Stash.
 
+## 1.31
+* Bugfix: Avoiding admin page to crash if entering quote as value of a field.
+
 ## 1.30
 * Adding "Triggers do not apply to" option with values DECLINED and MERGED.
 * Changing wording of trigger conditions in admin GUI.

diff --git a/src/main/java/se/bjurr/prnfs/settings/SettingsStorage.java b/src/main/java/se/bjurr/prnfs/settings/SettingsStorage.java
@@ -245,7 +245,10 @@ private static AdminFormValues injectConfigurationName(AdminFormValues adminForm
   if (nameMapOpt.isPresent()) {
    return adminFormValues;
   }
-  adminFormValues.add(ImmutableMap.<String, String> builder().put(NAME, name.name()).put(VALUE, DEFAULT_NAME).build());
+  adminFormValues.add(ImmutableMap.<String, String> builder()//
+    .put(NAME, name.name())//
+    .put(VALUE, DEFAULT_NAME)//
+    .build());
   return adminFormValues;
  }
 

diff --git a/src/main/resources/admin.js b/src/main/resources/admin.js
@@ -114,14 +114,15 @@
      var $template = $(".prnfs-template-"+formType).clone();
 
      $.each(config, function(fieldIndex,field_map) {
+      var safe_value = field_map.value.replace(/[^a-zA-Z]/g,'');
       $('.variable[data-variable="'+field_map.name+'"]', $template).html(field_map.value);
       $('input[type="text"][name="'+field_map.name+'"]', $template).attr('value', field_map.value);
       $('input[type="password"][name="'+field_map.name+'"]', $template).attr('value', field_map.value);
       $('textarea[name="'+field_map.name+'"]', $template).text(field_map.value);
       $('input[type="hidden"][name="'+field_map.name+'"]', $template).attr('value', field_map.value);
-      $('input[type="checkbox"][name="'+field_map.name+'"][value="'+field_map.value+'"]', $template).attr('checked','checked');
-      $('input[type="radio"][name="'+field_map.name+'"][value="'+field_map.value+'"]', $template).attr('checked','checked');
-      $('.visibleif.'+field_map.name+'_'+field_map.value.replace(/[^a-zA-Z]/g,''), $template).show();
+      $('input[type="checkbox"][name="'+field_map.name+'"][value="'+safe_value+'"]', $template).attr('checked','checked');
+      $('input[type="radio"][name="'+field_map.name+'"][value="'+safe_value+'"]', $template).attr('checked','checked');
+      $('.visibleif.'+field_map.name+'_'+safe_value, $template).show();
      });
 
      var header_names = [];