httplib2 throws RuntimeError when OpenSSL is below 1.1 (#948)

Line 847 drops a training space

.travis.yml

@@ -1,35 +1,129 @@
 if: tag IS blank
 
+env:
+  global:
+    - BUILD_PYTHON_VERSION=3.7.3
+    - 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="
+    - secure: "CPsDgSoZIHLyjpUbYEsx1GbB+UZcPXCEsz9qT6XRM+qMFKLlSnHxoJ7gMrJtqfjTh+1gLB3UTjQjFr+jAenqLWzaJh7Zdtpg9BOG6aXC8CAi1h0U5ZMNSA/+5lQxOXuhN8HmXI1r8xPNRFXBdZFea+072/2HJTwmgYlVTTQ8FrbXQJCzs2cFqxnVeFmuG3N49AJuoy3B+P2DMpqPzABbQt7Jf5H9Foq+16iXxhRkYA8/8H2nF7ZE8IdJuRpqhBUoPF/8Mt2QBLIlvNIdIzFEy2O7ZhwL9Dt08AG9v5c91QPzjsLok2e+5hFGaeMpGQJCE1V3uHyrOAeyZs1QYr7qBWbjQCVh0Phxz9yOA9RPfnQdjyJTq4QEj6vVYvCi5K/CGp/DnnLnGyYJKZOt7nBx02fTVI136UXqt29eF5NRkCpnUqah2s0OXkijsw5Y9LsbwiUxELKtCthESOwN8e/ZNvn/gjPfZWIaB0gupRNugL8Xo9Cx6vFmaW8wzm1IutJvo1mWvkWMvuYYjvd4aDyP6s7PFnSX7DoD/pfxoQuzjwHO2OD93nCOx0ofnNojLNooeJPKLikiwS4qKc8exWd+TlnccKSkXO8Y8S+XRgeE652YNlf+9DH79lNLeK0N0W2tRExX5JaEyJQCuvK0WZi02kxvjmUHhwLAOv9ueC2UCRs="
+    - secure: "JMv9mkSQBJXvUznXcyvngFaOfd2fHYEQQTH8BnS03pqAL0HkWSheG/R2HFJlJv1VJ9MDMf+wVzwMvU/kzkOT68nIgyFWnLBkT6fw+Mw7t/dG96/nOh7DPuaTVzKS0xRbMhDaqZOA9GW13TVnpVdIw79vbhQM69N9Gj80j8oM1cHgMi+fkJSDU3EN/vMJOGKSB3DTpyqAG/nYyZ38tLib8ic12za/YL3HIu8QRHa3fr37+cyrVKgGebGg++yK34p8lC1W4apiO30drmHVQhKWrWnmdcssdGmVM7NystMGGAzUwsJcmRFJuREv1LXiijDzjIRVduceeRYgPi1KHB5ZdL9vji0gM1eHYZZefhcJb6WgPDbCtbjdlCId4v+1bNfsh+dMmhM+vBZDtDEt3UC3MBeYTmklQT2w9zCXHuPBQigj7W4zLm6GxnAXife0SQMfmr736QBvSLUJWtd2tRgS+dRG/LvWxrP5Urvfgs8iRtEVZLDpRR+bSjvLs1UEKLN13KMKYuVwieHbxJn2kY7d5wmZVBYdaokl0yrTkZZ6J9xIphxM8GXJU1BnMZY9zn+Xq3jm576QYnNYUwCtUjOis00Ct4UVuuFqIqZ7bJL7GT4AHTENAk+9GtXVCo3/jnv161rxgoSdnUG6VmrpnyA9jSpcIvMVcE129oghBJ2+PkU="
+    - secure: "otePbb9W6CAuwzayL0dDAvCryzF2s5HHAIytvMW/xnzOuRMR03lumj9bhg56YCB/nIuTncAjToYmsMh2Acrp1Xcx8/DzqKse1K9nkfJgsB+EYeXmy8pVJnCxhHeLCzUPJjUfRoPBm+5GHAkeoviUyxenwbOFm3/Uhtay7i2ZU8K1FsECqx4FZXVh8rrGHqFGzHNimqDDvFUQM6f9a+BevEio8+/aDooaFfvVqPixDYXpi2+99DB/0hZKwcUpj6pOUUszATkAl0kJdOSWI6E7bQa63i6SfhcBNHfvbDqhpcAGs1TIXHbXwWGfySABKgT9mkq64CY3bc/QZ6HeWe6P5tJmt4mGBxDMOWMYj4qtCskQCCCiY9+sCx61Sj8W5w8exjQvvvFA088cKtbCKAx8FIil4CuYPtIjDQFkiNI2bC6BmkUen7qe4z7dSF2AZPb6CuSsBjoXL8Ezle3e1pRrkR+SYbxMSaZVcQoG8hinTqaXhlS5gXi97ZzRrJWn3tUB6JWEBeEkIfTJmrJolbLYIMcADNhKenrW8k6nV32JkvMsCgMFCIkJsIZeuQ9ZYgSZ3CXPODux/D2/4/gNa+353Fs3DTlDQxRTgoaYi9UDIRrKZAkoELFclxuGSKMCCheevQ8FMCmXfxUocwLSgjlO7g4rTJa9Kggn7VltucXiVWY="
+    - secure: "WKdB+WpZG/7SKpPpgM6DAwzVg0QQuxFMJEZE324pagJ74xv+GlObTLm6kU4SAZf6TuRSChTXDAD4paJXkxpq3LlXjp9aKxPASbG5PgZMnGL6bZ40c/UUqrwVy2HLnXPKSNuDBX1RidGXmH3u4YvufjguNnlOLvHYfMHIRGjiEL4ZvC38GB/3YDmID1zI6w8NzTCpFvxeNdg1qhhOBUKyt+icRUwBu8DfgLidzTrO0j5jo3UeqO/w3E9t3nnRgSiO25mBYwWySm1QBK1VS3F5iG9jo1J6GKMOFbWi3lOBoqnWotpfwID+p1vMNX35phHwmMrtoBYfMTV4A2CvQpGyQhn58qyMoKnhLz+NIOxlHN83qcu65bTMG+7ji0pgUl3jhp3ZPyWUjRYQpoVAg5f3UAnUzJgBrOUC0N60ukJVacT/kvkO10CLfz+0+eefW53r+GCkTi2m8iDezZn1olinpLs+Mt0M4VfQ52RVtq3WB6uxN7RjgtrK5XGi2zVAsvfHp+vqFQ6uu+iioiWNji88cTlMuKheo+FWwozNQzd8+4Vxe9w01mLek57Q0dpXiKWL3vMS4Qc4T9E6UzutllDyg/c61LW6Afcqw3jL4HN0UNG3zFefno47oKrmB13HcxakLEC8sdNfE1kWGvB7jqD0snXsz/8rz7rf0IqnK0kaCAc="
+    - secure: "Lah0Q4bWyEJXTBLZHCNkuEuU5wlDQzLF6aQwW47RyVtyRDYW8uQRQFkbb/3oj4QAAgXl0sOcDFnRaaWmlOStPIIYKKVY8Mk6ufyDCz8inWoPNJoSbdqbAi761HacGUsEfSNDrPNB7fst47UZaX7WNAO3q1QjCCGSEJQVpJE2MDAjcSJhAgLPt3JRFSOSwvqxcDLZI+wF9AM81OWNp6QisAdI4LPUJK3L4M4dLh9+apFRb1OMld++scWah1SB5Qj6tPzMvX96mp1XfWB1fJXuf8Yvks02H6ZcAXubK2HXe3iJZKVqGB67kShNN52P+wg0ZZO4OP4kZ2PXahnB7hhxIfEfWsNVy/w4ww1N6K907BfT6RDmsgNP1ZP8kpq6H4pTnWgAy9WDxjatzbNFAHtMzakGjYJNFxZJVco2FL0ipNQ7htoVAA4sUb+VbRQv4O/oZTLMNnnco19+TFJzuZuS4Rjxj/zX63gXkj/W7wou3hw+NpI/PL2hUXIc5imXSLfVQwri8Nl+6IOjV2gWR/vR1VhQqbLsTF6TZQKNI4lvbRTs1nNeqNMW1lHizI3r9Kernj2noAsxJK7wFTZ64OUkQvSNphfmVow29JYQKXbpxbmRrdnmfmtnMsxUngpx9WsTPhrprt5hIAqiBspHemrs+H3LiIml6IY/3l9bcPlc0gA="
+    - secure: "sNc7kC0CuH/TCZh2WwEN51GcA1fSpcliCHpFB+WX7ieQiRu3xKn2avby/T7vbvX0viXRER59arFGQF4i/dyr2g4tlZLVRYjPeiApfduKZ7Lb+vZGro3cWesfHG6Abk2VcgZZli1IDrgrHH5qAWnA9xNnKvKBL9NDM73Zj92BmlDFVEzadTii8brWvced/YP3jNXEmM5ZIufgpe2yidBB2bLWYJXb3Cf1MvzMG4tqNAtZTrI32q50mokz/uTqp3MRJ+cR8sOI+2+2xSbT0zZGLSRZf96/7FKtE0QIDxdWAe4XdlHq1CluRVk30Ju5BEn0QzoYLryCIuw3JjDl1Yksw4IA5imljZJlOmWa2l6fX0HNxMw+z0R/1d2HARA8BY7/uQKv4guV3Cf3jpsWoKSsM1WxqOqsuEFOoRQ2eQNJEaSuC6+j/vzNoj61pOuG0R9OC2PFcFCZ9fomIrZMse+7M3WIj4+mp7e+JDK8DgVdUlqkBVCx1Ospseb5pm6lDx8F5NbgqZgGXgyoWVpqZnyYOoOutezMoD6MI2wXzJaepV/L3+LD5f6q3DAa/sRAEEsBFGyMHXiPYbziEiy8Hz09Sz3inT5rzS8OLOinwAI2sHiIYHTl340XfWdYz6AlNhYLCGwwmtkntbjOj5UVW06IgBBx44ujpZSUjv7SOrACPGU="
+    - secure: "t9/mC8eSsxXIB2vjcZGtGISxrSY3Yd+XS4+/i1YG1mxSov3R6UdhVl2blLgrvFfVCSo61YMAzJbXKtZlXPzhLDXxpsSlWiatjNrKKo4D2unnlHsyEMJ4wfz8cJ8pKyynP7Kc1ZuaqTSMcEZgk85tlew8Zy/VH6g3Mc/7DvP4SxEDRsP+DdCplZc0vbxHDaV3iC93bwNRfy1UQypwJJ2WQviRema3Umneg8hVl2V35zbaBoy45ubCkUoCbRCDaUyoHA10GrE1OUOLsioar/dj6K2W3EhAtehHLWrUZhhl07rayrrRDQYDTdebifB/MWlvR5FjM/Dr5M4k2ciss4ol3IR5LypRLD+/YBtzeIuqkDbUkaBowY+oUj6OWlzEbzAUrUNa5mnyR2jhr8ivZUeEEWLxljsu8gWq65mzgiZt/u+kVCnMLciUv0//0nrsNsEMI9pau2ZxbcpItFVKdZYXFdmHWG+qPCgMcbgsUM3xqaIc7fNwbk2Aa6erIGqD2VkwWzD/xksweg4lsgQ0N1tXMfoWWKh4Xj/OFom+S+3w9uSx/jQma7nXm+PKQL8dIo7rqza3fz9biq5T6mhwUrqCpFIJv7mrMwaTT1UfOchjiLL3CGeO7Amv7Avmh3fhMPbypF0sws79d7ewZbyv+oSzn+pxlCdzBU1GYx6veApbzhg="
+    - secure: "ljVx3TgpBJ/ylMKDVmXabi9UNi5YvrRM5UBTrRk7XPu1YFYS4FI1GcGlyvYhToc4fKt4jLhX9qU+s/rZY+odO0x/HpmJglMBCrY+QcWOzuyaP1U5dCET+evuqFdEAZIzLQc4VDjL1aQLZh+OG7bjoBClVAan6a+pmW0yxBC6rNtCWTESG4rY3wOeTpoI0Q1gM7gg5Zkj4Z+yLvYeJdoKHijM7C3/R/VVTqUFqArk+Js7Qb2qTqm03SHP0ahRQA8XSfbPebSkJyX9oLbidanBEaQE6sqnp9Qh+8VGcnn7VkSu6oq2+ZXz4xlSMrH2Iv2JXl68Td51LsLo9BxaMCL68ssgTFfXPSrrcLwholNEt1pXk5nhBl1l6MZ1UwUJyBm+AXZp/4sCK9/P0rGa2d1rOcpOz7nobH7BDktqEJkrR6VzkTMx1aOwtF+JSt7SJQ1RrRdm9uKfOZZsnw17+VgVAHo/ttY0C3cRl10oaF1C/IdliDfa5gJdZ2VSZtJxyewqKwGiZrqCRv2fQyIuGsqfHXsyHVL6q1KfVcHjaXBvh0o6xZ6duieFT4FNHg7clv1qPQV+cLh4L11nugiihRTeYQtKyUnP5YIL+jlcGNM6KqKhF9RN5c+zOqWNmEcz6O8nljY5mFWdIxL6dFfE3+4wpw7snFP0PrWIWl5SmrU5ipY="
+    - secure: "L0ivSUmbOHNmKWVR2zeYcVR+Xr6780dYA829MyksXfg9OrieTS+qVqSODKexFW89dp4Wf8xFdT9f16xSqjA/xSuX12uiISMiTcFKP39ZnQZ//NDkx1T4pZaeNiysqT+2Ys9OaKTWxn8luFtAYp+DaluancQtEw6+M8H3jQyQZimGHl0QB6BK2A5VA2vko+7ebIdwu5Df5E7lc/LG42H+DdSFkSj7Meu5XMyPHSZRAdOE5doO++tqFKzgs2WbDRHRUP4R4LqtDlGn8+5qnQtQKUN4V9UGrKM95R34BhgUlgOqOFAjFDug71/1/rRyv9XnzKkAdTIbxV7nmxSL+APhQDqpwPr01EP9gtZBOycswV/igJYotgqkhzwNAYrmwOA5Ta8S18Ck0feDEqT20w8yKS4QwV2Ihg4q7CqDFu7i+9iSRUCd/RVrGtG0U5Zo1b3+1JcNxXH/ErUeyHPfrk4vktxfHmU+omqwkfvTRy5upn0Ycr57YHOJc/Iyur7vE07HcnBfAwV0d5KO6HJ7M1n6hmMxeyKmf+qiyQQnphySvHHAfa/9Sec7omwwKv4bn33DwFGc8GWvL6cZXWhmGhFvd+LslpZl0vZ+7Bz0tXlAg4t8V48y/ZtyoSpny0HP4UstdA43PttvZ6q2y8LUNk4LBP5btKmp27Fszuj/rldtj5g="
+    - secure: "Dox8JthAJqWT9eh3Jt4Morbf4pGN9OjduJXe/lYMsmFvqNg7b94P2QdumWBPmVjDq4YjDVirMejBA/TNwORgKfg7pI7MOw+qqoHpT9xyPecXi3ecyBay13e16p0GNRlc5pUu5JcU8sgCpttvM0EAw6bOuQIhnnkIFesbOvwoxGYjMzjmWMNuikR3CjKbo0LDtD5NJXT1OMSqrRuh8NM/BoKyn/kCdSaq9wI2GUMbkg09/kFJkQOvtMXPkM7dIhr/9UC0ouMIyqe/MHa8O6Y4xESdqiTql9uz1+eZfHIRrgFlHfxDvkMv87Cx5OuL+O+qeT/a+RYLCRJspMoq94IYHGg2iyEfBO2YAkogl53wiEf2KF2JdiNGT0xId7bxCJj3efTuCAXV1oqaHpJli1Mhvs7zPEtf78B4tkWEgjhGr5pBLIlbhNjS5wtTHJX4BUzoiP+wODj4h7rjPAah42nWF8XOMlboVi56sOCLjiHBOvYObqyhSfiQxoi2XHphsrZqw6H03tr4Kqd9HVmuoSvRiv+NOu24Ubr6MrrQM2/G72TrTx0/aBlt8Dx5nx2oWZ9ZMiDUR3XlvDLUi45SpY5qESXz08nRlcdS9EvUpK7C+77bNvX+A3dIhsxnxuNaf2naf+QnYYbvh7q4Qbrj4v6EMYS90Uky1JHdoc2wMua8J+w="
+    - secure: "Is2Lv/rxKKrXnxFns9KQYseD02tjY9qbgSteVtJavG1cLJDvkTwb6X+Thvgo4cxk5fQPiXScrQaYzHjVVuNleD+dyD1HC/8CU2Xq+tjBhPjdcccHFSbk06DpcETmLGRyMORXG9JkYlgXHLLXtu/9icppWEHgra+zvchVL2YDhofYne8FMNBb/lq0AAC2wgzAS33tW1+57HaYnzl0hf6+Q6lwqoH2/aTfGMRFDgyJ0HK+5IVfLnQJ+OuGFSrj8/0FWSggR5+EXDIddDgovFgaCghMjHYp21bzn0eIAJtuNFFultwk/UC1lT9joXTKEzgLTAh+w13yz1T3x9rNuv6FDKCotBIS/ZDtPmgvyZ8xvB4SzyULnTRSVn7YvspKR6PAO/qxGNudUD5H8tRKer4qKnKjHzSUcVBlRHb4yE6FqqY1Z9RLEcomWO43nJwb6saNHR9BYedyi0gA+EbA+P259QFClW1dWEQ2LQhDa+0VRssOqZ0BQblPFyz+e5Vc9kfAMbOuoss8fjkiYv+twXv7nT27xrVT5okfKDSiy5opZD6d36N5FibZPYiMrVx00YZdkFB+5EqQuJ7lqKUMkZJTeApLzj+h+/4aAOWd3paj5ghv7m+9ReohsNKFHyjaSy97RhMAZjzqgMMdD8rjUSKDhvNKvvQECWHlaXwL129GB0s="
+    - secure: "l7vWxfcu1RgXbStq76Mzz2I5Iu4e31729OyLYqulXZzft3wO+idvgQKy/JSwajiKgOxlpBuI0wrncgIUYshcRvE4yB0y9+QIMDTegJzTADtRSUyVNCIZfTgvtOvzrlW0iCdVsxLBtYcJWJVPdjF2q59ED1jahd1AuJJqX5e61gfr0eZ9+cNiHbX1u3VpmGchFNWQF4KvebE4WKs5xWEds+AtbTODdQq3H6kKQK3fTVJnbz6WMO+bEWgWI7orfSE20lku/3Q3eMLhNOcPwH8WnUoTTvDWol5Cq5NfPhkKF5aV7kIbNXkxswM7yBPAPumBiXdM1BHpfd4+0YQ/fqRtnqxw85HEYpT8dRewHimCl4IccgGCR+G0tK8RNleKL28GWrz86gRVpXMEhOU3ILwb8as3SdQWLwhXXy5uKGJmsdrCNAH4/8eu3XczO5VN2wOo7narYuBgGcl2eLW9TOLyNVKFKxbQnDLBiOybLNoOV42DCRYt7v3Eknkv1Z0dmX6n23q1z9if9kkfAFgRQWsTbNZyWeIwWuX8b2a0Zq0znS3JflSKxzqS7RHADfBOJEVM86AiGkw0XkR4o31yDrY+zOrkJ3GxfV/HpqG7LzCd9tFeexanneDCE1FJhCkDjpnc0Mdyx+1gVf+u2MkgrU0BbCf2EESBAlC/FTRvxTmk/6s="
+    - secure: "bvtQ348bxKwTtB8X0zMxeTsM0jEJozbS6/rzH/88Fk90a+KO8SdXen0Kj9/LahV4duMn2xTTRmxMCVj424FbcVTgBkJpIO7btqTcNASORkmK+9wGTK6Bgb9R5sHLbVrbrMYJzsMQR0MWxE8ibPLlyom+ssUIqr7HAjnRyYSDiKChGhgBfdE/0G9OE/DuQaU/ZkTuEYfc4527QNLJ8Bt1aLDdCHJLxzCojNaTHB215Tz7dmpnJjWa45BXxkMwLTpxIJuY7wA7K+2UBJfLvZv5QiPYyeUlosV7FwhCN9e90+dc2x8HPJbwe/Ysv5dm8/FfNTgTe6IkKw1z9kev9/W1tYCtqMzn9GnlIH2000ZUomhHKbc4UUl8sskF2jGr14rSz7pfaTyvXNvK7nKLKM7mZAO/cAaQvZoGEx0s6B7a7YX38NmJWcM0UUD603n4G9uVZNoxjyr8HWC6pho8MY8/u5aFKMPd+C8DaDWeSzNJDZRyi62v+t2iyyZuQUtVXtnDpv8GQW4tYFIJCkkrTm5VNNgD2x3WRsEr3LsBa3BonOmi3a1VrdIpyidDzBEWFUR59a/C0lU5J2UX5W1vu/Pnr9/8p898sDvvDbluz47OR9xoVOjtmGdt/ENJa4EOY1q/eRIN6zrt/cwwjIKgTcYOVk7DFDMXQuYlDeEFuHSJ5Xs="
+    - secure: "I05ZVphCT2Alu4najchCjDLIgflsdSCR/Z20OkMbcESprwJB5h7nb64kuVkqPQT7GeMcXMnK1xahx0KvE1Gn8OqOlDPt5WgnvcYERnVOKEJabmRXws8nM20AehwAzRoc6uDhaTnmwHRuliPSeuxiwY2Rkyj5hdyvEMzaOSY+qoIOYtDYQu0MM1XIC3cAjSbEfEGuqnKcN0p9VG0l7WscEUtcKPSFBShOlJZWDiHy7lisgO6OEzvAeDpZU/1ZdljXBl0RoDX8l4LqH4SzQqE68kK7qqIhZNmx4hkrh7qtx8tVqVKy/R3IUYhdxrJ84eJxrex6RQb9SgJQRGwi/3+rkKxVS41KiQ4quJHJhnqd2A1+5rDMN/fsjbjtM1I3VIl6w4oaT1C1QtwSjQOvuZCKDLIszVutW0PuGHveNyjwqQSm2PboOkLTg0dNrFIflT2hGMynv1s19WzGY8qQDP2UgODNR4EQVBy0PRk43ne5W/AFtzY1wUUUCBfKi7WYi4uURG/1Xu456GEElbIOwx9F1nC0s3z6ZFVJ3bVbmFxUlHtCyL5wJ3fiVHkAoPSygVARvv2UhHmXvJXXjxBMOvsnZZbpjvcbTeZoguffxMZEMNhuI4W22WjLdVTLxi9uh1VTdm8vkfAeNjMPw53gwPaSz7Jv6A82LFqpmbwAHxNAEy8="
+    - secure: "BSZK3v2RYsNKv/8lBZ/dKagYF+znGXIeDY271A2nCS8DXx+y0octwI5RT08+UqdD1AvhPOPjdnSXG+M2NOSLlfBoXF/0t9S39+qy3EhGgxYAcWcVDXnrOrHEOALg1cQkCA2D/CG+eeG/36SmAn6FINTLaAOilxWGGCeL0KOB5mqPPnPogaYhowIwDkj0Hfsfrw8011XzgbufNr15GIYJ+nP7f41NcgIbnNkqXY6Q1jiWs1DuKXNDr5WGPqztHtVf7RtcpVmShzptAcAMdRqCGKF7atCZhXPbd69j3qf7F533/tCSCIrszR/Wp4BKlJfVCRCk1oiEcfRvprJqeFJ+0WJCVzyD7hXfnkBg2Tb5PmzvxOFM+hsqRu4mY3UdjqXukzAe5O0O6Uo8sqzqQUIjUooRnNQ4GdPd+7wMbyBZn4PJaW6YTi/7zg7mAegqot6uyEGGpWb6iFYrf6DX75GUfTciNktv+ez0AeqYFwNBLgcOsmaq+3V+aR+dIxsxIzC/i5GCTHvMYOIp6Q2tPCuIug0tX6uxm++vMOoMLK+vG1fVQ0Cd8m6yQIWEXUu0VBs1MTlJD+vX6LsK8CGo0Dt3ZS3JmC4TGGo9CBSEkeDvnKvQeX6x3NBIFWvgt+Hjxh4S9U+vW+AaUXpV9k+NEhesC/8Ys0UGbGYsTDzHdx9TMBY="
+    - 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:
     - os: linux
-      name: "Linux 64-bit"
+      name: "Linux 64-bit Xenial"
       dist: xenial
-      language: python
-      python: 
-        - 3.7.3
+      language: bash
       env:
         - GAMOS=linux
         - PLATFORM=x86_64
+        - VMTYPE=build
+    - os: linux
+      name: "Linux 64-bit Trusty"
+      dist: trusty
+      language: bash
+      env:
+        - GAMOS=linux
+        - PLATFORM=x86_64
+        - VMTYPE=build
+    - os: linux
+      name: "Linux 64-bit Precise"
+      dist: precise
+      language: bash
+      env:
+        - GAMOS=linux
+        - PLATFORM=x86_64
+        - VMTYPE=build
+    - os: linux
+      name: "Linux 64-bit Xenial - Python 3.5 Source Testing"
+      dist: xenial
+      language: python
+      python:
+        - "3.5"
+      env:
+        - GAMOS=linux
+        - PLATFORM=x86_64
+        - VMTYPE=test
+    - os: linux
+      name: "Linux 64-bit Xenial - Python 3.6 Source Testing"
+      dist: xenial
+      language: python
+      python:
+        - "3.6"
+      env:
+        - GAMOS=linux
+        - PLATFORM=x86_64
+        - VMTYPE=test
+    - os: linux
+      name: "Linux 64-bit Xenial - Python 3.8-dev Source Testing"
+      dist: xenial
+      language: python
+      python:
+        - "3.8-dev"
+      env:
+        - GAMOS=linux
+        - PLATFORM=x86_64
+        - VMTYPE=test
+    - os: linux
+      name: "Linux 64-bit Xenial - Python nightly Source Testing"
+      dist: xenial
+      language: python
+      python:
+        - "nightly"
+      env:
+        - GAMOS=linux
+        - PLATFORM=x86_64
+        - VMTYPE=test
     - os: osx
       name: "MacOS 64-bit"
       language: generic
-      osx_image: xcode10.1
+      osx_image: xcode9.2
       env:
         - GAMOS=macos
         - PLATFORM=x86_64
+        - VMTYPE=build
     - os: windows
       name: "Windows 64-bit"
       language: shell
+      filter_secrets: false
       env:
         - GAMOS=windows
-          PLATFORM=x86_64
+        - PLATFORM=x86_64
+        - VMTYPE=build
     - os: windows
       name: "Windows 32-bit"
       language: shell
+      filter_secrets: false
       env:
         - GAMOS=windows
         - PLATFORM=x86
+        - VMTYPE=build
 
 before_install:
 - source src/travis/$TRAVIS_OS_NAME-$PLATFORM-before-install.sh
@@ -38,7 +132,83 @@ install:
 - source src/travis/$TRAVIS_OS_NAME-$PLATFORM-install.sh
 
 script:
-- gam/gam version
+- $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+
+- 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
+- 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
+- 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; fi
+- if [ "$e2e" = true ]; then echo email > sample.csv;
+  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 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 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 users "$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 $newuser update read domain; fi
+- if [ "$e2e" = true ]; then $gam calendar $newuser add editor $gam_user; fi
+- if [ "$e2e" = true ]; then $gam calendar $newuser showacl; 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 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
+- 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"
@@ -55,3 +225,4 @@ deploy:
   all_branches: true
   on:
     repo: jay0lee/GAM
+    condition: $VMTYPE = build

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|
@@ -118,7 +127,7 @@ If an item contains spaces, it should be surrounded by ".
 <MilliSeconds> ::= <Digit><Digit><Digit>
 <Date> ::=
 	<Year>-<Month>-<Day> |
-	(+|-)<Number>(d|w)
+	(+|-)<Number>(d|w|y)
 <Time> ::=
 	<Year>-<Month>-<Day>(<Space>|T)<Hour>:<Minute>:<Second>[.<MilliSeconds>](Z|(+|-(<Hour>:<Minute>))) |
 	(+|-)<Number>(m|h|d|w)
@@ -662,16 +671,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>)|
@@ -821,7 +820,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
 
@@ -941,9 +941,53 @@ gam calendar <CalendarItem> update <CalendarACLRole> ([user] <EmailAddress>)|(gr
 gam calendar <CalendarItem> del|delete <CalendarACLRole> <EmailAddress>|(domain [<DomainName>])|default
 gam calendar <CalendarItem> showacl
 
-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 +998,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
 
@@ -1269,6 +1313,9 @@ gam <UserTypeEntity> show imap|imap4
 gam <UserTypeEntity> pop|pop3 <Boolean> [for allmail|newmail|mailfromnowon|fromnowown] [action keep|leaveininbox|archive|delete|trash|markread]
 gam <UserTypeEntity> show pop|pop3
 
+gam <UserTypeEntity> language <Language>
+gam <UserTypeEntity> show language
+
 gam <UserTypeEntity> [create|add] sendas <EmailAddress> <Name> [signature|sig <String>|(file <FileName> [charset <Charset>]) (replace <Tag> <String>)*] [html] [replyto <EmailAddress>] [default] [treatasalias <Boolean>]
 	[smtpmsa.host <SMTPHostName> smtpmsa.port 25|465|587 smtpmsa.username <UserName> smtpmsa.password <Password> [smtpmsa.securitymode none|ssl|starttls]]
 gam <UserTypeEntity> update sendas <EmailAddress> [name <Name>] [signature|sig <String>|(file <FileName> [charset <Charset>]) (replace <Tag> <String>)*] [html] [replyto <EmailAddress>] [default] [treatasalias <Boolean>]

src/gam-install.sh

@@ -26,7 +26,7 @@ upgrade_only=false
 gamversion="latest"
 adminuser=""
 regularuser=""
-gam_glibc_ver="2.12" # CentOS 6
+gam_glibc_vers="2.23 2.19 2.15"
 
 while getopts "hd:a:o:lp:u:r:v:" OPTION
 do
@@ -87,13 +87,16 @@ case $gamos in
     gamos="linux"
     this_glibc_ver=$(ldd --version | awk '/ldd/{print $NF}')
     echo "This Linux distribution uses glibc $this_glibc_ver"
-    if version_gt $gam_glibc_ver $this_glibc_ver; then
-      echo_yellow "NOTICE: You are running an older Linux distro than the one GAM was compiled on. A legacy GAM version that should be compatible with your system but may run slower will be installed. For best performance, upgrade to a newer Linux distribution like Debian 9 stable, Ubuntu Xenial 16.04, Fedora 24+ or RedHat Enterprise Linux 8."
-      gamarch=x86_64_legacy
-    fi
+    useglibc="legacy"
+    for gam_glibc_ver in $gam_glibc_vers; do
+      if version_gt $this_glibc_ver $gam_glibc_ver; then
+        useglibc="glibc$gam_glibc_ver"
+        echo_green "Using GAM compiled against $useglibc"
+        break
+      fi
+    done
     case $gamarch in
-      x86_64) gamfile="linux-x86_64.tar.xz";;
-      x86_64_legacy) gamfile="linux-x86_64-legacy.tar.xz";;
+      x86_64) gamfile="linux-x86_64-$useglibc.tar.xz";;
       i?86) gamfile="linux-i686.tar.xz";;
       arm|armv7l) gamfile="linux-armv7l.tar.xz";;
       arm64|aarch64) gamfile="linux-aarch64.tar.xz";;

src/linux-gam.spec

@@ -1,23 +1,28 @@
-# -*- mode: python -*-
-a = Analysis(['gam.py'],
-             hiddenimports=[],
-             hookspath=None,
-             excludes=['_tkinter'],
-             runtime_hooks=None)
-for d in a.datas:
-    if 'pyconfig' in d[0]:
-        a.datas.remove(d)
-        break
-a.datas += [('httplib2/cacerts.txt', 'cacerts.txt', 'DATA')]
-a.datas += [('cloudprint-v2.json', 'cloudprint-v2.json', 'DATA')]
-pyz = PYZ(a.pure)
-exe = EXE(pyz,
-          a.scripts,
-          a.binaries,
-          a.zipfiles,
-          a.datas,
-          name='gam',
-          debug=False,
-          strip=None,
-          upx=False,
-          console=True )
+# -*- mode: python -*-
+a = Analysis(['gam.py'],
+             hiddenimports=[],
+             hookspath=None,
+             excludes=['_tkinter'],
+             runtime_hooks=None)
+for d in a.datas:
+    if 'pyconfig' in d[0]:
+        a.datas.remove(d)
+        break
+a.datas += [('cloudprint-v2.json', 'cloudprint-v2.json', 'DATA')]
+
+# dynamically determine where httplib2/cacerts.txt lives
+import importlib
+proot = os.path.dirname(importlib.import_module('httplib2').__file__)
+a.datas += [('httplib2/cacerts.txt', os.path.join(proot, 'cacerts.txt'), 'DATA')]
+
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='gam',
+          debug=False,
+          strip=None,
+          upx=False,
+          console=True )

src/macos-gam.spec

@@ -1,23 +1,28 @@
-# -*- mode: python -*-
-a = Analysis(['gam.py'],
-             hiddenimports=[],
-             hookspath=None,
-             excludes=['_tkinter'],
-             runtime_hooks=None)
-for d in a.datas:
-    if 'pyconfig' in d[0]:
-        a.datas.remove(d)
-        break
-a.datas += [('httplib2/cacerts.txt', 'cacerts.txt', 'DATA')]
-a.datas += [('cloudprint-v2.json', 'cloudprint-v2.json', 'DATA')]
-pyz = PYZ(a.pure)
-exe = EXE(pyz,
-          a.scripts,
-          a.binaries,
-          a.zipfiles,
-          a.datas,
-          name='gam',
-          debug=False,
-          strip=None,
-          upx=False,
-          console=True )
+# -*- mode: python -*-
+a = Analysis(['gam.py'],
+             hiddenimports=[],
+             hookspath=None,
+             excludes=['_tkinter'],
+             runtime_hooks=None)
+for d in a.datas:
+    if 'pyconfig' in d[0]:
+        a.datas.remove(d)
+        break
+a.datas += [('cloudprint-v2.json', 'cloudprint-v2.json', 'DATA')]
+
+# dynamically determine where httplib2/cacerts.txt lives
+import importlib
+proot = os.path.dirname(importlib.import_module('httplib2').__file__)
+a.datas += [('httplib2/cacerts.txt', os.path.join(proot, 'cacerts.txt'), 'DATA')]
+
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='gam',
+          debug=False,
+          strip=None,
+          upx=False,
+          console=True )

src/requirements.txt

@@ -1,7 +1,8 @@
 python-dateutil
 dnspython
 google-api-python-client
+google-auth
 google-auth-httplib2
-google-oauth
-oauth2client
+google-auth-oauthlib
+httplib2>=0.13.0
 passlib

src/staticx-gam.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-mypath=$(realpath $0)
-export GAM_REAL_PATH=$(dirname $mypath)
-staticx_binary="$mypath-staticx"
-"$staticx_binary" "$@"

src/tools/parse-aue.py

@@ -0,0 +1,104 @@
+#!/usr/bin/env python3
+
+from xml.etree import ElementTree as ET
+import requests
+from html.parser import HTMLParser
+import string
+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.append("  '%s': '%s'," % (fullname, date))
+                if fullname in exceptions:
+                    for value in exceptions[fullname]:
+                        output_rows.append("  '%s': '%s'," % (value, date))
+                data_is_date = False
+            else:
+                model = ''.join(filter(lambda x: x in printable, data)).replace('"', '\\"')
+                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')
+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('}')

src/travis/cfg_template.json

@@ -0,0 +1,12 @@
+{
+    "_class": "OAuth2Credentials",
+    "_module": "oauth2client.client",
+    "access_token": "",
+    "client_id": "118850122376-72t6r2666n5rbjlfebftqat5qjai2def.apps.googleusercontent.com",
+    "client_secret": "",
+    "invalid": false,
+    "refresh_token": "",
+    "token_expiry": "2010-04-17T15:18:45Z",
+    "token_uri": "https://accounts.google.com/o/oauth2/token",
+    "user_agent": ""
+}

src/travis/linux-x86_64-before-install.sh

@@ -1,12 +1,110 @@
-echo "RUNNING: apt update..."
-sudo apt-get --yes update > /dev/null
-echo "RUNNING: apt dist-upgrade..."
-sudo apt-get --yes dist-upgrade > /dev/null
-echo "Installing StaticX deps..."
-sudo apt-get --yes install binutils patchelf
+if [ "$VMTYPE" == "test" ]; then
+  export python="python"
+  export pip="pip"
+  echo "Travis setup Python $TRAVIS_PYTHON_VERSION"
+  echo "running tests with this version"
+else
+  export whereibelong=$(pwd)
+  export dist=$(lsb_release --codename --short)
+  echo "We are running on Ubuntu $dist"
+  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
+  echo "Installing build tools..."
+  sudo apt-get -qq --yes install build-essential
+
+  echo "Installing deps for python3"
+  sudo cp -v /etc/apt/sources.list /tmp
+  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 -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
+  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
+  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 ~
+
+  export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib
+  python=~/python/bin/python3
+  pip=~/python/bin/pip3
+
+  $python -V
+
+  if [[ "$dist" == "precise" ]]; then
+    echo "Installing deps for StaticX..."
+    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
+  cd $whereibelong
+fi
+
 echo "Upgrading pip packages..."
-pip freeze > upgrades.txt
-pip install --upgrade -r upgrades.txt
-pip install -r src/requirements.txt
-pip install pyinstaller
-pip install staticx
+$pip freeze > upgrades.txt
+$pip install --upgrade -r upgrades.txt
+$pip install -r src/requirements.txt

src/travis/linux-x86_64-install.sh

@@ -1,22 +1,32 @@
 cd src
-pyinstaller --clean --debug -F --distpath=gam $GAMOS-gam.spec
-gam/gam version
-export GAMVERSION=`gam/gam version simple`
-cp LICENSE gam
-cp whatsnew.txt gam
-cp GamCommands.txt gam
-GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.tar.xz
-tar cfJ $GAM_ARCHIVE gam/
-echo "PyInstaller GAM  info:"
-du -h gam/gam
-time gam/gam version
+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
+  export gam="gam/gam"
+  export gampath=$(readlink -e gam)
+  export GAMVERSION=`$gam version simple`
+  cp LICENSE $gampath
+  cp whatsnew.txt $gampath
+  cp GamCommands.txt $gampath
+  this_glibc_ver=$(ldd --version | awk '/ldd/{print $NF}')
+  GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-glibc$this_glibc_ver.tar.xz
+  rm $gampath/lastupdatecheck.txt
+  tar cfJ $GAM_ARCHIVE gam/
+  echo "PyInstaller GAM info:"
+  du -h gam/gam
+  time $gam version extended
 
-GAM_LEGACY_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-legacy.tar.xz
-staticx gam/gam gam/gam-staticx
-strip gam/gam-staticx
-rm gam/gam
-cp staticx-gam.sh gam/gam
-tar cfJ $GAM_LEGACY_ARCHIVE gam/
-echo "Legacy StaticX GAM info:"
-du -h gam/gam-staticx
-time gam/gam version
+  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
+    rm gam/gam
+    mv gam/gam-staticx gam/gam
+    tar cfJ $GAM_LEGACY_ARCHIVE gam/
+    echo "Legacy StaticX GAM info:"
+    du -h gam/gam
+    time $gam version extended
+  fi
+fi

src/travis/osx-x86_64-before-install.sh

@@ -1,8 +1,62 @@
-brew update
-brew upgrade python3
+mypath=$HOME
+whereibelong=$(pwd)
+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
+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 ~
+
+export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib
+python=~/python/bin/python3
+pip=~/python/bin/pip3
+
+$python -V
+
+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 install --upgrade pip
+$pip freeze > upgrades.txt
+$pip install --upgrade -r upgrades.txt
+$pip install -r src/requirements.txt
+$pip install pyinstaller

src/travis/osx-x86_64-install.sh

@@ -1,9 +1,12 @@
 cd src
-pyinstaller --clean --debug -F --distpath=gam $GAMOS-gam.spec
-gam/gam version
+$python -OO -m PyInstaller --clean --debug -F --distpath=gam $GAMOS-gam.spec
+export gam="gam/gam"
+export gampath=gam
+$gam version extended
 export GAMVERSION=`gam/gam version simple`
 cp LICENSE gam
 cp whatsnew.txt gam
 cp GamCommands.txt gam
 GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.tar.xz
+rm gam/lastupdatecheck.txt
 tar cfJ $GAM_ARCHIVE gam/

src/travis/set_printer_csv_filter.sh

@@ -0,0 +1 @@
+export GAM_CSV_ROW_FILTER='{"type": "regex:^GOOGLE"}'

src/travis/svars-write.py

@@ -0,0 +1,15 @@
+import sys
+import json
+import os
+
+cfg = json.load(sys.stdin)
+cfg['client_secret'] = os.getenv('client_secret')
+jid = os.getenv('jid')
+cfg['refresh_token'] = os.getenv('refresh_%s' % jid)
+vmtype = os.getenv('VMTYPE')
+if vmtype == 'test':
+    out_file = 'oauth2.txt'
+else:
+    out_file = 'gam/oauth2.txt'
+with open(out_file, 'w') as f:
+  json.dump(cfg, f)

src/travis/windows-x86-before-install.sh

@@ -1,7 +1,25 @@
-powershell Install-WindowsFeature Net-Framework-Core
+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
+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
-cinst -y wixtoolset
+cd $mypath
 pip install --upgrade pip
 pip freeze > upgrades.txt
 pip install --upgrade -r upgrades.txt

src/travis/windows-x86-install.sh

@@ -1,7 +1,10 @@
 cd src
 pyinstaller --clean -F --distpath=gam $GAMOS-gam.spec
-gam/gam version
-export GAMVERSION=`gam/gam version simple`
+export gam="gam/gam"
+export gampath=$(readlink -e gam)
+$gam version extended
+export GAMVERSION=`$gam version simple`
+rm gam/lastupdatecheck.txt
 cp LICENSE gam
 cp GamCommands.txt gam
 cp whatsnew.txt gam

src/travis/windows-x86_64-before-install.sh

@@ -1,7 +1,25 @@
-powershell Install-WindowsFeature Net-Framework-Core
-cinst -y $CINST_ARGS python3
+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
+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
-cinst -y wixtoolset
+cd $mypath
 pip install --upgrade pip
 pip freeze > upgrades.txt
 pip install --upgrade -r upgrades.txt

src/travis/windows-x86_64-install.sh

@@ -1,7 +1,10 @@
 cd src
 pyinstaller --clean -F --distpath=gam $GAMOS-gam.spec
-gam/gam version
-export GAMVERSION=`gam/gam version simple`
+export gam="gam/gam"
+export gampath=$(readlink -e gam)
+$gam version
+export GAMVERSION=`$gam version simple`
+rm gam/lastupdatecheck.txt
 cp LICENSE gam
 cp GamCommands.txt gam
 cp whatsnew.txt gam

src/utils.py

@@ -1,24 +1,19 @@
-import collections
 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, ONE_MEGA_BYTES, ONE_GIGA_BYTES
+
+ONE_KILO_BYTES = 1000
+ONE_MEGA_BYTES = 1000000
+ONE_GIGA_BYTES = 1000000000
+
 
 def convertUTF8(data):
-  if isinstance(data, str):
-    return data
-  if isinstance(data, str):
-    if GM_Globals[GM_WINDOWS]:
-      return data
-    return data.encode(GM_Globals[GM_SYS_ENCODING])
-  if isinstance(data, collections.Mapping):
-    return dict(list(map(convertUTF8, iter(data.items()))))
-  if isinstance(data, collections.Iterable):
-    return type(data)(list(map(convertUTF8, data)))
   return data
 
+
 class _DeHTMLParser(HTMLParser):
+
   def __init__(self):
     HTMLParser.__init__(self)
     self.__text = []
@@ -27,14 +22,15 @@ 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)
     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':
@@ -57,12 +53,14 @@ 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:
     parser = _DeHTMLParser()
-    parser.feed(text.encode('utf-8'))
+    parser.feed(str(text))
     parser.close()
     return parser.text()
   except:
@@ -70,8 +68,10 @@ 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 formatFileSize(fileSize):
   if fileSize == 0:
@@ -79,10 +79,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)

src/var.py

@@ -1,10 +1,12 @@
 import os
+import ssl
+import string
 import sys
 import platform
 import re
 
 gam_author = 'Jay Lee <jay0lee@gmail.com>'
-gam_version = '4.80'
+gam_version = '4.86'
 gam_license = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 GAM_URL = 'https://git.io/gam'
@@ -20,8 +22,6 @@ 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'
 
-TRUE = 'true'
-FALSE = 'false'
 true_values = ['on', 'yes', 'enabled', 'true', '1']
 false_values = ['off', 'no', 'disabled', 'false', '0']
 usergroup_types = ['user', 'users',
@@ -30,19 +30,12 @@ usergroup_types = ['user', 'users',
                    'ou_and_children', 'ou_and_child', 'ou_and_children_ns', 'ou_and_child_ns', 'ou_and_children_susp', 'ou_and_child_susp',
                    'query', 'queries', 'license', 'licenses', 'licence', 'licences', 'file', 'csv', 'csvfile', 'all',
                    'cros', 'cros_sn', 'crosquery', 'crosqueries', 'crosfile', 'croscsv', 'croscsvfile']
-ERROR = 'ERROR'
-ERROR_PREFIX = ERROR+': '
-WARNING = 'WARNING'
-WARNING_PREFIX = WARNING+': '
-DEFAULT_CHARSET = ['mbcs', 'utf-8'][os.name != 'nt']
-ONE_KILO_BYTES = 1000
-ONE_MEGA_BYTES = 1000000
-ONE_GIGA_BYTES = 1000000000
-FN_CLIENT_SECRETS_JSON = 'client_secrets.json'
+ERROR_PREFIX = 'ERROR: '
+WARNING_PREFIX = 'WARNING: '
+UTF8 = 'utf-8'
+UTF8_SIG = 'utf-8-sig'
 FN_EXTRA_ARGS_TXT = 'extra-args.txt'
 FN_LAST_UPDATE_CHECK_TXT = 'lastupdatecheck.txt'
-FN_OAUTH2SERVICE_JSON = 'oauth2service.json'
-FN_OAUTH2_TXT = 'oauth2.txt'
 MY_CUSTOMER = 'my_customer'
 # See https://support.google.com/drive/answer/37603
 MAX_GOOGLE_SHEET_CELLS = 5000000
@@ -55,6 +48,12 @@ SKUS = {
     'product': '101031', 'aliases': ['gsefe', 'e4e', 'gsuiteenterpriseeducation'], 'displayName': 'G Suite Enterprise for Education'},
   '1010310003': {
     'product': '101031', 'aliases': ['gsefes', 'e4es', 'gsuiteenterpriseeducationstudent'], 'displayName': 'G Suite Enterprise for Education Student'},
+  '1010330003': {
+    'product': '101033', 'aliases': ['gvstarter', 'voicestarter', 'googlevoicestarter'], 'displayName': 'Google Voice Starter'},
+  '1010330004': {
+    'product': '101033', 'aliases': ['gvstandard', 'voicestandard', 'googlevoicestandard'], 'displayName': 'Google Voice Standard'},
+  '1010330002': {
+    'product': '101033', 'aliases': ['gvpremier', 'voicepremier', 'googlevoicepremier'], 'displayName': 'Google Voice Premier'},
   'Google-Apps': {
     'product': 'Google-Apps', 'aliases': ['standard', 'free'], 'displayName': 'G Suite Free/Standard'},
   'Google-Apps-For-Business': {
@@ -64,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': {
@@ -99,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',
@@ -360,18 +377,18 @@ GOOGLEDOC_VALID_EXTENSIONS_MAP = {
   MIMETYPE_GA_SPREADSHEET: ['.csv', '.ods', '.pdf', '.xlsx', '.zip'],
   }
 
-MICROSOFT_FORMATS_LIST = [{'mime': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'ext': '.docx'},
-                          {'mime': 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'ext': '.dotx'},
-                          {'mime': 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'ext': '.pptx'},
-                          {'mime': 'application/vnd.openxmlformats-officedocument.presentationml.template', 'ext': '.potx'},
-                          {'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'ext': '.xlsx'},
-                          {'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', 'ext': '.xltx'},
-                          {'mime': 'application/msword', 'ext': '.doc'},
-                          {'mime': 'application/msword', 'ext': '.dot'},
-                          {'mime': 'application/vnd.ms-powerpoint', 'ext': '.ppt'},
-                          {'mime': 'application/vnd.ms-powerpoint', 'ext': '.pot'},
-                          {'mime': 'application/vnd.ms-excel', 'ext': '.xls'},
-                          {'mime': 'application/vnd.ms-excel', 'ext': '.xlt'}]
+_MICROSOFT_FORMATS_LIST = [{'mime': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'ext': '.docx'},
+                           {'mime': 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'ext': '.dotx'},
+                           {'mime': 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'ext': '.pptx'},
+                           {'mime': 'application/vnd.openxmlformats-officedocument.presentationml.template', 'ext': '.potx'},
+                           {'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'ext': '.xlsx'},
+                           {'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', 'ext': '.xltx'},
+                           {'mime': 'application/msword', 'ext': '.doc'},
+                           {'mime': 'application/msword', 'ext': '.dot'},
+                           {'mime': 'application/vnd.ms-powerpoint', 'ext': '.ppt'},
+                           {'mime': 'application/vnd.ms-powerpoint', 'ext': '.pot'},
+                           {'mime': 'application/vnd.ms-excel', 'ext': '.xls'},
+                           {'mime': 'application/vnd.ms-excel', 'ext': '.xlt'}]
 
 DOCUMENT_FORMATS_MAP = {
   'csv': [{'mime': 'text/csv', 'ext': '.csv'}],
@@ -404,9 +421,9 @@ DOCUMENT_FORMATS_MAP = {
   'xlsx': [{'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'ext': '.xlsx'}],
   'xltx': [{'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', 'ext': '.xltx'}],
   'zip': [{'mime': 'application/zip', 'ext': '.zip'}],
-  'ms': MICROSOFT_FORMATS_LIST,
-  'microsoft': MICROSOFT_FORMATS_LIST,
-  'micro$oft': MICROSOFT_FORMATS_LIST,
+  'ms': _MICROSOFT_FORMATS_LIST,
+  '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'},
@@ -454,6 +471,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',
@@ -557,6 +580,8 @@ CROS_SCALAR_PROPERTY_PRINT_ORDER = [
   'lastEnrollmentTime',
   'orderNumber',
   'supportEndDate',
+  'guessedAUEDate',
+  'guessedAUEModel',
   'tpmVersionInfo',
   'willAutoRenew',
   ]
@@ -575,6 +600,266 @@ 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_ACL_CHOICES = {
   'members': 'ALL_MEMBERS',
   'managersonly': 'MANAGERS_ONLY',
@@ -640,12 +925,18 @@ GM_CACHE_DISCOVERY_ONLY = 'gcdo'
 GM_MAP_BUILDING_ID_TO_NAME = 'bi2n'
 # Dictionary mapping Building Name to ID
 GM_MAP_BUILDING_NAME_TO_ID = 'bn2i'
+
+#
+_DEFAULT_CHARSET = UTF8
+_FN_CLIENT_SECRETS_JSON = 'client_secrets.json'
+_FN_OAUTH2SERVICE_JSON = 'oauth2service.json'
+_FN_OAUTH2_TXT = 'oauth2.txt'
 #
 GM_Globals = {
   GM_SYSEXITRC: 0,
   GM_GAM_PATH: None,
   GM_WINDOWS: os.name == 'nt',
-  GM_SYS_ENCODING: DEFAULT_CHARSET,
+  GM_SYS_ENCODING: _DEFAULT_CHARSET,
   GM_EXTRA_ARGS_DICT:  {'prettyPrint': False},
   GM_CURRENT_API_SERVICES: {},
   GM_CURRENT_API_USER: None,
@@ -687,6 +978,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
@@ -704,8 +997,6 @@ GC_NO_BROWSER = 'no_browser'
 GC_NO_CACHE = 'no_cache'
 # Disable GAM update check
 GC_NO_UPDATE_CHECK = 'no_update_check'
-# Disable SSL certificate validation
-GC_NO_VERIFY_SSL = 'no_verify_ssl'
 # Number of threads for gam batch
 GC_NUM_THREADS = 'num_threads'
 # Path to oauth2.txt
@@ -726,18 +1017,26 @@ GC_USER_MAX_RESULTS = 'user_max_results'
 GC_CSV_HEADER_FILTER = 'csv_header_filter'
 # CSV Rows GAM should filter
 GC_CSV_ROW_FILTER = 'csv_row_filter'
+# Minimum TLS Version required for HTTPS connections
+GC_TLS_MIN_VERSION = 'tls_min_ver'
+# Maximum TLS Version used for HTTPS connections
+GC_TLS_MAX_VERSION = 'tls_max_ver'
+# Path to certificate authority file for validating TLS hosts
+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: '',
   GC_CACHE_DISCOVERY_ONLY: True,
-  GC_CHARSET: DEFAULT_CHARSET,
-  GC_CLIENT_SECRETS_JSON: FN_CLIENT_SECRETS_JSON,
+  GC_CHARSET: _DEFAULT_CHARSET,
+  GC_CLIENT_SECRETS_JSON: _FN_CLIENT_SECRETS_JSON,
   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: '',
@@ -746,10 +1045,9 @@ GC_Defaults = {
   GC_NO_BROWSER: False,
   GC_NO_CACHE: False,
   GC_NO_UPDATE_CHECK: False,
-  GC_NO_VERIFY_SSL: False,
   GC_NUM_THREADS: 25,
-  GC_OAUTH2_TXT: FN_OAUTH2_TXT,
-  GC_OAUTH2SERVICE_JSON: FN_OAUTH2SERVICE_JSON,
+  GC_OAUTH2_TXT: _FN_OAUTH2_TXT,
+  GC_OAUTH2SERVICE_JSON: _FN_OAUTH2SERVICE_JSON,
   GC_SECTION: '',
   GC_SHOW_COUNTS_MIN: 0,
   GC_SHOW_GETTINGS: True,
@@ -757,6 +1055,9 @@ GC_Defaults = {
   GC_USER_MAX_RESULTS: 500,
   GC_CSV_HEADER_FILTER: '',
   GC_CSV_ROW_FILTER: '',
+  GC_TLS_MIN_VERSION: tls_min,
+  GC_TLS_MAX_VERSION: None,
+  GC_CA_FILE: None,
   }
 
 GC_Values = {}
@@ -766,8 +1067,10 @@ GC_TYPE_CHOICE = 'choi'
 GC_TYPE_DIRECTORY = 'dire'
 GC_TYPE_EMAIL = 'emai'
 GC_TYPE_FILE = 'file'
+GC_TYPE_HEADERFILTER = 'heaf'
 GC_TYPE_INTEGER = 'inte'
 GC_TYPE_LANGUAGE = 'lang'
+GC_TYPE_ROWFILTER = 'rowf'
 GC_TYPE_STRING = 'stri'
 
 GC_VAR_TYPE = 'type'
@@ -784,6 +1087,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},
@@ -792,7 +1096,6 @@ GC_VAR_INFO = {
   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_NO_VERIFY_SSL: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
   GC_NUM_THREADS: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (1, None)},
   GC_OAUTH2_TXT: {GC_VAR_TYPE: GC_TYPE_FILE},
   GC_OAUTH2SERVICE_JSON: {GC_VAR_TYPE: GC_TYPE_FILE},
@@ -801,22 +1104,18 @@ GC_VAR_INFO = {
   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_STRING},
-  GC_CSV_ROW_FILTER: {GC_VAR_TYPE: GC_TYPE_STRING},
+  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},
+  GC_TLS_MAX_VERSION: {GC_VAR_TYPE: GC_TYPE_STRING},
+  GC_CA_FILE: {GC_VAR_TYPE: GC_TYPE_FILE},
   }
 # Google API constants
 
 NEVER_TIME = '1970-01-01T00:00:00.000Z'
-NEVER_START_DATE = '1970-01-01'
-NEVER_END_DATE = '1969-12-31'
 ROLE_MANAGER = 'MANAGER'
 ROLE_MEMBER = 'MEMBER'
 ROLE_OWNER = 'OWNER'
-ROLE_USER = 'USER'
-ROLE_MANAGER_MEMBER = ','.join([ROLE_MANAGER, ROLE_MEMBER])
-ROLE_MANAGER_OWNER = ','.join([ROLE_MANAGER, ROLE_OWNER])
-ROLE_MANAGER_MEMBER_OWNER = ','.join([ROLE_MANAGER, ROLE_MEMBER, ROLE_OWNER])
-ROLE_MEMBER_OWNER = ','.join([ROLE_MEMBER, ROLE_OWNER])
 PROJECTION_CHOICES_MAP = {'basic': 'BASIC', 'full': 'FULL',}
 SORTORDER_CHOICES_MAP = {'ascending': 'ASCENDING', 'descending': 'DESCENDING',}
 #
@@ -824,30 +1123,34 @@ 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_PYTHON_SSL = 'You don\'t have the Python SSL module installed so we can\'t verify SSL Certificates. You can fix this by installing the Python SSL module or you can live on the edge and turn SSL validation off by creating a file named noverifyssl.txt in the same location as gam.exe / gam.py'
 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_REQUEST_COMPLETED_NO_FILES = 'Request completed but no results/files were returned, try requesting again'
-MESSAGE_REQUEST_NOT_COMPLETE = 'Request needs to be completed before downloading, current status is: {0}'
 MESSAGE_RESULTS_TOO_LARGE_FOR_GOOGLE_SPREADSHEET = 'Results are too large for Google Spreadsheets. Uploading as a regular CSV file.'
 MESSAGE_SERVICE_NOT_APPLICABLE = 'Service not applicable for this address: {0}. Please make sure service is enabled for user and run\n\ngam user <user> check serviceaccount\n\nfor further instructions'
 MESSAGE_INSTRUCTIONS_OAUTH2SERVICE_JSON = 'Please run\n\ngam create project\ngam user <user> check serviceaccount\n\nto create and configure a service account.'
-MESSAGE_OAUTH2SERVICE_JSON_INVALID = 'The file {0} is missing required keys (client_email, client_id or private_key). Please remove it and recreate with the commands:\n\ngam create project\ngam user <user> check serviceaccount'
 # oauth errors
 OAUTH2_TOKEN_ERRORS = [
   'access_denied',
   'access_denied: Requested client not authorized',
   'internal_failure: Backend Error',
+  'internal_failure: None',
+  'invalid_grant',
   'invalid_grant: Bad Request',
   'invalid_grant: Invalid email or User ID',
   'invalid_grant: Not a valid email',
+  'invalid_grant: Invalid JWT: No valid verifier found for issuer',
   'invalid_request: Invalid impersonation prn email address',
   'unauthorized_client: Client is unauthorized to retrieve access tokens using this method',
+  'unauthorized_client: Client is unauthorized to retrieve access tokens using this method, or client not authorized for any of the scopes requested',
   'unauthorized_client: Unauthorized client or scope in request',
   ]
 #

src/whatsnew.txt

@@ -1,3 +1,5 @@
+This file has been deprecated. For the latest features see https://git.io/gam-releases notes
+
 GAM 4.65
  - Manage email delivery settings for group members
  - Add operatingSystemType to user posix config (Roman)

src/windows-build.bat

@@ -10,7 +10,7 @@ del /q /f *.wixpdb
 
 set WIXVERSION=3.11
 
-c:\python27-32\scripts\pyinstaller --clean -F --distpath=gam windows-gam.spec
+c:\python37-32\scripts\pyinstaller --clean -F --distpath=gam windows-gam.spec
 xcopy LICENSE gam\
 xcopy whatsnew.txt gam\
 xcopy gam-setup.bat gam\
@@ -18,7 +18,7 @@ xcopy GamCommands.txt gam\
 del gam\w9xpopen.exe
 "%ProgramFiles%\7-Zip\7z.exe" a -tzip gam-%1-windows.zip gam\ -xr!.svn
 
-c:\python27-64\scripts\pyinstaller --clean -F --distpath=gam-64 windows-gam.spec
+c:\python37-64\scripts\pyinstaller --clean -F --distpath=gam-64 windows-gam.spec
 xcopy LICENSE gam-64\
 xcopy whatsnew.txt gam-64\
 xcopy gam-setup.bat gam-64\

src/windows-gam.spec

@@ -1,24 +1,29 @@
-# -*- mode: python -*-
-a = Analysis(['gam.py'],
-             pathex=['C:\\Users\\jlee\\Documents\\GitHub\\GAM'],
-             hiddenimports=[],
-             hookspath=None,
-             excludes=['_tkinter'],
-             runtime_hooks=None)
-for d in a.datas:
-    if 'pyconfig' in d[0]:
-        a.datas.remove(d)
-        break
-a.datas += [('httplib2/cacerts.txt', 'cacerts.txt', 'DATA')]
-a.datas += [('cloudprint-v2.json', 'cloudprint-v2.json', 'DATA')]
-pyz = PYZ(a.pure)
-exe = EXE(pyz,
-          a.scripts,
-          a.binaries,
-          a.zipfiles,
-          a.datas,
-          name='gam.exe',
-          debug=False,
-          strip=None,
-          upx=True,
-          console=True )
+# -*- mode: python -*-
+a = Analysis(['gam.py'],
+             pathex=['C:\\Users\\jlee\\Documents\\GitHub\\GAM'],
+             hiddenimports=[],
+             hookspath=None,
+             excludes=['_tkinter'],
+             runtime_hooks=None)
+for d in a.datas:
+    if 'pyconfig' in d[0]:
+        a.datas.remove(d)
+        break
+a.datas += [('cloudprint-v2.json', 'cloudprint-v2.json', 'DATA')]
+
+# dynamically determine where httplib2/cacerts.txt lives
+import importlib
+proot = os.path.dirname(importlib.import_module('httplib2').__file__)
+a.datas += [('httplib2/cacerts.txt', os.path.join(proot, 'cacerts.txt'), 'DATA')]
+
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='gam.exe',
+          debug=False,
+          strip=None,
+          upx=True,
+          console=True )