Updated regex refs #80

SCS-CBU-CED-IAM · Dec 23, 2014 · a335176 · a335176
1 parent f9abb38
commit a335176
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/bash/mobileid-query.sh b/bash/mobileid-query.sh
@@ -154,7 +154,7 @@ if [ "$RC" = "0" -a "$http_code" -eq 200 ]; then
   case "$MSGTYPE" in
     SOAP)
       # Parse the response xml
-      RES_RC=$(sed -n -e 's/.*<mss:StatusCode Value="\(.*\)"\/>.*/\1/p' $TMP.rsp)
+      RES_RC=$(sed -n -e 's/.*<mss:StatusCode Value="\([^"]*\).*/\1/p' $TMP.rsp)
       RES_ST=$(sed -n -e 's/.*<mss:StatusMessage>\(.*\)<\/mss:StatusMessage>.*/\1/p' $TMP.rsp)
       ;;
     JSON)

diff --git a/bash/mobileid-receipt.sh b/bash/mobileid-receipt.sh
@@ -212,9 +212,9 @@ if [ "$RC" = "0" -a "$http_code" -eq 200 ]; then
   case "$MSGTYPE" in
     SOAP)
       # Parse the response xml
-      RES_RC=$(sed -n -e 's/.*<mss:StatusCode Value="\(...\)"\/>.*/\1/p' $TMP.rsp)
+      RES_RC=$(sed -n -e 's/.*<mss:StatusCode Value="\([^"]*\).*/\1/p' $TMP.rsp)
       RES_ST=$(sed -n -e 's/.*<mss:StatusMessage>\(.*\)<\/mss:StatusMessage>.*/\1/p' $TMP.rsp)
-      RES_USR_ACK=$(sed -n -e 's/.*UserAck="\([^"]*\)\".*$/\1/p' $TMP.rsp)
+      RES_USR_ACK=$(sed -n -e 's/.*UserAck="\([^"]*\).*/\1/p' $TMP.rsp)
       RES_USR_RSP=$(sed -n -e 's/.*UserResponse="{\(.*\)}.*/\1/p' $TMP.rsp | sed -e 's/\&quot\;/\"/g')
       ;;
     JSON)

diff --git a/bash/mobileid-sign.sh b/bash/mobileid-sign.sh
@@ -197,11 +197,11 @@ if [ "$RC" = "0" -a "$http_code" -eq 200 ]; then
   case "$MSGTYPE" in
     SOAP)
       # Parse the response xml
-      RES_TRANSID=$(sed -n -e 's/.*AP_TransID="\(.*\)" AP_.*/\1/p' $TMP.rsp)
+      RES_TRANSID=$(sed -n -e 's/.*AP_TransID="\([^"]*\).*/\1/p' $TMP.rsp)
       RES_MSISDNID=$(sed -n -e 's/.*<mss:MSISDN>\(.*\)<\/mss:MSISDN>.*/\1/p' $TMP.rsp)
-      RES_RC=$(sed -n -e 's/.*<mss:StatusCode Value="\(.*\)"\/>.*/\1/p' $TMP.rsp)
+      RES_RC=$(sed -n -e 's/.*<mss:StatusCode Value="\([^"]*\).*/\1/p' $TMP.rsp)
       RES_ST=$(sed -n -e 's/.*<mss:StatusMessage>\(.*\)<\/mss:StatusMessage>.*/\1/p' $TMP.rsp)
-      RES_MSSPID=$(sed -n -e 's/.*MSSP_TransID="\(.*\)" xmlns:mss.*/\1/p' $TMP.rsp)
+      RES_MSSPID=$(sed -n -e 's/.*MSSP_TransID="\([^"]*\).*/\1/p' $TMP.rsp)
       sed -n -e 's/.*<mss:Base64Signature>\(.*\)<\/mss:Base64Signature>.*/\1/p' $TMP.rsp > $TMP.sig.base64
       ;;
     JSON)