Merge pull request huginn#812 from younata/master

Add 'unescapeHTML' functionality to the javascript agent.

app/models/agents/java_script_agent.rb

@@ -21,6 +21,8 @@ class JavaScriptAgent < Agent
       * `this.options(key)`
       * `this.log(message)`
       * `this.error(message)`
+      * `this.escapeHtml(htmlToEscape)`
+      * `this.unescapeHtml(htmlToUnescape)`
     MD
 
     def validate_options
@@ -102,6 +104,8 @@ def execute_js(js_function, incoming_events = [])
           memory.to_json
         end
       end
+      context["escapeHtml"] = lambda { |a, x| CGI.escapeHTML(x) }
+      context["unescapeHtml"] = lambda { |a, x| CGI.unescapeHTML(x) }
 
       context.eval(code)
       context.eval("Agent.#{js_function}();")
@@ -158,6 +162,14 @@ def setup_javascript
           doError(message);
         }
 
+        Agent.escapeHtml = function(html) {
+          return escapeHtml(html);
+        }
+
+        Agent.unescapeHtml = function(html) {
+          return unescapeHtml(html);
+        }
+
         Agent.check = function(){};
         Agent.receive = function(){};
       JS

spec/models/agents/java_script_agent_spec.rb

@@ -162,6 +162,20 @@
       end
     end
 
+    describe "escaping and unescaping HTML" do
+      it "can escape and unescape html with this.escapeHtml and this.unescapeHtml in the javascript environment" do
+        @agent.options['code'] = 'Agent.check = function() { this.createEvent({ escaped: this.escapeHtml(\'test \"escaping\" <characters>\'), unescaped: this.unescapeHtml(\'test &quot;unescaping&quot; &lt;characters&gt;\')}); };'
+        @agent.save!
+        expect {
+          expect {
+            @agent.check
+          }.not_to change { AgentLog.count }
+        }.to change { Event.count}.by(1)
+        created_event = @agent.events.last
+        expect(created_event.payload).to eq({ 'escaped' => 'test &quot;escaping&quot; &lt;characters&gt;', 'unescaped' => 'test "unescaping" <characters>'})
+      end
+    end
+
     describe "getting incoming events" do
       it "can access incoming events in the JavaScript enviroment via this.incomingEvents" do
         event = Event.new