GAM 4.94, pull in Ross changes in #1003

disable ssl verify on time sync so we know when clock is WAY off
Even better SA check
2026-06-04 14:21:39 +00:00 · 2019-08-30 11:45:52 -04:00 · 2019-08-30 11:15:56 -04:00 · 2019-08-30 11:02:42 -04:00 · 2019-08-29 14:32:45 -04:00 · 2019-08-27 14:28:04 -04:00
16 changed files with 1367 additions and 756 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,11 @@ if: tag IS blank

 env:
  global:
-    - BUILD_PYTHON_VERSION=3.7.3
+    - BUILD_PYTHON_VERSION=3.7.4
    - BUILD_OPENSSL_VERSION=1.1.1c
    - PATCHELF_VERSION=0.9
-    - MUSL_VERSION=1.1.22
+    - MUSL_VERSION=1.1.23
+    - PYINSTALLER_VERSION=3.5
    - secure: "FSKvLaiqhKz21SVgAQZI3bSX34Ffyev4l+R2G//QXNDu6UVQcuFsykzw+eZEG7fkhotXr8BMDL7xIkookiL8eLwUtcd/Z95HCjPBBHcmCSQleyvuuJBxdrQ9xldmiGLzMCYiumSH9OH4uJhQ39Yjnjsa8TK+PlTci6a/BTzlYyBSyDYDf7Iv/uhfQPDHL3pNwrQPHf4fL6/jcvo+uaPcv83AVZkNzZjjyoi9Aa+uh9xlbyHg11jp44463qqxoxTdYik3pYuXRBPjknjOGcnFHqn+QOVSdRQoiwbmT8xVuYuCzTv9THhuJ//i5u7s4y3Xyl7u17B3tdm86UlMpQHy/w9EsYaSBPOU4oPNomRtOnTSugh0v9ZBwptP5XfbslII/iA+LQdzTHhchn0W0CRyDqjOMSestWlrsq5NZJtBJTYHbebllOhEI7xbj9tY+re1zFWSPMOPgHJP23ovsdk3hD9OT93AzRHInCx5IxL6QvEgRhAancRuGkf2rGP0g/vX9fQ0Il3rNMSQxHB5CyHUBtUJ9nhU79YkMDZicD0jFMEwjWJO3itAp3ynoLXRgktgQCYUfgc9SpdWKD5SXLCYnSo22JD3D1P6h2EertRHaoKRLb+CRXQC/lM8uh/W+BjA2Xe6Vut2I/72ndjM+10T7E2xk1CFyCH37a5p8cH26Fs="
    - secure: "J9380tGLOZWa7dSH1y5Il8T5JQpN6ad81gI6VR1HIU0svpRdjgikyDA7ca2MKYDUYYY9yVSkTV6gCl6iIU/9+SKaYugpP+tkvdGYkC2moJdcTgYM/WOnIK9ExQ3BPhN1neGxJjPTwKo1ft27mtZ2I5vuCiBwIcnKWLnKPyW3PD+mWpfqiLuEzkHoAh6G3jC4qbcCrZDeX/knE+PzqESUEi+8k1G8gYcSDWujba9ypSsqZ8T/MXagGla6l7y2Rz+/KZTJmFHwKAA10V+xPLVqxoiqi4ar66yUqy0BamwRXPcseI+ns3Q+4lUpMqVQ5GlRy7LF1xC8myjmcAexXk0F9hg+CMzewKI8UgmQH/ZJvQZEh8s6mW26+CqA4d3zMQkWaR0WtEtpiuH7AGHCflIqvEQ6UiG7ia3B8iZfW2wl0j/kqx4OuHkS3r0pWKVVIIvCj9Ow2BHP7SpiV1AcUGsVxzwbgTh67fitna3Z3c6Uj8ccQlNr7ZIt1az6Wf3w5njijkLOiBpQSLKunTTCTSge/JzBTKUcie3RE9vzirl58gUxAt36nDtPWnory+RttMZrOkBVbTeSxp+IUe8pNwLFPHABsafXsjkfzBOtFmm+0ZXWt2Rlog5NvlemJfQUWDlsL4g+BSakzN+4sIPKzSauWDHyaEeULY7Uprkil6c5zwo="
    - secure: "szcjWHPr0Bf1KCkyTrV5Fu3ADhWk+pg8YWucjXHdybmhaQIKG7iBNg8LJ5d0OBTwAg31wK4ZgyLVSa2gKrAZ3UeDjykJFsR711xDSQOod51Wrgqu4FbXDewE817DUk3Cwe1l5DCu3/fjEw4vbm8B/qb7iMTRKCq6hJd97FwT5oauP0QHNPer9JjrW4F0Hk9ttkgEU2dXWvBMsTJsDOGNI3ddABE2HskxV4T4thelDYGKBDHhUOAsRwSjXgWy77Tvz98psPIvd+6+WPYNRdRWcPDyAR3Z1O/fNjUymrQI6eMaHoSFrmhDS5lbhjINRfdUmECyfCfIFeLWWiw4g4bq7l+4HBORbei55tAIjhEsxJQoqHi0Q5dD5TFh8IiWqowkFbpvNonMSIpKtB0cyT5jU1G/jRA7MPcIvSrdzHaDkoDNHJgAeZfgjOhzTGYYD19lGIljz5BQBcNFZY2dJbja+Jr4He2CMAOBOdERa4Zn1VyNfOmd8Bn5hu0C9D2ybnSCxjXXq5TRiktR8X7WycVZYfqMZXAwP9FEHVitJ4MZEGUc7S92K5gX4wmjcJjLS+Xo/0nsduQm8PuiMjbcPM7/oGx8Xm1KuSfHdKWMBoaesPaDvRX+YcuiNstXf1DkCWl72TsFABzddlNUMl/s2YSKkCSHAJ5ILqrB28Gx89kzVlg="
@@ -36,6 +37,14 @@ cache:

 matrix:
  include:
+#    - os: linux
+#      name: "Linux 64-bit Bionic"
+#      dist: bionic
+#      language: bash
+#      env:
+#         - GAMOS=linux
+#         - PLATFORM=x86_64
+#         - VMTYPE=cache
    - os: linux
      name: "Linux 64-bit Xenial"
      dist: xenial
@@ -61,7 +70,7 @@ matrix:
        - PLATFORM=x86_64
        - VMTYPE=build
    - os: linux
-      name: "Linux 64-bit Xenial - Python 3.5 Source Testing"
+      name: "Linux 64-bit - Python 3.5 Source Testing"
      dist: xenial
      language: python
      python:
@@ -71,8 +80,8 @@ matrix:
        - PLATFORM=x86_64
        - VMTYPE=test
    - os: linux
-      name: "Linux 64-bit Xenial - Python 3.6 Source Testing"
-      dist: xenial
+      name: "Linux 64-bit - Python 3.6 Source Testing"
+      dist: bionic
      language: python
      python:
        - "3.6"
@@ -81,8 +90,8 @@ matrix:
        - PLATFORM=x86_64
        - VMTYPE=test
    - os: linux
-      name: "Linux 64-bit Xenial - Python 3.8-dev Source Testing"
-      dist: xenial
+      name: "Linux 64-bit - Python 3.8-dev Source Testing"
+      dist: bionic
      language: python
      python:
        - "3.8-dev"
@@ -91,8 +100,8 @@ matrix:
        - PLATFORM=x86_64
        - VMTYPE=test
    - os: linux
-      name: "Linux 64-bit Xenial - Python nightly Source Testing"
-      dist: xenial
+      name: "Linux 64-bit - Python nightly Source Testing"
+      dist: bionic
      language: python
      python:
        - "nightly"
@@ -134,10 +143,12 @@ install:
 script:
 - $gam version extended
 - $gam version | grep travis # travis should be part of the path (not /tmp or such)
- if [ "$VMTYPE" == "build" ]; then $gam version | grep "Python ${BUILD_PYTHON_VERSION//./\\.}"; fi # We should be building with latest Python
- if [ "$VMTYPE" == "build" ]; then $gam version extended | grep "OpenSSL ${BUILD_OPENSSL_VERSION//./\\.}"; fi # We should be using OpenSSL 1.1.1+
+# determine which Python version GAM is built with and ensure it's at least build version from above.
+- if [ "VMTYPE" == "build" ]; then vline=$(gam version | grep "Python "); python_line=($vline); this_python=${python_line[1]}; tools/a_atleast_b.py $this_python $BUILD_PYTHON_VERSION; fi
+# determine which OpenSSL version GAM is built with and ensure it's at least build version from above.
+- if [ "VMTYPE" == "build" ]; then vline=$(gam version extended | grep "OpenSSL "); openssl_line=($vline); this_openssl=${openssl_line[1]}; tools/a_atleast_b.py $this_openssl $BUILD_OPENSSL_VERSION; fi
 - if [ "$VMTYPE" == "build" ]; then $gam version extended | grep TLSv1\.[23]; fi # Builds should default TLS 1.2 or 1.3 to Google
- if [ "$VMTYPE" == "build" ]; then GAM_TLS_MIN_VERSION=TLSv1_2 $gam version extended location tls-v1-0.badssl.com:1010; [[ $? == 3 ]]; fi # expect fail if server doesn't support our TLS version
+- if [ "$VMTYPE" == "build" ]; then GAM_TLS_MIN_VERSION=TLSv1_2 $gam version extended location tls-v1-0.badssl.com:1010; [[ $? == 3 ]]; fi # expect fail since server doesn't support our TLS version
 - export jid="$(cut -d'.' -f2 <<<"$TRAVIS_JOB_NUMBER")"
 - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then export e2e=true; fi
 - if [ "$e2e" = true ]; then export gam_user=gam-travis-$jid@pdl.jaylee.us; fi
@@ -159,13 +170,17 @@ script:
  for i in {01..20};
    do echo $newbase-bulkuser-$i >> sample.csv;
  done; fi
- if [ "$e2e" = true ]; then $gam create user $newuser firstname Travis lastname $jid password random travis.jid $jid; fi
+- if [ "$e2e" = true ]; then $gam create user $newuser firstname Travis lastname $jid password random recoveryphone 12125121110 recoveryemail jay0lee@gmail.com travis.jid $jid; fi
+- if [ "$e2e" = true ]; then $gam user $gam_user sendemail recipient $newuser subject "test message $newbase" message "Travis test message"; fi
 - if [ "$e2e" = true ]; then $gam create group $newgroup name "Travis $jid group" description "This is a description" isarchived true; fi
 - if [ "$e2e" = true ]; then $gam user $newuser add license gsuitebusiness; fi
 - if [ "$e2e" = true ]; then $gam update group $newgroup add owner $gam_user; fi
 - if [ "$e2e" = true ]; then $gam update group $newgroup add member $newuser; fi
 - if [ "$e2e" = true ]; then $gam csv sample.csv gam create user ~~email~~ firstname "Travis Bulk" lastname ~~email~~ travis.jid $jid; fi
+- if [ "$e2e" = true ]; then $gam csv sample.csv gam update user ~~email~~ recoveryphone 12125121110 recoveryemail jay0lee@gmail.com password random; fi
+- if [ "$e2e" = true ]; then $gam csv sample.csv gam update user ~~email~~ recoveryphone "" recoveryemail ""; fi
 - if [ "$e2e" = true ]; then $gam csv sample.csv gam user ~email add license gsuitebusiness; fi
+- if [ "$e2e" = true ]; then $gam csv sample.csv gam user $gam_user sendemail recipient ~~email~~@pdl.jaylee.us subject "test message $newbase" message "Travis test message"; fi
 - if [ "$e2e" = true ]; then $gam csv sample.csv gam update group $newgroup add member ~email; fi
 - if [ "$e2e" = true ]; then $gam info group $newgroup; fi
 - if [ "$e2e" = true ]; then $gam user $gam_user check serviceaccount; fi
@@ -173,7 +188,11 @@ script:
 - if [ "$e2e" = true ]; then $gam user $newuser show imap; fi
 - if [ "$e2e" = true ]; then $gam csv sample.csv gam user $newuser delegate to ~email; fi
 - if [ "$e2e" = true ]; then $gam user $newuser show delegates; fi
- if [ "$e2e" = true ]; then $gam users "$newbase-bulkuser-01 $newbase-bulkuser-02 $newbase-bulkuser-03" delete messages query in:anywhere maxtodelete 99999 doit; fi
+- if [ "$e2e" = true ]; then $gam user $gam_user importemail subject "Travis import $newbase" message "This is a test import" labels IMPORTANT,UNREAD,INBOX,STARRED; fi
+- if [ "$e2e" = true ]; then $gam user $gam_user insertemail subject "Travis insert $newbase" file gam.py labels INBOX,UNREAD; fi # yep body is gam code
+- if [ "$e2e" = true ]; then $gam user $gam_user sendemail subject "Travis send $gam_user $newbase" file gam.py recipient admin@pdl.jaylee.us; fi
+- if [ "$e2e" = true ]; then $gam user $gam_user draftemail subject "Travis draft $newbase" message "Draft message test"; fi
+- if [ "$e2e" = true ]; then $gam users "$gam_user $newbase-bulkuser-01 $newbase-bulkuser-02 $newbase-bulkuser-03" delete messages query in:anywhere maxtodelete 99999 doit; fi
 - if [ "$e2e" = true ]; then $gam users "$newbase-bulkuser-04 $newbase-bulkuser-05 $newbase-bulkuser-06" trash messages query in:anywhere maxtotrash 99999 doit; fi
 - if [ "$e2e" = true ]; then $gam users "$newbase-bulkuser-07 $newbase-bulkuser-08 $newbase-bulkuser-09" modify messages query in:anywhere maxtomodify 99999 addlabel IMPORTANT addlabel STARRED doit; fi
 - if [ "$e2e" = true ]; then $gam create feature name Whiteboard-$newbase; fi
@@ -197,10 +216,8 @@ script:
 - if [ "$e2e" = true ]; then $gam csv printers.csv gam info printer ~id; fi
 - if [ "$e2e" = true ]; then $gam print printjobs; fi
 - if [ "$e2e" = true ]; then $gam csv printers.csv gam printjob ~id fetch; fi
+- if [ "$e2e" = true ]; then $gam print printjobs | $gam csv - gam printjob ~id delete; fi
 - if [ "$e2e" = true ]; then $gam csv printers.csv gam delete printer ~id; fi
-#- if [ "$e2e" = true ]; then $gam calendar id:$newresource add editor $newuser; fi
-#- if [ "$e2e" = true ]; then $gam calendar id:$newresource update read domain; fi
-#- if [ "$e2e" = true ]; then $gam calendar id:$newresource showacl; fi
 - if [ "$e2e" = true ]; then $gam csv sample.csv gam user ~email add calendar id:$newresource; fi
 - if [ "$e2e" = true ]; then $gam delete resource $newresource; fi
 - if [ "$e2e" = true ]; then $gam delete feature Whiteboard-$newbase; fi
@@ -212,6 +229,8 @@ script:
 - if [ "$e2e" = true ]; then $gam user $gam_user show tokens; fi
 - if [ "$e2e" = true ]; then $gam delete user $newuser; fi
 - if [ "$e2e" = true ]; then $gam print users query "travis.jid=$jid" | $gam csv - gam delete user ~primaryEmail; fi
+- if [ "$e2e" = true ]; then $gam print mobile; fi
+- if [ "$e2e" = true ]; then $gam print cros allfields nolists; fi

 before_deploy:
 - export TRAVIS_TAG="preview"
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -143,6 +143,7 @@ If an item contains spaces, it should be surrounded by ".
 <ASPID> ::= <String>
 <BuildingID> ::= <String>|id:<String>
 <CalendarACLRole> ::= editor|freebusy|freebusyreader|owner|reader|writer
+<CalendarACLRuleID> ::= user:<EmailAddress>|group:<EmailAddress>|domain:<DomainName>|default
 <CalendarColorIndex> ::= <Number in range 1-24>
 <CalendarItem> ::= <EmailAddress>|<String>
 <ChatRoom> ::= <String>
@@ -256,16 +257,20 @@ If an item contains spaces, it should be surrounded by ".
 	annotatedassetid|assedid|asset|
 	annotatedlocation|location|
 	annotateduser|user|
+	autoupdateexpiration|
 	bootmode|
 	cpustatusreports|
 	devicefiles|
 	deviceid|
 	diskvolumereports|
+	dockmacaddress|
 	ethernetmacaddress|
+	ethernetmacaddress0|
 	firmwareversion|
 	lastenrollmenttime|
 	lastsync|
 	macaddress|
+	manufacturedate|
 	meid|
 	model|
 	notes|
@@ -520,6 +525,8 @@ If an item contains spaces, it should be surrounded by ".
 	phones|phone|
 	posixaccounts|posix|
 	primaryemail|username|
+	recoveryemail|
+	recoveryphone|
 	relations|relation|
 	ssh|sshkeys|sshpublickeys|
 	suspended|
@@ -775,6 +782,8 @@ Specify a collection of Users by directly specifying them or by specifiying item
 	(note clear|([text_html|text_plain] <String>|(file <FileName> [charset <Charset>])))|
 	(org|ou|orgunitpath <OrgUnitPath>)
 	(password random|<Password>)|
+	(recoveryemail <EmailAddress>)|
+	(recoveryphone <string>)|
 	(suspended <Boolean>)|
 	(<SchemaName>.<FieldName> [multivalued|multivalue|value|multinonempty [type home|other|work|(custom <String>)]] <String>)
 <UserMultiAttributes> ::=
@@ -798,7 +807,7 @@ Specify a collection of Users by directly specifying them or by specifiying item
 	<UserBasicAttribute>|
 	<UserMultiAttribute>

-gam version [check] [simple]
+gam version [check|checkrc|simple|extended] [timeoffset] [location <HostName>]
 gam help

 gam batch <FileName>|- [charset <Charset>]
@@ -812,7 +821,9 @@ Example: gam csv Users.csv gam update user "~primaryEmail" address type work uns
 Each user (~primaryEmail, e.g. foo@bar.com) would have their work address updated

 gam create project [<EmailAddress>] [<ProjectID>]
+gam create project [admin <EmailAddress>] [project <ProjectID>] [parent <String>]
 gam use project [<EmailAddress>] [<ProjectID>]
+gam use project [admin <EmailAddress>] [project <ProjectID>]
 gam update project [<EmailAddress>] [gam|<ProjectID>|(filter <String>)]
 gam delete project [<EmailAddress>] [gam|<ProjectID>|(filter <String>)]
 gam show projects [<EmailAddress>] [all|gam|<ProjectID>|(filter <String>)]
@@ -871,7 +882,7 @@ gam info resoldsubscriptions <CustomerID> [customer_auth_token <String>]
 <ReportsAppList> ::= "<ReportsApp>(,<ReportsApp>)*"

 gam report users|user [todrive] [date <Date>] [fulldatarequired all|<ReportsAppList>]
-	[(user all|<UserItem>)|(orgunit|org|ou <OrgUnitPath>)] [filter|filters <String>] [fields|parameters <String>]
+	[(user <UserItem>)|(orgunit|org|ou <OrgUnitPath>)] [filter|filters <String>] [fields|parameters <String>]
 gam report customers|customer|domain [todrive] [date <Date>] [fulldatarequired all|<ReportsAppList>]
 	[fields|parameters <String>]
 gam report admin|calendar|calendars|drive|docs|doc|groups|group|logins|login|mobile|tokens|token [todrive]
@@ -939,15 +950,17 @@ gam print aliases|nicknames [todrive] [shownoneditable] [nogroups] [nousers] [(q
 gam calendar <CalendarItem> add <CalendarACLRole> ([user] <EmailAddress>)|(group <EmailAddress>)|(domain [<DomainName>])|default [sendnotifications <Boolean>]
 gam calendar <CalendarItem> update <CalendarACLRole> ([user] <EmailAddress>)|(group <EmailAddress>)|(domain [<DomainName>])|default [sendnotifications <Boolean>]
 gam calendar <CalendarItem> del|delete <CalendarACLRole> <EmailAddress>|(domain [<DomainName>])|default
+gam calendar <CalendarItem> del|delete id <CalendarACLRuleID>
 gam calendar <CalendarItem> showacl
+gam calendar <CalendarItem> printacl [todrive]

 <EventNotificationAttribute> ::=
-        notifyattendees|(sendnotifications <Boolean>)|(sendupdates all|enternalonly|none)
+	notifyattendees|(sendnotifications <Boolean>)|(sendupdates all|enternalonly|none)

 The following attributes are equivalent:
-        notifyattendees - sendupdates all
-        sendnotifications false - sendupdates none
-        sendnotifications true - sendupdates all
+	notifyattendees - sendupdates all
+	sendnotifications false - sendupdates none
+	sendnotifications true - sendupdates all

 <EventAttributes> ::=
 	anyonecanaddself|
@@ -973,15 +986,15 @@ The following attributes are equivalent:
 	(visibility default|public|prvate)

 <EventSelectProperty:> ::=
-        (after <Time>)|
-        (before <Time>)|
-        includeeleted|
-        includehidden|
-        (query <QueryCalendar>)|
-        (updatedmin <Time>)
+	(after <Time>)|
+	(before <Time>)|
+	includeeleted|
+	includehidden|
+	(query <QueryCalendar>)|
+	(updatedmin <Time>)

 <EventDisplayProperty> ::=
-        (timezone <TimeZone>)
+	(timezone <TimeZone>)

 gam calendar <CalendarItem> addevent <EventAttributes>+ [<EventNotificationAttribute>]
 gam calendar <CalendarItem> deleteevent id|eventid <EventID> [doit] [<EventNotificationAttribute>]
@@ -1045,7 +1058,7 @@ The listlimit <Number> argument limits the number of recent users, time ranges a
 The start <Date> and end <Date> arguments filter the time ranges.
 Delimiter defaults to comma.

-gam update mobile <MobileID> action <MobileAction>
+gam update mobile <MobileID>|query:<QueryMobile> action <MobileAction> [doit] [if_users|match_users <UserTypeEntity>]
 gam delete mobile <MobileID>
 gam info mobile <MobileID>
 gam print mobile [todrive] [(query <QueryMobile>)|(queries <QueryMobileList>)] [basic|full] [orderby <MobileOrderByFieldName> [ascending|descending]]
@@ -1089,7 +1102,7 @@ gam create resource <ResourceID> <Name> <ResourceAttributes>*
 gam update resource <ResourceID> <ResourceAttributes>*
 gam delete resource <ResourceID>
 gam info resource <ResourceID>
-gam print resources [todrive] [allfields] <ResourceFieldName>*
+gam print resources [todrive] [allfields] <ResourceFieldName>* [query <String>]

 gam create schema|schemas <SchemaName> <SchemaFieldDefinition>+
 gam update schema <SchemaName> <SchemaFieldDefinition>* (deletefield <FieldName>)*
@@ -1170,9 +1183,11 @@ gam print printjobs [todrive] [printer|printerid <PrinterID>]
 gam create vaultexport|export matter <MatterItem> [name <name>] corpus <drive|mail|groups|hangouts_chat>
 	(accounts <EmailAddressList>) | (orgunit|ou <OrgUnitPath>) | (teamdrives <TeamDriveList>) | (rooms <ChatRoomList>) | everyone
 	[scope <all_data|held_data|unprocessed_data>]
-	[terms <terms>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>] [format mbox|pst]
-	[excludedrafts <Boolean>] [driveversiondate <Date>|<Time>] [includeteamdrives] [includerooms]
-	[includeaccessinfo <Boolean>]
+	[terms <terms>] [start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] [timezone <TimeZone>]
+	[excludedrafts <Boolean>] [format mbox|pst] [showconfidentialmodecontent <Boolean>]
+	[includerooms]
+	[driveversiondate <Date>|<Time>] [includeshareddrives|includeteamdrives] [includeaccessinfo <Boolean>]
+	[region any|europe|us]
 gam delete export <MatterItem> <ExportItem>
 gam info export <MatterItem> <ExportItem>
 gam print exports [todrive] [matters <MatterItemList>]
@@ -1283,6 +1298,21 @@ gam <UserTypeEntity> untrash messages query <QueryGmail> [doit] [max_to_untrash|

 gam <UserTypeEntity> show gmailprofile [todrive]

+gam <UserTypeEntity> draftemail [recipient|to <EmailAddress>] [from <EmailAddress>]
+	[subject <String>] [(message <String>)|(file <FileName> [charset <Charset>])]
+gam <UserTypeEntity> importemail [recipient|to <EmailAddress>] [from <EmailAddress>]
+	[subject <String>] [(message <String>)|(file <FileName> [charset <Charset>])]
+	[labels <LabelNameList>] (header <String> <String>)*
+	[deleted] [date <Time>]
+	[nevercheckspam] [processforcalendar]
+gam <UserTypeEntity> insertemail [recipient|to <EmailAddress>] [from <EmailAddress>]
+	[subject <String>] [(message <String>)|(file <FileName> [charset <Charset>])]
+	[labels <LabelNameList>] (header <String> <String>)*
+	[deleted] [date <Time>]
+gam <UserTypeEntity> sendemail [recipient|to <EmailAddress>] [from <EmailAddress>]
+	[subject <String>] [(message <String>)|(file <FileName> [charset <Charset>])]
+	(header <String> <String>)* 
+
 gam <UserTypeEntity> create|add delegate|delegates <EmailAddress>
 gam <UserTypeEntity> delegate|delegates to <EmailAddress>
 gam <UserTypeEntity> delete|del delegate|delegates <EmailAddress>
--- a/src/cros-aue-dates.json
+++ b/src/cros-aue-dates.json
@@ -0,0 +1,256 @@
+{
+  "acer ac700": "2016-08-01T00:00:00.000Z",
+  "acer c7 chromebook": "2017-10-01T00:00:00.000Z",
+  "acer c7 chromebook (c710)": "2017-10-01T00:00:00.000Z",
+  "acer c720 chromebook": "2019-06-01T00:00:00.000Z",
+  "acer c740 chromebook": "2019-06-01T00:00:00.000Z",
+  "acer chromebase": "2020-08-01T00:00:00.000Z",
+  "acer chromebase 24": "2021-06-01T00:00:00.000Z",
+  "acer chromebook 11 (c720, c720p)": "2019-06-01T00:00:00.000Z",
+  "acer chromebook 11 (c732, c732t, c732l, c732lt)": "2023-11-01T00:00:00.000Z",
+  "acer chromebook 11 (c740)": "2020-06-01T00:00:00.000Z",
+  "acer chromebook 11 (c771, c771t)": "2022-11-01T00:00:00.000Z",
+  "acer chromebook 11 (cb3-111, c730, c730e)": "2019-08-01T00:00:00.000Z",
+  "acer chromebook 11 (cb3-131, c735)": "2021-01-01T00:00:00.000Z",
+  "acer chromebook 11 (cb311-8h, cb311-8ht)": "2023-11-01T00:00:00.000Z",
+  "acer chromebook 11 n7 (c731, c731t)": "2022-01-01T00:00:00.000Z",
+  "acer chromebook 13 (cb5-311)": "2019-09-01T00:00:00.000Z",
+  "acer chromebook 13 (cb713-1w)": "2024-06-01T00:00:00.000Z",
+  "acer chromebook 13(cb5-311, c810)": "2019-09-01T00:00:00.000Z",
+  "acer chromebook 14 (cb3-431)": "2021-06-01T00:00:00.000Z",
+  "acer chromebook 14 for work (cp5-471)": "2022-11-01T00:00:00.000Z",
+  "acer chromebook 15 (c910 / cb5-571)": "2020-06-01T00:00:00.000Z",
+  "acer chromebook 15 (cb3-531)": "2020-06-01T00:00:00.000Z",
+  "acer chromebook 15 (cb3-532)": "2021-08-01T00:00:00.000Z",
+  "acer chromebook 15 (cb315-1h,cb315-1ht)": "2023-11-01T00:00:00.000Z",
+  "acer chromebook 15 (cb5-571, c910)": "2020-06-01T00:00:00.000Z",
+  "acer chromebook 15 (cb515-1h,cb515-1ht)": "2023-11-01T00:00:00.000Z",
+  "acer chromebook 311": "2025-06-01T00:00:00.000Z",
+  "acer chromebook 311 (c721, c733, c733u, c733t)": "2025-06-01T00:00:00.000Z",
+  "acer chromebook 315": "2025-06-01T00:00:00.000Z",
+  "acer chromebook 315 (cb315-2h)": "2025-06-01T00:00:00.000Z",
+  "acer chromebook 512 (c851, c851t)": "2025-06-01T00:00:00.000Z",
+  "acer chromebook 514": "2023-11-01T00:00:00.000Z",
+  "acer chromebook 714 (cb714-1w / cb714-1wt)": "2024-06-01T00:00:00.000Z",
+  "acer chromebook 715 (cb715-1w / cb715-1wt)": "2024-06-01T00:00:00.000Z",
+  "acer chromebook r11 (cb5-132t, c738t)": "2021-06-01T00:00:00.000Z",
+  "acer chromebook r13 (cb5-312t)": "2021-09-01T00:00:00.000Z",
+  "acer chromebook spin 11 (cp311-h1, cp311-1hn)": "2023-11-01T00:00:00.000Z",
+  "acer chromebook spin 11 (r751t)": "2023-11-01T00:00:00.000Z",
+  "acer chromebook spin 13 (cp713-1wn)": "2024-06-01T00:00:00.000Z",
+  "acer chromebook spin 15 (cp315)": "2023-11-01T00:00:00.000Z",
+  "acer chromebook spin 311 (r721t)": "2025-06-01T00:00:00.000Z",
+  "acer chromebook spin 511": "2025-06-01T00:00:00.000Z",
+  "acer chromebook spin 511 (r752t, r752tn)": "2025-06-01T00:00:00.000Z",
+  "acer chromebook spin 512 (r851tn)": "2025-06-01T00:00:00.000Z",
+  "acer chromebook tab 10": "2023-08-01T00:00:00.000Z",
+  "acer chromebox": "2019-09-01T00:00:00.000Z",
+  "acer chromebox cxi2": "2020-06-01T00:00:00.000Z",
+  "acer chromebox cxi2 / cxv2": "2020-06-01T00:00:00.000Z",
+  "acer chromebox cxi3": "2024-06-01T00:00:00.000Z",
+  "aopen chromebase commercial": "2020-09-01T00:00:00.000Z",
+  "aopen chromebase mini": "2022-02-01T00:00:00.000Z",
+  "aopen chromebox commercial": "2020-09-01T00:00:00.000Z",
+  "aopen chromebox commercial 2": "2024-06-01T00:00:00.000Z",
+  "aopen chromebox mini": "2022-02-01T00:00:00.000Z",
+  "asi chromebook": "2020-06-01T00:00:00.000Z",
+  "asus chromebit cs10": "2020-11-01T00:00:00.000Z",
+  "asus chromebook c200": "2019-06-01T00:00:00.000Z",
+  "asus chromebook c200ma": "2019-06-01T00:00:00.000Z",
+  "asus chromebook c201pa": "2020-06-01T00:00:00.000Z",
+  "asus chromebook c202sa": "2021-06-01T00:00:00.000Z",
+  "asus chromebook c204": "2025-06-01T00:00:00.000Z",
+  "asus chromebook c213na": "2023-11-01T00:00:00.000Z",
+  "asus chromebook c223": "2023-11-01T00:00:00.000Z",
+  "asus chromebook c300": "2019-08-01T00:00:00.000Z",
+  "asus chromebook c300ma": "2019-08-01T00:00:00.000Z",
+  "asus chromebook c300sa / c301sa": "2021-06-01T00:00:00.000Z",
+  "asus chromebook c403": "2023-11-01T00:00:00.000Z",
+  "asus chromebook c423": "2023-11-01T00:00:00.000Z",
+  "asus chromebook c523": "2023-11-01T00:00:00.000Z",
+  "asus chromebook flip c100pa": "2020-07-01T00:00:00.000Z",
+  "asus chromebook flip c101pa": "2023-08-01T00:00:00.000Z",
+  "asus chromebook flip c213": "2023-11-01T00:00:00.000Z",
+  "asus chromebook flip c214": "2025-06-01T00:00:00.000Z",
+  "asus chromebook flip c302": "2022-11-01T00:00:00.000Z",
+  "asus chromebook flip c434": "2024-06-01T00:00:00.000Z",
+  "asus chromebook tablet ct100": "2023-08-01T00:00:00.000Z",
+  "asus chromebox (cn60)": "2019-09-01T00:00:00.000Z",
+  "asus chromebox 2 (cn62)": "2021-06-01T00:00:00.000Z",
+  "asus chromebox 3": "2024-06-01T00:00:00.000Z",
+  "asus chromebox 3 (cn65)": "2024-06-01T00:00:00.000Z",
+  "asus chromebox cn60": "2019-09-01T00:00:00.000Z",
+  "asus chromebox cn62": "2021-06-01T00:00:00.000Z",
+  "bobicus chromebook 11": "2020-06-01T00:00:00.000Z",
+  "chromebook 11 (c730 / cb3-111)": "2019-08-01T00:00:00.000Z",
+  "chromebook 11 (c735)": "2021-01-01T00:00:00.000Z",
+  "chromebook 15 (cb515 - 1ht / 1h)": "2023-11-01T00:00:00.000Z",
+  "chromebook 311 (c721)": "2025-06-01T00:00:00.000Z",
+  "chromebook pcm-116e": "2020-06-01T00:00:00.000Z",
+  "consumer chromebook": "2020-06-01T00:00:00.000Z",
+  "cr-48": "2015-12-01T00:00:00.000Z",
+  "crambo chromebook": "2020-06-01T00:00:00.000Z",
+  "ctl chromebook j41 / j41t": "2023-11-01T00:00:00.000Z",
+  "ctl chromebook nl7": "2023-11-01T00:00:00.000Z",
+  "ctl chromebook nl7t-360 / nl7tw-360": "2023-11-01T00:00:00.000Z",
+  "ctl chromebook tab tx1": "2023-08-01T00:00:00.000Z",
+  "ctl chromebook tablet tx1 for education": "2023-08-01T00:00:00.000Z",
+  "ctl chromebox cbx1": "2024-06-01T00:00:00.000Z",
+  "ctl j2 / j4 chromebook": "2020-06-01T00:00:00.000Z",
+  "ctl j5 chromebook": "2021-08-01T00:00:00.000Z",
+  "ctl n6 education chromebook": "2020-06-01T00:00:00.000Z",
+  "ctl nl61 chromebook": "2021-08-01T00:00:00.000Z",
+  "dell chromebook 11": "2019-06-01T00:00:00.000Z",
+  "dell chromebook 11 (3120)": "2020-06-01T00:00:00.000Z",
+  "dell chromebook 11 (3180)": "2022-05-01T00:00:00.000Z",
+  "dell chromebook 11 (5190)": "2023-11-01T00:00:00.000Z",
+  "dell chromebook 11 2-in-1 (3189)": "2022-05-01T00:00:00.000Z",
+  "dell chromebook 11 2-in-1 (5190)": "2023-11-01T00:00:00.000Z",
+  "dell chromebook 13 (3380)": "2022-11-01T00:00:00.000Z",
+  "dell chromebook 13 (7310)": "2020-09-01T00:00:00.000Z",
+  "dell chromebook 3100": "2025-06-01T00:00:00.000Z",
+  "dell chromebook 3100 2-in-1": "2025-06-01T00:00:00.000Z",
+  "dell chromebook 3400": "2025-06-01T00:00:00.000Z",
+  "dell chromebox": "2019-09-01T00:00:00.000Z",
+  "dell inspiron chromebook 14 2-in-1 (7486)": "2024-06-01T00:00:00.000Z",
+  "edugear chromebook k": "2020-06-01T00:00:00.000Z",
+  "edugear chromebook m": "2020-06-01T00:00:00.000Z",
+  "edugear chromebook r": "2020-06-01T00:00:00.000Z",
+  "edugear cmt chromebook": "2021-08-01T00:00:00.000Z",
+  "edxis chromebook": "2020-06-01T00:00:00.000Z",
+  "edxis education chromebook": "2020-06-01T00:00:00.000Z",
+  "epik 11.6\" chromebook  elb1101": "2020-06-01T00:00:00.000Z",
+  "google chromebook pixel": "2018-06-01T00:00:00.000Z",
+  "google chromebook pixel (2015)": "2020-06-01T00:00:00.000Z",
+  "google cr-48": "2015-12-01T00:00:00.000Z",
+  "google pixel slate": "2024-06-01T00:00:00.000Z",
+  "google pixelbook": "2024-06-01T00:00:00.000Z",
+  "haier chromebook 11": "2020-06-01T00:00:00.000Z",
+  "haier chromebook 11 c": "2021-08-01T00:00:00.000Z",
+  "haier chromebook 11 g2": "2020-09-01T00:00:00.000Z",
+  "haier chromebook 11e": "2020-06-01T00:00:00.000Z",
+  "hexa chromebook pi": "2020-06-01T00:00:00.000Z",
+  "hisense chromebook 11": "2020-06-01T00:00:00.000Z",
+  "hp chromebook 11 1100-1199 / hp chromebook 11 g1": "2018-10-01T00:00:00.000Z",
+  "hp chromebook 11 2000-2099 / hp chromebook 11 g2": "2019-06-01T00:00:00.000Z",
+  "hp chromebook 11 2100-2199 / hp chromebook 11 g3": "2020-06-01T00:00:00.000Z",
+  "hp chromebook 11 2200-2299 / hp chromebook 11 g4/g4 ee": "2020-06-01T00:00:00.000Z",
+  "hp chromebook 11 g1": "2018-10-01T00:00:00.000Z",
+  "hp chromebook 11 g2": "2019-06-01T00:00:00.000Z",
+  "hp chromebook 11 g3": "2020-06-01T00:00:00.000Z",
+  "hp chromebook 11 g4/g4 ee": "2020-06-01T00:00:00.000Z",
+  "hp chromebook 11 g5": "2021-07-01T00:00:00.000Z",
+  "hp chromebook 11 g5 / hp chromebook 11-vxxx": "2021-07-01T00:00:00.000Z",
+  "hp chromebook 11 g5 ee": "2022-01-01T00:00:00.000Z",
+  "hp chromebook 11 g6 ee": "2023-11-01T00:00:00.000Z",
+  "hp chromebook 11 g7 ee": "2025-06-01T00:00:00.000Z",
+  "hp chromebook 11a g6 ee": "2025-06-01T00:00:00.000Z",
+  "hp chromebook 13 g1": "2022-11-01T00:00:00.000Z",
+  "hp chromebook 14": "2019-06-01T00:00:00.000Z",
+  "hp chromebook 14 / hp chromebook 14 g5": "2023-11-01T00:00:00.000Z",
+  "hp chromebook 14 ak000-099 / hp chromebook 14 g4": "2021-09-01T00:00:00.000Z",
+  "hp chromebook 14 db0000-db0999": "2025-06-01T00:00:00.000Z",
+  "hp chromebook 14 g3": "2019-10-01T00:00:00.000Z",
+  "hp chromebook 14 g4": "2021-09-01T00:00:00.000Z",
+  "hp chromebook 14 g5": "2023-11-01T00:00:00.000Z",
+  "hp chromebook 14 x000-x999 / hp chromebook 14 g3": "2019-10-01T00:00:00.000Z",
+  "hp chromebook 14a g5": "2025-06-01T00:00:00.000Z",
+  "hp chromebook 15 g1": "2024-06-01T00:00:00.000Z",
+  "hp chromebook x2 ": "2024-06-01T00:00:00.000Z",
+  "hp chromebook x360 11 g1 ee": "2023-11-01T00:00:00.000Z",
+  "hp chromebook x360 11 g2 ee": "2025-06-01T00:00:00.000Z",
+  "hp chromebook x360 14": "2024-06-01T00:00:00.000Z",
+  "hp chromebook x360 14 g1": "2024-06-01T00:00:00.000Z",
+  "hp chromebox cb1-(000-099) / hp chromebox g1/ hp chromebox for meetings": "2019-09-01T00:00:00.000Z",
+  "hp chromebox g1": "2019-09-01T00:00:00.000Z",
+  "hp chromebox g2": "2024-06-01T00:00:00.000Z",
+  "hp pavilion chromebook 14": "2018-02-01T00:00:00.000Z",
+  "jp sa couto chromebook": "2020-06-01T00:00:00.000Z",
+  "lava xolo chromebook": "2020-06-01T00:00:00.000Z",
+  "lenovo 100e chromebook": "2023-11-01T00:00:00.000Z",
+  "lenovo 100e chromebook 2nd gen": "2025-06-01T00:00:00.000Z",
+  "lenovo 100e chromebook 2nd gen mtk": "2025-06-01T00:00:00.000Z",
+  "lenovo 100s chromebook": "2020-09-01T00:00:00.000Z",
+  "lenovo 14e chromebook": "2025-06-01T00:00:00.000Z",
+  "lenovo 300e chromebook": "2025-06-01T00:00:00.000Z",
+  "lenovo 300e chromebook 2nd gen": "2025-06-01T00:00:00.000Z",
+  "lenovo 300e chromebook 2nd gen mtk": "2025-06-01T00:00:00.000Z",
+  "lenovo 500e chromebook": "2023-11-01T00:00:00.000Z",
+  "lenovo 500e chromebook 2nd gen": "2025-06-01T00:00:00.000Z",
+  "lenovo chromebook c330": "2022-06-01T00:00:00.000Z",
+  "lenovo chromebook s330": "2022-06-01T00:00:00.000Z",
+  "lenovo flex 11 chromebook": "2022-06-01T00:00:00.000Z",
+  "lenovo ideapad c330 chromebook": "2022-06-01T00:00:00.000Z",
+  "lenovo ideapad s330 chromebook": "2022-06-01T00:00:00.000Z",
+  "lenovo n20 chromebook": "2019-06-01T00:00:00.000Z",
+  "lenovo n21 chromebook": "2020-06-01T00:00:00.000Z",
+  "lenovo n22 chromebook": "2021-06-01T00:00:00.000Z",
+  "lenovo n23 chromebook": "2021-06-01T00:00:00.000Z",
+  "lenovo n23 yoga chromebook": "2022-06-01T00:00:00.000Z",
+  "lenovo n42 chromebook": "2021-06-01T00:00:00.000Z",
+  "lenovo thinkcentre chromebox": "2020-06-01T00:00:00.000Z",
+  "lenovo thinkpad 11e 3rd gen chromebook": "2021-06-01T00:00:00.000Z",
+  "lenovo thinkpad 11e 4th gen chromebook": "2023-11-01T00:00:00.000Z",
+  "lenovo thinkpad 11e chromebook": "2019-06-01T00:00:00.000Z",
+  "lenovo thinkpad 11e chromebook (4th gen)/lenovo thinkpad yoga 11e chromebook (4th gen)": "2023-11-01T00:00:00.000Z",
+  "lenovo thinkpad 13": "2022-11-01T00:00:00.000Z",
+  "lenovo thinkpad x131e chromebook": "2018-06-01T00:00:00.000Z",
+  "lenovo yoga c630 chromebook": "2024-06-01T00:00:00.000Z",
+  "lg chromebase (22cb25s)": "2020-06-01T00:00:00.000Z",
+  "lg chromebase (22cv241)": "2019-06-01T00:00:00.000Z",
+  "lumos education chromebook": "2020-06-01T00:00:00.000Z",
+  "m&a chromebook": "2020-06-01T00:00:00.000Z",
+  "mecer chromebook": "2020-06-01T00:00:00.000Z",
+  "mecer v2 chromebook": "2021-08-01T00:00:00.000Z",
+  "medion chromebook akoya s2013 ": "2020-06-01T00:00:00.000Z",
+  "medion chromebook s2015": "2020-06-01T00:00:00.000Z",
+  "multilaser chromebook m11c": "2021-08-01T00:00:00.000Z",
+  "ncomputing chromebook cx100": "2020-06-01T00:00:00.000Z",
+  "ncomputing chromebook cx110": "2020-06-01T00:00:00.000Z",
+  "nexian chromebook 11.6\"": "2020-06-01T00:00:00.000Z",
+  "pcmerge chromebook al116": "2023-11-01T00:00:00.000Z",
+  "pcmerge chromebookpcm-116e/pcm-116eb": "2020-06-01T00:00:00.000Z",
+  "pcmerge chromebookpcm-116t-432b": "2021-08-01T00:00:00.000Z",
+  "poin2 chromebook 11": "2020-06-01T00:00:00.000Z",
+  "poin2 chromebook 11c": "2022-11-01T00:00:00.000Z",
+  "poin2 chromebook 14": "2022-03-01T00:00:00.000Z",
+  "positivo chromebook c216b": "2021-08-01T00:00:00.000Z",
+  "positivo chromebook ch1190": "2020-06-01T00:00:00.000Z",
+  "promethean chromebox": "2024-06-01T00:00:00.000Z",
+  "prowise 11.6\" entry line chromebook": "2020-06-01T00:00:00.000Z",
+  "prowise chromebook eduline": "2023-11-01T00:00:00.000Z",
+  "prowise chromebook entryline": "2020-06-01T00:00:00.000Z",
+  "prowise chromebook proline": "2021-08-01T00:00:00.000Z",
+  "prowise proline chromebook": "2021-08-01T00:00:00.000Z",
+  "rgs education chromebook": "2020-06-01T00:00:00.000Z",
+  "samsung chromebook": "2018-07-01T00:00:00.000Z",
+  "samsung chromebook - xe303": "2018-07-01T00:00:00.000Z",
+  "samsung chromebook 2 11": "2019-06-01T00:00:00.000Z",
+  "samsung chromebook 2 11 - xe500c12": "2020-06-01T00:00:00.000Z",
+  "samsung chromebook 2 13": "2019-06-01T00:00:00.000Z",
+  "samsung chromebook 3": "2021-06-01T00:00:00.000Z",
+  "samsung chromebook plus": "2023-08-01T00:00:00.000Z",
+  "samsung chromebook plus (lte)": "2024-06-01T00:00:00.000Z",
+  "samsung chromebook plus (v2)": "2024-06-01T00:00:00.000Z",
+  "samsung chromebook pro": "2022-11-01T00:00:00.000Z",
+  "samsung chromebook series 5": "2016-06-01T00:00:00.000Z",
+  "samsung chromebook series 5 550": "2017-05-01T00:00:00.000Z",
+  "samsung chromebox series 3": "2018-03-01T00:00:00.000Z",
+  "sector 5 e1 rugged chromebook": "2020-06-01T00:00:00.000Z",
+  "sector 5 e3 chromebook": "2023-11-01T00:00:00.000Z",
+  "senkatel c1101 chromebook": "2020-06-01T00:00:00.000Z",
+  "thinkpad 11e chromebook 3rd gen (yoga/clamshell)": "2021-06-01T00:00:00.000Z",
+  "thinkpad 13 chromebook": "2022-11-01T00:00:00.000Z",
+  "toshiba chromebook": "2019-06-01T00:00:00.000Z",
+  "toshiba chromebook 2": "2020-06-01T00:00:00.000Z",
+  "toshiba chromebook 2 (2015 edition)": "2020-09-01T00:00:00.000Z",
+  "true idc chromebook": "2020-06-01T00:00:00.000Z",
+  "true idc chromebook 11": "2020-06-01T00:00:00.000Z",
+  "videonet chromebook": "2020-06-01T00:00:00.000Z",
+  "videonet chromebook bl10": "2020-06-01T00:00:00.000Z",
+  "viewsonic nmp660 chromebox": "2024-06-01T00:00:00.000Z",
+  "viglen chromebook 11": "2020-06-01T00:00:00.000Z",
+  "viglen chromebook 11c": "2023-11-01T00:00:00.000Z",
+  "viglen chromebook 360": "2021-08-01T00:00:00.000Z",
+  "xolo chromebook": "2020-06-01T00:00:00.000Z"
+}
--- a/src/gam.py
+++ b/src/gam.py
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -1,8 +1,7 @@
 python-dateutil
-dnspython
-google-api-python-client
+google-api-python-client>=1.7.10
 google-auth
 google-auth-httplib2
-google-auth-oauthlib
+google-auth-oauthlib==0.4.0
 httplib2>=0.13.0
 passlib
--- a/src/tools/parse-aue.py
+++ b/src/tools/parse-aue.py
@@ -4,6 +4,8 @@ from xml.etree import ElementTree as ET
 import requests
 from html.parser import HTMLParser
 import string
+import sys
+import json
 import dateutil.parser

 class MyHTMLParser(HTMLParser):
@@ -27,18 +29,18 @@ class MyHTMLParser(HTMLParser):
                    fullname = '%s %s' % (oem, model)
                    fullname = fullname.lower()
                date = dateutil.parser.parse(data).replace(day=1).strftime('%Y-%m-%dT00:00:00.000Z')
-                output_rows.append("  '%s': '%s'," % (fullname, date))
+                output_rows[fullname] = date
                if fullname in exceptions:
                    for value in exceptions[fullname]:
-                        output_rows.append("  '%s': '%s'," % (value, date))
+                        output_rows[value] = date
                data_is_date = False
            else:
-                model = ''.join(filter(lambda x: x in printable, data)).replace('"', '\\"')
+                model = ''.join(filter(lambda x: x in printable, data))
                data_is_date = True
            next_data_is_td = False

 global oem, next_data_is_oem, next_data_is_td, data_is_date, model, printable, exceptions, output_rows
-output_rows = []
+output_rows = {}
 printable = set(string.printable)
 exceptions = {
        # 'AUE OEM MODEL': ['API MODEL 1', ...]
@@ -95,10 +97,6 @@ next_data_is_oem = False
 next_data_is_td = False
 data_is_date = False
 auepage = requests.get('https://support.google.com/chrome/a/answer/6220366?hl=en')
-print('CROS_AUE_DATES = {')
 parser = MyHTMLParser()
 parser.feed(auepage.content.decode('utf-8'))
-output_rows.sort(key=str.lower)
-for row in output_rows:
-    print(row)
-print('}')
+print(json.dumps(output_rows, indent=2, sort_keys=True))
--- a/src/travis/linux-x86_64-before-install.sh
+++ b/src/travis/linux-x86_64-before-install.sh
@@ -10,7 +10,7 @@ else
  echo "RUNNING: apt update..."
  sudo apt-get -qq --yes update > /dev/null
  echo "RUNNING: apt dist-upgrade..."
-  sudo apt-get -qq --yes dist-upgrade > /dev/null
+#  sudo apt-get -qq --yes dist-upgrade > /dev/null
  echo "Installing build tools..."
  sudo apt-get -qq --yes install build-essential

@@ -47,28 +47,38 @@ else
  cd ~/pybuild
  # Compile latest Python
  if [ ! -d Python-$BUILD_PYTHON_VERSION ]; then
-    wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/Python-$BUILD_PYTHON_VERSION.tar.xz
+    echo "Downloading Python $BUILD_PYTHON_VERSION..."
+    curl -O https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/Python-$BUILD_PYTHON_VERSION.tar.xz
    echo "Extracting Python..."
    tar xf Python-$BUILD_PYTHON_VERSION.tar.xz
  fi
  cd Python-$BUILD_PYTHON_VERSION
+  #if [[ "$dist" == "bionic" ]]; then
+  #  echo "running bionic make clean"
+  #  make clean
+   # rm Makefile
+  #fi
  echo "Compiling Python $BUILD_PYTHON_VERSION..."
  safe_flags="--with-openssl=$mypath/ssl --enable-shared --prefix=$mypath/python --with-ensurepip=upgrade"
  unsafe_flags="--enable-optimizations --with-lto"
+  
  if [ ! -e Makefile ]; then
+    echo "running configure with safe and unsafe"
    ./configure $safe_flags $unsafe_flags > /dev/null
  fi
-  make -j$cpucount -s
+  timeout 1800 make -j$cpucount -s
  RESULT=$?
  echo "First make exited with $RESULT"
  if [ $RESULT != 0 ]; then
-    echo "Trying Python compile again without unsafe flags..."
-    make clean
-    ./configure $safe_flags > /dev/null
-    make -j$cpucount -s
+    #echo "Trying Python compile again without unsafe flags..."
+    #make clean
+    #./configure $safe_flags > /dev/null
+    #make -j$cpucount -s
+    echo "Sticking with safe Python for now..."
+  else
+    echo "Installing optimized Python..."
+    make install > /dev/null
  fi
-  echo "Installing Python..."
-  make install > /dev/null
  cd ~

  export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib
@@ -100,11 +110,10 @@ else
    fi
    $pip install git+https://github.com/JonathonReinhart/staticx.git@master
  fi
-  $pip install pyinstaller
  cd $whereibelong
 fi

 echo "Upgrading pip packages..."
-$pip freeze > upgrades.txt
-$pip install --upgrade -r upgrades.txt
-$pip install -r src/requirements.txt
+$pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 $pip install -U
+$pip install --upgrade -r src/requirements.txt
+$pip install --upgrade pyinstaller
--- a/src/travis/linux-x86_64-install.sh
+++ b/src/travis/linux-x86_64-install.sh
@@ -3,7 +3,7 @@ if [ "$VMTYPE" == "test" ]; then
  export gam="$python gam.py"
  export gampath=$(readlink -e .)
 else
-  $python -OO -m PyInstaller --clean --debug -F --distpath=gam $GAMOS-gam.spec
+  $python -OO -m PyInstaller --clean --noupx --strip -F --distpath=gam $GAMOS-gam.spec
  export gam="gam/gam"
  export gampath=$(readlink -e gam)
  export GAMVERSION=`$gam version simple`
--- a/src/travis/osx-x86_64-before-install.sh
+++ b/src/travis/osx-x86_64-before-install.sh
@@ -1,54 +1,63 @@
 mypath=$HOME
 whereibelong=$(pwd)
-echo "Brew installing xz..."
-brew install xz > /dev/null
+#echo "Brew installing xz..."
+#brew install xz > /dev/null

 cd ~/pybuild
-# Compile latest OpenSSL
-if [ ! -d openssl-$BUILD_OPENSSL_VERSION ]; then
-  wget --quiet https://www.openssl.org/source/openssl-$BUILD_OPENSSL_VERSION.tar.gz
-  echo "Extracting OpenSSL..."
-  tar xf openssl-$BUILD_OPENSSL_VERSION.tar.gz
+
+if [ ! -f python-$BUILD_PYTHON_VERSION-macosx10.9.pkg ]; then
+  wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/python-$BUILD_PYTHON_VERSION-macosx10.9.pkg
 fi
-cd openssl-$BUILD_OPENSSL_VERSION
-echo "Compiling OpenSSL $BUILD_OPENSSL_VERSION..."
-./config shared --prefix=$mypath/ssl
-echo "Running make for OpenSSL..."
-make -j$cpucount -s
-echo "Running make install for OpenSSL..."
-make install > /dev/null
-export LD_LIBRARY_PATH=~/ssl/lib
-cd ~/pybuild
+sudo installer -pkg python-$BUILD_PYTHON_VERSION-macosx10.9.pkg -target /
+export python=python3
+export pip=pip3
+
+# Compile latest OpenSSL
+#if [ ! -d openssl-$BUILD_OPENSSL_VERSION ]; then
+#  wget --quiet https://www.openssl.org/source/openssl-$BUILD_OPENSSL_VERSION.tar.gz
+#  echo "Extracting OpenSSL..."
+#  tar xf openssl-$BUILD_OPENSSL_VERSION.tar.gz
+#fi
+#cd openssl-$BUILD_OPENSSL_VERSION
+#echo "Compiling OpenSSL $BUILD_OPENSSL_VERSION..."
+#./config shared --prefix=$mypath/ssl
+#echo "Running make for OpenSSL..."
+#make -j$cpucount -s
+#echo "Running make install for OpenSSL..."
+#make install > /dev/null
+#export LD_LIBRARY_PATH=~/ssl/lib
+#cd ~/pybuild

 # Compile latest Python
-if [ ! -d Python-$BUILD_PYTHON_VERSION ]; then
-  wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/Python-$BUILD_PYTHON_VERSION.tar.xz
-  echo "Extracting Python..."
-  tar xf Python-$BUILD_PYTHON_VERSION.tar.xz
-fi
-cd Python-$BUILD_PYTHON_VERSION
-echo "Compiling Python $BUILD_PYTHON_VERSION..."
-safe_flags="--with-openssl=$mypath/ssl --enable-shared --prefix=$mypath/python --with-ensurepip=upgrade"
-unsafe_flags="--enable-optimizations --with-lto"
-if [ ! -e Makefile ]; then
-  ./configure $safe_flags $unsafe_flags > /dev/null
-fi
-make -j$cpucount -s
-RESULT=$?
-echo "Make Python exited with $RESULT"
-if [ $RESULT != 0 ]; then
-  echo "Trying Python make again without unsafe flags..."
-  make clean
-  ./configure $safe_flags > /dev/null
-  make -j$cpucount -s
-fi
-echo "Installing Python..."
-make install > /dev/null
-cd ~
+#if [ ! -d Python-$BUILD_PYTHON_VERSION ]; then
+#  wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/Python-$BUILD_PYTHON_VERSION.tar.xz
+#  echo "Extracting Python..."
+#  tar xf Python-$BUILD_PYTHON_VERSION.tar.xz
+#fi
+#cd Python-$BUILD_PYTHON_VERSION
+#echo "Compiling Python $BUILD_PYTHON_VERSION..."
+#safe_flags="--with-openssl=$mypath/ssl --enable-shared --prefix=$mypath/python --with-ensurepip=upgrade"
+#unsafe_flags="--enable-optimizations --with-lto"
+#if [ ! -e Makefile ]; then
+#  ./configure $safe_flags $unsafe_flags > /dev/null
+#fi
+#make -j$cpucount -s
+#RESULT=$?
+#echo "Make Python exited with $RESULT"
+#if [ $RESULT != 0 ]; then
+#  echo "Trying Python make again without unsafe flags..."
+#  make clean
+#  ./configure $safe_flags > /dev/null
+#  make -j$cpucount -s
+#fi
+#echo "Installing Python..."
+#make install > /dev/null
+#cd ~
+
+#export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib
+#python=~/python/bin/python3
+#pip=~/python/bin/pip3

-export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib
-python=~/python/bin/python3
-pip=~/python/bin/pip3

 $python -V

@@ -56,7 +65,6 @@ cd $whereibelong

 export PATH=/usr/local/opt/python/libexec/bin:$PATH
 $pip install --upgrade pip
-$pip freeze > upgrades.txt
-$pip install --upgrade -r upgrades.txt
-$pip install -r src/requirements.txt
-$pip install pyinstaller
+$pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 $pip install -U
+$pip install --upgrade -r src/requirements.txt
+$pip install --upgrade pyinstaller
--- a/src/travis/osx-x86_64-install.sh
+++ b/src/travis/osx-x86_64-install.sh
@@ -1,5 +1,5 @@
 cd src
-$python -OO -m PyInstaller --clean --debug -F --distpath=gam $GAMOS-gam.spec
+$python -OO -m PyInstaller --clean --noupx --strip -F --distpath=gam $GAMOS-gam.spec
 export gam="gam/gam"
 export gampath=gam
 $gam version extended
--- a/src/travis/windows-x86-before-install.sh
+++ b/src/travis/windows-x86-before-install.sh
@@ -2,26 +2,43 @@ echo "Installing Net-Framework-Core..."
 export mypath=$(pwd)
 until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done
 cd ~/pybuild
-export exefile=Win32OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe
-if [ ! -e $exefile ]; then
-  echo "Downloading $exefile..."
-  wget --quiet https://slproweb.com/download/$exefile
-fi
-echo "Installing $exefile..."
-powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl"
+#export exefile=Win32OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe
+#if [ ! -e $exefile ]; then
+#  echo "Downloading $exefile..."
+#  wget --quiet https://slproweb.com/download/$exefile
+#fi
+#echo "Installing $exefile..."
+#powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl"
 cinst -y --forcex86 python3
 until cinst -y wixtoolset; do echo "trying again..."; done
-echo "OpenSSL dlls..."
-ls -alRF /c/ssl
-echo "c drive"
-ls -al /c/
-echo "Python dlls..."
-ls -al /c/Python37/DLLs
-until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done
+#echo "OpenSSL dlls..."
+#ls -alRF /c/ssl
+#echo "c drive"
+#ls -al /c/
+#echo "Python dlls..."
+#ls -al /c/Python37/DLLs
+#until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done
 export PATH=$PATH:/c/Python37/scripts
 cd $mypath
 pip install --upgrade pip
-pip freeze > upgrades.txt
-pip install --upgrade -r upgrades.txt
-pip install -r src/requirements.txt
-pip install pyinstaller
+pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 pip install -U
+pip install --upgrade -r src/requirements.txt
+
+#pip install --upgrade pyinstaller
+# Install PyInstaller from source and build bootloader
+# to try and avoid getting flagged as malware since
+# lots of malware uses PyInstaller default bootloader
+# https://stackoverflow.com/questions/53584395/how-to-recompile-the-bootloader-of-pyinstaller
+echo "Downloading PyInstaller..."
+wget --quiet https://github.com/pyinstaller/pyinstaller/releases/download/v$PYINSTALLER_VERSION/PyInstaller-$PYINSTALLER_VERSION.tar.gz
+tar xf PyInstaller-$PYINSTALLER_VERSION.tar.gz
+cd PyInstaller-$PYINSTALLER_VERSION/bootloader
+echo "bootloader before:"
+md5sum ../PyInstaller/bootloader/Windows-32bit/*
+/c/python37/python ./waf all --target-arch=32bit
+echo "bootloader after:"
+md5sum ../PyInstaller/bootloader/Windows-32bit/*
+echo "PATH: $PATH"
+cd ..
+/c/python37/python setup.py install
+cd $mypath
--- a/src/travis/windows-x86-install.sh
+++ b/src/travis/windows-x86-install.sh
@@ -1,5 +1,5 @@
 cd src
-pyinstaller --clean -F --distpath=gam $GAMOS-gam.spec
+pyinstaller --clean --noupx -F --distpath=gam $GAMOS-gam.spec
 export gam="gam/gam"
 export gampath=$(readlink -e gam)
 $gam version extended
--- a/src/travis/windows-x86_64-before-install.sh
+++ b/src/travis/windows-x86_64-before-install.sh
@@ -2,26 +2,42 @@ echo "Installing Net-Framework-Core..."
 export mypath=$(pwd)
 until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done
 cd ~/pybuild
-export exefile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe
-if [ ! -e $exefile ]; then
-  echo "Downloading $exefile..."
-  wget --quiet https://slproweb.com/download/$exefile
-fi
-echo "Installing $exefile..."
-powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl"
+#export exefile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe
+#if [ ! -e $exefile ]; then
+#  echo "Downloading $exefile..."
+#  wget --quiet https://slproweb.com/download/$exefile
+#fi
+#echo "Installing $exefile..."
+#powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl"
 cinst -y python3
 until cinst -y wixtoolset; do echo "trying again..."; done
-echo "OpenSSL dlls..."
-ls -alRF /c/ssl
-echo "c drive"
-ls -al /c
-echo "Python dlls..."
-ls -al /c/Python37/DLLs
-until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done
+#echo "OpenSSL dlls..."
+#ls -alRF /c/ssl
+#echo "c drive"
+#ls -al /c
+#echo "Python dlls..."
+#ls -al /c/Python37/DLLs
+#until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done
 export PATH=$PATH:/c/Python37/scripts
 cd $mypath
 pip install --upgrade pip
-pip freeze > upgrades.txt
-pip install --upgrade -r upgrades.txt
-pip install -r src/requirements.txt
-pip install pyinstaller
+pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 pip install -U
+pip install --upgrade -r src/requirements.txt
+#pip install --upgrade pyinstaller
+# Install PyInstaller from source and build bootloader
+# to try and avoid getting flagged as malware since
+# lots of malware uses PyInstaller default bootloader
+# https://stackoverflow.com/questions/53584395/how-to-recompile-the-bootloader-of-pyinstaller
+echo "Downloading PyInstaller..."
+wget --quiet https://github.com/pyinstaller/pyinstaller/releases/download/v$PYINSTALLER_VERSION/PyInstaller-$PYINSTALLER_VERSION.tar.gz
+tar xf PyInstaller-$PYINSTALLER_VERSION.tar.gz
+cd PyInstaller-$PYINSTALLER_VERSION/bootloader
+echo "bootloader before:"
+md5sum ../PyInstaller/bootloader/Windows-64bit/*
+/c/python37/python ./waf all --target-arch=64bit
+echo "bootloader after:"
+md5sum ../PyInstaller/bootloader/Windows-64bit/*
+echo "PATH: $PATH"
+cd ..
+/c/python37/python setup.py install
+cd $mypath
--- a/src/travis/windows-x86_64-install.sh
+++ b/src/travis/windows-x86_64-install.sh
@@ -1,5 +1,5 @@
 cd src
-pyinstaller --clean -F --distpath=gam $GAMOS-gam.spec
+pyinstaller --clean --noupx -F --distpath=gam $GAMOS-gam.spec
 export gam="gam/gam"
 export gampath=$(readlink -e gam)
 $gam version
--- a/src/utils.py
+++ b/src/utils.py
@@ -1,3 +1,4 @@
+import datetime
 import re
 import sys
 from html.entities import name2codepoint
@@ -22,8 +23,7 @@ class _DeHTMLParser(HTMLParser):
    self.__text.append(data)

  def handle_charref(self, name):
-    self.__text.append(
-        chr(int(name[1:], 16)) if name.startswith('x') else chr(int(name)))
+    self.__text.append(chr(int(name[1:], 16)) if name.startswith('x') else chr(int(name)))

  def handle_entityref(self, name):
    cp = name2codepoint.get(name)
@@ -73,6 +73,16 @@ def indentMultiLineText(message, n=0):
  return message.replace('\n', '\n{0}'.format(' ' * n)).rstrip()


+def formatTimestampYMD(timestamp):
+  return datetime.datetime.fromtimestamp(int(timestamp)/1000).strftime('%Y-%m-%d')
+
+def formatTimestampYMDHMS(timestamp):
+  return datetime.datetime.fromtimestamp(int(timestamp)/1000).strftime('%Y-%m-%d %H:%M:%S')
+
+def formatTimestampYMDHMSF(timestamp):
+  return str(datetime.datetime.fromtimestamp(int(timestamp)/1000))
+
+
 def formatFileSize(fileSize):
  if fileSize == 0:
    return '0kb'
--- a/src/var.py
+++ b/src/var.py
@@ -6,21 +6,21 @@ import platform
 import re

 gam_author = 'Jay Lee <jay0lee@gmail.com>'
-gam_version = '4.87'
+gam_version = '4.94'
 gam_license = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'

 GAM_URL = 'https://git.io/gam'
 GAM_INFO = 'GAM {0} - {1} / {2} / Python {3}.{4}.{5} {6} / {7} {8} /'.format(gam_version, GAM_URL,
-                                                                              gam_author,
-                                                                              sys.version_info[0], sys.version_info[1],
-                                                                              sys.version_info[2], sys.version_info[3],
-                                                                              platform.platform(), platform.machine())
+                                                                             gam_author,
+                                                                             sys.version_info[0], sys.version_info[1],
+                                                                             sys.version_info[2], sys.version_info[3],
+                                                                             platform.platform(), platform.machine())

 GAM_RELEASES = 'https://github.com/jay0lee/GAM/releases'
 GAM_WIKI = 'https://github.com/jay0lee/GAM/wiki'
 GAM_ALL_RELEASES = 'https://api.github.com/repos/jay0lee/GAM/releases'
 GAM_LATEST_RELEASE = GAM_ALL_RELEASES+'/latest'
-GAM_PROJECT_APIS = 'https://raw.githubusercontent.com/jay0lee/GAM/master/src/project-apis.txt'
+GAM_PROJECT_FILEPATH = 'https://raw.githubusercontent.com/jay0lee/GAM/master/'

 true_values = ['on', 'yes', 'enabled', 'true', '1']
 false_values = ['off', 'no', 'disabled', 'false', '0']
@@ -39,6 +39,8 @@ FN_LAST_UPDATE_CHECK_TXT = 'lastupdatecheck.txt'
 MY_CUSTOMER = 'my_customer'
 # See https://support.google.com/drive/answer/37603
 MAX_GOOGLE_SHEET_CELLS = 5000000
+MAX_LOCAL_GOOGLE_TIME_OFFSET = 30
+
 SKUS = {
  '1010010001': {
    'product': '101001', 'aliases': ['identity', 'cloudidentity'], 'displayName': 'Cloud Identity'},
@@ -154,16 +156,18 @@ API_VER_MAPPING = {
  'vault': 'v1',
  }

+USERINFO_EMAIL_SCOPE = 'https://www.googleapis.com/auth/userinfo.email'
+
 API_SCOPE_MAPPING = {
  'alertcenter': ['https://www.googleapis.com/auth/apps.alerts',],
  'appsactivity': ['https://www.googleapis.com/auth/activity',
-                    'https://www.googleapis.com/auth/drive',],
+                   'https://www.googleapis.com/auth/drive',],
  'calendar': ['https://www.googleapis.com/auth/calendar',],
  'drive': ['https://www.googleapis.com/auth/drive',],
  'drive3': ['https://www.googleapis.com/auth/drive',],
  'gmail': ['https://mail.google.com/',
-             'https://www.googleapis.com/auth/gmail.settings.basic',
-             'https://www.googleapis.com/auth/gmail.settings.sharing',],
+            'https://www.googleapis.com/auth/gmail.settings.basic',
+            'https://www.googleapis.com/auth/gmail.settings.sharing',],
  'sheets': ['https://www.googleapis.com/auth/spreadsheets',],
 }

@@ -403,7 +407,7 @@ DOCUMENT_FORMATS_MAP = {
  'mht': [{'mime': 'message/rfc822', 'ext': 'mht'}],
  'odp': [{'mime': 'application/vnd.oasis.opendocument.presentation', 'ext': '.odp'}],
  'ods': [{'mime': 'application/x-vnd.oasis.opendocument.spreadsheet', 'ext': '.ods'},
-           {'mime': 'application/vnd.oasis.opendocument.spreadsheet', 'ext': '.ods'}],
+          {'mime': 'application/vnd.oasis.opendocument.spreadsheet', 'ext': '.ods'}],
  'odt': [{'mime': 'application/vnd.oasis.opendocument.text', 'ext': '.odt'}],
  'pdf': [{'mime': 'application/pdf', 'ext': '.pdf'}],
  'png': [{'mime': 'image/png', 'ext': '.png'}],
@@ -414,7 +418,7 @@ DOCUMENT_FORMATS_MAP = {
  'rtf': [{'mime': 'application/rtf', 'ext': '.rtf'}],
  'svg': [{'mime': 'image/svg+xml', 'ext': '.svg'}],
  'tsv': [{'mime': 'text/tab-separated-values', 'ext': '.tsv'},
-           {'mime': 'text/tsv', 'ext': '.tsv'}],
+          {'mime': 'text/tsv', 'ext': '.tsv'}],
  'txt': [{'mime': 'text/plain', 'ext': '.txt'}],
  'xls': [{'mime': 'application/vnd.ms-excel', 'ext': '.xls'}],
  'xlt': [{'mime': 'application/vnd.ms-excel', 'ext': '.xlt'}],
@@ -425,9 +429,21 @@ DOCUMENT_FORMATS_MAP = {
  'microsoft': _MICROSOFT_FORMATS_LIST,
  'micro$oft': _MICROSOFT_FORMATS_LIST,
  'openoffice': [{'mime': 'application/vnd.oasis.opendocument.presentation', 'ext': '.odp'},
-                  {'mime': 'application/x-vnd.oasis.opendocument.spreadsheet', 'ext': '.ods'},
-                  {'mime': 'application/vnd.oasis.opendocument.spreadsheet', 'ext': '.ods'},
-                  {'mime': 'application/vnd.oasis.opendocument.text', 'ext': '.odt'}],
+                 {'mime': 'application/x-vnd.oasis.opendocument.spreadsheet', 'ext': '.ods'},
+                 {'mime': 'application/vnd.oasis.opendocument.spreadsheet', 'ext': '.ods'},
+                 {'mime': 'application/vnd.oasis.opendocument.text', 'ext': '.odt'}],
+  }
+
+DNS_ERROR_CODES_MAP = {
+  1: 'DNS Query Format Error',
+  2: 'Server failed to complete the DNS request',
+  3: 'Domain name does not exist',
+  4: 'Function not implemented',
+  5: 'The server refused to answer for the query',
+  6: 'Name that should not exist, does exist',
+  7: 'RRset that should not exist, does exist',
+  8: 'Server not authoritative for the zone',
+  9: 'Name not in zone'
  }

 EMAILSETTINGS_OLD_NEW_OLD_FORWARD_ACTION_MAP = {
@@ -522,17 +538,21 @@ CROS_ARGUMENT_TO_PROPERTY_MAP = {
  'annotateduser': ['annotatedUser',],
  'asset': ['annotatedAssetId',],
  'assetid': ['annotatedAssetId',],
+  'autoupdateexpiration': ['autoUpdateExpiration',],
  'bootmode': ['bootMode',],
  'cpustatusreports': ['cpuStatusReports',],
  'devicefiles': ['deviceFiles',],
  'deviceid': ['deviceId',],
+  'dockmacaddress': ['dockMacAddress',],
  'diskvolumereports': ['diskVolumeReports',],
  'ethernetmacaddress': ['ethernetMacAddress',],
+  'ethernetmacaddress0': ['ethernetMacAddress0',],
  'firmwareversion': ['firmwareVersion',],
  'lastenrollmenttime': ['lastEnrollmentTime',],
  'lastsync': ['lastSync',],
  'location': ['annotatedLocation',],
  'macaddress': ['macAddress',],
+  'manufacturedate': ['manufactureDate',],
  'meid': ['meid',],
  'model': ['model',],
  'notes': ['notes',],
@@ -574,12 +594,16 @@ CROS_SCALAR_PROPERTY_PRINT_ORDER = [
  'osVersion',
  'bootMode',
  'meid',
+  'dockMacAddress',
  'ethernetMacAddress',
+  'ethernetMacAddress0',
  'macAddress',
  'systemRamTotal',
  'lastEnrollmentTime',
  'orderNumber',
+  'manufactureDate',
  'supportEndDate',
+  'autoUpdateExpiration',
  'guessedAUEDate',
  'guessedAUEModel',
  'tpmVersionInfo',
@@ -600,288 +624,76 @@ CROS_END_ARGUMENTS = ['end', 'enddate']
 CROS_TPM_VULN_VERSIONS = ['41f', '420', '628', '8520',]
 CROS_TPM_FIXED_VERSIONS = ['422', '62b', '8521',]

-# parsed from https://support.google.com/chrome/a/answer/6220366?hl=en
-# using src/tools/parse-aue.py
-CROS_AUE_DATES = {
-  'acer ac700': '2016-08-01T00:00:00.000Z',
-  'acer c7 chromebook (c710)': '2017-10-01T00:00:00.000Z',
-  'acer c7 chromebook': '2017-10-01T00:00:00.000Z',
-  'acer c720 chromebook': '2019-06-01T00:00:00.000Z',
-  'acer c740 chromebook': '2019-06-01T00:00:00.000Z',
-  'acer chromebase 24': '2021-06-01T00:00:00.000Z',
-  'acer chromebase': '2020-08-01T00:00:00.000Z',
-  'acer chromebook 11 (c720, c720p)': '2019-06-01T00:00:00.000Z',
-  'acer chromebook 11 (c732, c732t, c732l, c732lt)': '2023-11-01T00:00:00.000Z',
-  'acer chromebook 11 (c740)': '2020-06-01T00:00:00.000Z',
-  'acer chromebook 11 (c771, c771t)': '2022-11-01T00:00:00.000Z',
-  'acer chromebook 11 (cb3-111, c730, c730e)': '2019-08-01T00:00:00.000Z',
-  'acer chromebook 11 (cb3-131, c735)': '2021-01-01T00:00:00.000Z',
-  'acer chromebook 11 (cb311-8h, cb311-8ht)': '2023-11-01T00:00:00.000Z',
-  'acer chromebook 11 n7 (c731, c731t)': '2022-01-01T00:00:00.000Z',
-  'acer chromebook 13 (cb5-311)': '2019-09-01T00:00:00.000Z',
-  'acer chromebook 13 (cb713-1w)': '2024-06-01T00:00:00.000Z',
-  'acer chromebook 13(cb5-311, c810)': '2019-09-01T00:00:00.000Z',
-  'acer chromebook 14 (cb3-431)': '2021-06-01T00:00:00.000Z',
-  'acer chromebook 14 for work (cp5-471)': '2022-11-01T00:00:00.000Z',
-  'acer chromebook 15 (c910 / cb5-571)': '2020-06-01T00:00:00.000Z',
-  'acer chromebook 15 (cb3-531)': '2020-06-01T00:00:00.000Z',
-  'acer chromebook 15 (cb3-532)': '2021-08-01T00:00:00.000Z',
-  'acer chromebook 15 (cb315-1h,cb315-1ht)': '2023-11-01T00:00:00.000Z',
-  'acer chromebook 15 (cb5-571, c910)': '2020-06-01T00:00:00.000Z',
-  'acer chromebook 15 (cb515-1h,cb515-1ht)': '2023-11-01T00:00:00.000Z',
-  'acer chromebook 311 (c721, c733, c733u, c733t)': '2025-06-01T00:00:00.000Z',
-  'acer chromebook 311': '2025-06-01T00:00:00.000Z',
-  'acer chromebook 311': '2025-06-01T00:00:00.000Z',
-  'acer chromebook 315 (cb315-2h)': '2025-06-01T00:00:00.000Z',
-  'acer chromebook 315': '2025-06-01T00:00:00.000Z',
-  'acer chromebook 512 (c851, c851t)': '2025-06-01T00:00:00.000Z',
-  'acer chromebook 514': '2023-11-01T00:00:00.000Z',
-  'acer chromebook 714 (cb714-1w / cb714-1wt)': '2024-06-01T00:00:00.000Z',
-  'acer chromebook 715 (cb715-1w / cb715-1wt)': '2024-06-01T00:00:00.000Z',
-  'acer chromebook r11 (cb5-132t, c738t)': '2021-06-01T00:00:00.000Z',
-  'acer chromebook r13 (cb5-312t)': '2021-09-01T00:00:00.000Z',
-  'acer chromebook spin 11 (cp311-h1, cp311-1hn)': '2023-11-01T00:00:00.000Z',
-  'acer chromebook spin 11 (r751t)': '2023-11-01T00:00:00.000Z',
-  'acer chromebook spin 13 (cp713-1wn)': '2024-06-01T00:00:00.000Z',
-  'acer chromebook spin 15 (cp315)': '2023-11-01T00:00:00.000Z',
-  'acer chromebook spin 311 (r721t)': '2025-06-01T00:00:00.000Z',
-  'acer chromebook spin 511 (r752t, r752tn)': '2025-06-01T00:00:00.000Z',
-  'acer chromebook spin 511': '2025-06-01T00:00:00.000Z',
-  'acer chromebook spin 512 (r851tn)': '2025-06-01T00:00:00.000Z',
-  'acer chromebook tab 10': '2023-08-01T00:00:00.000Z',
-  'acer chromebox cxi2 / cxv2': '2020-06-01T00:00:00.000Z',
-  'acer chromebox cxi2': '2020-06-01T00:00:00.000Z',
-  'acer chromebox cxi3': '2024-06-01T00:00:00.000Z',
-  'acer chromebox': '2019-09-01T00:00:00.000Z',
-  'aopen chromebase commercial': '2020-09-01T00:00:00.000Z',
-  'aopen chromebase mini': '2022-02-01T00:00:00.000Z',
-  'aopen chromebox commercial 2': '2024-06-01T00:00:00.000Z',
-  'aopen chromebox commercial': '2020-09-01T00:00:00.000Z',
-  'aopen chromebox mini': '2022-02-01T00:00:00.000Z',
-  'asi chromebook': '2020-06-01T00:00:00.000Z',
-  'asus chromebit cs10': '2020-11-01T00:00:00.000Z',
-  'asus chromebook c200': '2019-06-01T00:00:00.000Z',
-  'asus chromebook c200ma': '2019-06-01T00:00:00.000Z',
-  'asus chromebook c201pa': '2020-06-01T00:00:00.000Z',
-  'asus chromebook c201pa': '2020-06-01T00:00:00.000Z',
-  'asus chromebook c202sa': '2021-06-01T00:00:00.000Z',
-  'asus chromebook c204': '2025-06-01T00:00:00.000Z',
-  'asus chromebook c204': '2025-06-01T00:00:00.000Z',
-  'asus chromebook c213na': '2023-11-01T00:00:00.000Z',
-  'asus chromebook c223': '2023-11-01T00:00:00.000Z',
-  'asus chromebook c300': '2019-08-01T00:00:00.000Z',
-  'asus chromebook c300ma': '2019-08-01T00:00:00.000Z',
-  'asus chromebook c300sa / c301sa': '2021-06-01T00:00:00.000Z',
-  'asus chromebook c403': '2023-11-01T00:00:00.000Z',
-  'asus chromebook c423': '2023-11-01T00:00:00.000Z',
-  'asus chromebook c523': '2023-11-01T00:00:00.000Z',
-  'asus chromebook flip c100pa': '2020-07-01T00:00:00.000Z',
-  'asus chromebook flip c101pa': '2023-08-01T00:00:00.000Z',
-  'asus chromebook flip c213': '2023-11-01T00:00:00.000Z',
-  'asus chromebook flip c214': '2025-06-01T00:00:00.000Z',
-  'asus chromebook flip c302': '2022-11-01T00:00:00.000Z',
-  'asus chromebook flip c434': '2024-06-01T00:00:00.000Z',
-  'asus chromebook tablet ct100': '2023-08-01T00:00:00.000Z',
-  'asus chromebox (cn60)': '2019-09-01T00:00:00.000Z',
-  'asus chromebox 2 (cn62)': '2021-06-01T00:00:00.000Z',
-  'asus chromebox 3 (cn65)': '2024-06-01T00:00:00.000Z',
-  'asus chromebox 3': '2024-06-01T00:00:00.000Z',
-  'asus chromebox cn60': '2019-09-01T00:00:00.000Z',
-  'asus chromebox cn62': '2021-06-01T00:00:00.000Z',
-  'bobicus chromebook 11': '2020-06-01T00:00:00.000Z',
-  'chromebook 11 (c730 / cb3-111)': '2019-08-01T00:00:00.000Z',
-  'chromebook 11 (c735)': '2021-01-01T00:00:00.000Z',
-  'chromebook 15 (cb515 - 1ht / 1h)': '2023-11-01T00:00:00.000Z',
-  'chromebook 311 (c721)': '2025-06-01T00:00:00.000Z',
-  'chromebook pcm-116e': '2020-06-01T00:00:00.000Z',
-  'consumer chromebook': '2020-06-01T00:00:00.000Z',
-  'cr-48': '2015-12-01T00:00:00.000Z',
-  'crambo chromebook': '2020-06-01T00:00:00.000Z',
-  'ctl chromebook j41 / j41t': '2023-11-01T00:00:00.000Z',
-  'ctl chromebook nl7 / nl7t-360 / nl7tw-360': '2023-11-01T00:00:00.000Z',
-  'ctl chromebook nl7': '2023-11-01T00:00:00.000Z',
-  'ctl chromebook tab tx1': '2023-08-01T00:00:00.000Z',
-  'ctl chromebook tablet tx1 for education': '2023-08-01T00:00:00.000Z',
-  'ctl chromebox cbx1': '2024-06-01T00:00:00.000Z',
-  'ctl j2 / j4 chromebook': '2020-06-01T00:00:00.000Z',
-  'ctl j5 chromebook': '2021-08-01T00:00:00.000Z',
-  'ctl n6 education chromebook': '2020-06-01T00:00:00.000Z',
-  'ctl nl61 chromebook': '2021-08-01T00:00:00.000Z',
-  'dell chromebook 11 (3120)': '2020-06-01T00:00:00.000Z',
-  'dell chromebook 11 (3180)': '2022-05-01T00:00:00.000Z',
-  'dell chromebook 11 (5190)': '2023-11-01T00:00:00.000Z',
-  'dell chromebook 11 2-in-1 (3189)': '2022-05-01T00:00:00.000Z',
-  'dell chromebook 11 2-in-1 (5190)': '2023-11-01T00:00:00.000Z',
-  'dell chromebook 11': '2019-06-01T00:00:00.000Z',
-  'dell chromebook 13 (3380)': '2022-11-01T00:00:00.000Z',
-  'dell chromebook 13 (7310)': '2020-09-01T00:00:00.000Z',
-  'dell chromebook 3100 2-in-1': '2025-06-01T00:00:00.000Z',
-  'dell chromebook 3100': '2025-06-01T00:00:00.000Z',
-  'dell chromebook 3400': '2025-06-01T00:00:00.000Z',
-  'dell chromebox': '2019-09-01T00:00:00.000Z',
-  'dell inspiron chromebook 14 2-in-1 (7486)': '2024-06-01T00:00:00.000Z',
-  'edugear chromebook k': '2020-06-01T00:00:00.000Z',
-  'edugear chromebook m': '2020-06-01T00:00:00.000Z',
-  'edugear chromebook r': '2020-06-01T00:00:00.000Z',
-  'edugear cmt chromebook': '2021-08-01T00:00:00.000Z',
-  'edxis chromebook': '2020-06-01T00:00:00.000Z',
-  'edxis education chromebook': '2020-06-01T00:00:00.000Z',
-  'epik 11.6" chromebook  elb1101': '2020-06-01T00:00:00.000Z',
-  'google chromebook pixel (2015)': '2020-06-01T00:00:00.000Z',
-  'google chromebook pixel': '2018-06-01T00:00:00.000Z',
-  'google cr-48': '2015-12-01T00:00:00.000Z',
-  'google pixel slate': '2024-06-01T00:00:00.000Z',
-  'google pixelbook': '2024-06-01T00:00:00.000Z',
-  'haier chromebook 11 c': '2021-08-01T00:00:00.000Z',
-  'haier chromebook 11 g2': '2020-09-01T00:00:00.000Z',
-  'haier chromebook 11': '2020-06-01T00:00:00.000Z',
-  'haier chromebook 11e': '2020-06-01T00:00:00.000Z',
-  'hexa chromebook pi': '2020-06-01T00:00:00.000Z',
-  'hisense chromebook 11': '2020-06-01T00:00:00.000Z',
-  'hp chromebook 11 1100-1199 / hp chromebook 11 g1': '2018-10-01T00:00:00.000Z',
-  'hp chromebook 11 2000-2099 / hp chromebook 11 g2': '2019-06-01T00:00:00.000Z',
-  'hp chromebook 11 2100-2199 / hp chromebook 11 g3': '2020-06-01T00:00:00.000Z',
-  'hp chromebook 11 2200-2299 / hp chromebook 11 g4/g4 ee': '2020-06-01T00:00:00.000Z',
-  'hp chromebook 11 g1': '2018-10-01T00:00:00.000Z',
-  'hp chromebook 11 g2': '2019-06-01T00:00:00.000Z',
-  'hp chromebook 11 g3': '2020-06-01T00:00:00.000Z',
-  'hp chromebook 11 g4/g4 ee': '2020-06-01T00:00:00.000Z',
-  'hp chromebook 11 g5 / hp chromebook 11-vxxx': '2021-07-01T00:00:00.000Z',
-  'hp chromebook 11 g5 ee': '2022-01-01T00:00:00.000Z',
-  'hp chromebook 11 g5': '2021-07-01T00:00:00.000Z',
-  'hp chromebook 11 g6 ee': '2023-11-01T00:00:00.000Z',
-  'hp chromebook 11 g7 ee': '2025-06-01T00:00:00.000Z',
-  'hp chromebook 11a g6 ee': '2025-06-01T00:00:00.000Z',
-  'hp chromebook 13 g1': '2022-11-01T00:00:00.000Z',
-  'hp chromebook 14 / hp chromebook 14 g5': '2023-11-01T00:00:00.000Z',
-  'hp chromebook 14 ak000-099 / hp chromebook 14 g4': '2021-09-01T00:00:00.000Z',
-  'hp chromebook 14 db0000-db0999': '2025-06-01T00:00:00.000Z',
-  'hp chromebook 14 g3': '2019-10-01T00:00:00.000Z',
-  'hp chromebook 14 g4': '2021-09-01T00:00:00.000Z',
-  'hp chromebook 14 g5': '2023-11-01T00:00:00.000Z',
-  'hp chromebook 14 x000-x999 / hp chromebook 14 g3': '2019-10-01T00:00:00.000Z',
-  'hp chromebook 14': '2019-06-01T00:00:00.000Z',
-  'hp chromebook 14a g5': '2025-06-01T00:00:00.000Z',
-  'hp chromebook 15 g1': '2024-06-01T00:00:00.000Z',
-  'hp chromebook x2 ': '2024-06-01T00:00:00.000Z',
-  'hp chromebook x360 11 g1 ee': '2023-11-01T00:00:00.000Z',
-  'hp chromebook x360 11 g2 ee': '2025-06-01T00:00:00.000Z',
-  'hp chromebook x360 14 g1': '2024-06-01T00:00:00.000Z',
-  'hp chromebook x360 14': '2024-06-01T00:00:00.000Z',
-  'hp chromebox cb1-(000-099) / hp chromebox g1/ hp chromebox for meetings': '2019-09-01T00:00:00.000Z',
-  'hp chromebox g1': '2019-09-01T00:00:00.000Z',
-  'hp chromebox g2': '2024-06-01T00:00:00.000Z',
-  'hp pavilion chromebook 14': '2018-02-01T00:00:00.000Z',
-  'jp sa couto chromebook': '2020-06-01T00:00:00.000Z',
-  'lava xolo chromebook': '2020-06-01T00:00:00.000Z',
-  'lenovo 100e chromebook 2nd gen mtk': '2025-06-01T00:00:00.000Z',
-  'lenovo 100e chromebook 2nd gen': '2025-06-01T00:00:00.000Z',
-  'lenovo 100e chromebook': '2023-11-01T00:00:00.000Z',
-  'lenovo 100s chromebook': '2020-09-01T00:00:00.000Z',
-  'lenovo 14e chromebook': '2025-06-01T00:00:00.000Z',
-  'lenovo 300e chromebook 2nd gen mtk': '2025-06-01T00:00:00.000Z',
-  'lenovo 300e chromebook 2nd gen': '2025-06-01T00:00:00.000Z',
-  'lenovo 300e chromebook': '2025-06-01T00:00:00.000Z',
-  'lenovo 500e chromebook 2nd gen': '2025-06-01T00:00:00.000Z',
-  'lenovo 500e chromebook': '2023-11-01T00:00:00.000Z',
-  'lenovo chromebook c330': '2022-06-01T00:00:00.000Z',
-  'lenovo chromebook s330': '2022-06-01T00:00:00.000Z',
-  'lenovo flex 11 chromebook': '2022-06-01T00:00:00.000Z',
-  'lenovo ideapad c330 chromebook': '2022-06-01T00:00:00.000Z',
-  'lenovo ideapad s330 chromebook': '2022-06-01T00:00:00.000Z',
-  'lenovo n20 chromebook': '2019-06-01T00:00:00.000Z',
-  'lenovo n21 chromebook': '2020-06-01T00:00:00.000Z',
-  'lenovo n22 chromebook': '2021-06-01T00:00:00.000Z',
-  'lenovo n23 chromebook': '2021-06-01T00:00:00.000Z',
-  'lenovo n23 yoga chromebook': '2022-06-01T00:00:00.000Z',
-  'lenovo n42 chromebook': '2021-06-01T00:00:00.000Z',
-  'lenovo thinkcentre chromebox': '2020-06-01T00:00:00.000Z',
-  'lenovo thinkpad 11e 3rd gen chromebook': '2021-06-01T00:00:00.000Z',
-  'lenovo thinkpad 11e 4th gen chromebook': '2023-11-01T00:00:00.000Z',
-  'lenovo thinkpad 11e chromebook (4th gen)/lenovo thinkpad yoga 11e chromebook (4th gen)': '2023-11-01T00:00:00.000Z',
-  'lenovo thinkpad 11e chromebook': '2019-06-01T00:00:00.000Z',
-  'lenovo thinkpad 13': '2022-11-01T00:00:00.000Z',
-  'lenovo thinkpad x131e chromebook': '2018-06-01T00:00:00.000Z',
-  'lenovo yoga c630 chromebook': '2024-06-01T00:00:00.000Z',
-  'lg chromebase (22cb25s)': '2020-06-01T00:00:00.000Z',
-  'lg chromebase (22cv241)': '2019-06-01T00:00:00.000Z',
-  'lumos education chromebook': '2020-06-01T00:00:00.000Z',
-  'm&a chromebook': '2020-06-01T00:00:00.000Z',
-  'mecer chromebook': '2020-06-01T00:00:00.000Z',
-  'mecer v2 chromebook': '2021-08-01T00:00:00.000Z',
-  'medion chromebook akoya s2013 ': '2020-06-01T00:00:00.000Z',
-  'medion chromebook s2015': '2020-06-01T00:00:00.000Z',
-  'multilaser chromebook m11c': '2021-08-01T00:00:00.000Z',
-  'ncomputing chromebook cx100': '2020-06-01T00:00:00.000Z',
-  'ncomputing chromebook cx110': '2020-06-01T00:00:00.000Z',
-  'nexian chromebook 11.6\"': '2020-06-01T00:00:00.000Z',
-  'pcmerge chromebook al116': '2023-11-01T00:00:00.000Z',
-  'pcmerge chromebookpcm-116e/pcm-116eb': '2020-06-01T00:00:00.000Z',
-  'pcmerge chromebookpcm-116t-432b': '2021-08-01T00:00:00.000Z',
-  'poin2 chromebook 11': '2020-06-01T00:00:00.000Z',
-  'poin2 chromebook 11c': '2022-03-01T00:00:00.000Z',
-  'poin2 chromebook 14': '2022-03-01T00:00:00.000Z',
-  'positivo chromebook c216b': '2021-08-01T00:00:00.000Z',
-  'positivo chromebook ch1190': '2020-06-01T00:00:00.000Z',
-  'prowise 11.6" entry line chromebook': '2020-06-01T00:00:00.000Z',
-  'prowise chromebook eduline': '2023-11-01T00:00:00.000Z',
-  'prowise chromebook entryline': '2020-06-01T00:00:00.000Z',
-  'prowise chromebook proline': '2021-08-01T00:00:00.000Z',
-  'prowise proline chromebook': '2021-08-01T00:00:00.000Z',
-  'rgs education chromebook': '2020-06-01T00:00:00.000Z',
-  'samsung chromebook - xe303': '2018-07-01T00:00:00.000Z',
-  'samsung chromebook 2 11\" - xe500c12': '2020-06-01T00:00:00.000Z',
-  'samsung chromebook 2 11\"': '2019-06-01T00:00:00.000Z',
-  'samsung chromebook 2 13\"': '2019-06-01T00:00:00.000Z',
-  'samsung chromebook 3': '2021-06-01T00:00:00.000Z',
-  'samsung chromebook plus (v2)': '2024-06-01T00:00:00.000Z',
-  'samsung chromebook plus': '2023-08-01T00:00:00.000Z',
-  'samsung chromebook pro': '2022-11-01T00:00:00.000Z',
-  'samsung chromebook series 5 550': '2017-05-01T00:00:00.000Z',
-  'samsung chromebook series 5': '2016-06-01T00:00:00.000Z',
-  'samsung chromebook': '2018-07-01T00:00:00.000Z',
-  'samsung chromebox series 3': '2018-03-01T00:00:00.000Z',
-  'sector 5 e1 rugged chromebook': '2020-06-01T00:00:00.000Z',
-  'sector 5 e3 chromebook': '2023-11-01T00:00:00.000Z',
-  'senkatel c1101 chromebook': '2020-06-01T00:00:00.000Z',
-  'thinkpad 11e chromebook 3rd gen (yoga/clamshell)': '2021-06-01T00:00:00.000Z',
-  'thinkpad 13 chromebook': '2022-11-01T00:00:00.000Z',
-  'toshiba chromebook 2 (2015 edition)': '2020-09-01T00:00:00.000Z',
-  'toshiba chromebook 2': '2020-06-01T00:00:00.000Z',
-  'toshiba chromebook': '2019-06-01T00:00:00.000Z',
-  'true idc chromebook 11': '2020-06-01T00:00:00.000Z',
-  'true idc chromebook': '2020-06-01T00:00:00.000Z',
-  'videonet chromebook bl10': '2020-06-01T00:00:00.000Z',
-  'videonet chromebook': '2020-06-01T00:00:00.000Z',
-  'viewsonic nmp660 chromebox': '2024-06-01T00:00:00.000Z',
-  'viglen chromebook 11': '2020-06-01T00:00:00.000Z',
-  'viglen chromebook 11c': '2023-11-01T00:00:00.000Z',
-  'viglen chromebook 360': '2021-08-01T00:00:00.000Z',
-  'xolo chromebook': '2020-06-01T00:00:00.000Z',
-}
+COLLABORATIVE_INBOX_ATTRIBUTES = [
+  'whoCanAddReferences',
+  'whoCanAssignTopics',
+  'whoCanEnterFreeFormTags',
+  'whoCanMarkDuplicate',
+  'whoCanMarkFavoriteReplyOnAnyTopic',
+  'whoCanMarkFavoriteReplyOnOwnTopic',
+  'whoCanMarkNoResponseNeeded',
+  'whoCanModifyTagsAndCategories',
+  'whoCanTakeTopics',
+  'whoCanUnassignTopic',
+  'whoCanUnmarkFavoriteReplyOnAnyTopic',
+  'favoriteRepliesOnTop',
+  ]

-COLLABORATIVE_ACL_CHOICES = {
-  'members': 'ALL_MEMBERS',
-  'managersonly': 'MANAGERS_ONLY',
-  'managers': 'OWNERS_AND_MANAGERS',
-  'owners': 'OWNERS_ONLY',
-  'none': 'NONE',
-  }
-
-COLLABORATIVE_INBOX_ATTRIBUTES = {
-  'whoCanAddReferences': 'acl',
-  'whoCanAssignTopics': 'acl',
-  'whoCanEnterFreeFormTags': 'acl',
-  'whoCanMarkDuplicate': 'acl',
-  'whoCanMarkFavoriteReplyOnAnyTopic': 'acl',
-  'whoCanMarkFavoriteReplyOnOwnTopic': 'acl',
-  'whoCanMarkNoResponseNeeded': 'acl',
-  'whoCanModifyTagsAndCategories': 'acl',
-  'whoCanTakeTopics': 'acl',
-  'whoCanUnassignTopic': 'acl',
-  'whoCanUnmarkFavoriteReplyOnAnyTopic': 'acl',
-  'favoriteRepliesOnTop': True,
-  }
+GROUP_SETTINGS_LIST_ATTRIBUTES = set([
+  # ACL choices
+  'whoCanAdd',
+  'whoCanApproveMembers',
+  'whoCanApproveMessages',
+  'whoCanAssignTopics',
+  'whoCanAssistContent',
+  'whoCanBanUsers',
+  'whoCanContactOwner',
+  'whoCanDeleteAnyPost',
+  'whoCanDeleteTopics',
+  'whoCanDiscoverGroup',
+  'whoCanEnterFreeFormTags',
+  'whoCanHideAbuse',
+  'whoCanInvite',
+  'whoCanJoin',
+  'whoCanLeaveGroup',
+  'whoCanLockTopics',
+  'whoCanMakeTopicsSticky',
+  'whoCanMarkDuplicate',
+  'whoCanMarkFavoriteReplyOnAnyTopic',
+  'whoCanMarkFavoriteReplyOnOwnTopic',
+  'whoCanMarkNoResponseNeeded',
+  'whoCanModerateContent',
+  'whoCanModerateMembers',
+  'whoCanModifyMembers',
+  'whoCanModifyTagsAndCategories',
+  'whoCanMoveTopicsIn',
+  'whoCanMoveTopicsOut',
+  'whoCanPostAnnouncements',
+  'whoCanPostMessage',
+  'whoCanTakeTopics',
+  'whoCanUnassignTopic',
+  'whoCanUnmarkFavoriteReplyOnAnyTopic',
+  'whoCanViewGroup',
+  'whoCanViewMembership',
+  # Miscellaneous hoices
+  'messageModerationLevel',
+  'replyTo',
+  'spamModerationLevel',
+  ])
+GROUP_SETTINGS_BOOLEAN_ATTRIBUTES = set([
+  'allowExternalMembers',
+  'allowGoogleCommunication',
+  'allowWebPosting',
+  'archiveOnly',
+  'enableCollaborativeInbox',
+  'favoriteRepliesOnTop',
+  'includeCustomFooter',
+  'includeInGlobalAddressList',
+  'isArchived',
+  'membersCanPostAsTheGroup',
+  'sendMessageDenyNotification',
+  'showInGroupDirectory',
+  ])

 #
 # Global variables
@@ -957,8 +769,6 @@ GM_Globals = {
 #
 # Global variables defined by environment variables/signal files
 #
-# When retrieving lists of Google Drive activities from API, how many should be retrieved in each chunk
-GC_ACTIVITY_MAX_RESULTS = 'activity_max_results'
 # Automatically generate gam batch command if number of users specified in gam users xxx command exceeds this number
 # Default: 0, don't automatically generate gam batch commands
 GC_AUTO_BATCH_MIN = 'auto_batch_min'
@@ -980,19 +790,15 @@ GC_CUSTOMER_ID = 'customer_id'
 GC_DEBUG_LEVEL = 'debug_level'
 # ID Token decoded from OAuth 2.0 refresh token response. Includes hd (domain) and email of authorized user
 GC_DECODED_ID_TOKEN = 'decoded_id_token'
-# When retrieving lists of ChromeOS/Mobile devices from API, how many should be retrieved in each chunk
-GC_DEVICE_MAX_RESULTS = 'device_max_results'
 # Domain obtained from gam.cfg or oauth2.txt
 GC_DOMAIN = 'domain'
 # Google Drive download directory
 GC_DRIVE_DIR = 'drive_dir'
-# When retrieving lists of Drive files/folders from API, how many should be retrieved in each chunk
-GC_DRIVE_MAX_RESULTS = 'drive_max_results'
-# When retrieving lists of Google Group members from API, how many should be retrieved in each chunk
-GC_MEMBER_MAX_RESULTS = 'member_max_results'
 # If no_browser is False, writeCSVfile won't open a browser when todrive is set
 # and doRequestOAuth prints a link and waits for the verification code when oauth2.txt is being created
 GC_NO_BROWSER = 'no_browser'
+# oauth_browser forces usage of web server OAuth flow that proved problematic.
+GC_OAUTH_BROWSER = 'oauth_browser'
 # Disable GAM API caching
 GC_NO_CACHE = 'no_cache'
 # Disable GAM update check
@@ -1011,8 +817,6 @@ GC_SHOW_COUNTS_MIN = 'show_counts_min'
 GC_SHOW_GETTINGS = 'show_gettings'
 # GAM config directory containing json discovery files
 GC_SITE_DIR = 'site_dir'
-# When retrieving lists of Users from API, how many should be retrieved in each chunk
-GC_USER_MAX_RESULTS = 'user_max_results'
 # CSV Columns GAM should show on CSV output
 GC_CSV_HEADER_FILTER = 'csv_header_filter'
 # CSV Rows GAM should filter
@@ -1026,7 +830,6 @@ GC_CA_FILE = 'ca_file'

 tls_min = "TLSv1_2" if hasattr(ssl.SSLContext(), "minimum_version") else None
 GC_Defaults = {
-  GC_ACTIVITY_MAX_RESULTS: 100,
  GC_AUTO_BATCH_MIN: 0,
  GC_BATCH_SIZE: 50,
  GC_CACHE_DIR: '',
@@ -1037,22 +840,19 @@ GC_Defaults = {
  GC_CUSTOMER_ID: MY_CUSTOMER,
  GC_DEBUG_LEVEL: 0,
  GC_DECODED_ID_TOKEN: '',
-  GC_DEVICE_MAX_RESULTS: 500,
  GC_DOMAIN: '',
  GC_DRIVE_DIR: '',
-  GC_DRIVE_MAX_RESULTS: 1000,
-  GC_MEMBER_MAX_RESULTS: 200,
  GC_NO_BROWSER: False,
  GC_NO_CACHE: False,
  GC_NO_UPDATE_CHECK: False,
  GC_NUM_THREADS: 25,
+  GC_OAUTH_BROWSER: False,
  GC_OAUTH2_TXT: _FN_OAUTH2_TXT,
  GC_OAUTH2SERVICE_JSON: _FN_OAUTH2SERVICE_JSON,
  GC_SECTION: '',
  GC_SHOW_COUNTS_MIN: 0,
  GC_SHOW_GETTINGS: True,
  GC_SITE_DIR: '',
-  GC_USER_MAX_RESULTS: 500,
  GC_CSV_HEADER_FILTER: '',
  GC_CSV_ROW_FILTER: '',
  GC_TLS_MIN_VERSION: tls_min,
@@ -1077,7 +877,6 @@ GC_VAR_TYPE = 'type'
 GC_VAR_LIMITS = 'lmit'

 GC_VAR_INFO = {
-  GC_ACTIVITY_MAX_RESULTS: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (1, 500)},
  GC_AUTO_BATCH_MIN: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (0, None)},
  GC_BATCH_SIZE: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (1, 1000)},
  GC_CACHE_DIR: {GC_VAR_TYPE: GC_TYPE_DIRECTORY},
@@ -1088,22 +887,19 @@ GC_VAR_INFO = {
  GC_CUSTOMER_ID: {GC_VAR_TYPE: GC_TYPE_STRING},
  GC_DEBUG_LEVEL: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (0, None)},
  GC_DECODED_ID_TOKEN: {GC_VAR_TYPE: GC_TYPE_STRING},
-  GC_DEVICE_MAX_RESULTS: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (1, 1000)},
  GC_DOMAIN: {GC_VAR_TYPE: GC_TYPE_STRING},
  GC_DRIVE_DIR: {GC_VAR_TYPE: GC_TYPE_DIRECTORY},
-  GC_DRIVE_MAX_RESULTS: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (1, 1000)},
-  GC_MEMBER_MAX_RESULTS: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (1, 10000)},
  GC_NO_BROWSER: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
  GC_NO_CACHE: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
  GC_NO_UPDATE_CHECK: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
  GC_NUM_THREADS: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (1, None)},
+  GC_OAUTH_BROWSER: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
  GC_OAUTH2_TXT: {GC_VAR_TYPE: GC_TYPE_FILE},
  GC_OAUTH2SERVICE_JSON: {GC_VAR_TYPE: GC_TYPE_FILE},
  GC_SECTION: {GC_VAR_TYPE: GC_TYPE_STRING},
  GC_SHOW_COUNTS_MIN: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (0, None)},
  GC_SHOW_GETTINGS: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
  GC_SITE_DIR: {GC_VAR_TYPE: GC_TYPE_DIRECTORY},
-  GC_USER_MAX_RESULTS: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (1, 500)},
  GC_CSV_HEADER_FILTER: {GC_VAR_TYPE: GC_TYPE_HEADERFILTER},
  GC_CSV_ROW_FILTER: {GC_VAR_TYPE: GC_TYPE_ROWFILTER},
  GC_TLS_MIN_VERSION: {GC_VAR_TYPE: GC_TYPE_STRING},
@@ -1399,3 +1195,19 @@ LANGUAGE_CODES_MAP = {
  'ur': 'ur', 'uz': 'uz', 'vi': 'vi', 'wo': 'wo', 'xh': 'xh', 'yi': 'yi', 'yo': 'yo', #Urdu, Uzbek, Vietnamese, Wolof, Xhosa, Yiddish, Yoruba
  'zh-cn': 'zh-CN', 'zh-hk': 'zh-HK', 'zh-tw': 'zh-TW', 'zu': 'zu', #Chinese (Simplified), Chinese (Hong Kong/Traditional), Chinese (Taiwan/Traditional), Zulu
  }
+
+# maxResults exception values for API list calls. Should only be listed if:
+#   - discovery doc does not specify maximum value (we use maximum value if it
+#     exists, not this)
+#   - actual max API returns with maxResults=<bigNum>  > default API returns
+#     when maxResults isn't specified (we should use default otherwise by not
+#     setting maxResults)
+
+MAX_RESULTS_API_EXCEPTIONS = {
+  'calendar.acl.list': 250,
+  'calendar.calendarList.list': 250,
+  'calendar.events.list': 2500,
+  'calendar.settings.list': 250,
+  'directory.chromeosdevices.list': 200,
+  'drive.files.list': 1000,
+  }
Author	SHA1	Message	Date
Jay Lee	cfd36c2836	GAM 4.94, pull in Ross changes in #1003	2019-08-30 11:45:52 -04:00
Jay Lee	7689ac7bed	disable ssl verify on time sync so we know when clock is WAY off	2019-08-30 11:15:56 -04:00
Jay Lee	7a5ba99b36	Even better SA check	2019-08-30 11:02:42 -04:00
Ross Scroggs	8f4a40bc9a	Add timeoffset option to gam version (#1002 ) * Add timeoffset option to gam version * Update timeOffset checking	2019-08-29 14:32:45 -04:00
Jay Lee	e3ab846d70	update user passwords	2019-08-27 14:28:04 -04:00
Jay Lee	29db574bc5	Merge branch 'master' of https://github.com/jay0lee/GAM	2019-08-27 10:19:48 -04:00
Jay Lee	4851d5b62f	upgrade MUSL	2019-08-27 10:19:33 -04:00
Jay Lee	caef16bdee	add email scope to SA, check serviceaccount verifies proper DwD and scopes for token	2019-08-27 10:18:36 -04:00
Ross Scroggs	1a0f9ab66a	handle empty recoveryPhone (#999 ) * handle empty recoveryPhone * Test empty recoveryemail/recoveryphone * Handle autoUpdateExpiration for CrOS	2019-08-21 15:03:05 -04:00
Ross Scroggs	021c3bfb13	Handle more errors with short URL oauth create (#998 )	2019-08-18 17:34:55 -04:00
Jay Lee	b3dfa41df6	GAM user agent on short URL	2019-08-15 18:21:54 -04:00
Jay Lee	5f94263db2	Use _createHttpObj() for short URL	2019-08-15 18:15:56 -04:00
Jay Lee	68d8e46b4c	force pip upgrades	2019-08-15 14:50:23 -04:00
Jay Lee	ed221b0d7b	just use static recovery phone	2019-08-15 13:31:26 -04:00
Jay Lee	1243563cd4	try to make MacOS tr happy	2019-08-15 12:38:47 -04:00
Jay Lee	1170457a39	GAM 4.93, remove *MAX_RESULTS config options	2019-08-15 12:35:10 -04:00
Jay Lee	435ed9f568	use area code 212 always	2019-08-15 12:18:36 -04:00
Jay Lee	81884e48d0	Support recovery email/phone for users	2019-08-15 12:00:36 -04:00
Jay Lee	a7be6d233b	confirm API call supports maxResults before checking value	2019-08-15 10:08:03 -04:00
Jay Lee	584ddba1a5	Dynamic maxResults from discovery or exception	2019-08-14 16:11:14 -04:00
Jay Lee	2bc6c8bca0	200 or bust for URL shorten	2019-08-13 08:35:06 -04:00
Jay Lee	fc1e81a01d	oauthbrowser.txt, GAM 4.92	2019-08-12 14:02:59 -04:00
Jay Lee	eebfaaf373	finish pyinstaller install	2019-08-12 12:48:01 -04:00
Jay Lee	652223d9bc	Pyinstaller windows 64 bit bootloader compile	2019-08-12 12:29:51 -04:00
Jay Lee	e75664fd2e	roll Python 3.5 back to Xenial	2019-08-12 12:08:09 -04:00
Jay Lee	556278b216	Use bionic for Python source tests	2019-08-12 11:57:24 -04:00
Jay Lee	f9bfaa98bb	fix cros/mobile print	2019-08-12 11:47:44 -04:00
Jay Lee	b6bd2da6ce	Short OAuth URLs, make console flow default to reduce issues	2019-08-12 11:00:26 -04:00
Jay Lee	7c36a6b601	Merge branch 'master' of https://github.com/jay0lee/GAM	2019-08-12 10:41:22 -04:00
Ross Scroggs	413924b11a	Generalize expression to find group settings values (#994 )	2019-08-12 10:41:17 -04:00
Jay Lee	251883dae5	add cros/mobile print tests	2019-08-10 15:46:52 -04:00
Jay Lee	7e4d0da8fb	GAM 4.91	2019-08-10 15:39:14 -04:00
Ross Scroggs	3fc2aeed4d	Fix group settings (#990 ) * Fix group settings Clean up md5MatchesFile * Simplify doGetCustomerInfo Avoid trap when doPrintDomains returned a domain creationTime with no fraction. Traceback (most recent call last): File "gam.py", line 14761, in <module> File "gam.py", line 14159, in ProcessGAMCommand File "gam.py", line 2053, in doGetDomainInfo File "gam.py", line 2088, in doGetCustomerInfo File "_strptime.py", line 577, in _strptime_datetime File "_strptime.py", line 359, in _strptime ValueError: time data '2019-04-23 16:14:56' does not match format '%Y-%m-%d %H:% M:%S.%f' lansa.co.uk,True,2019-04-23 16:14:13.041000,secondary, lansa.com.au,True,2019-04-23 16:14:56,secondary	2019-08-10 15:37:44 -04:00
Ross Scroggs	7f4f785f0b	Lower default limit for 500 to 200 for devices (#987 ) * Lower default limit for 500 to 200 for devices * Lower limit from 200 to 100 to handle mobile devices	2019-08-05 18:16:46 -04:00
Jay Lee	9f5920989d	remove bionic for now, re-enable e2e tests	2019-08-01 11:32:23 -04:00
Jay Lee	62bceb30c5	GAM 4.90, update mobile adjustments	2019-08-01 11:15:10 -04:00
Jay Lee	8c736e52ac	Empty body no longer required	2019-08-01 10:58:01 -04:00
Jay Lee	2669079a31	don't cleanup	2019-07-27 10:01:33 -04:00
Jay Lee	cbfd93e440	Timeout optimized Python build so we can cache partial testing...	2019-07-27 09:36:01 -04:00
Jay Lee	ffd1c297e5	force configure	2019-07-26 15:51:35 -04:00
Jay Lee	1a11cb04f9	clean and optimize python build	2019-07-26 15:38:23 -04:00
Jay Lee	438fd5b59a	turn off unsafe to speed up Python for moment	2019-07-26 15:23:58 -04:00
Jay Lee	2fef5e2cfa	minimal tests so Bionic Python 3.7 can build and cache	2019-07-26 14:22:35 -04:00
Jay Lee	db8ad38fd3	try curl instead of wget	2019-07-26 13:28:24 -04:00
Jay Lee	cbb2722291	figure out what's up with Python wget	2019-07-26 13:07:27 -04:00
Jay Lee	be1c7f2167	Bionic Beaver build	2019-07-26 12:37:00 -04:00
Jay Lee	61f4a137b0	32-bit bootloader, fix path	2019-07-26 12:34:40 -04:00
Jay Lee	dac9e91428	fix python path	2019-07-26 12:14:45 -04:00
Jay Lee	83c64f1f71	few more fixes	2019-07-26 11:53:12 -04:00
Jay Lee	443f4e707b	Use MacOS Python binary, fix Win32 Pyinstaller build	2019-07-26 11:33:00 -04:00
Jay Lee	70bf2a05f3	pyinstaller version	2019-07-26 11:09:12 -04:00
Jay Lee	33a4747677	rebuild w32 PyInstaller bootloader to avoid AV issues	2019-07-26 10:43:44 -04:00
Ross Scroggs	a4cce17767	Fix typos (#981 )	2019-07-26 09:27:19 -04:00
Ross Scroggs	67cd03d3f1	I suggest match_users instead of if_users (#980 ) * I suggest match_users instead of if_users * Allow if_users or match_users	2019-07-26 09:06:45 -04:00
Jay Lee	1f88c18f94	Update gam.py	2019-07-24 15:07:12 -04:00
Jay Lee	d2fc706b17	fix doit mobile update	2019-07-24 12:28:22 -04:00
Jay Lee	b5e5786813	Require doit argument to update >1 devices	2019-07-24 12:21:30 -04:00
Jay Lee	38e741c788	Update mobile devices by query	2019-07-24 11:16:54 -04:00
Jay Lee	e9a0b85682	retry notFound when changing group settings after create to handle sporadic latency issues that cause failure	2019-07-23 10:09:55 -04:00
Jay Lee	5ab3602c2a	gam download storagebucket initial work	2019-07-20 10:08:48 -04:00
Jay Lee	dd4bf7b144	10 second timeout on update check (default seems to be 2 min)	2019-07-20 10:07:34 -04:00
Ross Scroggs	922326c5ce	Code cleanup (#975 )	2019-07-17 08:41:38 -04:00
Jay Lee	c69be414ca	Update gam.py Fix one more case.	2019-07-16 17:45:03 -04:00
Ross Scroggs	10bc47402c	Cleanup (#974 ) * Cleanup parent is not valid with use project * Cleanup * Cleanup * Code fix	2019-07-16 17:42:42 -04:00
Ross Scroggs	193e42cf22	Add new forms of create/use project (#973 )	2019-07-16 12:50:36 -04:00
Jay Lee	e0f58e5264	Allow setting project parent	2019-07-15 13:24:54 -04:00
Jay Lee	f14e48320c	noupx, strip osx/linux	2019-07-14 17:33:50 -04:00
Jay Lee	474fcd33a6	disable PyInstaller debug	2019-07-13 15:12:50 -04:00
Jay Lee	a2a9ffc895	force pip upgrades	2019-07-13 14:40:01 -04:00
Jay Lee	b02416b32c	Actually use GAM_CA_FILE env var	2019-07-12 15:10:20 -04:00
Jay Lee	fa52d9e89e	Merge branch 'master' of https://github.com/jay0lee/GAM	2019-07-11 09:55:41 -04:00
Jay Lee	6383aa594a	Batch Drive Deletes	2019-07-11 09:55:20 -04:00
Ross Scroggs	54eb59c27b	Convert team to shared in vault export; prepare for the future (#971 ) * Convert team to shared in vault export Restore _getValidCourseStates(croom), it is used by _getCourseStates in print courses/course-participants * Update GamCommands.txt * Fix typo * Update gam.py	2019-07-10 15:35:06 -04:00
Ross Scroggs	3877f8309b	Update GamCommands.txt (#969 )	2019-07-10 12:17:53 -04:00
Jay Lee	d8b0681831	Merge branch 'master' of https://github.com/jay0lee/GAM	2019-07-10 12:17:13 -04:00
Jay Lee	cd8303dbea	GAM 4.89	2019-07-10 12:17:00 -04:00
Ross Scroggs	ab51d6e931	Update GamCommands.txt (#968 )	2019-07-10 11:33:49 -04:00
Jay Lee	b7e402dca2	confidential vault, generalize enums from discovery, query RCs	2019-07-10 09:33:21 -04:00
Jay Lee	842040a8b3	run e2e tests again	2019-07-09 21:39:27 -04:00
Jay Lee	1205da5d34	Update linux-x86_64-before-install.sh	2019-07-09 20:36:33 -04:00
Jay Lee	f40824fedd	disable e2e so Python 3.7.4 compile finishes	2019-07-09 13:18:29 -04:00
Jay Lee	67fa0cbc61	}	2019-07-09 12:23:29 -04:00
Jay Lee	e029c77f76	Python 3.7.4, accept newer Python/OpenSSL versions	2019-07-09 11:09:09 -04:00
Jay Lee	2b23ae4e67	remove dnspython requirement, minor fixes	2019-07-02 12:21:51 -04:00
Jay Lee	c8ecc23c9c	Remove dnspython in favor of simple Google DNS JSON API	2019-07-02 11:13:31 -04:00
Ross Scroggs	94f8959879	Handle group members with no status (#962 ) * Handle group members with no status * Omit Advanced form * Update gam.py	2019-07-01 12:02:08 -04:00
Jay Lee	2cdb8eb44d	fix message header argument, make sure we remove all headers in cases of duplicate header or non-matching case	2019-06-27 14:39:03 -04:00
Ross Scroggs	ebc1d1ecb3	Clean up sendOrDropEmail (#961 ) * Clean up sendOrDropEmail * Date allowed in all commands, only sets kwargs for import/insert * Two updates Allow headers in draft/import/insert/send email Quote arguments in todrive decscription * Make requested changes * Don't user sendser as an alias for from as they can be different things in SMTP * On import message, default to not checking for spam	2019-06-27 09:55:00 -04:00
Jay Lee	d9e99334d2	new options and improvements to message send/drop/draft	2019-06-25 13:24:36 -04:00
Jay Lee	a06776bbbd	Update var.py	2019-06-24 10:12:32 -04:00
Jay Lee	aecd725a71	Update .travis.yml	2019-06-21 21:11:59 -04:00
Jay Lee	ad8e9364e1	Update .travis.yml	2019-06-21 20:49:33 -04:00
Ross Scroggs	b812fef1c3	Update draft/import/insert/sendemail (#959 ) * Update draft/import/insert/sendemail If possible, use same option names as already exist in my Gam for same commands. Include charset with file. * Code cleanup	2019-06-21 20:22:44 -04:00
Ross Scroggs	56371214b0	Document gam <UserTypeEntity> sendemail (#958 )	2019-06-20 18:32:28 -04:00
Jay Lee	3669a86f41	use gam.py, send to admin	2019-06-20 16:40:27 -04:00
Jay Lee	4095bf63ef	Email send/import/insert/draft	2019-06-20 16:29:46 -04:00
Jay Lee	d75321ca8a	put on the breaks :-)	2019-06-20 11:52:07 -04:00
Jay Lee	c931e1cdd7	retry on version extended also	2019-06-20 11:43:45 -04:00
Jay Lee	ea8cda72c7	full email on send	2019-06-19 16:46:14 -04:00
Jay Lee	f0bcd7888a	don't use runCmdforUsers()	2019-06-19 15:53:48 -04:00
Jay Lee	6a08a66221	fi	2019-06-19 15:45:58 -04:00
Jay Lee	5e58edf598	command to send (spartan) test messages	2019-06-19 15:41:01 -04:00
Jay Lee	1e79772ec1	catch/retry DNS errors if we need to refresh token on startup	2019-06-19 15:09:58 -04:00
Jay Lee	3461ce053f	cleanup print jobs	2019-06-19 12:49:50 -04:00
Jay Lee	9c84ce30e8	retry on ServerNotFound DNS issues	2019-06-19 12:15:23 -04:00
Jay Lee	93ca63e133	Merge branch 'master' of https://github.com/jay0lee/GAM	2019-06-18 14:54:49 -04:00
Jay Lee	e367c86fce	fix issue with over-escaping aue model	2019-06-18 14:54:33 -04:00
Ross Scroggs	34dc12994a	Three updates (#956 ) Add notregex to GAM_CSV_ROW_FILTER to allow selection rows that don't have a particular value Standarize formatting timestamps Display mobile.patchSecurityLevel as a date/time	2019-06-18 14:03:19 -04:00
Jay Lee	df4de5ce4b	move CrOS AUE dates to dynamic file	2019-06-18 11:20:24 -04:00
Jay Lee	ea630480b2	create cros-aue-dates.json	2019-06-18 11:14:43 -04:00
Jay Lee	db1159cd0d	remove custom code verifier patch and force google-auth-oauthlib==0.4.0. Next release may break code_verifier auto-gen based on https://github.com/googleapis/google-auth-library-python-oauthlib/pull/48 so we lock at 0.4.0 for now.	2019-06-18 10:23:50 -04:00
Ross Scroggs	ccf1dc0585	Update calendar ACL commands (#953 ) * Update calendar ACL commands Your change was not backwards compatible; sys.argv[4] was previously ignored * Code cleanup	2019-06-17 19:52:08 -04:00