Commit graph

19624 commits

Author SHA1 Message Date
James Cammarata
7baf994f2c New release v2.1.6.0-1 2017-06-01 13:24:23 -05:00
James Cammarata
e06e9b40b7 Updating CHANGELOG for 2.1.6 final release 2017-06-01 13:21:14 -05:00
James Cammarata
a54a4fb78a New release v2.1.6.0-0.1.rc1 2017-05-09 08:54:21 -05:00
James Cammarata
fd30f53289 Fixing security issue with lookup returns not tainting the jinja2 environment
CVE-2017-7481

Lookup returns wrap the result in unsafe, however when used through the
standard templar engine, this does not result in the jinja2 environment being
marked as unsafe as a whole. This means the lookup result looses the unsafe
protection and may become simple unicode strings, which can result in bad
things being re-templated.

This also adds a global lookup param and cfg options for lookups to allow
unsafe returns, so users can force the previous (insecure) behavior.

(cherry picked from commit 72dfb1570d22ac519350a8c09e76c458789120ed)
(cherry picked from commit fadccda7c7a2e8d0650f4dee8e3cea93cf17acfd)
2017-05-08 15:59:55 -05:00
Nick Piper
d68a911141 Minor typo correction varibles -> variables
No impact as variable wasn't used.
(cherry picked from commit 403c142750)
2017-05-01 08:45:24 -04:00
Matt Clay
813497bbda Use Shippable image: drydock/u16pytall:master (#24003)
* Use Shippable image: drydock/u16pytall:master
* Disable postgresql test needing privileged mode.
2017-04-26 17:02:02 +08:00
Brian Coca
0c692484e6 fix hashing when path is symlink
(cherry picked from commit 631a10745d)
2017-04-20 10:36:18 -04:00
Brian Coca
3e9d4607ce tolerate 'batch' systems that mess with stdin (#23596)
* tolerate 'batch' systems taht mess with stdin

fixes #23541

* have pause on windows tolerate devnull

* tuplie

(cherry picked from commit 586fcae398)
2017-04-18 11:42:36 -04:00
James Cammarata
39ce8c6610 New release v2.1.5.0-1 2017-03-27 13:46:04 -05:00
Brian Coca
bd8f81b13b catch bad extra vars data earlier
Bad extra early (#22322)

(cherry picked from commit c71b15a696)
2017-03-07 13:48:17 -05:00
Matt Davis
f5dbb555fa refresh azure_rm.py inventory from devel 2017-03-06 15:53:29 -08:00
James Cammarata
1805f6b6c0 New release v2.1.5.0-0.2.rc2 2017-03-03 16:39:52 -06:00
Matt Davis
8f5212befe fix azure_rm version checks (#22270)
* Use packaging.version.Version instead of LooseVersion for better support of prerelease tags (eg, 0.30.0 > 0.30.0rc6)
* Add explicit check/error for msrestazure package
(cherry picked from commit d12c93ef2b)
2017-03-03 13:29:37 -08:00
James Cammarata
b25f0f4e00 New release v2.1.5.0-0.1.rc1 2017-02-21 18:08:12 -06:00
James Cammarata
109010c078 Additional lock down of conditionals
(cherry picked from commit 9751bf440e2b026874e70f950920e6dbee2e9115)
2017-02-21 17:45:47 -06:00
James Cammarata
cdd5ed5f3d Rework how the Conditional class deals with undefined vars
Previously, the Conditional class did a simple check when an
AnsibleUndefinedVariable error was raised to see if certain strings were
present. This patch tries to be smarter by evaluating the variable contained
in the error string and compared to the defined/not defined conditionals in
the conditional string.

This also modifies the UndefinedError message from HostVars slightly to
match the format returned jinja2 in general, making it easier to match the
error message in the Conditional code.

Fixes #18514

(cherry picked from commit 81aa12eb1b)
(cherry picked from commit cfd57fcae2)
2017-02-21 17:44:01 -06:00
James Cammarata
f40e1bc289 Use proper YAML constructor class for safe loading
(cherry picked from commit 9f0b354023)
2017-02-21 16:25:25 -06:00
James Cammarata
ad7c55dd9d Also clean template data even if marked unsafe
Fixes #20568

(cherry picked from commit 86beb55a90)
2017-02-10 10:12:14 -06:00
Brian Coca
68dbed2a5e removed warn, which is added in 2.3 2017-02-10 08:30:33 -05:00
Brian Coca
20d67cc562 use regex vs list to weed out password fields
- also warn as module SHOULD have no_log
 - make password regex exportable for testing
 - avoids boolean fields

(cherry picked from commit 403e9d35df)
2017-02-09 18:20:10 -05:00
Matt Davis
b4b65c6bd2 bump submodule refs 2017-02-09 11:32:50 -08:00
Brian Coca
2546e8b4e5 add url_password to 'cleanse' list
(cherry picked from commit 2f1ab29855)
2017-02-09 08:54:06 -05:00
Matt Clay
36d8612ac0 Use jinja2 import instead of pip to get version.
This resolves issues with older versions of pip.

(cherry picked from commit a8fb6f0958)
2017-01-19 12:22:01 -08:00
Matt Clay
799b180e2d Only test map on jinja2 >= 2.7
(cherry picked from commit ad65274643)
2017-01-19 12:18:52 -08:00
James Cammarata
44026f8d7b Add representer to AnsibleDumper for AnsibleUnsafeText
Fixes #20253
Fixes #20290
2017-01-19 10:58:49 -06:00
Toshio Kuratomi
978311bf3f Remove jinja2 version requirement in setup.py as we hope to have the next release working with jinja2-2.9. 2017-01-16 11:25:16 -08:00
James Cammarata
59407cf2cb Fix for bug in Conditional for older jinja2 versions
Fixes #20309

(cherry picked from commit af96cba7e1)
2017-01-16 13:17:25 -06:00
James Cammarata
2c832c736f New release v2.1.4.0-1 2017-01-16 10:20:00 -06:00
James Cammarata
71c8ab6ce8 Updating CHANGELOG 2017-01-16 09:58:29 -06:00
James Cammarata
8bbb2b3691 New release v2.1.4.0-0.3.rc3 2017-01-13 16:48:24 -06:00
James Cammarata
400a3b984e Additional security fixes for CVE-2016-9587
(cherry picked from commit b7cdc21aee)
2017-01-13 16:25:20 -06:00
Toshio Kuratomi
6c6570583f Add jinja2 version constraint.
We're not yet compatible with jinja2-2.9 so help out people using pip to
install to get a working installation.

(cherry picked from commit 06ed25e788)
2017-01-12 11:16:12 -08:00
James Cammarata
b5daf2286c New release v2.1.4.0-0.2.rc2 2017-01-11 16:28:32 -06:00
James Cammarata
7ec84394f9 Partial revert of 76f7ce55
(cherry picked from commit a94a48f85f)
2017-01-11 15:57:41 -06:00
James Cammarata
35480106e5 Additional fixes for security related to CVE-2016-9587
(cherry picked from commit d316068831)
2017-01-11 15:57:38 -06:00
Computest
51559b0a51 Fixing another corner case for security related to CVE-2016-9587
(cherry picked from commit bcceada5d9)
2017-01-11 15:54:42 -06:00
Matt Clay
bd1ba1e21a Update fedora images for testing. 2017-01-09 16:04:30 -08:00
Matt Clay
596765c605 Fix group_by test to work with jinja2 >= 2.9.
(cherry picked from commit cc3d131f50)
2017-01-09 15:28:49 -08:00
James Cammarata
d69f096f3e New release v2.1.4.0-0.1.rc1 2017-01-09 10:52:21 -06:00
James Cammarata
d7dd41146a Fixing security bugs CVE-2016-9587
(cherry picked from c8f8d0607c5c123522951835603ccb7948e663d5)
2017-01-09 10:44:02 -06:00
James Cammarata
f7ff28336d Correctly set loader path when using list tags/tasks
Fixes #19398

(cherry picked from commit b688f11474)
2016-12-21 21:05:10 -06:00
James Cammarata
20df246504 Wrap unhandled errors from lookups in an AnsibleError
This provides better error handling, and prevents errors like KeyError
from bubbliing up to code in odd places.

Fixes #17482

(cherry picked from commit 85bbce9d6b)
2016-12-21 11:49:46 -06:00
René Moser
f821d3a9f6 cloudstack: utils: fail friendlier if no zones available (#19332)
(cherry picked from commit 18b7852940)
2016-12-14 16:39:19 +01:00
James Cammarata
a8421e2424 Updating core submodules for mysql fix 2016-11-29 13:24:59 -06:00
Michael Schuett
75cdac0d19 Fix auth in collins.py inventory
This forces basic auth to be used. Using the normal HTTPPasswordMgrWithDefaultRealm
password manager from urllib2 fails since collins doesn't send a 401 retry on failure.
More about this can be seen here http://stackoverflow.com/questions/2407126/python-urllib2-basic-auth-problem.
I added a small comment about the format of the host so others don't waste time like i did.

(cherry picked from commit 21813ed83e)
2016-11-23 14:39:50 -05:00
James Cammarata
ff0b525608 Revert "Moved the _inventory.clear_group_dict_cache() from creating a group w… (#17766)"
This reverts commit a36ac1ad1b.
2016-11-18 14:28:59 -06:00
jamessewell
a36ac1ad1b Moved the _inventory.clear_group_dict_cache() from creating a group w… (#17766)
* Moved the _inventory.clear_group_dict_cache() from creating a group which doesn't exist, to adding members to the group.

* Update __init__.py

Update to use changed: block to catch all changes for cache clear as suggested

(cherry picked from commit b91d4d884d)
2016-11-18 13:28:27 -06:00
Brian Coca
d6ab369916 fix for filter fix
(cherry picked from commit 5d043b65d3)
2016-11-17 13:42:51 -05:00
Brian Coca
78e47b4bbd remove rsync path from returned facts
(cherry picked from commit 7c960d440f)
2016-11-17 13:21:26 -05:00
James Cammarata
c3fbe526ca Catch loop eval errors and only raise them again if the task is not skipped
This should help on issues like #16222.

(cherry picked from commit 57cf5e431c)
2016-11-15 10:40:50 -06:00