Merge branch 'master' of https://github.com/jay0lee/GAM

Batch Drive Deletes
Convert team to shared in vault export; prepare for the future (#971 )
2026-06-04 06:11:39 +00:00 · 2019-07-11 09:55:41 -04:00 · 2019-07-11 09:55:20 -04:00 · 2019-07-10 15:35:06 -04:00 · 2019-07-10 12:17:53 -04:00 · 2019-07-10 12:17:13 -04:00
13 changed files with 1480 additions and 547 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,10 @@ if: tag IS blank

 env:
  global:
+    - BUILD_PYTHON_VERSION=3.7.4
+    - BUILD_OPENSSL_VERSION=1.1.1c
+    - PATCHELF_VERSION=0.9
+    - MUSL_VERSION=1.1.22
    - 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="
@@ -23,6 +27,12 @@ env:
    - secure: "sskZYJ/+xmHh5GNvw3QRf10+sBGOjlub29jOTxjXIRYUyZfkhjsF8CR9NP59CBFuqgN716Mj1uEVEcx0aaepr/zWweQSnqa9lZgFD9nDYALVNh1b4oyqfhYG1sw57ZHdBsJOBF4mKBnahly/QQj11Ya25GyIS2IewwCWVNtCOJYietSssG9l0+qc+RPG5Ub/lEKA3VRrtbUuApcIYszt33DumgZ4wzkzICl1SuOy8V15vHVlkBqASJheEDa4Hia+eAMo6e7OCE5KWjl7K2MxTvtszwFi7lgMCyPCOy6DkaULACfBnQeloh42B2Qhd/ta04vuRKg6y4fKSrnegpeOAa9aGxF1ufvG9IvPsRTsu4+w63b9xsQUN9MyDgxcJe0YeUHPgPYL6mqAjCIKvL62LlIyrQ8IAteoh3MC+4Xb8crXaLGINTcLwYvLwxsHMuC/58hdQ23I4DqnyZGAS3L1IhpX4QvYN6xc7H+ptaiQttweoH5VpMAduSrmSnNmvLOc4g2PvbRES6D95moQ7qk7iX6vpu+PevL5HtQCbB8SFyFLTYWsqZaG+4NrjpIi2hLzUT35meHwrvxG/MsfeqOVlnBfa93VnX75vxOkRFNY56sOtrTJaiVZ+rQUdszAZz3KGPbyrSlz3KxV+ZKxZH6/0oFteAJttXFjWQdICnKGDSo="
    - secure: "sdzU5bPs1w7Nzf3F5Gtk/iq2Kfq3zfLQNGcehLZp1gJXzNf7F6HZLOn6GaXQ/5RVlhqR5nOmzMpVQs88rZv+6PE6YqGMugTxHIQeNmXtGnuEDJSBvGT9Ok8ENxcwKwL93g9SCd9P8mTspxklOsW2Bk3No2+Zlc/aQguBcX44TwYF42KuBU4O7oS6pUg8NjnuQp2zTyhp0ouzyAudatPyu1BLci/3lbx+MehutQw1y4Om6g8tfwf950UONZQdqq9MBluu7yYb1oHkdC1J4qgwdCZkJslWIwQHCH5UE4AW9iVG0qVrLpzBGtV27Kfy/Vf8r2gMYzbiur2h2+zzWSDm8/bk8YLn7u1FBpjGJdJ0pX0ZrZr+hMV2vH3e54NvA5WyRU7tw8mZ1PoDYd/FM5KXIYbscSbSRCqTsbPgyVIHuoOWXeeSe+/Ef1ifZv3HHf6ARfUIWupKfAipxChc7QUMI/HEQ9QPsqgBaooZD9chGsWAgv+8tFxdteqkx4Yh+AuZp1rVykB/9vAamUBebQxy0oeGm65j6X1rksfjAPkfeDYB7L4Ruy7tUwPtvYrAHPoWrf9O0g/qDRsw0vdqp42CjszpIxhuPhVRDx0i0wquqw2LnIU3ejRv2R8d1SecVKBBcVsWLFvc9iR4rNIi5JnxITRtiwL1Xv3Vcgx7WwxExtE="
    - secure: "f9n1KmU5NuV4jGkrhLNiPD+3Cy7t4D7Rq8YsPlmyB2A6u6IHMuOVP95IwH6Zt0cmMDBrZGthj3/0iu5kzxzqD0m135PT17wSEqsDfDMyKRZJQuYSO/ESVxnSca3afRH7Ds7/ipQVd/ljZgwEnW3JMaOQiIdbbIquNOOTeY0/wsXkreDamXZaKKqUoeadkAV4AkKhM0xcMg+Vni1i71TYPBWrZPLVAu3ZrSvU/cE5mtBUIkbr9EgsEE+WR23QCgtwxKzNxrXetBcPXDsJb98/ABgpoItm5Ko/Zk6pkib44f+iQtn7Y6j3lieELCH5Sn0uy3RrMxkl7xicB7zPYME94NEPHCmshyVsH3RxWfcBG4kauRNBCLYLl5HYF2t1lWZ6In5qlx8xN3Tf0KrbM3vzAEOnnfZt83h3q5OuWl+jzTOcv9xHmeW0lnwEEfS0nxUV3KDqLFBczcUxKBmsA2aWnJZ2HV+kls6OaWZ987m6V2pIGR2uviGT7I4ngjCSOJzbwYbvJbJqYAI97FWP/5pqv97xHLCSSJh6TBO4NMQ7Ib/W1XT6NZyPOjNGSLpd79UA3cTzU2+UYr/7RxZpAKONSAMTJh7CX451XQwgovpFZ2quXs2BzqcVpy8AlUc45ygnFOALOANAkcRP5QFhmff0jpXstjPW83/GksbtaiLhIiQ="
+cache:
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/python
+    - $HOME/ssl
+    - $HOME/pybuild

 matrix:
  include:
@@ -124,76 +134,90 @@ 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 3\.7\.3"; fi # We should be building with Python 3.7.3
- if [ "$VMTYPE" == "build" ]; then $gam version extended | grep TLSv1\.[23]; fi # Builds should support TLS 1.2 or 1.3 to Google
+# determine which Python version GAM is built with and ensure it's at least build version from above.
+- if [ "VMTYPE" == "build" ]; then vline=$(gamd 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=$(gamd 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 since server doesn't support our TLS version
 - export jid="$(cut -d'.' -f2 <<<"$TRAVIS_JOB_NUMBER")"
- export gam_user=gam-travis-$jid@pdl.jaylee.us
- openssl aes-256-cbc -K $encrypted_ab10ec38326e_key -iv $encrypted_ab10ec38326e_iv -in travis/oauth2service.json.enc -out $gampath/oauth2service.json -d
- cat travis/cfg_template.json | python travis/svars-write.py &> /dev/null
- $gam info domain
- $gam info user
- export tstamp=$(date +%s%3N);
+- 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
+- if [ "$e2e" = true ]; then openssl aes-256-cbc -K $encrypted_ab10ec38326e_key -iv $encrypted_ab10ec38326e_iv -in travis/oauth2service.json.enc -out $gampath/oauth2service.json -d; fi
+- if [ "$e2e" = true ]; then cat travis/cfg_template.json | python travis/svars-write.py &> /dev/null; fi
+- if [ "$e2e" = true ]; then $gam info domain; fi
+- if [ "$e2e" = true ]; then $gam oauth info; fi
+- if [ "$e2e" = true ]; then $gam oauth refresh; fi
+- if [ "$e2e" = true ]; then $gam info user; fi
+- if [ "$e2e" = true ]; then export tstamp=$(date +%s%3N);
  export newbase=travis-test-$jid-$tstamp;
  export newuser=$newbase@pdl.jaylee.us;
  export newgroup=$newbase-group@pdl.jaylee.us;
  export newalias=$newbase-alias@pdl.jaylee.us;
  export newbuilding=$newbase-building;
  export newresource=$newbase-resource;
-  export GAM_THREADS=5;
- echo email > sample.csv;
+  export GAM_THREADS=5; fi
+- if [ "$e2e" = true ]; then echo email > sample.csv;
  for i in {01..20};
    do echo $newbase-bulkuser-$i >> sample.csv;
-  done
- $gam create user $newuser firstname Travis lastname $jid password random travis.jid $jid
- $gam create group $newgroup name "Travis $jid group" description "This is a description" isarchived true
- $gam user $newuser add license gsuitebusiness
- $gam update group $newgroup add owner $gam_user
- $gam update group $newgroup add member $newuser
- $gam csv sample.csv gam create user ~~email~~ firstname "Travis Bulk" lastname ~~email~~ travis.jid $jid
- $gam csv sample.csv gam user ~email add license gsuitebusiness
- $gam csv sample.csv gam update group $newgroup add member ~email
- $gam info group $newgroup
- $gam user $gam_user check serviceaccount
- $gam user $newuser imap on 
- $gam user $newuser show imap
- $gam csv sample.csv gam user $newuser delegate to ~email
- $gam user $newuser show delegates
- $gam users "$newbase-bulkuser-01 $newbase-bulkuser-02 $newbase-bulkuser-03" delete messages query in:anywhere maxtodelete 99999 doit
- $gam users "$newbase-bulkuser-04 $newbase-bulkuser-05 $newbase-bulkuser-06" trash messages query in:anywhere maxtotrash 99999 doit
- $gam users "$newbase-bulkuser-07 $newbase-bulkuser-08 $newbase-bulkuser-09" modify messages query in:anywhere maxtomodify 99999 addlabel IMPORTANT addlabel STARRED doit
- $gam create feature name Whiteboard-$newbase
- $gam create feature name VC-$newbase
- $gam create building "My Building - $newbase" id $newbuilding floors 1,2,3,4,5,6,7,8,9,10,11,12,14,15 description "No 13th floor here..."
- $gam create resource $newresource "Resource Calendar $tstamp" capacity 25 features Whiteboard-$newbase,VC-$newbase building $newbuilding floor 15 type Room
- $gam info resource $newresource
- $gam user $newuser show filelist
- $gam calendar $newuser update read domain
- $gam calendar $newuser add editor $gam_user
- $gam calendar $newuser showacl
- $gam printer register
- source travis/set_printer_csv_filter.sh
- $gam print printers > printers.csv
- unset GAM_CSV_ROW_FILTER
- $gam csv printers.csv gam printer ~id add USER $newgroup
- $gam csv printers.csv gam printjob ~id submit https://www.github.com/jay0lee/GAM
- $gam csv printers.csv gam info printer ~id
- $gam print printjobs
- $gam csv printers.csv gam printjob ~id fetch
- $gam csv printers.csv gam delete printer ~id
-#- $gam calendar id:$newresource add editor $newuser
-#- $gam calendar id:$newresource update read domain
-#- $gam calendar id:$newresource showacl
- $gam csv sample.csv gam user ~email add calendar id:$newresource
- $gam delete resource $newresource
- $gam delete feature Whiteboard-$newbase
- $gam delete feature VC-$newbase
- $gam delete building $newbuilding
- $gam delete group $newgroup
- $gam create alias $newalias user $newuser
- $gam whatis $newuser
- $gam user $gam_user show tokens
- $gam delete user $newuser
- $gam print users query "travis.jid=$jid" | $gam csv - gam delete user ~primaryEmail
+  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 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 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
+- if [ "$e2e" = true ]; then $gam user $newuser imap on; fi
+- 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 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
+- if [ "$e2e" = true ]; then $gam create feature name VC-$newbase; fi
+- if [ "$e2e" = true ]; then $gam create building "My Building - $newbase" id $newbuilding floors 1,2,3,4,5,6,7,8,9,10,11,12,14,15 description "No 13th floor here..."; fi
+- if [ "$e2e" = true ]; then $gam create resource $newresource "Resource Calendar $tstamp" capacity 25 features Whiteboard-$newbase,VC-$newbase building $newbuilding floor 15 type Room; fi
+- if [ "$e2e" = true ]; then $gam info resource $newresource; fi
+- if [ "$e2e" = true ]; then $gam user $newuser show filelist; fi
+- if [ "$e2e" = true ]; then $gam calendar $gam_user printacl | $gam csv - gam calendar $gam_user delete id ~id; fi # clear ACLs
+- if [ "$e2e" = true ]; then $gam calendar $gam_user update read domain; fi
+- if [ "$e2e" = true ]; then $gam calendar $gam_user update freebusy default; fi
+- if [ "$e2e" = true ]; then $gam calendar $gam_user add editor $newuser; fi
+- if [ "$e2e" = true ]; then $gam calendar $gam_user showacl; fi
+- if [ "$e2e" = true ]; then $gam calendar $gam_user printacl | $gam csv - gam calendar $gam_user delete id ~id; fi
+- if [ "$e2e" = true ]; then $gam printer register; fi
+- if [ "$e2e" = true ]; then source travis/set_printer_csv_filter.sh; fi
+- if [ "$e2e" = true ]; then $gam print printers > printers.csv; fi
+- if [ "$e2e" = true ]; then unset GAM_CSV_ROW_FILTER; fi
+- if [ "$e2e" = true ]; then $gam csv printers.csv gam printer ~id add USER $newgroup; fi
+- if [ "$e2e" = true ]; then $gam csv printers.csv gam printjob ~id submit https://www.github.com/jay0lee/GAM; fi
+- 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 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
+- if [ "$e2e" = true ]; then $gam delete feature VC-$newbase; fi
+- if [ "$e2e" = true ]; then $gam delete building $newbuilding; fi
+- if [ "$e2e" = true ]; then $gam delete group $newgroup; fi
+- if [ "$e2e" = true ]; then $gam create alias $newalias user $newuser; fi
+- if [ "$e2e" = true ]; then $gam whatis $newuser; fi
+- 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

 before_deploy:
 - export TRAVIS_TAG="preview"
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -74,6 +74,13 @@ If an item contains spaces, it should be surrounded by ".
 	Google-Drive-storage|
 	Google-Vault|
 	101001|101005|101031
+<ProductID> ::=
+	Google-Apps|
+	Google-Chrome-Device-Management|
+	Google-Coordinate|
+	Google-Drive-storage|
+	Google-Vault|
+	101001|101005|101006|101031|101033|101034
 <SKUID> ::=
 	cloudidentity|identity|1010010001|
 	cloudidentitypremium|identitypremium|1010050001|
@@ -81,11 +88,13 @@ If an item contains spaces, it should be surrounded by ".
 	gafb|gafw|basic|gsuitebasic|Google-Apps-For-Business|
 	gafg|gsuitegovernment|gsuitegov|Google-Apps-For-Government|
 	gams|postini|gsuitegams|gsuitepostini|gsuitemessagesecurity|Google-Apps-For-Postini|
-	gal|lite|gsuitelite|Google-Apps-Lite|
-	gau|unlimited|gsuitebusiness|Google-Apps-Unlimited|
-	gae|enterprise|gsuiteenterprise|1010020020|
+	gal|gsl|lite|gsuitelite|Google-Apps-Lite|
+	gau|gsb|unlimited|gsuitebusiness|Google-Apps-Unlimited|
+	gae|gse|enterprise|gsuiteenterprise|1010020020|
 	gsefe|e4e|gsuiteenterpriseeducation|1010310002|
 	gsefes|e4es|gsuiteenterpriseeducationstudent|1010310003|
+	gsbau|businessarchived|gsuitebusinessarchived|
+	gseau|enterprisearchived|gsuiteenterprisearchived|
 	chrome|cdm|googlechromedevicemanagement|Google-Chrome-Device-Management|
 	coordinate|googlecoordinate|Google-Coordinate|
 	d4e|driveenterprise|drive4enterprise|
@@ -134,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>
@@ -662,16 +672,6 @@ Specify a collection of Users by directly specifying them or by specifiying item
 	(convert)|(ocr)|(ocrlanguage <Language>)|(restricted|restrict <Boolean>)|(starred|star <Boolean>)|(trashed|trash <Boolean>)|(viewed|view <Boolean>)|
 	(lastviewedbyme <Time>)|(modifieddate <Time>)|(description <String>)|(mimetype <MimeType>)|
 	(parentid <DriveFolderID>)|(parentname <DriveFolderName>)|(anyownerparentname <DriveFolderName>)|writerscantshare
-<EventAttributes> ::=
-	(anyonecanaddself)|(guestscantinviteothers)|(guestscantseeothers)|(notifyattendees)|(available)|(visibility default|public|prvate)|(tentative)|
-	(attendee <EmailAddress>)|(optionalattendee <EmailAddress>)|
-	(description <String>)|(summary <String>)|(location <String>)|(id <String>)|
-	(source <String> <URL>)|(privateproperty <PropertyKey> <PropertyValue>)|(sharedproperty <PropertyKey> <PropertyValue>)|
-	(recurrence <RRULE, EXRULE, RDATE and EXDATE line>)|
-	(start allday <Date>)|(start <Time>)|(end allday <Date>)|(end <Time>)|(timezone <Timezone>)|
-	(noreminders|(reminder <Number> email|popup|sms))|
-	(colorindex|colorid <EventColorIndex>)
-
 <GroupSettingsAttribute> ::=
 	(allowexternalmembers <Boolean>)|
 	(allowwebposting <Boolean>)|
@@ -799,7 +799,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] [location <HostName>]
 gam help

 gam batch <FileName>|- [charset <Charset>]
@@ -821,7 +821,8 @@ gam print projects [<EmailAddress>] [all|gam|<ProjectID>|(filter <String>)] [tod

 gam oauth|oauth2 create|request [<EmailAddress>]
 gam oauth|oauth2 delete|revoke
-gam oauth|oauth2 info|verify [<AccessToken>]
+gam oauth|oauth2 info|verify [accesstoken <AccessToken>] [idtoken <IDToken>] [showsecret]
+gam oauth|oauth2 refresh

 gam <UserTypeEntity> check serviceaccount

@@ -939,11 +940,57 @@ 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]

-gam calendar <CalendarItem> addevent <EventAttributes>+
-gam calendar <CalendarItem> deleteevent (id|eventid <EventID>)* (query|eventquery <QueryCalendar>)* [doit] [notifyattendees]
+<EventNotificationAttribute> ::=
+	notifyattendees|(sendnotifications <Boolean>)|(sendupdates all|enternalonly|none)
+
+The following attributes are equivalent:
+	notifyattendees - sendupdates all
+	sendnotifications false - sendupdates none
+	sendnotifications true - sendupdates all
+
+<EventAttributes> ::=
+	anyonecanaddself|
+	(attendee <EmailAddress>)|
+	available|
+	(colorindex|colorid <EventColorIndex>)
+	(description <String>)|
+	(end (allday <Date>)|<Time>)|
+	guestscantinviteothers|
+	guestscantseeothers|
+	(id <String>)|
+	(location <String>)|
+	(noreminders| (reminder <Number> email|popup|sms))|
+	(optionalattendee <EmailAddress>)|
+	(privateproperty <PropertyKey> <PropertyValue>)|
+	(recurrence <RRULE, EXRULE, RDATE and EXDATE line>)|
+	(sharedproperty <PropertyKey> <PropertyValue>)|
+	(source <String> <URL>)|
+	(start (allday <Date>)|<Time>)|
+	(summary <String>)|
+	tentative|
+	(timezone <Timezone>)|
+	(visibility default|public|prvate)
+
+<EventSelectProperty:> ::=
+	(after <Time>)|
+	(before <Time>)|
+	includeeleted|
+	includehidden|
+	(query <QueryCalendar>)|
+	(updatedmin <Time>)
+
+<EventDisplayProperty> ::=
+	(timezone <TimeZone>)
+
+gam calendar <CalendarItem> addevent <EventAttributes>+ [<EventNotificationAttribute>]
+gam calendar <CalendarItem> deleteevent id|eventid <EventID> [doit] [<EventNotificationAttribute>]
+gam calendar <CalendarItem> moveevent id|eventid <EventID> [doit] [<EventNotificationAttribute>]
 gam calendar <CalendarItem> wipe
+gam calendar <CalendarItem> printevents <EventSelectProperty>* <EventDisplayProperty>* [todrive]

 <CalendarSettings> ::=
 	summary <String>|
@@ -954,11 +1001,11 @@ gam calendar <CalendarItem> wipe
 gam calendar <CalendarItem> modify <CalendarSettings>+

 gam update cros <CrOSEntity> (<CrOSAttributes>+)|(action deprovision_same_model_replace|deprovision_different_model_replace|deprovision_retiring_device|disable|reenable [acknowledge_device_touch_requirement])
-gam info cros <CrOSEntity> [nolists] [listlimit <Number>] [start <Date>] [end <Date>]
+gam info cros <CrOSEntity> [guessaue] [nolists] [listlimit <Number>] [start <Date>] [end <Date>]
 	[basic|full|allfields] <CrOSFieldName>* [fields <CrOSFieldNameList>] [downloadfile latest|<Time>] [targetfolder <FilePath>]

 gam print cros [todrive] [(query <QueryCrOS>)|(queries <QueryCrOSList>)] [limittoou <OrgUnitItem>]
-	[orderby <CrOSOrderByFieldName> [ascending|descending]] [nolists|<CrOSListFieldName>*] [listlimit <Number>] [start <Date>] [end <Date>]
+	[orderby <CrOSOrderByFieldName> [ascending|descending]] [guessaue] [nolists|<CrOSListFieldName>*] [listlimit <Number>] [start <Date>] [end <Date>]
 	[basic|full|allfields] <CrOSFieldName>* [fields <CrOSFieldNameList>] [sortheaders]
 gam <CrOSTypeEntity> print

@@ -1045,7 +1092,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>)*
@@ -1126,9 +1173,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>]
@@ -1239,6 +1288,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,7 +1,7 @@
 python-dateutil
-dnspython
 google-api-python-client
+google-auth
 google-auth-httplib2
-google-oauth
-oauth2client
+google-auth-oauthlib==0.4.0
+httplib2>=0.13.0
 passlib
--- a/src/tools/parse-aue.py
+++ b/src/tools/parse-aue.py
@@ -0,0 +1,102 @@
+#!/usr/bin/env python3
+
+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):
+    def handle_starttag(self, tag, attrs):
+        global next_data_is_oem, next_data_is_td
+        if tag == 'h2' and attrs == [('class', 'zippy')]:
+            next_data_is_oem = True
+        elif tag == 'td':
+            next_data_is_td = True
+
+    def handle_data(self, data):
+        global oem, next_data_is_oem, next_data_is_td, data_is_date, model, printable, output_rows
+        if next_data_is_oem:
+            oem = ''.join(filter(lambda x: x in printable, data))
+            next_data_is_oem = False
+        elif next_data_is_td:
+            if data_is_date:
+                if model.lower().startswith(oem.lower()):
+                    fullname = model.lower()
+                else:
+                    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[fullname] = date
+                if fullname in exceptions:
+                    for value in exceptions[fullname]:
+                        output_rows[value] = date
+                data_is_date = False
+            else:
+                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 = {}
+printable = set(string.printable)
+exceptions = {
+        # 'AUE OEM MODEL': ['API MODEL 1', ...]
+        'acer c7 chromebook': ['acer c7 chromebook (c710)'],
+        'acer chromebook 11 (c720, c720p)': ['acer c720 chromebook', 'acer c740 chromebook'],
+        'acer chromebook 11 (cb3-111, c730, c730e)': ['chromebook 11 (c730 / cb3-111)'],
+        'acer chromebook 11 (cb3-131, c735)': ['chromebook 11 (c735)'],
+        'acer chromebook 15 (cb515-1h,cb515-1ht)': ['chromebook 15 (cb515 - 1ht / 1h)'],
+        'acer chromebook 13(cb5-311, c810)': ['acer chromebook 13 (cb5-311)'],
+        'acer chromebook 15 (cb5-571, c910)': ['acer chromebook 15 (c910 / cb5-571)'],
+        'acer chromebook 311 (c721, c733, c733u, c733t)': ['acer chromebook 311', 'chromebook 311 (c721)'],
+        'acer chromebook 315 (cb315-2h)': ['acer chromebook 315'],
+        'acer chromebook spin 311 (r721t)': ['acer chromebook 311'],
+        'acer chromebook spin 511 (r752t, r752tn)': ['acer chromebook spin 511'],
+        'acer chromebox cxi2 / cxv2': ['acer chromebox cxi2'],
+        'asus chromebook c200': ['asus chromebook c200ma'],
+        'asus chromebook c201pa': ['asus chromebook c201pa'],
+        'asus chromebook c204': ['asus chromebook c204'],
+        'asus chromebook c300': ['asus chromebook c300ma'],
+        'asus chromebook flip c213': ['asus chromebook c213na'],
+        'asus chromebox 2 (cn62)': ['asus chromebox cn62'],
+        'asus chromebox 3 (cn65)': ['asus chromebox 3'],
+        'asus chromebox (cn60)': ['asus chromebox cn60'],
+        'ctl chromebook nl7 / nl7t-360 / nl7tw-360': ['ctl chromebook nl7'],
+        'ctl chromebook tablet tx1 for education': ['ctl chromebook tab tx1'],
+        'ctl nl61 chromebook': ['mecer v2 chromebook'],
+        'google cr-48': ['cr-48'],
+        'haier chromebook 11e': ['chromebook pcm-116e', 'lumos education chromebook'],
+        'haier chromebook 11': ['true idc chromebook 11', 'xolo chromebook'],
+        'hisense chromebook 11': ['epik 11.6" chromebook  elb1101', 'mecer chromebook', 'videonet chromebook bl10'],
+        'hp chromebook 11 g1': ['hp chromebook 11 1100-1199 / hp chromebook 11 g1'],
+        'hp chromebook 11 g2': ['hp chromebook 11 2000-2099 / hp chromebook 11 g2'],
+        'hp chromebook 11 g3': ['hp chromebook 11 2100-2199 / hp chromebook 11 g3'],
+        'hp chromebook 11 g4/g4 ee': ['hp chromebook 11 2200-2299 / hp chromebook 11 g4/g4 ee'],
+        'hp chromebook 11 g5': ['hp chromebook 11 g5 / hp chromebook 11-vxxx'],
+        'hp chromebook 14a g5': ['hp chromebook 14 db0000-db0999'],
+        'hp chromebook 14 g3': ['hp chromebook 14 x000-x999 / hp chromebook 14 g3'],
+        'hp chromebook 14 g4': ['hp chromebook 14 ak000-099 / hp chromebook 14 g4'],
+        'hp chromebook 14 g5': ['hp chromebook 14 / hp chromebook 14 g5'],
+        'hp chromebox g1': ['hp chromebox cb1-(000-099) / hp chromebox g1/ hp chromebox for meetings'],
+        'lenovo ideapad c330 chromebook': ['lenovo chromebook c330'],
+        'lenovo ideapad s330 chromebook': ['lenovo chromebook s330'],
+        'lenovo n21 chromebook': ['asi chromebook', 'crambo chromebook', 'jp sa couto chromebook', 'rgs education chromebook', 'true idc chromebook', 'videonet chromebook', 'consumer chromebook'],
+        'lenovo thinkpad 11e 3rd gen chromebook': ['thinkpad 11e chromebook 3rd gen (yoga/clamshell)'],
+        'lenovo thinkpad 11e 4th gen chromebook': ['lenovo thinkpad 11e chromebook (4th gen)/lenovo thinkpad yoga 11e chromebook (4th gen)'],
+        'lenovo thinkpad 13': ['thinkpad 13 chromebook'],
+        'poin2 chromebook 14': ['poin2 chromebook 11c'],
+        'prowise chromebook eduline': ['viglen chromebook 11c'],
+        'prowise chromebook entryline': ['prowise 11.6\" entry line chromebook'],
+        'prowise chromebook proline': ['prowise proline chromebook'],
+        'samsung chromebook - xe303': ['samsung chromebook'],
+        }
+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')
+parser = MyHTMLParser()
+parser.feed(auepage.content.decode('utf-8'))
+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
@@ -8,33 +8,34 @@ else
  export dist=$(lsb_release --codename --short)
  echo "We are running on Ubuntu $dist"
  echo "RUNNING: apt update..."
-  sudo apt-get --yes update > /dev/null
+  sudo apt-get -qq --yes update > /dev/null
  echo "RUNNING: apt dist-upgrade..."
-  sudo apt-get --yes dist-upgrade > /dev/null
+  sudo apt-get -qq --yes dist-upgrade > /dev/null
  echo "Installing build tools..."
-  sudo apt-get --yes install build-essential
+  sudo apt-get -qq --yes install build-essential

  echo "Installing deps for python3"
  sudo cp -v /etc/apt/sources.list /tmp
-  chmod a+rwx /tmp/sources.list
+  sudo chmod a+rwx /tmp/sources.list
  echo "deb-src http://archive.ubuntu.com/ubuntu/ $dist main" >> /tmp/sources.list
  sudo cp -v /tmp/sources.list /etc/apt
-  sudo apt-get --yes update > /dev/null
-  sudo apt-get --yes build-dep python3
+  sudo apt-get -qq --yes update > /dev/null
+  sudo apt-get -qq --yes build-dep python3 > /dev/null

  mypath=$HOME
  echo "My Path is $mypath"
  cpucount=$(nproc --all)
  echo "This device has $cpucount CPUs for compiling..."

-
+  cd ~/pybuild
  # Compile latest OpenSSL
-  OPENSSL_VER=1.1.1b
-  wget --quiet https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz
-  echo "Extracting OpenSSL..."
-  tar xf openssl-$OPENSSL_VER.tar.gz
-  cd openssl-$OPENSSL_VER
-  echo "Compiling OpenSSL $OPENSSL_VER..."
+  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
@@ -43,16 +44,29 @@ else
  export LD_LIBRARY_PATH=~/ssl/lib
  cd ~

+  cd ~/pybuild
  # Compile latest Python
-  PYTHON_VER=3.7.3
-  wget --quiet https://www.python.org/ftp/python/$PYTHON_VER/Python-$PYTHON_VER.tar.xz
-  echo "Extracting Python..."
-  tar xf Python-$PYTHON_VER.tar.xz
-  cd Python-$PYTHON_VER
-  echo "Compiling Python $PYTHON_VER..."
-  ./configure --with-openssl=$mypath/ssl --enable-shared \
-	--prefix=$mypath/python --with-ensurepip=upgrade > /dev/null
+  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 "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
+  fi
  echo "Installing Python..."
  make install > /dev/null
  cd ~
@@ -63,9 +77,27 @@ else

  $python -V

-  if [[ "$dist" == "xenial" ]]; then
+  if [[ "$dist" == "precise" ]]; then
    echo "Installing deps for StaticX..."
-    sudo apt-get install --yes patchelf scons musl
+    sudo apt-get install --yes scons
+    if [ ! -d patchelf-$PATCHELF_VERSION ]; then
+      echo "Downloading PatchELF $PATCHELF_VERSION"
+      wget https://nixos.org/releases/patchelf/patchelf-$PATCHELF_VERSION/patchelf-$PATCHELF_VERSION.tar.bz2
+      tar xf patchelf-$PATCHELF_VERSION.tar.bz2
+      cd patchelf-$PATCHELF_VERSION
+      ./configure
+      make
+      sudo make install
+    fi
+    if [ ! -d musl=$MUSL_VERSION ]; then
+      echo "Downloading MUSL $MUSL_VERSION"
+      wget https://www.musl-libc.org/releases/musl-$MUSL_VERSION.tar.gz
+      tar xf musl-$MUSL_VERSION.tar.gz
+      cd musl-$MUSL_VERSION
+      ./configure
+      make
+      sudo make install
+    fi
    $pip install git+https://github.com/JonathonReinhart/staticx.git@master
  fi
  $pip install pyinstaller
--- a/src/travis/linux-x86_64-install.sh
+++ b/src/travis/linux-x86_64-install.sh
@@ -18,7 +18,7 @@ else
  du -h gam/gam
  time $gam version extended

-  if [[ "$dist" == "xenial" ]]; then
+  if [[ "$dist" == "precise" ]]; then
    GAM_LEGACY_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-legacy.tar.xz
    $python -OO -m staticx gam/gam gam/gam-staticx
    strip gam/gam-staticx
--- a/src/travis/osx-x86_64-before-install.sh
+++ b/src/travis/osx-x86_64-before-install.sh
@@ -3,31 +3,45 @@ whereibelong=$(pwd)
 echo "Brew installing xz..."
 brew install xz > /dev/null

+cd ~/pybuild
 # Compile latest OpenSSL
-OPENSSL_VER=1.1.1b
-wget --quiet https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz
-echo "Extracting OpenSSL..."
-tar xf openssl-$OPENSSL_VER.tar.gz
-cd openssl-$OPENSSL_VER
-echo "Compiling OpenSSL $OPENSSL_VER..."
+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 ~
+cd ~/pybuild

 # Compile latest Python
-PYTHON_VER=3.7.3
-wget --quiet https://www.python.org/ftp/python/$PYTHON_VER/Python-$PYTHON_VER.tar.xz
-echo "Extracting Python..."
-tar xf Python-$PYTHON_VER.tar.xz
-cd Python-$PYTHON_VER
-echo "Compiling Python $PYTHON_VER..."
-./configure --with-openssl=$mypath/ssl --enable-shared \
-		--prefix=$mypath/python --with-ensurepip=upgrade > /dev/null
+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 ~
--- a/src/travis/windows-x86-before-install.sh
+++ b/src/travis/windows-x86-before-install.sh
@@ -1,9 +1,25 @@
+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"
 cinst -y --forcex86 python3
-cinst -y --forcex86 openssl.light
-cp -v /c/Program\ Files/OpenSSL/*.dll /c/Python37/DLLs
-export PATH=$PATH:/c/Python37/scripts
 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
+export PATH=$PATH:/c/Python37/scripts
+cd $mypath
 pip install --upgrade pip
 pip freeze > upgrades.txt
 pip install --upgrade -r upgrades.txt
--- a/src/travis/windows-x86_64-before-install.sh
+++ b/src/travis/windows-x86_64-before-install.sh
@@ -1,9 +1,25 @@
+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"
 cinst -y python3
-cinst -y openssl.light
-cp -v /c/Program\ Files/OpenSSL/bin/*.dll /c/Python37/DLLs
-export PATH=$PATH:/c/Python37/scripts
 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
+export PATH=$PATH:/c/Python37/scripts
+cd $mypath
 pip install --upgrade pip
 pip freeze > upgrades.txt
 pip install --upgrade -r upgrades.txt
--- a/src/utils.py
+++ b/src/utils.py
@@ -1,18 +1,20 @@
-import collections
+import datetime
 import re
 import sys
 from html.entities import name2codepoint
 from html.parser import HTMLParser
-from var import GM_Globals, GM_WINDOWS, GM_SYS_ENCODING

 ONE_KILO_BYTES = 1000
 ONE_MEGA_BYTES = 1000000
 ONE_GIGA_BYTES = 1000000000

+
 def convertUTF8(data):
  return data

+
 class _DeHTMLParser(HTMLParser):
+
  def __init__(self):
    HTMLParser.__init__(self)
    self.__text = []
@@ -28,7 +30,7 @@ class _DeHTMLParser(HTMLParser):
    if cp:
      self.__text.append(chr(cp))
    else:
-      self.__text.append('&'+name)
+      self.__text.append('&' + name)

  def handle_starttag(self, tag, attrs):
    if tag == 'p':
@@ -51,7 +53,9 @@ class _DeHTMLParser(HTMLParser):
      self.__text.append('\n\n')

  def text(self):
-    return re.sub(r'\n{2}\n+', '\n\n', re.sub(r'\n +', '\n', ''.join(self.__text))).strip()
+    return re.sub(r'\n{2}\n+', '\n\n',
+                  re.sub(r'\n +', '\n', ''.join(self.__text))).strip()
+

 def dehtml(text):
  try:
@@ -64,8 +68,20 @@ def dehtml(text):
    print_exc(file=sys.stderr)
    return text

+
 def indentMultiLineText(message, n=0):
-  return message.replace('\n', '\n{0}'.format(' '*n)).rstrip()
+  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:
@@ -73,10 +89,11 @@ def formatFileSize(fileSize):
  if fileSize < ONE_KILO_BYTES:
    return '1kb'
  if fileSize < ONE_MEGA_BYTES:
-    return '{0}kb'.format(fileSize//ONE_KILO_BYTES)
+    return '{0}kb'.format(fileSize // ONE_KILO_BYTES)
  if fileSize < ONE_GIGA_BYTES:
-    return '{0}mb'.format(fileSize//ONE_MEGA_BYTES)
-  return '{0}gb'.format(fileSize//ONE_GIGA_BYTES)
+    return '{0}mb'.format(fileSize // ONE_MEGA_BYTES)
+  return '{0}gb'.format(fileSize // ONE_GIGA_BYTES)
+

 def formatMilliSeconds(millis):
  seconds, millis = divmod(millis, 1000)
--- a/src/var.py
+++ b/src/var.py
@@ -1,11 +1,12 @@
 import os
 import ssl
+import string
 import sys
 import platform
 import re

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

 GAM_URL = 'https://git.io/gam'
@@ -19,7 +20,7 @@ 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']
@@ -62,11 +63,15 @@ SKUS = {
  'Google-Apps-For-Postini': {
    'product': 'Google-Apps', 'aliases': ['gams', 'postini', 'gsuitegams', 'gsuitepostini', 'gsuitemessagesecurity'], 'displayName': 'G Suite Message Security'},
  'Google-Apps-Lite': {
-    'product': 'Google-Apps', 'aliases': ['gal', 'lite', 'gsuitelite'], 'displayName': 'G Suite Lite'},
+    'product': 'Google-Apps', 'aliases': ['gal', 'gsl', 'lite', 'gsuitelite'], 'displayName': 'G Suite Lite'},
  'Google-Apps-Unlimited': {
-    'product': 'Google-Apps', 'aliases': ['gau', 'unlimited', 'gsuitebusiness'], 'displayName': 'G Suite Business'},
+    'product': 'Google-Apps', 'aliases': ['gau', 'gsb', 'unlimited', 'gsuitebusiness'], 'displayName': 'G Suite Business'},
  '1010020020': {
-    'product': 'Google-Apps', 'aliases': ['gae', 'enterprise', 'gsuiteenterprise'], 'displayName': 'G Suite Enterprise'},
+    'product': 'Google-Apps', 'aliases': ['gae', 'gse', 'enterprise', 'gsuiteenterprise'], 'displayName': 'G Suite Enterprise'},
+  '1010340002': {
+    'product': '101034', 'aliases': ['gsbau', 'businessarchived', 'gsuitebusinessarchived'], 'displayName': 'G Suite Business Archived'},
+  '1010340001': {
+    'product': '101034', 'aliases': ['gseau', 'enterprisearchived', 'gsuiteenterprisearchived'], 'displayName': 'G Suite Enterprise Archived'},
  '1010060001': {
    'product': 'Google-Apps', 'aliases': ['d4e', 'driveenterprise', 'drive4enterprise'], 'displayName': 'Drive Enterprise'},
  'Google-Drive-storage-20GB': {
@@ -97,6 +102,20 @@ SKUS = {
    'product': 'Google-Chrome-Device-Management', 'aliases': ['chrome', 'cdm', 'googlechromedevicemanagement'], 'displayName': 'Google Chrome Device Management'}
  }

+PRODUCTID_NAME_MAPPINGS = {
+  '101001': 'Cloud Identity Free',
+  '101005': 'Cloud Identity Premium',
+  '101006': 'Drive Enterprise',
+  '101031': 'G Suite Enterprise for Education',
+  '101033': 'Google Voice',
+  '101034': 'G Suite Archived',
+  'Google-Apps': 'G Suite',
+  'Google-Chrome-Device-Management': 'Google Chrome Device Management',
+  'Google-Coordinate': 'Google Coordinate',
+  'Google-Drive-storage': 'Google Drive Storage',
+  'Google-Vault': 'Google Vault',
+  }
+
 # Legacy APIs that use v1 discovery. Newer APIs should all use v2.
 V1_DISCOVERY_APIS = {
  'admin',
@@ -411,6 +430,18 @@ DOCUMENT_FORMATS_MAP = {
                  {'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 = {
  'ARCHIVE': 'archive',
  'DELETE': 'trash',
@@ -452,6 +483,12 @@ RT_CLOSE_PATTERN = re.compile(r'{/RT}')
 RT_STRIP_PATTERN = re.compile(r'(?s){RT}.*?{/RT}')
 RT_TAG_REPLACE_PATTERN = re.compile(r'{(.*?)}')

+LOWERNUMERIC_CHARS = string.ascii_lowercase+string.digits
+ALPHANUMERIC_CHARS = LOWERNUMERIC_CHARS+string.ascii_uppercase
+URL_SAFE_CHARS = ALPHANUMERIC_CHARS+'-._~'
+PASSWORD_SAFE_CHARS = ALPHANUMERIC_CHARS+string.punctuation+' '
+FILENAME_SAFE_CHARS = ALPHANUMERIC_CHARS+'-_.() '
+
 FILTER_ADD_LABEL_TO_ARGUMENT_MAP = {
  'IMPORTANT': 'important',
  'STARRED': 'star',
@@ -555,6 +592,8 @@ CROS_SCALAR_PROPERTY_PRINT_ORDER = [
  'lastEnrollmentTime',
  'orderNumber',
  'supportEndDate',
+  'guessedAUEDate',
+  'guessedAUEModel',
  'tpmVersionInfo',
  'willAutoRenew',
  ]
@@ -691,6 +730,8 @@ GC_CONFIG_DIR = 'config_dir'
 GC_CUSTOMER_ID = 'customer_id'
 # If debug_level > 0: extra_args[u'prettyPrint'] = True, httplib2.debuglevel = gam_debug_level, appsObj.debug = True
 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
@@ -747,6 +788,7 @@ GC_Defaults = {
  GC_CONFIG_DIR: '',
  GC_CUSTOMER_ID: MY_CUSTOMER,
  GC_DEBUG_LEVEL: 0,
+  GC_DECODED_ID_TOKEN: '',
  GC_DEVICE_MAX_RESULTS: 500,
  GC_DOMAIN: '',
  GC_DRIVE_DIR: '',
@@ -797,6 +839,7 @@ GC_VAR_INFO = {
  GC_CONFIG_DIR: {GC_VAR_TYPE: GC_TYPE_DIRECTORY},
  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},
@@ -832,11 +875,15 @@ CLEAR_NONE_ARGUMENT = ['clear', 'none',]
 #
 MESSAGE_API_ACCESS_CONFIG = 'API access is configured in your Control Panel under: Security-Show more-Advanced settings-Manage API client access'
 MESSAGE_API_ACCESS_DENIED = 'API access Denied.\n\nPlease make sure the Client ID: {0} is authorized for the API Scope(s): {1}'
+MESSAGE_CONSOLE_AUTHORIZATION_PROMPT = '\nGo to the following link in your browser:\n\n\t{url}\n'
+MESSAGE_CONSOLE_AUTHORIZATION_CODE = 'Enter verification code: '
 MESSAGE_GAM_EXITING_FOR_UPDATE = 'GAM is now exiting so that you can overwrite this old version with the latest release'
 MESSAGE_GAM_OUT_OF_MEMORY = 'GAM has run out of memory. If this is a large G Suite instance, you should use a 64-bit version of GAM on Windows or a 64-bit version of Python on other systems.'
 MESSAGE_HEADER_NOT_FOUND_IN_CSV_HEADERS = 'Header "{0}" not found in CSV headers of "{1}".'
 MESSAGE_HIT_CONTROL_C_TO_UPDATE = '\n\nHit CTRL+C to visit the GAM website and download the latest release or wait 15 seconds continue with this boring old version. GAM won\'t bother you with this announcement for 1 week or you can create a file named noupdatecheck.txt in the same location as gam.py or gam.exe and GAM won\'t ever check for updates.'
 MESSAGE_INVALID_JSON = 'The file {0} has an invalid format.'
+MESSAGE_LOCAL_SERVER_AUTHORIZATION_PROMPT = '\nYour browser has been opened to visit:\n\n\t{url}\n\nIf your browser is on a different machine then press CTRL+C and create a file called nobrowser.txt in the same folder as GAM.\n'
+MESSAGE_LOCAL_SERVER_SUCCESS = 'The authentication flow has completed. You may close this browser window and return to GAM.'
 MESSAGE_NO_DISCOVERY_INFORMATION = 'No online discovery doc and {0} does not exist locally'
 MESSAGE_NO_TRANSFER_LACK_OF_DISK_SPACE = 'Cowardly refusing to perform migration due to lack of target drive space. Source size: {0}mb Target Free: {1}mb'
 MESSAGE_RESULTS_TOO_LARGE_FOR_GOOGLE_SPREADSHEET = 'Results are too large for Google Spreadsheets. Uploading as a regular CSV file.'
Author	SHA1	Message	Date
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
Jay Lee	1cb96cf057	Print Calendars ACLs, delete by ACL id	2019-06-12 14:25:10 -04:00
Jay Lee	2bc8a114c1	GAM 4.87	2019-06-12 13:46:14 -04:00
Ross Scroggs	7f183b9edc	Prevent traps when filtering CSV rows (#951 )	2019-06-12 13:44:01 -04:00
Jay Lee	f86be17834	Merge branch 'master' of https://github.com/jay0lee/GAM	2019-06-12 13:42:48 -04:00
Jay Lee	6854e3729a	prefer id_token_jwt if present in oauth2.txt. Fixes #952	2019-06-12 13:41:16 -04:00
Ross Scroggs	5f48b1e16f	httplib2 throws RuntimeError when OpenSSL is below 1.1 (#948 )	2019-06-07 19:15:31 -04:00
Jay Lee	aea92be8d3	Update .travis.yml	2019-06-07 17:15:16 -04:00
Jay Lee	b4c5d6c626	merge changes	2019-06-07 16:30:51 -04:00
Jay Lee	0e2845082b	include headers on version request	2019-06-07 16:29:28 -04:00
Ross Scroggs	705a40d035	Handle unknown server in gam version extended location (#947 ) Line 847 drops a training space	2019-06-07 16:11:34 -04:00
Jay Lee	f85a072708	downgrade patchelf to compile on precise	2019-06-07 15:34:01 -04:00
Jay Lee	e990387660	fix precise patchelf compile	2019-06-07 15:21:11 -04:00
Jay Lee	feb76f504c	build musl and patchelf	2019-06-07 14:21:52 -04:00
Jay Lee	6a33173a49	Use precise for legacy build	2019-06-07 13:58:16 -04:00
Jay Lee	5e8e9765fa	use	2019-06-07 12:09:20 -04:00
Jay Lee	2a6cdb9b14	fix rule	2019-06-07 11:33:52 -04:00
Jay Lee	642c0fa216	Merge branch 'master' of https://github.com/jay0lee/GAM	2019-06-07 11:28:36 -04:00
Jay Lee	9d5e79725c	generalize TLS test	2019-06-07 11:28:16 -04:00
Ross Scroggs	db301d2635	Fix case where event has no parameters (#946 )	2019-06-07 10:08:49 -04:00
Jay Lee	d7283d17e2	AUE updates	2019-06-07 09:44:54 -04:00
Ross Scroggs	bd7b58ad43	Pylint cleanup (#944 ) * Pylint cleanup * Handle Boolean values in activity cleanup	2019-06-07 05:28:10 -04:00
Jay Lee	27c0e5f8a6	use httplib2 TLS min/max feature, standardize http obj creation	2019-06-06 16:40:23 -04:00
Jay Lee	7a439a3e07	GAM 4.86	2019-06-06 13:23:50 -04:00
Jay Lee	fff6e6717f	Merge branch 'master' of https://github.com/jay0lee/GAM	2019-06-06 12:31:21 -04:00
Jay Lee	2671764e99	cleanup report token and other activity reports	2019-06-06 12:30:40 -04:00
Ross Scroggs	4f12e2affb	Various cleanup (#943 ) * Various cleanup 146, 152 - pylint 1752, 1762 - Python 3 1742, 7695/7703, 7773/7778 - Standardize getting project id from client_secrets.json * Fix bug in update group; specifying delivery_option causes failure	2019-06-06 12:29:59 -04:00
Jay Lee	e1faab524b	OpenSSL 1.1.1c	2019-05-30 12:57:58 -04:00
Jay Lee	6c5585d059	standardize char choice strings	2019-05-30 10:12:11 -04:00
Jay Lee	dc678dd510	include punctuation in random passwords	2019-05-29 19:19:25 -04:00
Jay Lee	7b70c5a745	switch back to choice() over sample() sample() decreases randomness because a char will only be chosen from the pool once for the string. Consider: random.sample(string.digits, 10) you'll always get the numbers 0-9 in some random order whereas: random.choice(string.digits) for _ in range(10) will give you greater randomness as there are 10 choices for every char.	2019-05-29 16:58:08 -04:00
Jay Lee	2e8190ce29	Merge branch 'master' of https://github.com/jay0lee/GAM	2019-05-29 16:03:16 -04:00
Jay Lee	14b09b91df	Temporarily implement OAuth 2.0 PKCE Add OAuth 2.0 PKCE support while we wait for upstream google-auth-oauthlib to implement. See https://tools.ietf.org/html/rfc7636 for more details.	2019-05-29 16:00:10 -04:00
Ross Scroggs	b77d7eaadc	Mr. Consistency strikes again (#941 )	2019-05-29 14:22:55 -04:00
Jay Lee	c68e0bfbc4	Remove SA DwD enablement steps on project create The step to enable domain-wide delegation for a service account is unnecessary. Even when unchecked, the service account gets access to the scopes that admin has granted in admin console (gam user <email> check serviceaccount).	2019-05-28 14:02:46 -04:00
Jay Lee	8a26e99dfc	don't store scopes	2019-05-28 10:49:10 -04:00
Ross Scroggs	9e2dd11617	Handle missing credentials, e.g., two gam oauth deletes in a row (#938 ) * Handle missing credentials, e.g., two gam oauth deletes in a row * Add scopes back to oauth2.txt If scopes are in oauth2.txt, an advanced gam user can use it unchanged. My code does preemptive error checking to detect API scope mismatches early on. * Suppress token details unless requested * Bring on the details * Update scopes used to make oauth2.txt	2019-05-27 10:25:38 -04:00
Ross Scroggs	19f01007f4	Clean up random string generation, cleanup (#937 ) * Clean up random string generation You don't want printable. string.printable: String of characters which are considered printable. This is a combination of digits, letters, punctuation, and whitespace. string.whitespace: A string containing all characters that are considered whitespace. On most systems this includes the characters space, tab, linefeed, return, formfeed, and vertical tab. * Cleanup	2019-05-25 17:40:20 -04:00
Jay Lee	2c4bbbbbfb	cleanup random string generation	2019-05-23 21:26:41 -04:00
Jay Lee	71536c50a2	set auth prompts equivalent to what we had with oauth2client	2019-05-23 11:10:24 -04:00
Jay Lee	1d118a9ca3	use oldest domain creation as customer creation date	2019-05-23 10:19:37 -04:00
Jay Lee	94f6c45291	expand info for gam oauth info	2019-05-22 13:00:06 -04:00
Jay Lee	fd4a64f6a7	gam oauth refresh to force refresh	2019-05-22 12:42:44 -04:00
Jay Lee	d8ba15ab98	iss seems to be with and without https://	2019-05-22 12:22:57 -04:00
Jay Lee	a0a2e1359e	more cleanup for google-auth	2019-05-22 12:12:31 -04:00
Jay Lee	34b32da1e6	change deps	2019-05-22 10:33:42 -04:00
Jay Lee	f9af688bea	replace deprecaed oauth2client with google-auth Early work, much remains to clean things up and patch all the remaining holes...	2019-05-22 10:17:00 -04:00
Jay Lee	8829bc3a65	filter activity reports by orgUnitID	2019-05-20 10:44:51 -04:00
Jay Lee	59d8e5a853	change order to allow more time for processes to finish	2019-05-18 10:40:03 -04:00
Ross Scroggs	fddd77e87c	Update events (#932 ) * Update printevents The column header should be calendarId not primaryEmail as the user could specify a resource calendar for instance. The order should be calendarId,id: major,minor as in other print commands. * Event cleanup * More event cleanup	2019-05-18 10:10:53 -04:00
ejochman	eed3fb1ed9	Remove unused imports (#931 ) Also corrects identified common misspellings	2019-05-18 10:08:02 -04:00
Jay Lee	fbaf9272a8	Update windows-x86-before-install.sh	2019-05-18 08:37:52 -04:00
Jay Lee	97df7c75b1	Update windows-x86_64-before-install.sh	2019-05-18 08:36:06 -04:00
Jay Lee	358892869b	fix paths	2019-05-18 08:05:31 -04:00
Jay Lee	7cca371c22	Update windows-x86_64-before-install.sh	2019-05-18 07:23:16 -04:00
Jay Lee	8b1c8b36ce	Update windows-x86-before-install.sh	2019-05-18 07:21:47 -04:00
Jay Lee	86154adc92	full paths	2019-05-17 22:17:31 -04:00
Jay Lee	bfc0b57f62	fix cp	2019-05-17 21:54:16 -04:00
Jay Lee	d67110e771	check for OpenSSL version	2019-05-17 21:40:01 -04:00
Jay Lee	2d7c382c2f	figure out OpenSSL silent install	2019-05-17 21:38:34 -04:00
Jay Lee	4536cd13ef	MainInstaller sub-folder	2019-05-17 17:27:14 -04:00
Jay Lee	627db97b30	use 7-z for extract	2019-05-17 16:45:40 -04:00
Jay Lee	bbdce9536b	[ not {	2019-05-17 16:15:27 -04:00
Jay Lee	5f0644d924	extract msi for openssl	2019-05-17 16:01:08 -04:00
Jay Lee	0b5dffc5a5	more fi	2019-05-17 15:22:54 -04:00
Jay Lee	33c85e9ed6	allow PRs to succeed, Win SSL 1.1.1b	2019-05-17 15:18:41 -04:00
Jay Lee	c04164e47a	fix osx build	2019-05-17 14:17:21 -04:00
Jay Lee	06e7545f33	fix before-install	2019-05-17 13:26:12 -04:00
Jay Lee	0399d96fd4	cache ssl and python, optimize python	2019-05-17 13:18:12 -04:00
Jay Lee	347688ac8c	Merge branch 'master' of https://github.com/jay0lee/GAM	2019-05-17 12:07:54 -04:00
Jay Lee	37ce64acb7	print and move events	2019-05-17 12:07:24 -04:00
Ross Scroggs	4b8bc4e7ea	Fix Issue #917 (#930 )	2019-05-17 09:28:28 -04:00
Ross Scroggs	d9ba83217f	Update parse-aue.py (#929 )	2019-05-16 14:26:19 -04:00
Jay Lee	1d658ca1ac	GAM 4.85	2019-05-16 12:39:49 -04:00
Jay Lee	65f94ff465	lowercase on AUE guess, many more exceptions	2019-05-16 11:55:37 -04:00
Ross Scroggs	1b010fbd07	Optimize AUE guessing (#928 ) Only look up a model once, cache the result	2019-05-16 11:44:05 -04:00
Ross Scroggs	a1bce42387	Update AUE exceptions (#927 )	2019-05-15 20:29:37 -04:00
Ross Scroggs	4808f18ca0	Cleanup guessAUE (#926 )	2019-05-15 18:05:32 -04:00
Jay Lee	b41baf19b4	another model	2019-05-15 16:42:36 -04:00
Jay Lee	9d78fa8825	GAM 4.84	2019-05-15 16:23:07 -04:00
Jay Lee	2a6a424ce0	AUE is 1st of month, fix few models	2019-05-15 16:20:48 -04:00
Jay Lee	c05c040241	Guess CrOS AUE date	2019-05-15 12:30:22 -04:00
Ross Scroggs	3d3f2b535b	Fix bug, encoded deviceId not included in output (#924 )	2019-05-14 10:42:10 -04:00
Ross Scroggs	49bf1f675a	Code cleanup (#923 ) keys(), we don't need no stinkin' keys()	2019-05-12 17:08:13 -04:00
Ross Scroggs	50f3ac493c	Update GamCommands.txt (#922 )	2019-05-12 12:39:31 -04:00
Jay Lee	690302f2b3	Full support for archived user	2019-05-11 11:24:06 -04:00