Commit Graph

1980 Commits

Author SHA1 Message Date
Greg Neagle
ee7be2997d Before copying a directory for a copy_from_dmg item, ensure it is owned by root (in addition to the 0700 check) 2018-06-19 15:31:35 -07:00
Greg Neagle
8496349b73 Catch exception if we cannot securely create the destination directory for a copy_from_dmg item 2018-06-19 14:46:33 -07:00
Greg Neagle
470013ac8a Merge branch 'no-serveserve-symlink' 2018-06-19 09:37:41 -07:00
Greg Neagle
18ef54ca00 Don't allow user-writable SelfServiceManifest to be a symlink 2018-06-18 14:42:52 -07:00
Greg Neagle
9e0d4e0426 More strict validation of permissions when copying directories from a disk image. 2018-06-18 11:28:50 -07:00
Clayton Burlison
b1e94a072b fix: Remove OpenSSL import in keychain.py (#856)
In Mojave 10.14 Apple has updated the openssl version to a newer release
of LibreSSL (2.6.4) that no longer contains the proper Symbols for SSLv3.
This causes import errors in the OpenSSL module that ships with 10.14.

To resolve the import errors we now shell out to openssl to get the
client cert common name. This has been hand tested with the following
macOS/openssl versions:

- 10.12 - 0.9.8zh 14 Jan 2016
- 10.13 - LibreSSL 2.2.7
- 10.14b1 - LibreSSL 2.6.4

Fix: #855
2018-06-12 08:23:13 -07:00
Elliot Jordan
7468a441cf Add missing spaces in help strings (#857) 2018-06-12 08:21:33 -07:00
Greg Neagle
68a5628a34 Add more logging to authrestartd; update comments in MSCPasswordAlertController.py 2018-06-05 16:06:51 -07:00
Greg Neagle
d248ec8121 When storing password for authrestart, also store (and retreive) username for use with APFS on High Sierra+ 2018-06-04 15:35:18 -07:00
Greg Neagle
0bf8d5d23c When checking for evidence of installation when evaluating a managed_uninstall, do not be fooled by an empty installs array. 2018-05-30 13:54:50 -07:00
Greg Neagle
ff0832fdf3 Don't crash if DomainName is not set in the current network configuration when attempting to auto-detect the repo URL 2018-05-30 08:10:01 -07:00
Greg Neagle
6a2586e655 Bumping version for future release 2018-05-16 06:22:49 -07:00
Greg Neagle
2ad96d86af Fix for inaccurate detection of already-mounted disk images 2018-05-08 17:02:40 -07:00
Greg Neagle
ddac5a7ea7 When installing Apple updates via softwareupdate, attempt to use the InstallHistory.plist to determine installation success before using the parsed outout of the softwareupdate binary. 2018-04-24 16:39:34 -07:00
Greg Neagle
48d9c296b2 munkiimport: if no options or arguments are given, print usage 2018-04-19 15:37:39 -07:00
Greg Neagle
c837176d19 Add 'featured' to the list of key/values to copy from the previous pkginfo. Fixes #815. 2018-04-18 13:47:53 -07:00
Greg Neagle
46747a9848 Fix warn_if_server_is_default function to not crash when SoftwareRepoURL is None, a result of the changes in autodetecting ther Munki repo 2018-04-18 10:25:18 -07:00
Greg Neagle
975d2b1f36 When SoftwareRepoURL is not defined, try several default URLs starting with some https:// urls 2018-04-17 22:34:40 -07:00
Greg Neagle
62dd7700fd Refactor app_usage_monitor into user-level agent and privileged daemon. 2018-04-07 19:10:16 -07:00
Greg Neagle
4fd032567a Fix bad merge of version.plist 2018-03-27 17:14:01 -07:00
Greg Neagle
51efa81942 Merge branch 'master' into Munki3dev 2018-03-27 17:11:31 -07:00
Greg Neagle
e1f5f0204b Explicitly clear softwareupdate's LastSessionSuccessful value before checking for updates to minimize false reports of unsuccessful sessions. 2018-03-27 17:08:02 -07:00
Greg Neagle
332212bfce When using os.uname()[1] to get the hostname, decode('UTF-8') to convert to Unicode 2018-03-23 16:00:53 -07:00
Greg Neagle
b365ffcc0a update munkilib/version.plist for eventual release 2018-03-09 16:42:50 -08:00
Greg Neagle
9f200aa586 Bump version for eventual release 2018-03-09 16:41:07 -08:00
Greg Neagle
3e0120a0db managedsoftwareupdate --show-config also prints com.apple.SoftwareUpdate CatalogURL config if Munki is configured to install Apple updates. 2018-03-09 16:28:34 -08:00
Tom
7f6f0f865d Implemented optional_installs for localonly manifest (#837)
* Implemented optional_installs for localonly manifest

You can now add an optional_installs key to your localonly manifest,
which was not possible before.
2018-03-07 09:28:33 -08:00
Greg Neagle
82c076aa46 Add os_build_number and os_build_last_component to predicate info object (AKA built-in 'conditions') 2018-02-11 09:12:57 -08:00
Greg Neagle
4f8b47746d Fix for #829. munkiimport: Don't crash with IndexError when --apple-update option is used. 2018-01-24 14:54:04 -08:00
Greg Neagle
1428c40d06 Update copyright notices to include 2018 2018-01-20 08:46:22 -08:00
Greg Neagle
f4078f6019 Set installed_size for High Sierra installer to 14.3GB when importing 2018-01-18 10:28:29 -08:00
Greg Neagle
de06aa73c0 When processing included_manifests skip any empty items in the array. Prevents an unexpected error leading to a crash wirh some webserver confiugurations 2018-01-10 09:21:10 -08:00
Greg Neagle
15e677d5e4 Update some Gurl object method defintions for better compatibility with newer versions of PyObjC 2017-12-16 09:21:51 -08:00
Greg Neagle
0de5de02e8 Strip leading slashes from relative manifest pathname to prevent managedsoftwareupdate from storing local manifest copies in unexpected paths 2017-12-08 10:32:57 -08:00
Greg Neagle
b676a5d894 app_usage_monitor: fix a commet typo - thanks @dre 2017-12-02 09:10:39 -08:00
Greg Neagle
97ab9ad234 Fix for Unexpected error in appleupdates when apple update metadata item contains 'RestartAction': 'None' for an item whose RestartAction is already 'None'. 2017-11-30 13:32:06 -08:00
Greg Neagle
0dc1f02511 munkilib/updatecheck/compare.py: Catch KeyError when attempting to find applications in installs arrays when an application item might not have a path key/value 2017-11-28 09:44:20 -08:00
Greg Neagle
f7f7f527b4 makecatalogslib.py: _append_ extra errors to the end of the errors list; _extend_ does the wrong thing :-) 2017-11-27 11:05:03 -08:00
Greg Neagle
ce5ddf2193 munkiimport: Fix issue where pkgs/ was prepended to the relative pkg path in the pkginfo. 2017-11-27 07:01:52 -08:00
Greg Neagle
833cd18806 Make some functions in munkiimportlib.py less chatty to make them easier to use in other code 2017-11-26 17:32:15 -08:00
Greg Neagle
0fc13759ab makepkginfo: Remove no-longer used --verify-options-only flag and code 2017-11-26 17:30:33 -08:00
Greg Neagle
dd6e936e80 munkiimport now calls code in munkilib/admin/makecatalogs.py to rebuild catalogs instead of subprocessing makecatalogs 2017-11-19 17:56:09 -08:00
Greg Neagle
255f5762f5 Move reusable code from makecatalogs into munkilib/admin/makecatalogslb.py 2017-11-19 17:30:22 -08:00
Greg Neagle
dbf0c95b9d Move munkiimportlib.py and pkginfolib.py into munkilib/admin 2017-11-19 08:39:22 -08:00
Greg Neagle
810d5d833d Move lots of munkiimport functions into munkilib/munkiimportlib.py so they can be called by other code 2017-11-19 07:04:44 -08:00
Greg Neagle
b27aefe373 munkiimport now calls code in munkilib/pkginfolib to generate a pkginfo instead of subprocessing makepkginfo. 2017-11-18 15:09:16 -08:00
Greg Neagle
b56c95e791 Move generation of makepkginfo option groups to pkginfolib so munkiimport can add them as well 2017-11-18 13:40:19 -08:00
Greg Neagle
fe659e0180 More tweaks to pkginfolib and makepkginfo 2017-11-18 13:18:17 -08:00
Greg Neagle
f0e6e3d1a9 Move some makepkginfo code into a lib module that can be called by other code (like, say munkiimport...) 2017-11-18 12:35:35 -08:00
Greg Neagle
11bc22b382 Merge branch 'issue814fix' into Munki3dev 2017-11-03 14:26:07 -07:00