properly protect pan

jpos · Jun 17, 2024 · 745b257 · 745b257
1 parent e776db2
commit 745b257
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/jpos/src/main/java/org/jpos/iso/ISOUtil.java b/jpos/src/main/java/org/jpos/iso/ISOUtil.java
@@ -906,16 +906,16 @@ public static String normalize (String s) {
 
     public static String protect(String s, char mask) {
         // Validation for minimum length
-        StringBuilder ps = new StringBuilder(s);
         if (s.length() <= 4) {
             char[] maskedArray = new char[s.length()];
             Arrays.fill(maskedArray, mask);// 6 (BIN) + 4 (last digits) = 10
             return new String(maskedArray);
         }
+        StringBuilder ps = new StringBuilder(s);
 
         // Identify the positions of separators (^ and =)
-        String separator = s.contains("^") ? "^" : "=";
-        int firstSeparatorIndex = ps.indexOf(separator);
+        String separator = s.contains("^") ? "^" : s.contains("=") ? "=" : null;
+        int firstSeparatorIndex = separator != null ? ps.indexOf(separator) : s.length();
         if (firstSeparatorIndex < 6) {
             return s; // nothing to do
         }
@@ -925,15 +925,16 @@ public static String protect(String s, char mask) {
         for (int i = 6; i < lastDigitIndex; i++) {
             ps.setCharAt(i, mask);
         }
-        for (int i = firstSeparatorIndex + 1; i < ps.length(); i++) {
-            char c = ps.charAt(i);
-            if ((c != '=' && c != '^')) {
-                ps.setCharAt(i, mask);
+        if (separator != null) {
+            for (int i = firstSeparatorIndex + 1; i < ps.length(); i++) {
+                char c = ps.charAt(i);
+                if ((c != '=' && c != '^')) {
+                    ps.setCharAt(i, mask);
+                }
             }
         }
         return ps.toString();
     }
-
     public static String protect(String s) {
         return protect(s, '_');
     }

diff --git a/jpos/src/test/java/org/jpos/iso/ISOUtilTest.java b/jpos/src/test/java/org/jpos/iso/ISOUtilTest.java
@@ -4238,6 +4238,12 @@ public void testProtect5() throws Throwable {
         assertEquals("", result, "result");
     }
 
+    @Test
+    public void testPan() throws Throwable {
+        String result = ISOUtil.protect("4111111111111111");
+        assertEquals("411111______1111", result, "result");
+    }
+
 
     @Test
     public void testProtectT1D3() throws Throwable {