mirror of
https://github.com/GAM-team/GAM.git
synced 2026-07-03 12:21:35 +00:00
Compare commits
12 Commits
v7.09.02
...
20250612.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f12d3abfc1 | ||
|
|
474aa069b7 | ||
|
|
c49708cbae | ||
|
|
43ecba07bb | ||
|
|
51f8ebe8e2 | ||
|
|
28edce3aca | ||
|
|
fe1f0285f8 | ||
|
|
da83121d0d | ||
|
|
f58a69e374 | ||
|
|
2f40a164c5 | ||
|
|
58a3fa7313 | ||
|
|
39ce5b7349 |
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -126,7 +126,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
cache.tar.xz
|
cache.tar.xz
|
||||||
key: gam-${{ matrix.jid }}-20250603
|
key: gam-${{ matrix.jid }}-20250611
|
||||||
|
|
||||||
- name: Untar Cache archive
|
- name: Untar Cache archive
|
||||||
if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true'
|
if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true'
|
||||||
|
|||||||
@@ -1,3 +1,20 @@
|
|||||||
|
7.09.04
|
||||||
|
|
||||||
|
Fixed bug in `gam whatis <EmailItem>` where the check for an invitable user always failed.
|
||||||
|
|
||||||
|
Fixed bug in `gam print shareddriveorganizers` where no organizers were displayed when `domain` in `gam.cfg` was blank.
|
||||||
|
|
||||||
|
Updated to Python 3.13.5
|
||||||
|
|
||||||
|
7.09.03
|
||||||
|
|
||||||
|
Updated `gam <UserTypeEntity> create focustime|outofoffice ... timerange <Time> <Time>` to check
|
||||||
|
that the first `<Time>` is less than the second `Time`; previously the event was not created.
|
||||||
|
|
||||||
|
For new installs the `enforce_expansive_access` Boolean variable in `gam.cfg` now defaults to True.
|
||||||
|
For existing installations, if `enforce_expansive_access` has not been added to `gam.cfg`,
|
||||||
|
a default value of True will be used.
|
||||||
|
|
||||||
7.09.02
|
7.09.02
|
||||||
|
|
||||||
Added command `gam info chromeschema std <SchemaName>` to display a Chrome policy schema in the same format as Legacy GAM.
|
Added command `gam info chromeschema std <SchemaName>` to display a Chrome policy schema in the same format as Legacy GAM.
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
|
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
|
||||||
__version__ = '7.09.02'
|
__version__ = '7.09.04'
|
||||||
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
|
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
|
||||||
|
|
||||||
#pylint: disable=wrong-import-position
|
#pylint: disable=wrong-import-position
|
||||||
@@ -13138,7 +13138,7 @@ def doWhatIs():
|
|||||||
entityUnknownWarning(Ent.EMAIL, email)
|
entityUnknownWarning(Ent.EMAIL, email)
|
||||||
setSysExitRC(ENTITY_IS_UKNOWN_RC)
|
setSysExitRC(ENTITY_IS_UKNOWN_RC)
|
||||||
return
|
return
|
||||||
if not invitableCheck or not getSvcAcctCredentials(API.CLOUDIDENTITY_USERINVITATIONS, _getAdminEmail(), softErrors=True):
|
if not invitableCheck:
|
||||||
isInvitableUser = False
|
isInvitableUser = False
|
||||||
else:
|
else:
|
||||||
isInvitableUser, ci = _getIsInvitableUser(None, email)
|
isInvitableUser, ci = _getIsInvitableUser(None, email)
|
||||||
@@ -28313,7 +28313,16 @@ CHROME_SCHEMA_SPECIAL_CASES = {
|
|||||||
'chrome.users.RelaunchNotificationWithDurationV2':
|
'chrome.users.RelaunchNotificationWithDurationV2':
|
||||||
{'relaunchnotificationperiodduration':
|
{'relaunchnotificationperiodduration':
|
||||||
{'casedField': 'relaunchNotificationPeriodDuration',
|
{'casedField': 'relaunchNotificationPeriodDuration',
|
||||||
'type': 'duration', 'minVal': -1, 'maxVal': None}},
|
'type': 'duration', 'minVal': 1, 'maxVal': 168},
|
||||||
|
'relaunchinitialquietperiodduration':
|
||||||
|
{'casedField': 'relaunchInitialQuietPeriodDuration',
|
||||||
|
'type': 'duration', 'minVal': 0, 'maxVal': None},
|
||||||
|
'relaunchwindowstarttime':
|
||||||
|
{'casedField': 'relaunchWindowStartTime',
|
||||||
|
'type': 'timeOfDay'},
|
||||||
|
'relaunchwindowdurationmin':
|
||||||
|
{'casedField': 'relaunchWindowDurationMin',
|
||||||
|
'type': 'duration', 'minVal': 1, 'maxVal': 1440}},
|
||||||
'chrome.users.SecurityTokenSessionSettingsV2':
|
'chrome.users.SecurityTokenSessionSettingsV2':
|
||||||
{'securitytokensessionnotificationseconds':
|
{'securitytokensessionnotificationseconds':
|
||||||
{'casedField': 'securityTokenSessionNotificationSeconds',
|
{'casedField': 'securityTokenSessionNotificationSeconds',
|
||||||
@@ -28475,7 +28484,7 @@ def doUpdateChromePolicy():
|
|||||||
return value
|
return value
|
||||||
#if vtype == timeOfDay:
|
#if vtype == timeOfDay:
|
||||||
hours, minutes = value.split(':')
|
hours, minutes = value.split(':')
|
||||||
return {vtype: {'hours': hours, 'minutes': minutes}}
|
return {vtype: {'hours': int(hours), 'minutes': int(minutes)}}
|
||||||
|
|
||||||
cp = buildGAPIObject(API.CHROMEPOLICY)
|
cp = buildGAPIObject(API.CHROMEPOLICY)
|
||||||
cd = buildGAPIObject(API.DIRECTORY)
|
cd = buildGAPIObject(API.DIRECTORY)
|
||||||
@@ -28931,7 +28940,7 @@ def _showChromePolicySchema(schema, FJQC, i=0, count=0):
|
|||||||
return
|
return
|
||||||
printEntity([Ent.CHROME_POLICY_SCHEMA, schema['name']], i, count)
|
printEntity([Ent.CHROME_POLICY_SCHEMA, schema['name']], i, count)
|
||||||
Ind.Increment()
|
Ind.Increment()
|
||||||
showJSON(None, schema, dictObjectsKey={'messageType': 'name', 'field': 'name'})
|
showJSON(None, schema, dictObjectsKey={'messageType': 'name', 'field': 'name', 'fieldDescriptions': 'field'})
|
||||||
Ind.Decrement()
|
Ind.Decrement()
|
||||||
|
|
||||||
CHROME_POLICY_SCHEMA_FIELDS_CHOICE_MAP = {
|
CHROME_POLICY_SCHEMA_FIELDS_CHOICE_MAP = {
|
||||||
@@ -51586,6 +51595,9 @@ def getStatusEventDateTime(dateType, dateList):
|
|||||||
if dateType == 'timerange':
|
if dateType == 'timerange':
|
||||||
startTime = getTimeOrDeltaFromNow(returnDateTime=True)[0]
|
startTime = getTimeOrDeltaFromNow(returnDateTime=True)[0]
|
||||||
endTime = getTimeOrDeltaFromNow(returnDateTime=True)[0]
|
endTime = getTimeOrDeltaFromNow(returnDateTime=True)[0]
|
||||||
|
if startTime >= endTime:
|
||||||
|
Cmd.Backup()
|
||||||
|
usageErrorExit(Msg.INVALID_EVENT_TIMERANGE.format(dateType, startTime, endTime))
|
||||||
recurrence = []
|
recurrence = []
|
||||||
while checkArgumentPresent(['recurrence']):
|
while checkArgumentPresent(['recurrence']):
|
||||||
recurrence.append(getString(Cmd.OB_RECURRENCE))
|
recurrence.append(getString(Cmd.OB_RECURRENCE))
|
||||||
@@ -66166,7 +66178,11 @@ def printSharedDriveOrganizers(users, useDomainAdminAccess=False):
|
|||||||
showNoOrganizerDrives = SHOW_NO_PERMISSIONS_DRIVES_CHOICE_MAP['false']
|
showNoOrganizerDrives = SHOW_NO_PERMISSIONS_DRIVES_CHOICE_MAP['false']
|
||||||
fieldsList = ['role', 'type', 'emailAddress']
|
fieldsList = ['role', 'type', 'emailAddress']
|
||||||
cd = entityList = orgUnitId = query = matchPattern = None
|
cd = entityList = orgUnitId = query = matchPattern = None
|
||||||
domainList = [GC.Values[GC.DOMAIN]]
|
domainList = set()
|
||||||
|
if GC.Values[GC.DOMAIN]:
|
||||||
|
domainList.add(GC.Values[GC.DOMAIN])
|
||||||
|
else:
|
||||||
|
domainList.add(GM.Globals[GM.DECODED_ID_TOKEN].get('hd', 'UNKNOWN').lower())
|
||||||
oneOrganizer = True
|
oneOrganizer = True
|
||||||
while Cmd.ArgumentsRemaining():
|
while Cmd.ArgumentsRemaining():
|
||||||
myarg = getArgument()
|
myarg = getArgument()
|
||||||
|
|||||||
@@ -379,7 +379,7 @@ Defaults = {
|
|||||||
DEVICE_MAX_RESULTS: '200',
|
DEVICE_MAX_RESULTS: '200',
|
||||||
DOMAIN: '',
|
DOMAIN: '',
|
||||||
DRIVE_DIR: '',
|
DRIVE_DIR: '',
|
||||||
ENFORCE_EXPANSIVE_ACCESS: FALSE,
|
ENFORCE_EXPANSIVE_ACCESS: TRUE,
|
||||||
DRIVE_MAX_RESULTS: '1000',
|
DRIVE_MAX_RESULTS: '1000',
|
||||||
DRIVE_V3_BETA: FALSE,
|
DRIVE_V3_BETA: FALSE,
|
||||||
DRIVE_V3_NATIVE_NAMES: TRUE,
|
DRIVE_V3_NATIVE_NAMES: TRUE,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
# Copyright (C) 2024 Ross Scroggs All Rights Reserved.
|
# Copyright (C) 2025 Ross Scroggs All Rights Reserved.
|
||||||
#
|
#
|
||||||
# All Rights Reserved.
|
# All Rights Reserved.
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -310,6 +310,7 @@ INVALID_ATTENDEE_CHANGE = 'Invalid attendee change "{0}"'
|
|||||||
INVALID_CHARSET = 'Invalid charset "{0}"'
|
INVALID_CHARSET = 'Invalid charset "{0}"'
|
||||||
INVALID_DATE_TIME_RANGE = '{0} {1} must be greater than/equal to {2} {3}'
|
INVALID_DATE_TIME_RANGE = '{0} {1} must be greater than/equal to {2} {3}'
|
||||||
INVALID_ENTITY = 'Invalid {0}, {1}'
|
INVALID_ENTITY = 'Invalid {0}, {1}'
|
||||||
|
INVALID_EVENT_TIMERANGE = '{0} {1} must be less than {2}'
|
||||||
INVALID_FILE_SELECTION_WITH_ADMIN_ACCESS = 'Invalid file selection with adminaccess|asadmin'
|
INVALID_FILE_SELECTION_WITH_ADMIN_ACCESS = 'Invalid file selection with adminaccess|asadmin'
|
||||||
INVALID_GROUP = 'Invalid Group'
|
INVALID_GROUP = 'Invalid Group'
|
||||||
INVALID_HTTP_HEADER = 'Invalid http header data: {0}'
|
INVALID_HTTP_HEADER = 'Invalid http header data: {0}'
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
# Copyright (C) 2023 Ross Scroggs All Rights Reserved.
|
# Copyright (C) 2025 Ross Scroggs All Rights Reserved.
|
||||||
#
|
#
|
||||||
# All Rights Reserved.
|
# All Rights Reserved.
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
# Copyright (C) 2023 Ross Scroggs All Rights Reserved.
|
# Copyright (C) 2025 Ross Scroggs All Rights Reserved.
|
||||||
#
|
#
|
||||||
# All Rights Reserved.
|
# All Rights Reserved.
|
||||||
#
|
#
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -10,6 +10,21 @@ 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
|
See [Downloads-Installs-GAM7](https://github.com/GAM-team/GAM/wiki/Downloads-Installs) for Windows or other options, including manual installation
|
||||||
|
|
||||||
|
### 7.09.03
|
||||||
|
|
||||||
|
Updated `gam <UserTypeEntity> create focustime|outofoffice ... timerange <Time> <Time>` to check
|
||||||
|
that the first `<Time>` is less than the second `Time`; previously the event was not created.
|
||||||
|
|
||||||
|
For new installs the `enforce_expansive_access` Boolean variable in `gam.cfg` now defaults to True.
|
||||||
|
For existing installations, if `enforce_expansive_access` has not been added to `gam.cfg`,
|
||||||
|
a default value of True will be used.
|
||||||
|
|
||||||
|
### 7.09.02
|
||||||
|
|
||||||
|
Added command `gam info chromeschema std <SchemaName>` to display a Chrome policy schema in the same format as Legacy GAM.
|
||||||
|
|
||||||
|
Improved output of `gam show chromeschemas [std]` and `gam info chromeschema [std]` to more accurately display the schemas.
|
||||||
|
|
||||||
### 7.09.01
|
### 7.09.01
|
||||||
|
|
||||||
Fixed bug in `gam <UserTypeEntity> print diskusage` where the `ownedByMe` column was
|
Fixed bug in `gam <UserTypeEntity> print diskusage` where the `ownedByMe` column was
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ gam update group|groups <GroupEntity> create|add [<GroupRole>]
|
|||||||
[preview] [actioncsv]
|
[preview] [actioncsv]
|
||||||
<UserItem>|<UserTypeEntity>
|
<UserItem>|<UserTypeEntity>
|
||||||
```
|
```
|
||||||
To add a group as a memmber of another group, just specify its email address.
|
To add a group as a member of another group, just specify its email address.
|
||||||
```
|
```
|
||||||
gam update group group1@domain.com add member group2@domain.com
|
gam update group group1@domain.com add member group2@domain.com
|
||||||
```
|
```
|
||||||
@@ -208,7 +208,7 @@ gam update group|groups <GroupEntity> delete|remove [<GroupRole>]
|
|||||||
```
|
```
|
||||||
`<GroupRole>` is ignored, deletions take place regardless of role.
|
`<GroupRole>` is ignored, deletions take place regardless of role.
|
||||||
|
|
||||||
To remove a group as a memmber of another group, just specify its email address.
|
To remove a group as a member of another group, just specify its email address.
|
||||||
```
|
```
|
||||||
gam update group group1@domain.com remove group2@domain.com
|
gam update group group1@domain.com remove group2@domain.com
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -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$ rm -f /Users/admin/GAMConfig/oauth2.txt
|
||||||
admin@server:/Users/admin$ gam version
|
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
|
WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found
|
||||||
GAM 7.09.01 - https://github.com/GAM-team/GAM - pyinstaller
|
GAM 7.09.03 - https://github.com/GAM-team/GAM - pyinstaller
|
||||||
GAM Team <google-apps-manager@googlegroups.com>
|
GAM Team <google-apps-manager@googlegroups.com>
|
||||||
Python 3.13.4 64-bit final
|
Python 3.13.4 64-bit final
|
||||||
MacOS Sequoia 15.5 x86_64
|
MacOS Sequoia 15.5 x86_64
|
||||||
@@ -989,7 +989,7 @@ writes the credentials into the file oauth2.txt.
|
|||||||
C:\>del C:\GAMConfig\oauth2.txt
|
C:\>del C:\GAMConfig\oauth2.txt
|
||||||
C:\>gam version
|
C:\>gam version
|
||||||
WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found
|
WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found
|
||||||
GAM 7.09.01 - https://github.com/GAM-team/GAM - pythonsource
|
GAM 7.09.03 - https://github.com/GAM-team/GAM - pythonsource
|
||||||
GAM Team <google-apps-manager@googlegroups.com>
|
GAM Team <google-apps-manager@googlegroups.com>
|
||||||
Python 3.13.4 64-bit final
|
Python 3.13.4 64-bit final
|
||||||
Windows-10-10.0.17134 AMD64
|
Windows-10-10.0.17134 AMD64
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
Print the current version of Gam with details
|
Print the current version of Gam with details
|
||||||
```
|
```
|
||||||
gam version
|
gam version
|
||||||
GAM 7.09.01 - https://github.com/GAM-team/GAM - pyinstaller
|
GAM 7.09.03 - https://github.com/GAM-team/GAM - pyinstaller
|
||||||
GAM Team <google-apps-manager@googlegroups.com>
|
GAM Team <google-apps-manager@googlegroups.com>
|
||||||
Python 3.13.4 64-bit final
|
Python 3.13.4 64-bit final
|
||||||
MacOS Sequoia 15.5 x86_64
|
MacOS Sequoia 15.5 x86_64
|
||||||
@@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00
|
|||||||
Print the current version of Gam with details and time offset information
|
Print the current version of Gam with details and time offset information
|
||||||
```
|
```
|
||||||
gam version timeoffset
|
gam version timeoffset
|
||||||
GAM 7.09.01 - https://github.com/GAM-team/GAM - pyinstaller
|
GAM 7.09.03 - https://github.com/GAM-team/GAM - pyinstaller
|
||||||
GAM Team <google-apps-manager@googlegroups.com>
|
GAM Team <google-apps-manager@googlegroups.com>
|
||||||
Python 3.13.4 64-bit final
|
Python 3.13.4 64-bit final
|
||||||
MacOS Sequoia 15.5 x86_64
|
MacOS Sequoia 15.5 x86_64
|
||||||
@@ -27,7 +27,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
|
Print the current version of Gam with extended details and SSL information
|
||||||
```
|
```
|
||||||
gam version extended
|
gam version extended
|
||||||
GAM 7.09.01 - https://github.com/GAM-team/GAM - pyinstaller
|
GAM 7.09.03 - https://github.com/GAM-team/GAM - pyinstaller
|
||||||
GAM Team <google-apps-manager@googlegroups.com>
|
GAM Team <google-apps-manager@googlegroups.com>
|
||||||
Python 3.13.4 64-bit final
|
Python 3.13.4 64-bit final
|
||||||
MacOS Sequoia 15.5 x86_64
|
MacOS Sequoia 15.5 x86_64
|
||||||
@@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64
|
|||||||
Path: /Users/Admin/bin/gam7
|
Path: /Users/Admin/bin/gam7
|
||||||
Version Check:
|
Version Check:
|
||||||
Current: 5.35.08
|
Current: 5.35.08
|
||||||
Latest: 7.09.01
|
Latest: 7.09.03
|
||||||
echo $?
|
echo $?
|
||||||
1
|
1
|
||||||
```
|
```
|
||||||
@@ -72,7 +72,7 @@ echo $?
|
|||||||
Print the current version number without details
|
Print the current version number without details
|
||||||
```
|
```
|
||||||
gam version simple
|
gam version simple
|
||||||
7.09.01
|
7.09.03
|
||||||
```
|
```
|
||||||
In Linux/MacOS you can do:
|
In Linux/MacOS you can do:
|
||||||
```
|
```
|
||||||
@@ -82,7 +82,7 @@ echo $VER
|
|||||||
Print the current version of Gam and address of this Wiki
|
Print the current version of Gam and address of this Wiki
|
||||||
```
|
```
|
||||||
gam help
|
gam help
|
||||||
GAM 7.09.01 - https://github.com/GAM-team/GAM
|
GAM 7.09.03 - https://github.com/GAM-team/GAM
|
||||||
GAM Team <google-apps-manager@googlegroups.com>
|
GAM Team <google-apps-manager@googlegroups.com>
|
||||||
Python 3.13.4 64-bit final
|
Python 3.13.4 64-bit final
|
||||||
MacOS Sequoia 15.5 x86_64
|
MacOS Sequoia 15.5 x86_64
|
||||||
|
|||||||
@@ -337,7 +337,7 @@ enforce_expansive_access
|
|||||||
gam <UserTypeEntity> move drivefile
|
gam <UserTypeEntity> move drivefile
|
||||||
gam <UserTypeEntity> transfer ownership
|
gam <UserTypeEntity> transfer ownership
|
||||||
gam <UserTypeEntity> claim ownership
|
gam <UserTypeEntity> claim ownership
|
||||||
Default: False
|
Default: True
|
||||||
event_max_results
|
event_max_results
|
||||||
When retrieving lists of Calendar events from API,
|
When retrieving lists of Calendar events from API,
|
||||||
how many should be retrieved in each API call
|
how many should be retrieved in each API call
|
||||||
|
|||||||
Reference in New Issue
Block a user