Jeremy Rosenbaum
462e403173
fix pylint error (unnecessary 'finally' clause may swallow exceptions unintentionally)
2015-08-06 14:35:03 +00:00
Jeremy Rosenbaum
c2177796ea
Fix issue with mixed user and group eauth perms
...
If an eauth config contained permissions for specific users and for groups,
a valid user that did not belong to any of the groups specified would have requests
fail because the validation logic assumed that if groups were configured for eauth,
any valid token would contain groups info, but the token creation logic only inserted
this information if the user matched one or more groups specified in the eauth config.
I also cleaned up a bunch of logic that fetched the same dictionary data repeatedly
and cycled through the same data multiple times.
2015-08-06 00:29:43 -07:00
Jeremy Rosenbaum
f9f46f7724
Return all relevant perms on login
...
If the requesting user was in a group specified in the eauth config, then the return would only have
the permissions allowed by their group memberships, even if there were specific permissions for that user
or permissions for '*'. A user without any group permissions, but with user-specific permissions would also
not get permissions for '*'. Now, the return should contain all relevant permissions for the requesting user.
2015-08-06 00:23:09 -07:00
C. R. Oldham
7c4027eedc
Merge pull request #26015 from rallytime/one-testing
...
Started writing unit tests for OpenNebula driver
2015-08-05 13:19:12 -06:00
Seth House
01044d7fa9
Merge pull request #26038 from whiteinge/doc-rest_cherrypy-setup
...
Add setup instructions to the rest_cherrypy netapi module
2015-08-05 11:14:31 -06:00
Seth House
7d675e3fa0
Add setup instructions to the rest_cherrypy netapi module
...
Might as well. It's only been three years. O_o
2015-08-05 11:04:32 -06:00
Mike Place
d8beb42847
Merge pull request #26023 from s0undt3ch/develop
...
Fixed shutdown on sys.exit
2015-08-05 10:29:46 -06:00
rallytime
1b5a9bc91d
Pylint fix
2015-08-05 10:05:29 -06:00
Pedro Algarvio
aadb4ecc90
Remove bad raise
2015-08-05 16:35:43 +01:00
Pedro Algarvio
16471cdfa0
Don't stacktrace on broken pipes at that stage
2015-08-05 16:34:27 +01:00
Pedro Algarvio
543dae1ebb
Remove unused import
2015-08-05 13:45:11 +01:00
Pedro Algarvio
4d5cb04230
Stop multiprocessing logging queue listener on exit.
2015-08-05 11:10:30 +01:00
Pedro Algarvio
824cbfbc5f
Proper daemons shutdown
2015-08-05 11:09:38 +01:00
Mike Place
bdfc723727
Merge pull request #25987 from rallytime/one-attribute-xml
...
Allow data to be passed in on the CLI for OpenNebula functions
2015-08-04 23:06:53 -06:00
Mike Place
3cb7c0f740
Merge pull request #26013 from techhat/hardtimeout
...
Make hard_timeout configurable in /etc/salt/cloud
2015-08-04 23:00:21 -06:00
Thomas S Hatch
cc2f3b1a1c
update Contributing with Apache Licence notice
2015-08-04 21:18:58 -06:00
Mike Place
c9e60adf71
Merge pull request #26018 from lyft/add-missing-docs2
...
Add missing module docs
2015-08-04 18:03:55 -06:00
Ryan Lane
b2a179fc1e
Add missing module docs
2015-08-04 16:33:37 -07:00
rallytime
78ea0f246e
Started writing unit tests for OpenNebula driver
...
Also fixed up some inconsistencies and bugs found along the way
2015-08-04 16:45:09 -06:00
Joseph Hall
75cd9eac23
Make hard_timeout configurable in /etc/salt/cloud
2015-08-04 16:05:47 -06:00
Pedro Algarvio
8fc782db25
Make sure the exit routines are called.
...
This will stop the multiprocessing logging listener
2015-08-04 21:51:15 +01:00
Mike Place
e52d1c6e41
Merge pull request #26003 from cachedout/lint_25935
...
Lint #25935
2015-08-04 09:59:04 -06:00
Mike Place
37f4c3dab0
Lint #25935
2015-08-04 09:59:04 -06:00
Mike Place
5bca218781
Merge pull request #25935 from whiteinge/cmd-powershell
...
Add cmd.powershell convenience function for common Powershell operations
2015-08-04 09:56:50 -06:00
Mike Place
73b3c04faf
Merge pull request #25995 from silenius/patch-1
...
Update file.py
2015-08-04 09:50:02 -06:00
Mike Place
50bceac369
Merge pull request #25943 from gczuczy/issue-19948
...
Use private interface if there's no public_vlan defined
2015-08-04 09:28:59 -06:00
Mike Place
662962c196
Merge pull request #25981 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-08-04 09:28:15 -06:00
Julien Cigar
be528b1261
Update file.py
...
fix typo
2015-08-04 10:44:29 +02:00
Gergely Czuczy
c64f9a4c8b
Use "is" instead of ==
2015-08-04 01:24:07 +02:00
Colton Myers
fcf5f6752f
Fix lint
2015-08-03 17:17:03 -06:00
Colton Myers
d5fbd960fe
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/vmware.py
salt/fileserver/s3fs.py
salt/modules/chocolatey.py
salt/modules/s3.py
salt/modules/zpool.py
salt/pillar/s3.py
salt/utils/s3.py
tests/unit/modules/s3_test.py
2015-08-03 15:01:35 -06:00
rallytime
796ef9ba00
Spelling clean up
2015-08-03 14:55:22 -06:00
Pedro Algarvio
342e0c0e10
Merge pull request #25977 from s0undt3ch/develop
...
Shutdown the multiprocessing logging queue listener
2015-08-03 21:39:15 +01:00
Pedro Algarvio
37924b2843
Shutdown the multiprocessing logging queue listener
2015-08-03 21:37:56 +01:00
rallytime
e9acddb234
Allow the use of data in addition to path in OpenNebula
2015-08-03 14:31:45 -06:00
Colton Myers
7b50807a12
Merge pull request #25902 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-03 14:30:07 -06:00
Mike Place
f648a3ab8b
Merge pull request #25976 from fleaflicker/patch-1
...
Typo in help output
2015-08-03 14:15:16 -06:00
Ori Schwartz
0c5c271d09
Typo in help output
...
"on will be searched"->"one will be search"
2015-08-03 16:01:01 -04:00
Thomas S Hatch
10813cadef
Merge pull request #25956 from alprs/fix-cron_user
...
Fix user argument to cron functions
2015-08-03 13:40:16 -06:00
Thomas S Hatch
aeb3b4edaf
Merge pull request #25946 from sjorge/esky-decorator-fix
...
Fix for salt.utils.decorators under esky
2015-08-03 13:39:32 -06:00
Colton Myers
4d8ba6b874
Remove reg unit tests, not applicable to latest version of reg module
2015-08-03 12:03:03 -06:00
Colton Myers
abf389743a
Merge pull request #25903 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-08-03 11:12:18 -06:00
Mike Place
beea6e39a8
Merge pull request #25888 from adelcast/dev/adelcast/add_opkg_module
...
opkg: add opkg execution module
2015-08-03 10:53:34 -06:00
rallytime
7278202eaf
Only split on the first "=" in salt-cloud CLI kwargs
2015-08-03 10:53:18 -06:00
Colton Myers
876af79897
Py3 compat
2015-08-03 10:53:05 -06:00
Colton Myers
579ba19c1d
Fix lint
2015-08-03 10:52:16 -06:00
Mike Place
3bfdc9bbdd
Merge pull request #25936 from rallytime/one-improvements
...
Allow the use of *_name in addition to *_id kwargs where possible in OpenNebula
2015-08-03 10:51:52 -06:00
Mike Place
0bffcff5e1
Merge pull request #25957 from alprs/fix-file_managed_checkcmd_remove
...
Remove temporary file after file.managed with checkcmd
2015-08-03 10:51:03 -06:00
Mike Place
8e99e27288
Merge pull request #25761 from AkhterAli/develop
...
Adding delete_den to delete denied keys See issue #24836
2015-08-03 10:45:01 -06:00
Nicole Thomas
1ba7e8ebcf
Merge pull request #25874 from rallytime/bp-25668
...
Back-port #25668 to 2015.8
2015-08-03 10:40:42 -06:00
