Merge pull request #85 from CyberSource/june-22-release

June 22 release

Author: gnongsie

CyberSource/__init__.py

@@ -190,6 +190,8 @@
 from .models.pts_v2_payments_post201_response_payment_information_bank_account import PtsV2PaymentsPost201ResponsePaymentInformationBankAccount
 from .models.pts_v2_payments_post201_response_payment_information_instrument_identifier import PtsV2PaymentsPost201ResponsePaymentInformationInstrumentIdentifier
 from .models.pts_v2_payments_post201_response_payment_information_tokenized_card import PtsV2PaymentsPost201ResponsePaymentInformationTokenizedCard
+from .models.pts_v2_payments_post201_response_payment_insights_information import PtsV2PaymentsPost201ResponsePaymentInsightsInformation
+from .models.pts_v2_payments_post201_response_payment_insights_information_response_insights import PtsV2PaymentsPost201ResponsePaymentInsightsInformationResponseInsights
 from .models.pts_v2_payments_post201_response_point_of_sale_information import PtsV2PaymentsPost201ResponsePointOfSaleInformation
 from .models.pts_v2_payments_post201_response_point_of_sale_information_emv import PtsV2PaymentsPost201ResponsePointOfSaleInformationEmv
 from .models.pts_v2_payments_post201_response_processing_information import PtsV2PaymentsPost201ResponseProcessingInformation
@@ -491,6 +493,7 @@
 from .models.riskv1addressverifications_order_information_line_items import Riskv1addressverificationsOrderInformationLineItems
 from .models.riskv1addressverifications_order_information_ship_to import Riskv1addressverificationsOrderInformationShipTo
 from .models.riskv1authenticationresults_consumer_authentication_information import Riskv1authenticationresultsConsumerAuthenticationInformation
+from .models.riskv1authenticationresults_device_information import Riskv1authenticationresultsDeviceInformation
 from .models.riskv1authenticationresults_order_information import Riskv1authenticationresultsOrderInformation
 from .models.riskv1authenticationresults_order_information_amount_details import Riskv1authenticationresultsOrderInformationAmountDetails
 from .models.riskv1authenticationresults_order_information_line_items import Riskv1authenticationresultsOrderInformationLineItems
@@ -662,6 +665,7 @@
 from .models.tss_v2_transactions_get200_response_point_of_sale_information import TssV2TransactionsGet200ResponsePointOfSaleInformation
 from .models.tss_v2_transactions_get200_response_processing_information import TssV2TransactionsGet200ResponseProcessingInformation
 from .models.tss_v2_transactions_get200_response_processing_information_authorization_options import TssV2TransactionsGet200ResponseProcessingInformationAuthorizationOptions
+from .models.tss_v2_transactions_get200_response_processing_information_authorization_options_initiator import TssV2TransactionsGet200ResponseProcessingInformationAuthorizationOptionsInitiator
 from .models.tss_v2_transactions_get200_response_processing_information_bank_transfer_options import TssV2TransactionsGet200ResponseProcessingInformationBankTransferOptions
 from .models.tss_v2_transactions_get200_response_processing_information_japan_payment_options import TssV2TransactionsGet200ResponseProcessingInformationJapanPaymentOptions
 from .models.tss_v2_transactions_get200_response_processor_information import TssV2TransactionsGet200ResponseProcessorInformation
@@ -681,14 +685,16 @@
 from .models.tss_v2_transactions_post201_response__embedded_buyer_information import TssV2TransactionsPost201ResponseEmbeddedBuyerInformation
 from .models.tss_v2_transactions_post201_response__embedded_client_reference_information import TssV2TransactionsPost201ResponseEmbeddedClientReferenceInformation
 from .models.tss_v2_transactions_post201_response__embedded_consumer_authentication_information import TssV2TransactionsPost201ResponseEmbeddedConsumerAuthenticationInformation
-from .models.tss_v2_transactions_post201_response__embedded_device_information import TssV2TransactionsPost201ResponseEmbeddedDeviceInformation
 from .models.tss_v2_transactions_post201_response__embedded__links import TssV2TransactionsPost201ResponseEmbeddedLinks
 from .models.tss_v2_transactions_post201_response__embedded_merchant_information import TssV2TransactionsPost201ResponseEmbeddedMerchantInformation
 from .models.tss_v2_transactions_post201_response__embedded_order_information import TssV2TransactionsPost201ResponseEmbeddedOrderInformation
 from .models.tss_v2_transactions_post201_response__embedded_order_information_bill_to import TssV2TransactionsPost201ResponseEmbeddedOrderInformationBillTo
 from .models.tss_v2_transactions_post201_response__embedded_order_information_ship_to import TssV2TransactionsPost201ResponseEmbeddedOrderInformationShipTo
 from .models.tss_v2_transactions_post201_response__embedded_payment_information import TssV2TransactionsPost201ResponseEmbeddedPaymentInformation
+from .models.tss_v2_transactions_post201_response__embedded_payment_information_bank import TssV2TransactionsPost201ResponseEmbeddedPaymentInformationBank
+from .models.tss_v2_transactions_post201_response__embedded_payment_information_bank_account import TssV2TransactionsPost201ResponseEmbeddedPaymentInformationBankAccount
 from .models.tss_v2_transactions_post201_response__embedded_payment_information_card import TssV2TransactionsPost201ResponseEmbeddedPaymentInformationCard
+from .models.tss_v2_transactions_post201_response__embedded_payment_information_customer import TssV2TransactionsPost201ResponseEmbeddedPaymentInformationCustomer
 from .models.tss_v2_transactions_post201_response__embedded_payment_information_payment_type import TssV2TransactionsPost201ResponseEmbeddedPaymentInformationPaymentType
 from .models.tss_v2_transactions_post201_response__embedded_point_of_sale_information import TssV2TransactionsPost201ResponseEmbeddedPointOfSaleInformation
 from .models.tss_v2_transactions_post201_response__embedded_point_of_sale_information_partner import TssV2TransactionsPost201ResponseEmbeddedPointOfSaleInformationPartner

CyberSource/logging/sensitive_formatter.py

@@ -20,66 +20,66 @@ def _filter(s):
         s = re.sub(r'keyid="[-.A-Za-z0-9+/= ]+"', r'keyid="xxxxxxxx"', s)
 
         # masking cardNumber
-        matches = re.search(r'"cardNumber":"((\s*[0-9]\s*)+)"', s)
+        matches = re.search(r'"cardNumber":"(((\s*[s/-]*\s*)+[0-9](\s*[s/-]*\s*)+)+)"', s)
         if matches:
             matchedString= matches.group(0)            
             matchString= matchedString.replace(" ","")
+            matchString= matchString.replace("-","")
             pats = re.findall(r'"cardNumber":"[0-9]+"', matchString)
             if len(pats) > 0:
                 pat = pats[0]
-                pat.replace(" ", "")
                 pat = re.sub(r'[0-9](?=.*.{5})', r'x', pat)
                 replaceString = re.sub(r'"cardNumber":"[0-9]+"', pat, matchString)
                 s=s.replace(matchedString,replaceString)
 
         # masking number
-        matches = re.search(r'"number":"((\s*[0-9]\s*)+)"', s)
+        matches = re.search(r'"number":"(((\s*[s/-]*\s*)+[0-9](\s*[s/-]*\s*)+)+)"', s)
         if matches:
             matchedString= matches.group(0)
             matchString= matchedString.replace(" ","")
+            matchString= matchString.replace("-","")
             pats = re.findall(r'"number":"[0-9]+"', matchString)
             if len(pats) > 0:
                 pat = pats[0]
-                pat.replace(" ", "")
                 pat = re.sub(r'[0-9](?=.*.{5})', r'x', pat)
                 replaceString = re.sub(r'"number":"[0-9]+"', pat, matchString)
                 s=s.replace(matchedString,replaceString)
 
         # masking account
-        matches = re.search(r'"account":"((\s*[0-9]\s*)+)"', s)
+        matches = re.search(r'"account":"(((\s*[s/-]*\s*)+[0-9](\s*[s/-]*\s*)+)+)"', s)
         if matches:
             matchedString= matches.group(0)
             matchString= matchedString.replace(" ","")
+            matchString= matchString.replace("-","")
             pats = re.findall(r'"account":"[0-9]+"', matchString)
             if len(pats) > 0:
                 pat = pats[0]
-                pat.replace(" ", "")
                 pat = re.sub(r'[0-9](?=.*.{5})', r'x', pat)
                 replaceString = re.sub(r'"account":"[0-9]+"', pat, matchString)
                 s=s.replace(matchedString,replaceString)
 
         # masking prefix
-        matches = re.search(r'"prefix":"((\s*[0-9]\s*)+)"', s)
+        matches = re.search(r'"prefix":"(((\s*[s/-]*\s*)+[0-9](\s*[s/-]*\s*)+)+)"', s)
         if matches:
             matchedString= matches.group(0)
             matchString= matchedString.replace(" ","")
+            matchString= matchString.replace("-","")
             pats = re.findall(r'"prefix":"[0-9]+"', matchString)
             if len(pats) > 0:
                 pat = pats[0]
-                pat.replace(" ", "")
                 pat = re.sub(r'(?<=["])([0-9]{6})', r'x', pat)
                 replaceString = re.sub(r'"prefix":"[0-9]+"', pat, matchString)
                 s=s.replace(matchedString,replaceString)
 
         # masking bin
-        matches = re.search(r'"bin":"((\s*[0-9]\s*)+)"', s)
+        matches = re.search(r'"bin":"(((\s*[s/-]*\s*)+[0-9](\s*[s/-]*\s*)+)+)"', s)
         if matches:
             matchedString= matches.group(0)
             matchString= matchedString.replace(" ","")
+            matchString= matchString.replace("-","")
             pats = re.findall(r'"bin":"[0-9]+"', matchString)
             if len(pats) > 0:
                 pat = pats[0]
-                pat.replace(" ", "")
                 pat = re.sub(r'(?<=["])([0-9]{6})', r'x', pat)
                 replaceString = re.sub(r'"bin":"[0-9]+"', pat, matchString)
                 s=s.replace(matchedString,replaceString)