Commit graph

3196 commits

Author SHA1 Message Date
Daniel Wozniak
b8c72db128 Merge pull request #65716 from dwoz/merge-forward
[master] Merge forward 3006.x
2023-12-17 21:57:55 -07:00
Daniel A. Wozniak
c88ea27d36 Skip RC test on Photon OS 2023-12-17 20:18:14 -07:00
Daniel A. Wozniak
0744177cd7 Merge remote-tracking branch 'saltstack/3006.x' into merge-forward 2023-12-17 14:58:34 -07:00
Daniel A. Wozniak
15e5e33939 Even more reliable pillar timeout test 2023-12-17 14:57:27 -07:00
Daniel A. Wozniak
2710c0668d Merge remote-tracking branch 'saltstack/3006.x' into merge-forward 2023-12-16 15:35:16 -07:00
Daniel A. Wozniak
60a1d31e19 Make cluster tests more stable 2023-12-16 15:31:00 -07:00
Pablo Suárez Hernández
dbeb44bdd4 Add unit tests to check path is expanded 2023-12-16 14:48:10 -07:00
Jason Woods
a1ae9cccf5 fix: Enable port modification in state selinux.port_policy_present 2023-12-16 04:34:23 -07:00
jeanluc
c1ac77d842 Run pyupgrade 2023-12-16 04:32:10 -07:00
jeanluc
5d48537179 Correct scene33 hash + regen sigs after rebase
It seems the file lost a space character, making the tests fail
2023-12-16 04:32:10 -07:00
jeanluc
ba2b208b3b Add signature verification to file.managed/archive.extracted 2023-12-16 04:32:10 -07:00
Michael Calmer
bd02c1ebe5 add testcase for remove and removeptf 2023-12-16 04:31:08 -07:00
Pedro Algarvio
040c0fe7e6 Set the right path for the config file
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-12-16 01:30:01 -07:00
jeanluc
cd8cb61196 Make x509_v2 compound match detection use match runner 2023-12-16 01:27:15 -07:00
nicholasmhughes
099962909f add tests for file.serialize check_cmd usage 2023-12-16 01:19:19 -07:00
jeanluc
4ace69d13d Rewrite vault core, issue AppRoles to minions (#62684)
* Rewrite vault core, orchestrate AppRoles for minions

This commit represents a fundamental rewrite in how Salt interacts with
Vault. The master should still be compatible with minions running the
old code. There should be no breaking changes to public interfaces and
the old configuration format should still apply.

Core:
- Issue AppRoles to minions
- Manage entities with templatable metadata for minions
- Use inbuilt Salt cache
- Separate config cache from token cache
- Cache: introduce connection-scope vs global scope

Utility module:
- Support being imported (__utils__ deprecation)
- Raise exceptions on queries to simplify response handling
- Add classes to wrap complexity, especially regarding KV v2
- Lay some groundwork for renewing tokens

Execution module:
- Add patch_secret
- Add version support to delete_secret
- Allow returning listed keys only in list_secret
- Add policy_[fetch/write/delete] and policies_list
- Add query for arbitrary API queries

State module:
- Make use of execution module
- Change output format

Docs:
- Update for new configuration format
- Correct examples
- Add configuration examples
- Add required policies

* Fix linting for rewritten vault integration

* Add pytest unit tests for utils.vault, fix found issues

* Fix old vault runner tests

* Rewrite vault sdb tests, migrate to pytests

* Adapt vault ext_pillar tests

* Adapt vault execution module tests, migrate to pytests

* Add more vault execution module unit tests

* Support python <3.7 (vault util), time-independent tests

* Add/migrate vault runner unit tests (pytest)

* Add vault state module pytests

* Fix tests lint

* Refactor Vault container fixture, move to session scope

* Fix for existing vault execution/sdb module integration tests

* Improve existing vault runner integration tests

* Fix vault test support, add list policies

* Add more functional execution module tests, fix deprecated warning

* Refactor vault pytest support

* Add integration tests, improve/fix caching/issue_params

* Improve caching behavior, fix tests

* Always use session cache as well
* Also flush session cache when requested
* Make KV metadata caching behavior configurable
* Update tests to account for changes from prev commit

* Allow to autodiscover platform default CA bundle

* Remove runner approle param overrides

There is no simple way to ensure they are kept.

* Add clear_cache runner function

* Also manage token metadata for issued secret IDs

* Cleanup tests

* Cleanup code, pylint logging suggestions

* Do not always invalidate config when verify=default

* Ensure concatted metadata lists are sorted

* Add changelog (partly)

* Work with legacy peer_run configuration as well

* Consume a token use regardless of status code

* Correct verify semantics

* Refine token uses handling, add changelog/tests for old issues

* Add changelog for main features

* Add test for issue 58580

* Fix vault docs

* Provide all old make_request functionality, add tests

* Allow token use override, add docstrings to query funcs

* Simplify config_location merge

* Cleanup

* Fix make_request warning

* Attempt to fix memory issues during CI test run

* Increase documented version

* Improve lease handling

* Refine lease ttl handling/add token lifecycle management

* Fix docs build

* Adapt formatting

* assert what you get against what you expect
* drop empty parentheses after wrapper
* use `is` to compare against strictly boolean vars

* Fix issue param overrides

* during pillar rendering, they were always reset by the master (for
  AppRoles)
* overrides were only respected for some settings (AppRoles)
* old config syntax was using the old syntax internally (tech debt)

* Introduce session-scoped cache

* Tokens with a single use left are unrenewable

* Allow override of flushing of cached leases during lookup

* Refactor cache classes, save lease data

* Rename session token cache key

* Add lease management utility

* Fix runner integration tests

after renaming the token cache key

* Do not overwrite data of cached leases after renewal

* Pass token_lifecycle to minions

* Do not fail syncing multiple approles/entities with pillar templates

* Ensure config cache expiration can be disabled

* Rename changelog files (.md)

* Declare vaultpolicylexer as parallel read safe

* Correct meta[data] payload key

For tokens it is `meta`, but for secret IDs, `metadata`.

* Reuse TCP connection

* Refactor utils module

* Ensure client is recreated after clearing cache

* Always use unwrap_client config as expected server

This should fix the test failure in the runner integration test
TestAppRoleIssuance::test_server_switch_does_not_break_minion_auth

* Ensure client is recreated after clearing cache 2

* Simulate patch for KV v1 or missing `patch` capability

* Add `patch` option to Vault SDB driver

* Reduce lease validity when revocation fails

* Extract AppRole/Identity API from runner into utils

* Revoke tokens, fire events, improve cache/exception handling

* Tokens (and therefore associated leases) are revoked when cleared by default
* It's possible to disable clearing cache when a perfectly valid token
  is available, but a PermissionDeniedError is encountered.
* UnwrapExceptions always cause an event to be fired
* It's possible to enable sending of events when
    a) cache is cleared
    b) a lease is requested from cache, but it is/will be invalid
* A VaultAuthException does not immediately lead to clearing
  the connection cache
* get_authd_client and others: multiple small enhancements and fixes

* Allow updating cached config w/o closing session

* Homogenize funcs, update docs, cleanup

* Minor internal fixes

`is_valid_for` is present on all lease-like objects, while `is_valid`
specifically should account for more, e.g. the number of uses.

The Vault API does not return 404 when a lookup fails.

* Add release note

* Address review remarks

* Fix release notes

* Remove loading minion_mods from factory

* Address other review remarks

* Add inline specification of trusted CA root cert

* Small QoL additions

* Fix lint

* Fix lint for Python >=3.8 support

* Add missing fixes

* Fix unit tests

In some cases, the `spec` calls were failing because the underlying
object was already patched

---------

Co-authored-by: Thomas Phipps <tphipps@vmware.com>
2023-12-15 21:42:08 -07:00
Daniel A. Wozniak
9e23be093d Make pillar timeout test less flaky 2023-12-15 16:58:56 -07:00
Felippe Burk
58774e9a98 update photon paths to use their $releasever string 2023-12-15 16:45:52 -07:00
Felippe Burk
e488ac1eec Revert "update photon paths to use their $releasever string string which includes .0"
This reverts commit 1d0b29c803.
2023-12-15 13:14:23 -07:00
Felippe Burk
1d0b29c803 update photon paths to use their $releasever string string which includes .0 2023-12-15 11:13:20 -07:00
Daniel Wozniak
3ad04be3d9 Merge pull request #65699 from s0undt3ch/hotfix/merge-forward
[master] Merge 3006.x into master
2023-12-15 01:16:58 -07:00
Pedro Algarvio
f385e4b851 Remove duplicated keyword argument left when conflict solving the merge-forward
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-12-14 15:09:56 +00:00
Pedro Algarvio
2bfab51bd8 Run pyupgrade against the files modified in the merge-forward 2023-12-14 11:33:55 +00:00
Pedro Algarvio
7d8338b85f Merge 3006.x into 3007.x 2023-12-14 11:32:20 +00:00
David Murphy
12ebb06902 Merge branch '3006.x' into test_coverage_batch_35_slsutil 2023-12-13 09:18:32 -07:00
Frode Gundersen
4807c2536d Update test_glusterfs.py 2023-12-12 15:45:05 -07:00
Frode Gundersen
b9011f3bd0 migrate unit_states_test_glusterfs to pytest 2023-12-12 15:45:05 -07:00
Frode Gundersen
8b05691ec1 Update test_gem.py 2023-12-12 15:44:28 -07:00
Frode Gundersen
acd16ae4c6 migrate unit_states_test_gem to pytest 2023-12-12 15:44:28 -07:00
Frode Gundersen
6092e0b3f1 fix lint error 2023-12-12 15:43:38 -07:00
Frode Gundersen
424f417249 Update tests/pytests/unit/modules/test_dig.py
Co-authored-by: Pedro Algarvio <pedro@algarvio.me>
2023-12-12 15:43:38 -07:00
Frode Gundersen
a4f19f0919 Update tests/pytests/unit/modules/test_dig.py
Co-authored-by: Pedro Algarvio <pedro@algarvio.me>
2023-12-12 15:43:38 -07:00
Frode Gundersen
e801dfb684 Update test_dig.py 2023-12-12 15:43:38 -07:00
Frode Gundersen
e193ea42de migrate test_dig to pytest 2023-12-12 15:43:38 -07:00
Frode Gundersen
0cab1ecb12 migrate test_glusterfs to pytest 2023-12-12 15:42:55 -07:00
Frode Gundersen
33a1c54744 migrate test_dpkg_lowpkg to pytest 2023-12-12 15:42:18 -07:00
Frode Gundersen
e1ea50b21d Update test_dnsutil.py 2023-12-12 15:41:43 -07:00
Frode Gundersen
ad1d8ac420 migrate test_dnsutil to pytest 2023-12-12 15:41:43 -07:00
Frode Gundersen
654396f31c skip on Win/Mac 2023-12-12 15:40:52 -07:00
Frode Gundersen
38803cbe13 migrate test_debian_ip to pytest 2023-12-12 15:40:52 -07:00
Frode Gundersen
a0dbff8bbb migrate test_redismod to pytest 2023-12-12 15:40:13 -07:00
Frode Gundersen
c7956484a8 migrate test_serverdensity_device to pytest 2023-12-12 15:37:13 -07:00
Frode Gundersen
c820d48c4d migrate test_servicenow to pytest 2023-12-12 15:36:35 -07:00
Frode Gundersen
c3e3f8aa3b migrate test_smtp to pytest 2023-12-12 15:35:53 -07:00
Frode Gundersen
6acb5509ad migrate test_uwsgi to pytest 2023-12-12 15:35:12 -07:00
Frode Gundersen
6332632ddd fix skip syntax 2023-12-12 15:34:21 -07:00
Frode Gundersen
a8bcef36cb migrate test_xfs to pytest 2023-12-12 15:34:21 -07:00
Frode Gundersen
74ed2e6714 migrate test_xfs to pytest 2023-12-12 15:34:21 -07:00
Frode Gundersen
46191b40c8 fix asserts and fixture names 2023-12-12 15:33:30 -07:00
Frode Gundersen
096fb0df7b migrate test_syslog_ng to pytest 2023-12-12 15:33:30 -07:00