Bo Maryniuk
9d64abed0c
Fix PyLint
2016-03-03 21:44:14 +01:00
Bo Maryniuk
327ea11139
Add daemons unit test to verify hash_type settings
2016-03-03 21:44:14 +01:00
Bo Maryniuk
f3aecc0b22
Standardize logging
2016-03-03 21:44:14 +01:00
Bo Maryniuk
51f556243d
Verify if hash_type is using vulnerable algorithms
2016-03-03 21:44:14 +01:00
Bo Maryniuk
95ec634f00
Report environment failure, if any
2016-03-03 21:44:14 +01:00
Bo Maryniuk
63eedefe54
Use mixin for the daemon classes
2016-03-03 21:44:14 +01:00
Bo Maryniuk
82dd383630
Create a mixin class that will be reused in the similar instances (daemons)
2016-03-03 21:44:14 +01:00
Bo Maryniuk
36da8f5efa
Use MD5 hash algorithm by default (until deprecated)
2016-03-03 21:44:14 +01:00
Bo Maryniuk
584325797c
Remove SHA1 in favor of SHA256
2016-03-03 21:44:14 +01:00
Bo Maryniuk
373493c13f
Remove SHA1 for SHA256
2016-03-03 21:44:14 +01:00
Bo Maryniuk
d5cb4dd424
Remove sha1 to sha265
2016-03-03 21:43:04 +01:00
Bo Maryniuk
73b8d35e01
Add note to the Tomcat module for SHA256
2016-03-03 21:43:04 +01:00
Bo Maryniuk
efb78f1055
Remove SHA1 to SHA265 by default
2016-03-03 21:43:04 +01:00
Bo Maryniuk
6198976edb
Use SHA1 by default instead of MD5
2016-03-03 21:42:18 +01:00
Bo Maryniuk
73f2df76ce
Use SHA1 hash by default in Tomcat module, refactor for support different algorithms
2016-03-03 21:42:18 +01:00
Bo Maryniuk
0d4e4e31f8
Use SHA1 hash by default
2016-03-03 21:42:18 +01:00
Bo Maryniuk
785717703b
Use configurable hash_type for general Key fingerprinting
2016-03-03 21:42:18 +01:00
Bo Maryniuk
f0d931f4d0
Use hash_type configuration for the Cloud
2016-03-03 21:41:08 +01:00
Bo Maryniuk
95cb59dec7
Set defalt hash as SHA1 in config and explain why.
2016-03-03 21:41:08 +01:00
Bo Maryniuk
8f9543c292
Set config hash_type to SHA1
2016-03-03 21:39:15 +01:00
Bo Maryniuk
413eca124d
Set default checksum for key fingerprint to SHA1
2016-03-03 21:39:15 +01:00
Mike Place
2ed7286af1
Merge pull request #31653 from DSRCompany/issues/29753_multimaster_auth_fail
...
Don't attempt to verify token if it wasn't sent to master.
2016-03-03 10:39:34 -07:00
Mike Place
118fcde425
Merge pull request #31629 from darix/fix-services-on-sles
...
Fix services on sles
2016-03-03 09:41:27 -07:00
Mike Place
4d1701de60
Merge pull request #31641 from rallytime/testing-tutorial
...
Improve Salt Testing tutorial to be a more comprehensive intro
2016-03-03 09:08:47 -07:00
Mike Place
584f8401b8
Merge pull request #31651 from dr4Ke/test_case_for_30689
...
test case: test_list_present_nested_already
2016-03-03 09:02:55 -07:00
Dmitry Kuzmenko
2557707cc7
Don't attempt to verify token if it wasn't sent to master.
...
In multimaster setup new minion having no master pubkey sends initial
auth requests to each master without token but it tries to verify the
token in the received payload for each master excluding the first.
This happens because minion makes this decision depending on the master
pubkey file existense.
2016-03-03 17:36:37 +03:00
C. R. Oldham
5566f1f2a7
Merge pull request #31643 from Unity-Technologies/hotfix/hg-fix-repo-updated
...
Make sure we are really updating the mercurial repository
2016-03-03 07:30:53 -07:00
Christophe Drevet-Droguet
fc9dd356e8
test case: test_list_present_nested_already
2016-03-03 15:17:43 +01:00
Daniel Hobley
ca41c4b8c1
Make sure we are really updating the mercurial repository
...
This fixes a bug where if you have any changes pushed to a mercurial repo no matter which revision you specify the state will claim the repository is updated. This also correctly detects when you switch from one branch to another in mercurial even if there are no new changes being pulled.
2016-03-03 08:48:00 +01:00
rallytime
6ab3961748
Improve Salt Testing tutorial to be a more comprehensive intro
2016-03-02 17:07:57 -07:00
Mike Place
36c790eede
Merge pull request #31598 from terminalmage/issue30761
...
Remove limitations on validation types for eauth targets
2016-03-02 15:14:41 -07:00
Mike Place
cc4c31cf7f
Merge pull request #31627 from jakehilton/2015.8
...
Handling error from using gevent 1.1.
2016-03-02 15:01:22 -07:00
Nicole Thomas
191241e71a
Merge pull request #31630 from rallytime/merge-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2016-03-02 13:49:51 -07:00
rallytime
75bb692990
Merge branch '2015.5' into '2015.8'
...
No conflicts.
2016-03-02 12:33:10 -07:00
Marcus Rückert
9b8d6cbb72
make the suse check consistent with rh_service.py
2016-03-02 20:17:37 +01:00
Marcus Rückert
c0c8a77242
Fix numerical check of osrelease
...
After making the version check numerical in 9975508
it no longer matched
SLES 11 properly to use the rh_service module as '11.4 > 11' evaluates
to true. Without using the rh_service module, not all methods are
implemented to use the service state on sle11.
2016-03-02 20:16:26 +01:00
Jake Hilton
02fb5ed616
Handling error from using gevent 1.1.
2016-03-02 12:11:38 -07:00
Nicole Thomas
6d31b8918f
Merge pull request #31622 from jfindlay/query_doc
...
doc/topics/tutorials/http: update query decoding docs
2016-03-02 11:23:44 -07:00
Justin Findlay
4e48fec806
doc/topics/tutorials/http: update query decoding docs
...
Fixes #31614 .
2016-03-02 10:17:22 -07:00
Nicole Thomas
38ddd62aef
Merge pull request #31594 from rallytime/bp-31589
...
Back-port #31589 to 2015.8
2016-03-02 09:33:24 -07:00
C. R. Oldham
86a0fc46b4
Merge pull request #31604 from joejulian/2015.8_31596_workaround_no_xml_when_not_tty
...
Workaround for non-xml output from gluster cli when not tty
2016-03-02 08:53:44 -07:00
Nicole Thomas
36ce240596
Merge pull request #31583 from vutny/remove-trailing-white-spaces
...
Remove trailing white spaces
2016-03-02 08:38:01 -07:00
Denys Havrysh
bbcad93a8d
Fix trailing white spaces in Salt PRM spec file
2016-03-02 10:42:00 +02:00
Denys Havrysh
86433f2378
Revert changes in files used by roots_test.py
integration test
2016-03-02 10:00:45 +02:00
Joe Julian
c567a823a9
Workaround for non-xml output from gluster cli when not tty
...
Gluster has a bug in versions prior to 3.6 in that they will replace the
cli output mode if isatty() returns false. This patch uses the script
utility to trick the cli into thinking it's being called from a tty to
allow xml output.
Upstream bug: https://bugzilla.redhat.com:443/show_bug.cgi?id=1047378
Fixes #31596
2016-03-01 18:02:01 -08:00
C. R. Oldham
c9fe8d87f3
Merge pull request #31592 from rallytime/bp-31546
...
Back-port #31546 to 2015.8
2016-03-01 16:51:02 -07:00
C. R. Oldham
c8dbc93ac6
Merge pull request #31593 from rallytime/bp-31570
...
Back-port #31570 to 2015.8
2016-03-01 16:50:05 -07:00
Erik Johnson
5dedaa2d9d
Remove limitations on validation types for eauth targets
...
When validate_tgt() was written, we did not have a CkMinions class nor
did we have a method of pre-matching minions. Therefore, only certain
match types were permitted.
This commit removes that limitation, allowing eauth targets to be
pillar, ipcidr, etc.
Fixes #30761 .
2016-03-01 14:48:56 -06:00
Joseph Hall
6cd89459c7
Ensure that the latest node data is returned
2016-03-01 13:18:00 -07:00
C. R. Oldham
b2294d0a28
Need to return the value
2016-03-01 13:14:10 -07:00