[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. fbbe66947289e631aa510c28f343ff5b8891f43f

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_2 has been updated
       via  fbbe66947289e631aa510c28f343ff5b8891f43f (commit)
      from  8bd99a225bf3f5bc7cbcb0a954c1e5f53b55a561 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fbbe66947289e631aa510c28f343ff5b8891f43f
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date:   Thu Mar 22 22:21:36 2012 -0400

    Acq: Yet more efforts to sanitize data for the EDI translator
    
    I specifically did this to address cases reported to me by Galen
    Charlton in which get_li_attr_jedi() would return the string "nul", but
    I hope this is a nail in the coffin for problems involving
    JEDI-producing Action/Trigger templates feeding the EDI translator
    strings that the latter doesn't like.
    
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor.pm
index a56a2cd..f6702ce 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor.pm
@@ -189,6 +189,12 @@ $_TT_helpers = {
     # returns matching line item attribute, or undef
     get_li_attr => \&get_li_attr,
 
+    # get_li_attr_jedi() returns a JSON-encoded string without the enclosing
+    # quotes.  The function also removes other characters from the string
+    # that the EDI translator doesn't like.
+    #
+    # This *always* return a string, so don't use this in conditional
+    # expressions in your templates unless you really mean to.
     get_li_attr_jedi => sub {
         # This helper has to mangle data in at least three interesting ways.
         #
@@ -201,33 +207,42 @@ $_TT_helpers = {
         # passed through edi4r by the edi_pusher.pl script.
 
         my $value = get_li_attr(@_);
-        if ($value) {
-            # Here we can add any number of special case transformations to
-            # avoid problems with the EDI translator (or bad JSON).
-
-            # The ? character, if in the final position of a string, breaks
-            # the translator. + or ' or : could be problematic, too.
-            if ($value =~ /[\?\+':]$/) {
-                chop $value;
-            }
 
-            # Typical vendors dealing with EDIFACT would seem not to want
-            # any unicode characters, so trash them. Yes, they're already
-            # in the data escaped like this at this point even though we
-            # haven't JSON-escaped things yet.
-            $value =~ s/\\u[0-9a-f]{4}//g;
+        {
+            no warnings 'uninitialized';
+            $value .= "";   # force to string
+        };
+
+        # Here we can add any number of special case transformations to
+        # avoid problems with the EDI translator (or bad JSON).
 
-            # What the heck, get rid of [ ] too (although I couldn't get them
-            # to cause any problems for me, problems have been reported. See
-            # LP #812593).
-            $value =~ s/[\[\]]//g;
-        }
+        # Typical vendors dealing with EDIFACT (or is the problem with
+        # our EDI translator itself?) would seem not to want
+        # any characters outside the ASCII range, so trash them.
+        $value =~ s/[^[:ascii:]]//g;
+
+        # Remove anything somehow already JSON-escaped as a Unicode
+        # character. (even though for our part, we haven't JSON-escaped
+        # anything yet).
+        $value =~ s/\\u[0-9a-f]{4}//g;
+
+        # What the heck, get rid of [ ] too (although I couldn't get them
+        # to cause any problems for me, problems have been reported. See
+        # LP #812593).
+        $value =~ s/[\[\]]//g;
 
         $value = OpenSRF::Utils::JSON->perl2JSON($value);
 
         # Existing action/trigger templates expect an unquoted string.
         $value =~ s/^"//g;
-        chop $value;
+        $value =~ s/"$//g;
+
+        # The ? character, if in the final position of a string, breaks
+        # the translator. + or ' or : could be problematic, too. And we must
+        # avoid leaving a hanging \.
+        while ($value =~ /[\\\?\+':]$/) {
+            chop $value;
+        }
 
         return $value;
     },

-----------------------------------------------------------------------

Summary of changes:
 .../lib/OpenILS/Application/Trigger/Reactor.pm     |   55 ++++++++++++-------
 1 files changed, 35 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
Evergreen ILS