Custom notifications fix

As provided by star-glider in issue:

nutechsoftware#99

The custom notification option is broken; the notify_data dictionary is always empty. There's quite a bit of code that works over this dictionary (lines 1182 through 1204 in types.py), but none of it runs because custom_values is blank. I haven't dug in deeply enough to really understand what's going on here; it's way more code than exists in the other notification methods, and I'm not sure why.

I ran into this trying to set up Slack notifications (JSON POST) and threw in a quick patch to get it working. Basically, I just skip over all of the inactive code, create a dictionary directly in a manner similar to the other notification methods, and then reference that in the _do_post method call. Since the project isn't being maintained, I don't think it's worth the time to submit a pull request (and do the associated work to figure out why there's all that additional code), but I figured I'd drop my patch in here just in case it helps anyone.

Two notes: 1) the modification to line 1144 was just me troubleshooting; it's not relevant to the fix but is kind of a nice-to-have; 2) the new "message_string" variable includes a version of the "Subject" option from the email notification, but I just harcoded in the message instead of modifying the web forms to offer it as a front-end-selectable option, mainly because I'm lazy. Presumably, if you're applying this patch, you can just type in whatever you want there or just set it equal to the 'text' variable to eliminate it entirely.

I know the project is essentially abandoned, but it's a great addition to these old (and very reliable) ADEMCO systems. As long as you're running it behind a firewall with no ports exposed, there's really not much risk in running an old image with so little attack surface, and while old it works just perfectly (kind of like my 20-year-old alarm system)!

ad2web/notifications/types.py

@@ -1141,7 +1141,7 @@ def _do_post(self, data, app=None):
             return True
         else:
             app.logger.info('Event Custom Notification Failed')
-            raise Exception('Custom Notification Failed (' + str(http_response.status) + ") " + http_response.reason)
+            raise Exception('Custom Notification Failed (' + str(http_response.status) + ") " + http_response.reason + " Headers:" + str(self.headers) + " Body:" + str(data))
 
     # Warning: Threaded so it may be sent later and state may change.
     # Never access any AD2* state vars in a threaded function.
@@ -1175,6 +1175,8 @@ def _do_get(self, data, app=None):
     @raise_with_stack
     def send(self, type, text, raw):
         self.msg_to_send = text
+        message_string = 'Primary Residence Alarm Event: %s' % text
+        json_data = {"text": message_string}
 
         result = False
         if check_time_restriction(self.starttime, self.endtime):
@@ -1211,7 +1213,7 @@ def send(self, type, text, raw):
                    result =  self._do_post(self._dict_to_xml('notification', notify_data))
 
                 if self.post_type == JSON:
-                    result = self._do_post(self._dict_to_json(notify_data) )
+                    result = self._do_post(self._dict_to_json(json_data))
 
             if self.method == CUSTOM_METHOD_GET_TYPE:
                 if self.post_type == URLENCODE: