Commit Graph

95995 Commits

Author SHA1 Message Date
Tao ZHOU
925a9c905c
Update archive.py 2018-12-17 08:13:34 -06:00
angeloudy
ed2bed3e86
fix command line options 2018-12-17 08:13:30 -06:00
Max Arnold
d7403dae18 Fix profile outputter docs
Also remove the mention of obsolete "grains" output format.
2018-12-15 18:38:39 +07:00
Gareth J. Greenaway
e7f0ab6f19
Merge pull request #50873 from Ch3LL/bp-50740
Backport #50740 to 2017.7
2018-12-14 15:59:47 -08:00
Gareth J. Greenaway
5fd9ed9aa9
Merge branch '2017.7' into bp-50740 2018-12-14 15:55:07 -08:00
Gareth J. Greenaway
2f77b2dc99
Merge pull request #50869 from garethgreenaway/50848_mysql_exception_test
[2017.7] Adding a test to ensure exception handling is correct
2018-12-14 15:54:34 -08:00
Gareth J. Greenaway
3767d4ffe3
Merge branch '2017.7' into 50848_mysql_exception_test 2018-12-14 15:54:22 -08:00
Erik Johnson
676a12ac55
Fix compound matching in eauth
The auth validation functions were using flawed logic to validate the
expressions configured for a given eauth plugin. To "expand" the
expression, it would use `salt.utils.minions.parse_target()` to analyze
the expression. However, this function was intended to be used on
individual words in a compound expression, not on a compound expression
as a whole. This means that any multi-word compound expression would
fail to validate. By assuming that the euth expression is compound and
using `check_minions()` to get the list of minions that match the
expression, we ensure that it is properly validated.
2018-12-14 16:09:41 -06:00
Gareth J. Greenaway
4242e64680
Merge branch '2017.7' into bp-50740 2018-12-14 14:08:26 -08:00
Gareth J. Greenaway
b95b44fa90
Merge pull request #50867 from Ch3LL/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-12-14 13:32:22 -08:00
Gareth J. Greenaway
a5caab7263
Merge pull request #50872 from Ch3LL/bp-50864
Backport #50864 to 2017.7
2018-12-14 11:57:47 -08:00
Massimiliano Torromeo
fd73f86c75
Catch UnicodeDecodeErrors in id verification
Do not crash if the id cannot be decoded. An invalid id provided by an untrusted client can DOS the master.
2018-12-14 13:23:57 -05:00
Rémi Jouannet
fc9c64b622
fix typo in file.managed documentation 2018-12-14 13:20:46 -05:00
Ch3LL
512293fd93
Remove dunder_dictionaries.rst. Was added to modules/developing.rst 2018-12-14 12:55:39 -05:00
Gareth J. Greenaway
af3e1459c3
Cleanup. 2018-12-14 09:28:44 -08:00
Gareth J. Greenaway
b85c5bf6d9
Adding a test to ensure exception handling is correct. 2018-12-14 09:16:09 -08:00
Ch3LL
89b4e096db
Merge branch '2017.7' into '2018.3'
Conflicts:
  - doc/topics/development/dunder_dictionaries.rst
  - salt/grains/core.py
  - salt/netapi/rest_tornado/saltnado.py
2018-12-14 11:15:48 -05:00
Thomas S Hatch
858cfac113
Merge pull request #50863 from 5uper5hoot/fix-issue-50848
Unpack exception args in python3 compatible way.
2018-12-14 08:36:14 -07:00
Thomas S Hatch
216fa14fee
Merge pull request #50859 from garethgreenaway/50850_python_key_cache_file_binary
[2018.3] Fixes for key_cache and python3
2018-12-13 16:57:06 -07:00
Peter Schutt
c90d2019c8 Unpack exception args in python3 compatible way.
Fixes #50848
2018-12-14 10:12:26 +11:00
Gareth J. Greenaway
ebc9a01b38
When reading and writing the key cache file, when using Python3, ensuring the file is read & written in binary mode. 2018-12-13 13:09:13 -08:00
Mike Place
e28b2baf31
Merge pull request #50752 from kstreee/fix-memory-leak
Fixes a memory leak which is caused by un-cleared stream connections.
2018-12-13 09:41:59 -07:00
Mike Place
6b45aad5e7
Merge pull request #50828 from twangboy/fix_lgpo
Fix issues with lgpo state and util
2018-12-13 09:37:32 -07:00
Mike Place
1f57602043
Merge pull request #50837 from Ch3LL/pyren_doc
Clarify py render docs when data context is available
2018-12-13 09:37:14 -07:00
Mike Place
fdff67594c
Merge pull request #50844 from twangboy/fix_grains
Fix grains for future windows releases
2018-12-13 09:35:26 -07:00
Mike Place
3d567508d0
Extra newline for lint 2018-12-13 09:34:24 -07:00
Mircea Ulinic
5176cd8798 Improve the Capirca and related modules for ACL config generation
Since I added these modules in 2017.7.0, Capirca has been released on PyPI,
now available to be installed as a regular Python library.

Besides that, in the past there were various issues due to the way the modules
are interacting with the underlying library, solved by adding a hardcoded list
for the policy term fields. This has caused some issues in the past, and had
to be patches, e.g., db255d3702 or
1e74141cc0.
While the changes referenced above are not particularly big, it's tedious to
always keep an eye on Capirca and be aware of what's newly added or changed.
Besides, this may have caused issues for users in the past when using other
Capirca versions.
2018-12-13 13:51:26 +00:00
Gareth J. Greenaway
05baa95e59
Merge branch '2018.3' into fix_lgpo 2018-12-12 13:23:12 -08:00
Daniel Wozniak
6ea059d308
Merge pull request #50843 from bdrung/fix-tests
Fix RemoveCapacityFromDiskgroupTestCase require pyvmomi
2018-12-12 13:36:31 -07:00
twangboy
473f4d7a24
Fix some unrelated lint 2018-12-12 13:19:01 -07:00
twangboy
fd1a0726aa
Fix grains for future windows releases 2018-12-12 13:02:23 -07:00
Daniel Wozniak
14d7d1d68b
Merge pull request #50839 from terminalmage/issue50829
Fix UnicodeDecodeError in ps module
2018-12-12 12:59:11 -07:00
Benjamin Drung
0d00ae4f8e Fix RemoveCapacityFromDiskgroupTestCase require pyvmomi
If the `pyvmomi` library is missing, all tests from the
tests.unit.modules.RemoveCapacityFromDiskgroupTestCase will fail:

```
ERROR: test__get_proxy_target_call
(unit.modules.test_vsphere.RemoveCapacityFromDiskgroupTestCase)
[CPU:0.0%|MEM:35.1%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "salt/utils/vmware.py", line 485, in disconnect
    Disconnect(service_instance)
NameError: name 'Disconnect' is not defined

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "salt/modules/vsphere.py", line 381, in _gets_service_instance_via_proxy
    salt.utils.vmware.disconnect(local_service_instance)
  File "salt/utils/vmware.py", line 486, in disconnect
    except vim.fault.NoPermission as exc:
NameError: name 'vim' is not defined

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "salt/utils/vmware.py", line 485, in disconnect
    Disconnect(service_instance)
NameError: name 'Disconnect' is not defined

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "tests/unit/modules/test_vsphere.py", line 1568, in test__get_proxy_target_call
    capacity_disk_ids=['fake_disk1', 'fake_disk2'])
  File "salt/modules/vsphere.py", line 295, in __supports_proxies
    return fn(*args, **salt.utils.args.clean_kwargs(**kwargs))
  File "salt/modules/vsphere.py", line 386, in _gets_service_instance_via_proxy
    salt.utils.vmware.disconnect(local_service_instance)
  File "/home/bdrung/projects/salt/debian/salt/utils/vmware.py", line 486, in disconnect
    except vim.fault.NoPermission as exc:
NameError: name 'vim' is not defined
```

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2018-12-12 20:21:49 +01:00
Erik Johnson
3a3d9b7d3e
Ensure that unicode types returned from compatibility funcs 2018-12-12 11:41:43 -06:00
Erik Johnson
1a00abc5f6
Add unit test for _get_proc_cmdline 2018-12-12 11:41:18 -06:00
Erik Johnson
9eaa2edfe3
Remove extraneous comments 2018-12-12 11:11:12 -06:00
Mike Place
264a04292d
Merge pull request #50653 from lexvella/2018.3
Check file_mode in file.directory and _check_directory
2018-12-12 09:30:51 -07:00
twangboy
1233e2b480
Fix some lint 2018-12-12 09:10:43 -07:00
Erik Johnson
b855fd9e7c
Fix misspelling in comment 2018-12-12 09:55:08 -06:00
Ch3LL
a873019a57
Clarify py render docs when data context is available 2018-12-12 10:31:57 -05:00
twangboy
56c0e55581
Fix issues with lgpo state and util
Fix py3 issues in win_lgpo_netsh
Make the state case insensitive for policy lookups
2018-12-11 16:49:39 -07:00
Mike Place
a8ad17aaa4
Merge pull request #50823 from terminalmage/issue45026
salt.modules.mysql: Decode fetch results before making string comparisons
2018-12-11 14:04:40 -07:00
Erik Johnson
ec8e116f7e
Decode fetch results before making string comparisons 2018-12-11 13:58:15 -06:00
Megan Wilhite
e31e731697
Merge pull request #50817 from dubb-b/2018.3
Adding git 'v' to the bootstrap options
2018-12-11 12:28:09 -05:00
Brett Benassi
48fc01fb13
Adding git 'v' to the bootstrap options 2018-12-11 10:24:44 -07:00
Gareth J. Greenaway
32dfabab50
Merge pull request #50816 from dubb-b/2017.7
Pinning bootstrap to the tagged version of salt.
2018-12-11 09:20:01 -08:00
Brett Benassi
dc7ff48822
Pinning bootstrap to the tagged version of salt. 2018-12-11 10:09:35 -07:00
Daniel Wozniak
9b6b39ce49
Merge pull request #50780 from twangboy/lgpo_netsh
Add netsh mechanism in the LGPO module
2018-12-10 15:09:19 -07:00
twangboy
5eea728879
Fix some lint 2018-12-10 14:05:48 -07:00
Jenkins
f077783cbd
Add some tests 2018-12-10 13:43:54 -07:00