GData reduction, security recs for regex

GAM-team · Aug 18, 2023 · 4454e55 · 4454e55
1 parent f1229fe
commit 4454e55
Show file tree

Hide file tree

Showing 70 changed files with 10 additions and 13,179 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -665,7 +665,8 @@ jobs:
              $gam config csv_output_row_filter "email:regex:^gha_test_${JID}_" print cigroups | $gam csv - gam delete cigroup ~email
              $gam config csv_output_row_filter "resourceId:regex:^gha_test_${JID}_" print resources | $gam csv - gam delete resource ~resourceId
              $gam config csv_output_row_filter "buildingId:regex:^gha_test_${JID}_" print buildings | $gam csv - gam delete building ~buildingId
-             
+             $gam config csv_output_row_filter "Emails.1.address:^gha_test-${JID}_" print contacts | $gam csv - gam delete contact ~ContactID
+
              echo "Creating OrgUnit ${newou}"
              $gam create ou "${newou}"
              export GAM_THREADS=5
@@ -684,6 +685,8 @@ jobs:
              $gam user $gam_user sendemail recipient $newuser subject "test message $newbase" message "GHA test message"
              $gam user $gam_user sendemail recipient exchange@pdl.jaylee.us subject "test ${tstamp}" message "test message"
              $gam config enable_dasa false save
+             $gam create contact firstname GHA lastname "$JID" email "${newbase}@example.com"
+             $gam print contacts
              $gam user $newuser add license workspaceenterpriseplus
              $gam print privileges
              $gam config enable_dasa true save
@@ -781,6 +784,7 @@ jobs:
              $gam create device serialnumber $sn devicetype android
              $gam config enable_dasa true save
              $gam print users query "gha.jid=$JID" | $gam csv - gam delete user ~primaryEmail  || if [ $? != 50 ]; then exit $?; fi # expect a 50 return code (vault hold on user)
+             $gam delete contacts emailmatchpattern "^${newbase}@example.com$"
              $gam print mobile
              $gam print devices
              $gam print browsers

diff --git a/src/gam/__init__.py b/src/gam/__init__.py
@@ -13864,7 +13864,8 @@ def _getTagReplacementFieldValues(user, i, count, tagReplacements, results=None)
 UC_PATTERN = re.compile(r'(?s){UC}.*?{/UC}')
 LC_PATTERN = re.compile(r'(?s){LC}.*?{/LC}')
 CASE_MARKERS = {'PC', '/PC', 'UC', '/UC', 'LC', '/LC'}
-SKIP_PATTERNS = [re.compile(r'<head>.*?</head>'), re.compile(r'<script>.*?</script>')]
+SKIP_PATTERNS = [re.compile(r'<head>.*?</head>', flags=re.IGNORECASE),
+                 re.compile(r'<script>.*?</script>', flags=re.IGNORECASE)]
 
 def _processTagReplacements(tagReplacements, message):
   def pcase(trstring):