Forcr rebuild

bump version dependancy to resolve vulns

.github/workflows/build.yml

@@ -22,7 +22,7 @@ defaults:
     working-directory: src
 
 env:
-  SCRATCH_COUNTER: 13
+  SCRATCH_COUNTER: 14
   OPENSSL_CONFIG_OPTS: no-fips --api=3.0.0
   OPENSSL_INSTALL_PATH: ${{ github.workspace }}/bin/ssl
   OPENSSL_SOURCE_PATH: ${{ github.workspace }}/src/openssl
@@ -88,15 +88,12 @@ jobs:
             goal: build
             arch: Win64
             openssl_archs: VC-WIN64A
-          # disable 3.9 test for now since it's oldest and due
-          # for removal in Oct 2025. We only have 13 jid accounts
-          # so we need this one off but can re-enable at some point
-          # if we feel the need.
-          #- os: ubuntu-24.04
-          #  goal: test
-          #  python: "3.9"
-          #  jid: 11
-          #  arch: x86_64
+          #- os: windows-11-arm
+          #  jid: 14
+          #  goal: build
+          #  arch: arm64
+          #  openssl_archs: VC-CLANG-WIN64-CLANGASM-ARM
+          #  continue-on-error: true
           - os: ubuntu-24.04
             goal: test
             python: "3.10"
@@ -270,6 +267,12 @@ jobs:
             echo "PYTHON=${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}/python.exe" >> $GITHUB_ENV
             echo "GAM_ARCHIVE_ARCH=${GAM_ARCHIVE_ARCH}" >> $GITHUB_ENV
             echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV
+            if [[ "$arch" == "arm64" ]]; then
+              MAKE=make
+              MAKEOPT="-j$(nproc)"
+              echo "VSCMD_DEBUG=3" >> $GITHUB_ENV
+              echo "PATH=${PATH}:${VCINSTALLDIR}\Tools\Llvm\ARM64\bin" >> $GITHUB_ENV
+            fi
           fi
           echo "We'll run make with: ${MAKEOPT}"
           echo "staticx=${staticx}" >> $GITHUB_ENV

src/GamUpdate.txt

@@ -1,3 +1,13 @@
+7.06.04
+
+Fixed bug in `gam report <ActivityApplictionName>` where a report with no activities
+was not displaying any output.
+
+7.06.03
+
+Fixed bug in `gam <UserTypeEntity> print|show drivelastmodification` that caused a trap
+when an empty drive was specified.
+
 7.06.02
 
 Updated `gam <UserTypeEntity> print|show filecounts ... showlastmodification` to include

src/gam/__init__.py

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.06.02'
+__version__ = '7.06.04'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -14145,6 +14145,7 @@ def doReport():
       startDateTime += oneDay
     csvPF.writeCSVfile(f'Customer Report - {tryDate}')
   else: # activityReports
+    csvPF.SetTitles('name')
     if addCSVData:
       csvPF.AddTitles(sorted(addCSVData.keys()))
     if select:
@@ -14303,8 +14304,7 @@ def doReport():
         row = {'name': 'NoActivities'}
         if addCSVData:
           row.update(addCSVData)
-          csvPF.WriteRowTitles(row)
-      csvPF.SetSortTitles(['name'])
+        csvPF.WriteRowTitles(row)
     else:
       if eventRowFilter:
         csvPF.SetRowFilter([], GC.Values[GC.CSV_OUTPUT_ROW_FILTER_MODE])
@@ -56489,7 +56489,7 @@ def printFileParentTree(users):
 # Last file modification utilities
 def _initLastModification():
   return {'lastModifiedFileId': '', 'lastModifiedFileName': '',
-          'lastModifiedFileMimeType': '', 'lastModifiedFilaPath': '',
+          'lastModifiedFileMimeType': '', 'lastModifiedFilePath': '',
           'lastModifyingUser': '', 'lastModifiedTime': NEVER_TIME,
           'fileEntryInfo': {}}
 
@@ -56504,9 +56504,10 @@ def _checkUpdateLastModifiction(f_file, userLastModification):
     userLastModification['fileEntryInfo'] = f_file.copy()
 
 def _getLastModificationPath(drive, userLastModification, pathDelimiter):
-  filePathInfo = initFilePathInfo(pathDelimiter)
-  _, paths, _ = getFilePaths(drive, {}, userLastModification['fileEntryInfo'], filePathInfo)
-  userLastModification['lastModifiedFilePath'] = paths[0] if paths else UNKNOWN
+  if userLastModification['fileEntryInfo']:
+    filePathInfo = initFilePathInfo(pathDelimiter)
+    _, paths, _ = getFilePaths(drive, {}, userLastModification['fileEntryInfo'], filePathInfo)
+    userLastModification['lastModifiedFilePath'] = paths[0] if paths else UNKNOWN
 
 def _showLastModification(lastModification):
   printKeyValueList(['lastModifiedFileId', lastModification['lastModifiedFileId']])

src/requirements.txt

@@ -2,13 +2,13 @@ chardet
 cryptography
 distro; sys_platform=='linux'
 filelock
-google-api-python-client>=2.1
-google-auth-httplib2
-google-auth-oauthlib>=0.4.1
-google-auth>=2.3.2
-httplib2>=0.17.0
+google-api-python-client>=2.166.0
+google-auth-httplib2>=0.2.0
+google-auth-oauthlib>=1.2.1
+google-auth>=2.38.0
+httplib2>=0.22.0
 lxml
-passlib>=1.7.2
+passlib>=1.7.4
 pathvalidate
 python-dateutil
-yubikey-manager[yubikey]>=5.0
+yubikey-manager[yubikey]>=5.6.1

wiki/Command-Line-Parsing.md

@@ -57,10 +57,10 @@ Typically, you will enclose the entire list in double quotes and quote each item
    * ```"item item item"```
 - Items, separated by commas, with spaces, commas or single quotes in the items themselves
    * ```"'it em','it,em',\"it'em\""``` - Linux, MacOS, Windows Command Prompt
-   * ```"'it em','it,em',`"it'em`""``` - Windows Power Shell
+   * ```"'it\ em','it,em',`"it\'em`""``` - Windows Power Shell
 - Items, separated by spaces, with spaces, commas or single quotes in the items themselves
    * ```"'it em' 'it,em' \"it'em\""``` - Linux, MacOS, Windows Command Prompt
-   * ```"'it em' 'it,em' `"it'em`""``` - Windows Power Shell
+   * ```"'it\ em' 'it,em' `"it\'em`""``` - Windows Power Shell
 
 Typical places where these rules apply are lists of OUs and Contact Groups.
 

wiki/GamUpdates.md

@@ -10,6 +10,16 @@ Add the `-s` option to the end of the above commands to suppress creating the `g
 
 See [Downloads-Installs-GAM7](https://github.com/GAM-team/GAM/wiki/Downloads-Installs) for Windows or other options, including manual installation
 
+### 7.06.04
+
+Fixed bug in `gam report <ActivityApplictionName>` where a report with no activities
+was not displaying any output.
+
+### 7.06.03
+
+Fixed bug in `gam <UserTypeEntity> print|show drivelastmodification` that caused a trap
+when an empty drive was specified.
+
 ### 7.06.02
 
 Updated `gam <UserTypeEntity> print|show filecounts ... showlastmodification` to include

wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md

@@ -251,7 +251,7 @@ writes the credentials into the file oauth2.txt.
 admin@server:/Users/admin$ rm -f /Users/admin/GAMConfig/oauth2.txt
 admin@server:/Users/admin$ gam version
 WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found
-GAM 7.06.02 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.06.04 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.3 64-bit final
 MacOS Sequoia 15.4 x86_64
@@ -989,7 +989,7 @@ writes the credentials into the file oauth2.txt.
 C:\>del C:\GAMConfig\oauth2.txt
 C:\>gam version
 WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found
-GAM 7.06.02 - https://github.com/GAM-team/GAM - pythonsource
+GAM 7.06.04 - https://github.com/GAM-team/GAM - pythonsource
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.3 64-bit final
 Windows-10-10.0.17134 AMD64

wiki/Version-and-Help.md

@@ -4,7 +4,7 @@ k
 Print the current version of Gam with details
 ```
 gam version
-GAM 7.06.02 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.06.04 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.3 64-bit final
 MacOS Sequoia 15.4 x86_64
@@ -16,7 +16,7 @@ Time: 2023-06-02T21:10:00-07:00
 Print the current version of Gam with details and time offset information
 ```
 gam version timeoffset
-GAM 7.06.02 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.06.04 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.3 64-bit final
 MacOS Sequoia 15.4 x86_64
@@ -28,7 +28,7 @@ Your system time differs from www.googleapis.com by less than 1 second
 Print the current version of Gam with extended details and SSL information
 ```
 gam version extended
-GAM 7.06.02 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.06.04 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.3 64-bit final
 MacOS Sequoia 15.4 x86_64
@@ -65,7 +65,7 @@ MacOS High Sierra 10.13.6 x86_64
 Path: /Users/Admin/bin/gam7
 Version Check:
   Current: 5.35.08
-   Latest: 7.06.02
+   Latest: 7.06.04
 echo $?
 1
 ```
@@ -73,7 +73,7 @@ echo $?
 Print the current version number without details
 ```
 gam version simple
-7.06.02
+7.06.04
 ```
 In Linux/MacOS you can do:
 ```
@@ -83,7 +83,7 @@ echo $VER
 Print the current version of Gam and address of this Wiki
 ```
 gam help
-GAM 7.06.02 - https://github.com/GAM-team/GAM
+GAM 7.06.04 - https://github.com/GAM-team/GAM
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.3 64-bit final
 MacOS Sequoia 15.4 x86_64