summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Ensure tokens are revoked for relevant v3 api calls"Jenkins2013-03-132-5/+356
|\
| * Ensure tokens are revoked for relevant v3 api callsHenry Nash2013-03-132-5/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A number of the v3 apis were not yet revoking tokens that would be invalidated by their actions, including: - grant/revoke role - delete group - add/remove user to group A seperate bug has been rasied with regard to revoking tokens when a role is deleted, since this needs much more plumbing to implement. Fixes Bug #1093493 Change-Id: Icf0792821829045d5bdecf686ec470ce54f9c9af
* | Merge "Filter out legacy_endpoint_id (bug 1152635)"Jenkins2013-03-132-0/+15
|\ \
| * | Filter out legacy_endpoint_id (bug 1152635)Dolph Mathews2013-03-122-0/+15
| | | | | | | | | | | | Change-Id: I176c3f4fec0a1fa544efb11cffd4837dedf8cace
* | | Merge "Catch and log server exceptions"Jenkins2013-03-131-2/+6
|\ \ \ | |_|/ |/| |
| * | Catch and log server exceptionsBen Nemec2013-03-121-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1133041 Exceptions from the keystone WSGI server can occur and not be logged. This means keystone will appear to silently crash, so this change catches these exceptions and logs them so the user can determine the cause of the crash. Change-Id: Iecc4b8062fa4e7dbe021627613412b5dfc635432
* | | Merge "Explain LDAP page_size & default value"Jenkins2013-03-131-0/+2
|\ \ \ | |/ / |/| |
| * | Explain LDAP page_size & default valueDolph Mathews2013-03-041-0/+2
| | | | | | | | | | | | Change-Id: If7746bf92c29e824369777764877a414dc7a5d6e
* | | Merge "Improve tests for api protection and filtering"Jenkins2013-03-124-190/+393
|\ \ \
| * | | Improve tests for api protection and filteringHenry Nash2013-03-124-190/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fills out some more tests for both these areas. To make it easier for any v3 tests to do their own authentication, moved the auth builder utility functions from test_v3_auth into test_v3.RestfulTestCase. Also fixed an issue that meant the api filtering on a boolean would not work. Fixes Bug #1132080 Fixes Bug #1132372 Change-Id: I7bb7b5ba61adfc6a9c496a5547a0ca3fcfbab209
* | | | Merge "add belongs_to check"Jenkins2013-03-122-3/+47
|\ \ \ \ | |/ / / |/| | |
| * | | add belongs_to checkAdam Young2013-03-112-3/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 1081943 The belongs_to check was lost as part of the v3 API work. It looks like it was broken to begin with. Fixed Change-Id: I4e40758fa9136b76b515100b461a36d6c31b578e
* | | | Merge "remove spurious roles check"Jenkins2013-03-121-2/+0
|\ \ \ \
| * | | | remove spurious roles checkAdam Young2013-03-081-2/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia4909478703d5fe9fb4fec7377c4030cf67eae7b
* | | | | Merge "cleanup trusts in controllers"Jenkins2013-03-121-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | cleanup trusts in controllersAdam Young2013-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I1eff618d1e6cef2eb10ae7e737b0ca0beaca1d4d
* | | | | Revert "update tests/__init__.py to verify openssl version"Adam Young2013-03-111-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 72ec89ba301af203ae956bfc84eca19e4919cf24. Change-Id: I46b40440a355be5b459822e77e8df28394a8cdb3
* | | | | Revert "from tests import"Adam Young2013-03-1119-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d8599dcda06514a9687af3f714e55ff7580af9db. Change-Id: Iddb881070a91b9761a567a7d3b6d906e228af9f6
* | | | | Merge "Fix folsom -> grizzly role table migration issues (bug 1119789)"Jenkins2013-03-112-0/+54
|\ \ \ \ \
| * | | | | Fix folsom -> grizzly role table migration issues (bug 1119789)William Kelly2013-03-082-0/+54
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: Id7e5b3354d9139afa0a69b283924f363847cef56
* | | | | Merge "Run keystone server in debug mode."Jenkins2013-03-111-1/+4
|\ \ \ \ \
| * | | | | Run keystone server in debug mode.Nachiappan VR N2013-03-091-1/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keystone currently not able be to started in debug mode because pydev package in pycharm-debug.egg is removed. Fix is provided with the correct import statement. Fixes Bug #1135306 Change-Id: I5588b768a4807b79ae1dabd7550cbee7d2c7505e
* | | | | Merge "bug 1133526"Jenkins2013-03-112-2/+18
|\ \ \ \ \
| * | | | | bug 1133526Malini Bhandaru2013-03-082-2/+18
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modify "expires" to "expires_at", most of the changes were already done by Guang-yee, added a pki-token-id test Change-Id: Ib3f39620db18aaea6b0cb5d0ae9c290afd870605
* | | | | Merge "Make Keystone return v3 as part of the version api"Jenkins2013-03-114-91/+197
|\ \ \ \ \
| * | | | | Make Keystone return v3 as part of the version apiHenry Nash2013-03-094-91/+197
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keystone "get version" api currently fails to list v3 as a supported api. It should now do this, along with v2 (which is, of course, still supported) Fixes Bug #1148186 Change-Id: Ie88bf941123702d2f7e2ecf6cecb1fa937ca1e52
* | | | | Merge "Make getting user-domain roles backend independant"Jenkins2013-03-115-35/+128
|\ \ \ \ \
| * | | | | Make getting user-domain roles backend independantHenry Nash2013-03-045-35/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is nothing backend specific in geting the list of roles for a user-domain, so we should move this function into backends core. This also has the affect of now ensuring that the kvs and ldap support will work, provided the specific backend supports roles on users and domains. This is true today for kvs, but support in ldap for domains is gated by other bugs. Fixes bug #1131769 Change-Id: Id99accb33fd7cd8d6c37e64e140552c5bfe68349
* | | | | | Merge "from tests import"Jenkins2013-03-1119-24/+24
|\ \ \ \ \ \
| * | | | | | from tests importAdam Young2013-03-0819-24/+24
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the resolution of local imports work when running individual tests. Bug 1152326 Change-Id: I72f54bdbb60a6d7acf32bdbdc02d7bce69add84e
* | | | | | Merge "Change exception raised to Forbidden on trust_id"Jenkins2013-03-111-3/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Change exception raised to Forbidden on trust_idAdam Young2013-03-061-3/+2
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: I30f89d52ade45335d2f29b8454438d0dd3b20a97
* | | | | Merge "v3 endpoints won't have legacy ID's (bug 1150930)"Jenkins2013-03-091-1/+1
|\ \ \ \ \
| * | | | | v3 endpoints won't have legacy ID's (bug 1150930)Dolph Mathews2013-03-081-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I8cc6bac7b0e549db7755df3a993db7d563907324
* | | | | Merge "add missing attributes for group/project tables (bug1126021)"Jenkins2013-03-088-156/+189
|\ \ \ \ \
| * | | | | add missing attributes for group/project tables (bug1126021)Gordon Chung2013-03-078-156/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add and assign default values for optional attributes to all backends Change-Id: I54fe234b919162c3056c14f1f06c4de876080fb9
* | | | | | Merge "unable to load certificate should abort request"Jenkins2013-03-084-12/+56
|\ \ \ \ \ \
| * | | | | | unable to load certificate should abort requestDavid Höppner2013-03-064-12/+56
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If openssl returns with a command line error (3), we assume the PKI certificate is not properly installed. Added 'try ... except' blocks to cms_sign_text and cms_sign_token calls. Fixes: bug #1103569 Change-Id: Iad98738e990d3ab1ec0d0015840d76cf948ae560
* | | | | | Delete tokens for userAdam Young2013-03-084-51/+104
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 1152283 There was a typo in the function that showed it was untested. This fixes the typo and adds a unit test It also corrects the logic in the KVS backend to ignore the user_id field when listing tokens by trust_id Change-Id: I5325c04e53a09fce68f3d350e7502341a398aa05
* | | | | return 201 Created on POST request (bug1131119)Gordon Chung2013-03-075-13/+45
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | correct status code from 200 Ok to 201 Created for v3 POST requests. Fixes: bug #1131119 Change-Id: Iabeb6daf677e0f34defdef5e58d87229fc90346f
* | | | Merge "Remove unused methods from LDAP backed."Jenkins2013-03-071-59/+0
|\ \ \ \
| * | | | Remove unused methods from LDAP backed.Yuriy Taraday2013-03-071-59/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I642a5f3471da00c9e91bc3150beebe345d88187a
* | | | | Merge "Move get_by_name to LdapBase."Jenkins2013-03-072-38/+10
|\| | | |
| * | | | Move get_by_name to LdapBase.Yuriy Taraday2013-03-072-38/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: Id75a3c56aeb414c4bee9bcb606033f8f360637bc
* | | | | Merge "fix typo in kvs backend"Jenkins2013-03-071-9/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix typo in kvs backendAdam Young2013-03-071-9/+10
| |/ / / | | | | | | | | | | | | Change-Id: I74134bae9abff847d317e0074cae1878cf76aae8
* | | | Merge "Straighten out NotFound raising in LDAP backend."Jenkins2013-03-072-83/+45
|\ \ \ \
| * | | | Straighten out NotFound raising in LDAP backend.Yuriy Taraday2013-03-052-83/+45
| | | | | | | | | | | | | | | | | | | | Change-Id: If5914f34da318d960f5a2ae8e8b0592d1cbab946
* | | | | Merge "mark 2.0 API as stable"Jenkins2013-03-072-6/+6
|\ \ \ \ \
| * | | | | mark 2.0 API as stableAdam Young2013-03-062-6/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Bug 1135230 Change-Id: Icb0ae39b5ac4514c04220b846ebbe24d059ba6c1