diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/AUTHORS keystone-2012.1.3+stable-20130423-f48dd0fc/AUTHORS --- keystone-2012.1+stable~20120824-a16a0ab9/AUTHORS 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/AUTHORS 2013-04-24 13:24:40.000000000 +0000 @@ -22,6 +22,7 @@ Dan Prince Dan Prince Darren Birkett +Dave Walker dcramer Dean Troyer Deepak Garg @@ -74,6 +75,7 @@ Michael Basnight Michael Still Monty Taylor +Nathanael Burton Pádraig Brady Paul Voccio Peng Yong diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/ChangeLog keystone-2012.1.3+stable-20130423-f48dd0fc/ChangeLog --- keystone-2012.1+stable~20120824-a16a0ab9/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/ChangeLog 2013-04-24 13:24:44.000000000 +0000 @@ -0,0 +1,29958 @@ +commit f48dd0fc98391737a456e701e425d95f3892626a +Merge: 8945567 7402f5e +Author: Jenkins +Date: Wed Feb 20 11:34:35 2013 +0000 + + Merge "Ensure user and tenant enabled in EC2" into stable/essex + +commit 7402f5ef994599653bdbb3ed5ff1a2b8c3e72b9f +Author: Nathanael Burton +Date: Tue Feb 19 09:27:54 2013 -0600 + + Ensure user and tenant enabled in EC2 + + Fixes bug 1121494. + + Change-Id: Ia9a149a93dec87f46b667100e0ee2eda56d9489d + + AUTHORS | 1 + + keystone/contrib/ec2/core.py | 22 +++++++++++++++++----- + 2 files changed, 18 insertions(+), 5 deletions(-) + +commit 8945567b5ec39c7f32f27aec4eccf230cc86646c +Author: Dolph Mathews +Date: Tue Feb 19 09:08:41 2013 -0600 + + Disable XML entity parsing + + Fixes bug 1100282 and bug 1100279. + + Change-Id: Idd3989356dfededc3d863770f0ca1661c1d45782 + + keystone/common/serializer.py | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit e49390efb591be83fc50f0b69a928125752d62ce +Merge: ef1e682 7b5b72f +Author: Jenkins +Date: Thu Feb 7 14:21:42 2013 +0000 + + Merge "Add size validations for /tokens." into stable/essex + +commit ef1e6823a4340cf734ac34465b564b684840911b +Author: Dave Walker (Daviey) +Date: Tue Feb 5 15:37:34 2013 +0000 + + Pin docutils to 0.9.1. + + Docutils 0.10 breaks manpage generation in sphinx 1.1.3. A fix to + sphinx has been merged, but not yet released (scheduled for dec + 24-31). In the mean time, we should pin docutils to 0.9.1. + + (Also add myself to Authors to allow merge tests to pass) + + Fixes bug 1091333. + + Change-Id: I0157c6d662ae8ceecb1440d245cfa06def1101db + + AUTHORS | 1 + + tools/test-requires | 1 + + 2 files changed, 2 insertions(+) + +commit 7b5b72f4c1d16968435fb2e18c4f47765bd8f098 +Author: Dan Prince +Date: Fri Jan 11 20:28:51 2013 -0500 + + Add size validations for /tokens. + + Updates /tokens controller so that it explicitly checks the max + size of userId, username, tenantId, tenantname, token, and password + before continuing with a request. + + Previously, when used with the SQL keystone backend an unauthenticated + user could send in *really* large requests which would ultimately + log large SQL exceptions and could thus fill up keystone logs on the + disk. + + Change-Id: Ic7f9291b6020f2579ec55431358af16eb2ebb66f + + keystone/config.py | 2 +- + keystone/exception.py | 13 +++++++ + keystone/service.py | 27 ++++++++++++-- + tests/test_service.py | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 136 insertions(+), 4 deletions(-) + +commit c17a9992c8a94c7728bd762115874f125c0905b7 +Merge: 025b1d5 8735009 +Author: Jenkins +Date: Thu Nov 22 19:41:20 2012 +0000 + + Merge "Ensures User is member of tenant in ec2 validation" into stable/essex + +commit 025b1d52e61fff4dff913fc58d0de81712b808b6 +Author: Ionuț Arțăriși +Date: Wed Oct 31 14:32:04 2012 +0100 + + pin sqlalchemy to 0.7 + + sqlalchemy 0.8.0b1 breaks some dependencies such as sqlalchemy-migrate, pin the version until we fix them + + Essex backport note: lower bound is not defined, Essex is known to work + with older sqlalchemy versions e.g. precise has 0.7.4 + + Fixes bug #1073569 + + Change-Id: I6620276bf8f0a7cbc1d51aa226cd33c512e59a48 + + tools/pip-requires | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8735009dc5b895db265a1cd573f39f4acfca2a19 +Author: Vishvananda Ishaya +Date: Tue Nov 13 15:49:19 2012 -0800 + + Ensures User is member of tenant in ec2 validation + + It is possible that a user is no longer a member of a tenant when + they attempt to use an ec2 token. This checks to make sure that + the user still has at least one valid role in the tenant before + authenticating them. This should automatically work for the s3 + version as well since it is a subclass. + + Fixes bug 1064914 + + Change-Id: Ieb237bae936a7b00ce7ba4d4c59aec6c7a69ec21 + + keystone/contrib/ec2/core.py | 23 +++++++++++++---------- + 1 file changed, 13 insertions(+), 10 deletions(-) + +commit ddb40198c9323ff8dc82a44a72e456a7bfe736b8 +Author: Mark McLoughlin +Date: Thu Oct 11 20:44:32 2012 +0100 + + Open 2012.1.4 development + + Bump version to 2012.1.4 to formally open development after the release + of 2012.1.3. + + See http://wiki.openstack.org/StableBranchRelease + + Note - 2012.1.3 is expected to be the final official release of Essex. + + Change-Id: I0de6fae1495deab60bd667e4653210b22b994b39 + + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e1f05e7a851f5fb72742e4d3e4978d76fe23b55 +Author: Dolph Mathews +Date: Tue Sep 25 19:04:50 2012 +0000 + + utf-8 encode user keys in memcache (bug 1056373) + + (cherry picked from commit 431e50a7851d2e7dbb212d02647faeb958ed21e8) + + Change-Id: I026dd4282742213e69c7aa02e109439b07a73c8e + + keystone/token/backends/memcache.py | 8 ++++++-- + tests/test_backend_memcache.py | 14 +++++++++++++- + 2 files changed, 19 insertions(+), 3 deletions(-) + +commit 176ee9bce7557937710c8ec8086ff61cc751cf0f +Author: Dolph Mathews +Date: Thu Sep 13 11:59:11 2012 -0500 + + Limit token revocation to tenant (bug 1050025) + + Change-Id: I7ebe0192b4900ad9475119a6d582233b37b31fb4 + + keystone/identity/core.py | 8 ++++---- + keystone/token/backends/kvs.py | 15 ++++++++++----- + keystone/token/backends/memcache.py | 11 ++++++++--- + keystone/token/backends/sql.py | 7 ++++++- + keystone/token/core.py | 16 +++++++++++----- + tests/test_backend.py | 22 +++++++++++++++++++++- + 6 files changed, 60 insertions(+), 19 deletions(-) + +commit 58ac6691a21675be9e2ffb0f84a05fc3cd4d2e2e +Author: Dolph Mathews +Date: Fri Sep 7 14:55:31 2012 -0500 + + Delete user tokens after role grant/revoke + + Delete user tokens when a new role is granted or revoked, in order to + prevent old tokens to continue to be valid for the original set of + roles for the remainder of the token's lifespan. + + Addresses CVE-2012-4413. + Fixes bug 1041396. + + Change-Id: Ib11b5b3a933c6000afe0c875c3f71f1f101bb202 + + keystone/identity/core.py | 7 ++++++- + keystone/token/core.py | 11 +++++++++++ + tests/test_keystoneclient.py | 18 +++++++++--------- + 3 files changed, 26 insertions(+), 10 deletions(-) + +commit cd1e48a7d60497c528af6d311bd5048821dc1c07 +Author: Adam Young +Date: Thu Sep 6 11:54:04 2012 -0400 + + List tokens for memcached backend + + Creates and updates an index of tokens in a memcache entry keyed + by the user id + + Bug 1046905 + + Change-Id: I114810297009331f491dc069d667f358092f1e34 + + keystone/token/backends/memcache.py | 23 ++++++++++++++++++++- + tests/test_backend.py | 41 ++++++++++++++++++++++++++++++++----- + tests/test_backend_memcache.py | 17 ++++++++++++--- + 3 files changed, 72 insertions(+), 9 deletions(-) + +commit 5438d3b5a219d7c8fa67e66e538d325a61617155 +Author: Dolph Mathews +Date: Thu Aug 23 07:39:20 2012 -0500 + + Require authz to update user's tenant (bug 1040626) + + Change-Id: I82f80b84af2bc4db00b3dcb87a2ec338816a82e9 + + keystone/identity/core.py | 1 + + 1 file changed, 1 insertion(+) + +commit a16a0ab997c3a406da2ccf0005534d5f9d81861f +Merge: a130848 ff6df7c +Author: Jenkins +Date: Thu Aug 23 06:17:45 2012 +0000 + + Merge "Returning roles from authenticate in ldap backend" into stable/essex + +commit ff6df7cdbeaed6a8784955ba866332ec5f082ad5 +Author: Ryan Lane +Date: Thu Jul 26 11:41:16 2012 -0700 + + Returning roles from authenticate in ldap backend + + Without this fix, the LDAP backend doesn't return + roles during the authentication phase. + + lp 1035428 + + Change-Id: Ibd7e5a8f5475b56a4d3063c85ab634e4c0614e7e + + AUTHORS | 1 + + keystone/identity/backends/ldap/core.py | 24 +++++++++++++++--------- + tests/test_backend.py | 10 ++++++++++ + 3 files changed, 26 insertions(+), 9 deletions(-) + +commit a130848c71f1bc65dcf98c085dee0c4796748faa +Author: Adam Young +Date: Thu Jul 26 15:30:39 2012 -0400 + + Allow overloading of username and tenant name in the config files. + + Includes documentation and sample config file values. + + Bug 997700 + + Patchset adds DocImpact flag for notifying doc team about these new + config file values. + + (cherry picked from commit 4f3dcb6c9b23867e6049f24c851b12904aee3b76) + + Conflicts: + + etc/keystone.conf.sample + keystone/config.py + + Change-Id: I94a162be07c224c705333804a53910833df96b8e + + doc/source/configuration.rst | 13 +++++++++++++ + keystone/config.py | 2 ++ + keystone/identity/backends/ldap/core.py | 2 ++ + 3 files changed, 17 insertions(+) + +commit 359c426f3009b6088efc364c035d104b089eb37a +Author: Mark McLoughlin +Date: Fri Aug 10 06:54:48 2012 +0100 + + Open 2012.1.3 development + + Bump version to 2012.1.3 to formally open development of the next + Essex stable update release. + + See http://wiki.openstack.org/StableBranchRelease + + Change-Id: Ie3a82ed9b26d25a83b284d57e3d58ab6f4c31b30 + + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit afc37aeb10638807c9839fcc6f403b34029662a5 +Author: Mark McLoughlin +Date: Wed Aug 8 00:45:22 2012 +0100 + + Open 2012.1.2 development + + Bump version to 2012.1.2 to formally open development of the next + Essex stable update release. + + See http://wiki.openstack.org/StableBranchRelease + + Change-Id: Id20de09f981f5389afbb9622ade9de7d4f3fd015 + + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f65604db7b504709fcb9aba2bcfd34a2aebffed3 +Merge: 46b3722 5373601 +Author: Jenkins +Date: Tue Jul 31 10:31:57 2012 +0000 + + Merge "Raise unauthorized if tenant disabled (bug 988920)" into stable/essex + +commit 46b3722245283858017cf4df83e2e1ca2311211d +Merge: d56a3fb 708c80e +Author: Jenkins +Date: Mon Jul 30 16:11:58 2012 +0000 + + Merge "fix variable names to coincide with the ones in common.ldap" into stable/essex + +commit 5373601bbdda10f879c08af1698852142b75f8d5 +Author: Dolph Mathews +Date: Mon Jul 16 16:08:32 2012 -0500 + + Raise unauthorized if tenant disabled (bug 988920) + + If the client attempts to explicitly authenticate against a disabled + tenant, keystone should return HTTP 401 Unauthorized. + + Change-Id: I49fe56b6ef8d9f2fc6b9357472dae8964bb9cb9c + + keystone/service.py | 11 +++++++++++ + tests/test_keystoneclient.py | 47 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 58 insertions(+) + +commit d56a3fb026268e87bdd54b862be388d69d5a1266 +Author: Dmitry Khovyakov +Date: Wed Jul 11 14:17:46 2012 +0300 + + Import ec2 credentials from old keystone db + + Fix bug #1016056 + + Change-Id: Iebf31ccbdeff274b2c8f265911d3411963dd4844 + + AUTHORS | 1 + + keystone/common/sql/legacy.py | 19 +++++++++++++++++++ + 2 files changed, 20 insertions(+) + +commit 0b95c3cf66659a828de055b8d026c11e333cd8c8 +Author: J. Daniel Schmidt +Date: Thu Jul 12 11:22:33 2012 +0200 + + cleanup dependent data upon user/tenant deletion + + fixes bug 974199 + fixes bug 973243 + + * upon deletion of tenant also delete user tenant relations + * upon deletion of tenant or user also delete corresponding metadata + * add foreign keys in metadata to ensure consistency + + see also: https://bugs.launchpad.net/keystone/+bug/959294/comments/16 + + Change-Id: I264714fe82b727e3e0f5273bcb781a580a3f3826 + + AUTHORS | 1 + + keystone/identity/backends/sql.py | 21 +++++++++++++++++++++ + tests/test_backend_sql.py | 35 +++++++++++++++++++++++++++++++++++ + 3 files changed, 57 insertions(+) + +commit 708c80ea8e4ca1897b6815b559ad9437b36448ef +Author: Ionuț Arțăriși +Date: Fri Jun 29 13:02:26 2012 +0200 + + fix variable names to coincide with the ones in common.ldap + + Change-Id: I148d8d9b0a67b8c45d06227829d0105935216c4d + + keystone/identity/backends/ldap/core.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f1762e6d81be38fc6f9b3e12735a868896ce931d +Merge: d111d54 14b136a +Author: Jenkins +Date: Thu Jul 5 16:04:40 2012 +0000 + + Merge "Require authz for user role list (bug 1006815)" into stable/essex + +commit d111d548767bfed1d2c892e7bb443155c166fdc5 +Merge: 1428278 24df3ad +Author: Jenkins +Date: Thu Jul 5 15:43:54 2012 +0000 + + Merge "Require authz for service CRUD (bug 1006822)" into stable/essex + +commit 1428278b6202b7cb285f9e1bb278f894c05d31b0 +Merge: d8dbdbc 707b725 +Author: Jenkins +Date: Thu Jun 28 14:16:31 2012 +0000 + + Merge "Set defaultbranch in .gitreview to stable/essex" into stable/essex + +commit d8dbdbced061fa4a4e42ec33c4b7e7752b0ebc04 +Author: Rafael Durán Castañeda +Date: Tue Jun 19 20:35:43 2012 +0200 + + Monkey patching 'thread'. + + Fixes bug 1012381. + + Change-Id: Icb7b2372df96d647fc6dcd4c4ebe72c8aa607f9d + + AUTHORS | 1 + + keystone/common/wsgi.py | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 14b136aed9d988f5a8f3e699bd4577c9b874d6c1 +Author: Dolph Mathews +Date: Sun Jun 3 12:24:07 2012 -0500 + + Require authz for user role list (bug 1006815) + + Change-Id: I65f25dcca3e265f44746930917434b45e64de15e + + keystone/identity/core.py | 1 + + tests/test_content_types.py | 11 +++++++++++ + 2 files changed, 12 insertions(+) + +commit 24df3adb3f50cbb5ada411bc67aba8a781e6a431 +Author: Dolph Mathews +Date: Sun Jun 3 11:00:54 2012 -0500 + + Require authz for service CRUD (bug 1006822) + + Change-Id: Ia90f0aa2b856b9a9874d4865fb92ee913e8125c5 + + keystone/catalog/core.py | 7 +++++++ + tests/test_content_types.py | 33 +++++++++++++++++++++++++++++++++ + 2 files changed, 40 insertions(+) + +commit 707b7259f9772e5f498990297c65b68116bdc3c1 +Author: Mark McLoughlin +Date: Fri Jun 22 21:16:26 2012 +0100 + + Set defaultbranch in .gitreview to stable/essex + + This allows people run git-review without any arguments. + + Change-Id: I3f1c7ce22cbe40ed34f084fd3dbc0941ba787bcf + + .gitreview | 2 ++ + 1 file changed, 2 insertions(+) + +commit 29e74e73a6e51cffc0371b32354558391826a4aa +Author: Derek Higgins +Date: Tue Jun 5 09:33:53 2012 +0100 + + Carrying over token expiry time when token chaining + + Fixes bug #998185 + + This commit causes the token expiry time to be maintained when + one token is being created from another + + Change-Id: I7b61692a60d9227423b93c267864a5abe939ca33 + + keystone/service.py | 3 ++- + tests/test_keystoneclient.py | 12 ++++++++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 9a841f3ba93d5a0bd1f56cc897415258ed6cf877 +Merge: 35d5ebd d960043 +Author: Jenkins +Date: Thu Jun 14 19:56:21 2012 +0000 + + Merge "Invalidate user tokens when a user is disabled" into stable/essex + +commit 35d5ebd54e02e4b79515e882506f0a518548d273 +Merge: 9695b86 ea03d05 +Author: Jenkins +Date: Thu Jun 14 16:58:30 2012 +0000 + + Merge "Invalidate user tokens when password is changed" into stable/essex + +commit 9695b8681801f3624b8f40dc06797aa171b5f30d +Merge: 0dcfe7e f70505c +Author: Jenkins +Date: Thu Jun 14 16:15:39 2012 +0000 + + Merge "Fix expired token tests" into stable/essex + +commit 0dcfe7ec2df5a45271847914997cbba92fdda330 +Merge: 18513c3 4265499 +Author: Jenkins +Date: Thu Jun 14 15:42:01 2012 +0000 + + Merge "Corrects url conversion in export_legacy_catalog" into stable/essex + +commit d9600434da14976463a0bd03abd8e0309f0db454 +Author: Derek Higgins +Date: Fri May 11 13:42:43 2012 +0100 + + Invalidate user tokens when a user is disabled + + Fixes Bug 997194 + + Delete valid tokens for a user when they have been disabled + + Moved logic to delete tokens into update_user, as this can be called + directly form the REST API. + + Also checks if a user is enabled when creating a token from another + token, this helps in cases there the backend didn't support listing of + tokens (and as a result weren't deleted) + + Change-Id: Ib5ed73a7873bfa66ef31bf6d0f0322f50e677688 + + keystone/identity/core.py | 22 ++++++++++++---------- + keystone/service.py | 14 +++++++++++++- + tests/test_keystoneclient.py | 21 +++++++++++++++++++-- + 3 files changed, 44 insertions(+), 13 deletions(-) + +commit ea03d05ed5de0c015042876100d37a6a14bf56de +Author: Derek Higgins +Date: Wed May 9 15:55:46 2012 +0100 + + Invalidate user tokens when password is changed + + Fixes bug 996595 + + This commit will cause all valid tokens to be deleted for a user + who's password is changed (implemented for the sql and kvs backends) + + Change-Id: I6ad7da8957b7041983a3fc91d9ba9368667d06ac + + AUTHORS | 1 + + keystone/identity/core.py | 14 +++++++++++++- + keystone/token/backends/kvs.py | 15 +++++++++++++++ + keystone/token/backends/sql.py | 14 ++++++++++++++ + keystone/token/core.py | 10 ++++++++++ + tests/test_keystoneclient.py | 23 +++++++++++++++++++++++ + 6 files changed, 76 insertions(+), 1 deletion(-) + +commit 18513c36e63ee2da417f1125cfa05ea9d525b6ee +Author: Mark McLoughlin +Date: Thu Jun 14 10:59:33 2012 +0100 + + Open 2012.1.1 development + + Bump version to 2012.1.1 to formally open development of the next + Essex stable update release. + + See http://wiki.openstack.org/StableBranchRelease + + Change-Id: I845e8abca87751bbe4ebfa9414add247f2afdc1f + + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f70505ced12ae7319dedaf75bedb964c7469c6dd +Author: Mark McLoughlin +Date: Tue Apr 10 13:35:30 2012 +0100 + + Fix expired token tests + + Fixes bug #983800 + + The expiration timestamps are expressed in UTC time, so ensure: + + 1) The timestamp of the token created by the test is UTC time (i.e. + utcnow() vs now()) + + 2) The expiration check in the dummy memcache client properly + accounts for UTC (i.e. utctimetuple() vs timetuple()) + + Change-Id: Ie7356456f79ab5a8070a79771bb7d210b1cedd47 + + tests/test_backend.py | 2 +- + tests/test_backend_memcache.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit aa7e7b96e7bd05819c899906091b9121385dc125 +Author: Dan Prince +Date: Wed Apr 11 10:57:56 2012 -0400 + + Add ChangeLog to tarball. + + Fixes LP Bug #978981. + + Change-Id: I5b98df88673422cfc39c471fd77eecd77fa0cf2c + + MANIFEST.in | 1 + + 1 file changed, 1 insertion(+) + +commit d0a73669369d86ff4c7b9de715fa4eec9bc58b59 +Author: Adam Gandelman +Date: Mon Jun 11 10:35:16 2012 -0700 + + Flush tenant membership deletion before user + + Ensure user tenant membership is *actually* removed before deleting + user. + + Applied to 'stable/essex', originally committed to trunk via + https://review.openstack.org/#/c/7353/ + + Fixes bug 998137. + + Change-Id: Ib52970d68f288b8742c3e060c7040838a1c738c2 + + keystone/identity/backends/sql.py | 1 + + 1 file changed, 1 insertion(+) + +commit 426549934e323a9bc435b9ec58163e88f5e74a32 +Author: Sam Morrison +Date: Mon May 7 09:09:57 2012 +1000 + + Corrects url conversion in export_legacy_catalog + + Fixes bug 994936 + + Change-Id: Ia63fdae7d0bcd7f8b0b587da588404765e22fb8f + + AUTHORS | 1 + + keystone/common/sql/legacy.py | 2 +- + tests/test_import_legacy.py | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +commit 7715d6cd72477af83d95563b69a5f0273bdb719b +Author: Alan Pevec +Date: Mon Jun 11 20:19:50 2012 +0200 + + Fix test env for the stable branch + + Need both changes in one commit to pass the gate! + + * Nail pep8 dependencies to 1.0.1. + + Nails the pep8 deps for tox and test-requires to 1.0.1. + Fixes an issues causing pep8 failures due to a new pep8 release. + + (cherry picked from Nova stable) + + * Switch to 1000 rounds during unit tests + + Fixes bug 992918 + + passlib 1.6 introduced a minimum number of rounds for sha512_crypt. As + a result, increase the rounds used during testing to the minimum + + Change-Id: Ic0c635e92b4f13180a047904a6efa490ab599012 + + tests/test_overrides.conf | 2 +- + tools/test-requires | 2 +- + tox.ini | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit aff45d69a73033241531f5e3542a8d1782ddd859 +Author: Mark McLoughlin +Date: Fri Mar 30 12:17:48 2012 +0100 + + Make import_nova_auth only create roles which don't already exist + + Fixes bug #969088 + + If a role already exists, there's no particular need for import_nova_auth + to barf. Instead, we should just use the existing role. + + Change-Id: I18ae38af62b4c2b2423e20e436611fc30f844ae1 + + keystone/common/sql/nova.py | 5 ++++- + tests/test_migrate_nova_auth.py | 9 +++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 7d08d12cea96910145f05499ba7d124603d7c4f6 +Author: Adam Gandelman +Date: Mon Apr 2 14:21:43 2012 -0700 + + Remove tenant membership during user deletion + + Remove users' tenant membership on user deletion. Resolves a FK constraint + issue that previously went unnoticed due to testing against database + configurations that do not support FK constraints (MyISAM). + + Fixes LP bug 959294. + + Update: * Move tenant membership cleanup to the sql identity backend + * Add a test case to test_backend_sql + + Change-Id: Ib4f5da03033f7886b36d1ab3b8b4ac37f08b2e0e + + keystone/identity/backends/sql.py | 8 ++++++++ + tests/test_backend_sql.py | 11 +++++++++++ + 2 files changed, 19 insertions(+) + +commit aa542c420aa283968a0154a29038ec0bb1be9326 +Author: Chmouel Boudjnah +Date: Mon Apr 2 17:15:47 2012 +0200 + + Add a _ at the end of reseller_prefix default. + + - Fixes bug 971592. + + Change-Id: Ic9edb2b8b0043413e4ec16de9c669646ae4230a6 + + keystone/middleware/swift_auth.py | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 0a0513d9fb1b84d5b998ff47088aee7f121dc794 +Merge: a05daf5 89e8dc0 +Author: Jenkins +Date: Tue Apr 3 19:39:43 2012 +0000 + + Merge "Add support to swift_auth for tokenless authz" into milestone-proposed + +commit a05daf5f53fbf0084e0f19ed4a8b686ff60bcb90 +Merge: bc153d5 4314ae6 +Author: Jenkins +Date: Tue Apr 3 19:29:19 2012 +0000 + + Merge "additional logging to support debugging auth issue" into milestone-proposed + +commit 89e8dc075151acc85d8c4f8972d3910c7f33bd25 +Author: Maru Newby +Date: Tue Mar 20 22:19:36 2012 -0700 + + Add support to swift_auth for tokenless authz + + * Updates keystone.middleware.swift_auth to allow token-less + (unauthenticated) access for container sync (bug 954030) and + permitted referrers (bug 924578). + + Change-Id: Ieccf458c44dfe55f546dc15c79704800dad59ac0 + + doc/source/configuringservices.rst | 3 + + keystone/middleware/swift_auth.py | 106 ++++++++++++++++++++++++++---------- + tests/test_swift_auth_middleware.py | 56 +++++++++---------- + 3 files changed, 104 insertions(+), 61 deletions(-) + +commit 4314ae6c038b96c080dfd13938678e358e5574e7 +Author: Joe Heck +Date: Fri Mar 30 22:04:16 2012 -0700 + + additional logging to support debugging auth issue + + fixes bug 969801 + + Change-Id: Iaf752e5f3692c91030cfd8575114f2c3293d1dba + + keystone/middleware/auth_token.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit bc153d5ad9b32737dd55c33fd12468e89189eded +Author: Maru Newby +Date: Mon Mar 26 16:08:56 2012 -0700 + + Fixed misc errors in configuration.rst + + * Addresses bug 965788 + + Change-Id: I5aa276589a9818c7f523e6da9531af363139adbb + + doc/source/configuration.rst | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit ada402155acf5bda83d1b0fbedfbb0d7e4144b58 +Author: termie +Date: Thu Mar 29 16:03:17 2012 -0700 + + don't duplicate the extra dict in extra + + fixes bug 929815 + + Change-Id: Icfbe9a4b0eb2ef9b24bcf41113a6ec8e636210a9 + + keystone/catalog/backends/sql.py | 4 ++-- + keystone/identity/backends/sql.py | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 1b7aa15ae425e68c15588ba738e9b701b62d995a +Author: Dolph Mathews +Date: Tue Mar 27 10:57:04 2012 -0700 + + Raise keystone.exception for HTTP 401 (bug 962563) + + Change-Id: I22e3b6769c69ef5917028980007d3295fed99fb7 + + keystone/contrib/s3/core.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit b1336b0a3921621741ff8ba2adbc44113357e175 +Author: Dolph Mathews +Date: Fri Mar 23 10:46:16 2012 -0500 + + Validate object refs (return 404 instead of 500) + + Combined fix for bug 963056: + user-crud 404 + service-crud 404 + ec2-credential-crud 404 + user-role-crud 404 + endpoint-crud 404 + + Change-Id: I7762aaaae9817ea7426039e4700e16b59e18cba1 + + keystone/catalog/core.py | 5 +- + keystone/contrib/ec2/core.py | 2 + + keystone/exception.py | 2 +- + keystone/identity/backends/kvs.py | 4 + + keystone/identity/backends/sql.py | 4 + + keystone/identity/core.py | 26 +++++- + tests/test_keystoneclient.py | 175 ++++++++++++++++++++++++++++++++++++++ + tests/test_keystoneclient_sql.py | 7 ++ + 8 files changed, 222 insertions(+), 3 deletions(-) + +commit 80afa04f6e031207e6a7003843852b37c81eacc6 +Merge: f745dae d9959d8 +Author: Jenkins +Date: Tue Apr 3 14:45:36 2012 +0000 + + Merge "tenant-crud 404 (bug 963056)" into milestone-proposed + +commit f745dae9a6d9c68140476daa8403d0efc09826ab +Merge: 8037722 b56e326 +Author: Jenkins +Date: Tue Apr 3 13:30:07 2012 +0000 + + Merge "role-crud 404 (bug 963056)" into milestone-proposed + +commit d9959d85a759b4acdff52c25f20a9462d66b185d +Author: Dolph Mathews +Date: Fri Mar 23 10:23:06 2012 -0500 + + tenant-crud 404 (bug 963056) + + tenant-get + tenant-update + tenant-delete + + Change-Id: I9e67cea985f546c9ddf6ce6d82a11486099bd524 + + keystone/identity/core.py | 10 +++++++++- + tests/test_keystoneclient.py | 21 +++++++++++++++++++++ + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit b56e32645fa88cd21f4b5289cfb68d51fcbf740c +Author: Dolph Mathews +Date: Fri Mar 23 09:10:59 2012 -0500 + + role-crud 404 (bug 963056) + + role-get + role-delete + role-list + + Change-Id: I099b1e1e5bd2cd77a2ea3b72fb0f14b88a3af26e + + keystone/identity/backends/kvs.py | 3 +-- + keystone/identity/backends/sql.py | 3 +-- + keystone/identity/core.py | 13 +++++++++++-- + tests/test_keystoneclient.py | 41 +++++++++++++++++++++++++++++++++++++-- + 4 files changed, 52 insertions(+), 8 deletions(-) + +commit 8037722264668d9b66326cdfac25f6cf84d2b7d4 +Author: Maru Newby +Date: Tue Mar 20 18:47:19 2012 -0700 + + Improve swift_auth test coverage + Minor fixes + + * Isolates authorize() tests from wsgi tests + * Adds coverage for authorize() + * Adds support for a blank reseller_prefix + * Adds swift_auth test dependencies to tools/test-requires + * Cleans up authorize()'s use of tenant_id/tenant_name + (addresses bug 963546) + + Change-Id: I603b89ab4fe8559b0f5d72528afd659ee0f0bce1 + + AUTHORS | 1 + + keystone/middleware/swift_auth.py | 18 +-- + tests/test_swift_auth_middleware.py | 281 ++++++++++++++++++------------------ + tools/test-requires | 4 + + 4 files changed, 158 insertions(+), 146 deletions(-) + +commit f3ce326a8c9ab85f60145e6a198e061fd9ccf431 +Merge: 7abe0aa 1904228 +Author: Jenkins +Date: Fri Mar 23 17:59:24 2012 +0000 + + Merge "Check values for EC2." + +commit 7abe0aa3845459b95a7d4e401e51d4ab8c4c0280 +Author: Chmouel Boudjnah +Date: Wed Mar 21 16:59:15 2012 +0000 + + S3 tokens cleanups. + + - Cleanups. + - Remove reference about config admin_username/password/token. + - Return proper http error on errors. + - Add unittests (skip them for now when swift is not installed). + - Fixes bug 956983. + + Change-Id: I392fc274f3b01a5a0b5779dd13f9cd3b819ee65a + + doc/source/configuringservices.rst | 6 +- + keystone/middleware/s3_token.py | 124 +++++++++++++++++++++++------------ + tests/test_s3_token_middleware.py | 130 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 213 insertions(+), 47 deletions(-) + +commit 1904228a5a3fef549c5b9294eba5c39f9f6f72bd +Author: Chmouel Boudjnah +Date: Thu Mar 22 21:34:39 2012 +0000 + + Check values for EC2. + + - Add multiple check to methods to make sure we have a proper + tenant_id/user_id/credentials. + - Fixes bug 958135. + + Change-Id: I4dd171e3db32d6ebdc70bb1a83492c8ecd09c21c + + keystone/contrib/ec2/core.py | 61 +++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 55 insertions(+), 6 deletions(-) + +commit 9feb00085f75ea2697fd2225e6003c2384904d08 +Author: Dolph Mathews +Date: Wed Mar 21 13:11:31 2012 -0500 + + Fix critical typo in endpoint_create (bug 961412) + + It looks like catalog crud was previously untested. + + Change-Id: I8e3060b6d6c737d3d97a5bd9076e9a5fdf9945e2 + + keystone/catalog/core.py | 2 +- + tests/test_keystoneclient_sql.py | 43 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 44 insertions(+), 1 deletion(-) + +commit 885f8d5950f8441e857d860b4e1cd4fd996440cd +Merge: d61aeda 94904e4 +Author: Jenkins +Date: Tue Mar 20 23:59:16 2012 +0000 + + Merge "Rename tokenauth to authtoken." + +commit d61aedaf868d984f1c317a73b362a2e7a366ef89 +Author: Yong Sheng Gong +Date: Sun Mar 18 23:56:35 2012 +0800 + + unique role name constraint + + For SQL identity backend, add unique constraint with column definition; + for kvs and ldap backend, use python code to apply this constraint. + Test cases test_create_duplicate_role_name_fails and test_rename_duplicate_role_name_fails are added to guard it. + python run_tests.py test_backend_ldap test_backend_kvs test_backend_sql pass. + + bug 932258. + + Change-Id: I990f17a270e84d35c078f215c587a81d6784c192 + + AUTHORS | 1 + + keystone/identity/backends/kvs.py | 23 +++++++++++++++++++++- + keystone/identity/backends/ldap/core.py | 14 ++++++++++++- + keystone/identity/backends/sql.py | 2 +- + tests/test_backend.py | 35 +++++++++++++++++++++++++++------ + 5 files changed, 66 insertions(+), 9 deletions(-) + +commit f98cd4f27d68c47a003b529bbcfeffa9140e090d +Merge: 53b3d44 3a296a4 +Author: Jenkins +Date: Tue Mar 20 23:17:30 2012 +0000 + + Merge "Spring cleaning, fix PEP8 violations." + +commit 53b3d4498848ae2fff58751f9a791a9ebc00b742 +Author: Chmouel Boudjnah +Date: Sat Feb 25 11:37:17 2012 +0100 + + Add test for swift middleware. + + - skip the tests if we don't have swift installed. + + Change-Id: I3647538f3e7a32cbfce97b181c532371cef963da + + tests/test_swift_auth_middleware.py | 203 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 203 insertions(+) + +commit 3a296a458c4e2f9465ddc0330d03c3e7ec0e3c50 +Author: Chmouel Boudjnah +Date: Tue Mar 20 10:09:25 2012 +0000 + + Spring cleaning, fix PEP8 violations. + + Change-Id: Ide832cd64c9b285213e23901eaf81946d504e726 + + doc/source/conf.py | 33 +++++++++++--------- + run_tests.py | 1 - + tests/default_fixtures.py | 6 ++-- + tests/test_auth_token_middleware.py | 6 ++-- + tests/test_backend.py | 61 ++++++++++++++++++------------------- + tests/test_backend_kvs.py | 58 +++++++++++++++++------------------ + tests/test_backend_sql.py | 30 +++++++++--------- + tests/test_content_types.py | 6 ++-- + tests/test_import_legacy.py | 2 -- + tests/test_keystoneclient.py | 6 ++-- + tests/test_middleware.py | 3 +- + 11 files changed, 108 insertions(+), 104 deletions(-) + +commit 5ea232a09f88d621980cbd5ef4655f9c9a2e2da1 +Merge: da04fc0 009d661 +Author: Jenkins +Date: Tue Mar 20 22:40:51 2012 +0000 + + Merge "Wrapped unexpected exceptions (bug 955411)" + +commit da04fc0de4b7f46a5559f3c81e54b5402e4876e3 +Merge: 57f1cb2 e677327 +Author: Jenkins +Date: Tue Mar 20 22:34:37 2012 +0000 + + Merge "Support PyPAM in pam backend, update to latest API" + +commit 94904e45e3276e1c274a25c785c0143cd6d6fec1 +Author: Chmouel Boudjnah +Date: Tue Mar 20 17:08:46 2012 +0000 + + Rename tokenauth to authtoken. + + - Avoid confusing by using the authtoken name for auth_token middleware. + - Improve swift_auth middleware doc. + + Change-Id: I287860eba067b99a1d89f8f17200820340836ff9 + + doc/source/configuringservices.rst | 10 +++++----- + keystone/middleware/swift_auth.py | 9 +++++++-- + 2 files changed, 12 insertions(+), 7 deletions(-) + +commit 57f1cb2c4a37ef0040321732fb64fc6cde02126d +Merge: 80c7936 3e4653a +Author: Jenkins +Date: Tue Mar 20 18:04:22 2012 +0000 + + Merge "fix keystone-all's usage of options vs conf" + +commit 80c7936b3147d53659025a76ac232de986f5ce64 +Author: termie +Date: Tue Mar 20 10:41:03 2012 -0700 + + pass the arguments in when starting keystone-all + + fixes bug 942793 + + Change-Id: I044a56c1eedae2ecef04dd3aa60b91414b7abc14 + + bin/keystone-all | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3e4653a3914e84aec72ba159c4d23edba8ced48f +Author: termie +Date: Tue Mar 20 10:47:31 2012 -0700 + + fix keystone-all's usage of options vs conf + + we shouldn't be using options at all, that was a leftover piece of code + from a long time ago. + + invalidates bug 949373 + + Change-Id: I29fcbd5f641464bda985900172b55bca45843f81 + + bin/keystone-all | 8 ++++---- + etc/keystone.conf | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 9c823977baca9944074c62cedf32f5107a95a443 +Merge: 3263f45 6f8752b +Author: Jenkins +Date: Tue Mar 20 17:19:51 2012 +0000 + + Merge "Clean up sql connection args" + +commit 3263f45926f054c759caa10e391777e7372e73a1 +Merge: 5d07cdf ee57716 +Author: Jenkins +Date: Tue Mar 20 16:59:17 2012 +0000 + + Merge "Improved file logging example (bug 959610)" + +commit 009d661a7e06ad72ab39b93433839bf567755ece +Author: Dolph Mathews +Date: Wed Mar 14 15:06:16 2012 -0500 + + Wrapped unexpected exceptions (bug 955411) + + - Replaced all webob.exc's (outside of middleware) with + keystone.exception's + - Raised 409 Conflict when creating/updating existing + user/tenant ID/names (bug 955464) + - Raised 501 Not Implemented for user-role-add w/o tenant_id + (bug 955548) + + Change-Id: I9f16cac502c20dd35a6b8da778e85bf3d9cfae49 + + keystone/catalog/backends/sql.py | 2 +- + keystone/catalog/core.py | 11 ++------ + keystone/common/ldap/core.py | 11 +++++--- + keystone/common/sql/core.py | 1 + + keystone/common/wsgi.py | 3 ++ + keystone/contrib/ec2/core.py | 20 +++++-------- + keystone/exception.py | 50 +++++++++++++++++++++++++++++---- + keystone/identity/backends/kvs.py | 19 +++++++++---- + keystone/identity/backends/ldap/core.py | 2 +- + keystone/identity/backends/sql.py | 23 +++++++++++++++ + keystone/identity/core.py | 24 ++++++++-------- + keystone/policy/backends/rules.py | 2 +- + keystone/service.py | 4 +-- + tests/test_exception.py | 4 +-- + 14 files changed, 121 insertions(+), 55 deletions(-) + +commit 5d07cdf438b97ec2fdc4685b2f1559f3258da102 +Author: Michael Basnight +Date: Tue Mar 20 08:53:31 2012 -0500 + + Changing belongsTo validation back to ID + + * Fixes lp#960218 + + Change-Id: I6296413c211da92a4d0e07a544ca812d3544cb73 + + keystone/service.py | 2 +- + tests/test_content_types.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 3a70a2f9281fdfec6f770cfb60fcd2dce5a77c5f +Merge: 632fb0a 193374a +Author: Jenkins +Date: Tue Mar 20 04:55:46 2012 +0000 + + Merge "Fixes LP #954089 - Service list templated catalog" + +commit 632fb0a8cb4eddf76ce0695472601d69115149a9 +Merge: 4f3dade 2324247 +Author: Jenkins +Date: Tue Mar 20 04:49:56 2012 +0000 + + Merge "Swift middleware doc update." + +commit 4f3dade2367270442b685426befd6d6de665797b +Merge: ed231ff 678dcad +Author: Jenkins +Date: Tue Mar 20 04:44:01 2012 +0000 + + Merge "Refactor keystone.common.logging use (bug 948224)" + +commit ed231ffa8c3e90125bc73c528d1db8b46f3f5381 +Merge: 36b2b22 00a2392 +Author: Jenkins +Date: Tue Mar 20 04:37:59 2012 +0000 + + Merge "Installing keystone docs" + +commit 6f8752bf6ea74fb8841dac1a1d6b62af019b48e5 +Author: Brian Waldon +Date: Mon Mar 19 14:21:02 2012 -0700 + + Clean up sql connection args + + * Convert idle_timeout (pool_recycle) to integer + * Drop min_pool_size, max_pool_size, pool_timeout + * Fixes bug 959916 + + Change-Id: Ie124b3abdf00358d6b722e1c2e2a2fb22967ca5a + + doc/source/configuration.rst | 3 --- + etc/keystone.conf | 3 --- + keystone/config.py | 5 +---- + tests/backend_sql.conf | 3 --- + 4 files changed, 1 insertion(+), 13 deletions(-) + +commit 36b2b228daabd07e185e70800863991cbde6ba95 +Merge: 83bc8c0 6f2c858 +Author: Jenkins +Date: Tue Mar 20 04:15:44 2012 +0000 + + Merge "Update get_metadata to return {}" + +commit ee577163e32b88ca1345124c96ae3113d9a5ccdd +Author: Dolph Mathews +Date: Mon Mar 19 14:49:18 2012 -0500 + + Improved file logging example (bug 959610) + + - Root logger w/ file handler will log WARNING, ERROR, CRITICAL by default + + Change-Id: I36cd07cec85712640daa013563401a3bc52f290c + + .gitignore | 2 +- + etc/keystone.conf | 2 +- + etc/logging.conf.sample | 23 ++++------------------- + 3 files changed, 6 insertions(+), 21 deletions(-) + +commit 83bc8c088ec66a858afce9a889a4407c59b9d48e +Merge: 5027c9d 773f0f8 +Author: Jenkins +Date: Mon Mar 19 18:07:20 2012 +0000 + + Merge "Fix default port for identity.internalURL" + +commit 5027c9d7150815abe1dde7e4d85d41eb2d0fad4d +Merge: 7c1e32b 56e4103 +Author: Jenkins +Date: Mon Mar 19 18:01:19 2012 +0000 + + Merge "docstring cleanup to remove sphinx warnings" + +commit 2324247baac2ba620da1f6cdc540462e6f0b6a5f +Author: Chmouel Boudjnah +Date: Mon Mar 19 14:53:36 2012 +0000 + + Swift middleware doc update. + + Change-Id: I01ecc4d602b5e887f66d32676f11a92d022f693f + + doc/source/configuringservices.rst | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 7c1e32bba6837eb0937e6e7567aa5e7981db7fec +Merge: 43a84e3 2146119 +Author: Jenkins +Date: Mon Mar 19 16:26:45 2012 +0000 + + Merge "Remove nova-specific middlewares" + +commit 43a84e3b96450d29b7f3139a6e830583038c1d24 +Merge: 2c6a232 239e4f6 +Author: Jenkins +Date: Mon Mar 19 16:20:55 2012 +0000 + + Merge "Add check for MAX_PASSWORD_LENGTH to utils." + +commit 193374af3860e17ed03bb0431d823046079ae444 +Author: Jay Pipes +Date: Tue Mar 13 17:30:07 2012 -0400 + + Fixes LP #954089 - Service list templated catalog + + * Adds missing test cases for the TemplatedCatalog + * Adds a base CatalogTest that different backends + can use + * Updates kvs.Catalog to raise ServiceNotFound where + appropriate + * Updates the tests.test_keystoneclient_sql to actually + test the SQL catalog backend + * Removes old test for incorrect endpoints listing + * Removes the keystone.catalog.core.Driver.service_exists + method since it was only implemented in the SQL driver + and wasn't required now that get_service and delete_service + properly raise ServiceNotFound exception. + + Change-Id: I35690cc147e56007be27bacf94eeff360e727e5d + + keystone/catalog/backends/kvs.py | 9 +++- + keystone/catalog/backends/sql.py | 10 ++--- + keystone/catalog/backends/templated.py | 3 ++ + keystone/catalog/core.py | 12 ++---- + keystone/exception.py | 4 ++ + keystone/test.py | 75 +++++++++++++++++++++------------- + tests/backend_sql.conf | 3 ++ + tests/default_fixtures.py | 21 ++++++++++ + tests/test_backend.py | 20 +++++++++ + tests/test_backend_kvs.py | 7 ++-- + tests/test_backend_templated.py | 57 ++++++++++++++++++++++++++ + tests/test_keystoneclient.py | 8 ---- + 12 files changed, 174 insertions(+), 55 deletions(-) + +commit 2146119eaddaa5b3e375fef6590458a77932a58b +Author: Brian Waldon +Date: Mon Mar 19 08:31:26 2012 -0700 + + Remove nova-specific middlewares + + * Nova now ships with nova.api.auth.NovaKeystoneContext + * Nova does not depend on either of the middlewares being removed + + Change-Id: I9546e5c84ea1453f5dfd2dd7bf9924ccda57f87a + + doc/source/configuringservices.rst | 11 +-- + doc/source/nova-api-paste.rst | 143 --------------------------- + keystone/middleware/nova_auth_token.py | 103 ------------------- + keystone/middleware/nova_keystone_context.py | 71 ------------- + 4 files changed, 1 insertion(+), 327 deletions(-) + +commit 239e4f64c2134338b32ffd6d42c0b6ff70cd040c +Author: Dan Prince +Date: Fri Mar 16 21:46:31 2012 -0400 + + Add check for MAX_PASSWORD_LENGTH to utils. + + Updates to keystone password hashing and checking functions so + that a max password length is enforced. + + Fixes LP Bug #959288. + + Change-Id: Id3048f3c916e92c59ac5b063d09c3d612d51c97c + + keystone/common/utils.py | 17 +++++++++++++---- + tests/test_utils.py | 5 +++++ + 2 files changed, 18 insertions(+), 4 deletions(-) + +commit 2c6a232c38cf6bbd969421b2fe2fe7d410da327a +Author: Brian Waldon +Date: Fri Mar 16 15:55:22 2012 -0700 + + Remove glance_auth_token middleware + + * Fixes bug 957501 + + Change-Id: I2ae6ec7b391dd41587f2246940a8d392c12c91fe + + keystone/middleware/glance_auth_token.py | 78 -------------------------------- + 1 file changed, 78 deletions(-) + +commit e67732748c7ad4656f6ef5d9da3ff4789199bf9a +Author: Russell Bryant +Date: Wed Mar 14 16:55:24 2012 -0400 + + Support PyPAM in pam backend, update to latest API + + Fix bug 938801. + + This bug pointed out that some distros don't have the same pam Python + module packaged that this backend was expecting. In my case, on Fedora, + it's PAM and the API is not compatible with the pam module that was + used. This patch makes the backend support PyPAM, as well as the + original pam module that was used. + + In order to test this, I updated the pam backend to the latest backend + API. Even though the base class will raise NotImplementedError, I + included all functions here to make it more clear all of the things + this backend does not do. + + Change-Id: I74144f4e63b6830c8224bc87e1662eb5df8728a0 + + keystone/identity/backends/pam.py | 137 ++++++++++++++++++++++++++++++++++---- + 1 file changed, 125 insertions(+), 12 deletions(-) + +commit 88ac1edec0b62fe5b18b2b0ffce3798f63f21351 +Merge: c93f663 f8cbd61 +Author: Jenkins +Date: Fri Mar 16 02:34:15 2012 +0000 + + Merge "sample_data.sh: check file paths for packaged installations" + +commit c93f6633cdcde89c346054a478fa17b12940b395 +Merge: 2415b17 9363d5f +Author: Jenkins +Date: Thu Mar 15 22:34:02 2012 +0000 + + Merge "Properly return 501 for unsupported Catalog calls" + +commit 2415b171b113aea4f4fbec5856b92cec36d44709 +Merge: 096300d e7bb737 +Author: Jenkins +Date: Thu Mar 15 17:23:52 2012 +0000 + + Merge "Add automatically generated code docs." + +commit 096300d072d8545f899586af44968c9ba43d380b +Merge: fdca62c ab6be05 +Author: Jenkins +Date: Thu Mar 15 14:46:48 2012 +0000 + + Merge "Update username -> name in token response." + +commit 773f0f84af282cd3e53650ccbb99284c37677b6a +Author: Julien Danjou +Date: Thu Mar 15 11:38:29 2012 +0100 + + Fix default port for identity.internalURL + + This should be the public_port and not the admin one. + + Change-Id: Ib09e7479c0507797532e6bb91d76b7d3083cc761 + Signed-off-by: Julien Danjou + + etc/default_catalog.templates | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fdca62c93858e5bac09e5e20e0818585946a598d +Merge: 9a2010b d2c6e88 +Author: Jenkins +Date: Thu Mar 15 07:49:17 2012 +0000 + + Merge "Raising unauthorized instead of 500 (bug 954547)" + +commit 00a239278553fd357e56da35b559ec329dc9796a +Author: Joe Heck +Date: Wed Mar 14 19:03:59 2012 -0700 + + Installing keystone docs + + fixes bug 954217 + + Change-Id: Iba79d2d5bae836037d5b0e10169d9bbdba8603dc + + doc/source/index.rst | 5 +- + doc/source/installing.rst | 115 ++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 118 insertions(+), 2 deletions(-) + +commit ab6be05068068b0902db44b1d60f56eea4fe1215 +Author: Brian Lamar +Date: Wed Mar 14 18:30:13 2012 -0400 + + Update username -> name in token response. + + Tokens validation responses contain user information. The API docs + seem to indicate token["user"]["name"] contains the username but + currently the auth_token.py middleware checks for + token["user"]["username"]. This updates that check and the tests. + + Fixes bug 955563 + + Change-Id: Ib2fbf6fcea87f7066394cf14c18158f1e5eeaf06 + + keystone/middleware/auth_token.py | 2 +- + tests/test_auth_token_middleware.py | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 678dcad410b2496eb1ed34bb91c0d0914a9c6b0d +Author: Dolph Mathews +Date: Wed Mar 14 14:28:04 2012 -0500 + + Refactor keystone.common.logging use (bug 948224) + + Change-Id: I01b2b5748a2524273bb8c2b734ab22415652f739 + + HACKING.rst | 20 +++++++++++++++++ + keystone/catalog/backends/templated.py | 2 +- + keystone/common/bufferedhttp.py | 8 +++++-- + keystone/common/ldap/core.py | 5 ++--- + keystone/common/ldap/fakeldap.py | 4 ++-- + keystone/common/sql/nova.py | 16 +++++++------- + keystone/common/utils.py | 15 +++++++------ + keystone/common/wsgi.py | 37 ++++++++++++++++--------------- + keystone/middleware/auth_token.py | 40 +++++++++++++++++----------------- + keystone/policy/backends/rules.py | 2 +- + keystone/test.py | 3 ++- + 11 files changed, 90 insertions(+), 62 deletions(-) + +commit 9a2010bfe81a386610a294d0b29c31e12db79773 +Merge: acc9f89 f4915af +Author: Jenkins +Date: Wed Mar 14 20:45:40 2012 +0000 + + Merge "Allow connect to another tenant." + +commit e7bb73767ba9b538bdab85cdb4edb2549c02427f +Author: Russell Bryant +Date: Wed Mar 14 16:05:46 2012 -0400 + + Add automatically generated code docs. + + Fix bug 954734. + + Fix "python setup.py build_sphinx" to build the code documentation via + sphinx-apidoc. + + Change-Id: I18eced31aab424b7c808697324cbf6cfede442a7 + + setup.py | 3 +++ + 1 file changed, 3 insertions(+) + +commit 9363d5fea676e1e083c5afe5287ef30c806046bf +Author: Adam Gandelman +Date: Tue Mar 13 16:23:45 2012 -0700 + + Properly return 501 for unsupported Catalog calls + + Similar to the other APIs, this creates a Driver class that describes + expected functionality of the catalog driver and raises NotImplemented + accordingly. NotImplementedError()'s are caught and returned as proper + 501s instead of AttributeErrors. + + Also fixes some inconsistent paramters names in the sql backend. + + Fixes bug 954087 + + Update: Convert usage of NotImplementedError() to new + keystone.exception.NotImplemented() for all + unimplemented driver actions. + + Change-Id: I69d8e21a6f651e69b724ec5ed5784645bad80c00 + + doc/source/architecture.rst | 2 +- + keystone/catalog/backends/kvs.py | 3 +- + keystone/catalog/backends/sql.py | 6 +-- + keystone/catalog/core.py | 79 ++++++++++++++++++++++++++++++++++++++++ + keystone/exception.py | 6 +++ + keystone/identity/core.py | 56 ++++++++++++++-------------- + keystone/policy/core.py | 3 +- + keystone/service.py | 4 +- + keystone/token/core.py | 7 ++-- + 9 files changed, 127 insertions(+), 39 deletions(-) + +commit acc9f892b36aa7315ac84d1e7f6506a6fea9fbad +Merge: b03c204 a1e0174 +Author: Jenkins +Date: Wed Mar 14 18:22:30 2012 +0000 + + Merge "Update docs for keystone client cli args" + +commit 56e41037ba41b2507722dcbc54157cfe4cf4535f +Author: Joe Heck +Date: Wed Mar 14 17:19:37 2012 +0000 + + docstring cleanup to remove sphinx warnings + + Change-Id: Icfc273f2466f48307d2addd22b70f1759d23fd97 + + keystone/common/policy.py | 17 ++++++++++------- + keystone/policy/backends/rules.py | 6 ++++-- + 2 files changed, 14 insertions(+), 9 deletions(-) + +commit b03c2047815ff341547d2d9792dfd392148d277a +Author: Joe Heck +Date: Wed Mar 14 05:08:58 2012 +0000 + + updating documentation for rewrite of auth_token. + + fixes bug 944372 + + Change-Id: Ifac365a6eb141e0ca4701cf139d6ea66a0b3ffbc + + doc/source/configuringservices.rst | 3 +- + doc/source/images/graphs_305.svg | 41 -- + doc/source/images/graphs_both.svg | 36 -- + .../images/graphs_delegate_forbiden_basic.svg | 53 -- + .../images/graphs_delegate_forbiden_proxy.svg | 52 -- + doc/source/images/graphs_delegate_reject_basic.svg | 55 -- + doc/source/images/graphs_delegate_reject_oauth.svg | 56 --- + .../images/graphs_delegate_unimplemented.svg | 53 -- + doc/source/images/graphs_mapper.svg | 73 --- + doc/source/images/graphs_proxyAuth.svg | 51 -- + doc/source/images/images_layouts.svg | 200 -------- + doc/source/index.rst | 3 +- + doc/source/middleware_architecture.rst | 555 +++++---------------- + doc/source/old/middleware.rst | 169 ------- + doc/source/setup.rst | 28 +- + 15 files changed, 148 insertions(+), 1280 deletions(-) + +commit f4915afc5af0d1252e7779fcc30ffff892a69d91 +Author: Chmouel Boudjnah +Date: Wed Mar 14 16:19:12 2012 +0000 + + Allow connect to another tenant. + + - Works with nova s3_affix_tenant. + - This would only be allowed for user who has reselleradmin rights. + - Fixes bug 954505. + + Change-Id: Iea84f1c61f6c725982c8bee95889ce084d9ffd82 + + keystone/middleware/s3_token.py | 26 +++++++++++++++++++++----- + 1 file changed, 21 insertions(+), 5 deletions(-) + +commit fb4cbe9d3766ac0ccbe746114d5c6745bc91e002 +Merge: 5b3e05b dc41cb5 +Author: Jenkins +Date: Wed Mar 14 06:08:00 2012 +0000 + + Merge "Failing to update tenants (bug 953678, bug 954673)" + +commit a1e01747ea81fc128d08c02d449b477f52003680 +Author: Dean Troyer +Date: Wed Mar 14 00:35:47 2012 -0500 + + Update docs for keystone client cli args + + Changes CLI args in keystone command per updated http://wiki.openstack.org/CLIAuth + + Change-Id: I097181c418f6cc2226fceb5c79d87fde36026594 + + doc/source/configuration.rst | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit d2c6e88200bb33708a0861da4d1a10c0f7984895 +Author: Dolph Mathews +Date: Tue Mar 13 22:06:34 2012 -0500 + + Raising unauthorized instead of 500 (bug 954547) + + Change-Id: I557ff1ca51261edf0824aeb4565816216c59c76e + + keystone/common/wsgi.py | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +commit dc41cb5c11951b416d3e379bc944ac85737b979a +Author: Dolph Mathews +Date: Tue Mar 13 16:11:27 2012 -0500 + + Failing to update tenants (bug 953678, bug 954673) + + - GET /tenants: Enabled attribute was being overridden + - "POST" /tenants/{tenant_id}: was failing to update KVS + + Change-Id: Icc1efef52d35777d73e6010bdfc0409e24570aa2 + + keystone/identity/backends/kvs.py | 3 ++- + keystone/identity/core.py | 3 ++- + tests/test_keystoneclient.py | 56 ++++++++++++++++++++++++++++++--------- + 3 files changed, 47 insertions(+), 15 deletions(-) + +commit 5b3e05bbabd5366461630327e4498fe582ff8ab7 +Author: Adam Young +Date: Wed Mar 7 16:04:32 2012 -0500 + + added LDAP section to architecture and architecture + + https://bugs.launchpad.net/keystone/+bug/949521 + + Bug 949521 + + Change-Id: I2e37c0d946e3d97a2c4bc4bf4a50bd94466f70c2 + + doc/source/architecture.rst | 6 ++++++ + doc/source/configuration.rst | 42 +++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 45 insertions(+), 3 deletions(-) + +commit e65a22c43a7fe44621080cee01f394c90b54320d +Author: Peng Yong +Date: Sun Mar 11 10:35:15 2012 +0800 + + Bug #943031 MySQL Server has gone away + added docnotes of error messages caught for mysql and reference + + Change-Id: I147b32193436be891e54e36c6adc1b16fda886d3 + + AUTHORS | 1 + + keystone/common/sql/core.py | 43 +++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 40 insertions(+), 4 deletions(-) + +commit 97460ef70b7a8008a27f73384c389c2b4c23dded +Merge: dee8153 73af033 +Author: Jenkins +Date: Tue Mar 13 21:28:39 2012 +0000 + + Merge "Improved legacy tenancy resolution (bug 951933)" + +commit dee81534cb2743262e2287da35e9b5970bd9cc12 +Author: Joe Heck +Date: Tue Mar 13 13:53:40 2012 -0700 + + making all use of time follow datetime.utcnow() + fixes bug 954057 + + Change-Id: I14fa475dc03410b8843ab028d30fbc8802c4be30 + + keystone/token/backends/kvs.py | 2 +- + keystone/token/backends/sql.py | 2 +- + keystone/token/core.py | 4 ++-- + tests/test_backend_memcache.py | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit 73af033ded8fe9ba54c37ab4f2a7553b3be1e450 +Author: Dolph Mathews +Date: Tue Mar 13 12:27:53 2012 -0500 + + Improved legacy tenancy resolution (bug 951933) + + Change-Id: Ia6fd5eb57e8d7f90328117351f7b814b1b4495dc + + keystone/middleware/auth_token.py | 33 ++++-- + tests/test_auth_token_middleware.py | 201 +++++++++++++++++++++++++++--------- + 2 files changed, 174 insertions(+), 60 deletions(-) + +commit f8cbd611cfa258f75051e41ebd83501cfec06630 +Author: Alan Pevec +Date: Mon Feb 27 17:59:33 2012 +0100 + + sample_data.sh: check file paths for packaged installations + + v4: try to use system-wide configuration first + then fallback to assuming git checkout + + Change-Id: I6916f554cb9848fcb2d090e142b8915ad19a7486 + + tools/sample_data.sh | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +commit 1e07b98d77a6ccb254e6f4411682235a47dab137 +Author: Chmouel Boudjnah +Date: Sat Mar 10 17:22:06 2012 +0100 + + Fix iso8601 import/use and date comparaison. + + - Store the unix time from iso8601.parse_date to compare against + time.time. + - on a WSGI environement the import don't get passed to the methods from + __init__ use a self. variable. + - Fixes bug 951603. + - Add unit tests. + - Add iso8601 to test-requires. + + Change-Id: Ia8af8b203d1310d5ae6868c3a14dfdf68d6e5331 + + keystone/middleware/auth_token.py | 6 ++- + tests/test_auth_token_middleware.py | 93 +++++++++++++++++++++++++++++-------- + tools/test-requires | 1 + + 3 files changed, 79 insertions(+), 21 deletions(-) + +commit a036b3f77ba39301d0a5d44afe6c4253c0db8b15 +Author: Dean Troyer +Date: Mon Mar 12 14:45:34 2012 -0500 + + Fix double-quoted service names + + The Keystone service template parser doesn't do any quote interpolation, + it just splits on ' = ' and passes the two parts on. So we just remove + the quotes for now. + + Fixes bug 943523 + + Change-Id: Ib9e17e70926339ab67f9c50a52a5036eeb7bfb65 + + etc/default_catalog.templates | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit f6fd0c79219e0b4f8108aba73553b120f763af54 +Merge: 0c3c27c 1b64c84 +Author: Jenkins +Date: Sun Mar 11 06:42:37 2012 +0000 + + Merge "Remove Nova Diablo reference from migrate docs" + +commit 1b64c8405381000b8738195b265c6c81690d8e9e +Author: Brian Waldon +Date: Sat Mar 10 20:59:40 2012 -0800 + + Remove Nova Diablo reference from migrate docs + + Change-Id: Ic8e07197db0b926c2ac7ee0ad6fcc936314ffe6f + + doc/source/configuration.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0c3c27c7dbf8a4d359e8cae7f80fcaad5d8582e9 +Author: Deepak Garg +Date: Thu Mar 8 09:16:26 2012 +0530 + + Fixes the cli documentation of user/tenant/roles + + Fixed the subcommands and basic misconfiguration mentioned in bug #948211 + + Note: deleted the old commands after the review comments. + + Change-Id: I2a8491c35f346d120581156ae1743d07c3c11fd0 + + AUTHORS | 1 + + doc/source/configuration.rst | 103 +++++++++++++------------------------------ + 2 files changed, 32 insertions(+), 72 deletions(-) + +commit 9d245f8b6867bb7cb2b1230055de1230a483f0cb +Merge: a863c13 2f4fb46 +Author: Jenkins +Date: Sun Mar 11 01:54:48 2012 +0000 + + Merge "create service endpoints in sample data" + +commit a863c136720a1e3ddc098588afd171dc10ffb308 +Author: Brian Waldon +Date: Sat Mar 10 13:59:44 2012 -0800 + + Add simple set of tests for auth_token middleware + + Change-Id: Ie959e91dc555e35b8e5ba4b01c68a3f232efc115 + + keystone/middleware/auth_token.py | 7 +- + tests/test_auth_token_middleware.py | 162 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 168 insertions(+), 1 deletion(-) + +commit 7ee2a4618314217c1b5bae15e9346be4d9cb8107 +Merge: c373132 d6631d8 +Author: Jenkins +Date: Sat Mar 10 19:21:04 2012 +0000 + + Merge "update documention on changing user password" + +commit c373132e7fc720690d0f7531e1f5871632984c4f +Merge: 6db0067 259d938 +Author: Jenkins +Date: Sat Mar 10 19:01:34 2012 +0000 + + Merge "enables run_test option to skip integration" + +commit 6db00670ea33c39c408d657525ebd778c8932ce1 +Merge: ee5083d 48f2c7d +Author: Jenkins +Date: Sat Mar 10 11:29:31 2012 +0000 + + Merge "Add AUTHORS to the tarball." + +commit d6631d81d5f469415aed2023367adccb529ea656 +Author: Yaguang Tang +Date: Sat Mar 10 15:51:56 2012 +0800 + + update documention on changing user password + + Change-Id: I73be30eed4d2eed7a53c9dbdb5f29ec9c8f6eb6f + + doc/source/configuration.rst | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ee5083d7b4d7c9f3d687ccba6fe652af0966b9e0 +Merge: b5c8b3a 94abc7e +Author: Jenkins +Date: Sat Mar 10 07:35:54 2012 +0000 + + Merge "Make sure we have a port number before int it." + +commit 259d9380e835d03d7358e4d953404b8207b8e8d7 +Author: Joe Heck +Date: Fri Mar 9 22:41:47 2012 -0800 + + enables run_test option to skip integration + + * fixes bug 948495 + + Change-Id: I274bfe9611d677c44117a0d9ff67394790794fc4 + + run_tests.sh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit b5c8b3a81911491c97ee95e741c75ffd269f382a +Author: Chmouel Boudjnah +Date: Fri Mar 2 15:31:54 2012 +0000 + + Add token caching via memcache. + + - Fixes bug 938253 + - caching requires both python-memcache and iso8601 + + Change-Id: I23d5849aad4c6a2333b903eaca6d4f00be8615d3 + + doc/source/nova-api-paste.rst | 2 +- + doc/source/old/middleware.rst | 2 +- + keystone/middleware/auth_token.py | 70 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 72 insertions(+), 2 deletions(-) + +commit 6f2c858f4382395bd4b4232e7ba3dd509327e4c6 +Author: Brian Lamar +Date: Fri Mar 9 15:24:25 2012 -0500 + + Update get_metadata to return {} + + Fixes bug 951093 + + While the actual issue was encountered in keystone/service.py, + the underlying issue is that all identity backends seems to be + returning None when no metadata is found for a user. I would argue + that returning {} makes it easier on clients. + + Change-Id: I06faf755cc0dbe45b5d0a0f86c6235b27c856047 + + keystone/identity/backends/kvs.py | 2 +- + keystone/identity/backends/ldap/core.py | 8 +++----- + keystone/identity/backends/sql.py | 2 +- + tests/default_fixtures.py | 4 ++++ + tests/test_backend.py | 19 +++++++++++++++++-- + 5 files changed, 26 insertions(+), 9 deletions(-) + +commit e05bc6a6edeee5e1430e6c36fb38c911821800f5 +Author: Dolph Mathews +Date: Thu Mar 1 12:31:53 2012 -0600 + + Diablo to Essex migration docs (bug 934328) + + - Also includes notes to address bug 947060 + + Change-Id: I2756457861f3e84334a7d37aed31372a3b02dd40 + + doc/source/configuration.rst | 408 +++++++++++++++++++++++-------------- + doc/source/man/keystone-manage.rst | 9 +- + 2 files changed, 260 insertions(+), 157 deletions(-) + +commit 5720730c2e55259f1894368e766256cded51a1df +Author: Dolph Mathews +Date: Fri Mar 2 13:38:39 2012 -0600 + + Added license header (bug 929663) + + Change-Id: Ia36a22f2d6bba411e4fad81ea2d6fa1f0465a733 + + keystone/catalog/__init__.py | 16 ++++++++++++++++ + keystone/common/kvs.py | 14 ++++++++++++++ + keystone/common/ldap/__init__.py | 16 ++++++++++++++++ + keystone/common/ldap/core.py | 14 ++++++++++++++ + keystone/common/logging.py | 14 ++++++++++++++ + keystone/common/manager.py | 14 ++++++++++++++ + keystone/common/serializer.py | 16 ++++++++++++++++ + keystone/common/sql/__init__.py | 16 ++++++++++++++++ + keystone/common/sql/core.py | 14 ++++++++++++++ + keystone/common/sql/legacy.py | 14 ++++++++++++++ + keystone/common/sql/nova.py | 14 ++++++++++++++ + keystone/common/sql/util.py | 14 ++++++++++++++ + keystone/contrib/admin_crud/__init__.py | 16 ++++++++++++++++ + keystone/contrib/ec2/__init__.py | 16 ++++++++++++++++ + keystone/contrib/s3/__init__.py | 16 ++++++++++++++++ + keystone/identity/__init__.py | 16 ++++++++++++++++ + keystone/identity/backends/ldap/__init__.py | 16 ++++++++++++++++ + keystone/identity/backends/ldap/core.py | 14 ++++++++++++++ + keystone/middleware/__init__.py | 16 ++++++++++++++++ + keystone/policy/__init__.py | 16 ++++++++++++++++ + keystone/token/__init__.py | 16 ++++++++++++++++ + run_tests.sh | 14 ++++++++++++++ + setup.py | 3 +-- + tests/_ldap_livetest.py | 14 ++++++++++++++ + tests/default_fixtures.py | 16 ++++++++++++++++ + tests/test_backend_ldap.py | 14 ++++++++++++++ + tests/test_content_types.py | 14 ++++++++++++++ + tests/test_serializer.py | 14 ++++++++++++++ + tools/sample_data.sh | 14 ++++++++++++++ + 29 files changed, 419 insertions(+), 2 deletions(-) + +commit 48f2c7d4efb5e4691802fa5124523590b6321975 +Author: Dan Prince +Date: Fri Mar 9 12:54:06 2012 -0500 + + Add AUTHORS to the tarball. + + Fixes LP Bug #950998. + + Change-Id: Ia521a9d013ef4fb332df4dc5576cc3e5f13651bc + + MANIFEST.in | 1 + + 1 file changed, 1 insertion(+) + +commit 2f4fb46159e8b73c8aba231ec2239b41bb53183c +Author: Alan Pevec +Date: Wed Mar 7 21:31:37 2012 +0100 + + create service endpoints in sample data + + Enable creation of endpoints by setting ENABLE_ENDPOINTS environment + variable. Works with Catalog SQL backend. + + Change-Id: I9ba0ea1b3cf35720fb338e91f48fcbddc326971b + + keystone/catalog/backends/sql.py | 8 ++++++- + tools/sample_data.sh | 51 +++++++++++++++++++++++++++++++++++----- + 2 files changed, 52 insertions(+), 7 deletions(-) + +commit 303a10b9460c506455a74e890567031cf4c9cdef +Author: Dean Troyer +Date: Fri Mar 9 00:03:46 2012 -0600 + + Fix EC2 credentials crud after policy backend change + + https://review.openstack.org/4659 implemented the common policy code + but made a change to the exception thrown by wsgi.Application.assert_admin() + and Ec2Controller._is_admin() needed updating. + + Fixes bug 950557 + + Change-Id: I0e27aeeabd1be5a6012e34aa71efdfc2f2d5a726 + + keystone/contrib/ec2/core.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0a124fa6a114ba357f6aec9ba4da5eb503483a95 +Merge: a2f2274 524cbd5 +Author: Jenkins +Date: Thu Mar 8 22:29:04 2012 +0000 + + Merge "add more default catalog templates" + +commit a2f2274c69df2ca5b040a69173f3eb7eb030c561 +Author: termie +Date: Tue Feb 28 16:50:48 2012 -0800 + + port common policy code to keystone + + keystone.common.policy is copied from nova + + leave simple backend in as a shim until devstack stops referencing it + + Change-Id: Ibd579cfeb99465706d525b6565818a2d8f5f3b7c + + etc/keystone.conf | 2 +- + etc/policy.json | 3 + + keystone/common/policy.py | 207 +++++++++++++++++++++++++++++++++++++ + keystone/common/utils.py | 43 ++++++++ + keystone/common/wsgi.py | 7 +- + keystone/policy/backends/rules.py | 104 +++++++++++++++++++ + keystone/policy/backends/simple.py | 22 +--- + keystone/policy/core.py | 10 ++ + keystone/test.py | 22 ++-- + tests/policy.json | 3 + + tests/test_policy.py | 180 ++++++++++++++++++++++++++++++++ + 11 files changed, 575 insertions(+), 28 deletions(-) + +commit e5254d48b133f3ec9798cc8eb48a03cb69ff2d97 +Merge: e422567 71aa1db +Author: Jenkins +Date: Thu Mar 8 21:38:24 2012 +0000 + + Merge "fix Nova Volume Service in sample data" + +commit e4225671cf9c5f3bac5a0f061fa90ad73a6ee673 +Author: Michael Basnight +Date: Wed Mar 7 22:32:23 2012 -0600 + + rename belongs_to to belongsTo as per the API spec. + + fixes lp#949554 + + Change-Id: Ia24dda7e9aa8e075861029dd5edeafd01c9d89c2 + + keystone/service.py | 4 ++-- + tests/test_content_types.py | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 5231d3cc022d7a894e41f03a53eadd9ec4f16220 +Merge: 5c6bccf a7472f1 +Author: Jenkins +Date: Thu Mar 8 20:26:21 2012 +0000 + + Merge "HTTP_AUTHORIZATION was used in proxy mode" + +commit 94abc7ed3e8105cf80ad60558d01fc0839adc027 +Author: Chmouel Boudjnah +Date: Fri Mar 2 11:34:16 2012 +0000 + + Make sure we have a port number before int it. + + - Remove unused auth_location in s3_token along the way. + - Fixes bug 944720. + + Change-Id: Ib6e48511d09798868c5ca3fa00472525bc9f8823 + + keystone/middleware/auth_token.py | 3 +-- + keystone/middleware/s3_token.py | 9 +-------- + 2 files changed, 2 insertions(+), 10 deletions(-) + +commit 5c6bccf1c57b06a19845c696c19274ae9f080104 +Author: Michael Basnight +Date: Wed Mar 7 22:32:23 2012 -0600 + + fixes lp#949648 change belongsTo validate to name + + Change-Id: I3d36290ad95a0440c006e2daff5b831be62957ae + + keystone/service.py | 2 +- + tests/test_content_types.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 4e4f793e0becb19d77cf137587adb9944a15f5f8 +Merge: 161c658 5c7f3cf +Author: Jenkins +Date: Thu Mar 8 04:00:28 2012 +0000 + + Merge "Set default identity driver to sql (bug 934332)" + +commit 161c6587af3908a1e6f23c398bc2221395e4466c +Merge: 07985e4 989d62f +Author: Jenkins +Date: Thu Mar 8 03:54:52 2012 +0000 + + Merge "Improve auth_str_equal()." + +commit 07985e4349dcead9f5487910020f5dec07351e5e +Merge: d0429ea 98170a7 +Author: Jenkins +Date: Thu Mar 8 00:34:28 2012 +0000 + + Merge "fixes bug lp#948439 belongs_to and serviceCatalog behavior * removing belongs_to as a kwarg and getting from the context * adding a serviceCatalog for belongs_to calls to tokens * adding test to validate belongs_to behavior in tokens" + +commit a7472f139d7f1c4b40906e66302db720efdb19a7 +Author: Jesse Andrews +Date: Wed Mar 7 16:00:45 2012 -0800 + + HTTP_AUTHORIZATION was used in proxy mode + + Change-Id: I72eae79bd1991321eac224777fb186c5022f2c12 + + keystone/middleware/auth_token.py | 6 ------ + 1 file changed, 6 deletions(-) + +commit 71aa1db60ff4f83599819f1d86aea411bfc9f4ae +Author: Alan Pevec +Date: Wed Mar 7 13:52:36 2012 +0100 + + fix Nova Volume Service in sample data + + Change-Id: Ic6bb8ddea1ab894076d1580f5dbbe535aa668a8a + + tools/sample_data.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 98170a73dd28cebf9737c012d03554ffce5fd1f5 +Author: Michael Basnight +Date: Tue Mar 6 21:36:01 2012 -0600 + + fixes bug lp#948439 belongs_to and serviceCatalog behavior + * removing belongs_to as a kwarg and getting from the context + * adding a serviceCatalog for belongs_to calls to tokens + * adding test to validate belongs_to behavior in tokens + + Change-Id: If6f6a7007a6830c57a5ac71aef0090e57a064232 + + AUTHORS | 1 + + keystone/service.py | 22 ++++++++++++++++++---- + tests/test_content_types.py | 22 +++++++++++++++++++--- + 3 files changed, 38 insertions(+), 7 deletions(-) + +commit d0429ea9b8849f99aa170cd09aef7776e2651dbf +Author: Devin Carlen +Date: Sat Mar 3 14:01:46 2012 -0800 + + Make bind host configurable + + * fixes bug 945868 + + Change-Id: Ib33dc9ad1878a9215c1a1ab10814fa7d0905cbdb + + bin/keystone-all | 6 ++++-- + etc/keystone.conf | 1 + + keystone/common/wsgi.py | 11 ++++++----- + keystone/config.py | 1 + + 4 files changed, 12 insertions(+), 7 deletions(-) + +commit fe6414c8c1f769e6cc87fc001b6c52c5fea0f160 +Merge: 358ecca ec35ea8 +Author: Jenkins +Date: Wed Mar 7 18:11:04 2012 +0000 + + Merge "Fix coverage jobs for Jenkins." + +commit 358eccac110f0ae315382043386296f27a871a73 +Merge: b68051c fd4e961 +Author: Jenkins +Date: Wed Mar 7 18:05:42 2012 +0000 + + Merge "Isolating backtraces to DEBUG (bug 947060)" + +commit 524cbd58acd0c47664e164f72f25524cb95b09f0 +Author: Alan Pevec +Date: Tue Mar 6 21:46:52 2012 +0100 + + add more default catalog templates + + Image, Volume and Ec2 services were missing + + Change-Id: I409b0b587b0019dc97bf46760e8f732aa13b88de + + etc/default_catalog.templates | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit ec35ea8b9e3b9ef3422ca8119e743de974099a68 +Author: Monty Taylor +Date: Tue Mar 6 22:11:38 2012 -0800 + + Fix coverage jobs for Jenkins. + + Change-Id: I9a97ac7b997f531d05d4a6beab7d6c16ced7016a + + tox.ini | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 989d62fe8f606cb4fecaaaf1395e1cd9c3d81d67 +Author: Russell Bryant +Date: Tue Mar 6 13:18:58 2012 -0500 + + Improve auth_str_equal(). + + This patch is to improve auth_str_equal() a bit. The whole point of + this function is to do a string comparison in constant time to help + protect against timing attacks. The original implementation had a bit + of a silly property in that it would exit early if the strings were not + of the same length. This would theoretically still allow someone to + discover the proper length of a password. + + This patch moves the length verification to the end. It also makes it + so the main loop time to run is a function of the provided password + length instead of the length of the shorter of the two strings. + + Change-Id: I6dbe076818b7e3e8a313544ebd5c5734b5a025e5 + + keystone/common/utils.py | 22 +++++++++++++--------- + keystone/contrib/ec2/core.py | 4 ++-- + tests/test_utils.py | 1 + + 3 files changed, 16 insertions(+), 11 deletions(-) + +commit 5c7f3cff8d489fefbc34dadbefea6dc9604c4a4a +Author: Dolph Mathews +Date: Fri Mar 2 11:26:29 2012 -0600 + + Set default identity driver to sql (bug 934332) + + Change-Id: Ibc5502f0feb2bcc9583ccd1aa9bf9bd94fef43ca + + etc/keystone.conf | 2 +- + tests/test_overrides.conf | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit b68051cd13cc71ebd15cd478afedf0c5d07ebd4e +Author: Dolph Mathews +Date: Fri Mar 2 10:50:57 2012 -0600 + + Renamed sqlite files (bug 944951) + + Change-Id: Iae7aa34de0bf68da9e422719605753634cc0d113 + + etc/keystone.conf | 2 +- + keystone/common/sql/util.py | 2 +- + tests/backend_sql.conf | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 6621c79b06fc2848072e59d22d1224ae3a0c593a +Merge: a18b3f2 e8fb989 +Author: Jenkins +Date: Tue Mar 6 17:07:45 2012 +0000 + + Merge "Add reseller admin capability." + +commit fd4e9616ddca4dbd0c4f0545c376167b966eae8d +Author: Dolph Mathews +Date: Mon Mar 5 16:47:58 2012 -0600 + + Isolating backtraces to DEBUG (bug 947060) + + Debug mode on: http://pastie.org/3529520 + (full backtrace to stdout) + + Debug mode off: http://pastie.org/3529526 + (Just an error message to stdout) + + Change-Id: I1d4e17cf73e7777c3cbaef7c5d7fd18a4f6e53dc + + keystone/catalog/backends/templated.py | 8 +++++++- + keystone/common/logging.py | 18 ++++++++++++++++++ + keystone/service.py | 4 ++++ + 3 files changed, 29 insertions(+), 1 deletion(-) + +commit a18b3f29c4a977977e6bf29d1edcba43d5e6005b +Merge: f8d7bbd 460c3f3 +Author: Jenkins +Date: Mon Mar 5 20:45:05 2012 +0000 + + Merge "Remove trailing whitespaces in regular file" + +commit f8d7bbd45b3e4d4fb3a77a74b1bd54f196dacda0 +Merge: fad1a38 bc34635 +Author: Jenkins +Date: Mon Mar 5 20:39:47 2012 +0000 + + Merge "LDAP get_user_by_name" + +commit fad1a388f89681a0f487ad5bb1aba2a58ea14b47 +Author: Joe Heck +Date: Fri Mar 2 16:39:10 2012 -0800 + + updating readme to point to developer setup docs + * fixes bug 945274 + + Change-Id: I6caf8da9fd0bd5647ae913efd752dd6651abcb85 + + README.rst | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit e8fb989b8b07f3209300ecba043bdf14c94d497f +Author: Chmouel Boudjnah +Date: Mon Feb 13 23:29:49 2012 +0000 + + Add reseller admin capability. + + - A user with the reseller admin role will be able to access to every + other accounts. + - Rename name groups to roles. + + Change-Id: I8e86d8280a8fcdefbd4f9386bec11afdad797167 + + keystone/middleware/swift_auth.py | 45 +++++++++++++++++++++++++-------------- + 1 file changed, 29 insertions(+), 16 deletions(-) + +commit 460c3f389185f352c36ccbe5e9f11579de334643 +Author: Hengqing Hu +Date: Sat Mar 3 13:10:06 2012 +0800 + + Remove trailing whitespaces in regular file + + Change-Id: I8d05fbb7a372bf9a813da9165cd40af71a1ae4c2 + + AUTHORS | 1 + + doc/source/index.rst | 2 +- + doc/source/man/keystone-manage.rst | 2 +- + doc/source/old/middleware.rst | 4 ++-- + doc/source/static/jquery.tweet.js | 6 +++--- + tools/sample_data.sh | 2 +- + 6 files changed, 9 insertions(+), 8 deletions(-) + +commit bc346357a2205d552e62a351a4d37b3f2398b87e +Author: Adam Young +Date: Thu Mar 1 15:46:41 2012 -0500 + + LDAP get_user_by_name + + Required by keystoneclient + + https://bugs.launchpad.net/keystone/+bug/943567 + bug 943567 + + Change-Id: I5aec63e81262ad6f3b2e5a984841d8d6bdfa8da5 + + keystone/identity/backends/ldap/core.py | 6 ++++++ + tests/_ldap_livetest.py | 3 --- + tests/test_backend_ldap.py | 3 --- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 48dc5be3d294a20a79c989f760e7d46bc1f90456 +Merge: ca97ac8 b698855 +Author: Jenkins +Date: Fri Mar 2 19:19:58 2012 +0000 + + Merge "Added missing import (bug 944905)" + +commit ca97ac85513853b50fcac73f77ceadc9cf36df7e +Merge: ea4999d dd35d2a +Author: Jenkins +Date: Fri Mar 2 19:08:55 2012 +0000 + + Merge "standardize ldap and related tests" + +commit b69885596ba03d7e307082e902e541a85ca68fe0 +Author: Dolph Mathews +Date: Fri Mar 2 09:57:53 2012 -0600 + + Added missing import (bug 944905) + + Change-Id: I0e5edbcb79b1c9124a9ca82edfe4f0a5bd93e66e + + keystone/cli.py | 1 + + 1 file changed, 1 insertion(+) + +commit ea4999d22e325ccb915a9f59d6dd5b996cfed319 +Author: Jesse Andrews +Date: Thu Mar 1 18:11:22 2012 -0800 + + add git commit date / sha1 to sphinx html docs + + Change-Id: I96124871263a489504c529bb69549d0cfa4545d5 + + doc/source/conf.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit b50f7d85091f253f47045ee1925a6a0ca52c41fc +Merge: 96cdf72 fc63c5d +Author: Jenkins +Date: Thu Mar 1 22:47:41 2012 +0000 + + Merge "Add service accounts to sample_data.sh" + +commit 96cdf7290717beb58aeec0eb2313fbc51c3ba78d +Merge: 33e6c29 845a0de +Author: Jenkins +Date: Thu Mar 1 22:43:11 2012 +0000 + + Merge "gitignore follow up for docs/ rename" + +commit 845a0de3f1443c105698dd74094ce72a10b5e57b +Author: Dolph Mathews +Date: Thu Mar 1 16:35:02 2012 -0600 + + gitignore follow up for docs/ rename + + Change-Id: I9402b47a61acbd78028ff6f74838b2f5074b9f97 + + .gitignore | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 33e6c29d0d9a29eea2f50bdc24dcf87329337e66 +Author: Jesse Andrews +Date: Tue Feb 28 21:05:17 2012 -0800 + + improve auth_token middleware + + * remove ability to run auth_token as stand-alone proxy service + * only validate a token once + * improved error handling & comments where further improvement needed + * improved admin_token logic + * resolved bug 942984 and bug 942985 + + Change-Id: I12ae25c9d8047862072b7ebea1a98722eae1f40d + + keystone/middleware/auth_token.py | 653 +++++++++++++++++++------------------- + 1 file changed, 323 insertions(+), 330 deletions(-) + +commit fc63c5ddb56693dbbc8301509c6c61b94d47e86a +Author: Dean Troyer +Date: Thu Mar 1 12:34:08 2012 -0600 + + Add service accounts to sample_data.sh + + Updated sample_data.sh to create the service accounts now required + for services (Nova/Swift/etc) to use Keystone. Swift and Quantum + are now enabled by setting ENABLE_SWIFT and/or ENABLE_QUANTUM. + + This corresponds to the auth_token middleware rewrite in + https://review.openstack.org/4675 + + Change-Id: I327c593a53f3ac06e2ed0c1543d2974728e70e03 + + tools/sample_data.sh | 68 +++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 59 insertions(+), 9 deletions(-) + +commit dd35d2afbfc7bcd41cd5c68b440f5c502d32d656 +Author: termie +Date: Thu Mar 1 11:27:06 2012 -0800 + + standardize ldap and related tests + + ldap was accidentally supplying some of its own values rather than using + the built-in fixtures, so it was providing the incorrect interface for a + couple calls. + + also adds a test for get_user_by_name (skipped for ldap) and + standardizes the kvs and ldap authenticate calls + + fix user authentication live ldap tests + Change-Id: If1ccce1fd9c84622bb89344bc5d5c59b059d03ae + + keystone/identity/backends/kvs.py | 4 +++- + keystone/identity/backends/ldap/core.py | 18 ++++-------------- + keystone/identity/backends/sql.py | 2 -- + tests/_ldap_livetest.py | 18 +++++++++--------- + tests/test_backend.py | 10 +++++++++- + tests/test_backend_ldap.py | 9 +++++---- + 6 files changed, 30 insertions(+), 31 deletions(-) + +commit f8ba5af130b7ec2d2ec8c0abcadbc27275467ab8 +Author: Monty Taylor +Date: Tue Feb 28 00:46:14 2012 -0800 + + Align with project configs. + + * docs in doc/ rather than docs/ + * write out changelog from git + * freeze requirements file + + Change-Id: If28d5414f7b2747fd6835546c45e1acfac8a3563 + + MANIFEST.in | 3 +- + doc/Makefile | 159 ++++++ + doc/keystone_compat_flows.sdx | 99 ++++ + doc/source/_templates/.placeholder | 0 + doc/source/_theme/layout.html | 86 ++++ + doc/source/_theme/theme.conf | 5 + + doc/source/api_curl_examples.rst | 442 +++++++++++++++++ + doc/source/architecture.rst | 273 +++++++++++ + doc/source/community.rst | 92 ++++ + doc/source/conf.py | 274 +++++++++++ + doc/source/configuration.rst | 536 +++++++++++++++++++++ + doc/source/configuringservices.rst | 285 +++++++++++ + doc/source/developing.rst | 172 +++++++ + doc/source/images/authComp.svg | 174 +++++++ + doc/source/images/graphs_305.svg | 41 ++ + doc/source/images/graphs_authComp.svg | 48 ++ + doc/source/images/graphs_authCompDelegate.svg | 53 ++ + doc/source/images/graphs_both.svg | 36 ++ + .../images/graphs_delegate_forbiden_basic.svg | 53 ++ + .../images/graphs_delegate_forbiden_proxy.svg | 52 ++ + doc/source/images/graphs_delegate_reject_basic.svg | 55 +++ + doc/source/images/graphs_delegate_reject_oauth.svg | 56 +++ + .../images/graphs_delegate_unimplemented.svg | 53 ++ + doc/source/images/graphs_mapper.svg | 73 +++ + doc/source/images/graphs_proxyAuth.svg | 51 ++ + doc/source/images/images_layouts.svg | 200 ++++++++ + doc/source/index.rst | 80 +++ + doc/source/man/keystone-all.rst | 83 ++++ + doc/source/man/keystone-manage.rst | 97 ++++ + doc/source/middleware_architecture.rst | 529 ++++++++++++++++++++ + doc/source/nova-api-paste.rst | 143 ++++++ + doc/source/old/backends.rst | 188 ++++++++ + doc/source/old/controllingservers.rst | 288 +++++++++++ + doc/source/old/endpoints.rst | 430 +++++++++++++++++ + doc/source/old/extensions.rst | 183 +++++++ + doc/source/old/middleware.rst | 169 +++++++ + doc/source/old/migration.rst | 126 +++++ + doc/source/old/releases.rst | 36 ++ + doc/source/old/services.rst | 92 ++++ + doc/source/old/ssl.rst | 118 +++++ + doc/source/setup.rst | 171 +++++++ + doc/source/static/basic.css | 416 ++++++++++++++++ + doc/source/static/default.css | 230 +++++++++ + doc/source/static/jquery.tweet.js | 154 ++++++ + doc/source/static/tweaks.css | 65 +++ + docs/Makefile | 159 ------ + docs/keystone_compat_flows.sdx | 99 ---- + docs/source/_templates/.placeholder | 0 + docs/source/_theme/layout.html | 86 ---- + docs/source/_theme/theme.conf | 5 - + docs/source/api_curl_examples.rst | 442 ----------------- + docs/source/architecture.rst | 273 ----------- + docs/source/community.rst | 92 ---- + docs/source/conf.py | 274 ----------- + docs/source/configuration.rst | 536 --------------------- + docs/source/configuringservices.rst | 285 ----------- + docs/source/developing.rst | 172 ------- + docs/source/images/authComp.svg | 174 ------- + docs/source/images/graphs_305.svg | 41 -- + docs/source/images/graphs_authComp.svg | 48 -- + docs/source/images/graphs_authCompDelegate.svg | 53 -- + docs/source/images/graphs_both.svg | 36 -- + .../images/graphs_delegate_forbiden_basic.svg | 53 -- + .../images/graphs_delegate_forbiden_proxy.svg | 52 -- + .../source/images/graphs_delegate_reject_basic.svg | 55 --- + .../source/images/graphs_delegate_reject_oauth.svg | 56 --- + .../images/graphs_delegate_unimplemented.svg | 53 -- + docs/source/images/graphs_mapper.svg | 73 --- + docs/source/images/graphs_proxyAuth.svg | 51 -- + docs/source/images/images_layouts.svg | 200 -------- + docs/source/index.rst | 80 --- + docs/source/man/keystone-all.rst | 83 ---- + docs/source/man/keystone-manage.rst | 97 ---- + docs/source/middleware_architecture.rst | 529 -------------------- + docs/source/nova-api-paste.rst | 143 ------ + docs/source/old/backends.rst | 188 -------- + docs/source/old/controllingservers.rst | 288 ----------- + docs/source/old/endpoints.rst | 430 ----------------- + docs/source/old/extensions.rst | 183 ------- + docs/source/old/middleware.rst | 169 ------- + docs/source/old/migration.rst | 126 ----- + docs/source/old/releases.rst | 36 -- + docs/source/old/services.rst | 92 ---- + docs/source/old/ssl.rst | 118 ----- + docs/source/setup.rst | 171 ------- + docs/source/static/basic.css | 416 ---------------- + docs/source/static/default.css | 230 --------- + docs/source/static/jquery.tweet.js | 154 ------ + docs/source/static/tweaks.css | 65 --- + keystone/openstack/common/cfg.py | 1 - + keystone/openstack/common/setup.py | 127 +++++ + openstack-common.conf | 2 +- + setup.cfg | 21 + + setup.py | 59 ++- + 94 files changed, 7174 insertions(+), 6971 deletions(-) + +commit a6105f70c4007dab9a7180c27e5c379999f56cec +Author: Darren Birkett +Date: Thu Mar 1 16:30:14 2012 +0000 + + Fixes doc typo s/SERVIVE/SERVICE/ + + Fixes bug 944115 + + Change-Id: I3d896d3384fc9bc69856a3c5e53b62f1a875e82f + + AUTHORS | 1 + + docs/source/configuration.rst | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 0d677ba2992c4a142622aed8b0f65c63bdbf24ac +Merge: 8d37f19 1c24191 +Author: Jenkins +Date: Wed Feb 29 18:29:02 2012 +0000 + + Merge "Use constant time string comparisons for auth." + +commit 8d37f192d482ea27ee7987b0bbf5b30e6dd602a8 +Merge: 95413dc cfb996d +Author: Jenkins +Date: Wed Feb 29 16:31:33 2012 +0000 + + Merge "Align tox jobs with project standards." + +commit 1c2419114702865fcec97ea957dc1086f29893bd +Author: Russell Bryant +Date: Tue Feb 28 11:42:19 2012 -0500 + + Use constant time string comparisons for auth. + + Fix bug 942644. + + Use constant time string comparisons when doing authentication to help + guard against timing attacks. + + Change-Id: I5fa5c8f07e57201e129903f71b3dea19071cac5e + + AUTHORS | 1 + + keystone/common/utils.py | 20 ++++++++++++++++++++ + keystone/contrib/ec2/core.py | 4 ++-- + keystone/contrib/s3/core.py | 3 ++- + tests/test_utils.py | 5 +++++ + 5 files changed, 30 insertions(+), 3 deletions(-) + +commit 95413dcce49e6b7747f2b91627e6dd2df1053b89 +Merge: 9b522d7 1c5f3e2 +Author: Jenkins +Date: Wed Feb 29 03:29:28 2012 +0000 + + Merge "GET /v2.0 (bug 930321)" + +commit 9b522d7ee8366faf140a93bfcba6639a56030fb0 +Merge: 7c2ad0a a7c8e2a +Author: Jenkins +Date: Wed Feb 29 03:21:02 2012 +0000 + + Merge "Provide request to Middleware.process_response()" + +commit 7c2ad0a5833f293e384ce2ee4d519dd37ceb1a34 +Merge: 49586bd 834b931 +Author: Jenkins +Date: Wed Feb 29 02:47:14 2012 +0000 + + Merge "Unpythonic code in redux in auth_token.py" + +commit 834b931cba15e7ded27555c0f9c1ea0e2eb99f56 +Author: Zhongyue Luo +Date: Wed Feb 22 13:41:13 2012 +0800 + + Unpythonic code in redux in auth_token.py + + Fixed bug #932578 + + Fixes code which are not pythonic and not pep8 standard. + + Change-Id: Idd8ba4a75ad0a854a60238aec2d8d32ff2ee9c53 + + keystone/middleware/auth_token.py | 196 ++++++++++++++++++++++---------------- + 1 file changed, 113 insertions(+), 83 deletions(-) + +commit 49586bdfc648ba2686d13ecf3c82064c2534975f +Author: termie +Date: Tue Feb 28 17:53:08 2012 -0800 + + fix pep8 + + First off, I don't know how this got in as it is an obvious pep8 + violation. + + Secondly, it is your job as reviewers to catch this sort of stuff, + obviously this was incorrect. -shakes fingers at you- + + Change-Id: I41d4bf6a18721338240c14e63c8230f3827f51f4 + + keystone/identity/backends/ldap/core.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1c5f3e256fc730675966d597213bed488cb77598 +Author: Dolph Mathews +Date: Tue Feb 28 17:00:26 2012 -0600 + + GET /v2.0 (bug 930321) + + Change-Id: Ide2a6073a0a54e017d1fcb8d9065ec6f348e07cd + + keystone/service.py | 90 ++++++++++++++++++++++++++++----------------- + tests/test_content_types.py | 84 ++++++++++++++++++++++++------------------ + 2 files changed, 106 insertions(+), 68 deletions(-) + +commit 83df2100b6af847cc9a11782e03c788783ae7955 +Author: Adam Young +Date: Tue Feb 28 12:49:58 2012 -0500 + + LDAP member defaults + + sets the default attributes required for Tenants as well as + other classes that will use the groupOfNames object class in the future + + Change-Id: I77d0e1bdb46e64105d12e0565dd1112d8e6c3f17 + + keystone/common/ldap/core.py | 4 ++-- + keystone/identity/backends/ldap/core.py | 4 +--- + 2 files changed, 3 insertions(+), 5 deletions(-) + +commit 089f53a6317543660f600f3ec6b819b8d7b7f9a7 +Author: Dan Prince +Date: Tue Feb 28 11:56:24 2012 -0500 + + Handle KeyError in _get_admin_auth_token. + + Updates the _get_admin_auth_token so that it more gracefully + handles KeyError's. + Also adds a conn.close to the _get_admin_auth_token method. + + Fixes LP Bug #942247. + + Change-Id: I2826f1b02bc7fd46c02ab3d15d88f76b9a8457f0 + + keystone/middleware/auth_token.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit cfb996d90a629abfdd48e05431cd4ee2b175a8a9 +Author: Monty Taylor +Date: Tue Feb 28 00:46:14 2012 -0800 + + Align tox jobs with project standards. + + Change-Id: I215773d0d1b2f5763efcf96b3b84a291df856ad0 + + tox.ini | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 5816542c0edc35f66fe05e66f2b9621200292c1f +Author: Joe Heck +Date: Mon Feb 27 17:46:43 2012 -0800 + + renaming pip-requires-test to test-requires + + * (per request from jeblair) + * version of python-ldap match between + test and requires + * pinned to 2.3.13 to let tests work in macosx + * separating dependencies between deps and test + * removed python-keystoneclient from install_requires + for now. (there is no python-keystoneclient in PyPI) + Real solution coming. + + Change-Id: I89e50d6747fb57dee7badb17bc1231d3619e3ef7 + + docs/source/setup.rst | 2 +- + setup.py | 2 +- + tools/install_venv.py | 3 ++- + tools/pip-requires | 24 +----------------------- + tools/pip-requires-test | 28 ---------------------------- + tools/test-requires | 24 ++++++++++++++++++++++++ + tox.ini | 5 +++-- + 7 files changed, 32 insertions(+), 56 deletions(-) + +commit a7c8e2ab8186a01009a163e4c714ebec95e3cc4e +Author: Dolph Mathews +Date: Tue Feb 28 00:08:07 2012 -0600 + + Provide request to Middleware.process_response() + + It appears that no middleware has taken advantage of + the builtin process_response(response) convention, + because a reference to the original request is + typically necessary to build an appropriate response. + + Change-Id: If032261974eb1d756abdbd5b18892091978e2a07 + + keystone/common/wsgi.py | 14 +++++++------- + keystone/middleware/core.py | 7 +------ + 2 files changed, 8 insertions(+), 13 deletions(-) + +commit 9581809f88b953e361ef3451d410e568b606fcca +Author: Dolph Mathews +Date: Thu Feb 23 13:47:33 2012 -0600 + + Add Vary header (bug 928057) + + Change-Id: I0db0d64725824fb27cb1f9418203d962f82b00ab + + keystone/common/wsgi.py | 16 +++++----------- + tests/test_content_types.py | 9 ++++++++- + 2 files changed, 13 insertions(+), 12 deletions(-) + +commit e671ee726ee1c216e24c3887ced58ce70667beba +Merge: 6c60d6c 37d223e +Author: Jenkins +Date: Tue Feb 28 03:12:30 2012 +0000 + + Merge "Implement a Catalog SQL backend" + +commit 37d223ecdb392f3b46079418a7b82398afca2128 +Author: Adam Gandelman +Date: Thu Feb 23 13:16:00 2012 -0800 + + Implement a Catalog SQL backend + + This adds a catalog SQL backend. Makes use of 3 tables: endpoint, + service and service_endpoint_association. Services and endpoints are + joined via the association table. New sqlalchemy models have been defined + in keystone/catalog/backends/sql.py and are imported during the initial + migration (v001). + + Configuring the service catalog is possible with changes to + python-keystoneclient. I will be proposing a merge for that and I'll + update this commit msg with a link to its review. With those client + changes, admins can now create and delete endpoints that are associated + with existing services. Existing service commands on the client-side work + as expected against this new backend. This driver's get_catalog method + properly translates existing services, endpoints and relatoins into something + consumable by keystone non-admin users / clients. + + Update: Some cleanup as per bcwaldon's suggestions + + Update: Match functionality of existing catalog backend by returning + IDs instead of sql objects for list_services() and list_endpoints() + + Update: pep8 fixes + + Update (1/2): Remove legacy OS-KSADM stuff + + Update (2/2): Remove ServiceEndpointAssociation table/model + in favor of a FK, endpoint.service_id -> service.id + + Resolves bug 928053 + + Change-Id: Icc11889920744c36255f06356744cb247d79f4aa + + keystone/catalog/backends/sql.py | 167 +++++++++++++++++++++ + keystone/catalog/core.py | 39 +++++ + .../versions/001_add_initial_tables.py | 1 + + keystone/contrib/admin_crud/core.py | 15 ++ + keystone/identity/core.py | 3 - + 5 files changed, 222 insertions(+), 3 deletions(-) + +commit 6c60d6c783656f35657b6cb462d93390fc689ac0 +Author: Dan Prince +Date: Wed Feb 22 22:28:42 2012 -0500 + + Set tenantName to 'admin' in get_admin_auth_token. + + Sets the tenantName to 'admin' in get_admin_auth_token. This + is required because user-only roles are currently not supported. + Give that wsgi is hard coded to check for 'role:admin' this + seems to be a reasonable thing to do. In the future it would be nice + to add a custom admin_role setting in the config file so the + role wouldn't be hard coded to 'admin'. + + Also removes unused version of get_admin_auth_token. + + Fixes LP Bug #939015. + + Change-Id: I545b458e31c8a44a5a69cad1e875f0fe02956246 + + docs/source/configuringservices.rst | 24 ++++++++++++++++++++++++ + keystone/middleware/auth_token.py | 24 +++--------------------- + 2 files changed, 27 insertions(+), 21 deletions(-) + +commit 63437e9dca3b969c917fb138716aa4d3e5fabafa +Author: Adam Young +Date: Mon Feb 6 21:21:46 2012 -0500 + + LDAP Identity backend + + Bug 933852 + + Merged over the code from the legacy keystone implementation, updated + style and streamlined the API a bit. + + * Unit tests can be run against a live OpenLDAP server + * Password hashing done via passlib. Only does salted sha1, which is what simple_bind requires, but is not secure. + * Added pip dependencies + + Change-Id: I5296d94f6b7d0a7c7dbc887cdae872171e34bb5f + + AUTHORS | 1 + + etc/keystone.conf | 10 + + keystone/common/ldap/__init__.py | 1 + + keystone/common/ldap/core.py | 317 +++++++++++ + keystone/common/ldap/fakeldap.py | 313 +++++++++++ + keystone/common/utils.py | 15 + + keystone/config.py | 23 + + keystone/identity/backends/ldap/__init__.py | 1 + + keystone/identity/backends/ldap/core.py | 791 ++++++++++++++++++++++++++++ + keystone/identity/core.py | 6 +- + keystone/identity/models.py | 77 +++ + keystone/test.py | 5 + + tests/_ldap_livetest.py | 61 +++ + tests/backend_ldap.conf | 9 + + tests/backend_liveldap.conf | 9 + + tests/default_fixtures.py | 1 + + tests/test_backend.py | 39 +- + tests/test_backend_ldap.py | 35 ++ + tests/test_keystoneclient.py | 2 +- + tools/pip-requires | 1 + + tools/pip-requires-test | 4 + + 21 files changed, 1718 insertions(+), 3 deletions(-) + +commit 679fd363d8a44098cdf4fa2044b068e51016c02d +Merge: 2812940 33a13b7 +Author: Jenkins +Date: Mon Feb 27 23:00:47 2012 +0000 + + Merge "Add HEAD /tokens/{token_id} (bug 933587)" + +commit 28129406ba2bbec2dc60b9e8733c4270d7e5d15b +Merge: 9075d25 071f6b3 +Author: Jenkins +Date: Mon Feb 27 21:22:51 2012 +0000 + + Merge "Implements extension discovery (bug 928054)" + +commit 9075d25071bf77184d18cb8d83f9701e431ef717 +Merge: 746cd92 cdac09e +Author: Jenkins +Date: Mon Feb 27 21:18:24 2012 +0000 + + Merge "Support unicode in the keystone database." + +commit 071f6b367b55782bd048e645dab96402eb504114 +Author: Dolph Mathews +Date: Thu Feb 23 15:38:18 2012 -0600 + + Implements extension discovery (bug 928054) + + Public & admin specific variations of: + - GET /extensions + - GET /extensions/{extension_alias} + + Change-Id: I9f8424667f1a8a10d2a7301d42d60800ba207f3e + + keystone/service.py | 58 +++++++++++++++++++++++++++++--- + tests/test_content_types.py | 81 ++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 131 insertions(+), 8 deletions(-) + +commit 746cd92781eacc77d73c6e8cb088aa4d80d99862 +Merge: 82a3c7e 2124890 +Author: Jenkins +Date: Mon Feb 27 19:51:48 2012 +0000 + + Merge "XML de/serialization (bug 928058)" + +commit 82a3c7eff8281a7c8ff3e7434a6d50aacfd771fc +Merge: e23ecc6 c2142af +Author: Jenkins +Date: Mon Feb 27 19:15:17 2012 +0000 + + Merge "fleshing out architecture docs" + +commit cdac09e19f362798c27b9588601f08b642173978 +Author: Andrew Bogott +Date: Sun Feb 26 21:38:44 2012 -0600 + + Support unicode in the keystone database. + + Fixes the horizon instance of bug 931667. + + Change-Id: Ia8d76e948d6f6ddfd13723b549674d5d857cc207 + + AUTHORS | 1 + + keystone/common/sql/core.py | 1 + + 2 files changed, 2 insertions(+) + +commit 33a13b7dcd82ee926a707bf1cc7f87ae2b90c98e +Author: Dolph Mathews +Date: Tue Feb 21 16:38:40 2012 -0600 + + Add HEAD /tokens/{token_id} (bug 933587) + + Also addresses bug 928045 by returning 204 No Content + for null content bodies. + + Change-Id: Icd4b8b5f6c29c074cb014c301fe86cd917f6663e + + keystone/common/wsgi.py | 9 ++++++--- + keystone/service.py | 35 +++++++++++++++++++++++++++++++---- + tests/test_content_types.py | 5 ++--- + 3 files changed, 39 insertions(+), 10 deletions(-) + +commit 212489084fac8de20718bfccad2f77cbfa7ea3e2 +Author: Dolph Mathews +Date: Fri Feb 10 14:52:13 2012 -0600 + + XML de/serialization (bug 928058) + + Middleware rewrites incoming XML requests as JSON, and outgoing JSON as + XML, per Accept and Content-Type headers. + + Tests assert that core API methods support WADL/XSD specs, and cover + JSON content as well. + + Change-Id: I6897971dd745766cbc472fd6e5346b1b34d933b0 + + etc/keystone.conf | 11 +- + keystone/common/serializer.py | 197 ++++++++++++++ + keystone/middleware/core.py | 31 ++- + keystone/service.py | 4 + + tests/test_content_types.py | 578 ++++++++++++++++++++++++++++++++++++++++++ + tests/test_middleware.py | 58 +++++ + tests/test_serializer.py | 155 +++++++++++ + tests/test_versions.py | 126 +++++---- + tools/pip-requires | 1 + + tools/pip-requires-test | 1 + + 10 files changed, 1105 insertions(+), 57 deletions(-) + +commit c2142af65dfd36553bacdaf3190ad8541d77cedb +Author: Joe Heck +Date: Sat Feb 25 18:11:28 2012 -0800 + + fleshing out architecture docs + + Change-Id: I60e59ad7a8140985eddb86ece09e7d45bb3dbfa0 + + docs/source/architecture.rst | 124 +++++++++++++++++++++++++++++++++---------- + docs/source/community.rst | 51 +++++++++++------- + docs/source/developing.rst | 62 +++++++++++++++------- + 3 files changed, 171 insertions(+), 66 deletions(-) + +commit e23ecc6893db337671f75b6cc069d96a183940e8 +Author: Dan Prince +Date: Sat Feb 25 15:56:38 2012 -0500 + + Update auth_token middleware so it sets X_USER_ID. + + Fixes LP Bug #941101. + + Change-Id: I67b68f6004456eb76003fdcd2ec3fb4c9b9f3bfb + + keystone/middleware/auth_token.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit b4d35d621908557ac3fba70cbacac7500f79a352 +Author: Gabriel Hurley +Date: Thu Feb 23 14:21:10 2012 -0800 + + Adds AUTHORS file generated from git log (and de-duplicated). + + Also adds a unit test (copied from Glance) to check that the + AUTHORS file is up-to-date. + + Change-Id: I365d74ecef49f8e10a5edd4b7c768bb88c697a17 + + AUTHORS | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ + tests/test_authors.py | 63 +++++++++++++++++++++++++++++++ + 2 files changed, 164 insertions(+) + +commit 99575a0465bb40d293623c6ec24c4c50c742ca3a +Merge: e573d31 c4411c1 +Author: Jenkins +Date: Sat Feb 25 04:52:19 2012 +0000 + + Merge "Fix case of admin role in middleware." + +commit e573d317546adcbce53ccc3a90d833d0ed7b10e9 +Merge: 12ef30e 036b990 +Author: Jenkins +Date: Sat Feb 25 04:34:58 2012 +0000 + + Merge "Backslash continuations (Keystone)" + +commit 12ef30e8c260449adb0458e533b5833501108c26 +Merge: 8fe6826 09a64dd +Author: Jenkins +Date: Sat Feb 25 04:29:51 2012 +0000 + + Merge "Create tools/sample_data.sh" + +commit 8fe682678f494e468de9b19c68c4897fc790f575 +Merge: 7530b8e 1395bb4 +Author: Jenkins +Date: Sat Feb 25 04:24:52 2012 +0000 + + Merge "Fix MANIFEST.in to include missing files" + +commit 7530b8ef32d4d151d67b7b4b35521c99d85c7fb7 +Author: Dan Prince +Date: Fri Feb 24 16:39:12 2012 -0500 + + The default nova compute port is 8774. + + Fixes LP Bug #940637. + + Change-Id: I58523892ef862254c1ebe1320a5bd6386455c281 + + etc/keystone.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c4411c1e17bb3d6539cf61d49cd5a4a28d4e7c16 +Author: Dan Prince +Date: Fri Feb 24 13:31:38 2012 -0500 + + Fix case of admin role in middleware. + + Fixes LP Bug #940521. + + Change-Id: I1d31c805651cb633dee7efc708cd2c86bb32c3b2 + + keystone/middleware/auth_token.py | 2 +- + keystone/middleware/glance_auth_token.py | 2 +- + keystone/middleware/nova_auth_token.py | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 644811203fa98d4066bf738df13019c74540effb +Merge: 8465ef1 510061e +Author: Jenkins +Date: Fri Feb 24 18:16:44 2012 +0000 + + Merge "Removing broken & redundant code (bug 933555)" + +commit 1395bb41359b916714b74abc41f4b5ae8a2dc6d8 +Author: Thierry Carrez +Date: Fri Feb 24 15:47:13 2012 +0100 + + Fix MANIFEST.in to include missing files + + Fix MANIFEST.in to include missing files in generated tarballs. + Fixes bug 940357. + + Change-Id: Ic31e7db4ae960e23ebd8c34a3510208c98d400a4 + + MANIFEST.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8465ef1b547fe7c2679346a27e2cba82d3ecef53 +Author: Eoghan Glynn +Date: Fri Feb 24 14:47:44 2012 +0000 + + Remove extraneous _validate_claims() arg. + + Extraneous env argument to: + + keystone.middleware.auth_token.AuthProtocol._validate_claims() + + causes glance failure when keystone auth strategy is enabled: + + File "/opt/stack/keystone/keystone/middleware/auth_token.py", line 309, in _validate_claims + return self._validate_claims(env, claims, False) + NameError: global name '\''env'\'' is not defined + + Seen when running devstack on Fedora16. + + Change-Id: Ia04c14a709e3b332002dc6cddcda56e247821fa5 + + keystone/middleware/auth_token.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 09a64dd862463fe116c4ddb8aee538e4bc7f56e0 +Author: Dean Troyer +Date: Thu Feb 23 22:29:12 2012 -0600 + + Create tools/sample_data.sh + + Based on devstack's files/keystone_data.sh, sample_data.sh creates + the same set of tenants/users/roles/etc. It can eventually be used + by devstack as the bootstrap script. + + Fixes bug 934331 + + Change-Id: Ib3b514b6e4fc5c9e980e4e0c59bc44cda1b8d2b6 + + tools/sample_data.sh | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 137 insertions(+) + +commit 036b99086c170418b4fa54bc51c1c632eb420506 +Author: Zhongyue Luo +Date: Fri Feb 24 10:38:45 2012 +0800 + + Backslash continuations (Keystone) + + Fixes bug #940010 + + Didn't fix SQLAlchemy queries. + + Module keystone/middleware/auth_token.py + is fixed in https://review.openstack.org/#change,4385 + + Change-Id: Idaad992b5ef493407a23f0f77110ed2ab3f2452e + + bin/keystone-all | 9 +++++---- + keystone/common/bufferedhttp.py | 4 ++-- + keystone/common/wsgi.py | 2 +- + keystone/service.py | 10 +++++----- + run_tests.py | 6 +++--- + 5 files changed, 16 insertions(+), 15 deletions(-) + +commit 17ffe7a97ee6490b9ee1fd3ecc62d0167710e40b +Merge: 81f28ef 1f119bc +Author: Jenkins +Date: Thu Feb 23 23:56:58 2012 +0000 + + Merge changes Ib8e5dc50,I9db09c77,Ib89efdec + + * changes: + Use cfg's new print_help() method + Remove cfg dict mixin + Update cfg from openstack-common + +commit 81f28efee212e6a2629f2e548053e7dd989b2a2e +Merge: baedc45 e6a23e3 +Author: Jenkins +Date: Thu Feb 23 23:51:37 2012 +0000 + + Merge "fix the style guide to match the code" + +commit baedc454b128292f19f741969101245640ca3cdc +Author: Dan Prince +Date: Thu Feb 23 14:42:51 2012 -0500 + + Correct config name for max_pool_size. + + Change-Id: Ie00f676019b70202745cb3a02779cca0efbfbda9 + + keystone/config.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1f119bc91f178df43f1cec6df3247f6f6a4e0c36 +Author: Mark McLoughlin +Date: Wed Feb 22 21:04:11 2012 +0000 + + Use cfg's new print_help() method + + Change-Id: Ib8e5dc50bc9773d13b8d9c741676477aa0f001e0 + + keystone/config.py | 3 --- + keystone/openstack/common/cfg.py | 4 ++++ + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit d679baf883a74e0fae25e5657f4d7d58d359a05b +Author: Mark McLoughlin +Date: Wed Feb 22 21:04:11 2012 +0000 + + Move cfg to keystone.openstack.common + + Just code movement here, no changes. + + This is so we can use openstack-common's update script to keep it in + sync. See: + + http://wiki.openstack.org/CommonLibrary#Incubation + + Change-Id: Ieb8ce50071a85987152b995fa6773433b7671c48 + + keystone/common/cfg.py | 1131 --------------------------------- + keystone/config.py | 2 +- + keystone/openstack/__init__.py | 0 + keystone/openstack/common/__init__.py | 0 + keystone/openstack/common/cfg.py | 1131 +++++++++++++++++++++++++++++++++ + 5 files changed, 1132 insertions(+), 1132 deletions(-) + +commit 762b461720fced80435de818f9f843ced5059035 +Author: Mark McLoughlin +Date: Wed Feb 22 21:04:11 2012 +0000 + + Remove cfg dict mixin + + cfg now implements the collections.Mapping ABC + + Use set_override() in tests rather than directly setting the attribute + since the cfg iterator doesn't iterate the attributes. + + Change-Id: I9db09c778b0fed5e19e836ce4e6006f790e2fca0 + + keystone/config.py | 10 ---------- + keystone/test.py | 17 ++++++++++++++--- + 2 files changed, 14 insertions(+), 13 deletions(-) + +commit e5a3e09d0263c1a434c0bb76c95e6ddd294b5cae +Author: Mark McLoughlin +Date: Wed Feb 22 21:04:11 2012 +0000 + + Update cfg from openstack-common + + Use openstack-common's update script to sync it to the latest. + + Add some dire warnings that changes should be made in the upstream + copy of the code first. + + Change-Id: Ib89efdecc7f8a00f2a7fc2824b519f211d3d784c + + HACKING.rst | 15 +++ + keystone/openstack/common/README | 13 +++ + keystone/openstack/common/cfg.py | 207 +++++++++++++++++++++++++-------------- + openstack-common.conf | 7 ++ + 4 files changed, 170 insertions(+), 72 deletions(-) + +commit 45d6aa1870bd81e451cba46c6b2c0c3801f68d6e +Author: Shevek +Date: Wed Feb 22 16:30:32 2012 -0800 + + Fix copyright dates and remove duplicate Apache licenses. + + Change-Id: I8c4b3bace0d22798d0889342662e99b24887ca85 + + docs/source/api_curl_examples.rst | 2 +- + docs/source/architecture.rst | 2 +- + docs/source/community.rst | 2 +- + docs/source/configuration.rst | 2 +- + docs/source/configuringservices.rst | 2 +- + docs/source/developing.rst | 2 +- + docs/source/index.rst | 2 +- + docs/source/middleware_architecture.rst | 2 +- + docs/source/nova-api-paste.rst | 2 +- + docs/source/old/backends.rst | 2 +- + docs/source/old/controllingservers.rst | 2 +- + docs/source/old/endpoints.rst | 2 +- + docs/source/old/extensions.rst | 2 +- + docs/source/old/middleware.rst | 2 +- + docs/source/old/services.rst | 2 +- + docs/source/old/ssl.rst | 2 +- + docs/source/setup.rst | 2 +- + keystone/common/bufferedhttp.py | 2 +- + keystone/common/cfg.py | 1 + + keystone/common/sql/migration.py | 1 + + keystone/common/utils.py | 1 + + keystone/common/wsgi.py | 1 + + keystone/middleware/auth_token.py | 16 +------------ + keystone/middleware/ec2_token.py | 18 +++------------ + keystone/middleware/glance_auth_token.py | 34 ++++++++-------------------- + keystone/middleware/nova_auth_token.py | 17 +------------- + keystone/middleware/nova_keystone_context.py | 32 ++++++++------------------ + keystone/middleware/s3_token.py | 21 ++++------------- + run_tests.py | 1 + + tests/test_versions.py | 32 ++++++++------------------ + tools/install_venv.py | 22 +++++++++--------- + 31 files changed, 72 insertions(+), 161 deletions(-) + +commit d671b2f1ed1c8a7793f3d7cb52d6679b97cd160e +Merge: c64aeb7 13dfd21 +Author: Jenkins +Date: Thu Feb 23 00:28:29 2012 +0000 + + Merge "Fix thinko in keystone-all sys.path hack" + +commit c64aeb725225388eccc6a636d50ee626f35cc928 +Merge: 83c7933 de3ad7a +Author: Jenkins +Date: Thu Feb 23 00:23:27 2012 +0000 + + Merge "Add migration path for Nova auth" + +commit 83c793332c5cc27e706d7ad40714cfb52bf53a7a +Author: termie +Date: Wed Feb 22 13:43:00 2012 -0800 + + some additional style bits + + Change-Id: I6e785acd5d1f397786a122088f3e59822854dca9 + + HACKING.rst | 1 + + 1 file changed, 1 insertion(+) + +commit b7341619331303eec42e4f39b8e42f4acc74a5f1 +Merge: 4b7f391 015dd3d +Author: Jenkins +Date: Wed Feb 22 23:44:08 2012 +0000 + + Merge "Return HTTP 401 bad user/password is specified." + +commit 4b7f3915e79a279f00ebb868d767bc440276ca09 +Merge: 3996c23 1746ea6 +Author: Jenkins +Date: Wed Feb 22 23:32:12 2012 +0000 + + Merge "Ignore sqlite.db files" + +commit 3996c231843041fcd3bd517611dafa7b7edfbdc9 +Merge: 7ec5f05 08a3060 +Author: Jenkins +Date: Wed Feb 22 23:14:08 2012 +0000 + + Merge "Re-adds admin_pass/user to auth_tok middleware." + +commit 7ec5f05e4ec7c456e4d08a98f13cca510d1e9ef6 +Merge: af6656f fb4f379 +Author: Jenkins +Date: Wed Feb 22 23:09:30 2012 +0000 + + Merge "Update docs for Swift and S3 middlewares." + +commit de3ad7abacb4f5d8f37aabaa53aad79d7b3680e3 +Author: Brian Waldon +Date: Sat Feb 18 23:24:44 2012 -0800 + + Add migration path for Nova auth + + * Adds keystone-manage command import_nova_auth + * Document migration path in docs/source/configuration.rst + + Change-Id: I35bc20686bfed3f13162e278cf9a1713c78fad1e + + docs/source/configuration.rst | 50 ++++++++++++++- + keystone/cli.py | 18 ++++++ + keystone/common/sql/nova.py | 108 +++++++++++++++++++++++++++++++ + tests/test_migrate_nova_auth.py | 136 ++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 311 insertions(+), 1 deletion(-) + +commit af6656fc4cdee35bd7dc03dcf5ab814727144207 +Merge: 9742dc0 43c8bbc +Author: Jenkins +Date: Wed Feb 22 22:46:03 2012 +0000 + + Merge "Removing unused imports from keystone.cli" + +commit e6a23e394a24b4da2b25172c35fc29ba24735e81 +Author: termie +Date: Wed Feb 22 14:43:49 2012 -0800 + + fix the style guide to match the code + + Change-Id: Ia06e64d6184393323162cdbb39239ab49e8749a0 + + HACKING.rst | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 08a3060bade8f14c2f81d4d502d27f097b016b93 +Author: Dan Prince +Date: Tue Feb 21 12:19:46 2012 -0500 + + Re-adds admin_pass/user to auth_tok middleware. + + Re-adds support for 'admin_user' and 'admin_password' options to + the auth_token middleware. This was removed in KSL. + + Fixes LP bug #939015. + Change-Id: Ia6eb8ccf65777175964c1c1d2e58b8de54062d67 + + keystone/middleware/auth_token.py | 46 +++++++++++++++++++++++++++++++++------ + 1 file changed, 39 insertions(+), 7 deletions(-) + +commit 13dfd219c53edad405008a2a149c14ad6f780800 +Author: Mark McLoughlin +Date: Wed Feb 22 20:56:51 2012 +0000 + + Fix thinko in keystone-all sys.path hack + + We shouldn't be looking for keystone-all/__init__.py + + Change-Id: I833342cbc3d0fff3168d31d72d1c7e8b029e32fd + + bin/keystone-all | 4 ++-- + bin/keystone-manage | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 510061e0807d17234d533a83579074f7d0a42a77 +Author: Dolph Mathews +Date: Wed Feb 22 13:46:46 2012 -0600 + + Removing broken & redundant code (bug 933555) + + Change-Id: I6618487885bcb930a28373bc86d07c537f7a1fe1 + + keystone/service.py | 13 ++----------- + tests/test_keystoneclient.py | 2 ++ + 2 files changed, 4 insertions(+), 11 deletions(-) + +commit 9742dc0673e3e54b1bbc427a170103a0caca23e7 +Merge: 77c11b2 c233b44 +Author: Jenkins +Date: Wed Feb 22 18:56:56 2012 +0000 + + Merge "cli now returns an exit status cmd is invalid." + +commit 015dd3d9d157e79ffd1e0b8859fea96fa3798987 +Author: Dan Prince +Date: Wed Feb 22 11:50:07 2012 -0500 + + Return HTTP 401 bad user/password is specified. + + Update keystone/service.py to more gracefully handle auth + failures and return an HTTP 401. + + Fixes LP Bug #938815. + + Change-Id: I44d7a9b36e6ac30f30326beb76b125dc2addc2fb + + keystone/service.py | 14 +++++++------- + tests/test_keystoneclient.py | 12 ++++++++++-- + 2 files changed, 17 insertions(+), 9 deletions(-) + +commit c233b44fbbd0570c95d7da3414cf1de1bb63939d +Author: Dan Prince +Date: Wed Feb 22 09:39:26 2012 -0500 + + cli now returns an exit status cmd is invalid. + + Update keystone-manage so that it returns an exit status when + the specified command is invalid. Also prints out usuage on error. + + Fixes LP Bug #938718. + + Change-Id: I57f1e009e7485912ed7e03c7163ae9dda27def04 + + keystone/cli.py | 3 +++ + 1 file changed, 3 insertions(+) + +commit 1746ea6491890afaed0247780e5ab0777d834674 +Author: Zhongyue Luo +Date: Wed Feb 22 13:49:42 2012 +0800 + + Ignore sqlite.db files + + Fixes bug #932729 + + legacy*.sqlite.db files should also be ignored. + + Change-Id: Ia776bc45f880e2f1ffd67963c020773a29645153 + + .gitignore | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 77c11b2ba190a5c7b7e4d7d47ea8775d58fcaf30 +Author: Gabriel Hurley +Date: Tue Feb 21 21:24:19 2012 -0800 + + Implements admin logic for tenant_list call. + + Incidentally this required refactoring the keystoneclient + tests to differentiate between calls that are explicitly + admin API calls vs. public API calls. Previously all tests + had been hitting the admin API endpoint. + + Fixed bug 933786. + + Change-Id: I50c2505aefb64636b7b64fbff045fd427715396b + + keystone/identity/backends/kvs.py | 4 +++ + keystone/identity/backends/sql.py | 6 +++- + keystone/identity/core.py | 17 +++++++++-- + tests/test_keystoneclient.py | 63 +++++++++++++++++++-------------------- + 4 files changed, 55 insertions(+), 35 deletions(-) + +commit 73f22e159622d28e781779d801c477a263dd3a3c +Author: Gabriel Hurley +Date: Tue Feb 21 21:19:01 2012 -0800 + + Implemented get_tenant_users. Fixed bug 933721. + + Change-Id: I3e5337158064e5c3ed6cde8635752685a73f081b + + keystone/contrib/admin_crud/core.py | 2 +- + keystone/identity/backends/kvs.py | 5 +++++ + keystone/identity/backends/sql.py | 8 ++++++++ + keystone/identity/core.py | 5 +++-- + tests/test_keystoneclient.py | 21 ++++++++++----------- + 5 files changed, 27 insertions(+), 14 deletions(-) + +commit 43c8bbc8bdf2fca545dfb23f83461e3a2ca0c2d1 +Author: Brian Waldon +Date: Fri Feb 17 10:29:53 2012 -0800 + + Removing unused imports from keystone.cli + + Change-Id: If626913022ed329660bf88d8f407d8ebfc4feb1c + + keystone/cli.py | 3 --- + 1 file changed, 3 deletions(-) + +commit 74ef93a63b131690575d037be28fc8cd63c0e8ab +Merge: 08f26ac 9246e04 +Author: Jenkins +Date: Wed Feb 22 01:04:37 2012 +0000 + + Merge "fixes #934459" + +commit 08f26acf3b6dfcbf4e107eb0b7432a28b6abc406 +Merge: f04ce68 faf6866 +Author: Jenkins +Date: Tue Feb 21 19:50:01 2012 +0000 + + Merge "Set include_package_data=True in setup.py." + +commit f04ce688c0edc57edb1038dfeb3ad7754fa982d7 +Merge: 1143802 460504f +Author: Jenkins +Date: Tue Feb 21 19:39:13 2012 +0000 + + Merge "Remove data_files section from setup.py." + +commit faf6866c17255cc03a26119b77d5c7e9a6a04be6 +Author: Dan Prince +Date: Tue Feb 21 12:13:42 2012 -0500 + + Set include_package_data=True in setup.py. + + Fixes issue where migrate.cfg was not getting installed. + + Also, remove the previous 'data_files' fix from setup.py as it causes files + to get copied to the wrong location on install. + + Fixes LP Bug #937265 + + Change-Id: I94e89271660baca4408df470a122e127540a4131 + + Updates. + + Change-Id: I5c4744a14719393e4dc35c5ef6a292c57a81527c + + setup.py | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 460504f274ed5c066303f41187afaa8c5b3918b8 +Author: Dan Prince +Date: Tue Feb 21 12:13:42 2012 -0500 + + Remove data_files section from setup.py. + + 'data_files' is probably not the best way to get migrate.cfg into + the tarball. Updating MANIFEST.in seems to work just fine. + + Fixes LP Bug #937265 + + Change-Id: I94e89271660baca4408df470a122e127540a4131 + + setup.py | 3 --- + 1 file changed, 3 deletions(-) + +commit 1143802037bf2fc3b7e762c5014047e70758ae79 +Author: Chuck Short +Date: Tue Feb 21 10:47:16 2012 -0500 + + Update Manifest.in + + Add missing files in keystone tarball. + + Change-Id: Idaccca930391b4cbe73ac6edac648045b6bf1327 + Signed-off-by: Chuck Short + + MANIFEST.in | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 6919b05149d42986091de5f96f429dd736e99ae9 +Merge: 2feb519 546f952 +Author: Jenkins +Date: Mon Feb 20 18:33:15 2012 +0000 + + Merge "Fix logging.config import" + +commit 2feb5199fdbeb34e478117a7d8d0baa8a84d7809 +Author: Ghe Rivero +Date: Mon Feb 20 18:32:05 2012 +0100 + + Add migrate.cfg to data_files in setup.py + + Change-Id: I9e06b7f496ce817a9a8a95135c75867d86a5ed31 + + setup.py | 3 +++ + 1 file changed, 3 insertions(+) + +commit 76d591149383f0de0459a4c8609191d55a5fa4e1 +Merge: f28ee22 892ba0f +Author: Jenkins +Date: Sun Feb 19 16:39:59 2012 +0000 + + Merge "remove pycli" + +commit f28ee221e96bae9ba8dbacf2da27a9465c4b6271 +Merge: dd382af 6672acb +Author: Jenkins +Date: Fri Feb 17 22:39:06 2012 +0000 + + Merge "Should return 300 Multiple Choice (bug 925548)" + +commit 6672acbeb9586bbc42d1e52c4377896374c750c7 +Author: Dolph Mathews +Date: Fri Feb 17 15:22:01 2012 -0600 + + Should return 300 Multiple Choice (bug 925548) + + Change-Id: Ieee2f747cf19822fadadd1e27008063e7f946e42 + + keystone/common/wsgi.py | 25 +++++++++++++++---------- + keystone/service.py | 5 +++-- + tests/test_versions.py | 2 ++ + 3 files changed, 20 insertions(+), 12 deletions(-) + +commit dd382af03bb302e91a2465e7c80ae2b148701d0f +Author: Dolph Mathews +Date: Fri Feb 17 15:18:38 2012 -0600 + + Admin version pipeline not utilized (bug 925548) + + Change-Id: Id7c527d8a65330dee1116a020568faaa3354cfa5 + + etc/keystone.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9246e0453f8e7335103d086ace22be8082a84b0e +Author: Joe Heck +Date: Fri Feb 17 13:09:08 2012 -0800 + + fixes #934459 + + Change-Id: Icbe5c3d1d00466dc018b50363d13135a87f5b46e + + tools/install_venv.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 546f952f91fab90fbb705c07d117285687bdbc5c +Author: Adam Gandelman +Date: Thu Feb 16 17:20:14 2012 -0800 + + Fix logging.config import + + import logging.config, assign it to an attribute where keystone-all + expects it. Fixes bug #933234 + + Change-Id: I0004900f5b68b86cd97d1bfe4036599ea2af1d69 + + keystone/common/logging.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8712abb6b535f0e956df41066be66e6988c4ffb5 +Author: termie +Date: Thu Feb 16 15:43:08 2012 -0800 + + backport some asserts + + Change-Id: I4f3baf5c03d2a212ecc9d2eb4375b5e9c978ffa4 + + keystone/test.py | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 892ba0fd6f6f64f99b08c93eeca96e49f88657cb +Author: termie +Date: Thu Feb 16 15:33:03 2012 -0800 + + remove pycli + + Change-Id: I3236016910479a08e2fd220ebd6793ed06d1b76b + + keystone/cli.py | 49 +++++++++++++++++++------------------------------ + tools/pip-requires | 1 - + tools/pip-requires-test | 1 - + 3 files changed, 19 insertions(+), 32 deletions(-) + +commit 1a40142bc9d2bcec315836e40a9d65cfd877eff0 +Merge: a5cf688 3093980 +Author: Jenkins +Date: Thu Feb 16 23:12:47 2012 +0000 + + Merge "remove executable bit from setup.py" + +commit a5cf688da5e37e0927fda9e324c8c57577337ebe +Merge: 02ef19a 484dc24 +Author: Jenkins +Date: Thu Feb 16 22:04:52 2012 +0000 + + Merge "Raising 'NotImplmented' results in TypeError" + +commit 02ef19a13c79e241af4830b1a5544e3244bf1e20 +Author: Gabriel Hurley +Date: Thu Feb 16 13:29:10 2012 -0800 + + Adds missing argument to add_user_to_tenant in create_user. + + Previously untested code branch was missing an argument. Adds + unit tests and fixes bug 933034. + + Change-Id: I3f404ce1c1607a681d9fbcfa532b8f9027bf037f + + keystone/identity/core.py | 2 +- + tests/test_keystoneclient.py | 7 +++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit e2384275bf1618df8eaa77ea296810a15dbc20c1 +Author: Gabriel Hurley +Date: Thu Feb 16 13:12:21 2012 -0800 + + Fixes a failure caused by a recent change to user update in the client. + + Change-Id: I9c1e5a7d243a48144eb6f2f6d9c072ae4824ab38 + + tests/test_keystoneclient.py | 46 ++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 44 insertions(+), 2 deletions(-) + +commit 3093980eb2a26c83966102527e36fabd6ea9ed1e +Author: Alan Pevec +Date: Thu Feb 16 18:01:47 2012 +0100 + + remove executable bit from setup.py + + Change-Id: I3bf7b8b8778c57784044c17b0952e7390404779f + + setup.py | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 484dc240799f9e157e9baf5e944e392d26b21ad0 +Author: Dolph Mathews +Date: Thu Feb 16 10:13:31 2012 -0600 + + Raising 'NotImplmented' results in TypeError + + NotImplemented is a constant: http://docs.python.org/library/constants.html + + NotImplementedError is an exception: http://docs.python.org/library/exceptions.html + + Change-Id: I28a9eb0aa71113700132ccb20b238de50f523814 + + keystone/service.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit fb4f3798c91dfbf6168b850b5ef71d27fa467371 +Author: Chmouel Boudjnah +Date: Sun Feb 12 21:17:57 2012 +0100 + + Update docs for Swift and S3 middlewares. + + - Rename SwiftOperator variable to lowercase swiftoperator along the + way. + - Remove reference to swift.cache as this is not working in our + tokenauth version. + + Change-Id: I5dfbc872f7d9d71417f45cdd0ac46c3efbe2f731 + + docs/source/configuringservices.rst | 172 +++++++++++++++++++++++++----------- + keystone/middleware/swift_auth.py | 18 ++-- + 2 files changed, 123 insertions(+), 67 deletions(-) + +commit 8d7189f117e4cfd9c1721fab8056bd890db88ae4 +Author: Monty Taylor +Date: Wed Feb 15 09:26:54 2012 -0800 + + Added Apache 2.0 License information. + + Fixes bug 932819 + + Change-Id: I58e0c2ad704e2e8ff1924a01791694a5e02a154b + + LICENSE | 176 +++++++++++++++++++++ + MANIFEST.in | 4 + + keystone/catalog/backends/kvs.py | 14 ++ + keystone/catalog/backends/templated.py | 14 ++ + keystone/catalog/core.py | 14 ++ + keystone/cli.py | 14 ++ + .../versions/001_add_initial_tables.py | 16 ++ + keystone/config.py | 14 ++ + keystone/contrib/admin_crud/core.py | 14 ++ + keystone/contrib/ec2/backends/kvs.py | 14 ++ + keystone/contrib/ec2/backends/sql.py | 14 ++ + keystone/contrib/ec2/core.py | 14 ++ + keystone/contrib/s3/core.py | 14 ++ + keystone/exception.py | 15 ++ + keystone/identity/backends/kvs.py | 14 ++ + keystone/identity/backends/pam.py | 14 ++ + keystone/identity/backends/sql.py | 14 ++ + keystone/identity/core.py | 14 ++ + keystone/middleware/auth_token.py | 14 ++ + keystone/middleware/core.py | 14 ++ + keystone/middleware/ec2_token.py | 14 ++ + keystone/middleware/glance_auth_token.py | 14 ++ + keystone/middleware/nova_auth_token.py | 14 ++ + keystone/middleware/nova_keystone_context.py | 14 ++ + keystone/middleware/s3_token.py | 14 ++ + keystone/middleware/swift_auth.py | 14 ++ + keystone/policy/backends/simple.py | 14 ++ + keystone/policy/core.py | 14 ++ + keystone/service.py | 14 ++ + keystone/test.py | 14 ++ + keystone/token/backends/kvs.py | 14 ++ + keystone/token/backends/memcache.py | 14 ++ + keystone/token/backends/sql.py | 14 ++ + keystone/token/core.py | 14 ++ + tests/test_backend.py | 14 ++ + tests/test_backend_kvs.py | 15 ++ + tests/test_backend_memcache.py | 14 ++ + tests/test_backend_sql.py | 14 ++ + tests/test_exception.py | 14 ++ + tests/test_import_legacy.py | 14 ++ + tests/test_keystoneclient.py | 14 ++ + tests/test_keystoneclient_sql.py | 14 ++ + tests/test_middleware.py | 14 ++ + tests/test_utils.py | 14 ++ + tests/test_versions.py | 14 ++ + tests/test_wsgi.py | 14 ++ + 46 files changed, 800 insertions(+) + +commit eef1f0d93ae19f04601b75cd7a2514e81b4005b9 +Merge: 9452cf0 90068b0 +Author: James E. Blair +Date: Tue Feb 14 15:54:59 2012 -0800 + + Merge redux branch (keystone light) + + Change-Id: I2cb5b198a06848f42f919ea49e338443131e263e + +commit 90068b0143af788869116d08533d5ebc99874a17 +Author: Anthony Young +Date: Tue Feb 14 14:58:55 2012 -0800 + + Add docs on keystone_old -> ksl migration + + * Fixes bug 928046 + + Change-Id: I4af516dbc9577c08a77850e75e45d98040e4fb27 + + docs/source/configuration.rst | 48 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +commit ee4795c291fb20da027dda830d5eabc41a3d3535 +Merge: fa9b949 448c641 +Author: Jenkins +Date: Tue Feb 14 22:38:36 2012 +0000 + + Merge "Update docs to for current keystone-manage usage" into redux + +commit fa9b949b5947dd1163e5321bef8a279fb90faa93 +Merge: 988a585 71436db +Author: Jenkins +Date: Tue Feb 14 22:26:49 2012 +0000 + + Merge "Add token expiration" into redux + +commit 71436dbf188b3ff1c576fcd54b992530aac98b6c +Author: Brian Waldon +Date: Wed Feb 8 16:08:08 2012 -0800 + + Add token expiration + + * Config option token.expiration defines amount of time tokens should be valid + * Fixes bug 928545 + + Change-Id: I3dff7a1ebf03bb44fc6e5247f976baea0581de08 + + etc/keystone.conf | 3 ++ + keystone/common/sql/core.py | 1 + + .../versions/001_add_initial_tables.py | 1 + + keystone/common/utils.py | 24 ++++++++++++++++ + keystone/contrib/ec2/core.py | 3 +- + keystone/identity/backends/sql.py | 4 ++- + keystone/service.py | 12 ++++---- + keystone/token/backends/kvs.py | 18 ++++++++---- + keystone/token/backends/memcache.py | 13 +++++++-- + keystone/token/backends/sql.py | 33 +++++++++++++++------- + keystone/token/core.py | 12 ++++++++ + tests/backend_sql.conf | 3 ++ + tests/test_backend.py | 22 +++++++++++++++ + tests/test_backend_memcache.py | 14 +++++---- + tests/test_keystoneclient_sql.py | 1 - + tests/test_utils.py | 9 ++++++ + 16 files changed, 142 insertions(+), 31 deletions(-) + +commit 448c6414a176831b400ed5a1618fe89a8780968b +Author: Anthony Young +Date: Tue Feb 14 12:30:23 2012 -0800 + + Update docs to for current keystone-manage usage + + * Document how to manage users, roles, tenants, services, etc with + keystoneclient cli + * keystone-manage only does db_sync right now + * Fixes bug 931837 + * Add docs for import_legacy and export_legacy_catalog + + Change-Id: I7f55fd607363d0cd4f1646564e430dfb5b12855f + + docs/source/configuration.rst | 322 ++++++++++++++++++------------------ + docs/source/configuringservices.rst | 30 ++-- + docs/source/man/keystone-manage.rst | 156 +---------------- + 3 files changed, 183 insertions(+), 325 deletions(-) + +commit 988a5850d1f1ea7f2db4b179a2fab22a878e7bfe +Merge: d44b859 27db5cb +Author: Jenkins +Date: Tue Feb 14 21:44:57 2012 +0000 + + Merge "add catalog export" into redux + +commit d44b859797a0fb383559555e291508b7e3c86d04 +Merge: 1ed067c af28360 +Author: Jenkins +Date: Tue Feb 14 21:04:39 2012 +0000 + + Merge "Add s3_token." into redux + +commit 27db5cbc05864b8c130eded9082ee82f7e722c34 +Author: termie +Date: Mon Feb 13 22:07:10 2012 -0800 + + add catalog export + + Change-Id: I66a7b3e8136757979c96984242b2bbd5f390b9a0 + + keystone/catalog/backends/templated.py | 52 +++++++------ + keystone/cli.py | 17 ++++ + keystone/common/sql/legacy.py | 32 +++++++- + tests/test_import_legacy.py | 138 +++++++++++++++++++-------------- + 4 files changed, 154 insertions(+), 85 deletions(-) + +commit 1ed067cb5791585bb02644a4a3827b6640324a95 +Merge: 86ffbc8 6c5c964 +Author: Jenkins +Date: Tue Feb 14 20:54:14 2012 +0000 + + Merge "Update swift token middleware." into redux + +commit 86ffbc8a1a662844c47e2a7fa596b63f34cca492 +Merge: b2a0489 9f03722 +Author: Jenkins +Date: Tue Feb 14 20:42:00 2012 +0000 + + Merge "Remove executable bit from auth_token.py" into redux + +commit b2a048962aa4d2921be2ceec3345cd32c8f853db +Merge: 9dd1543 ed793ad +Author: Jenkins +Date: Tue Feb 14 20:36:19 2012 +0000 + + Merge "make sure passwords work after migration" into redux + +commit 9dd154393028297f8eda8b0ccd773993a492cfd2 +Merge: b409629 e1a9a1f +Author: Jenkins +Date: Tue Feb 14 20:27:29 2012 +0000 + + Merge "Handle unicode keys in memcache token backend" into redux + +commit e1a9a1f06f83f9795e03d726a9e41db6dd9b9a9f +Author: Brian Waldon +Date: Mon Feb 13 14:15:33 2012 -0800 + + Handle unicode keys in memcache token backend + + * Cast keys to str in memcache backend + * Emulate encoding error in fake memcache client + * Fixes bug 931746 + + Change-Id: I13bc573d4aca6849b1b8128ab55823545d5a3a11 + + keystone/token/backends/memcache.py | 2 +- + tests/test_backend_memcache.py | 17 +++++++++++++++++ + 2 files changed, 18 insertions(+), 1 deletion(-) + +commit ed793ad5365e33e2fda54c3900c1ad9b2c93dc37 +Author: termie +Date: Mon Feb 13 20:34:46 2012 -0800 + + make sure passwords work after migration + + Change-Id: I0086a362d772bf158e3fdc12fb42c1c7c50d50dd + + keystone/common/utils.py | 5 ++++- + tests/test_import_legacy.py | 21 ++++++++++++++++++--- + 2 files changed, 22 insertions(+), 4 deletions(-) + +commit b4096290d149a04d5f3691025ad4adbfb4f4d4eb +Author: termie +Date: Mon Feb 13 17:38:26 2012 -0800 + + add legacy diablo import tests + + Change-Id: Id96b376ad92d906d14c3183eec2739fa34a2e51b + + tests/legacy_diablo.mysql | 281 +++++++++++++++++++++++++++++++++++++++++++ + tests/legacy_diablo.sqlite | 283 ++++++++++++++++++++++++++++++++++++++++++++ + tests/test_import_legacy.py | 8 ++ + 3 files changed, 572 insertions(+) + +commit 48f2f650c8b622b55e67610081336055ec9a2c8e +Author: termie +Date: Mon Feb 13 16:49:54 2012 -0800 + + change password hash + + Change-Id: Idd5d09dc114cbb0cbd63e23e4178bb74d081c789 + + keystone/common/utils.py | 13 ++++++------- + tests/test_overrides.conf | 2 +- + tools/pip-requires | 2 +- + tools/pip-requires-test | 2 +- + 4 files changed, 9 insertions(+), 10 deletions(-) + +commit aa2656c730d57515b0eba1f57c829b673490fdd5 +Author: termie +Date: Mon Feb 13 17:31:58 2012 -0800 + + add essex test as well + + Change-Id: Ib71a360568c6fdef4fdf8791d3f41b749391befb + + tests/legacy_essex.mysql | 309 +++++++++++++++++++++++++++++++++++++++++++ + tests/legacy_essex.sqlite | 313 ++++++++++++++++++++++++++++++++++++++++++++ + tests/test_import_legacy.py | 56 ++++++++ + 3 files changed, 678 insertions(+) + +commit 700a397a64bf984ef4c56aec8cc597f212e1f459 +Author: termie +Date: Mon Feb 13 17:01:02 2012 -0800 + + add sql for import legacy tests + + Change-Id: I778300970c12bff0c296e6551c1b4e9e079496dc + + tests/legacy_d5.mysql | 281 +++++++++++++++++++++++++++++++++++++++++++++ + tests/legacy_d5.sqlite | 277 ++++++++++++++++++++++++++++++++++++++++++++ + tools/convert_to_sqlite.sh | 71 ++++++++++++ + 3 files changed, 629 insertions(+) + +commit 63adca31f772ab50a2da1c81bda9a66e0e009e02 +Author: termie +Date: Mon Feb 13 16:50:00 2012 -0800 + + add import legacy cli command + + Change-Id: I41f0baaf3e7beb5c1ba44a7da420b411c1f60277 + + keystone/cli.py | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit eb5a939b4691da8b433043259b1541686285bb35 +Author: termie +Date: Mon Feb 13 15:18:35 2012 -0800 + + add migration from legacy db + + Change-Id: If49d829a36c61d6ee379f35c793196fde4ab4657 + + keystone/common/sql/legacy.py | 113 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 113 insertions(+) + +commit de8c9587277e2f12b4023ac7250f9c2e007db702 +Author: termie +Date: Mon Feb 13 17:03:21 2012 -0800 + + remove keystoneclient-based manage commands + + Change-Id: I2aaec673c2f2117026ae417b41b6996188f5bb84 + + keystone/cli.py | 257 +----------------------------------------------------- + tests/test_cli.py | 93 -------------------- + 2 files changed, 1 insertion(+), 349 deletions(-) + +commit 9f037224b0c1442f0d5a882d4f3ad400733aa59b +Author: Chmouel Boudjnah +Date: Mon Feb 13 22:39:23 2012 +0000 + + Remove executable bit from auth_token.py + + Change-Id: I2422eb697ef41b74181bd6b4654d97ff6144bfd8 + + keystone/middleware/auth_token.py | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 6c5c964ff4b43457f5baafbbb889fffeccf92fc7 +Author: Chmouel Boudjnah +Date: Thu Feb 2 13:15:26 2012 +0000 + + Update swift token middleware. + + - Update swift middleware which add features: + - Leaves authententication to token-auth. + - ACL. + - Container-Sync + - Referer. + - S3. + - address termie comments on reviews. + + Change-Id: Iefaa228015d6286e4fb05be2cc24aec01589ef58 + + keystone/middleware/auth_token.py | 3 +- + keystone/middleware/nova_auth_token.py | 3 +- + keystone/middleware/swift_auth.py | 351 +++++++++++++++------------------ + 3 files changed, 158 insertions(+), 199 deletions(-) + +commit b5c4c415704f19afeb7098a2f863257f4a1c0db7 +Merge: 778c3c9 2c18314 +Author: Jenkins +Date: Mon Feb 13 21:11:11 2012 +0000 + + Merge "Add TokenNotFound exception" into redux + +commit af2836083b53c27406670841a57382e146868d02 +Author: Chmouel Boudjnah +Date: Thu Feb 2 14:23:09 2012 +0100 + + Add s3_token. + + Add s3_token middleware originally written by Akira YOSHIYAMA. + Make it works with new swift_auth. + Make not necessary modification to swift3 middleware. + Handle errors when connecting to keystone. + Address termie's comment in reviews. + + Change-Id: Icb2ae3fe79296ee6415dd55d146339ab72dd1d46 + + keystone/middleware/s3_token.py | 136 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 136 insertions(+) + +commit 778c3c950a7a7bc7f8a1c39c67929aa8906a6a57 +Merge: 79faa28 0e775d6 +Author: Jenkins +Date: Sat Feb 11 01:51:45 2012 +0000 + + Merge "Add pagination to GET /tokens" into redux + +commit 0e775d628b30f16a200d2b1f540d76ba24fbb351 +Author: Brian Waldon +Date: Thu Feb 9 16:25:45 2012 -0800 + + Add pagination to GET /tokens + + * Partially fixes bug 928049 + + Change-Id: I21943dcc7cea4dabfab672e84fe507e78e430de4 + + keystone/common/wsgi.py | 1 + + keystone/identity/core.py | 31 +++++++++++++++++++++++-- + tests/test_cli.py | 6 +++++ + tests/test_keystoneclient.py | 55 ++++++++++++++++++++++++++++++++++++++++++++ + tests/test_wsgi.py | 35 ++++++++++++++++++---------- + 5 files changed, 114 insertions(+), 14 deletions(-) + +commit 79faa28f0389f427956ca72b3a902864ae5856f5 +Author: Vishvananda Ishaya +Date: Wed Feb 8 23:37:31 2012 +0000 + + Fixes role checking for admin check + + Change-Id: I6afe52033996b56aa38033017e0ce2f37c471592 + + keystone/common/wsgi.py | 3 +++ + keystone/middleware/core.py | 40 ++------------------------------------ + keystone/policy/backends/simple.py | 4 +++- + 3 files changed, 8 insertions(+), 39 deletions(-) + +commit d049c19227d2702c5c5ac545d195465eac55246d +Author: Brian Waldon +Date: Fri Feb 10 14:23:12 2012 -0800 + + Fix webob exceptions in test_middlware + + Change-Id: I211180ee0dde45f2030fba7e83fb1f6a1d880068 + + tests/test_middleware.py | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +commit 82d53b03dc0298be9788fbd8c061d1f8ce075d63 +Merge: 9028f32 363a5d6 +Author: Jenkins +Date: Fri Feb 10 19:52:02 2012 +0000 + + Merge "Add tests for core middleware" into redux + +commit 363a5d63c0ff0630864765a07752cd63e6890e41 +Author: Brian Waldon +Date: Wed Feb 8 14:31:41 2012 -0800 + + Add tests for core middleware + + * Partially fixes bug 928039 + + Change-Id: I3807bcc77ab424c73069889b65b1a5598c17011c + + keystone/middleware/core.py | 10 ++++-- + tests/test_middleware.py | 76 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 83 insertions(+), 3 deletions(-) + +commit 9028f3228b785cfefbbe3cd6532485817262c51d +Author: Anthony Young +Date: Thu Feb 9 17:08:47 2012 +0000 + + Add version description to root path + + * Fixes 925548 + * Fix test for correct assertion + * / returns {} + + Change-Id: I1067b402ad1bab474781e29ab7761f644f076540 + + etc/keystone.conf | 14 +++++++ + keystone/service.py | 112 ++++++++++++++++++++++++++++++++++++++----------- + tests/test_versions.py | 107 ++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 208 insertions(+), 25 deletions(-) + +commit 2c18314e7cb7e5b7e5b6237f0793ec82739468f1 +Author: Brian Waldon +Date: Thu Feb 9 09:53:03 2012 -0800 + + Add TokenNotFound exception + + * raise TokenNotFound from token backends on get/delete when token doesn't exist + + Change-Id: Ic9aba7911088c30c20fe62501a05d75232f2d8b9 + + keystone/common/wsgi.py | 7 +++++-- + keystone/contrib/ec2/core.py | 8 ++++++-- + keystone/exception.py | 4 ++++ + keystone/identity/core.py | 20 +++++--------------- + keystone/service.py | 23 ++++++++++------------- + keystone/token/backends/kvs.py | 13 ++++++++++--- + keystone/token/backends/memcache.py | 9 ++++++++- + keystone/token/backends/sql.py | 8 ++++++-- + keystone/token/core.py | 4 +++- + tests/test_backend.py | 9 +++++++-- + tests/test_backend_memcache.py | 12 ++++++++++-- + 11 files changed, 74 insertions(+), 43 deletions(-) + +commit 1951c87de39f8dde704632512db92b22f967bf08 +Merge: e5ffa74 ae55fdc +Author: Jenkins +Date: Thu Feb 9 23:31:20 2012 +0000 + + Merge "remove diablo tests, they aren't doing much" into redux + +commit ae55fdca23135f76da4f7926135d384e9b13d419 +Author: termie +Date: Thu Feb 9 14:05:25 2012 -0800 + + remove diablo tests, they aren't doing much + + Change-Id: I80640e123a784cd2ca5e9dfcf826a73666cea43c + + tests/test_legacy_compat.py | 170 -------------------------------------------- + 1 file changed, 170 deletions(-) + +commit e5ffa7473359eee40c4644481067ef5212039150 +Author: Anthony Young +Date: Thu Feb 9 19:17:29 2012 +0000 + + Fix largest memory leak in ksl tests + + * Explicitly kill wsgi servers that are launched + * Fixes bug 929653 + * Fix spaceypoo + + Change-Id: Id4b2f06749cb57c2680d37c1e4014c020d95ad5e + + keystone/common/wsgi.py | 7 ++++++- + tests/test_keystoneclient.py | 22 +++++++++++----------- + 2 files changed, 17 insertions(+), 12 deletions(-) + +commit 05b2583dfa6d2f932f29e053c557b19601fae06b +Author: Jesse Andrews +Date: Mon Feb 6 18:49:03 2012 -0800 + + Add memcache token backend + + * tests use a fake memcache client + * fixes bug 928040 + + Change-Id: I7c24e7829ee91fcf719eb4f338cf0ce2a0fa6bbd + + keystone/token/backends/memcache.py | 42 +++++++++++++++++++++++++++++++++++++ + tests/test_backend_memcache.py | 33 +++++++++++++++++++++++++++++ + tools/pip-requires-test | 1 + + 3 files changed, 76 insertions(+) + +commit 738e2ec8e4244fbe2c032145fca5889799ecf8a4 +Merge: 2cc97c1 6013dd8 +Author: Jenkins +Date: Wed Feb 8 22:25:35 2012 +0000 + + Merge "Add content-type to responses" into redux + +commit 2cc97c19fb242128d760554324136cb6b500f479 +Merge: 288159b 26655dc +Author: Jenkins +Date: Wed Feb 8 22:19:06 2012 +0000 + + Merge "Fix comment on bcrypt and avoid hard-coding 29 as the salt length" into redux + +commit 288159b7741124e4c36bfb58277a916c16d565af +Merge: bd1a73e c64a12f +Author: Jenkins +Date: Wed Feb 8 22:12:46 2012 +0000 + + Merge "Friendly JSON exceptions (bug 928061, bug 928062)" into redux + +commit bd1a73e2affce182b8ab1cbb4e8c361443d9855f +Merge: cad74ae 51eda01 +Author: Jenkins +Date: Wed Feb 8 22:03:57 2012 +0000 + + Merge "termie all the things" into redux + +commit cad74aec6ef3c7b51949f1f76abac16f59bb8a65 +Merge: 524d3d1 c680d7c +Author: Jenkins +Date: Wed Feb 8 21:58:52 2012 +0000 + + Merge "Add SQL token backend" into redux + +commit c64a12ffc7072a5822d014da7111ed12adcf4046 +Author: Dolph Mathews +Date: Tue Feb 7 20:46:31 2012 -0600 + + Friendly JSON exceptions (bug 928061, bug 928062) + + Example http://pastie.org/3338663 + + Change-Id: I26f53488c062ebfb6e49cfcf82e0b8179a683ea8 + + keystone/common/wsgi.py | 36 +++++++++++++++++++++++------ + keystone/exception.py | 54 ++++++++++++++++++++++++++++++++++++++++++++ + keystone/identity/core.py | 5 +++- + keystone/service.py | 9 ++++++++ + tests/test_exception.py | 53 +++++++++++++++++++++++++++++++++++++++++++ + tests/test_keystoneclient.py | 26 +++++++++++++++++---- + 6 files changed, 171 insertions(+), 12 deletions(-) + +commit 26655dc7b7a5cf8374e1ecf4a9852e38a47be3b8 +Author: Justin Santa Barbara +Date: Wed Feb 8 11:50:34 2012 -0800 + + Fix comment on bcrypt and avoid hard-coding 29 as the salt length + + Change-Id: Ifc78535ea79e071b7953769ff26eed8ecf666dc2 + + keystone/common/utils.py | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 524d3d1c419ad5fb71039fe7022195a9b8f9980e +Merge: d1c2e85 f9a8827 +Author: Jenkins +Date: Wed Feb 8 21:53:57 2012 +0000 + + Merge "example in hacking was incorrect" into redux + +commit d1c2e857771c3c2c2ec2be173b91152150bb522e +Merge: e968ace 9528060 +Author: Jenkins +Date: Wed Feb 8 21:44:20 2012 +0000 + + Merge "Cope with unicode passwords or None" into redux + +commit e968acee4be4c5ea006fd4326711bafe7f7e0c86 +Merge: a3d21f0 aed78aa +Author: Jenkins +Date: Wed Feb 8 21:39:18 2012 +0000 + + Merge "fixes lp:925721 adds .gitreview for redux branch" into redux + +commit c680d7ca5466e35b3b1c5c09dd949039c807ee8f +Author: Brian Waldon +Date: Wed Feb 8 12:31:25 2012 -0800 + + Add SQL token backend + + * abstract out common token tests into test_backend + * fixes bug 928052 + + Change-Id: I75da2f3c8d733b71025bcc1ef02f55e07645327f + + keystone/token/backends/sql.py | 52 ++++++++++++++++++++++++++++++++++++++++++ + tests/test_backend.py | 19 +++++++++++++++ + tests/test_backend_kvs.py | 18 +-------------- + tests/test_backend_sql.py | 36 ++++++++--------------------- + 4 files changed, 82 insertions(+), 43 deletions(-) + +commit 6013dd83bb96bc1f654fb8a0d7e7b29c25bfa36a +Author: Brian Waldon +Date: Wed Feb 8 13:22:51 2012 -0800 + + Add content-type to responses + + * fixes bug 928055 + + Change-Id: Id86a9b3361d27493ed5ef175462aa1d4c1001bf4 + + keystone/common/wsgi.py | 9 ++++++--- + tests/test_wsgi.py | 25 +++++++++++++++++++++++++ + 2 files changed, 31 insertions(+), 3 deletions(-) + +commit 95280608fc82f7ae51f8c42678d6a7f0ac2ecff0 +Author: Justin Santa Barbara +Date: Wed Feb 8 12:53:44 2012 -0800 + + Cope with unicode passwords or None + + If the password has a unicode character in it, bcrypt breaks. So encode it using utf-8. utf-8 should mean that existing hashes still work. + + Change-Id: I4f9f3b636c8728234ada87de62d22bed2ff8eb60 + + keystone/common/utils.py | 10 +++++++--- + tests/test_utils.py | 40 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 47 insertions(+), 3 deletions(-) + +commit a3d21f06adaab181d566edbe6dbe250e5a0bff29 +Author: Brian Waldon +Date: Wed Feb 8 10:46:33 2012 -0800 + + Add auth checks to ec2 credential crud operations + + * Re-enables ec2 crud authorization tests + * Fixes bug 928471 + + Change-Id: I22a97a8659ade5d146b52d112ff66ea58f847ef7 + + keystone/contrib/ec2/core.py | 58 +++++++++++++++++++++++++++++++++++++------- + tests/test_cli.py | 9 +++++++ + tests/test_keystoneclient.py | 33 ++++++++++++------------- + 3 files changed, 73 insertions(+), 27 deletions(-) + +commit 51eda0155f987f098b941d1eed4cd21e03a9c4d2 +Author: Dolph Mathews +Date: Wed Feb 8 14:01:03 2012 -0600 + + termie all the things + + Change-Id: Ib7b5fab2a09de8a9dcad8d8b0cf71c529e944f8c + + keystone/cli.py | 2 +- + keystone/common/bufferedhttp.py | 4 +- + keystone/common/cfg.py | 14 +-- + keystone/common/sql/core.py | 8 +- + keystone/common/sql/migration.py | 4 +- + keystone/common/utils.py | 8 +- + keystone/config.py | 6 +- + keystone/contrib/admin_crud/core.py | 174 ++++++++++++++++++------------------ + keystone/contrib/ec2/core.py | 8 +- + keystone/contrib/s3/core.py | 2 +- + keystone/middleware/auth_token.py | 76 ++++++++-------- + keystone/middleware/core.py | 10 +-- + keystone/middleware/ec2_token.py | 4 +- + keystone/middleware/swift_auth.py | 14 +-- + keystone/test.py | 4 +- + 15 files changed, 169 insertions(+), 169 deletions(-) + +commit f9a88277502b10416488d799d99f831299ad474e +Author: termie +Date: Wed Feb 8 12:20:31 2012 -0800 + + example in hacking was incorrect + + Change-Id: I0a345e72c8974c26fb911f2a676c062280ac9557 + + HACKING.rst | 3 +++ + 1 file changed, 3 insertions(+) + +commit 3364905041dd133cef3512a0a3ee4a3aa161b798 +Merge: 705e508 f0f8dde +Author: Jenkins +Date: Wed Feb 8 17:52:32 2012 +0000 + + Merge "Ensures duplicate users and tenants can't be made" into redux + +commit 705e5083a5f7c9dc21f6b8417e14f77e3f541cf5 +Merge: 3efce6d 666a2b8 +Author: Jenkins +Date: Wed Feb 8 10:09:58 2012 +0000 + + Merge "Add .gitreview file." into redux + +commit f0f8ddeaa8923af615fad9171c96ea1ef1f5968d +Author: Vishvananda Ishaya +Date: Tue Feb 7 23:07:10 2012 -0800 + + Ensures duplicate users and tenants can't be made + + * adds test for duplicate names and ids for backends + * also adds test for rename duplicates and changing ids + * makes kvs backend raise an exception if duplicate is requested + * ensures kvs backend doesn't allow update of id + * makes sure that kvs is reset between tests + * cleans up a few imports + * fixes bug 927291 + * fixes bug 928659 + + Change-Id: Ia6eb1961796cbde7ed57a75cd9394d77c88cf655 + + keystone/identity/backends/kvs.py | 23 ++- + keystone/test.py | 5 +- + tests/test_backend.py | 305 +++++++++++++++++++++++++------------- + 3 files changed, 221 insertions(+), 112 deletions(-) + +commit 3efce6da3a3560328103892bf4dba92cc4305594 +Author: Vishvananda Ishaya +Date: Tue Feb 7 22:37:38 2012 -0800 + + make pip requires match nova + + Change-Id: Ie64d9571730f699d276fbf93241506e63053f0e0 + + tools/pip-requires | 4 ++-- + tools/pip-requires-test | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit aed78aa21a84881e6abaa662a5bb345db830e8e7 +Author: Joe Heck +Date: Mon Feb 6 20:06:31 2012 -0800 + + fixes lp:925721 + adds .gitreview for redux branch + + Change-Id: Ic993ee7abd5f54b118b1b58688199f58a529222c + + .gitreview | 4 ++++ + docs/source/configuration.rst | 12 ++++++++++++ + 2 files changed, 16 insertions(+) + +commit 8da000ae0b548212a29948562804fb9561d914e9 +Merge: fabad5a fa5b2e4 +Author: Jenkins +Date: Tue Feb 7 02:22:48 2012 +0000 + + Merge "We don't need all the deps to check pep8." into redux + +commit fabad5a6604e9e0248ec310e2b808dc06799c34b +Author: termie +Date: Mon Feb 6 18:01:08 2012 -0800 + + remove novaclient, fix python syntax + + Change-Id: Ib5c523a5feb74fbc6f4f75ec4d112dbcd23a559c + + tests/test_keystoneclient.py | 3 +- + tests/test_novaclient_compat.py | 62 ----------------------------------------- + 2 files changed, 1 insertion(+), 64 deletions(-) + +commit fa5b2e450a441fb6d838f842c46cd363775ba3d0 +Author: Monty Taylor +Date: Mon Feb 6 16:36:41 2012 -0800 + + We don't need all the deps to check pep8. + + Change-Id: I01296b99d7ed91eb26b3d29256d8b9d538d9c839 + + tox.ini | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit 9dadf0162448151aaa769f2ef5555e36616b4b7d +Author: Vishvananda Ishaya +Date: Mon Feb 6 23:05:19 2012 +0000 + + remove extra line + + keystone/contrib/ec2/core.py | 1 - + 1 file changed, 1 deletion(-) + +commit b6a142d8407b441c1023acaeb597036bdb26f3ba +Author: Vishvananda Ishaya +Date: Mon Feb 6 23:01:10 2012 +0000 + + Make ec2 auth actually work + + keystone/cli.py | 1 - + keystone/common/utils.py | 30 +++++++++++++++--------------- + keystone/contrib/ec2/core.py | 15 ++++++++++++--- + 3 files changed, 27 insertions(+), 19 deletions(-) + +commit 4054253aa50f34179db37919b038b80da23e0c51 +Merge: a5ca4d9 62a92c4 +Author: Andy Smith +Date: Mon Feb 6 14:45:18 2012 -0800 + + Merge pull request #35 from 4P/dox + + A bunch of docs updates + +commit 62a92c44baf533fe316016c1fa5be892fc85009c +Author: Joe Heck +Date: Mon Feb 6 20:43:24 2012 +0000 + + fixing grammar, noting broken enable, adding hacking with prefs for project + + HACKING.rst | 189 ++++++++++++++++++++++++++++++++++++ + docs/source/configuration.rst | 11 +++ + docs/source/configuringservices.rst | 44 ++++++--- + docs/source/man/keystone-all.rst | 2 +- + 4 files changed, 232 insertions(+), 14 deletions(-) + +commit a5ca4d9c56f2493f27e73010af623cf6b44e2ca4 +Merge: 63573fe fca3e9c +Author: Andy Smith +Date: Mon Feb 6 12:43:16 2012 -0800 + + Merge pull request #36 from 4P/tokendriver + + Add token interface description (token.Driver) + +commit 63573fe88cc1e6e7ce7cceeeb76e6ad527c8af85 +Merge: 446b268 e0afc0d +Author: Andy Smith +Date: Mon Feb 6 12:40:29 2012 -0800 + + Merge pull request #37 from dolph/master + + Add support for invalidate token: DELETE /tokens/{token_id} + +commit e0afc0dc327030d34c1fbd7806f555f69e406144 +Author: Dolph Mathews +Date: Mon Feb 6 14:28:35 2012 -0600 + + Removed unused reference + + keystone/service.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit fca3e9c0453bc6adeb50c77dd1be79933132fdaf +Author: Joe Heck +Date: Sun Feb 5 16:24:42 2012 -0800 + + adding a token service Driver to define the interface + + keystone/token/backends/kvs.py | 3 ++- + keystone/token/core.py | 47 ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 49 insertions(+), 1 deletion(-) + +commit 6a5c5248a76a561d65bdc1868408c4c7cb27e934 +Author: Dolph Mathews +Date: Mon Feb 6 09:28:53 2012 -0600 + + Added support for DELETE /tokens/{token_id} + + keystone/service.py | 12 ++++++++++++ + tests/test_cli.py | 3 +++ + tests/test_keystoneclient.py | 19 +++++++++++++++++++ + 3 files changed, 34 insertions(+) + +commit 9452cf04bc8b0a4dc66dc640615d5ace1ca715f2 +Author: Alvaro Lopez Garcia +Date: Tue Jan 31 18:14:17 2012 +0100 + + Fixes bug 924391 + + Change-Id: Iccb232a56df6072580cbcb0bc07ef7c0f81ca8fe + + keystone/backends/__init__.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit cc371272f2f650765f39d03bd17c1afc80b0e561 +Author: Joe Heck +Date: Sun Feb 5 20:32:37 2012 +0000 + + ran through all commands to verify keywords against current (master) keystonelight + + docs/source/configuration.rst | 58 +++++++++++++++++++++++++++++++++++++------ + 1 file changed, 50 insertions(+), 8 deletions(-) + +commit 32ff03b6dc9d8a6b5c1102faabf7f84bd1ebd3c1 +Author: Joe Heck +Date: Thu Feb 2 20:40:39 2012 -0800 + + updating docs: + + * reference keystone-all instead of keystone + * remove reference to keystone.version + * rename gnerated man page + * spacing and line wrapping + + README.rst | 4 +- + docs/source/conf.py | 16 ++-- + docs/source/configuration.rst | 154 ++++++++++++++++++++++++++++++------ + docs/source/configuringservices.rst | 23 +++--- + docs/source/developing.rst | 30 ++++--- + docs/source/man/keystone-all.rst | 83 +++++++++++++++++++ + docs/source/man/keystone.rst | 81 ------------------- + docs/source/nova-api-paste.rst | 3 +- + docs/source/setup.rst | 17 ++-- + 9 files changed, 268 insertions(+), 143 deletions(-) + +commit bfe9abeaa8a7ec8403b8fae1a7a302aa0e060bf4 +Author: Pete Zaitcev +Date: Thu Feb 2 22:41:28 2012 -0700 + + Fix "KeyError: 'service-header-mappings'" + + Someone changed the dashes for underscores in keystone.conf + and forgot to update one place. Fix is trivial, tested to work. + + bug 925872 + + Change-Id: Ib448f55fb0a352b5782fe0241bb1977c1d1ab79b + + keystone/frontends/legacy_token_auth.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6ebc246ba983bdfa03a65025f5b44212b125810b +Merge: d851dc7 1ea4e4f +Author: Jenkins +Date: Fri Feb 3 18:09:02 2012 +0000 + + Merge "Added keystone-manage list_role_grants (bug 923933)" + +commit 4f651ba2425fa418b101a266a5b73d758d1b3d04 +Author: Joe Heck +Date: Thu Feb 2 20:57:45 2012 -0800 + + updating tox.ini with test pip requirements + + tox.ini | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d851dc7fe1ff3f5a25ec25d379755afaa4f5f85a +Merge: f76477c 9858e08 +Author: Jenkins +Date: Fri Feb 3 07:27:52 2012 +0000 + + Merge "Removes nova middleware and config from keystone" + +commit 446b26850d1afa1bd239c3048a23fc818b86c8f0 +Author: termie +Date: Thu Feb 2 16:58:32 2012 -0800 + + use our own logging module + + keystone/config.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f91610c5d933ff3a2e0946caaeeb12c90a8e89b2 +Merge: 50e4e4d 0027f90 +Author: Andy Smith +Date: Thu Feb 2 14:42:23 2012 -0800 + + Merge pull request #33 from zulcss/master + + Renamed binary to keystone-all. + +commit f76477c7b19aeade22ef00bccc1b652cc37d7349 +Author: Dan Prince +Date: Wed Feb 1 15:17:26 2012 -0500 + + Update auth_token middleware to support creds. + + Updates to the auth_token middleware to support admin_user and + admin_password in addition to the existing admin_token. If an + admin_token isn't specified then a call to obtain the admin_token + is made. If an admin token expires the username and password can + also be used to obtain a fresh token. + + Also, added a test for case for middleware where token isn't + specified. + + Fixes LP Bug #923573. + + Change-Id: I643efec310cbb9a175607cc17f0c077f261b1d6d + + keystone/middleware/auth_token.py | 64 +++++++++++++++++++++++-------- + keystone/middleware/quantum_auth_token.py | 6 +-- + keystone/test/client/test_middleware.py | 28 ++++++++++++-- + keystone/test/functional/common.py | 4 +- + 4 files changed, 78 insertions(+), 24 deletions(-) + +commit 9858e08d44c89f5aa7bf38e5235e4c05fffdb96d +Author: Vishvananda Ishaya +Date: Thu Feb 2 11:36:26 2012 -0800 + + Removes nova middleware and config from keystone + + * Everything has been moved back into nova + * Fixes bug 917408 + + Change-Id: Id7e3a0eaa90cc0a32f84fdd587d50e2eba00800b + + doc/source/nova-api-paste.rst | 142 --------------------------- + examples/paste/nova-api-paste.ini | 123 ----------------------- + keystone/middleware/ec2_token.py | 96 ------------------ + keystone/middleware/nova_auth_token.py | 120 ---------------------- + keystone/middleware/nova_keystone_context.py | 72 -------------- + 5 files changed, 553 deletions(-) + +commit 50e4e4d63cbec841299aa960f8faa9e6b48a5ed2 +Merge: 67ba46c 433e7db +Author: Andy Smith +Date: Thu Feb 2 11:23:58 2012 -0800 + + Merge pull request #34 from 4P/docup + + minor docstring update for new locations + +commit 433e7db49920d5b0d233d623d7376589c2897d57 +Author: Joe Heck +Date: Thu Feb 2 08:48:39 2012 -0800 + + minor docstring update for new locations + + keystone/catalog/core.py | 2 +- + keystone/contrib/ec2/core.py | 2 +- + keystone/identity/core.py | 2 +- + keystone/policy/core.py | 2 +- + keystone/token/core.py | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +commit 0027f90c0e22b0adfa78d534658e56c72f81dd55 +Author: Chuck Short +Date: Thu Feb 2 09:39:02 2012 -0500 + + Missed one more keystone-server. + + Signed-off-by: Chuck Short + + bin/keystone-all | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 69bb042a86a73773044b94437fe17a1639ec7e79 +Author: Chuck Short +Date: Thu Feb 2 09:34:16 2012 -0500 + + Renamed keystone-server to keystone-all based on comments + in LP: #910484. + + Signed-off-by: Chuck Short + + bin/keystone-all | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + bin/keystone-server | 71 ----------------------------------------------------- + setup.py | 2 +- + 3 files changed, 72 insertions(+), 72 deletions(-) + +commit 67ba46c1db3174cc4acc4066430d6eb0c657de8e +Merge: 2d2ce8c 40525e0 +Author: Andy Smith +Date: Wed Feb 1 16:53:49 2012 -0800 + + Merge pull request #30 from termie/fix_master_kc + + Update code to handle keystoneclient master + +commit 40525e0e52966454e75a4ba9ed689280caaaf61d +Author: termie +Date: Wed Feb 1 16:51:46 2012 -0800 + + be more safe with getting json aprams + + keystone/middleware/core.py | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit a703983713306278ecee1c7cf993a5c5772e1035 +Author: termie +Date: Wed Feb 1 15:56:09 2012 -0800 + + skip the two tests where testing code is failing + + the cli is rather well tested already from the other tests, these tests + are only failing because the testing code is having trouble with + multiple copies of the keystoneclient.exceptions.NotFound error (the + tests pass when run individually) and I am no longer willing to waste + time trying to fix it + + tests/test_cli.py | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 3cfea52ace7d273f77d4bc58e095f20030f8c48b +Author: termie +Date: Wed Feb 1 15:53:26 2012 -0800 + + accept POST or PUT for tenant update + + this is a keystone legacy issue + + keystone/contrib/admin_crud/core.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 09bd758fb88387cf9e58666b1bbcded4e019037e +Author: termie +Date: Wed Feb 1 14:50:02 2012 -0800 + + deal with reparsing the config files + + tests/test_cli.py | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 37e1c5c57a140c41b154ba9901855026e4ee5c3b +Author: termie +Date: Wed Feb 1 14:49:50 2012 -0800 + + don't automatically parse sys.argv for cfg + + keystone/config.py | 1 + + 1 file changed, 1 insertion(+) + +commit 0b34e5f511c8dc57d11ddef874fdbd2ea7bb6ff5 +Author: termie +Date: Wed Feb 1 11:49:21 2012 -0800 + + deal with tags in git checkout + + keystone/test.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 6fd68e1a3878502c9d2bb65be670791e20a29ef6 +Author: termie +Date: Tue Jan 31 21:31:36 2012 -0800 + + fix keystoneclient tests + + keystone/contrib/admin_crud/core.py | 2 +- + keystone/identity/core.py | 57 +++++++++++++- + keystone/middleware/core.py | 2 + + tests/test_keystoneclient.py | 148 +++++++++++++++++++++--------------- + 4 files changed, 145 insertions(+), 64 deletions(-) + +commit c6e30eb5a1b14816e06589c407ea81f6d63b5355 +Author: termie +Date: Tue Jan 31 15:45:00 2012 -0800 + + add tests for essex and fix the testing framework + + keystone/test.py | 5 +++++ + tests/test_keystoneclient.py | 13 ++++++++++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +commit 2d2ce8c72efa965b6db4affe1a5d9e3e6ca5d47b +Author: Andy Smith +Date: Wed Feb 1 11:07:32 2012 -0800 + + Update docs/source/developing.rst + + docs/source/developing.rst | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit ec89d4ec9ae5428fe3509c5155d66efedb8a6668 +Author: Chuck Short +Date: Wed Feb 1 13:35:59 2012 -0500 + + Change the name of keystone to keystone-server so + the binaries dont conflict with python-keystoneclient. + + Signed-off-by: Chuck Short + + bin/keystone | 71 ----------------------------------------------------- + bin/keystone-server | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + setup.py | 2 +- + 3 files changed, 72 insertions(+), 72 deletions(-) + +commit 89f835a3eb88abc474c9b42b3665845a1a6556af +Merge: 826319b 3da6575 +Author: Andy Smith +Date: Tue Jan 31 17:30:03 2012 -0800 + + Merge pull request #27 from emonty/jenkins-normalization + + set up infrastructure for jenkins testing + +commit 3da657555d801a487fbfbc97778e2664e50f8434 +Author: Monty Taylor +Date: Tue Jan 31 13:45:53 2012 -0500 + + Normalize build files with current jenkins. + + Change-Id: I528c3cc4e16dfa1465c8e3ac1062c65dc2ddc2f0 + + .gitignore | 3 +++ + run_tests.sh | 3 +-- + tools/install_venv.py | 4 ++-- + tools/pip-requires | 23 ++++++++++++++++++++++- + tools/with_venv.sh | 2 +- + tox.ini | 26 ++++++++++++++++++++++++++ + 6 files changed, 55 insertions(+), 6 deletions(-) + +commit fc3de2491d15f446d6223ff494bbeaef06fda8ac +Author: Monty Taylor +Date: Tue Jan 31 13:40:29 2012 -0500 + + Use gerrit instead of github + + When we run gating tests in jenkins, any access of network resources is a + potential source of false-negative on the test due to intermittent service + failures on systems that are out of our control. We observe that this is + actually quite frequent when things want to access PyPI or github. With + pypi, we pre-create virtualenvs and cache the eggs so that an individual + test run doesn't fail due to pypi not responding. For repos, if at all + possible, we direct them all at the gerrit instance, because since gerrit is + driving the test run in the first place, it's indicative of a much larger + problem if jenkins can't talk to it - and it's one that we can fix if it + does come up. + + Change-Id: I9f54133f7f2025d15a9d0b270d2466438cbc6dd5 + + tests/test_keystoneclient.py | 3 ++- + tests/test_legacy_compat.py | 8 ++++---- + tests/test_novaclient_compat.py | 3 ++- + 3 files changed, 8 insertions(+), 6 deletions(-) + +commit cf3f671a050f5cb5a2acc8c8c4b0b6b7a3a0d892 +Author: Monty Taylor +Date: Tue Jan 31 13:39:36 2012 -0500 + + Fix pep8 violations. + + Change-Id: I12e304c567b92178e193c60599c3be606cc70d38 + + bin/keystone-manage | 14 +- + keystone/cli.py | 505 +++++++++++++++++++++++---------------------- + keystone/common/logging.py | 16 +- + keystone/common/utils.py | 64 +++--- + setup.py | 3 +- + 5 files changed, 302 insertions(+), 300 deletions(-) + +commit 666a2b8d8f275bdd80ab12e4686b0892673e841c +Author: James E. Blair +Date: Tue Jan 31 02:12:38 2012 -0800 + + Add .gitreview file. + + Change-Id: I022e6b0dfe3db6dc5c1530cfbbf3f7d5e6804962 + + .gitreview | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 826319befdb552e1fb9098e0bd5518ce11915b0a +Merge: d23691b 8d695b8 +Author: Andy Smith +Date: Mon Jan 30 15:51:19 2012 -0800 + + Merge pull request #26 from 4P/moredoc + + copy over a bunch of docs from keystone, will probably have to be proofread a bit after + +commit 1ea4e4fe90a209b185037932e88f4423192ca9aa +Author: Dolph Mathews +Date: Mon Jan 30 14:51:55 2012 -0600 + + Added keystone-manage list_role_grants (bug 923933) + + Change-Id: I213b47240fa1211bafe7895fc01c5c6e888d3c35 + + keystone/backends/sqlalchemy/api/role.py | 40 +++++++++++++++++++++ + keystone/content/admin/HP-IDM-admin.wadl | 32 ++++++++--------- + keystone/content/admin/OS-KSEC2-admin.wadl | 38 ++++++++++---------- + keystone/manage2/base.py | 1 - + keystone/manage2/commands/list_role_grants.py | 50 +++++++++++++++++++++++++++ + keystone/managers/grant.py | 3 ++ + keystone/test/unit/test_commands.py | 47 +++++++++++++++++++++++++ + 7 files changed, 175 insertions(+), 36 deletions(-) + +commit 8d695b83df68367be9172f0659a90a844680039b +Author: Joe Heck +Date: Mon Jan 30 20:22:34 2012 +0000 + + removing unused images, cleaning up RST in docstrings from sphinx warnings + + docs/source/configuration.rst | 36 ++-- + docs/source/images/305.svg | 158 ----------------- + docs/source/images/both.svg | 135 --------------- + docs/source/images/graphs_delegate_accept.svg | 52 ------ + docs/source/images/graphs_separate.svg | 30 ---- + docs/source/images/graphs_standard_accept.svg | 51 ------ + docs/source/images/graphs_standard_reject.svg | 39 ----- + docs/source/images/graphs_together.svg | 24 --- + docs/source/images/layouts.svg | 215 ----------------------- + docs/source/images/mapper.svg | 237 ------------------------- + docs/source/images/proxyAuth.svg | 238 -------------------------- + keystone/catalog/backends/templated.py | 3 + + keystone/common/cfg.py | 24 +-- + keystone/service.py | 20 +-- + 14 files changed, 46 insertions(+), 1216 deletions(-) + +commit d961f7c30c1290dba392381a56c7159a09d36068 +Author: Joe Heck +Date: Mon Jan 30 19:59:58 2012 +0000 + + pep8 cleanup + + keystone/middleware/core.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9d7d898586566cf2f7c21846961f67a773c2ee6c +Author: Joe Heck +Date: Mon Jan 30 19:53:08 2012 +0000 + + shifting contents from _static to static + + docs/source/_static/basic.css | 416 ------------------------------------ + docs/source/_static/default.css | 230 -------------------- + docs/source/_static/jquery.tweet.js | 154 ------------- + docs/source/_static/tweaks.css | 65 ------ + docs/source/conf.py | 2 +- + docs/source/static/basic.css | 416 ++++++++++++++++++++++++++++++++++++ + docs/source/static/default.css | 230 ++++++++++++++++++++ + docs/source/static/jquery.tweet.js | 154 +++++++++++++ + docs/source/static/tweaks.css | 65 ++++++ + 9 files changed, 866 insertions(+), 866 deletions(-) + +commit d1f4ddcb81d470401f5b6c80b66ac9649e3c224e +Author: Joe Heck +Date: Sun Jan 29 14:36:11 2012 -0800 + + adding in testing details + + docs/source/developing.rst | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +commit 22c3f8067ed7e480e5d06c67677a4f60d740a10d +Author: Joe Heck +Date: Sun Jan 29 14:14:09 2012 -0800 + + moved notes from README.rst into docs/architecture.rst + + docs/source/architecture.rst | 228 +++++++++++++++++++++++++++++++------------ + docs/source/developing.rst | 14 +++ + 2 files changed, 179 insertions(+), 63 deletions(-) + +commit ef8b8f1d9b61ff527b223d69c52f35f25536b8dd +Author: Joe Heck +Date: Sun Jan 29 14:09:24 2012 -0800 + + updating formating for configuration page + + docs/source/configuration.rst | 133 +++++++++++++++++++++++++----------------- + 1 file changed, 81 insertions(+), 52 deletions(-) + +commit 1908a2d7ba14b830648078e6871fba0e6644fdf5 +Author: Joe Heck +Date: Sun Jan 29 13:47:29 2012 -0800 + + format tweaks and moving old docs + + docs/source/backends.rst | 188 ---------- + docs/source/configuringservices.rst | 174 +++++++++ + docs/source/index.rst | 6 + + docs/source/middleware_architecture.rst | 529 ++++++++++++++++++++++++++++ + docs/source/nova-api-paste.rst | 142 ++++++++ + docs/source/old/backends.rst | 188 ++++++++++ + docs/source/old/configuringservices.rst | 333 ----------------- + docs/source/old/middleware_architecture.rst | 529 ---------------------------- + docs/source/old/nova-api-paste.rst | 142 -------- + docs/source/setup.rst | 2 +- + 10 files changed, 1040 insertions(+), 1193 deletions(-) + +commit fec7598a07b4beca78fe31a549e5d3beb6c0dc5d +Author: Joe Heck +Date: Sun Jan 29 13:24:38 2012 -0800 + + shifting older docs into old/ directory + + docs/source/adminAPI_curl_examples.rst | 387 -------------------- + docs/source/configuration.rst | 2 +- + docs/source/configuringservices.rst | 333 ----------------- + docs/source/controllingservers.rst | 288 --------------- + docs/source/endpoints.rst | 430 ---------------------- + docs/source/extensions.rst | 183 ---------- + docs/source/index.rst | 6 +- + docs/source/middleware.rst | 169 --------- + docs/source/middleware_architecture.rst | 529 ---------------------------- + docs/source/migration.rst | 126 ------- + docs/source/nova-api-paste.rst | 142 -------- + docs/source/old/configuringservices.rst | 333 +++++++++++++++++ + docs/source/old/controllingservers.rst | 288 +++++++++++++++ + docs/source/old/endpoints.rst | 430 ++++++++++++++++++++++ + docs/source/old/extensions.rst | 183 ++++++++++ + docs/source/old/middleware.rst | 169 +++++++++ + docs/source/old/middleware_architecture.rst | 529 ++++++++++++++++++++++++++++ + docs/source/old/migration.rst | 126 +++++++ + docs/source/old/nova-api-paste.rst | 142 ++++++++ + docs/source/old/releases.rst | 36 ++ + docs/source/old/services.rst | 92 +++++ + docs/source/old/ssl.rst | 118 +++++++ + docs/source/releases.rst | 36 -- + docs/source/serviceAPI_curl_examples.rst | 69 ---- + docs/source/services.rst | 92 ----- + docs/source/ssl.rst | 118 ------- + docs/source/usingkeystone.rst | 28 -- + 27 files changed, 2450 insertions(+), 2934 deletions(-) + +commit e643f239816bae29e8206407db3d5eabdd2ea4b0 +Author: Joe Heck +Date: Sun Jan 29 10:57:02 2012 -0800 + + doc updates + + docs/source/api_curl_examples.rst | 442 ++++++++++++++++++++++++++++++++++++ + docs/source/architecture.rst | 4 + + docs/source/community.rst | 26 +-- + docs/source/configuration.rst | 224 ++++++++++++++---- + docs/source/developing.rst | 130 +++++------ + docs/source/index.rst | 20 +- + docs/source/man/keystone-manage.rst | 241 ++++++++++++-------- + docs/source/man/keystone.rst | 69 +++--- + docs/source/setup.rst | 71 ++++-- + docs/source/testing.rst | 77 ------- + keystone/cli.py | 2 +- + keystone/middleware/core.py | 38 ++++ + 12 files changed, 957 insertions(+), 387 deletions(-) + +commit 6b38e3ceb62515f1d28078d2f36b72548023521c +Author: Joe Heck +Date: Tue Jan 24 09:43:06 2012 -0800 + + moving in all the original docs from keystone + + docs/source/adminAPI_curl_examples.rst | 387 +++++++++++++++ + docs/source/architecture.rst | 97 ++++ + docs/source/backends.rst | 188 ++++++++ + docs/source/configuration.rst | 100 ++++ + docs/source/configuringservices.rst | 333 +++++++++++++ + docs/source/controllingservers.rst | 288 +++++++++++ + docs/source/endpoints.rst | 430 +++++++++++++++++ + docs/source/extensions.rst | 183 +++++++ + docs/source/images/305.svg | 158 ++++++ + docs/source/images/authComp.svg | 174 +++++++ + docs/source/images/both.svg | 135 ++++++ + docs/source/images/graphs_305.svg | 41 ++ + docs/source/images/graphs_authComp.svg | 48 ++ + docs/source/images/graphs_authCompDelegate.svg | 53 +++ + docs/source/images/graphs_both.svg | 36 ++ + docs/source/images/graphs_delegate_accept.svg | 52 ++ + .../images/graphs_delegate_forbiden_basic.svg | 53 +++ + .../images/graphs_delegate_forbiden_proxy.svg | 52 ++ + .../source/images/graphs_delegate_reject_basic.svg | 55 +++ + .../source/images/graphs_delegate_reject_oauth.svg | 56 +++ + .../images/graphs_delegate_unimplemented.svg | 53 +++ + docs/source/images/graphs_mapper.svg | 73 +++ + docs/source/images/graphs_proxyAuth.svg | 51 ++ + docs/source/images/graphs_separate.svg | 30 ++ + docs/source/images/graphs_standard_accept.svg | 51 ++ + docs/source/images/graphs_standard_reject.svg | 39 ++ + docs/source/images/graphs_together.svg | 24 + + docs/source/images/images_layouts.svg | 200 ++++++++ + docs/source/images/layouts.svg | 215 +++++++++ + docs/source/images/mapper.svg | 237 +++++++++ + docs/source/images/proxyAuth.svg | 238 +++++++++ + docs/source/middleware.rst | 169 +++++++ + docs/source/middleware_architecture.rst | 529 +++++++++++++++++++++ + docs/source/migration.rst | 126 +++++ + docs/source/nova-api-paste.rst | 142 ++++++ + docs/source/releases.rst | 36 ++ + docs/source/serviceAPI_curl_examples.rst | 69 +++ + docs/source/services.rst | 92 ++++ + docs/source/ssl.rst | 118 +++++ + docs/source/usingkeystone.rst | 28 ++ + 40 files changed, 5439 insertions(+) + +commit d23691b78b0491fad9fb2e2e02c4d99d4bbf34a0 +Merge: 20243af 68aa9cd +Author: Andy Smith +Date: Fri Jan 27 03:50:49 2012 -0800 + + Merge pull request #25 from 4P/pipup + + fixing up PIP requirements for testing and virtualenv + +commit 68aa9cd10fca548dcbf2a8a58d7cf902a1af655b +Author: Joe Heck +Date: Fri Jan 27 07:06:03 2012 +0000 + + adding python keystoneclient to setup.py deps + + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 080f523ff771c861251f1c33e32ec9ff2d358f88 +Author: Joe Heck +Date: Fri Jan 27 07:00:44 2012 +0000 + + fixing up PIP requirements for testing and virtualenv + + tools/pip-requires | 2 +- + tools/pip-requires-test | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 20243af977061ebee25e0383b8a789b056e19fd8 +Merge: 9095992 103fc87 +Author: Andy Smith +Date: Thu Jan 26 14:50:52 2012 -0800 + + Merge pull request #22 from chmouel/s3token + + Add s3tokens validation. + +commit 103fc87b8eb80eae4f20e23e9ad6485a33f360f7 +Author: Chmouel Boudjnah +Date: Thu Jan 26 14:29:47 2012 -0800 + + indents. + + keystone/contrib/ec2/core.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 9095992428e6e591ab75c50d1d7d9ccdea763bf4 +Merge: fa4cdc4 d6d56e4 +Author: Andy Smith +Date: Thu Jan 26 13:40:52 2012 -0800 + + Merge pull request #24 from termie/require_adminness + + initial stab at requiring adminness + +commit 3974760a4406060061017f03bb7eabe5b1937a23 +Author: Chmouel Boudjnah +Date: Thu Jan 26 13:29:38 2012 -0800 + + Make it as a subclass. + + as advised by termie make it as a subclass instead of patching the + method. + + keystone/contrib/s3/core.py | 26 ++++++++++---------------- + 1 file changed, 10 insertions(+), 16 deletions(-) + +commit d2e6f63fe107c17e344337b8db030733ed9bbb2e +Author: Dolph Mathews +Date: Thu Jan 26 15:29:34 2012 -0600 + + Added shortcut for id=NULL queries (bug 916386) + + Change-Id: I9d7ae05f860d4a8f56bb9b7ab77221e201478393 + + keystone/backends/sqlalchemy/api/credentials.py | 6 +++-- + .../backends/sqlalchemy/api/endpoint_template.py | 6 +++-- + keystone/backends/sqlalchemy/api/role.py | 6 +++-- + keystone/backends/sqlalchemy/api/service.py | 6 +++-- + keystone/backends/sqlalchemy/api/tenant.py | 12 +++++++++ + keystone/backends/sqlalchemy/api/token.py | 6 +++-- + keystone/backends/sqlalchemy/api/user.py | 31 +++++++++++++--------- + 7 files changed, 51 insertions(+), 22 deletions(-) + +commit d6d56e45dc416cbdb000266e2a3ad3a3880fd166 +Author: Jesse Andrews +Date: Thu Jan 26 15:04:54 2012 -0600 + + fix style and termie's comments about comments + + tests/test_keystoneclient.py | 49 +++++++++++++++++++++++++++++++------------- + 1 file changed, 35 insertions(+), 14 deletions(-) + +commit 726b5adab004d84cec061b1de2ab6fe306b08973 +Author: Jesse Andrews +Date: Thu Jan 26 00:30:24 2012 -0600 + + invalid params for roles.delete + + tests/test_keystoneclient.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d5443e2ef0ac8d1c33ba3644ddb9053b68a6ed0d +Author: Jesse Andrews +Date: Thu Jan 26 00:26:30 2012 -0600 + + initial stab at requiring adminness + + tests/test_keystoneclient.py | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit fa4cdc40356e25b6097306396b57c38e7b9ee363 +Merge: d4f2bf5 1efee11 +Author: Jesse Andrews +Date: Wed Jan 25 19:40:19 2012 -0800 + + Merge pull request #23 from termie/auth_invalid_tenant + + add tests that auth with tenant user isn't member of + +commit b1cd21426cc12ab65a89f617b9a8d09322dde009 +Author: Chmouel Boudjnah +Date: Thu Jan 26 01:37:37 2012 +0000 + + Simplify code. + + Per Termie's suggestion, share as much as possible with ec2 module and + instantiate s3 module from it. + + keystone/contrib/ec2/core.py | 52 +++++++++++++++---------- + keystone/contrib/s3/core.py | 91 +++++++++----------------------------------- + 2 files changed, 49 insertions(+), 94 deletions(-) + +commit 1efee11f587a73969c68a6c77fc97d786a1903e6 +Author: Jesse Andrews +Date: Wed Jan 25 19:33:43 2012 -0600 + + add tests that auth with tenant user isn't member of + + tests/default_fixtures.py | 1 + + tests/test_keystoneclient.py | 19 +++++++++++++++++-- + 2 files changed, 18 insertions(+), 2 deletions(-) + +commit fcea15df2a1dba5ae65f90a16e5f865a08d00457 +Author: Chmouel Boudjnah +Date: Wed Jan 25 16:50:14 2012 -0800 + + Add s3tokens validation. + + There is still some works to be done in the swift middleware but this + should works. + + Documentation and tests are in the planning. + + keystone/contrib/s3/__init__.py | 1 + + keystone/contrib/s3/core.py | 98 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 99 insertions(+) + +commit 2abbc77df6c5d9b0cbb94019285bb9527bf224c3 +Merge: df1dcc0 2e73dfa +Author: Jenkins +Date: Thu Jan 26 00:48:57 2012 +0000 + + Merge "Documented race condition (bug 921634)" + +commit df1dcc0d7026fb367ddb424c67c337ee98447334 +Merge: b653826 fd36f1f +Author: Jenkins +Date: Thu Jan 26 00:06:34 2012 +0000 + + Merge "add instructions for setting up a devenv on openSUSE 11.4 and 12.1" + +commit b65382614e84aee2ff187120c0512aa7660ebe4e +Merge: a86a661 2efd311 +Author: Jenkins +Date: Wed Jan 25 21:47:49 2012 +0000 + + Merge "Test coverage for issue described in bug 919335" + +commit 2efd3117bd8103f16bf561873deaa5210db257cb +Author: Dolph Mathews +Date: Wed Jan 25 13:53:23 2012 -0600 + + Test coverage for issue described in bug 919335 + + Change-Id: I5608968ba287e732216da9c883a32a16b2b15523 + + keystone/test/functional/test_auth.py | 58 +++++++++++++++++++++++++++++++++++ + 1 file changed, 58 insertions(+) + +commit a86a661b2900379139c363dae22aec50c5906da7 +Author: Dolph Mathews +Date: Wed Jan 25 13:35:32 2012 -0600 + + Removing __init__ from non-packages (bug 921054) + + These were mistakenly treated as packages long ago. + + Change-Id: I975b7c1cf310b6ca482a5a32c615ecab7fc9517f + + doc/__init__.py | 0 + examples/__init__.py | 0 + tools/__init__.py | 0 + 3 files changed, 0 insertions(+), 0 deletions(-) + +commit 4c680cf61d04f44b40dc418338000c08703a316e +Merge: 6d506f5 d1a3c5f +Author: Jenkins +Date: Wed Jan 25 19:33:42 2012 +0000 + + Merge "Fix race in TestCreateTokenCommand (bug 921634)" + +commit 6d506f5d1d693061201a666968fd9456d3253159 +Merge: 9e9e7f0 053345c +Author: Jenkins +Date: Wed Jan 25 17:08:12 2012 +0000 + + Merge "Forgot to update models (bug 885426)" + +commit fd36f1f3b9adf809af77cb67a0180d00326b0718 +Author: Ionuț Arțăriși +Date: Thu Jan 19 11:32:49 2012 +0100 + + add instructions for setting up a devenv on openSUSE 11.4 and 12.1 + + Change-Id: I171aba035326159a3d3fa0e2630dc21b1e6f0751 + + AUTHORS | 1 + + doc/source/setup.rst | 6 +++++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 2e73dface4258c6d2d796d23ce95357e1093027c +Author: Dolph Mathews +Date: Wed Jan 25 10:48:08 2012 -0600 + + Documented race condition (bug 921634) + + Change-Id: I6db4035c0b2067f309407232959091245e80e290 + + keystone/test/unit/test_commands.py | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) + +commit d1a3c5fa96928b05c3ecdbd8fa5be4bd12fb33ff +Author: Ralf Haferkamp +Date: Wed Jan 25 16:51:52 2012 +0100 + + Fix race in TestCreateTokenCommand (bug 921634) + + This fix should reduce the possiblity of failure significantly. + + Change-Id: I3a1a7d4eafd11ee8c73a97c45c3f9c38a63a0df0 + + keystone/test/unit/test_commands.py | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit 053345c4e6a9bbd8daaf4829e3a83829a7516785 +Author: Dolph Mathews +Date: Wed Jan 25 08:38:27 2012 -0600 + + Forgot to update models (bug 885426) + + Change-Id: Ic3ed3491839502e904a20a31b1032c941b008fba + + keystone/backends/sqlalchemy/models.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9e9e7f0c332b045337e72bf5e0e766fad4bd34a5 +Author: Eoghan Glynn +Date: Wed Jan 25 11:14:53 2012 +0000 + + Updating example glance paste config. + + The glance config has gone through a number of changes since + the sample paste files were added to keystone: + + - Add generic PasteDeploy app and filter factories + + [https://github.com/openstack/glance/commit/ba44d1c3] + + - Split out paste deployment config from the core glance + *.conf files into corresponding *-paste.ini files + + [https://github.com/openstack/glance/commit/14593a3b] + [https://github.com/openstack/glance/commit/5835b30c] + + Updating samples to conform to latest version supported by glance. + + Change-Id: I52bcdfd1760f6f844e0a44dabe3294886bb7aafd + + AUTHORS | 1 + + examples/paste/glance-api-paste.ini | 60 ++++++++++++++++++++++++++++++++ + examples/paste/glance-api.conf | 38 +++----------------- + examples/paste/glance-registry-paste.ini | 37 ++++++++++++++++++++ + examples/paste/glance-registry.conf | 27 ++------------ + 5 files changed, 105 insertions(+), 58 deletions(-) + +commit d4f2bf5fdefca433ee81075dd28be6f1b7387b50 +Author: termie +Date: Tue Jan 24 23:01:51 2012 -0800 + + add a bunch of basic tests for the cli + + keystone/cli.py | 146 ++++++++++++++++++++++++++++++++++++++++++- + keystone/common/wsgi.py | 1 - + keystone/test.py | 1 - + tests/test_cli.py | 61 ++++++++++++++++++ + tests/test_keystoneclient.py | 80 +++++++++++++----------- + 5 files changed, 249 insertions(+), 40 deletions(-) + +commit b1581a1852142548814d72deb0eebee238b4fdbf +Author: Dolph Mathews +Date: Mon Jan 23 11:02:01 2012 -0600 + + Migrated 'enabled' int columns to bool for postgres (bug 885426) + + Also included additional fixes for bp portable-identifiers + which were discovered by running existing tests against + postgres, per the bug referenced above. + + Change-Id: I6c51bb817ec12df33866ff632f906d17c90c8d54 + + keystone/backends/api.py | 6 +++ + keystone/backends/sqlalchemy/__init__.py | 9 ++-- + keystone/backends/sqlalchemy/api/service.py | 20 +++++++- + keystone/backends/sqlalchemy/api/tenant.py | 4 +- + keystone/backends/sqlalchemy/api/token.py | 3 ++ + keystone/backends/sqlalchemy/api/user.py | 21 ++++---- + .../migrate_repo/versions/001_initial_migration.py | 2 +- + .../versions/002_rename_token_table.py | 2 +- + .../versions/003_add_endpoint_template_versions.py | 2 +- + .../migrate_repo/versions/004_add_service_owner.py | 2 +- + .../migrate_repo/versions/005_add_tenants_uid.py | 2 +- + .../versions/006_populate_tenants_uid.py | 2 +- + .../versions/007_make_tenants_uid_unique.py | 2 +- + .../migrate_repo/versions/008_add_users_uid.py | 2 +- + .../versions/009_populate_users_uid.py | 2 +- + .../versions/010_make_users_uid_unique.py | 2 +- + .../versions/011_is_enabled_boolean.py | 58 ++++++++++++++++++++++ + .../versions/011_postgresql_downgrade.sql | 5 ++ + .../versions/011_postgresql_upgrade.sql | 5 ++ + keystone/logic/service.py | 2 +- + keystone/manage2/__init__.py | 54 +++++++++++++++++++- + keystone/managers/credential.py | 2 +- + keystone/test/functional/test_token.py | 16 ++++-- + keystone/test/unit/test_commands_v1.py | 8 +-- + pylintrc | 3 +- + 25 files changed, 196 insertions(+), 40 deletions(-) + +commit 608b9a270bf2bdc017e02d2575669ec62d0645e7 +Author: termie +Date: Tue Jan 24 20:29:33 2012 -0800 + + remove this useless catalog + + tests/keystone_compat_diablo_sample_catalog.json | 53 ------------------------ + 1 file changed, 53 deletions(-) + +commit de6a98a1381090583f253ccbaa9c5af3c392e877 +Author: termie +Date: Tue Jan 24 20:28:18 2012 -0800 + + move cli code into a module for testing + + bin/keystone-manage | 204 +-------------------------------------------------- + keystone/cli.py | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 209 insertions(+), 201 deletions(-) + +commit 56f7ad831765bc0d5446cf8f7cd8675a7527dc9e +Merge: b207a49 8c6e606 +Author: Jenkins +Date: Wed Jan 25 03:54:00 2012 +0000 + + Merge "Updated bp keystone-configuration for bp keystone-manage2" + +commit 8c6e606110e26415f81e4177f433528e659182cb +Author: Dolph Mathews +Date: Tue Jan 24 19:03:58 2012 -0600 + + Updated bp keystone-configuration for bp keystone-manage2 + + - Centralized sql_connection method + - Avoided initializing commands that weren't being called + + Change-Id: I8231ed4ee4c384f948703b5620acef9f27265f55 + + keystone/manage2/__init__.py | 3 +-- + keystone/manage2/base.py | 11 +++++++---- + keystone/manage2/commands/downgrade_database.py | 6 ------ + keystone/manage2/commands/goto_database.py | 6 ------ + keystone/manage2/commands/sync_database.py | 6 ------ + keystone/manage2/commands/upgrade_database.py | 6 ------ + keystone/manage2/commands/version.py | 6 ------ + keystone/manage2/commands/version_control_database.py | 6 ------ + keystone/manage2/common.py | 2 +- + keystone/test/client/test_keystone_manage.py | 2 +- + 10 files changed, 10 insertions(+), 44 deletions(-) + +commit b207a49cf9cf8f091fdadc0da06970e016101dc3 +Author: Ziad Sawalha +Date: Tue Jan 24 20:52:46 2012 -0600 + + Return Version and Tenant in Endpoints + + - fixes bug 920817 + - adds basic tests for this case + + Change-Id: If32884ba149b089f93dc4278271d85c84f0f738c + + keystone/logic/types/auth.py | 18 ++++- + keystone/models.py | 10 +-- + keystone/test/unit/test_logic_auth.py | 132 ++++++++++++++++++++++++++++++++++ + 3 files changed, 153 insertions(+), 7 deletions(-) + +commit 23c396df0b42bda0fb373fb4b93d0b66e3069e87 +Author: Dolph Mathews +Date: Tue Jan 24 19:01:26 2012 -0600 + + Updated error message for keystone-manage2 + + Change-Id: I731ae211ead97cc3d7a1e8f281b67ce4ae9f7b3b + + keystone/backends/sqlalchemy/__init__.py | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit a6a6124ccd5790bd60eef55880403a4a9f736564 +Author: termie +Date: Tue Jan 24 16:49:29 2012 -0800 + + allow class names to be different from attr names + + bin/keystone-manage | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit f5dbc98dffa3216506453c6dbf038972577fe3fc +Author: termie +Date: Tue Jan 24 16:33:31 2012 -0800 + + add ec2 credentials to the cli + + bin/keystone-manage | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 51a2c185ff41b373def1f6c7f7635f652c0d1dff +Author: termie +Date: Tue Jan 24 15:55:44 2012 -0800 + + fix middleware + + keystone/middleware/auth_token.py | 2 +- + keystone/middleware/swift_auth.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e2f86075ec198bfeb2a48af708ae09fe771ac98d +Author: Carlos Marin +Date: Tue Jan 24 10:45:10 2012 -0600 + + Added: "UserWithPassword" + Added: "UserWithOnlyEnabled" + Removed: "UserWithOnlyPassword" + + Included samples. + + UPDATED: JSON sample whitespaces. + + Change-Id: I4c15a7ab34843918ed2e32281b740204c951dc9f + + .../common/samples/RAX-KSADM-userWithPassword.json | 8 +++++++ + .../common/samples/RAX-KSADM-userWithPassword.xml | 6 +++++ + keystone/content/common/xsd/RAX-KSADM-users.xsd | 28 +++++++++++++++++++--- + 3 files changed, 39 insertions(+), 3 deletions(-) + +commit 27d14119f9d7602d36038548be70850462197f41 +Merge: 2dbb2a6 b680202 +Author: Jenkins +Date: Tue Jan 24 20:44:17 2012 +0000 + + Merge "Fix for bug 921126" + +commit 2dbb2a6bf92686e396f176c932dc0dfa358e8804 +Author: Ziad Sawalha +Date: Tue Jan 24 12:45:00 2012 -0600 + + Update Extended Credentials (EC2, S3) + + - format should be extension:credential. + - older format (extension-credentials, or ec2Credentials + still supported for compatibility + + Change-Id: I3e2651a37baeae411e626e97c4eb4e992cf4cf2f + + .../common/samples/auth_credentials-OS-KSEC2.json | 2 +- + .../content/common/samples/credentialswithec2.json | 2 +- + .../content/common/samples/credentialswiths3.json | 2 +- + .../content/common/samples/ec2Credentials.json | 2 +- + keystone/content/common/samples/s3Credentials.json | 2 +- + keystone/controllers/token.py | 9 +++++-- + keystone/logic/types/auth.py | 8 +++---- + keystone/middleware/ec2_token.py | 5 ++-- + keystone/middleware/s3_token.py | 2 +- + keystone/test/unit/test_authn_ec2.py | 2 +- + keystone/test/unit/test_authn_s3.py | 8 +++---- + run_tests.py | 28 +++++++--------------- + 12 files changed, 33 insertions(+), 39 deletions(-) + +commit b680202c644d3849b096e1c8b282db649f646673 +Author: Brian Lamar +Date: Tue Jan 24 13:31:04 2012 -0500 + + Fix for bug 921126 + + Updated soon-to-be-legacy 'keystone-manage database sync' to pass the + correct information to migrate lib. + + Change-Id: Id3a8345c17efd4be7c2056db68dade4bdb86cf9a + + keystone/manage/__init__.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 36a18b84a5d1b700536caf67e16edd7425bc196e +Merge: 02409a8 5ce7e70 +Author: Jenkins +Date: Tue Jan 24 17:07:32 2012 +0000 + + Merge "Restore Console Info Logging - bp keystone-logging" + +commit 02409a8c6f19a320f00b85019856049a89dfd3db +Merge: 027782a ef6c133 +Author: Jenkins +Date: Tue Jan 24 16:31:25 2012 +0000 + + Merge "Release Notes for E3" + +commit 027782a95f6eada6c0ffca610accc1e0e2f95d11 +Author: Akira YOSHIYAMA +Date: Sun Jan 15 23:20:07 2012 +0900 + + Adds keystone auth-n/auth-z for Swift S3 API. + + This capability has three parts: + + a) a keystone patch to handle OS-KSS3-s3Credentials + when received in a POST to /tokens. + b) a new keystone middleware s3_token.py for swift. + c) a swift patch to use token and endpoints from keystone via b). + + This patch contains a) and b). + + Note: modified by zns to get it in by E3. + + See: + blueprint s3token + bug #874280 + + Change-Id: I9021de064177db358ea6d727c570f4e3bcd6e56c + + examples/paste/swift-proxy-server.conf | 41 ++++ + keystone/content/admin/OS-KSS3-admin.wadl | 212 ++++++++++++++++++ + .../content/common/samples/credentialswiths3.json | 17 ++ + .../content/common/samples/credentialswiths3.xml | 7 + + keystone/content/common/samples/s3Credentials.json | 7 + + keystone/content/common/samples/s3Credentials.xml | 7 + + .../content/common/xsd/OS-KSS3-credentials.xsd | 35 +++ + keystone/controllers/token.py | 12 + + keystone/logic/service.py | 23 +- + keystone/logic/signer.py | 30 ++- + keystone/logic/types/auth.py | 133 ++++++++++- + keystone/middleware/s3_token.py | 161 ++++++++++++++ + keystone/routers/service.py | 1 + + keystone/test/unit/test_authn_s3.py | 245 +++++++++++++++++++++ + setup.py | 1 + + 15 files changed, 929 insertions(+), 3 deletions(-) + +commit 5b8682f2aa15ca1b677ab3eeeede7ab6d8e5e5d3 +Author: Ed Leafe +Date: Fri Jan 20 17:23:12 2012 +0000 + + Implement cfg.py + + - Updates configuration handling to use module + other projects use. + - Fixed the command-line to accept options that + override config file settings. + + bp keystone-configuration + + Change-Id: I63958b1cc2918f5984c65164f6b3e5116efd0ea6 + + bin/keystone | 80 +- + bin/keystone-admin | 25 +- + bin/keystone-auth | 25 +- + doc/source/extensions.rst | 12 +- + etc/keystone.conf | 42 +- + keystone/backends/__init__.py | 51 +- + keystone/backends/ldap/__init__.py | 4 +- + keystone/backends/ldap/api/__init__.py | 14 +- + keystone/backends/ldap/api/base.py | 21 +- + keystone/backends/sqlalchemy/__init__.py | 12 +- + keystone/backends/sqlalchemy/api/role.py | 4 +- + keystone/backends/sqlalchemy/api/service.py | 24 +- + keystone/backends/sqlalchemy/api/tenant.py | 23 +- + keystone/backends/sqlalchemy/api/user.py | 22 +- + keystone/backends/sqlalchemy/migration.py | 52 +- + keystone/cfg.py | 1185 ++++++++++++++++++++ + keystone/client.py | 2 +- + keystone/common/config.py | 9 +- + keystone/common/wsgi.py | 50 +- + keystone/config.py | 176 +++ + keystone/contrib/extensions/__init__.py | 15 +- + keystone/contrib/extensions/admin/__init__.py | 6 +- + keystone/contrib/extensions/admin/extension.py | 2 +- + .../contrib/extensions/admin/hpidm/__init__.py | 2 +- + .../contrib/extensions/admin/osksadm/__init__.py | 12 +- + .../extensions/admin/oskscatalog/__init__.py | 4 +- + .../extensions/admin/osksvalidate/__init__.py | 6 +- + .../extensions/admin/osksvalidate/handler.py | 5 +- + keystone/controllers/__init__.py | 14 - + keystone/controllers/base_controller.py | 44 + + keystone/controllers/credentials.py | 12 +- + keystone/controllers/endpointtemplates.py | 14 +- + keystone/controllers/extensions.py | 10 +- + keystone/controllers/roles.py | 14 +- + keystone/controllers/services.py | 12 +- + keystone/controllers/staticfiles.py | 9 +- + keystone/controllers/tenant.py | 13 +- + keystone/controllers/token.py | 30 +- + keystone/controllers/user.py | 14 +- + keystone/controllers/version.py | 8 +- + keystone/frontends/normalizer.py | 2 +- + keystone/logic/extension_reader.py | 39 +- + keystone/logic/service.py | 31 +- + keystone/logic/types/auth.py | 2 - + keystone/manage/__init__.py | 44 +- + keystone/manage2/__init__.py | 4 +- + keystone/manage2/base.py | 8 +- + keystone/manage2/commands/downgrade_database.py | 11 +- + keystone/manage2/commands/goto_database.py | 12 +- + keystone/manage2/commands/sync_database.py | 11 +- + keystone/manage2/commands/upgrade_database.py | 11 +- + keystone/manage2/commands/version.py | 11 +- + .../manage2/commands/version_control_database.py | 11 +- + keystone/manage2/common.py | 37 +- + keystone/managers/credential.py | 3 +- + keystone/managers/endpoint.py | 3 +- + keystone/managers/endpoint_template.py | 3 +- + keystone/managers/grant.py | 3 +- + keystone/managers/role.py | 3 +- + keystone/managers/service.py | 3 +- + keystone/managers/tenant.py | 3 +- + keystone/managers/token.py | 3 +- + keystone/managers/user.py | 3 +- + keystone/routers/admin.py | 20 +- + keystone/routers/service.py | 14 +- + keystone/server.py | 75 +- + keystone/test/__init__.py | 32 +- + keystone/test/client/test_d5_compat_calls.py | 8 +- + keystone/test/client/test_keystone_manage.py | 2 +- + keystone/test/functional/common.py | 38 +- + keystone/test/unit/base.py | 60 +- + keystone/test/unit/test_backends.py | 153 ++- + keystone/test/unit/test_cfg.py | 826 ++++++++++++++ + keystone/test/unit/test_commands.py | 23 +- + keystone/test/unit/test_commands_v1.py | 10 +- + keystone/test/unit/test_config.py | 70 ++ + keystone/test/unit/test_controller_version.py | 2 +- + keystone/test/unit/test_extensions.py | 46 +- + keystone/test/unit/test_migrations.py | 19 +- + keystone/test/utils.py | 4 +- + keystone/tools/tracer.py | 2 +- + keystone/utils.py | 64 +- + 82 files changed, 3153 insertions(+), 655 deletions(-) + +commit 4899210334a030c541e13aa994b25b3996bb3cc9 +Author: termie +Date: Tue Jan 24 00:56:53 2012 -0800 + + bcrypt the passwords + + keystone/common/utils.py | 25 +++++++++++++++++++++++++ + keystone/config.py | 12 ++++++++++++ + keystone/identity/backends/kvs.py | 27 +++++++++++++++++++-------- + keystone/identity/backends/sql.py | 13 ++++++++++++- + keystone/identity/core.py | 7 ++----- + keystone/test.py | 10 ++++++++-- + tests/test_backend.py | 5 +++++ + tests/test_keystoneclient.py | 10 ++-------- + tests/test_keystoneclient_sql.py | 2 +- + tests/test_overrides.conf | 3 +++ + tools/pip-requires | 1 + + 11 files changed, 90 insertions(+), 25 deletions(-) + +commit e344821225d0f44461eff9376de8509660ecd4e1 +Author: termie +Date: Mon Jan 23 17:47:48 2012 -0800 + + fix token vs auth_token + + bin/keystone-manage | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 28dac4595cbdaab82d108992f43321efbb925199 +Author: Ziad Sawalha +Date: Fri Jan 6 16:47:08 2012 -0600 + + Implement Secure Token Auth + + - Added OS-KSVALIDATE extension that supports + /tokens calls with the token supplied in the + headers. Using X-Subject-Token instead of in the + URL. + - Addresses bug 861854 + + Change-Id: Ib6798a98683111c8ce7dfd70a99603ddf1f85248 + + doc/source/extensions.rst | 10 ++ + etc/keystone.conf | 2 +- + keystone/common/bufferedhttp.py | 2 +- + keystone/common/crypt.py | 74 ++++++++ + keystone/content/admin/OS-KSVALIDATE-admin.wadl | 192 +++++++++++++++++++++ + keystone/content/common/samples/extensions.json | 5 +- + .../contrib/extensions/admin/hpidm/__init__.py | 10 +- + .../extensions/admin/osksvalidate/__init__.py | 39 +++++ + .../extensions/admin/osksvalidate/extension.json | 21 +++ + .../extensions/admin/osksvalidate/extension.xml | 15 ++ + .../extensions/admin/osksvalidate/handler.py | 47 +++++ + keystone/controllers/token.py | 40 +++-- + keystone/middleware/auth_token.py | 153 +++++++++++++--- + keystone/middleware/crypt.py | 74 ++++++++ + keystone/routers/admin.py | 6 +- + 15 files changed, 636 insertions(+), 54 deletions(-) + +commit 9f0bb492128e396dcdb0d0be76bce913718a6611 +Author: termie +Date: Mon Jan 23 17:27:36 2012 -0800 + + some quick fixes to cli, tests incoming + + bin/keystone-manage | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit aaf75e9bb0f8a4d19ffb1bac39a737982ca8e6bf +Author: termie +Date: Mon Jan 23 17:22:10 2012 -0800 + + fix pep8 + + keystone/contrib/ec2/core.py | 8 ++++---- + keystone/identity/backends/kvs.py | 1 + + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit e4a00e05e93094f7b7f9ff8dbac374c56669ffc6 +Author: termie +Date: Mon Jan 23 17:19:01 2012 -0800 + + fix some more pass-by-reference bugs + + keystone/identity/backends/kvs.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit da4f95527953938692627a9ba12f21731cb1c12e +Author: termie +Date: Mon Jan 23 17:18:47 2012 -0800 + + strip password before checking output + + tests/test_backend.py | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 8ad8d88dc65daf2662fde34033619a4918be6129 +Author: termie +Date: Mon Jan 23 17:18:30 2012 -0800 + + flip actual and expected to match common api + + keystone/test.py | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 8ffee09635c5be69a578376d309bcfc5b7b8c927 +Author: termie +Date: Mon Jan 23 16:49:28 2012 -0800 + + don't allow disabled users to authenticate + + keystone/service.py | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 5a8a8ae6d7341138ff28395d67d4acc8e467e7ba +Author: termie +Date: Mon Jan 23 16:35:58 2012 -0800 + + turn off echo + + keystone/common/sql/core.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2ebb89bf8024d2700a9c884763da795fba35b14f +Author: termie +Date: Mon Jan 23 16:35:41 2012 -0800 + + fix invalid_password, skip ec2 tests + + tests/test_keystoneclient.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 88b88a9e6f515fe617da724993a327b5bbc12aaa +Merge: 5f69fbb 92462c8 +Author: Jenkins +Date: Tue Jan 24 00:01:39 2012 +0000 + + Merge "Suppressed backtraces in tests causes sweaty eyes" + +commit 92462c8f59410984b142a99b49e9e3bf6050aebd +Author: Dolph Mathews +Date: Mon Jan 23 17:05:40 2012 -0600 + + Suppressed backtraces in tests causes sweaty eyes + + Change-Id: Ieaceaea5d44860cc096e847977dc076db64765f6 + + keystone/test/client/test_keystone_manage.py | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 57b24dde131a349afb7a533b6a54f6ab1362eeae +Author: termie +Date: Mon Jan 23 14:56:38 2012 -0800 + + strip password from sql backend + + keystone/identity/backends/sql.py | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +commit 3cce41e2804ca93897144b84418d523d9954c660 +Author: termie +Date: Mon Jan 23 14:53:37 2012 -0800 + + raise and catch correct authenticate error + + keystone/service.py | 13 ++++++++----- + tests/test_keystoneclient.py | 3 +-- + 2 files changed, 9 insertions(+), 7 deletions(-) + +commit c59370eda09cf0ce1f71b45f1b3321e3a687ef7b +Author: termie +Date: Mon Jan 23 14:52:53 2012 -0800 + + rely on internal _get_user for update calls + + keystone/identity/core.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5f69fbba77d73eff185d5b7670a539af548e8740 +Author: Dolph Mathews +Date: Mon Jan 23 16:47:53 2012 -0600 + + Fixed: Inserting URLs into endpoint version attr + + version_id is defined to be a varchar(20), and the + uuid's urls being inserted were way too long + + Change-Id: Ibcedda18678249f77cb37a54c7acfb490ba9f2c0 + + keystone/test/functional/common.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 36a0190f08b0a614d188db75febd2380c822c122 +Author: termie +Date: Mon Jan 23 14:33:49 2012 -0800 + + strip password from kvs backend + + keystone/common/kvs.py | 5 ++++- + keystone/identity/backends/kvs.py | 26 +++++++++++++++++++------- + 2 files changed, 23 insertions(+), 8 deletions(-) + +commit 86dad078f4b4b6db49e63578ee809e08d92fcfdb +Author: termie +Date: Mon Jan 23 14:30:22 2012 -0800 + + fix user_get/user_list tests + + tests/test_keystoneclient.py | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit ef6c1335fc51e73354807f272fd75b033848edb7 +Author: Ziad Sawalha +Date: Mon Jan 23 14:54:44 2012 -0600 + + Release Notes for E3 + + Change-Id: I4b3dd0275defccb57c16f5aa5e57531b6a51bcce + + doc/source/releases.rst | 22 +++++++++++++++++++--- + 1 file changed, 19 insertions(+), 3 deletions(-) + +commit 45b36369a39e5e3cde6453312d73f85268dcd372 +Author: Ziad Sawalha +Date: Thu Jan 19 20:10:08 2012 -0600 + + Addresses bug 918608 + + - limit needs to be an integer + + Change-Id: I651dd336437f01f514baeaf880c2c73c9c5fee7b + + .../backends/sqlalchemy/api/endpoint_template.py | 16 ++++++++-------- + keystone/backends/sqlalchemy/api/role.py | 20 +++++++++++--------- + keystone/backends/sqlalchemy/api/service.py | 9 +++++---- + keystone/backends/sqlalchemy/api/tenant.py | 13 +++++++------ + keystone/backends/sqlalchemy/api/user.py | 14 +++++++------- + 5 files changed, 38 insertions(+), 34 deletions(-) + +commit 5ce7e70d5a2efed61c303c9a276e7ec362a9d265 +Author: Ziad Sawalha +Date: Fri Jan 20 16:47:20 2012 -0600 + + Restore Console Info Logging + - bp keystone-logging + + Change-Id: Ie4e4af171faa4d33b031afa17adf0aa4c321f2cc + + keystone/common/config.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit 507d5f2de39abee3b9cd0786e0f6d95875ccc929 +Merge: f943977 28760bd +Author: Andy Smith +Date: Fri Jan 20 12:53:54 2012 -0800 + + Merge pull request #21 from 4P/doc2 + + removing the sphinx_build from setup.py + +commit 28760bd33be09e29b3b1490409eced74e243d88e +Author: Joe Heck +Date: Fri Jan 20 20:51:54 2012 +0000 + + removing the sphinx_build from setup.py, adding how to run the docs into the README + + README.rst | 18 ++++++++++++++++++ + setup.py | 26 -------------------------- + 2 files changed, 18 insertions(+), 26 deletions(-) + +commit f2726df39c3ec4e50448361e3be4cfba45e4fa93 +Author: Dolph Mathews +Date: Fri Jan 20 14:22:20 2012 -0600 + + Added Vary header to support caching (bug 913895) + + Change-Id: I26dca09ace688a25cf207214808e8a9c919621c4 + + keystone/test/client/test_request_specs.py | 31 ++++++++++++++++++++++++++++++ + keystone/utils.py | 4 ++++ + 2 files changed, 35 insertions(+) + +commit fc9dcb4f51731dcb5e264538142a83b3f6b8752d +Merge: 95fb6d1 6362857 +Author: Jenkins +Date: Fri Jan 20 19:48:15 2012 +0000 + + Merge "Handle EC2 Credentials on /tokens" + +commit 95fb6d13fb716b7312967bdc3f1877c0993b7c91 +Author: Dolph Mathews +Date: Fri Jan 20 09:23:04 2012 -0600 + + Implemented subparsers (bp keystone-manage2) + + Using subparsers improves CLI feedback and simplifies the way we handle + commands. + + Change-Id: I6fa3a6f056f408b5af2d95bb5650f7c9a76c00be + + keystone/manage2/__init__.py | 44 +++++++++++++++++++------------------------- + 1 file changed, 19 insertions(+), 25 deletions(-) + +commit 63628575417514f980af52f1e99d54a66d97276a +Author: Ziad Sawalha +Date: Fri Jan 20 04:12:10 2012 -0600 + + Handle EC2 Credentials on /tokens + + - EC2 credentials are just another type of credential + that can be passed in to /tokens. This patch now + handles those credentials correctly. + - POST /tokens {'auth': {'OS-EC2-ec2Credentials...} + now works correctly. + - Multiple credential handling is improved. There is + a detect_credentials call in utils now to detect + the different types. + + Addresses: + - bug 843058 + - bug 904523 + Prepares for: + - bp s3token + - bp keystone-client + + Change-Id: I43931fdc7b8a9b76eac351e11394cfa507911578 + + keystone/controllers/token.py | 39 +++++++---- + keystone/logic/types/auth.py | 25 +++++-- + keystone/middleware/ec2_token.py | 4 +- + keystone/routers/service.py | 1 + + keystone/test/unit/test_authn_ec2.py | 129 ++++++++++++++++++++++++++++++++++- + keystone/test/unit/test_utils.py | 72 ++++++++++++++++++- + keystone/utils.py | 49 +++++++++++++ + 7 files changed, 293 insertions(+), 26 deletions(-) + +commit f94397743ea0ed008181c22ec2eafd67a83217f2 +Author: Jesse Andrews +Date: Fri Jan 20 00:10:47 2012 -0800 + + ec2 docs + + keystone/contrib/ec2/core.py | 82 ++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 76 insertions(+), 6 deletions(-) + +commit 269159f67dd5772d2cac02f9e9941785e65f0561 +Author: Jesse Andrews +Date: Thu Jan 19 23:00:51 2012 -0800 + + simple docstrings for ec2 crud + + keystone/contrib/ec2/core.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 9e1e113901639d40ed28a558e8710baf3deba2c7 +Author: Dolph Mathews +Date: Thu Jan 19 14:10:05 2012 -0600 + + Fixed PEP8 violations and disallowed them + + Change-Id: I0fb83c47323be392882df40ea728e8dc00300996 + + keystone/tools/buffout.py | 2 -- + run_tests.sh | 1 - + 2 files changed, 3 deletions(-) + +commit 8b3df32298953e4906d1471430cb794ffb575ce9 +Author: Dolph Mathews +Date: Tue Jan 3 09:11:04 2012 -0600 + + Implemented bp keystone-manage2 + + $ ./bin/keystone-manage --help + usage: keystone-manage [-h] command + + OpenStack Identity (Keystone) Management + + positional arguments: + command create_credential, create_endpoint, create_endpoint_template, + create_role, create_service, create_tenant, create_token, + create_user, delete_credential, delete_endpoint, + delete_endpoint_template, delete_role, delete_service, + delete_tenant, delete_token, delete_user, downgrade_database, + goto_database, grant_role, list_credentials, + list_endpoint_templates, list_endpoints, list_roles, + list_services, list_tenants, list_tokens, list_users, + map_endpoint, revoke_role, sync_database, unmap_endpoint, + update_credential, update_endpoint_template, update_role, + update_service, update_tenant, update_token, update_user, + upgrade_database, version, version_control_database + + optional arguments: + -h, --help show this help message and exit + + Change-Id: I67ec29be8ce6407a1e1f5ce8f1b0e00e86c07d8d + + keystone/backends/ldap/api/role.py | 6 +- + keystone/backends/sqlalchemy/api/credentials.py | 31 +- + .../backends/sqlalchemy/api/endpoint_template.py | 44 +- + keystone/backends/sqlalchemy/api/role.py | 12 + + keystone/backends/sqlalchemy/api/service.py | 29 +- + keystone/backends/sqlalchemy/api/token.py | 22 +- + keystone/controllers/staticfiles.py | 15 +- + keystone/logic/service.py | 14 +- + keystone/logic/types/atom.py | 3 + + keystone/logic/types/auth.py | 2 + + keystone/logic/types/tenant.py | 2 +- + keystone/manage2/__init__.py | 16 +- + keystone/manage2/base.py | 111 ++ + keystone/manage2/commands/create_credential.py | 43 + + .../manage2/commands/create_endpoint_template.py | 62 ++ + keystone/manage2/commands/create_role.py | 36 + + keystone/manage2/commands/create_service.py | 42 + + keystone/manage2/commands/create_tenant.py | 38 + + keystone/manage2/commands/create_token.py | 59 + + keystone/manage2/commands/create_user.py | 55 + + keystone/manage2/commands/delete_credential.py | 18 + + .../manage2/commands/delete_endpoint_template.py | 18 + + keystone/manage2/commands/delete_role.py | 18 + + keystone/manage2/commands/delete_service.py | 18 + + keystone/manage2/commands/delete_tenant.py | 21 + + keystone/manage2/commands/delete_token.py | 18 + + keystone/manage2/commands/delete_user.py | 21 + + keystone/manage2/commands/downgrade_database.py | 18 + + keystone/manage2/commands/goto_database.py | 24 + + keystone/manage2/commands/grant_role.py | 45 + + keystone/manage2/commands/list_credentials.py | 23 + + .../manage2/commands/list_endpoint_templates.py | 23 + + keystone/manage2/commands/list_endpoints.py | 20 + + keystone/manage2/commands/list_roles.py | 20 + + keystone/manage2/commands/list_services.py | 21 + + keystone/manage2/commands/list_tenants.py | 22 + + keystone/manage2/commands/list_tokens.py | 23 + + keystone/manage2/commands/list_users.py | 23 + + keystone/manage2/commands/map_endpoint.py | 37 + + keystone/manage2/commands/revoke_role.py | 40 + + keystone/manage2/commands/sync_database.py | 18 + + keystone/manage2/commands/unmap_endpoint.py | 28 + + keystone/manage2/commands/update_credential.py | 55 + + .../manage2/commands/update_endpoint_template.py | 88 ++ + keystone/manage2/commands/update_role.py | 40 + + keystone/manage2/commands/update_service.py | 47 + + keystone/manage2/commands/update_tenant.py | 40 + + keystone/manage2/commands/update_token.py | 42 + + keystone/manage2/commands/update_user.py | 62 ++ + keystone/manage2/commands/upgrade_database.py | 18 + + keystone/manage2/commands/version.py | 43 +- + .../manage2/commands/version_control_database.py | 14 + + keystone/manage2/common.py | 62 +- + keystone/manage2/mixins.py | 42 + + keystone/managers/credential.py | 15 + + keystone/managers/endpoint.py | 12 +- + keystone/managers/endpoint_template.py | 12 +- + keystone/managers/grant.py | 2 +- + keystone/managers/role.py | 9 +- + keystone/managers/service.py | 7 +- + keystone/managers/tenant.py | 6 +- + keystone/managers/token.py | 8 + + keystone/managers/user.py | 4 + + keystone/models.py | 39 +- + keystone/test/unit/base.py | 3 - + keystone/test/unit/test_commands.py | 1168 +++++++++++++++++++- + keystone/test/unit/test_models_endpoint.py | 2 - + .../test/unit/test_models_endpoint_template.py | 1 - + keystone/test/utils.py | 1 - + keystone/tools/buffout.py | 10 +- + 70 files changed, 2867 insertions(+), 144 deletions(-) + +commit 8c98285ad0c1b24efe35a3ea777da58fb0d67054 +Author: Ziad Sawalha +Date: Thu Jan 19 11:19:13 2012 -0600 + + Fixes 918535: time not properly parsed in auth_token middleware + + - replaced get_datetime() with expanded _convert_datetime() + function that uses datutil parser to handle any date + string. + - added tests + - fixes bug 918535 + - also addresses bug 911197 + + Change-Id: I7f4e3c01b1b7466fd5f30889c7b28deae9fc9367 + + keystone/middleware/auth_token.py | 33 +++++++++------------------------ + 1 file changed, 9 insertions(+), 24 deletions(-) + +commit fd65f4c0b4ef5283c2090799d56ee23bacdb258f +Merge: 565e329 159757c +Author: Jenkins +Date: Fri Jan 20 04:56:20 2012 +0000 + + Merge "Use dateutil 1.5" + +commit 565e3293057b91f3540b19c7891df09f6323f30b +Merge: 70e5a00 1b44286 +Author: Jenkins +Date: Fri Jan 20 04:46:42 2012 +0000 + + Merge "fix bug lp:843064" + +commit 159757ccf9faca7581fc8d29f5d1b16afb615358 +Author: Ziad Sawalha +Date: Thu Jan 19 22:36:35 2012 -0600 + + Use dateutil 1.5 + + - 2.0 has problems on some platforms with + python 2.x + + Change-Id: Ic6b243b352b4fdf24c91d00ded9199b7bfd0ec64 + + tools/pip-requires | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d8ddc074f026a2b7c72cdb2107ed8ff790a4bb5f +Author: termie +Date: Thu Jan 19 20:36:06 2012 -0800 + + get docs working + + docs/Makefile | 2 +- + docs/generate_autodoc_index.py | 76 ------------------------------------------ + keystone/catalog/core.py | 3 -- + keystone/contrib/ec2/core.py | 3 -- + keystone/identity/core.py | 3 -- + keystone/policy/core.py | 3 -- + keystone/token/core.py | 3 -- + 7 files changed, 1 insertion(+), 92 deletions(-) + +commit ed8bf3b7066a7cf6e80d04ab82788cdb89ade3f2 +Merge: e34e694 f40198d +Author: Andy Smith +Date: Thu Jan 19 20:33:00 2012 -0800 + + Merge pull request #19 from 4P/basedocs + + Basedocs + +commit e34e694ee85c0c453a1779fe5f90fa6debae52e5 +Merge: ea78b2e c83bcb1 +Author: Andy Smith +Date: Thu Jan 19 20:15:48 2012 -0800 + + Merge pull request #20 from termie/no_pass_field + + add checks for no password attribute + +commit ea78b2e4fcdefd13e35cb1eb28559f18a9cc6f1c +Author: termie +Date: Thu Jan 19 15:54:14 2012 -0800 + + some cli improvements + + prints available commands and config values when no arguments are given + prints available subcommands when command is given but no subocmmand is + + bin/keystone-manage | 75 +++++++++++++++++++++++++++++++++++++++++++++++------ + keystone/config.py | 45 ++++++++++++++++++++++---------- + 2 files changed, 99 insertions(+), 21 deletions(-) + +commit d8b499bd6dc1fe87c824b9a03dcbb6f5bd574b12 +Merge: 0df93eb 2a91b1c +Author: Andy Smith +Date: Thu Jan 19 20:09:39 2012 -0800 + + Merge pull request #18 from termie/fail_login + + test login fails with invalid password or disabled user + +commit c83bcb1aac9bcbf0ceea7bf4defa905490bebf05 +Author: Jesse Andrews +Date: Thu Jan 19 18:37:30 2012 -0800 + + add checks for no password attribute + + tests/test_keystoneclient.py | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 70e5a00c1f26c9568c5d992b4367131c1148587b +Author: Ziad Sawalha +Date: Thu Jan 19 20:24:45 2012 -0600 + + Prestage fix + - fixed requirement name; python-dateutil, not dateutil + + Change-Id: Idda16107e0a86aeaded7c63e51a8fa38e51d8764 + + tools/pip-requires | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f2825c997d5c88657478def080f8608ef322047e +Merge: 0d46091 2d18686 +Author: Jenkins +Date: Fri Jan 20 02:20:37 2012 +0000 + + Merge "Pre-staging pip requires" + +commit 2a91b1c06e8aa50ea603fd1c104ddea8e1649230 +Author: Jesse Andrews +Date: Thu Jan 19 18:13:05 2012 -0800 + + users with correct credentials but disabled are forbidden not unauthorized + + tests/test_keystoneclient.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0d46091ee11000be4fe0e3c6bf6889b42817c9d2 +Merge: 50b22cb 7c0529f +Author: Jenkins +Date: Fri Jan 20 02:11:02 2012 +0000 + + Merge "Bug #916199: keystone-manage service list fails with AttributeError on Service.description" + +commit 50b22cbf912747d89bbc487b20a67d4b2232d55c +Merge: 31f7770 3d08211 +Author: Jenkins +Date: Fri Jan 20 02:01:51 2012 +0000 + + Merge "Fix LDAP Schema Syntax (bug 904380)" + +commit 2d186861c94ab83bd670bbb536970b3e6a9ca612 +Author: Ziad Sawalha +Date: Thu Jan 19 19:59:39 2012 -0600 + + Pre-staging pip requires + + - Need to get a pip requires update in to be able to + update the venv so that a patch with a new requires + can get in. This is for https://review.openstack.org/#change,3185 + + Change-Id: I99dd6ff554fc384eca7f597ad12ea71acf40930f + + tools/pip-requires | 1 + + 1 file changed, 1 insertion(+) + +commit f40198dece0b3729e6eb70abaa972bd73ee827da +Author: Joe Heck +Date: Thu Jan 19 17:30:27 2012 -0800 + + shimming in basics from original keystone + + docs/generate_autodoc_index.py | 76 +++++++ + docs/source/_static/basic.css | 416 ++++++++++++++++++++++++++++++++++++ + docs/source/_static/default.css | 230 ++++++++++++++++++++ + docs/source/_static/jquery.tweet.js | 154 +++++++++++++ + docs/source/_static/tweaks.css | 65 ++++++ + docs/source/_templates/.placeholder | 0 + docs/source/_theme/layout.html | 86 ++++++++ + docs/source/_theme/theme.conf | 5 + + docs/source/community.rst | 93 ++++++++ + docs/source/conf.py | 12 ++ + docs/source/developing.rst | 135 ++++++++++++ + docs/source/index.rst | 58 ++++- + docs/source/man/keystone-manage.rst | 192 +++++++++++++++++ + docs/source/man/keystone.rst | 90 ++++++++ + docs/source/setup.rst | 151 +++++++++++++ + docs/source/testing.rst | 77 +++++++ + 16 files changed, 1832 insertions(+), 8 deletions(-) + +commit 3d2bb3a355274c6ce013fb03accb4811d467939e +Author: Jesse Andrews +Date: Thu Jan 19 17:15:03 2012 -0800 + + test login fails with invalid password or disabled user + + tests/test_keystoneclient.py | 38 ++++++++++++++++++++++++++++++-------- + 1 file changed, 30 insertions(+), 8 deletions(-) + +commit ffeb0e558ca1108df02c53c9170e73020e57e67c +Author: Joe Heck +Date: Thu Jan 19 01:52:44 2012 +0000 + + doctry + + docs/source/conf.py | 29 ++++++++++++++++++++++------- + setup.py | 27 +++++++++++++++++++++++++++ + 2 files changed, 49 insertions(+), 7 deletions(-) + +commit 0df93ebd19eae6e44d12572d7924a98ef2d6b022 +Author: Jesse Andrews +Date: Thu Jan 19 16:25:26 2012 -0800 + + use token_client in token tests + + tests/test_keystoneclient.py | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 71faa9f0e11a6645f2b6596d325695057a508ba6 +Author: Jesse Andrews +Date: Thu Jan 19 16:11:31 2012 -0800 + + remove duplicate pycli from pip-requires + + tools/pip-requires | 1 - + 1 file changed, 1 deletion(-) + +commit de3c0917b33e33dda09e61bfd5a5f40562afea5e +Merge: 781feaf ecabdd1 +Author: Andy Smith +Date: Thu Jan 19 16:01:26 2012 -0800 + + Merge pull request #15 from termie/negative_tests + + add (failing) tests for unauthorized ec2 crud + +commit ecabdd1a7068dadb5603ddbaa3bb38615916d103 +Author: Jesse Andrews +Date: Thu Jan 19 15:58:30 2012 -0800 + + fix ec2 sql config + + tests/backend_sql.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 21cfcfc38e0e605197405cff73d37b0fb5924a64 +Author: Jesse Andrews +Date: Thu Jan 19 15:48:28 2012 -0800 + + get_client lets you send user and tenant + + tests/test_keystoneclient.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit cbc1558ea676456f163b3e060a781cfe21f9932b +Author: Jesse Andrews +Date: Thu Jan 19 15:44:48 2012 -0800 + + update how user is specified in tests + + tests/default_fixtures.py | 4 ++-- + tests/test_keystoneclient.py | 27 +++++++++++++-------------- + 2 files changed, 15 insertions(+), 16 deletions(-) + +commit c1fe99854c4a4082d377de07d1c925abcddb01a9 +Author: Jesse Andrews +Date: Wed Jan 18 11:23:43 2012 -0800 + + rename ec2 tests to be more explicit + + tests/test_keystoneclient.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e567fb91464798d11005dc9a7c53e8dce5726ac3 +Author: Jesse Andrews +Date: Wed Jan 18 11:23:22 2012 -0800 + + use the sql backend for ec2 tests + + tests/backend_sql.conf | 3 +++ + 1 file changed, 3 insertions(+) + +commit 88b0a4bbd1353933614270b90477901a18d6ce7b +Author: Jesse Andrews +Date: Tue Jan 17 21:48:31 2012 -0800 + + more failing ec2 tests + + tests/test_keystoneclient.py | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +commit f28a03cf2094d8ba5b64dfea7554afce3ec309a3 +Author: Jesse Andrews +Date: Tue Jan 17 21:39:01 2012 -0800 + + add METADATA for boo + + tests/default_fixtures.py | 1 + + 1 file changed, 1 insertion(+) + +commit 7b4c26d603d3dc03578f7e2043d20660054e8a05 +Author: Jesse Andrews +Date: Tue Jan 17 21:03:27 2012 -0800 + + add (failing) tests for scoping ec2 crud + + tests/default_fixtures.py | 1 + + tests/test_keystoneclient.py | 55 ++++++++++++++++++++++++++------------------ + 2 files changed, 34 insertions(+), 22 deletions(-) + +commit 31f7770add8c7fc2979295cf97bb10be8b3a00c1 +Merge: e81ce0a 7681a01 +Author: Jenkins +Date: Thu Jan 19 21:20:45 2012 +0000 + + Merge "Exception raise error" + +commit e81ce0a9b5230778bf730521e0484cb1e64d4fb8 +Merge: 8d9ace7 e03ff6e +Author: Jenkins +Date: Thu Jan 19 21:11:18 2012 +0000 + + Merge "Updates to middleware to deprecate X_USER" + +commit 781feaf6a8efb015db1be732f025c2d4339ab656 +Author: termie +Date: Thu Jan 19 12:41:08 2012 -0800 + + add some docs that got overwritten last night + + keystone/identity/backends/kvs.py | 3 +- + keystone/identity/backends/sql.py | 3 +- + keystone/identity/core.py | 143 ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 147 insertions(+), 2 deletions(-) + +commit 7c0529fac859c9131aae3986d81fdb10810a49c1 +Author: Ewan Mellor +Date: Fri Jan 13 14:01:34 2012 -0800 + + Bug #916199: keystone-manage service list fails with AttributeError on Service.description + + Make sqlalchemy.api.service take a keystone.models.Service into create, and + return the same from get_all. This replaces their use of + sqlalchemy.models.Service in these positions. This is consistent with + User, Tenant, Token, and fixes the bug referenced above. + + Added unit tests for keystone.manage.api.{list_services,add_service, + add_token}. The latter isn't actually related to this bug (that call turned + out to be working fine) but I've written it so you may as well have it! + + Fix tearDown in test_backends. These tests were leaving the DB layer in an + invalid state, so the subsequent test_commands_v1 tests couldn't initialize. + + Change-Id: I63e24189832cb96454c085797bff4c5c09e10b70 + + keystone/backends/sqlalchemy/api/service.py | 24 +++++++-- + keystone/test/unit/test_backends.py | 6 +++ + keystone/test/unit/test_commands_v1.py | 75 +++++++++++++++++++++++++++++ + 3 files changed, 102 insertions(+), 3 deletions(-) + +commit 7681a01171b7ebdf8c0d578de5eb129af50b8600 +Author: Zhongyue Luo +Date: Thu Jan 19 13:39:42 2012 -0500 + + Exception raise error + + Fixes bug #916827 + + As per: http://docs.python.org/library/stdtypes.html + ?highlight=__exit__#contextmanager.__exit__ + + Ionut Artarisi wrote: + + The exception passed in should never be reraised explicitly - instead, + this method should return a false value to indicate that the method completed + successfully and does not want to suppress the raised exception. + This allows context management code (such as contextlib.nested) to easily + detect whether or not an __exit__() method has actually failed. + + Change-Id: I79bbac32b5c99742b5cb283c6e55e6204bf92adc + + keystone/tools/buffout.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8d9ace78ee467a7c866d74343a1f50d9a3afc670 +Merge: 7f97469 eedd271 +Author: Jenkins +Date: Thu Jan 19 18:17:58 2012 +0000 + + Merge "Revert "Exception raise error"" + +commit 7f97469b11c17ee47296a1068d2237517d47b34e +Merge: 45c62a8 fa95e14 +Author: Jenkins +Date: Thu Jan 19 18:10:46 2012 +0000 + + Merge "Bug #915544: keystone-manage version 1 commands broken when using flags" + +commit e03ff6e291a0679bcbaf1a28ec0f5b8a5319b461 +Author: Ziad Sawalha +Date: Fri Jan 13 14:34:30 2012 -0600 + + Updates to middleware to deprecate X_USER + + - There is an outstanding issue where we return the user id + for the legacy X-User header, but the documentation says + it should be the 'name the user logged in with'. I did not + fix this in this commit until we discuss with other teams. + + Change-Id: Ibf2acf5bb594b889b5c220ea00d777ac528175b0 + + doc/source/middleware.rst | 8 +++++++- + keystone/middleware/auth_token.py | 2 ++ + keystone/middleware/glance_auth_token.py | 2 +- + keystone/middleware/nova_auth_token.py | 5 ++--- + keystone/middleware/nova_keystone_context.py | 2 +- + 5 files changed, 13 insertions(+), 6 deletions(-) + +commit eedd27127626e35601df7c6257b32f73290482c6 +Author: Zhongyue Luo +Date: Thu Jan 19 06:30:29 2012 +0000 + + Revert "Exception raise error" + + This reverts commit 45c62a8e86bbd35a50fefe33248b01f6482982a8 + + keystone/tools/buffout.py | 2 +- + run_tests.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 89c378c2400d697059b3e5d81f65814424604c05 +Author: termie +Date: Wed Jan 18 21:46:39 2012 -0800 + + fix pep8 + + keystone/catalog/backends/kvs.py | 3 --- + keystone/catalog/core.py | 5 ++++- + keystone/common/sql/core.py | 1 + + keystone/contrib/ec2/backends/kvs.py | 1 - + keystone/contrib/ec2/backends/sql.py | 1 - + keystone/contrib/ec2/core.py | 4 ++-- + keystone/identity/backends/kvs.py | 1 - + keystone/identity/backends/sql.py | 6 +++--- + keystone/identity/core.py | 8 ++++++-- + keystone/service.py | 3 +-- + keystone/token/backends/kvs.py | 1 + + 11 files changed, 18 insertions(+), 16 deletions(-) + +commit f22623491758097445d9dfcceb3a307eea5979bf +Author: termie +Date: Wed Jan 18 21:21:29 2012 -0800 + + update tests + + tests/backend_sql.conf | 2 +- + tests/keystone_compat_diablo.conf | 52 --------------------------------------- + tests/test_backend_kvs.py | 10 +++++--- + tests/test_backend_sql.py | 6 ++--- + tests/test_legacy_compat.py | 4 +-- + tests/test_novaclient_compat.py | 4 +-- + 6 files changed, 14 insertions(+), 64 deletions(-) + +commit fc79bbe7f4f6622a570d704e3e0d4ac248a30ec4 +Author: termie +Date: Wed Jan 18 21:15:14 2012 -0800 + + update some names + + bin/keystone | 2 +- + bin/keystone-manage | 2 +- + etc/keystone.conf | 16 +++--- + keystone/catalog/backends/kvs.py | 2 +- + keystone/identity/backends/sql.py | 2 +- + keystone/middleware/__init__.py | 2 +- + keystone/middleware/core.py | 100 ++++++++++++++++++++++++++++++++++++++ + keystone/middleware/internal.py | 100 -------------------------------------- + keystone/token/backends/kvs.py | 2 +- + 9 files changed, 114 insertions(+), 114 deletions(-) + +commit e2f04f224e36c16430d7f7430b05d625ca5145a1 +Author: termie +Date: Wed Jan 18 21:10:08 2012 -0800 + + fix some imports + + keystone/catalog/core.py | 6 ------ + keystone/common/sql/__init__.py | 2 +- + keystone/common/sql/util.py | 2 +- + keystone/common/wsgi.py | 11 ++++++++--- + keystone/config.py | 2 +- + keystone/contrib/ec2/backends/sql.py | 4 ---- + keystone/contrib/ec2/core.py | 2 +- + keystone/identity/core.py | 18 +++++++++++------- + keystone/middleware/internal.py | 2 +- + keystone/policy/__init__.py | 1 + + keystone/policy/core.py | 2 +- + keystone/test.py | 6 +++--- + keystone/token/core.py | 2 +- + tests/test_keystoneclient_sql.py | 4 ++-- + 14 files changed, 32 insertions(+), 32 deletions(-) + +commit ff6af1f808bc962c816528174096b5e386c1cb9a +Author: termie +Date: Wed Jan 18 21:09:04 2012 -0800 + + split up sql backends too + + keystone/common/sql/core.py | 415 +-------------------- + .../versions/001_add_initial_tables.py | 8 +- + keystone/contrib/ec2/backends/sql.py | 57 +++ + keystone/identity/backends/sql.py | 340 +++++++++++++++++ + 4 files changed, 410 insertions(+), 410 deletions(-) + +commit 308a766b5b8ddbfbaa549e3af7fa736c1e1d4218 +Author: termie +Date: Wed Jan 18 20:57:44 2012 -0800 + + split up the services and kvs backends + + keystone/catalog/__init__.py | 1 + + keystone/catalog/backends/kvs.py | 42 ++ + keystone/catalog/backends/templated.py | 6 +- + keystone/catalog/core.py | 41 +- + keystone/common/kvs.py | 283 +------------ + keystone/common/manager.py | 2 +- + keystone/common/utils.py | 2 +- + keystone/common/wsgi.py | 86 +++- + keystone/contrib/admin_crud/__init__.py | 1 + + keystone/contrib/admin_crud/core.py | 150 +++++++ + keystone/contrib/ec2/__init__.py | 1 + + keystone/contrib/ec2/backends/__init__.py | 0 + keystone/contrib/ec2/backends/kvs.py | 32 ++ + keystone/contrib/ec2/core.py | 135 +++++- + keystone/identity/__init__.py | 1 + + keystone/identity/backends/kvs.py | 178 ++++++++ + keystone/identity/core.py | 293 +++++++++++++ + keystone/policy/backends/simple.py | 2 +- + keystone/service.py | 683 +----------------------------- + keystone/token/__init__.py | 1 + + keystone/token/backends/__init__.py | 0 + keystone/token/backends/kvs.py | 15 + + 22 files changed, 997 insertions(+), 958 deletions(-) + +commit 909012a63e5761b4ff09d2c63a7a0493f7daffa6 +Author: termie +Date: Wed Jan 18 20:06:27 2012 -0800 + + establish basic structure + + keystone/backends/__init__.py | 0 + keystone/backends/kvs.py | 302 ------ + keystone/backends/pam.py | 29 - + keystone/backends/policy.py | 21 - + keystone/backends/sql/__init__.py | 1 - + keystone/backends/sql/core.py | 518 --------- + keystone/backends/sql/migrate_repo/README | 4 - + keystone/backends/sql/migrate_repo/__init__.py | 0 + keystone/backends/sql/migrate_repo/manage.py | 5 - + keystone/backends/sql/migrate_repo/migrate.cfg | 25 - + .../versions/001_add_initial_tables.py | 15 - + .../backends/sql/migrate_repo/versions/__init__.py | 0 + keystone/backends/sql/migration.py | 80 -- + keystone/backends/sql/util.py | 18 - + keystone/backends/templated.py | 88 -- + keystone/bufferedhttp.py | 167 --- + keystone/catalog.py | 24 - + keystone/catalog/__init__.py | 0 + keystone/catalog/backends/__init__.py | 0 + keystone/catalog/backends/templated.py | 88 ++ + keystone/catalog/core.py | 24 + + keystone/cfg.py | 1130 -------------------- + keystone/common/__init__.py | 0 + keystone/common/bufferedhttp.py | 167 +++ + keystone/common/cfg.py | 1130 ++++++++++++++++++++ + keystone/common/kvs.py | 302 ++++++ + keystone/common/logging.py | 55 + + keystone/common/manager.py | 36 + + keystone/common/sql/__init__.py | 1 + + keystone/common/sql/core.py | 518 +++++++++ + keystone/common/sql/migrate_repo/README | 4 + + keystone/common/sql/migrate_repo/__init__.py | 0 + keystone/common/sql/migrate_repo/manage.py | 5 + + keystone/common/sql/migrate_repo/migrate.cfg | 25 + + .../versions/001_add_initial_tables.py | 15 + + .../common/sql/migrate_repo/versions/__init__.py | 0 + keystone/common/sql/migration.py | 80 ++ + keystone/common/sql/util.py | 18 + + keystone/common/utils.py | 173 +++ + keystone/common/wsgi.py | 351 ++++++ + keystone/contrib/__init__.py | 0 + keystone/contrib/admin_crud/__init__.py | 0 + keystone/contrib/ec2/__init__.py | 0 + keystone/contrib/ec2/core.py | 24 + + keystone/ec2.py | 24 - + keystone/identity.py | 24 - + keystone/identity/__init__.py | 0 + keystone/identity/backends/__init__.py | 0 + keystone/identity/backends/pam.py | 29 + + keystone/identity/core.py | 24 + + keystone/logging.py | 55 - + keystone/manager.py | 36 - + keystone/policy.py | 24 - + keystone/policy/__init__.py | 0 + keystone/policy/backends/__init__.py | 0 + keystone/policy/backends/simple.py | 21 + + keystone/policy/core.py | 24 + + keystone/token.py | 24 - + keystone/token/__init__.py | 0 + keystone/token/core.py | 24 + + keystone/utils.py | 173 --- + keystone/wsgi.py | 351 ------ + 62 files changed, 3138 insertions(+), 3138 deletions(-) + +commit f0e3e7f123c24f4441de14be34e5b9fd307354aa +Author: termie +Date: Wed Jan 18 11:40:36 2012 -0800 + + add docs for various service managers + + keystone/catalog.py | 12 ++++++++++++ + keystone/ec2.py | 12 ++++++++++++ + keystone/identity.py | 8 +++++++- + keystone/policy.py | 12 ++++++++++++ + keystone/token.py | 12 ++++++++++++ + 5 files changed, 55 insertions(+), 1 deletion(-) + +commit 94f78a3082efb7a73a8670701e9c037b7ffde581 +Author: termie +Date: Wed Jan 18 11:36:02 2012 -0800 + + expect sphinx sources to be autogenned + + .gitignore | 2 + + docs/source/keystone.backends.rst | 42 ------- + docs/source/keystone.backends.sql.migrate_repo.rst | 18 --- + ...keystone.backends.sql.migrate_repo.versions.rst | 11 -- + docs/source/keystone.backends.sql.rst | 42 ------- + docs/source/keystone.rst | 130 --------------------- + docs/source/modules.rst | 9 -- + 7 files changed, 2 insertions(+), 252 deletions(-) + +commit bf7e6fb47d8587e4c5176c5281fb3bbe724a85a4 +Author: termie +Date: Wed Jan 18 10:54:48 2012 -0800 + + some tiny docs + + keystone/identity.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit e129d5f402255bd10e2bd2f8a80284b7b38ab749 +Author: termie +Date: Wed Jan 18 10:54:33 2012 -0800 + + fix sphinx + + docs/Makefile | 2 +- + docs/source/conf.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 198d168a529b5aedc4b3b814748f43980584ff49 +Author: termie +Date: Tue Jan 17 13:38:41 2012 -0800 + + testing rst on github + + README.rst | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit c20bb033fe0e0c24234e55fa4b2154c288ace38e +Merge: e75f7be 67d4a7c +Author: Jesse Andrews +Date: Wed Jan 18 18:05:13 2012 -0800 + + Merge pull request #16 from 4P/deps + + updating dependencies for ksl + +commit 67d4a7c624c166269e0b2f1aeb65b32ceb5ab645 +Author: Joe Heck +Date: Wed Jan 18 01:33:44 2012 +0000 + + updating dependencies for ksl + + tools/pip-requires | 3 +++ + 1 file changed, 3 insertions(+) + +commit e75f7bebdff2df2342178270efe39ebf38d0672f +Author: termie +Date: Tue Jan 17 17:36:03 2012 -0800 + + needed to do more for cli opts + + keystone/config.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e023a89fa577e10c9c27a3cf8c9e6190e333befa +Merge: 76c45b4 33b7814 +Author: termie +Date: Tue Jan 17 16:05:42 2012 -0800 + + Merge branch 'master' of github.com:termie/keystonelight + +commit 76c45b4791275daccff7545f677684fa9a695431 +Author: termie +Date: Tue Jan 17 16:05:31 2012 -0800 + + make a main in keystone-manage + + bin/keystone-manage | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 33b7814a6ac1e4cf6d1f18330a977e6b9786fc27 +Merge: 3c10e73 53ec23a +Author: Andy Smith +Date: Tue Jan 17 13:31:00 2012 -0800 + + Merge pull request #14 from vishvananda/patch-1 + + Fix typo + +commit 3c10e730839bb313ad33228eb56afcd3a8e55bc1 +Author: termie +Date: Tue Jan 17 13:29:18 2012 -0800 + + fix pep8 error + + keystone/service.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9d04ee987bff0bcf7587b632fdea86518c4adc9a +Author: termie +Date: Tue Jan 17 13:29:10 2012 -0800 + + rename apidoc to autodoc + + docs/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 53ec23ab7384ddf7e2ad37f1e7260ebbb4956402 +Author: vishvananda +Date: Tue Jan 17 13:25:37 2012 -0800 + + Fix typo + + keystone/service.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3d08211972e295291284bcc46462ec7c4e05dc60 +Author: Ralf Haferkamp +Date: Wed Dec 21 14:16:36 2011 +0100 + + Fix LDAP Schema Syntax (bug 904380) + + Apply the change from commit 8741597f62 to the .schema file as well + (additional fix for bug 904380) + + Change-Id: Ifd7e7de235b9c81c746cdc64ce699073697c8bb0 + + keystone/backends/ldap/keystone.schema | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit f16a262c916fe03a7301a9968fdd99737644bbbb +Author: Jesse Andrews +Date: Mon Jan 16 22:52:52 2012 -0800 + + return to starting directory after git work + + keystone/test.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit 44c6b6939b0b6a734631c9859f7fdce40dedb31e +Author: Jesse Andrews +Date: Mon Jan 16 17:38:02 2012 -0800 + + spacing + + tests/test_keystoneclient.py | 1 - + 1 file changed, 1 deletion(-) + +commit 14189256690e2fd281a583383bcc23bbc489a8ab +Author: Jesse Andrews +Date: Mon Jan 16 17:36:38 2012 -0800 + + tests for ec2 crud + + etc/keystone.conf | 2 +- + keystone/backends/kvs.py | 5 +++-- + keystone/backends/sql/core.py | 5 +++-- + keystone/service.py | 16 ++++++++-------- + tests/test_keystoneclient.py | 21 +++++++++++++++++++++ + 5 files changed, 36 insertions(+), 13 deletions(-) + +commit dae746d9b779905c95efddcea066771bcddf1dad +Author: termie +Date: Mon Jan 16 17:02:31 2012 -0800 + + add keystoneclient expected format + + keystone/service.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit a0c7c7ce5104075bdf85d9e53e8382c5bb22cc92 +Author: termie +Date: Mon Jan 16 16:56:01 2012 -0800 + + add sql backend, too + + keystone/backends/sql/core.py | 53 ++++++++++++++++++++++++++++++++++++++++++- + keystone/service.py | 4 ++-- + 2 files changed, 54 insertions(+), 3 deletions(-) + +commit afd897f9122cdee925376a1c25994a515082963f +Author: termie +Date: Mon Jan 16 16:31:44 2012 -0800 + + add an ec2 extension + + etc/keystone.conf | 6 ++- + keystone/backends/kvs.py | 36 ++++++++++++- + keystone/config.py | 1 + + keystone/ec2.py | 12 +++++ + keystone/service.py | 137 ++++++++++++++++++++++++++++++++++++++++++++--- + keystone/utils.py | 81 ++++++++++++++++++++++++++++ + 6 files changed, 264 insertions(+), 9 deletions(-) + +commit 2ed9759ff729163113d42109c846ec19374c9c26 +Author: termie +Date: Mon Jan 16 14:59:32 2012 -0800 + + update readme + + README.rst | 31 +------------------------------ + 1 file changed, 1 insertion(+), 30 deletions(-) + +commit 45c62a8e86bbd35a50fefe33248b01f6482982a8 +Author: Zhongyue Luo +Date: Sun Jan 15 11:31:23 2012 -0500 + + Exception raise error + + Fixes bug #916827 + + The reason for ignoring W602 is explained at + https://github.com/openstack/nova/blob/master/run_tests.sh#L101 + + Change-Id: I2e12e3ababcfd0de15903c47eef27f5e514ee427 + + keystone/tools/buffout.py | 2 +- + run_tests.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 8c33e66f1d1fe4a439b27a52584437174d14cd60 +Author: termie +Date: Thu Jan 12 16:07:23 2012 -0800 + + re-indent + + keystone/middleware/internal.py | 106 ++++++++++++++++++++-------------------- + 1 file changed, 54 insertions(+), 52 deletions(-) + +commit c233dc215cab776d3e7faf10cf1870fa84d24db5 +Author: termie +Date: Thu Jan 12 16:02:37 2012 -0800 + + re-indent + + keystone/backends/sql/util.py | 14 ++--- + keystone/backends/templated.py | 117 +++++++++++++++++++++-------------------- + 2 files changed, 67 insertions(+), 64 deletions(-) + +commit bd974c9b514a539dc15ec8aa1d887ce74248c40f +Author: termie +Date: Thu Jan 12 15:58:06 2012 -0800 + + re-indent + + keystone/backends/policy.py | 25 +- + keystone/backends/sql/core.py | 764 +++++++++++++++++++++--------------------- + 2 files changed, 398 insertions(+), 391 deletions(-) + +commit 9ab0a423e294c0a1494481d25992a954be9917be +Author: termie +Date: Thu Jan 12 15:29:54 2012 -0800 + + re-indent kvs.py + + keystone/backends/kvs.py | 487 ++++++++++++++++++++++++----------------------- + 1 file changed, 245 insertions(+), 242 deletions(-) + +commit 9d7c5c05d2b9cbac96f8afdf014f2dc9158c48b7 +Author: termie +Date: Thu Jan 12 15:23:39 2012 -0800 + + re-indent test.py + + keystone/test.py | 365 ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 184 insertions(+), 181 deletions(-) + +commit 6a48676db101b18020d90fe4e1ab6d0f016a3dd4 +Author: termie +Date: Thu Jan 12 14:35:17 2012 -0800 + + remove models.py + + keystone/backends/sql/core.py | 1 - + keystone/logging.py | 4 ++++ + keystone/models.py | 28 ----------------------- + keystone/service.py | 1 - + keystone/test.py | 1 - + tests/test_backend_kvs.py | 1 - + tests/test_backend_sql.py | 1 - + tests/test_legacy_compat.py | 49 ++++++++++++++++++++--------------------- + tests/test_novaclient_compat.py | 1 - + 9 files changed, 28 insertions(+), 59 deletions(-) + +commit 7b0f71bce4645447f6aa342cb81d554d6b19d3de +Author: termie +Date: Thu Jan 12 14:28:22 2012 -0800 + + add some docs to manager + + keystone/manager.py | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit deab5c450692fd2f1ec97ef61bf9143b35007fe4 +Author: termie +Date: Thu Jan 12 13:23:57 2012 -0800 + + dynamic manager classes for now + + keystone/backends/kvs.py | 80 ++++++++++++++++---------------- + keystone/backends/sql/core.py | 30 ++++++------ + keystone/bufferedhttp.py | 2 + + keystone/catalog.py | 24 ++-------- + keystone/config.py | 1 + + keystone/identity.py | 103 ++---------------------------------------- + keystone/manager.py | 23 ++++++++++ + keystone/policy.py | 12 ++--- + keystone/service.py | 25 +++++----- + keystone/token.py | 25 ++-------- + 10 files changed, 109 insertions(+), 216 deletions(-) + +commit 1bd1349482548909416bead8b4dffe94af2bac81 +Author: termie +Date: Thu Jan 12 12:45:08 2012 -0800 + + add a couple more tests + + TODO | 1 - + keystone/service.py | 26 ++++++++++++++++---------- + tests/test_keystoneclient.py | 24 ++++++++++++++++++++++++ + 3 files changed, 40 insertions(+), 11 deletions(-) + +commit fa95e14a534aee058f56d85b18f371b2ba8a07d8 +Author: Ewan Mellor +Date: Mon Jan 9 14:44:16 2012 -0800 + + Bug #915544: keystone-manage version 1 commands broken when using flags + + Fix detection of keystone-manage version 1 commands. The + heuristic for detecting these was broken in the presence + of options of the command line. + + Change-Id: Iae7b5fe892ce5030a384867f1783dd81f7a4bd74 + + bin/keystone-manage | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +commit 8ea6e8f497377cc06a334b9e7fa82a5b87b92f47 +Author: termie +Date: Wed Jan 11 16:45:08 2012 -0800 + + add some more todos + + TODO | 3 +++ + 1 file changed, 3 insertions(+) + +commit be52a5efef83babe6ed841f3eba052fa3b4e0945 +Author: termie +Date: Wed Jan 11 16:09:44 2012 -0800 + + strip newlines + + keystone/backends/templated.py | 2 +- + keystone/wsgi.py | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 2a31259fa0afa504a523fc40f56027f22e540533 +Author: termie +Date: Wed Jan 11 14:58:29 2012 -0800 + + TODO + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2d6b348e2738ae97e858d236847436ccaba942f0 +Author: termie +Date: Wed Jan 11 14:56:19 2012 -0800 + + add role refs to validate token + + keystone/service.py | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +commit aea09bd48e73a1b5dbaec88a971e681ad6e95c8c +Author: termie +Date: Wed Jan 11 13:33:44 2012 -0800 + + fix token auth + + keystone/service.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit c25155acf9a40caea38d62fddd5dd9d18b56106a +Author: termie +Date: Wed Jan 11 12:57:20 2012 -0800 + + check for membership + + keystone/backends/sql/core.py | 7 +++ + keystone/middleware/nova_keystone_context.py | 69 ++++++++++++++++++++++++++++ + 2 files changed, 76 insertions(+) + +commit 4ae246d68837a8df6c299fe69141c38496a8217a +Author: termie +Date: Tue Jan 10 17:55:11 2012 -0800 + + flush that sht + + keystone/backends/sql/core.py | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 61ecf604910bbd99a2007dc10f69e3a772f60398 +Author: termie +Date: Tue Jan 10 17:50:32 2012 -0800 + + add more middleware + + keystone/middleware/ec2_token.py | 92 +++++++++++++ + keystone/middleware/nova_auth_token.py | 105 ++++++++++++++ + keystone/middleware/swift_auth.py | 243 +++++++++++++++++++++++++++++++++ + 3 files changed, 440 insertions(+) + +commit 5c6f0a2ad936c4abfb45a2492c9111e18c034f77 +Merge: 44f6f4e ef1a474 +Author: Andy Smith +Date: Tue Jan 10 17:44:49 2012 -0800 + + Merge pull request #13 from 4P/logfix + + fixing WatchedFileHandler + +commit ef1a4746045e4cac814ee46d369b367e37b58243 +Author: Joe Heck +Date: Tue Jan 10 17:44:03 2012 -0800 + + fixing WatchedFileHandler + + keystone/config.py | 2 +- + keystone/logging.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 44f6f4e485bd8d53cb89f33dba5f23ebef12b008 +Merge: 2723439 c830305 +Author: Andy Smith +Date: Tue Jan 10 17:40:32 2012 -0800 + + Merge pull request #12 from 4P/lg + + logging to debugging by default for now + +commit c8303054343a6693387c56417364495521598568 +Author: Joe Heck +Date: Tue Jan 10 17:38:15 2012 -0800 + + logging to debugging by default for now + + etc/keystone.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2723439149de2e340edafa77719d29d4e10acf79 +Author: termie +Date: Tue Jan 10 17:36:22 2012 -0800 + + add a noop controller + + keystone/service.py | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit cd37b051e6334bfb82853dde80cc94644fc0d99b +Author: termie +Date: Tue Jan 10 17:29:37 2012 -0800 + + woops + + keystone/glance_auth_token.py | 78 -------------------------------- + keystone/middleware/glance_auth_token.py | 78 ++++++++++++++++++++++++++++++++ + 2 files changed, 78 insertions(+), 78 deletions(-) + +commit 52da8917d157ffacd05aa8dee2af5448c40766e9 +Author: termie +Date: Tue Jan 10 17:27:04 2012 -0800 + + add glance middleware ?? + + keystone/glance_auth_token.py | 78 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 78 insertions(+) + +commit 47908a4735d757d010aa30dcab4a2d4eb410aae6 +Author: termie +Date: Tue Jan 10 17:21:28 2012 -0800 + + add legacy middleware + + keystone/bufferedhttp.py | 165 ++++++++++++++++ + keystone/middleware.py | 98 ---------- + keystone/middleware/__init__.py | 1 + + keystone/middleware/auth_token.py | 397 ++++++++++++++++++++++++++++++++++++++ + keystone/middleware/internal.py | 98 ++++++++++ + 5 files changed, 661 insertions(+), 98 deletions(-) + +commit ec8574928c929260b74c7a72aa8db9f66e103c67 +Author: termie +Date: Tue Jan 10 16:45:39 2012 -0800 + + fix setup.py + + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2814a981c190387ce1dfa0962fac7271fbc74cfa +Merge: 230a003 d230857 +Author: Andy Smith +Date: Tue Jan 10 16:43:58 2012 -0800 + + Merge pull request #11 from 4P/twk + + adding #vim to file with changed indent + +commit d230857c3aa52a35f509e9c00884f59606d69fed +Author: Joe Heck +Date: Tue Jan 10 16:36:08 2012 -0800 + + adding #vim to file with changed indent + + keystone/config.py | 1 + + 1 file changed, 1 insertion(+) + +commit 230a00386014c06e01b9d79a641640f4d6d6e764 +Author: termie +Date: Mon Jan 9 21:30:09 2012 -0800 + + add id-only flag to return IDs + + bin/keystone-manage | 6 ++++++ + keystone/config.py | 47 ++++++++++++++++++++++++++++++++--------------- + 2 files changed, 38 insertions(+), 15 deletions(-) + +commit 59614300798793e40619ce2d272bc8a7d8fd62d7 +Author: termie +Date: Mon Jan 9 21:20:44 2012 -0800 + + rename ks to keystone-manage + + bin/keystone-manage | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + bin/ks | 139 ---------------------------------------------------- + 2 files changed, 139 insertions(+), 139 deletions(-) + +commit e3aff52138c7140effdd2b37bae9261acd45eb50 +Merge: 69225f2 d940dc4 +Author: Andy Smith +Date: Tue Jan 10 14:39:44 2012 -0800 + + Merge pull request #10 from 4P/gettext + + Gettext + +commit d940dc40e6d8cdd688314203e9f12f2149380c19 +Author: Joe Heck +Date: Tue Jan 10 14:33:15 2012 -0800 + + fixing imports for syslog handlers and gettext + + keystone/config.py | 6 +++--- + keystone/logging.py | 3 ++- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit c3c05cbabd1f88fcef68ecb834f090f82955fd45 +Author: Joe Heck +Date: Tue Jan 10 14:22:41 2012 -0800 + + adding gettext + + keystone/config.py | 3 +++ + 1 file changed, 3 insertions(+) + +commit 69225f2d9dffd035f81a5df6618b22c34251c6d5 +Merge: 6540120 393aedb +Author: Andy Smith +Date: Tue Jan 10 13:45:23 2012 -0800 + + Merge pull request #9 from 4P/logger + + Logging + +commit 393aedb7ace6843b637aca7d156ffb9a430e671f +Author: Joe Heck +Date: Tue Jan 10 13:42:03 2012 -0800 + + adding logging from configuration files, default logging per common + + bin/keystone | 9 +++-- + etc/keystone.conf | 11 ++++++ + etc/logging.conf.sample | 54 +++++++++++++++++++++++++++++ + keystone/cfg.py | 4 +++ + keystone/config.py | 92 +++++++++++++++++++++++++++++++++++++------------ + keystone/logging.py | 3 ++ + tools/pip-requires | 2 ++ + tools/pip-requires-test | 2 ++ + 8 files changed, 153 insertions(+), 24 deletions(-) + +commit 6540120494b0d5ed476ed053af980547bf26e4cd +Author: termie +Date: Mon Jan 9 20:57:03 2012 -0800 + + cli using keystoneclient + + bin/ks | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + keystone/config.py | 7 +++++++ + 2 files changed, 67 insertions(+) + +commit 732909a7be4e856f2a5c2a56778a852d42eec6c0 +Author: termie +Date: Mon Jan 9 17:55:33 2012 -0800 + + add a db_sync command to bin/ks, remove others + + .gitignore | 2 +- + bin/ks | 109 +++++++++++++----------------------------- + keystone/backends/sql/core.py | 6 +++ + keystone/config.py | 4 +- + 4 files changed, 42 insertions(+), 79 deletions(-) + +commit 3c88b7f546e727d8ae86901dd62b8230d1d85314 +Author: termie +Date: Mon Jan 9 15:52:48 2012 -0800 + + merge test and default configs + + keystone/test.py | 31 ++++++++++++++++---- + tests/default.conf | 62 ---------------------------------------- + tests/test_backend_sql.py | 4 ++- + tests/test_keystoneclient.py | 11 +++---- + tests/test_keystoneclient_sql.py | 4 ++- + tests/test_legacy_compat.py | 5 ++-- + tests/test_novaclient_compat.py | 7 +++-- + tests/test_overrides.conf | 2 ++ + 8 files changed, 46 insertions(+), 80 deletions(-) + +commit 43b683b3429e2e679e27428589290690bfd50bc2 +Merge: 1d6334d 2c60c7f +Author: Andy Smith +Date: Mon Jan 9 15:50:01 2012 -0800 + + Merge pull request #6 from 4P/addingproject + + adding project to keystone config to find default config files + +commit 2c60c7f541d806f2607f29ef808cb1602abac62b +Author: Joe Heck +Date: Mon Jan 9 15:47:09 2012 -0800 + + adding project to keystone config to find default config files + + keystone/config.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1d6334d3c25a815797fa040aa2ae3451ea3075d7 +Author: termie +Date: Mon Jan 9 15:37:31 2012 -0800 + + some more config in bin/keystone + + bin/keystone | 21 ++++++++++++++------- + keystone/config.py | 5 ++--- + 2 files changed, 16 insertions(+), 10 deletions(-) + +commit 74170ee7b4504748c5842a7935e64133970f587f +Author: termie +Date: Mon Jan 9 15:16:00 2012 -0800 + + in the bin config too + + bin/keystone | 4 ++-- + etc/keystone.conf | 28 +++++++++++----------------- + 2 files changed, 13 insertions(+), 19 deletions(-) + +commit a606c399665feb1c4e64053902659d4af7f396fb +Author: termie +Date: Mon Jan 9 15:14:05 2012 -0800 + + rename many service parts to public + + keystone/service.py | 12 ++++++------ + tests/default.conf | 18 +++++++++--------- + tests/test_legacy_compat.py | 4 ++-- + 3 files changed, 17 insertions(+), 17 deletions(-) + +commit ec82e9b1c9bc4da3631454b2077bbcec42003623 +Author: termie +Date: Mon Jan 9 15:03:29 2012 -0800 + + keystone_compat -> service + + keystone/client.py | 101 ----- + keystone/keystone_compat.py | 860 -------------------------------------- + keystone/service.py | 859 +++++++++++++++++++++++++++++++++++++ + run_tests.sh | 2 +- + tests/default.conf | 12 +- + tests/keystone_compat_diablo.conf | 14 +- + tests/test_identity_api.py | 162 ------- + 7 files changed, 870 insertions(+), 1140 deletions(-) + +commit 75e781a11918662af1a4f88091856af9d00cdd13 +Author: termie +Date: Mon Jan 9 14:51:26 2012 -0800 + + remove keystone from names, remove service + + keystone/keystone_compat.py | 148 ++++++++++++++++++-------- + keystone/service.py | 254 -------------------------------------------- + keystone/utils.py | 9 ++ + tests/default.conf | 2 +- + 4 files changed, 113 insertions(+), 300 deletions(-) + +commit 51df8b1b5ba2a71c0b2bd4e0b6a6a0a025576f76 +Author: termie +Date: Mon Jan 9 14:34:28 2012 -0800 + + remove default configuration + + etc/default.conf | 68 -------------------------------------------------------- + 1 file changed, 68 deletions(-) + +commit 8f46af011ea2c4756ac3d9e7d62fc6ce477f8566 +Author: termie +Date: Mon Jan 9 14:32:02 2012 -0800 + + basic service running again + + .gitignore | 4 ++- + bin/keystone | 7 ++++- + etc/default.conf | 57 ++++++++++++++++++++++++++++----------- + etc/default_catalog.templates | 12 +++++++++ + etc/keystone.conf | 62 ++++++++++++++++++++++++++++++++++++------- + 5 files changed, 115 insertions(+), 27 deletions(-) + +commit 4d85d09f8981881526e92632968c330631196061 +Merge: bbdb716 0762754 +Author: Jenkins +Date: Mon Jan 9 22:14:57 2012 +0000 + + Merge "Show useful traceback if manage command fails" + +commit 2340dee20f614da92a3e3615d06dcd2a3c91dfdf +Author: termie +Date: Mon Jan 9 13:45:41 2012 -0800 + + rename extras to metadata + + keystone/backends/kvs.py | 62 +++++++++++++++---------------- + keystone/backends/pam.py | 6 +-- + keystone/backends/sql/core.py | 84 +++++++++++++++++++++--------------------- + keystone/backends/templated.py | 2 +- + keystone/catalog.py | 4 +- + keystone/identity.py | 16 ++++---- + keystone/keystone_compat.py | 42 ++++++++++----------- + keystone/models.py | 10 ++--- + keystone/service.py | 32 ++++++++-------- + keystone/test.py | 17 +++++---- + tests/default_fixtures.py | 2 +- + tests/test_backend.py | 26 ++++++------- + tests/test_identity_api.py | 18 ++++----- + tests/test_keystoneclient.py | 2 +- + tests/test_legacy_compat.py | 4 +- + 15 files changed, 165 insertions(+), 162 deletions(-) + +commit 836244267812cde323b583fb554c731e48bd9aaa +Author: termie +Date: Mon Jan 9 13:27:17 2012 -0800 + + version number in setup.py + + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a84930a8265b8e917e75fe4814be706721596253 +Author: termie +Date: Mon Jan 9 13:25:20 2012 -0800 + + add basic sphinx doc bits + + docs/Makefile | 158 +++++++++++++ + docs/source/conf.py | 247 +++++++++++++++++++++ + docs/source/index.rst | 22 ++ + docs/source/keystone.backends.rst | 42 ++++ + docs/source/keystone.backends.sql.migrate_repo.rst | 18 ++ + ...keystone.backends.sql.migrate_repo.versions.rst | 11 + + docs/source/keystone.backends.sql.rst | 42 ++++ + docs/source/keystone.rst | 130 +++++++++++ + docs/source/modules.rst | 9 + + 9 files changed, 679 insertions(+) + +commit 19675450d4ac089b4a978ca62185d1e929094ad8 +Author: termie +Date: Mon Jan 9 13:11:11 2012 -0800 + + remove references to keystone light + + bin/ks | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 9238a020ee49e979b6bc8054914dbfee8853e01b +Merge: 13ec79b 763013c +Author: Andy Smith +Date: Mon Jan 9 13:09:29 2012 -0800 + + Merge pull request #5 from 4P/rename + + renaming keystonelight to keystone + +commit 763013c5264e87dc8075d50117e5e394fccef1a7 +Author: Joe Heck +Date: Mon Jan 9 10:28:55 2012 -0800 + + renaming keystonelight to keystone + + .gitignore | 1 + + bin/keystone | 6 +- + bin/ks | 122 +++ + bin/ksl | 122 --- + keystone/__init__.py | 0 + keystone/backends/__init__.py | 0 + keystone/backends/kvs.py | 264 +++++ + keystone/backends/pam.py | 29 + + keystone/backends/policy.py | 18 + + keystone/backends/sql/__init__.py | 1 + + keystone/backends/sql/core.py | 436 ++++++++ + keystone/backends/sql/migrate_repo/README | 4 + + keystone/backends/sql/migrate_repo/__init__.py | 0 + keystone/backends/sql/migrate_repo/manage.py | 5 + + keystone/backends/sql/migrate_repo/migrate.cfg | 25 + + .../versions/001_add_initial_tables.py | 15 + + .../backends/sql/migrate_repo/versions/__init__.py | 0 + keystone/backends/sql/migration.py | 80 ++ + keystone/backends/sql/util.py | 16 + + keystone/backends/templated.py | 87 ++ + keystone/catalog.py | 30 + + keystone/cfg.py | 1126 ++++++++++++++++++++ + keystone/client.py | 101 ++ + keystone/config.py | 49 + + keystone/identity.py | 105 ++ + keystone/keystone_compat.py | 802 ++++++++++++++ + keystone/logging.py | 47 + + keystone/middleware.py | 98 ++ + keystone/models.py | 28 + + keystone/policy.py | 18 + + keystone/service.py | 254 +++++ + keystone/test.py | 213 ++++ + keystone/token.py | 31 + + keystone/utils.py | 83 ++ + keystone/wsgi.py | 350 ++++++ + keystonelight/__init__.py | 0 + keystonelight/backends/__init__.py | 0 + keystonelight/backends/kvs.py | 264 ----- + keystonelight/backends/pam.py | 29 - + keystonelight/backends/policy.py | 18 - + keystonelight/backends/sql/__init__.py | 1 - + keystonelight/backends/sql/core.py | 436 -------- + keystonelight/backends/sql/migrate_repo/README | 4 - + .../backends/sql/migrate_repo/__init__.py | 0 + keystonelight/backends/sql/migrate_repo/manage.py | 5 - + .../backends/sql/migrate_repo/migrate.cfg | 25 - + .../versions/001_add_initial_tables.py | 15 - + .../backends/sql/migrate_repo/versions/__init__.py | 0 + keystonelight/backends/sql/migration.py | 80 -- + keystonelight/backends/sql/util.py | 16 - + keystonelight/backends/templated.py | 87 -- + keystonelight/catalog.py | 30 - + keystonelight/cfg.py | 1126 -------------------- + keystonelight/client.py | 101 -- + keystonelight/config.py | 49 - + keystonelight/identity.py | 105 -- + keystonelight/keystone_compat.py | 802 -------------- + keystonelight/logging.py | 47 - + keystonelight/middleware.py | 98 -- + keystonelight/models.py | 28 - + keystonelight/policy.py | 20 - + keystonelight/service.py | 255 ----- + keystonelight/test.py | 215 ---- + keystonelight/token.py | 31 - + keystonelight/utils.py | 83 -- + keystonelight/wsgi.py | 350 ------ + run_tests.sh | 2 +- + setup.py | 4 +- + tests/backend_sql.conf | 2 +- + tests/default.conf | 32 +- + tests/keystone_compat_diablo.conf | 30 +- + tests/test_backend_kvs.py | 6 +- + tests/test_backend_sql.py | 10 +- + tests/test_identity_api.py | 8 +- + tests/test_keystoneclient.py | 4 +- + tests/test_keystoneclient_sql.py | 8 +- + tests/test_legacy_compat.py | 10 +- + tests/test_novaclient_compat.py | 10 +- + 78 files changed, 4504 insertions(+), 4508 deletions(-) + +commit 13ec79bf48a185a6f359d1e6c013bdfe24b7da53 +Author: termie +Date: Fri Jan 6 23:10:18 2012 -0800 + + keystoneclient tests working against sql backend + + keystonelight/backends/kvs.py | 6 +- + keystonelight/backends/sql/core.py | 197 ++++++++++++++++++++++++++----------- + keystonelight/keystone_compat.py | 27 ++--- + keystonelight/service.py | 17 +++- + keystonelight/test.py | 12 ++- + 5 files changed, 180 insertions(+), 79 deletions(-) + +commit 4b4ada27cadf9bc5fcaaa9ccab79fdd1400fb450 +Author: termie +Date: Fri Jan 6 21:31:12 2012 -0800 + + run all teh keystoneclient tests against sql too + + keystonelight/backends/sql/util.py | 16 +++ + tests/backend_sql.conf | 9 ++ + tests/test_backend_sql.py | 6 +- + tests/test_keystoneclient.py | 238 +++++++++++++++++++++++++++++++++++ + tests/test_keystoneclient_compat.py | 239 ------------------------------------ + tests/test_keystoneclient_sql.py | 16 +++ + 6 files changed, 282 insertions(+), 242 deletions(-) + +commit 0f6a9a78d9e8336e5d42b3be7192b426cb1d502b +Author: termie +Date: Fri Jan 6 21:18:51 2012 -0800 + + move everything over to the default config + + tests/default.conf | 9 ++++- + tests/keystoneclient_compat_master.conf | 67 --------------------------------- + tests/test_keystoneclient_compat.py | 19 +++++----- + tests/test_novaclient_compat.py | 6 +-- + 4 files changed, 21 insertions(+), 80 deletions(-) + +commit feadf7576058f47f2bb1f0bc097d45101e8c1562 +Author: termie +Date: Fri Jan 6 21:00:41 2012 -0800 + + config system overhaul + + we're now based on nova's config system which mainly means that you will + have to call config.CONF with a config file at some point during tests + or running an executable + + keystonelight/backends/kvs.py | 8 +-- + keystonelight/backends/policy.py | 6 -- + keystonelight/backends/sql/core.py | 34 +++-------- + keystonelight/backends/sql/migration.py | 24 +++++--- + keystonelight/backends/templated.py | 25 +++++--- + keystonelight/catalog.py | 10 ++-- + keystonelight/config.py | 49 +++++++++++++++ + keystonelight/identity.py | 11 ++-- + keystonelight/keystone_compat.py | 103 ++++++++++++++------------------ + keystonelight/middleware.py | 6 +- + keystonelight/policy.py | 10 ++-- + keystonelight/service.py | 25 ++++---- + keystonelight/test.py | 58 +++--------------- + keystonelight/token.py | 10 ++-- + keystonelight/wsgi.py | 12 ++-- + tests/default.conf | 42 ++++++------- + tests/default_catalog.templates | 12 ++++ + tests/keystone_compat_diablo.conf | 17 ++++-- + tests/keystoneclient_compat_master.conf | 36 +++++------ + tests/test_backend_kvs.py | 9 +-- + tests/test_backend_sql.py | 20 +++++-- + tests/test_identity_api.py | 12 ++-- + tests/test_keystoneclient_compat.py | 9 +-- + tests/test_legacy_compat.py | 35 ++++++----- + tests/test_novaclient_compat.py | 6 +- + 25 files changed, 306 insertions(+), 283 deletions(-) + +commit 829a96b1e08585b77443fcc2317a773bfd097655 +Author: termie +Date: Fri Jan 6 18:33:24 2012 -0800 + + add nova's cfg framework + + keystonelight/cfg.py | 1126 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 1126 insertions(+) + +commit 8fdcb69d4d6e155852c7d9fd35292b0e59f1469d +Author: termie +Date: Fri Jan 6 17:05:26 2012 -0800 + + fix pep8 + + keystonelight/backends/sql/core.py | 6 ++++-- + .../backends/sql/migrate_repo/versions/001_add_initial_tables.py | 1 + + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit c8ed28c7d302b4e0db2e36161e4ed74102964996 +Author: termie +Date: Fri Jan 6 17:03:19 2012 -0800 + + missed a file + + keystonelight/backends/sql/core.py | 2 + + tests/test_backend.py | 91 ++++++++++++++++++++++++++++++++++++++ + tests/test_backend_kvs.py | 4 +- + tests/test_backend_sql.py | 4 +- + 4 files changed, 97 insertions(+), 4 deletions(-) + +commit 6495d41ac2bf3548c4d3a9bea40d7ecd3ee8ac1c +Author: termie +Date: Fri Jan 6 17:00:01 2012 -0800 + + most tests working again + + keystonelight/backends/sql/core.py | 132 +++++++++++++++++------------- + keystonelight/models.py | 7 +- + keystonelight/test.py | 9 ++- + tests/default_fixtures.py | 2 +- + tests/test_backend_kvs.py | 96 +--------------------- + tests/test_backend_sql.py | 161 +++++++++---------------------------- + 6 files changed, 126 insertions(+), 281 deletions(-) + +commit 119808d60247ebe59cf84f89e76a262732da2bd9 +Author: termie +Date: Thu Jan 5 15:17:22 2012 -0800 + + still wip, got migration mostly working + + keystonelight/backends/sql.py | 347 -------------------- + keystonelight/backends/sql/__init__.py | 1 + + keystonelight/backends/sql/core.py | 351 +++++++++++++++++++++ + keystonelight/backends/sql/migrate_repo/README | 4 + + .../backends/sql/migrate_repo/__init__.py | 0 + keystonelight/backends/sql/migrate_repo/manage.py | 5 + + .../backends/sql/migrate_repo/migrate.cfg | 25 ++ + .../versions/001_add_initial_tables.py | 14 + + .../backends/sql/migrate_repo/versions/__init__.py | 0 + keystonelight/backends/sql/migration.py | 74 +++++ + tests/default.conf | 2 +- + tests/test_backend_kvs.py | 4 +- + tests/test_backend_sql.py | 154 +++++++++ + 13 files changed, 631 insertions(+), 350 deletions(-) + +commit 775b8ed73415716f55becd7d0c94b48113f148d5 +Author: termie +Date: Thu Jan 5 14:21:18 2012 -0800 + + get the sql ball rolling, still wip + + keystonelight/backends/sql.py | 238 +++++++++++++++++++++++++++++++++++++++--- + keystonelight/models.py | 6 +- + keystonelight/test.py | 6 +- + tests/default.conf | 7 ++ + tests/test_backend_kvs.py | 1 + + 5 files changed, 240 insertions(+), 18 deletions(-) + +commit b766165b8b2ec4781c45feb53075bd338fb39b9f +Author: termie +Date: Wed Dec 28 16:24:37 2011 -0800 + + add sql backend, WIP + + keystonelight/backends/sql.py | 135 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 135 insertions(+) + +commit 0762754801ccb472f6c8ca98297f2b0091798c9c +Author: Cole Robinson +Date: Mon Jan 9 11:24:51 2012 -0500 + + Show useful traceback if manage command fails + + Currently, if a keystone-manage command raises an exception, the + exception object is reraised which overwrites the original traceback. + + Use plain 'raise' to preserve the original stack trace. Refactor + the error handling to not use a nested try/except. + + Change-Id: I86f3ad945018b32a50e7d09e354b1990d0d0ecf3 + + keystone/manage/__init__.py | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +commit bbdb716ef0644301cf33979908df59e7894e2ea4 +Merge: f560488 3f70358 +Author: Jenkins +Date: Mon Jan 9 14:58:05 2012 +0000 + + Merge "Add 'tenants' to Auth & Validate Response" + +commit f560488ed98fd70bc86d58bf6fcf335a877b5a14 +Merge: ee617f4 1c2708f +Author: Jenkins +Date: Mon Jan 9 14:48:39 2012 +0000 + + Merge "Fixed Test Coverage Handling" + +commit ee617f4b176c33e30b740481d18bbca992cfb557 +Author: Michael Still +Date: Sun Jan 8 18:35:12 2012 +1100 + + Fix minor typo + + Change-Id: I17c8be42a785f110ad16031c9715290b8e16d8c8 + + keystone/middleware/auth_token.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3f70358bc3c893c6e85e9a0ee87d835fb54619ef +Author: Ziad Sawalha +Date: Fri Jan 6 11:18:06 2012 -0600 + + Add 'tenants' to Auth & Validate Response + + - Addresses bug 906442 + - Preserves compatibility (keeps 'tenant') + - No changes in XML (this is a json-only gap) + + Change-Id: Ia6f373d0c7e40b05892c6cdffeed8d1e4b6f65ca + + keystone/content/common/samples/auth.json | 6 +- + keystone/logic/types/auth.py | 8 +- + keystone/test/functional/test_auth.py | 7 +- + keystone/test/functional/test_token.py | 2 +- + keystone/test/unit/test_authn_ec2.py | 180 ++++++++++++++++++++++++++++++ + keystone/test/unit/test_authn_password.py | 65 +++++++++++ + keystone/test/unit/test_ec2_authn.py | 180 ------------------------------ + 7 files changed, 263 insertions(+), 185 deletions(-) + +commit 1c2708fb5ba23c0b4c9e830cd288cb2ba72a213d +Author: Ziad Sawalha +Date: Fri Jan 6 21:37:55 2012 -0600 + + Fixed Test Coverage Handling + + - Coverage command was causing tests to + stop after first run (OptParse was exiting + so had to override the behaviour) + - Also added logging, error handling, and + combining ot coverage files between runs. + - Output summary report at end of run + + Change-Id: Ibec98009b16226de9a68da3be3d7b258d6d771a4 + + keystone/test/__init__.py | 11 ++++++++++- + keystone/test/etc/sql_no_hpidm.conf.template | 8 ++++---- + run_tests.py | 25 ++++++++++++++++--------- + run_tests.sh | 5 +++-- + 4 files changed, 33 insertions(+), 16 deletions(-) + +commit 73525ac00d7d7d6e55ef59ba2fbd2d1dffa7b89e +Author: Ziad Sawalha +Date: Fri Jan 6 19:51:00 2012 -0600 + + Adding prettytable dependency + + Adding it to pip-requires in a separate review + so we can rebuild the venv. Tests failing + otherwise + + Change-Id: I10b8049f12080de198978d32e485c86beb06da91 + + tools/pip-requires | 1 + + 1 file changed, 1 insertion(+) + +commit 105b90844af9ddd7bb25dab886a70c4887c66766 +Author: Ziad Sawalha +Date: Fri Dec 30 13:06:36 2011 -0600 + + Front-end logging + + - Added logging to Front-end components + - Replaced console logging with log info events + - Addresses some of bug 900451 (import exception + mentioned will get logged to logger, but logger + is not yet initialized by that time) + - blueprint keystone-logging + + Change-Id: I1dce90b9876d7bc26c090d757b44f7321bc32f9d + + keystone/backends/backendutils.py | 14 +++- + .../contrib/extensions/admin/raxkey/frontend.py | 10 ++- + .../contrib/extensions/service/osec2/frontend.py | 10 ++- + .../contrib/extensions/service/raxkey/frontend.py | 12 +-- + keystone/frontends/d5_compat.py | 94 ++++++++++++++++------ + keystone/frontends/legacy_token_auth.py | 21 +++-- + keystone/frontends/normalizer.py | 12 ++- + keystone/logic/types/tenant.py | 1 - + keystone/manage/__init__.py | 57 ++++++------- + keystone/middleware/auth_basic.py | 12 ++- + keystone/middleware/auth_openid.py | 21 ++--- + keystone/middleware/auth_token.py | 53 ++++++------ + keystone/middleware/ec2_token.py | 11 ++- + keystone/middleware/glance_auth_token.py | 5 ++ + keystone/middleware/nova_auth_token.py | 20 +++-- + keystone/middleware/nova_keystone_context.py | 4 + + keystone/middleware/quantum_auth_token.py | 26 +++--- + keystone/middleware/remoteauth.py | 10 ++- + keystone/middleware/url.py | 9 +-- + keystone/server.py | 8 +- + 20 files changed, 263 insertions(+), 147 deletions(-) + +commit 06a843a7cc2dcdbb0734fc0d7edf3e805de8e141 +Merge: 205a7b9 9691c0f +Author: Andy Smith +Date: Fri Jan 6 16:03:41 2012 -0800 + + Merge pull request #4 from 4P/master + + small updates to make it easy to run and track in jenkins + +commit 9691c0f7c8d1528290543765a355d0459f639e38 +Author: Joe Heck +Date: Fri Jan 6 15:58:02 2012 -0800 + + tweaking for running regular tests in jenkins + + .gitignore | 4 ++++ + run_tests.sh | 2 +- + tools/pip-requires-test | 1 + + 3 files changed, 6 insertions(+), 1 deletion(-) + +commit 870c1aa6181aed5f82a4dc19fda75ac9323e9b09 +Author: Ziad Sawalha +Date: Thu Jan 5 23:33:30 2012 -0600 + + Implement Role Model + + - Replace logic.types.Role(s) with models.Role(s) + - Also impacts UserRoleAssociation since that is + effectively a Role granted to a user + - Reorganized sqlalchemy.api.role file and grouped + rolegrant separately from role calls + - Made rolegrant and role calls return models.Role(s) + - Deleted logic.types.role + - Added enhancements to models to handle class-level + serialization hints and XML namespace + - Create AttrDict class to hold attrs and simplify + set/getattr overrides + - Renamed test modules to lowercase (PEP8) + + - Applies to: + bp keystone-refactor-backend + bp refactor-keystone-models + + Change-Id: I33784caa75aba5bbba822dc7169259cab0b73115 + + keystone/backends/sqlalchemy/api/role.py | 302 +++++++----- + keystone/controllers/roles.py | 2 +- + keystone/logic/service.py | 15 +- + keystone/logic/types/role.py | 147 ------ + keystone/logic/types/tenant.py | 42 -- + keystone/models.py | 530 ++++++++++++--------- + keystone/test/functional/test_roles.py | 1 - + keystone/test/functional/test_tenants.py | 12 +- + keystone/test/unit/base.py | 8 +- + keystone/test/unit/test_ec2_authn.py | 1 + + keystone/test/unit/test_models.py | 21 +- + keystone/test/unit/test_models_Endpoint.py | 80 ---- + keystone/test/unit/test_models_EndpointTemplate.py | 80 ---- + keystone/test/unit/test_models_Role.py | 88 ---- + keystone/test/unit/test_models_Service.py | 90 ---- + keystone/test/unit/test_models_Services.py | 47 -- + keystone/test/unit/test_models_Tenant.py | 168 ------- + keystone/test/unit/test_models_Token.py | 70 --- + keystone/test/unit/test_models_User.py | 69 --- + keystone/test/unit/test_models_endpoint.py | 80 ++++ + .../test/unit/test_models_endpoint_template.py | 80 ++++ + keystone/test/unit/test_models_role.py | 115 +++++ + keystone/test/unit/test_models_service.py | 90 ++++ + keystone/test/unit/test_models_services.py | 47 ++ + keystone/test/unit/test_models_tenant.py | 167 +++++++ + keystone/test/unit/test_models_token.py | 70 +++ + keystone/test/unit/test_models_user.py | 69 +++ + run_tests.py | 2 +- + 28 files changed, 1248 insertions(+), 1245 deletions(-) + +commit 876e309f29e4b6fc7a0153ceb3af6c86d037b825 +Author: Ziad Sawalha +Date: Fri Jan 6 01:45:14 2012 -0600 + + xsd fixes + + - use=optional applies to attributes. The way + to have an optional element is to use minOccurs=0 + This was fixed in tenant.xsd (was failing validation) + - Updated api.xsd and endpoints.xsd (recursive references) + - Removed old, invalid entries from RAX extensions + + Change-Id: I6264c3166fe6f5a93360f9c01020784feb2a69ce + + keystone/content/common/xsd/RAX-KSADM-users.xsd | 12 ------------ + keystone/content/common/xsd/endpoints.xsd | 3 ++- + keystone/content/common/xsd/tenant.xsd | 2 +- + 3 files changed, 3 insertions(+), 14 deletions(-) + +commit eac98b07b30b46edcc12b7b2f0789e294cac539b +Merge: 6111fb5 2e3ee14 +Author: Jenkins +Date: Fri Jan 6 06:43:28 2012 +0000 + + Merge "Initial keystone-manage rewrite (bp keystone-manage2)" + +commit 6111fb5caf2c24d2f4834617e19b0568a6f3687e +Merge: 82852a7 fe74938 +Author: Jenkins +Date: Fri Jan 6 06:34:07 2012 +0000 + + Merge "Correct endpoint template URLs in docs." + +commit 82852a7547a2ce21aa99cbf9499a61c06d3b6183 +Author: Ed Leafe +Date: Thu Jan 5 19:00:35 2012 +0000 + + Added decorators for admin and service_admin checks + + BP: keystone-internal-authorization + + Also updated the unit test base to include user roles in order to + add unit tests to the logic/service.py classes. + + Change-Id: I57312594e90a7970caf335a0864da195bf6bebe7 + + keystone/logic/service.py | 126 +++++++++-------- + keystone/test/unit/base.py | 236 +++++++++++++++++++------------ + keystone/test/unit/test_ec2_authn.py | 3 +- + keystone/test/unit/test_service_logic.py | 65 +++++++++ + 4 files changed, 276 insertions(+), 154 deletions(-) + +commit 2e3ee148fd9a4f22302fe25644b727fbd31efb94 +Author: Dolph Mathews +Date: Fri Dec 2 22:24:13 2011 -0600 + + Initial keystone-manage rewrite (bp keystone-manage2) + + - Example session: http://paste.openstack.org/show/3927/ + - Example usage: ./bin/keystone-manage --help + - Example usage: ./bin/keystone-manage version --help + - Commands are implemented as decorated classes + - The name of the command module *is* the name of the command + - Testing + - Includes base testcase for testing commands, with the following coverage: + - Unit test command classes directly + - Unit test by passing parsed args (via argparse) + - Use output buffer to make assertions on stdout + - Includes tests for 'version' command + - Includes tests for OutputBuffer + - Routing calls through bin/keystone-manage to manage2. + - New command names use a different syntax, so none should collide. + - Old: 'subject verb' (e.g. 'user add') + - New: 'verb_subject' (e.g. 'add_user') + - Implication: --help for original keystone-manage is now overridden + by that from manage2 + - OutputBuffer captures stdout as a string for testing commands + - Example usage: + + with buffout.OutputBuffer() as ob: + print 'foobar' + assert ob.read() == 'foobar\n' + + Change-Id: Iafd25d77df600ca70e19925936f3e997109f4d68 + + bin/keystone-manage | 10 ++- + keystone/manage2/__init__.py | 66 ++++++++++++++++++++ + keystone/manage2/commands/__init__.py | 0 + keystone/manage2/commands/version.py | 39 ++++++++++++ + keystone/manage2/common.py | 33 ++++++++++ + keystone/test/client/test_keystone_manage.py | 2 +- + keystone/test/unit/test_buffout.py | 91 ++++++++++++++++++++++++++++ + keystone/test/unit/test_commands.py | 64 +++++++++++++++++++ + keystone/tools/buffout.py | 83 +++++++++++++++++++++++++ + 9 files changed, 386 insertions(+), 2 deletions(-) + +commit fe74938ef53724c5e2e973a0c311d54a7ac0f63c +Author: Kiall Mac Innes +Date: Thu Jan 5 12:27:31 2012 +0000 + + Correct endpoint template URLs in docs. + + Change-Id: I6ef379d2b9f7442b3a53e03dc680dff17ad506ca + + AUTHORS | 1 + + doc/source/configuringservices.rst | 12 ++++++------ + 2 files changed, 7 insertions(+), 6 deletions(-) + +commit 1b44286ca9592b2be3cfaf00003b9a3b210a2826 +Author: Yaguang Tang +Date: Thu Jan 5 17:03:00 2012 +0800 + + fix bug lp:843064 + + change description of for integrating with nova. + + Change-Id: I8c9dc9922efd4aa055c2f0e984aaad1cd7e9bca6 + + README.md | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 205a7b9aed46c62567da6edc67e8303ba42ce9c5 +Author: termie +Date: Wed Jan 4 18:23:07 2012 -0800 + + finished up services stuff + + i don't think it makes any sense though + + keystonelight/backends/kvs.py | 27 ++++++++++++++++++++++++--- + keystonelight/backends/templated.py | 5 ++++- + keystonelight/catalog.py | 12 ++++++++++++ + keystonelight/keystone_compat.py | 31 +++++++++++++++++++++++++++++-- + keystonelight/service.py | 6 +++++- + tests/test_keystoneclient_compat.py | 2 ++ + 6 files changed, 76 insertions(+), 7 deletions(-) + +commit ebe158f750cabe1786d2ab084746d32880ff98fa +Author: termie +Date: Wed Jan 4 17:31:54 2012 -0800 + + add the various role tests + + keystonelight/backends/kvs.py | 9 +++++ + keystonelight/identity.py | 3 ++ + keystonelight/keystone_compat.py | 71 ++++++++++++++++++++++++++----------- + tests/test_keystoneclient_compat.py | 8 ++--- + 4 files changed, 67 insertions(+), 24 deletions(-) + +commit 5c89972ffeb2256c362773cc367440edbe16f623 +Author: termie +Date: Wed Jan 4 17:13:23 2012 -0800 + + add list users + + keystonelight/backends/kvs.py | 9 +++++++++ + keystonelight/identity.py | 5 +++++ + keystonelight/keystone_compat.py | 8 +++++++- + 3 files changed, 21 insertions(+), 1 deletion(-) + +commit 46943c5f4110042756f0919a45cff11544548c7b +Author: termie +Date: Wed Jan 4 15:47:52 2012 -0800 + + get user tests working + + keystonelight/keystone_compat.py | 104 ++++++++++++++++++++++++++++-------- + tests/test_keystoneclient_compat.py | 4 +- + 2 files changed, 84 insertions(+), 24 deletions(-) + +commit bb1aed610f070f6e584c9f624780dedbd85ef809 +Author: James E. Blair +Date: Thu Jan 5 00:15:33 2012 +0000 + + Remove install_requires processing. + + This is based on a similar change to nova: + https://review.openstack.org/#change,2800 + + Loading install_requires with the contents of pip-requires + isn't getting us any real beneift and is causing issues. + + a) It can conflict with installing keystone into an environment + where deps have been installed from packages (devstack) + b) It breaks the ability to use -e git urls in pip-requires + which we want to start using for python-novaclient and + python-keystoneclient + c) It causes spurious network traffic when we're trying to + test things. + + At the same time, since we are not expecting anyone to install + keystone from setup.py for production, the normal benefit of the + feature is not needed. + + Change-Id: I7235e1bff75a9fd1455daa684300a83c4295bd9c + + setup.py | 7 ------- + 1 file changed, 7 deletions(-) + +commit ff15e5fca79611bd923da89fae873de58a23db9a +Author: termie +Date: Wed Jan 4 14:52:17 2012 -0800 + + get endpoints test working + + keystonelight/keystone_compat.py | 6 +++--- + tests/test_keystoneclient_compat.py | 6 ++++-- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit c6d6d43b7e4af109423f23f6bbf136e94025437d +Author: termie +Date: Wed Jan 4 14:33:43 2012 -0800 + + get tenant_add_and_remove_user test working + + this actually required a lot of stuff, basically we have to + emulate some legacy features where user-tenant association is only + handled through roles. + + in the process we added a few high level calls that will make + abstracting the backend easier, too + + keystonelight/backends/kvs.py | 47 ++++++++++++++++++++ + keystonelight/identity.py | 21 +++++++++ + keystonelight/keystone_compat.py | 85 ++++++++++++++++++++++++++++++++++++- + tests/default_fixtures.py | 2 + + tests/test_keystoneclient_compat.py | 33 +++++++++++--- + 5 files changed, 180 insertions(+), 8 deletions(-) + +commit 94e9d6bcc236f9538053f095e6f8d140c1f6d2e9 +Author: termie +Date: Wed Jan 4 11:05:58 2012 -0800 + + tenant test working again + + keystonelight/keystone_compat.py | 66 +++++++++++++++++++++---------------- + keystonelight/service.py | 14 ++++++++ + tests/test_keystoneclient_compat.py | 3 +- + 3 files changed, 53 insertions(+), 30 deletions(-) + +commit e39665091379cf3a9ec6d97696c2f41f6343923d +Author: termie +Date: Wed Jan 4 10:45:18 2012 -0800 + + copy over the os-ksadm extension + + keystonelight/keystone_compat.py | 132 ++++++++++++++++++++++++++++++++++++--- + 1 file changed, 123 insertions(+), 9 deletions(-) + +commit 40579d213fd310f9c7a34157f6bf25182c9a69b6 +Merge: de05b02 e0ffbc0 +Author: Jenkins +Date: Wed Jan 4 16:30:53 2012 +0000 + + Merge "Implement Endpoint, Endpoint Template, and Credential Managers" + +commit de05b02bc1eacb6faf0a01737f5fd0b3b34ee6c0 +Merge: 44e9bf7 8b00bd1 +Author: Jenkins +Date: Wed Jan 4 15:07:35 2012 +0000 + + Merge "PEP8 keystone cleanup" + +commit e0ffbc08e4724b81cb9d9bbeb09fce39977a56e8 +Author: Ziad Sawalha +Date: Wed Jan 4 00:54:34 2012 -0600 + + Implement Endpoint, Endpoint Template, and Credential Managers + + - removed api.ENDPOINT_TEMPLATE calls from service.py + - removed api.CREDENTIALS calls from service.py + - separated operations on Endpoints from operations + on Endpoint Templates + - removed reference to backend api from imports + - Applies to: + bp keystone-refactor-backend + bp refactor-keystone-models + + Change-Id: I81d34455f847e4a8b1a3bcdd2a2b2b6c581e769c + + keystone/logic/service.py | 83 ++++++++++++++++++++-------------- + keystone/managers/credential.py | 32 +++++++++++++ + keystone/managers/endpoint.py | 56 +++++++++++++++++++++++ + keystone/managers/endpoint_template.py | 66 +++++++++++++++++++++++++++ + 4 files changed, 202 insertions(+), 35 deletions(-) + +commit 8b00bd19688a3fb0f5d8f1755e1c08a235d1d19e +Author: lzyeval +Date: Wed Jan 4 10:48:30 2012 +0800 + + PEP8 keystone cleanup + + The None, True, and False values are singletons. + + All variable *comparisons* to singletons should use 'is' or 'is not'. + All variable *evaluations* to boolean should use 'if' or 'if not'. + All Object type comparisons should use isinstance() + instead of comparing types directly. + + Change-Id: Ic3dfcd81ae772fa8cccaa8c0bfa3a4e3a54ae05a + + AUTHORS | 1 + + keystone/backends/__init__.py | 4 ++-- + keystone/backends/backendutils.py | 6 +++--- + keystone/backends/ldap/api/role.py | 4 ++-- + keystone/backends/memcache/__init__.py | 2 +- + keystone/backends/sqlalchemy/api/tenant.py | 4 ++-- + keystone/common/config.py | 2 +- + keystone/common/template.py | 3 +-- + keystone/common/wsgi.py | 6 +++--- + keystone/logic/types/auth.py | 2 +- + keystone/middleware/quantum_auth_token.py | 2 +- + keystone/test/__init__.py | 2 +- + keystone/test/functional/common.py | 4 ++-- + keystone/test/unit/test_controller_version.py | 2 +- + tools/validate_json.py | 2 +- + 15 files changed, 23 insertions(+), 23 deletions(-) + +commit 44e9bf7563170531760872983c17585da97d61ea +Author: Ed Leafe +Date: Tue Jan 3 23:16:11 2012 +0000 + + Changes run_tests.sh to also run pep8 by default. + + Can be turned off by passing -P on the command line. + Fixes bug lp911438. + + Change-Id: Icf719702d496f08b14b7855a1d99ec5419ac63bf + + run_tests.sh | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +commit c26a1dfcf3f7d0b163f23926042b95f3bf501e9f +Merge: ddc9495 d4cb5fb +Author: Jenkins +Date: Wed Jan 4 00:27:00 2012 +0000 + + Merge "Un-pythonic methods lp:911311 Fixed pep8 problems Changed comments to docstrings." + +commit ddc949588461e8b4570aa0b5fc41d5b316fbc8bd +Merge: bdf4b83 b990dd2 +Author: Jenkins +Date: Wed Jan 4 00:17:37 2012 +0000 + + Merge "fix bug lp:910491 option "service_host" in keystone.conf not works" + +commit 23c6f49f874b5cb2dc7e94aa3b47136ee042bd32 +Author: termie +Date: Tue Jan 3 16:00:59 2012 -0800 + + example crud extension for create_tenant + + keystonelight/keystone_compat.py | 13 ++++++++++ + keystonelight/wsgi.py | 42 +++++++++++++++++++++++++++++++++ + tests/keystoneclient_compat_master.conf | 5 +++- + 3 files changed, 59 insertions(+), 1 deletion(-) + +commit bdf4b831efe1aef89e85db81cf6de76ae0e93752 +Author: Ziad Sawalha +Date: Sat Dec 31 03:21:14 2011 -0600 + + Updates to Tests/Testing + + Improve logging, error handling, messaging, and overall + functionality. + + - Added '--only' as option as well as '-O' flag to select test + suites (for consistency with other flags) + - Updated tracer to pop it's argument out of sys.argv (and + refactored/optimized some code) + - Updated test cleanup so we can now run all suites in + the same process (less messing about with Popen/Wait) + - Addressed many (handled) import errors showing up with new + logging (many unnecessary in backend loader) + - Added logging along the way + - unittest.skip not working in test_middleware, so explicitely + raised SkipTest exceptions + - Made test suites skip intelligently if test filter calls for + client, functional, or unit tests + - Configured all suite config files to point to same log file + to more easily debug when running multiple suites + + bp keystone-logging + + Change-Id: Ic05306c9b8e249c2cbcf92bda3c066031835901b + + keystone/backends/sqlalchemy/__init__.py | 24 ++--- + keystone/common/bufferedhttp.py | 4 +- + keystone/contrib/extensions/__init__.py | 29 +++--- + keystone/controllers/token.py | 2 + + keystone/logic/service.py | 1 - + keystone/test/__init__.py | 102 +++++++++++++------ + keystone/test/etc/ldap.conf.template | 2 +- + keystone/test/etc/memcache.conf.template | 2 +- + keystone/test/etc/sql.conf.template | 2 +- + keystone/test/etc/sql_no_hpidm.conf.template | 2 +- + keystone/test/etc/ssl.conf.template | 2 +- + keystone/test/functional/common.py | 19 ++-- + keystone/test/unit/test_migrations.py | 1 - + keystone/tools/tracer.py | 144 ++++++++++++++++++--------- + keystone/utils.py | 6 +- + run_tests.py | 93 ++++++++++++----- + run_tests.sh | 6 +- + 17 files changed, 288 insertions(+), 153 deletions(-) + +commit d4cb5fbdc69d639489f328fd0c4ac0349d88f8c1 +Author: Ed Leafe +Date: Tue Jan 3 16:21:48 2012 +0000 + + Un-pythonic methods lp:911311 + Fixed pep8 problems + Changed comments to docstrings. + + Change-Id: Ida14c6c307adf22429d96f8a1be56df565a44794 + + keystone/test/functional/common.py | 36 ++++++++++++++++++++++++------------ + 1 file changed, 24 insertions(+), 12 deletions(-) + +commit 63c79344445bafb828c1cec3ddfe65e0e482c6f7 +Author: termie +Date: Tue Jan 3 12:51:28 2012 -0800 + + get some tests working again + + keystonelight/keystone_compat.py | 5 ++++- + keystonelight/test.py | 10 +++++----- + tests/test_keystoneclient_compat.py | 7 ------- + 3 files changed, 9 insertions(+), 13 deletions(-) + +commit 0e7f06d71ed635a1fe9a7a0cde484f61a66e1db9 +Author: termie +Date: Tue Jan 3 11:41:43 2012 -0800 + + merge fixes + + tests/test_keystoneclient_compat.py | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 30a11465e3e7339b15ff06dbaf1644c3c6cdadf0 +Author: termie +Date: Tue Jan 3 11:40:37 2012 -0800 + + fixup + + keystonelight/keystone_compat.py | 4 ---- + 1 file changed, 4 deletions(-) + +commit c5b1b6fb05736ef5699111614ef72576eaeb55a8 +Author: Devin Carlen +Date: Thu Dec 29 20:51:11 2011 -0800 + + Made tests use both service and admin endpoints + + tests/test_keystoneclient_compat.py | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +commit 2fb294f6804cb7105dd985bf53fda55ac8817dae +Author: Devin Carlen +Date: Thu Dec 29 20:13:20 2011 -0800 + + All tests but create_tenant pass + + keystonelight/keystone_compat.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit f2a9c51af0d4c5f38663ac425b551e47d1c8f3dd +Author: Devin Carlen +Date: Thu Dec 29 17:40:32 2011 -0800 + + Split keystone compat by admin and service endpoints + + keystonelight/keystone_compat.py | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit f32648d7cd58b8f13f21e386f2238f48cff78b81 +Merge: 909770d 3eb2adf +Author: Andy Smith +Date: Tue Jan 3 11:06:10 2012 -0800 + + Merge pull request #3 from 4P/keystone-compat + + Split keystone compat by admin and service endpoints + +commit 3d762e8959c046be19d9d681d703151cf40d651a +Author: Monty Taylor +Date: Mon Jan 2 13:58:50 2012 -0800 + + Install a good version of pip in the venv. + + Change-Id: I894274207ecd47e4ac319f7e01bc44455419f58c + + tools/install_venv.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit b990dd243b3b178e166d2194e0406368a4c98772 +Author: Yaguang Tang +Date: Sun Jan 1 14:51:59 2012 +0800 + + fix bug lp:910491 option "service_host" in keystone.conf not works + + Change-Id: I1a0b78a2ef9dab287e719657c058f4ed2675b2c1 + + AUTHORS | 1 + + keystone/common/config.py | 2 +- + keystone/server.py | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +commit 3eb2adfff686a539c3f52afda2f45cd5aa4d1291 +Author: Devin Carlen +Date: Fri Dec 30 16:14:36 2011 -0800 + + Added broken tests to show compatibility gaps + + tests/test_keystoneclient_compat.py | 164 +++++++++++++++++++++++++++++++----- + 1 file changed, 141 insertions(+), 23 deletions(-) + +commit b3c8111b1a742b10eb7c3447b0e3c9920ac57c62 +Author: Monty Taylor +Date: Fri Dec 30 16:07:02 2011 -0800 + + Added tox.ini file + + Added file to start using tox to drive test running. + + Change-Id: I1ee4df92f03ae673ed3066e3fe561fa370430ffa + + tox.ini | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 4b55fa5e8e5f45f0155879f8d8afa8caf73898af +Author: Devin Carlen +Date: Thu Dec 29 17:40:32 2011 -0800 + + Split keystone compat by admin and service endpoints + + .gitignore | 2 + + bin/keystone | 29 +++- + etc/default.conf | 16 +- + keystonelight/catalog.py | 2 - + keystonelight/keystone_compat.py | 290 ++++++++++++++++++++++++-------- + keystonelight/test.py | 13 +- + keystonelight/wsgi.py | 20 +-- + tests/default.conf | 18 +- + tests/keystone_compat_diablo.conf | 17 +- + tests/keystoneclient_compat_master.conf | 23 ++- + tests/test_identity_api.py | 3 - + tests/test_keystoneclient_compat.py | 46 +++-- + 12 files changed, 347 insertions(+), 132 deletions(-) + +commit 67607044df47c1110cfbdbe79f8511d63f9d2095 +Author: Ziad Sawalha +Date: Fri Dec 30 15:45:58 2011 -0600 + + Implement Service Manager + + - removed api.SERVICE calls from logic.service + - bp refactor-keystone-models + + Change-Id: I5c18ac67228e0b2b75ef48ac4c8a94b9ddd692d1 + + keystone/logic/service.py | 47 +++++++++++++++++----------------- + keystone/managers/service.py | 61 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 85 insertions(+), 23 deletions(-) + +commit e215709e24ff7876b94fe40acc0bcb47d16c5099 +Author: Ziad Sawalha +Date: Fri Dec 30 01:08:28 2011 -0600 + + Implement Tenant Manager + + - remove api.TENANT calls from logic.service + - move tenant.is_ampty call into backend and out + of the API. It is only used by sqlalchemy and + the check is used before a delete. The logic + of whether you can delete a tenant with users + in it should be in the backend and it should + throw an error if it can't support it. So this + logic did not belong in service.py. + - Added Wsgi test module as well + + Change-Id: I7b1b0683aea92cd436297203cf085719af7ab2c8 + + keystone/backends/api.py | 7 +-- + keystone/backends/ldap/api/tenant.py | 10 ++++- + keystone/backends/sqlalchemy/api/tenant.py | 56 +++++++++++++++-------- + keystone/logic/service.py | 28 +++++------- + keystone/managers/tenant.py | 18 ++++++++ + keystone/test/unit/test_wsgi.py | 71 ++++++++++++++++++++++++++++++ + 6 files changed, 148 insertions(+), 42 deletions(-) + +commit 82344399d3a9cd2a27a233c3a470b8de2e5a8802 +Author: Ed Leafe +Date: Fri Dec 30 20:20:24 2011 +0000 + + Fixes bug lp:910169 - Tests are using too much memory + Added super() call to tearDown() method + + Change-Id: I95929837f7de691b96ba1e22c1f9ff18702c2901 + + keystone/test/functional/common.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 841ed4cbc08b70b361107f89c9ce40c508f7eb73 +Author: Ed Leafe +Date: Fri Dec 30 19:59:16 2011 +0000 + + Changed the call to create the KeystoneContextMiddleware object to pass the correct glance ConfigOpts object. + + Change-Id: I990e115f986e39e4110edb042c4642be210f9bbe + + AUTHORS | 1 + + keystone/middleware/glance_auth_token.py | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit e337eda9875b90bd8ecc869924086c3e4e2964c6 +Merge: b24a71c d932ef6 +Author: Jenkins +Date: Fri Dec 30 19:22:11 2011 +0000 + + Merge "Added logging on core modules" + +commit b24a71c3ae7b70404ef37da6eca7e8f856acfba9 +Merge: bd8204a 39cd0ce +Author: Jenkins +Date: Fri Dec 30 18:21:07 2011 +0000 + + Merge "Implement Role Manager" + +commit d932ef63925bbe78772cb4e0eb236097ef29402f +Author: Ziad Sawalha +Date: Fri Dec 30 12:14:01 2011 -0600 + + Added logging on core modules + + - keystone.server + - keystone.common.wsgi + - keystone.controllerrs.* + - keystone.logic.service + - keystone.utils + + blueprint keystone-logging + + Change-Id: I98802392c9595e725474e491ebc9fabc21bbd111 + + bin/keystone-admin | 3 +- + bin/keystone-auth | 7 ++--- + keystone/common/wsgi.py | 19 +++++++++---- + keystone/controllers/credentials.py | 26 +++++++++++++++++ + keystone/controllers/endpointtemplates.py | 26 +++++++++++++++++ + keystone/controllers/extensions.py | 26 +++++++++++++++++ + keystone/controllers/roles.py | 26 +++++++++++++++++ + keystone/controllers/services.py | 26 +++++++++++++++++ + keystone/controllers/staticfiles.py | 47 ++++++++++++++++++------------- + keystone/controllers/tenant.py | 28 ++++++++++++++++++ + keystone/controllers/token.py | 3 ++ + keystone/controllers/user.py | 26 +++++++++++++++++ + keystone/controllers/version.py | 33 ++++++++++++++++++++-- + keystone/logic/service.py | 30 ++++++++++++++++---- + keystone/routers/admin.py | 4 +++ + keystone/routers/service.py | 4 +++ + keystone/server.py | 30 +++++++++++--------- + keystone/utils.py | 10 +++++-- + 18 files changed, 319 insertions(+), 55 deletions(-) + +commit bd8204abe0639769f6308bf81d45491a24234c17 +Author: Ziad Sawalha +Date: Fri Dec 30 03:49:28 2011 -0600 + + Adding logging to Auth-Token Middleware + + - Under bp keystone-logging + - Added mostly debug logs to help troubleshooting + + Change-Id: I94787963e1c0b40721a61fea31521e18292b3e51 + + keystone/middleware/auth_token.py | 34 +++++++++++++++++++++++++++++++++- + 1 file changed, 33 insertions(+), 1 deletion(-) + +commit 39cd0ce172b528530506f22d269ffeaf49ce2407 +Author: Ziad Sawalha +Date: Fri Dec 30 03:15:36 2011 -0600 + + Implement Role Manager + + - removed api.ROLE calls from service.py + - cleaned up backend API function names to better + reflect what they do (especially for + differentiating between roles and roles-granted) + - Applies to: + bp keystone-refactor-backend + bp refactor-keystone-models + + Change-Id: I0be1e661e077ad6338f8c9e201f6cbc4a9689dc0 + + keystone/backends/api.py | 48 +++++++--- + keystone/backends/ldap/api/role.py | 30 +++--- + keystone/backends/ldap/api/tenant.py | 10 +- + keystone/backends/ldap/api/user.py | 12 +-- + keystone/backends/sqlalchemy/api/role.py | 22 +++-- + keystone/backends/sqlalchemy/api/user.py | 14 +-- + keystone/logic/service.py | 148 ++++++++++++++++-------------- + keystone/logic/types/auth.py | 22 ++--- + keystone/managers/grant.py | 57 ++++++++++++ + keystone/managers/role.py | 70 ++++++++++++++ + keystone/middleware/quantum_auth_token.py | 7 +- + keystone/test/functional/test_token.py | 2 +- + keystone/test/unit/test_models.py | 9 +- + keystone/test/unit/test_models_Tenant.py | 8 +- + 14 files changed, 310 insertions(+), 149 deletions(-) + +commit 96e9a6ab1b03fc2c1e9bf2f64055f92f2b639397 +Author: Ziad Sawalha +Date: Wed Dec 28 02:11:27 2011 -0600 + + Refactor models and backends + + Blueprints: + bp keystone-refactor-backend + bp refactor-keystone-models + + This is a combination of 9 commits. Originals + here: github.com/ziadsawalha/keystone/commits/models + + Move token calls in service.py to managers.token + - removed direct backend calls from service.py to token backend + - implementing blueprint keystone-refactor-backend + + Refactor: move tenant calls to managers.tenant + - Not all calls removed yet + + Implement models.Service in backends + - Adding functionality needed to models.Role + - Using models.Service in sqlalchemy.service + - additional serialization changes and tests. + + Implement models.service + - remove logic.types.service:Service class + + Implement user.manager + - remove direct backend calls to api.USER from service.py + + Remove user_get_update from backend API + - No idea why that is there. It seems to be a + duplicate of plain get. + + Backend updates + - Document some user APIs + - Update user.check_password to take user ID and password only + - Implement more user.manager calls in service.py + - remove user.delete_ternant_user call (probably existed when + we had the concept of users under tenants + + Completed moving api.USER to user_manager in service.py + - Completed remove of api.USER + - Additional backend API documentation + + Removed logic.types.service + - Completed moving to models.Service(s) + - Added basic test module for models.Services + - pep8/pylint cleanup + + Added keystone-manage tests + + Change-Id: Ife3e95974ab63c1c3a5999fd1ac558a3ef77e5ff + + keystone/backends/__init__.py | 4 - + keystone/backends/api.py | 74 +- + keystone/backends/ldap/api/user.py | 21 +- + keystone/backends/sqlalchemy/api/service.py | 22 +- + keystone/backends/sqlalchemy/api/user.py | 41 +- + keystone/backends/sqlalchemy/models.py | 4 + + keystone/controllers/services.py | 2 +- + keystone/logic/service.py | 1197 ++++++++++---------- + keystone/logic/types/service.py | 130 --- + keystone/manage/api.py | 12 +- + keystone/managers/tenant.py | 22 + + keystone/managers/token.py | 36 +- + keystone/managers/user.py | 81 ++ + keystone/models.py | 264 ++++- + keystone/test/__init__.py | 1 + + keystone/test/client/__init__.py | 2 + + keystone/test/client/test_keystone_manage.py | 58 + + keystone/test/functional/__init__.py | 25 + + keystone/test/functional/common.py | 2 +- + keystone/test/unit/test_keystone_manage.py | 32 - + keystone/test/unit/test_models.py | 35 +- + keystone/test/unit/test_models_Endpoint.py | 12 +- + keystone/test/unit/test_models_EndpointTemplate.py | 13 +- + keystone/test/unit/test_models_Role.py | 45 +- + keystone/test/unit/test_models_Service.py | 55 +- + keystone/test/unit/test_models_Services.py | 47 + + keystone/test/unit/test_models_Tenant.py | 32 +- + keystone/test/unit/test_models_Token.py | 12 +- + keystone/test/unit/test_models_User.py | 12 +- + run_tests.py | 4 +- + 30 files changed, 1310 insertions(+), 987 deletions(-) + +commit e99ff4e9ebbd2e9dc5db8e58cd2a4b89568b8ab2 +Merge: 7784673 fafc25b +Author: Jenkins +Date: Thu Dec 29 20:01:53 2011 +0000 + + Merge "Add HP-IDM extension to fix Bug 890411" + +commit fafc25b3b1d6f0610d31819d55c6c480cfd5bb5a +Author: Guang Yee +Date: Mon Dec 26 15:44:56 2011 -0800 + + Add HP-IDM extension to fix Bug 890411 + + See + + https://github.com/openstack/keystone/raw/master/keystone/content/admin/HP-IDM-admin-devguide.pdf + https://github.com/openstack/keystone/raw/master/keystone/content/admin/HP-IDM-admin.wadl + + and + + https://bugs.launchpad.net/keystone/+bug/890411 + + for more details. + + incorporated feedbacks from https://review.openstack.org/#change,2624 + + Change-Id: Ied659b3c010ac4efa04c073388bdf3f3a67a51f0 + + doc/source/controllingservers.rst | 4 +- + doc/source/extensions.rst | 9 + + etc/keystone.conf | 14 +- + etc/ldap.conf | 2 +- + etc/memcache.conf | 2 +- + etc/ssl.conf | 1 + + keystone/backends/__init__.py | 4 + + keystone/backends/ldap/fakeldap.py | 6 + + .../contrib/extensions/admin/hpidm/__init__.py | 33 +++ + .../contrib/extensions/admin/hpidm/extension.json | 21 ++ + .../contrib/extensions/admin/hpidm/extension.xml | 21 ++ + keystone/controllers/token.py | 7 +- + keystone/logic/extension_reader.py | 26 ++- + keystone/logic/service.py | 121 ++++++++-- + keystone/manage/__init__.py | 2 +- + keystone/manage/api.py | 10 +- + keystone/middleware/auth_token.py | 9 +- + keystone/middleware/quantum_auth_token.py | 13 +- + keystone/test/__init__.py | 12 + + keystone/test/client/test_extensions.py | 11 + + keystone/test/etc/ldap.conf.template | 2 +- + keystone/test/etc/memcache.conf.template | 2 +- + keystone/test/etc/sql.conf.template | 2 +- + keystone/test/etc/sql_no_hpidm.conf.template | 54 +++++ + keystone/test/etc/ssl.conf.template | 1 + + keystone/test/functional/common.py | 86 ++++++- + keystone/test/functional/test_extensions.py | 258 +++++++++++++++++++++ + keystone/test/sampledata.py | 12 + + run_tests.py | 1 + + run_tests.sh | 1 + + 30 files changed, 703 insertions(+), 44 deletions(-) + +commit 77846736dd1cd09c37b73796b23ecf707e2a5553 +Author: Ziad Sawalha +Date: Wed Dec 28 03:35:52 2011 -0600 + + Move URL Normalizer to Frontends + + keystone.middleware.url is a front-end filter for + keystone. It is not a service middleware. It should + therefore not be in the middleware directory. + + This patch moves it and updates associated documentation + and tests. It also maintains a reference file and code + to allow existing configurations to continue to work. + They will receive a warning message in the log to + update their configuration. + + Change-Id: Ib946bd3883df1cf5855b207771669f91d0dad1da + + doc/source/developing.rst | 13 +- + doc/source/keystone.conf.rst | 11 +- + etc/keystone.conf | 8 +- + etc/ldap.conf | 8 +- + etc/memcache.conf | 8 +- + etc/ssl.conf | 8 +- + keystone/frontends/normalizer.py | 206 +++++++++++++++++++++++++++ + keystone/middleware/url.py | 192 ++----------------------- + keystone/test/etc/ldap.conf.template | 8 +- + keystone/test/etc/memcache.conf.template | 8 +- + keystone/test/etc/sql.conf.template | 8 +- + keystone/test/etc/ssl.conf.template | 8 +- + keystone/test/unit/test_normalizingfilter.py | 2 +- + 13 files changed, 264 insertions(+), 224 deletions(-) + +commit 909770de2a317baf93f2f5a6710867a7f5c7b1fd +Author: termie +Date: Wed Dec 28 14:20:16 2011 -0800 + + move novaclient tests over also + + tests/test_novaclient_compat.py | 31 +++++-------------------------- + 1 file changed, 5 insertions(+), 26 deletions(-) + +commit 9e8ec252aa8a7704c4600b2ab367efff6a13902f +Author: termie +Date: Wed Dec 28 14:16:29 2011 -0800 + + clean up test_identity_api + + keystonelight/models.py | 2 +- + keystonelight/test.py | 2 ++ + tests/test_identity_api.py | 30 ++++++------------------------ + 3 files changed, 9 insertions(+), 25 deletions(-) + +commit 2e1558ebd2dba1d2adb89160d1bb1f4e2020f762 +Author: termie +Date: Wed Dec 28 13:58:49 2011 -0800 + + clean up keystoneclient setup + + keystonelight/keystone_compat.py | 17 +++++++++----- + keystonelight/test.py | 16 +++++++++++++- + tests/test_backend_kvs.py | 4 ++-- + tests/test_keystoneclient_compat.py | 44 ++++++++++++++----------------------- + 4 files changed, 45 insertions(+), 36 deletions(-) + +commit f9ce9115a54765597bafe1e72e7928dd285def4b +Author: Ziad Sawalha +Date: Wed Dec 28 11:31:26 2011 -0600 + + Move Global Role variables out of backendutils + + - These should be in the logic.service file + - Implemented under bp keystone-refactor-backend + + Change-Id: I4f5272f9f50181f6c4dbcb1e270d485587b6c971 + + keystone/backends/__init__.py | 14 -------------- + keystone/logic/service.py | 30 ++++++++++++++++++++++-------- + 2 files changed, 22 insertions(+), 22 deletions(-) + +commit 3f2b53586ca804115d8cf91e43f63ec7a300e82c +Author: Ewan Mellor +Date: Tue Dec 27 22:45:36 2011 -0800 + + Bug #909255: Endpoint handling broken on SQL backend by portable-identifiers changes + + When deciding whether to translate UIDs to integer IDs or vice versa, use + hasattr(api.TENANT, 'uid_to_id') or hasattr(api.TENANT, 'id_to_uid') in place + of isinstance(api.TENANT, models.Tenant). This matches the code elsewhere + (e.g. user.py) and has the effect that the IDs will be translated correctly. + + Change-Id: Ia036bf310d48f8f8aa5739cb3e09d1f7364ad1a4 + + keystone/backends/sqlalchemy/api/endpoint_template.py | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 32aa1dedb7cd5f1cae6531e72b122fca60ec9e19 +Author: termie +Date: Tue Dec 27 12:51:23 2011 -0800 + + add role crud + + keystonelight/backends/kvs.py | 17 ++++++++++++++++- + keystonelight/identity.py | 12 ++++++++++++ + keystonelight/test.py | 11 +++++++++++ + tests/default_fixtures.py | 7 +++---- + tests/test_backend_kvs.py | 5 +++++ + 5 files changed, 47 insertions(+), 5 deletions(-) + +commit a32c73c53504ed6a13ca1eba215320d04ffe48cc +Author: termie +Date: Tue Dec 27 12:50:11 2011 -0800 + + speed up tests + + .gitignore | 3 + + run_tests.sh | 2 +- + tests/test_keystone_compat.py | 171 ------------------------------------------ + tests/test_legacy_compat.py | 171 ++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 175 insertions(+), 172 deletions(-) + +commit 8425eabe6ffb9dcdfe205d559ca33e5cbf749428 +Author: termie +Date: Tue Dec 27 12:06:14 2011 -0800 + + add basic fixture functionality + + keystonelight/models.py | 10 ++++++++++ + keystonelight/test.py | 31 +++++++++++++++++++++++++++++++ + tests/default_fixtures.py | 16 ++++++++++++++++ + tests/test_backend_kvs.py | 17 ++--------------- + 4 files changed, 59 insertions(+), 15 deletions(-) + +commit 7541ed49954dea081ecb3aa97246b42b4f3c92c3 +Author: termie +Date: Tue Dec 27 11:20:55 2011 -0800 + + documentation driven development + + README.rst | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 53 insertions(+), 5 deletions(-) + +commit b4eba62b214a4dbc0c87e4c8e57c6643a5a0c9d7 +Author: termie +Date: Tue Dec 27 12:10:39 2011 -0800 + + novaclient now requires prettytable + + tools/pip-requires-test | 3 +++ + 1 file changed, 3 insertions(+) + +commit 08c0435aa1bad669c697de27efadda9765c50d1a +Merge: c1f583f 620d2ff +Author: Jenkins +Date: Tue Dec 27 18:31:14 2011 +0000 + + Merge " Bug #907521. Changes to support get roles by service." + +commit c1f583fb0e4ccaf11b1ad17f61da19fd7b82a554 +Author: Ziad Sawalha +Date: Mon Dec 26 16:52:23 2011 -0600 + + Return Endpoint IDs + + - Implements blueprint endpoint-identifiers + - Returns a unique identifier for each endpoint when + authenticating. This allows clients to reference an + endpoint even if some of its attributes (such as + region, version, etc...) change. + + Change-Id: Ib26a73493262cce801a70681a7f279d91e85a417 + + keystone/content/common/samples/auth.json | 2 ++ + keystone/content/common/samples/auth.xml | 5 +++++ + keystone/logic/types/auth.py | 2 ++ + 3 files changed, 9 insertions(+) + +commit f2b8ce035b8bab826539a6fa70d9ab064f0ad361 +Author: Ziad Sawalha +Date: Mon Dec 26 15:32:44 2011 -0600 + + Correct Handling of Default Tenant + + - implements solution for bug 881794 + - GET /tenants returns all tenants if scoped to a default tenant + + Change-Id: I49246a24f97ace19467aaaa72077c8f78f064759 + + keystone/logic/service.py | 23 +++- + keystone/test/functional/common.py | 8 +- + keystone/test/functional/test_authentication.py | 125 ++++++++++-------- + keystone/test/functional/test_tenants.py | 163 +++++++++++++++++------- + 4 files changed, 207 insertions(+), 112 deletions(-) + +commit 6babef79065882d9076a4940fb697bb5cb5e3aea +Author: Ziad Sawalha +Date: Mon Dec 26 16:27:02 2011 -0600 + + Fix duplicate logging + + - when running bin/keystone, duplicate FileHandlers + were intialized. A check now prevents this. + - Fixes bug 844959 + - Addresses some of blueprint keystone-logging + + Change-Id: Ic017423091c35f37721dbda7af0fa253541647c6 + + keystone/common/config.py | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit ae3c3da36411238eb66eea7aee2c7e3530ab54f1 +Author: Ziad Sawalha +Date: Mon Dec 26 10:32:38 2011 -0600 + + Added global endpoints response in XML as well + + Change-Id: I3287387e1847cc06fe4d90e90c13ff12ae436f2a + + keystone/logic/types/auth.py | 23 +++++++++++++++++------ + run_tests.py | 2 +- + 2 files changed, 18 insertions(+), 7 deletions(-) + +commit 067ab5b254d1375c44eaa640d8d4269c8fbfe3b4 +Author: Ziad Sawalha +Date: Mon Dec 26 10:39:32 2011 -0600 + + Fix: Client and Unit Tests not correctly failing a build + + Change-Id: Id3ec3246932e74d00a0811aeaf44e33c2b56a8f2 + + keystone/controllers/version.py | 2 +- + keystone/test/__init__.py | 4 ++-- + keystone/test/unit/test_backends.py | 3 ++- + 3 files changed, 5 insertions(+), 4 deletions(-) + +commit 620d2ff33d8f4994d0f31b6c04c38910ce63a082 +Author: Yogeshwar Srikrishnan +Date: Thu Dec 22 09:54:21 2011 -0600 + + Bug #907521. + Changes to support get roles by service. + + Change-Id: I0646ab91f6961e5e3ed40b8697412c31047511d3 + + keystone/backends/api.py | 6 ++ + keystone/backends/ldap/api/role.py | 10 +++- + keystone/backends/sqlalchemy/api/role.py | 97 ++++++++++++++++++++++++-------- + keystone/controllers/roles.py | 21 +++++-- + keystone/logic/service.py | 22 ++++++-- + keystone/test/functional/common.py | 16 +++++- + keystone/test/functional/test_roles.py | 39 +++++++++++++ + 7 files changed, 174 insertions(+), 37 deletions(-) + +commit 6c40cc9223f76f9242475b8f55165b38ff0999c7 +Merge: 16409df 8f63921 +Author: Jenkins +Date: Mon Dec 26 16:19:24 2011 +0000 + + Merge "Fixed bug 905422. Swift caching should work again. Also fixed a few other minor syntactical stuff." + +commit 16409df198a258b34ee9d022fe99260b65280e64 +Merge: 6fe27af c74d23f +Author: Jenkins +Date: Mon Dec 26 16:10:57 2011 +0000 + + Merge "Added HP-IDM documentation artifacts." + +commit 6fe27afd9f450a0223ddb5a726b78ea13a968912 +Merge: 441771f b725ad9 +Author: Jenkins +Date: Mon Dec 26 16:02:35 2011 +0000 + + Merge "Always Return Global Endpoints" + +commit 441771fa603d0be4c37b95361a7c872e448676c0 +Merge: 1a57df3 2c034be +Author: Jenkins +Date: Sat Dec 24 00:42:34 2011 +0000 + + Merge "Added release notes" + +commit 1a57df3da11c7b627f810b61a95237d1a5ccc3cc +Merge: e1be8d5 aca713d +Author: Jenkins +Date: Fri Dec 23 23:55:34 2011 +0000 + + Merge "Implement Multiple Choices Response (bug 843051)" + +commit b725ad943eac1326429fa2a4f00f4f8104a6870c +Author: Ziad Sawalha +Date: Fri Dec 23 12:15:28 2011 -0600 + + Always Return Global Endpoints + + Global endpoints should be returned even when an unscoped + token is returned. + + This implements blueprint globalendpoints + + Change-Id: I73169840788bc1147d4ca5c87a8f16ad7e081c9a + + keystone/frontends/d5_compat.py | 9 ++++---- + keystone/logic/service.py | 8 +++---- + keystone/logic/types/auth.py | 40 +++++++++++++++++++++------------- + keystone/test/sampledata.py | 2 ++ + keystone/test/unit/test_backends.py | 42 ++++++++++++++++++++++++++++++++++++ + keystone/test/unit/test_d5_compat.py | 15 +++++++++++++ + 6 files changed, 92 insertions(+), 24 deletions(-) + +commit 2c034be4413b64b05df2330234a98191494f66ef +Author: Ziad Sawalha +Date: Fri Dec 23 16:27:41 2011 -0600 + + Added release notes + + Change-Id: I522a2443c67cedf37e62d11bb8c524d78fb15ff1 + + doc/source/index.rst | 1 + + doc/source/releases.rst | 20 ++++++++++++++++++++ + 2 files changed, 21 insertions(+) + +commit e1be8d5d07e87c38ea1a59cb620fc83960a30ff3 +Author: Ziad Sawalha +Date: Fri Dec 23 08:51:54 2011 -0600 + + Fixed error with database initialization + + New versioning code was not creating tables in + database when database was not an in-memory database. + This broke existing behaviour, scripts (like + devstack). + Identified problem in backend tests where backends + were not being reloaded between tests. + This highlighted an issue where LDAP was not passing + tests and that was fixed. + + Change-Id: Ib4eab7fe696bdc48c363032f078e5c535abc0849 + + keystone/backends/ldap/api/tenant.py | 6 ++-- + keystone/backends/sqlalchemy/__init__.py | 5 +++ + keystone/backends/sqlalchemy/api/tenant.py | 12 ++++--- + keystone/test/unit/test_backends.py | 58 ++++++++++++++++++++++-------- + 4 files changed, 60 insertions(+), 21 deletions(-) + +commit 1c6c3515660bbf98d1b585c7723eab2482208d15 +Author: Ziad Sawalha +Date: Wed Dec 21 18:03:35 2011 -0600 + + Tests use free TCP/IP ports + + - test.KeystoneTest loads server (in ClientTests only) on free TCP/IP + port and sets globals in keystone.test.client to point to the server. + Client tests pick that info up and use the provided server ports. + - All defaults to 35357/5000 remain + + Change-Id: Ifc4ff023e3004cf886d26eaefeb42e1b469e9b81 + + keystone/client.py | 4 ++ + keystone/server.py | 14 ++++-- + keystone/test/__init__.py | 34 ++++++++++++--- + keystone/test/client/__init__.py | 37 ++++++++++++++++ + keystone/test/client/test_client.py | 21 +++++---- + keystone/test/client/test_middleware.py | 13 ++++-- + keystone/test/etc/ldap.conf.template | 4 +- + keystone/test/etc/memcache.conf.template | 4 +- + keystone/test/etc/sql.conf.template | 4 +- + keystone/test/etc/ssl.conf.template | 4 +- + keystone/test/functional/common.py | 74 ++++++++++++++++++++------------ + keystone/test/utils.py | 12 ++++++ + 12 files changed, 169 insertions(+), 56 deletions(-) + +commit a5e7587c8dcb6f89ce49d694c8eca8d3baf8e854 +Author: Ziad Sawalha +Date: Tue Dec 20 01:19:13 2011 -0600 + + Testing Refactor + - this is a squash of 6 commits + - original commits are vailable for cherry-picking here: + https://github.com/ziadsawalha/keystone/commits/tests + + Removed test dependency on sampledata + - added fixtures in FunctionalTestCase class + - updated tests to use created fixtures + - only kept boot-strap creations in KeystoneTestCase + + Note: This has significantly slowed down tests, but this will + allow us to continue refactoring tests to not go through HTTP + and not require a running server (where not needed). + + Backend test suites (SQL, LDAP, etc) can also now be run + separately and in parallel since they don't need a TCP/IP + port. These tests no longer use http(s). + + Update to Tenant serialization + + - Correctly handle description as an optional attribute + of tenant + - added tests that fail where blank description was coming + back as 'None' string. + - added fixes to handle None correctly (check for None + before calling str(value) + + Separated out test suites + + - Unit, Functional, and Client (HTTP) suites can be run separately + - -O flag in run_tests now accepts UnitTests and ClientTests as options + - run_tests will run all suites (but end up executing less tests + overall since Unit tests run once and client tests run twice; for + HTTP and HTTPS/SSL tests + + Fixed 'python setup.py test' not running + + Change-Id: I3505740466abac0fbb35c822858c70a234893798 + + keystone/logic/service.py | 2 +- + keystone/logic/types/tenant.py | 16 +- + keystone/models.py | 7 +- + keystone/test/__init__.py | 152 +++++++-- + keystone/test/client/__init__.py | 0 + keystone/test/client/test_client.py | 96 ++++++ + keystone/test/client/test_d5_compat_calls.py | 169 ++++++++++ + keystone/test/client/test_extensions.py | 57 ++++ + keystone/test/client/test_frontends.py | 38 +++ + keystone/test/client/test_middleware.py | 97 ++++++ + keystone/test/client/test_request_specs.py | 93 ++++++ + keystone/test/client/test_static_files.py | 94 ++++++ + keystone/test/functional/common.py | 399 +++++++++++++++++++++-- + keystone/test/functional/test_auth.py | 4 - + keystone/test/functional/test_authentication.py | 31 -- + keystone/test/functional/test_client.py | 95 ------ + keystone/test/functional/test_credentials.py | 28 +- + keystone/test/functional/test_d5_compat_calls.py | 167 ---------- + keystone/test/functional/test_endpoints.py | 97 ++++-- + keystone/test/functional/test_extensions.py | 53 --- + keystone/test/functional/test_middleware.py | 94 ------ + keystone/test/functional/test_request_specs.py | 91 ------ + keystone/test/functional/test_roles.py | 119 ++++--- + keystone/test/functional/test_services.py | 20 ++ + keystone/test/functional/test_static_files.py | 38 +-- + keystone/test/functional/test_tenants.py | 51 ++- + keystone/test/functional/test_token.py | 17 +- + keystone/test/functional/test_users.py | 31 +- + keystone/test/unit/test_models_Tenant.py | 42 ++- + run_tests.py | 6 +- + run_tests.sh | 10 +- + 31 files changed, 1460 insertions(+), 754 deletions(-) + +commit c74d23fb0ddf93b663fa17478d76631ff5562590 +Author: Jorge L. Williams +Date: Fri Dec 23 12:35:40 2011 -0600 + + Added HP-IDM documentation artifacts. + + Change-Id: I2f5189ca1670238b16bf7900de0cd5625c3c9342 + + keystone/content/admin/HP-IDM-admin-devguide.pdf | Bin 0 -> 95635 bytes + keystone/content/admin/HP-IDM-admin.wadl | 150 +++++++++++++++++++++++ + 2 files changed, 150 insertions(+) + +commit 26a4cde397c16452ec0d3f70b02c3e63a3a58736 +Author: termie +Date: Thu Dec 22 15:22:29 2011 -0800 + + whitespace + + keystonelight/backends/policy.py | 1 - + 1 file changed, 1 deletion(-) + +commit 5ff67d74703e2ff2a42cafe8df4b4084f82eb19d +Author: termie +Date: Thu Dec 22 15:22:19 2011 -0800 + + whitespace + + keystonelight/backends/policy.py | 1 + + 1 file changed, 1 insertion(+) + +commit 82f6445a2482a2f581f6aa3bb8c9ca6ade8b13a7 +Author: termie +Date: Thu Dec 22 15:20:55 2011 -0800 + + make create_tenant work for keystone api + + keystonelight/backends/policy.py | 3 ++- + keystonelight/keystone_compat.py | 33 +++++++++++++++++++++++++++++++-- + tests/test_keystoneclient_compat.py | 1 + + 3 files changed, 34 insertions(+), 3 deletions(-) + +commit 29e13366ea2b16624be6213bedd3d0cca4063374 +Author: Jesse Andrews +Date: Thu Dec 22 13:09:43 2011 -0800 + + common ks client creation + + README.rst | 1 + + tests/test_keystoneclient_compat.py | 58 ++++++++++++++++++------------------- + 2 files changed, 29 insertions(+), 30 deletions(-) + +commit ed3c5aa9321ca5b1cbcd67651df6a981d4f987cc +Merge: 03447b1 8a84213 +Author: Jenkins +Date: Thu Dec 22 19:31:18 2011 +0000 + + Merge "Fixed version response (bug 891555 and bug 843052)" + +commit 8a842139ddc78c7ccb7e93eb8749cba38359a078 +Author: Ziad Sawalha +Date: Wed Dec 21 22:46:32 2011 -0600 + + Fixed version response (bug 891555 and bug 843052) + + 891555: Version response was supposed to be wrapped in a + 'versions' element, instead there was only one version + being returned at the root. + Fixed and added tests to validate that. + + 843052: requests for version ATOM were ignoring the + atom+xml as a valid content-type. Fix required + adding a new atom template file and adding a new + mapping for the content-type/extension in the + URL normalizer. + Fixed and added tests to validate that. + + Change-Id: I259c060e592e11cfc06f59ac5a540178c7f2def2 + + keystone/content/admin/version.atom.tpl | 29 ++++++ + keystone/content/admin/version.json.tpl | 66 ++++++------ + keystone/content/admin/version.xml.tpl | 44 ++++---- + keystone/content/service/version.atom.tpl | 29 ++++++ + keystone/content/service/version.json.tpl | 66 ++++++------ + keystone/content/service/version.xml.tpl | 44 ++++---- + keystone/controllers/version.py | 4 + + keystone/middleware/url.py | 6 +- + keystone/test/unit/test_controller_version.py | 139 ++++++++++++++++++++++++++ + keystone/test/unit/test_normalizingfilter.py | 6 ++ + keystone/utils.py | 5 + + 11 files changed, 322 insertions(+), 116 deletions(-) + +commit aca713d5e0e0f5cd3e58dd45e1fd1d5c3fed141e +Author: Ziad Sawalha +Date: Thu Dec 22 02:48:46 2011 -0600 + + Implement Multiple Choices Response (bug 843051) + + The bug allowed clients to call keystone without a version + in the URL (ex. http://localhost:35357/tenants). This will + prevent that behavior, but will break those clients. + + Change-Id: I8fdf2738371a6ceff9729fdb47563fefa0f0ec79 + + keystone/content/multiple_choice.json.tpl | 26 ++++++++++++++ + keystone/content/multiple_choice.xml.tpl | 16 +++++++++ + keystone/controllers/version.py | 54 +++++++++++++++++++++++++--- + keystone/frontends/legacy_token_auth.py | 2 +- + keystone/middleware/url.py | 49 +++++++++++++++++++------ + keystone/test/unit/test_normalizingfilter.py | 9 +++++ + 6 files changed, 141 insertions(+), 15 deletions(-) + +commit 5e4a877df20884ccd825e4e93cf958ed63367bf5 +Author: Jesse Andrews +Date: Wed Dec 21 23:20:25 2011 -0800 + + updating of docs + + README.rst | 17 +++++++---------- + 1 file changed, 7 insertions(+), 10 deletions(-) + +commit 03447b10d3e8902ec2751fa4ca27597e39604fd2 +Author: Ziad Sawalha +Date: Wed Dec 21 23:35:13 2011 -0600 + + Fix LDAP schema (bug 904815) + + As per comments from Ralf Haferkamp (rhafer): + keystoneName should be a subtype of 'name' instead of 'distinguishedName'. 'name' is defined to be of the DirectoryString Syntax, which basically is UTF-8. + + Change-Id: I29ec92f7974170875ad4bfa4dc009eea86b66839 + + keystone/backends/ldap/keystone.ldif | 2 +- + keystone/backends/ldap/keystone.schema | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e4428dc3399406416c5b8a76ade1eb694fc19538 +Author: Jesse Andrews +Date: Wed Dec 21 20:52:10 2011 -0800 + + working on a tenant_create test + + tests/test_keystoneclient_compat.py | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 99f81d5e0f33c1d11d321befe9f5a54db3dc8860 +Author: Jesse Andrews +Date: Wed Dec 21 16:24:48 2011 -0800 + + standardize spacing + + tests/test_keystoneclient_compat.py | 157 +++++++++++++++++------------------- + 1 file changed, 75 insertions(+), 82 deletions(-) + +commit a0d06696974361b367e2599df037a868cfe079f9 +Author: Jesse Andrews +Date: Wed Dec 21 16:17:23 2011 -0800 + + novaclient uses password instead of apikey + + tests/test_novaclient_compat.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b42859fe7305e39ae49e72b628af4c0c6bc530ef +Author: Jesse Andrews +Date: Wed Dec 21 16:15:21 2011 -0800 + + update to use the correct repo for python-novaclient + + tests/test_novaclient_compat.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cad238d912338114b4ac578da26c9ff0d9002333 +Author: Jesse Andrews +Date: Wed Dec 21 16:07:35 2011 -0800 + + fix tenant auth tests + + tests/test_keystoneclient_compat.py | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +commit 462af873c4e33a8209f9ee10c88f4a722b7bb8f7 +Author: Carlos Marin +Date: Wed Dec 21 15:17:04 2011 -0600 + + Updated namespace. + + Change-Id: I56e8a9287c30a2e571a642f61960498a4e1d8682 + + keystone/content/common/samples/choices.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9cc06bf14a15d27369e1057e58414377c9d30289 +Author: Will Kelly +Date: Tue Dec 20 14:05:46 2011 -0600 + + Fixes the catalog return in d5_compat calls. + + The service catalog previously returned by the middleware was identical to + diablo return value. + + d5 uses service types as dictionary keys to index the service catalog, which + return a list of endpoint dictionaries. + + Change-Id: I80ca604a4e65fd5838bb8242d655eb692e3cbe03 + + AUTHORS | 1 + + keystone/frontends/d5_compat.py | 7 ++++--- + keystone/test/functional/test_d5_compat_calls.py | 8 ++++++++ + 3 files changed, 13 insertions(+), 3 deletions(-) + +commit a1d15b05a9d3b95bc41397982fc97dbf2e364e05 +Author: Dolph Mathews +Date: Mon Dec 19 14:05:59 2011 -0600 + + Added: ./keystone-manage database goto + + - Jumps to a given version without performing migrations + - Analog of `UPDATE migrate_version SET version=;` + + Change-Id: I682d3c2d83b22bcd30e672a11a35c8804dd5a1ea + + doc/source/migration.rst | 21 +++++++++------ + keystone/backends/sqlalchemy/migration.py | 45 +++++++++++++++++++++++++------ + keystone/manage/__init__.py | 26 +++++++++++++++--- + 3 files changed, 73 insertions(+), 19 deletions(-) + +commit 0391b44478ca38ce23929c40a472f885bbbd7c84 +Merge: fdc6fd6 bc8750b +Author: Jenkins +Date: Mon Dec 19 22:09:13 2011 +0000 + + Merge "Added databased version check on startup w/ docs" + +commit fdc6fd6679446b252115dcce5e7c113065cc0b0f +Merge: fa43973 e7716f8 +Author: Jenkins +Date: Mon Dec 19 21:49:16 2011 +0000 + + Merge changes Ib4ea1bb6,I4a761e8e + + * changes: + Clarify 'test not found' error message + Contract fix: change IDs from xsd:ID to xsd:string + +commit bc8750b9a62c71f31a9de084950253b2f17bb27e +Author: Dolph Mathews +Date: Fri Dec 16 09:44:29 2011 -0600 + + Added databased version check on startup w/ docs + + - Does not affect sqlite:// in-memory configs + + Change-Id: Ice82cf59d9a7c7cba1b9e0b77f809bfac7ff1a70 + + doc/source/migration.rst | 104 ++++++++++++++++++++++++++---- + keystone/backends/sqlalchemy/__init__.py | 63 +++++++++++++++--- + keystone/backends/sqlalchemy/migration.py | 19 +++++- + keystone/manage/__init__.py | 23 +++---- + 4 files changed, 174 insertions(+), 35 deletions(-) + +commit fa43973e72efa8929abb6057dd2fdc8ad78bd50e +Author: Dolph Mathews +Date: Mon Dec 19 14:58:50 2011 -0600 + + Revised in-memory sql connection path for sqlalchemy + + Source: http://www.sqlalchemy.org/docs/dialects/sqlite.html#using-a-memory-database-in-multiple-threads + + Change-Id: Ibd8dcd7dd1a0bf5d5531faf9cebd6d69fbc8b981 + + keystone/test/unit/test_backends.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e7716f89dc079258495d7896272684eddace1fae +Author: Ziad Sawalha +Date: Mon Dec 19 14:54:58 2011 -0600 + + Clarify 'test not found' error message + + Change-Id: Ib4ea1bb6491bc4b5b57d6d2799e0122aa31b4ba3 + + run_tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 427e12aa89a1ae19072d01da8df6a3f1aa274f26 +Author: Ziad Sawalha +Date: Mon Dec 19 10:03:23 2011 -0600 + + Contract fix: change IDs from xsd:ID to xsd:string + + - xsd:ID cannot contain the ':' character. It also can't start + with a digit a hyphen or a period. xsd:string is more approriate + to allow integer IDs to be presented as string. + + Change-Id: I4a761e8ebaaf18981c5e42a6f0e042f94b0e6035 + + keystone/content/common/xsd/OS-KSADM.xsd | 6 +++--- + keystone/content/common/xsd/RAX-KSADM-users.xsd | 4 ++-- + keystone/content/common/xsd/endpoints.xsd | 2 +- + keystone/content/common/xsd/tenant.xsd | 2 +- + keystone/content/common/xsd/user.xsd | 2 +- + 5 files changed, 8 insertions(+), 8 deletions(-) + +commit afe1c3236296ebd792e91ae9ec6df519bcf78190 +Merge: 197ae2d 8741597 +Author: Jenkins +Date: Mon Dec 19 13:42:45 2011 +0000 + + Merge "LDAP: fix to keystone.ldif" + +commit 197ae2df5fd78c3a48c560ef9ac647e2205f5874 +Merge: 24b97d1 0b03a1d +Author: Jenkins +Date: Mon Dec 19 13:35:46 2011 +0000 + + Merge "Support for unscoped admin tokens" + +commit 24b97d14563d9b16b0b37e68850a63b499f95b45 +Merge: 23383b2 0a14c0e +Author: Jenkins +Date: Mon Dec 19 13:29:03 2011 +0000 + + Merge "Contract fix: IDs are not Ints, they are ID or string types" + +commit 23383b2aeb23b9ca686a49928913c0ef695e11b1 +Author: Dolph Mathews +Date: Fri Dec 16 21:32:09 2011 -0600 + + Tenants - asserted all the things (bug 887844) + + - Fixed: GET /tenants returning backend ID instead of UID + (post-e2 bug 905604) + - Added LDAP backend test + + Change-Id: I37f3441c769a7ce6f7a16eb39c4a0d848aa8d404 + + keystone/backends/ldap/api/tenant.py | 26 +++- + keystone/backends/sqlalchemy/api/tenant.py | 7 +- + keystone/models.py | 2 + + keystone/server.py | 3 + + keystone/test/functional/common.py | 12 ++ + keystone/test/functional/test_tenants.py | 224 +++++++++++++++++++++++------ + keystone/test/unit/test_backends.py | 78 +++++++--- + 7 files changed, 275 insertions(+), 77 deletions(-) + +commit 0b03a1def22f44de6f3c6830c64cf08c1827ddd1 +Author: Ziad Sawalha +Date: Sat Dec 17 13:57:13 2011 -0600 + + Support for unscoped admin tokens + + - Fixes bug 887877 + - Updates to sampledata to not scope admin/serviceadmin tokens to customer-x + - Fix 'undocumented' bug in keystone-manage that fails to handle 'None' correctly for tenant + + Change-Id: Iaa7f8897c79ca5e4811d1f15a1b307ae1313b656 + + keystone/manage/api.py | 3 ++- + keystone/test/sampledata.py | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 8741597f624177e5172140054f27e60b6b376b26 +Author: Ziad Sawalha +Date: Sat Dec 17 13:34:34 2011 -0600 + + LDAP: fix to keystone.ldif + + - fixes bug 904380 + + Change-Id: I8812512108aa9cfc1a325a513a3a77ce5cde8397 + + keystone/backends/ldap/keystone.ldif | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 0a14c0e5df2e3e0a070151b8212ceb725d7871c2 +Author: Ziad Sawalha +Date: Sat Dec 17 10:41:00 2011 -0600 + + Contract fix: IDs are not Ints, they are ID or string types + + Change-Id: I38675eb901cb05524eff70f983ff0b80bba4b16e + + keystone/content/admin/OS-KSADM-admin.wadl | 2 +- + keystone/content/admin/OS-KSCATALOG-admin.wadl | 2 +- + keystone/content/common/xsd/OS-KSADM.xsd | 2 +- + keystone/content/common/xsd/endpoints.xsd | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit cbaebeb2871de812b525d43474ad01257d000667 +Author: Ziad Sawalha +Date: Sat Dec 17 10:35:57 2011 -0600 + + Contract fix: description optional + + Change-Id: I4f1a40960c819b5e81db68c478919fae599fe6be + + keystone/content/common/xsd/tenant.xsd | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1e391f02bbc6f83e7a0c5221665a5c573aae8625 +Author: ziadsawalha +Date: Fri Dec 16 18:59:49 2011 -0800 + + Update tracer excludes for Linux + + Change-Id: I0c3dfc1724e83f8cb1377c4dd9c40f99c15b3c11 + + keystone/tools/tracer.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8f63921f4ddb8fbbfc0edcd573f59cdcc3042da5 +Author: Liem Nguyen +Date: Fri Dec 16 10:59:55 2011 -0800 + + Fixed bug 905422. + Swift caching should work again. Also fixed a few other minor + syntactical stuff. + + Change-Id: I76eb0ed283dd8d2726179803e2fd8b9eaa6d1642 + + keystone/middleware/auth_token.py | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit 1e1c1ee15034518cdffc479289383451fba0416b +Author: Brian Lamar +Date: Fri Dec 16 16:22:24 2011 -0500 + + Update test_keystone_manage to use unittest2. + + Change-Id: Ice620e0201f45f63fa09568913fc34612a6b458e + + keystone/test/unit/test_keystone_manage.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6429ff9076948e5cfce5cc8e4a09815d642b27cc +Merge: d3444a4 e6b9d26 +Author: Jenkins +Date: Fri Dec 16 21:04:49 2011 +0000 + + Merge "No more python path changes" + +commit d3444a4c9cfdd1fa172406d0d5eb7ead5fba5088 +Author: Brian Lamar +Date: Fri Dec 16 15:34:39 2011 -0500 + + Python 2.6 subprocess.check_output doesn't exist. + + bug 905482 + + Change-Id: Id83ca0d6d9759dcab397361ddc11f71ebe0798e7 + + keystone/test/unit/test_keystone_manage.py | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit e6b9d26d2956a8ef87953cb08e5407a6e69f3865 +Author: Ziad Sawalha +Date: Fri Dec 16 14:18:05 2011 -0600 + + No more python path changes + + - Removes code that modified python path + + Change-Id: I0f184fbfc7756bb6240ae095e946eeff75fe08bf + + keystone/controllers/version.py | 3 +-- + keystone/frontends/d5_compat.py | 8 -------- + keystone/frontends/legacy_token_auth.py | 12 ++---------- + keystone/test/unit/base.py | 7 ++----- + keystone/test/unit/test_keystone_manage.py | 1 + + keystone/tools/tracer.py | 4 +--- + 6 files changed, 7 insertions(+), 28 deletions(-) + +commit 16e9471f20cd48b3f57535df01cbfe55d6a45e1f +Merge: c50d500 315a031 +Author: Jenkins +Date: Fri Dec 16 20:16:00 2011 +0000 + + Merge "Refactor: Workaround for python build_sphinx failure" + +commit c50d5001374e481f1807ecf080897fd74d98ff24 +Author: Dolph Mathews +Date: Fri Dec 16 14:01:04 2011 -0600 + + Clarified language on migration instructions + + Change-Id: I529035bdc17c3a2cc64d95f05854a884614afefa + + doc/source/migration.rst | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 315a031c9b90169d8c3c7c462848c4729c70ccf3 +Author: Dolph Mathews +Date: Fri Dec 16 13:51:35 2011 -0600 + + Refactor: Workaround for python build_sphinx failure + + See: https://jenkins.openstack.org/view/Keystone/job/keystone-docs/228/console + + Change-Id: I2dd3724d0347c2525a1f02cebd4a5eb2e3142cb0 + + keystone/logic/service.py | 4 ++-- + keystone/managers/__init__.py | 0 + keystone/managers/tenant.py | 32 ++++++++++++++++++++++++++++++++ + keystone/managers/token.py | 32 ++++++++++++++++++++++++++++++++ + keystone/tenant.py | 32 -------------------------------- + keystone/token.py | 32 -------------------------------- + 6 files changed, 66 insertions(+), 66 deletions(-) + +commit a331a5e8b77a22dbebd4c0e16b42caba827d65d0 +Merge: 4ba7e7b f47379b +Author: Jenkins +Date: Fri Dec 16 18:14:26 2011 +0000 + + Merge "Fixed some skipped tests" + +commit f47379bba1d40518de4daff496b00a96255f0ef0 +Author: Ziad Sawalha +Date: Thu Dec 15 23:49:16 2011 -0600 + + Fixed some skipped tests + + Skipped because they were duplicated name + + Change-Id: I2cd671af33818c4c7a945650de34aee2e13baf71 + + keystone/manage/__init__.py | 95 +++++++++++++++++++++++++++--------- + keystone/test/unit/test_auth.py | 6 +-- + keystone/test/unit/test_d5_compat.py | 4 +- + 3 files changed, 78 insertions(+), 27 deletions(-) + +commit 4ba7e7bc9c71b88e488c9ab4bdf9178a62e1deea +Author: Ziad Sawalha +Date: Thu Dec 15 23:32:19 2011 -0600 + + Format keystone-manage output better + + This makes the output of keystone-manage list commands much + prettier: + $ ./keystone-manage tenant list + --------------------------------------------------------------- + | Tenants | + --------------------------------------------------------------- + | id | name | enabled | + --------------------------------------------------------------- + | e028069d28a5440c9028aa1c5111cef6 | customer-x | True | + | 01ad238f97a648709e68f3148b157f88 | ANOTHER:TENANT | True | + | 67ce3d68bc49427abed2c409a2213b3c | project-y | False | + --------------------------------------------------------------- + It also starts a unit test to test keystone-manage. + + Change-Id: I0e679795d6050ed401609fce3de0c16e234d21da + + keystone/manage/__init__.py | 95 +++++++++++++++++++++++------- + keystone/test/unit/test_keystone_manage.py | 27 +++++++++ + 2 files changed, 100 insertions(+), 22 deletions(-) + +commit ee6f844aed42564fa4f2a1a63246af23cf9d7eac +Author: Dolph Mathews +Date: Fri Dec 16 08:28:11 2011 -0600 + + Added instructions to git clone from github + + Change-Id: Ide5dac370f927555c7fba8ec358f364667115df4 + + doc/source/setup.rst | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit b87a8f55d5b32e2b4e31085b52f44bbc7452aa3c +Author: Dolph Mathews +Date: Thu Dec 15 11:12:12 2011 -0600 + + Refactor: Computing api/model module paths dynamically + + Change-Id: I9bab67b0cf8ffa7baabfe543b7c2d2e0ff96e2b4 + + keystone/backends/sqlalchemy/__init__.py | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit d1d3df0465f6ef1b14ed71eeed84d92c9fe6f256 +Author: Ziad Sawalha +Date: Thu Dec 8 15:45:19 2011 -0600 + + Introduces UID's & domain models (bp portable-identifiers) + + This is an initial redesign of a series where we're moving + away from the existing keystone backend/model architecture + towards a simpler design more in line with other OpenStack + projects. + + - Implemented User & Tenant UID's + - Migrations to introduce users.uid and tenants.uid + - Migrations populate these columns with existing PK ID's + - Populating them with UUID's moving forward + - Domain models + - Allows us to keep backend models in the backend, + and use business objects in keystone.logic + - Starts to simplify de/serialization + - Added 'database' commands to keystone-manage + - e.g. ./bin/keystone-manage database [sync|version|version_contro|upgrade|downgrade] + - Improved test coverage + - Add database migration tests + - Cleaner handling of migration errors + - New attribute is commented out in sqlalchemy model (for illustration) + - Refactored service.py to be class-based (IdentityService) + - Retains configuration in self.options on init + - Added __init__ which inits ClassManagers + - Moved backend initialization to IdentityService + - Pylint updates + - added many @staticmethods where recommended + - turned off checks where appropriate (or to be fixed) + + Change-Id: I4ac00c190968b24640d25806f45b33c7aa2c5c92 + + bin/keystone-manage | 2 + + etc/ldap.conf | 64 +++ + keystone/backends/__init__.py | 9 +- + keystone/backends/api.py | 25 +- + keystone/backends/backendutils.py | 5 +- + keystone/backends/ldap/api/base.py | 19 +- + keystone/backends/ldap/api/role.py | 4 +- + keystone/backends/ldap/api/tenant.py | 4 +- + keystone/backends/ldap/api/user.py | 2 +- + keystone/backends/ldap/models.py | 6 +- + keystone/backends/memcache/api/__init__.py | 2 +- + keystone/backends/memcache/api/token.py | 7 +- + keystone/backends/models.py | 1 + + keystone/backends/sqlalchemy/__init__.py | 166 ++++--- + keystone/backends/sqlalchemy/api/__init__.py | 1 - + keystone/backends/sqlalchemy/api/credentials.py | 71 ++- + .../backends/sqlalchemy/api/endpoint_template.py | 95 +++- + keystone/backends/sqlalchemy/api/role.py | 100 +++- + keystone/backends/sqlalchemy/api/service.py | 9 +- + keystone/backends/sqlalchemy/api/tenant.py | 168 ++++++- + keystone/backends/sqlalchemy/api/token.py | 77 ++- + keystone/backends/sqlalchemy/api/user.py | 206 +++++++- + .../versions/002_rename_token_table.py | 2 + + .../migrate_repo/versions/005_add_tenants_uid.py | 38 ++ + .../versions/006_populate_tenants_uid.py | 40 ++ + .../versions/007_make_tenants_uid_unique.py | 59 +++ + .../migrate_repo/versions/008_add_users_uid.py | 40 ++ + .../versions/009_populate_users_uid.py | 42 ++ + .../versions/010_make_users_uid_unique.py | 60 +++ + keystone/backends/sqlalchemy/migration.py | 132 +++++ + keystone/backends/sqlalchemy/models.py | 4 + + keystone/common/bufferedhttp.py | 13 + + keystone/controllers/credentials.py | 15 +- + keystone/controllers/endpointtemplates.py | 23 +- + keystone/controllers/extensions.py | 4 +- + keystone/controllers/roles.py | 21 +- + keystone/controllers/services.py | 14 +- + keystone/controllers/tenant.py | 22 +- + keystone/controllers/token.py | 18 +- + keystone/controllers/user.py | 33 +- + keystone/logic/service.py | 170 +++---- + keystone/logic/signer.py | 2 + + keystone/logic/types/auth.py | 2 +- + keystone/logic/types/fault.py | 4 + + keystone/logic/types/tenant.py | 9 +- + keystone/manage/__init__.py | 130 ++++- + keystone/manage/api.py | 12 +- + keystone/middleware/nova_auth_token.py | 6 + + keystone/middleware/quantum_auth_token.py | 18 +- + keystone/models.py | 531 +++++++++++++++++++++ + keystone/routers/admin.py | 2 - + keystone/routers/service.py | 3 - + keystone/server.py | 8 +- + keystone/tenant.py | 32 ++ + keystone/test/__init__.py | 2 - + keystone/test/functional/common.py | 5 +- + keystone/test/functional/test_auth.py | 8 +- + keystone/test/functional/test_authentication.py | 8 +- + keystone/test/functional/test_issue_85.py | 3 +- + keystone/test/functional/test_roles.py | 7 +- + keystone/test/functional/test_tenants.py | 3 +- + keystone/test/functional/test_token.py | 2 +- + keystone/test/unit/test_backends.py | 93 ++++ + keystone/test/unit/test_ec2_authn.py | 5 + + keystone/test/unit/test_migrations.py | 138 ++++++ + keystone/test/unit/test_models.py | 94 ++++ + keystone/test/unit/test_models_Endpoint.py | 84 ++++ + keystone/test/unit/test_models_EndpointTemplate.py | 85 ++++ + keystone/test/unit/test_models_Role.py | 75 +++ + keystone/test/unit/test_models_Service.py | 75 +++ + keystone/test/unit/test_models_Tenant.py | 116 +++++ + keystone/test/unit/test_models_Token.py | 74 +++ + keystone/test/unit/test_models_User.py | 73 +++ + keystone/test/unit/test_utils.py | 1 + + keystone/test/utils.py | 48 ++ + keystone/token.py | 32 ++ + keystone/utils.py | 1 + + 77 files changed, 3208 insertions(+), 376 deletions(-) + +commit 1accb479fdc274ad18eb4a88dc1fe7e8850dfdac +Merge: f26c655 60555a5 +Author: Jenkins +Date: Wed Dec 14 19:20:42 2011 +0000 + + Merge "Fixed: Tests returning successful (0) on failure" + +commit f26c655f9cc9b1b15613184aaf706f9142412344 +Author: Dolph Mathews +Date: Wed Dec 14 12:05:46 2011 -0600 + + Improved test coverage of d5 compat + + Change-Id: I950b1390cc2d3491eb202e5b34c296789b338998 + + keystone/frontends/d5_compat.py | 5 +-- + keystone/test/functional/test_d5_compat_calls.py | 45 ++++++++++++++++++++++++ + 2 files changed, 48 insertions(+), 2 deletions(-) + +commit cd77dda927cbdf430138547a45c3e8bb409b4477 +Merge: a02fa98 78d04dc +Author: Jenkins +Date: Wed Dec 14 18:51:21 2011 +0000 + + Merge "Bug 897496: Remove tenant id from Glance URLs" + +commit 60555a54742dec9c8449fdc17cc37a56c04e3682 +Author: Dolph Mathews +Date: Wed Dec 14 12:14:08 2011 -0600 + + Fixed: Tests returning successful (0) on failure + + Change-Id: Ifd10426db35b3cba704d0382e41a80b900d7fc3f + + run_tests.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a02fa988a4bdbfa05197078faa905f13274d82b8 +Merge: 7b5e804 7f4ee43 +Author: Jenkins +Date: Wed Dec 14 15:50:31 2011 +0000 + + Merge "Added original tenants blueprint to docs" + +commit 7b5e804b76591a99100a2d12d1f9ef4976da94cc +Author: Ziad Sawalha +Date: Tue Dec 6 16:26:32 2011 -0600 + + D5 Compatibility Support + + Fixes bug 900916 + + Added a D5-compat front-end for Keystone which responds in + D5 syntax if it receives a D5-formatted request. + It also formats responses to requests that can't be identified + as D5 or Diablo final in dual/compatible format (ugly, but works). + + This is intended to be around until Essex (maybe we deprecate sooner) + + Change-Id: I050d77ee3acc9d91732b5099774d82d6492ec1ca + + doc/source/keystone.conf.rst | 6 +- + etc/keystone.conf | 15 +- + etc/memcache.conf | 5 + + etc/ssl.conf | 5 + + keystone/frontends/d5_compat.py | 418 +++++++++++++++++++++++ + keystone/test/etc/ldap.conf.template | 5 + + keystone/test/etc/memcache.conf.template | 5 + + keystone/test/etc/sql.conf.template | 5 + + keystone/test/etc/ssl.conf.template | 5 + + keystone/test/functional/common.py | 13 + + keystone/test/functional/test_d5_compat_calls.py | 114 +++++++ + keystone/test/unit/test_d5_compat.py | 159 +++++++++ + 12 files changed, 749 insertions(+), 6 deletions(-) + +commit 7f4ee439cd2de6b8dd866f31dfc9e8e852f32b07 +Author: Ziad Sawalha +Date: Fri Dec 9 16:29:33 2011 -0600 + + Added original tenants blueprint to docs + + Change-Id: I7471f07748c106dca0f8dc454ecbc10d56a325d5 + + doc/design/tenants.pdf | Bin 0 -> 383178 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit a09a66ce91fbe7e4f5526eb68f174c4d698e5880 +Author: Dolph Mathews +Date: Fri Dec 9 14:04:31 2011 -0600 + + Fixed broken import of version info (bug 902316) + + Change-Id: I9efaab46c1fe93dbfc9e9c08c6b79a8c23eb8fd5 + + doc/source/conf.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 057c050506e2eecf1c73989042815f2976825e3c +Author: Dolph Mathews +Date: Fri Dec 9 13:22:53 2011 -0600 + + Added missing import preventing keystone from starting (bug 901453) + + Change-Id: Iae79ffd0e3065c821edcbe250b59a6aa1e3a5a07 + + keystone/server.py | 1 + + 1 file changed, 1 insertion(+) + +commit d2a0791219da083b4ab32415fdf12b5f5405a910 +Merge: 45b68d9 0494a06 +Author: Jenkins +Date: Fri Dec 9 19:14:52 2011 +0000 + + Merge "Fix some issues with new version module" + +commit 0494a06823666cf731b2961790f64ce266a3e9f5 +Author: Mark McLoughlin +Date: Wed Dec 7 12:22:05 2011 +0000 + + Fix some issues with new version module + + Change-Id: I6adfec496794e4f461806390643f62e17bbec2a6 + + bin/keystone-control | 4 ++-- + doc/source/setup.rst | 4 ++-- + keystone/test/__init__.py | 4 +++- + 3 files changed, 7 insertions(+), 5 deletions(-) + +commit 45b68d9882862010f7b00661cc5721cfb24854b6 +Author: Édouard Thuleau +Date: Wed Dec 7 16:04:36 2011 +0100 + + quantum_auth_token.py middleware fails on roles + + Fixes bug 900330. + + Change-Id: I174f0f76dcec761604bc05dd8fa0b2344f73e0b7 + + .mailmap | 1 + + AUTHORS | 1 + + keystone/middleware/quantum_auth_token.py | 2 +- + 3 files changed, 3 insertions(+), 1 deletion(-) + +commit 5d3fc70483d74b7dd0c000e116f4284deca2d2eb +Author: Monty Taylor +Date: Tue Dec 6 16:44:20 2011 -0800 + + Removed Server class from __init__.py. + + Fixes bug 901018. + + Change-Id: Ida1fe9b15547db3cf1ff5bcc80b5fa49707bacf5 + + bin/keystone | 11 ++-- + bin/keystone-admin | 3 +- + bin/keystone-auth | 5 +- + keystone/__init__.py | 133 ---------------------------------------------- + keystone/server.py | 131 +++++++++++++++++++++++++++++++++++++++++++++ + keystone/test/__init__.py | 14 ++--- + 6 files changed, 150 insertions(+), 147 deletions(-) + +commit 6fa5f96b6955bfbfd91990466526c132cf0cb180 +Merge: 38dd9c7 ef50a33 +Author: Jenkins +Date: Wed Dec 7 04:59:14 2011 +0000 + + Merge "Change is_global == 1 to is_global == True" + +commit 38dd9c70f2addb75704b0f1f230b41475d4d9adf +Author: Dan Prince +Date: Tue Dec 6 22:48:32 2011 -0500 + + Fix auth_token middleware: make _verify_claims not static. Fixes bug #901049. + + Change-Id: I8498b8c89a5818a7dcca3f74aa98289d957eac74 + + keystone/middleware/auth_token.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 3e3f239538bcafc6189e3cb44f9ab0c9366fa0cc +Merge: cd1ddca 4956a93 +Author: Jenkins +Date: Wed Dec 7 00:13:51 2011 +0000 + + Merge "Split version code into its own file." + +commit cd1ddca4cbca95bcd2a8e43d770edcbd7843781b +Author: Ziad Sawalha +Date: Tue Dec 6 17:45:06 2011 -0600 + + Pylint fixes to auth_token.py + + Change-Id: I0aa05a61e2c42df13a0e5b1a2b0668ef442d74ba + + keystone/middleware/auth_token.py | 44 +++++++++++++++++++++++++-------------- + 1 file changed, 28 insertions(+), 16 deletions(-) + +commit 4956a936d9c6fb19f06b1fc222f9a47eff9dd12b +Author: Monty Taylor +Date: Tue Dec 6 14:41:30 2011 -0800 + + Split version code into its own file. + + Change-Id: I764035afc257fad38b9d40d157ec1a9d41a40a6f + + bin/keystone | 4 ++-- + keystone/__init__.py | 22 ++-------------------- + keystone/controllers/version.py | 8 ++++---- + keystone/manage/__init__.py | 4 ++-- + keystone/version.py | 31 +++++++++++++++++++++++++++++++ + setup.py | 4 ++-- + 6 files changed, 43 insertions(+), 30 deletions(-) + +commit ef50a3353292265846e9276db0d0b98753ee8945 +Author: Ziad Sawalha +Date: Tue Dec 6 12:44:09 2011 -0600 + + Change is_global == 1 to is_global == True + + Fixes bug 892429 - which correctly points out incorrect use of integer 1 instead of boolean True + + Change-Id: I360ba8275ca3e67af6b99a7859421aa2e3c0d2bc + + keystone/backends/sqlalchemy/api/tenant.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 78d04dc0cdc500058bcf62cf4ec2a65f131b3a07 +Author: Ziad Sawalha +Date: Tue Dec 6 12:32:40 2011 -0600 + + Bug 897496: Remove tenant id from Glance URLs + + Glance URLs do not have the tenant ID in them. These were removed in the sample data + and documentation. + Fixes bug 897496 + + Change-Id: I49210d2560739f1409c8816c5610ef9c3b033f1d + + doc/source/adminAPI_curl_examples.rst | 6 +++--- + keystone/test/sampledata.py | 12 ++++++------ + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit 0d8bc572339bc8defe5ea5fba16eedcd79c5472b +Author: Ziad Sawalha +Date: Sun Dec 4 03:03:22 2011 -0600 + + Refactor: move initialization code to class + + - Each script (keystone, keystone-admin, keystone-auth) had a copy + of the initialization code that handled options, arguments, and + starting the paste apps. The code was also duplicated in the + test SetUp code. This code has now been consolidated in one + class. + - Created the keystone.Server class that has start/stop + methods to manage keystone servers. It also handles initializing + options and arguments. + - This provides one point of entry into keystone where we can + now start refactoring logging and backend code. + + Change-Id: Ie4e2a9aae9578c3657c0459381d1618d30b8ca32 + + bin/keystone | 81 +++++++--------------------- + bin/keystone-admin | 35 ++----------- + bin/keystone-auth | 35 ++----------- + keystone/__init__.py | 131 ++++++++++++++++++++++++++++++++++++++++++++++ + keystone/test/__init__.py | 75 +++++++------------------- + 5 files changed, 176 insertions(+), 181 deletions(-) + +commit 5d7b61b76fc0b05cc029177182e9e9607f210232 +Author: Ziad Sawalha +Date: Sun Dec 4 00:44:42 2011 -0600 + + Add missing json validation + + - Some logic/types classes had json validation and some did not. + I added the ones that were missing. + + Change-Id: I33996c88ea0837be527184c2bf7b0efb50433310 + + keystone/logic/types/credential.py | 7 +++++++ + keystone/logic/types/role.py | 7 +++++++ + keystone/logic/types/service.py | 9 ++++++++- + keystone/logic/types/tenant.py | 8 ++++++++ + keystone/logic/types/user.py | 27 +++++++++++++++++++-------- + 5 files changed, 49 insertions(+), 9 deletions(-) + +commit 11605fe7db29c6afb68fefc7e1aedc63a3bbf767 +Author: Ziad Sawalha +Date: Sat Dec 3 23:20:52 2011 -0600 + + Refactor: get rid of keystone/config.py + + - The file was unnecessary and the name was confusing. + - Replaced all uses of config.SERVICE with direct references to the + IdentityService class (which will probably need to be refactored + away as well). + + Change-Id: Id65c2f231376ed76a631e51d91f17023b98636e9 + + keystone/config.py | 8 -------- + keystone/controllers/credentials.py | 12 ++++++------ + keystone/controllers/endpointtemplates.py | 20 ++++++++++---------- + keystone/controllers/roles.py | 18 +++++++++--------- + keystone/controllers/services.py | 12 ++++++------ + keystone/controllers/tenant.py | 14 +++++++------- + keystone/controllers/token.py | 14 +++++++------- + keystone/controllers/user.py | 24 ++++++++++++------------ + keystone/logic/service.py | 1 + + 9 files changed, 58 insertions(+), 65 deletions(-) + +commit a7a9d32f9b0eeeecb9ce9fc5791ac2f7974ce628 +Merge: fb70b8c ff30def +Author: Jenkins +Date: Tue Dec 6 03:49:00 2011 +0000 + + Merge "Rename .keystone-venv to .venv." + +commit fb70b8cde352bd00d737e13b94fbaacde84ff7e9 +Author: Ziad Sawalha +Date: Mon Dec 5 19:17:38 2011 -0600 + + Fixes missed tests and subsequently introduced bugs + + - bug 900514 fixed: some test files were marked as + executable. Nose by default skips those. They've + been reset to 644. + - bug 900525 was introduced in the refactoring of + the backend code. The test was not impacted but + the load fixture code was. This has been addressed + and the test passes again. No nchanges needed to + the code being tested (i.e. no bugs introduced) + + Change-Id: I87ee799a47f90c383e181d203fd783c77fa4b3e5 + + keystone/test/__init__.py | 2 +- + keystone/test/functional/test_authentication.py | 0 + keystone/test/functional/test_endpoints.py | 0 + keystone/test/functional/test_roles.py | 0 + keystone/test/functional/test_services.py | 0 + keystone/test/functional/test_tenants.py | 0 + keystone/test/functional/test_token.py | 0 + keystone/test/functional/test_users.py | 0 + keystone/test/unit/base.py | 4 +++- + keystone/test/unit/test_auth.py | 0 + keystone/test/unit/test_ec2_authn.py | 0 + keystone/test/unit/test_server.py | 0 + 12 files changed, 4 insertions(+), 2 deletions(-) + +commit ff30def8899c36626eacbbd5c2266c1a7b72d2cd +Author: James E. Blair +Date: Mon Dec 5 11:24:30 2011 -0800 + + Rename .keystone-venv to .venv. + + This simplifies a number of Jenkins jobs which currently, other + than directory names, could be the same for all OpenStack + projects. By renaming the virtualenv directory, the redundant + Jenkins virtualenv build and copy jobs can be eliminated. + + Change-Id: Ia831674b6e9c9d2be25b54e26c92009778d97a22 + + .gitignore | 1 + + .mailmap | 2 ++ + AUTHORS | 2 +- + doc/source/developing.rst | 4 ++-- + run_tests.sh | 2 +- + tools/install_venv.py | 4 ++-- + tools/with_venv.sh | 2 +- + 7 files changed, 10 insertions(+), 7 deletions(-) + +commit b5b28e0591f7d88ae649ca3d5a2638b67e1e0e61 +Author: Ziad Sawalha +Date: Sat Dec 3 22:01:51 2011 -0600 + + Refactor: Rename auth controller to token controller + + - All other controllers are named after the entity they + manage. This makes it easier to understand what this + controller does. + + Change-Id: Icc940f181fd91e340e7a10dfe1849a43180ea565 + + keystone/controllers/auth.py | 69 ------------------------------- + keystone/controllers/token.py | 95 +++++++++++++++++++++++++++++++++++++++++++ + keystone/routers/admin.py | 4 +- + keystone/routers/service.py | 4 +- + 4 files changed, 99 insertions(+), 73 deletions(-) + +commit 8788fc25516d9d0b4a320cfc3aeb59b03abab49a +Author: Ziad Sawalha +Date: Sat Dec 3 17:25:51 2011 -0600 + + Added documentation + + Added Services section + Updated index and started an Entities section + Added links to OpenStackDeployability in the migrations section + + Change-Id: I2a6ddb997d9dd155564e693c3b736d5744b154ad + + doc/source/index.rst | 10 +++++- + doc/source/migration.rst | 5 +++ + doc/source/services.rst | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 106 insertions(+), 1 deletion(-) + +commit 525a95b7d99147bb4436debd956b2f5c0f08e939 +Author: Ziad Sawalha +Date: Fri Dec 2 09:48:28 2011 -0600 + + Added SSL and memcache sample config files + + The files contain a short header description on their use. + + Also replaced tabs with spaces in config files + + Updated documentation to point to sample files + + Change-Id: Ia738e214b183773c6940b5c107e0eac6a78202ca + + doc/source/configuration.rst | 35 ++++++++++++++++ + etc/keystone.conf | 6 +-- + etc/memcache.conf | 71 ++++++++++++++++++++++++++++++++ + etc/ssl.conf | 68 ++++++++++++++++++++++++++++++ + keystone/test/etc/ldap.conf.template | 16 +++---- + keystone/test/etc/memcache.conf.template | 16 +++---- + keystone/test/etc/sql.conf.template | 16 +++---- + keystone/test/etc/ssl.conf.template | 16 +++---- + 8 files changed, 209 insertions(+), 35 deletions(-) + +commit 88d6c0dc09189f199e386906948eaf2736378bfb +Author: Ziad Sawalha +Date: Thu Dec 1 23:42:14 2011 -0600 + + Updated auth_token middleware caching to support memcache + + - Added support for memcache client (swift cache is not 100% compatible with it;it uses a timeout instead of time + parameter) + - Added the 'memcache_hosts' entry in the middleware ini file to support that. + - Moved the caching logic to the _verify_claims call (so callers don't have to manage cache) + - Added caching for bad/invalid tokens so they don't generate calls to Keystone + - Added documentation for middleware configuration + - Added documentation on caching configuration for middleware + + Change-Id: I9fc30186a91559ec8d50d90e887f5ee87669d38b + + doc/source/configuringservices.rst | 12 ++++ + doc/source/middleware.rst | 98 ++++++++++++++++++++++++++ + doc/source/nova-api-paste.rst | 3 +- + examples/echo/echo/echo.ini | 2 + + examples/echo/echo/echo_basic.ini | 2 + + examples/paste/auth_token.ini | 3 + + examples/paste/nova-api-paste.ini | 2 + + keystone/middleware/auth_token.py | 138 ++++++++++++++++++++++++++++--------- + 8 files changed, 227 insertions(+), 33 deletions(-) + +commit db9c53e5f54a5e8c9f0170180a8fc1673d030bbf +Author: Ziad Sawalha +Date: Fri Dec 2 09:29:45 2011 -0600 + + Deprecating RAX-KEY middleware + + This middleware was never fully functional and has now been deprecated. + To not break existing configurations, the middleware is still there + and will do nothing except show a message that it will be removed in + Essex+1 to give ample notice for removing it from configurations. + + It has also been removed from all configuration files. + + The functionality will be provided using the new extension framework. + + Also discovered OS-EC2 middleware was copy/paste named RAX-KEY also and fixed that + + Change-Id: I518baaf88a70b2b4a6f7a1038e30b256a3812f09 + + etc/keystone.conf | 4 ---- + keystone/contrib/extensions/service/osec2/frontend.py | 2 +- + keystone/contrib/extensions/service/raxkey/frontend.py | 13 +++++++++---- + keystone/test/etc/ldap.conf.template | 4 ---- + keystone/test/etc/memcache.conf.template | 4 ---- + keystone/test/etc/sql.conf.template | 4 ---- + keystone/test/etc/ssl.conf.template | 4 ---- + 7 files changed, 10 insertions(+), 25 deletions(-) + +commit 5c70d24462d75256fb6167d58e13d9c0a3d60427 +Merge: 6b1b107 3b72579 +Author: Jenkins +Date: Fri Dec 2 14:39:59 2011 +0000 + + Merge "Added documentation for SQL tables" + +commit 6b1b10752384dfc332b34ab004b67b2d6762049f +Author: Dolph Mathews +Date: Fri Dec 2 08:23:16 2011 -0600 + + Added argparse to support python 2.3 - 2.6 + + Change-Id: If70c89a9bb5db971dc03b9494ce7a0140b2d5f70 + + tools/pip-requires | 1 + + 1 file changed, 1 insertion(+) + +commit 658237e15475e535aa6eaaf423bb6d1b67e24a65 +Merge: 849eb57 b9dde8d +Author: Jenkins +Date: Fri Dec 2 13:51:41 2011 +0000 + + Merge "Make bin/keystone use port settings in the config file. Fixes bug #898935." + +commit b9dde8d0e317203e349b8e4bca5bc9923c11974e +Author: Dan Prince +Date: Thu Dec 1 22:40:32 2011 -0500 + + Make bin/keystone use port settings in the config file. + Fixes bug #898935. + + Change-Id: I40c91a40eb853f7a1566454d005ccf2fcf9c8eb9 + + bin/keystone | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 849eb57ad533dfb7254af307776243cfdd7c804d +Author: Pádraig Brady +Date: Fri Dec 2 12:24:30 2011 +0000 + + Bug#899116: use correct module when building docs + + Currently the wrong directory is searched for the + keystone module, requiring keystone to be installed + in the default system path, for docs to be buildable. + Also the path was appended, so the default system version + which may be completely different is referenced. + This ensures that only local keystone files are referenced. + + Change-Id: I187a5153d9c8be076e8aff6bb0ae63a7c739e3e8 + + AUTHORS | 1 + + doc/source/conf.py | 8 ++++---- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit 38631304a87ed55c3f291236f2c596d6b846173a +Merge: e17e5a0 db138ca +Author: Jenkins +Date: Thu Dec 1 23:09:56 2011 +0000 + + Merge "Minor RST changes" + +commit db138ca968106af995bbb71c3e79de13e92d984f +Author: Dolph Mathews +Date: Thu Dec 1 16:56:07 2011 -0600 + + Minor RST changes + + Change-Id: I762e8d67ce696e9cc62d71a2b0609ecd8235e094 + + doc/source/endpoints.rst | 25 ++++++++++++------------- + 1 file changed, 12 insertions(+), 13 deletions(-) + +commit e17e5a02dd33d3869c8f3243116f7b38a8d3562f +Author: Dolph Mathews +Date: Thu Dec 1 16:54:34 2011 -0600 + + Revised extension documentation + + Change-Id: I5a1fe087d62696534fe72f1ce769729e56ae9b40 + + doc/source/extensions.rst | 135 +++++++++++++++++++++++++++++----------------- + 1 file changed, 86 insertions(+), 49 deletions(-) + +commit 3b72579ad94da206c0da8d8a23f86f70810a9250 +Author: Dolph Mathews +Date: Tue Nov 29 14:24:07 2011 -0600 + + Added documentation for SQL tables + + Change-Id: Iddeabb4998b864dca7f1c0778a8ddda84bca13c4 + + doc/source/backends.rst | 188 ++++++++++++++++++++++++++++++++++++++++++++++++ + doc/source/index.rst | 3 +- + 2 files changed, 189 insertions(+), 2 deletions(-) + +commit befd76e71158bd34e884bcef484c4a9855521aef +Merge: ceb4dc3 4f69fba +Author: Jenkins +Date: Thu Dec 1 16:20:25 2011 +0000 + + Merge "Implements blueprint keystone-swift-acls." + +commit ceb4dc327b2fc97213a5bd49e0d70226fae6faae +Merge: 3157ec7 17b6131 +Author: Jenkins +Date: Thu Dec 1 15:00:14 2011 +0000 + + Merge "Remove pysqlite deps. Fixes bug #898343." + +commit 3157ec72e0d113379c1b2c900e1a0c79ee616efb +Merge: 2529d4f 5d7ff6a +Author: Jenkins +Date: Thu Dec 1 14:58:57 2011 +0000 + + Merge "Pretty-printed JSON samples" + +commit 17b61311368495fd2ed3514f44fd4fc7fdd6a13f +Author: Dan Prince +Date: Wed Nov 30 17:37:14 2011 -0800 + + Remove pysqlite deps. Fixes bug #898343. + + Change-Id: I9f0727b2847f2011eacf28e89e085dc09b6d64fe + + setup.py | 2 +- + tools/pip-requires | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit 5d7ff6abcef9c2b42a3800a1ce7f3809d6ddb4d9 +Author: Dolph Mathews +Date: Wed Nov 30 18:44:57 2011 -0600 + + Pretty-printed JSON samples + + - Uses: https://review.openstack.org/#change,1997 + - Preserves original sample data & key ordering + + Change-Id: Id962be7d093566499edd09726644ad8c44bbd732 + + examples/echo/echo/samples/echo.json | 16 +- + keystone/content/admin/extensions.json | 6 +- + .../content/common/samples/RAX-KSGRP-groups.json | 15 +- + .../content/common/samples/RAX-KSQA-secretQA.json | 8 +- + .../content/common/samples/apiKeyCredentials.json | 8 +- + keystone/content/common/samples/auth.json | 171 ++++++++++---------- + .../common/samples/auth_credentials-OS-KSEC2.json | 18 +-- + .../common/samples/auth_credentials-RAX-KSKEY.json | 14 +- + .../content/common/samples/auth_credentials.json | 16 +- + .../content/common/samples/auth_with_token.json | 12 +- + .../content/common/samples/authwithgroups.json | 173 +++++++++++---------- + keystone/content/common/samples/choices.json | 127 ++++++++------- + keystone/content/common/samples/credentials.json | 17 +- + .../common/samples/credentialswithapikey.json | 29 ++-- + .../content/common/samples/credentialswithec2.json | 31 ++-- + .../content/common/samples/ec2Credentials.json | 10 +- + keystone/content/common/samples/endpoint.json | 20 +-- + .../content/common/samples/endpointTemplate.json | 28 ++-- + .../common/samples/endpointTemplateWithOnlyId.json | 6 +- + .../content/common/samples/endpointTemplates.json | 114 +++++++------- + keystone/content/common/samples/endpoints.json | 127 +++++++-------- + keystone/content/common/samples/ext-getuser.json | 10 +- + keystone/content/common/samples/extension.json | 3 +- + keystone/content/common/samples/extensions.json | 75 ++++----- + keystone/content/common/samples/getuser-1.json | 44 +++--- + .../common/samples/passwordcredentials.json | 8 +- + keystone/content/common/samples/roles.json | 15 +- + keystone/content/common/samples/service.json | 14 +- + keystone/content/common/samples/services.json | 31 ++-- + keystone/content/common/samples/tenants-1.json | 28 ++-- + keystone/content/common/samples/tenants-2.json | 36 +++-- + keystone/content/common/samples/tenants-3.json | 28 ++-- + keystone/content/common/samples/tenants.json | 31 ++-- + keystone/content/common/samples/users.json | 31 ++-- + .../common/samples/userwithenabledonly.json | 2 +- + keystone/content/common/samples/userwithoutid.json | 2 +- + keystone/content/common/samples/validatetoken.json | 47 +++--- + keystone/content/common/samples/version.json | 9 +- + keystone/content/common/samples/versions.json | 64 ++++---- + keystone/content/service/extensions.json | 8 +- + .../contrib/extensions/admin/osec2/extension.json | 38 ++--- + .../extensions/admin/osksadm/extension.json | 15 +- + .../extensions/admin/oskscatalog/extension.json | 15 +- + .../contrib/extensions/admin/raxgrp/extension.json | 16 +- + .../contrib/extensions/admin/raxkey/extension.json | 15 +- + keystone/contrib/extensions/extensions.json | 6 +- + .../extensions/service/osec2/extension.json | 30 ++-- + .../extensions/service/raxgrp/extension.json | 12 +- + .../extensions/service/raxkey/extension.json | 12 +- + 49 files changed, 838 insertions(+), 773 deletions(-) + +commit 2529d4f636f36d824fc40817b62e3552188834cc +Author: Dolph Mathews +Date: Wed Nov 30 17:20:27 2011 -0600 + + Added option to pretty-print JSON + + Change-Id: I0cf98fe510858679e1801889ce85025950fe9f0f + + tools/validate_json.py | 60 +++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 52 insertions(+), 8 deletions(-) + +commit 4f69fbaa8b11e8021b53e0c692a2533f05f2b97c +Author: Liem Nguyen +Date: Tue Nov 29 10:49:52 2011 -0800 + + Implements blueprint keystone-swift-acls. + + This basically refactors the swift_auth.py (thanks, Chmouel!) and + token_auth.py so that auth_token.py does purely token authentication, + and swift_auth.py does purely swift authorization and relies on + auth_token.py for validating the token. This is to avoid duplicate + validate-token logics at different service-layer middleware. + + The memcache functionality in Swift used for caching tokens is also + refactored to the token_auth.py, so that other services that may + provide a memcache implementation may benefit from this as well. + + The swift_auth.py is also enhanced to include support for explicit + user access in Swift ACL, similar to tempauth. + + Change-Id: Ifc0287898658e8d576dfeaafefdc5340cd321577 + + doc/source/configuringservices.rst | 7 ++ + keystone/middleware/auth_token.py | 63 +++++++++++++-- + keystone/middleware/swift_auth.py | 154 ++++++++++--------------------------- + 3 files changed, 107 insertions(+), 117 deletions(-) + +commit 5b72249d1a3c6be4d03f26ddb38945f570705565 +Merge: dcc59e5 8f21b2c +Author: Jenkins +Date: Wed Nov 30 23:52:21 2011 +0000 + + Merge "Added JSON validator; fixed samples (bug 898353)" + +commit dcc59e56317701d7e457fed8d5e162dc463a8e13 +Author: Dolph Mathews +Date: Wed Nov 30 10:26:08 2011 -0600 + + Updated docstring to match auth_token.py (bug 898211) + + Change-Id: I6586f415e4bdb8bf2951363b5f3cfe894ddb49bf + + keystone/middleware/quantum_auth_token.py | 52 ++++++++++++++++++++----------- + 1 file changed, 34 insertions(+), 18 deletions(-) + +commit 93154778c9c7ee1195b5f24a99c22b801c4ebcc9 +Merge: 2eab4b3 a932695 +Author: Jenkins +Date: Wed Nov 30 23:42:03 2011 +0000 + + Merge "Bug-897724: Added method to list endpoints specific to a service and related tests." + +commit 2eab4b317bf4db8e8107a003cc0df194f65b50da +Author: Yogeshwar Srikrishnan +Date: Sun Nov 27 14:04:35 2011 -0600 + + Bug #890801 Changes to support /extensions call. + - Introduced a new extension reader to read static extension content. + - Added additional rst files explaining extensions. + - Removed functionality from additional middleware that used to support /extensions call.ie RAX-KEY-extension + - Removed service extension test as it was no more relavent. + - Added unit test that checks toggling of extensions. + - Additional notes on the conf file. + + Change-Id: Ia7b47b123e94704ca5d88dcce0db4ee1ac5eb3ba + + doc/source/extensions.rst | 125 +++++++++++++++++++++ + doc/source/index.rst | 2 + + doc/source/keystone.conf.rst | 4 + + etc/keystone.conf | 3 +- + keystone/contrib/extensions/__init__.py | 8 +- + keystone/contrib/extensions/admin/__init__.py | 16 ++- + keystone/contrib/extensions/extensions.json | 1 + + keystone/contrib/extensions/extensions.xml | 5 + + keystone/contrib/extensions/service/__init__.py | 1 + + keystone/contrib/extensions/service/raxgrp/api.py | 5 +- + .../contrib/extensions/service/raxkey/frontend.py | 58 ++-------- + keystone/controllers/extensions.py | 30 +++-- + keystone/logic/extension_reader.py | 109 ++++++++++++++++++ + keystone/logic/types/extension.py | 12 ++ + keystone/routers/admin.py | 1 - + keystone/routers/service.py | 3 +- + keystone/test/functional/test_ext_raxkskey.py | 30 ----- + keystone/test/functional/test_extensions.py | 31 ++++- + keystone/test/unit/test_extensions.py | 65 +++++++++++ + 19 files changed, 392 insertions(+), 117 deletions(-) + +commit 8f21b2c1efe4020aabfa5388ce1cd5eabf85cef5 +Author: Dolph Mathews +Date: Wed Nov 30 14:26:06 2011 -0600 + + Added JSON validator; fixed samples (bug 898353) + + - Fixed broken samples + - Added command to validate all included *.json files + ./run_tests.sh -j + + Change-Id: I06839e22a4408e7ff4b6f5b8ebd29a73fcc809cf + + .../common/samples/endpointTemplateWithOnlyId.json | 4 +- + keystone/content/common/samples/roles.json | 4 +- + run_tests.sh | 14 ++++ + tools/validate_json.py | 84 ++++++++++++++++++++++ + 4 files changed, 102 insertions(+), 4 deletions(-) + +commit d9f9501f36912f3e26aaafb55e5dc19c9bcea909 +Author: Jay Pipes +Date: Mon Nov 28 19:45:01 2011 -0500 + + Fixes a number of configuration/startup bugs + + LP Bug#897376 - log_file in configuration file not respected + + Adds a check to ensure that the log_file in the configuration + file, if set, is not overridden by the default options['log_file'] + value set in keystone.common.configu.load_paste_app() + + LP Bug#897382 - service_ssl not safely checked for existence + + Added safe checks for a number of SSL-related variables in + bin/keystone to help support easy migration for existing + configuration files that did not have the SSL options in them. + + LP Bug#897397 - bin/keystone-auth does not respect service_port + or service_host + + Replicates the same behaviour that is in keystone-admin into + keystone-auth so that it recognizes service_host and service_port + instead of only bind_host and bind_port. This enables you to + pass the main keystone.conf file to keystone-auth and it will + not bomb. + + Note: keystone.common.config should go away once openstack.common.config + is a reality... + + Change-Id: If2dfa57ba00758144219f8c1d42c05e56ed44ca2 + + bin/keystone | 45 ++++++++++++++++++++++++++++----------------- + bin/keystone-auth | 4 ++-- + keystone/common/config.py | 3 ++- + 3 files changed, 32 insertions(+), 20 deletions(-) + +commit 7d2956d0b5b5e590733a0e88a0cb4ea1f57caa11 +Merge: 980f011 ae038ea +Author: Jenkins +Date: Wed Nov 30 20:21:10 2011 +0000 + + Merge "Eliminated debug output from sphinx_build (bug 898211)" + +commit 980f01196f36bf8772c616e682f5a7be807ed2cc +Merge: 5743562 a461eda +Author: Jenkins +Date: Wed Nov 30 20:20:01 2011 +0000 + + Merge "Added ssl docs to index; fixed rst syntax (bug 898211)" + +commit 574356251fb6edec6a0a5b0e289b36ef9c85a65d +Merge: e113713 e9b54cd +Author: Jenkins +Date: Wed Nov 30 20:18:43 2011 +0000 + + Merge "Fixed RST syntax in doc strings (bug 898211)" + +commit e113713267ce888d1669f89f9018046194473811 +Merge: cde2067 0ea013a +Author: Jenkins +Date: Wed Nov 30 20:17:00 2011 +0000 + + Merge "Improved doc formatting consistency (bug 898211)" + +commit cde206740d34b69be55be113bba0e1710ac29701 +Author: Dolph Mathews +Date: Wed Nov 30 10:37:44 2011 -0600 + + Fixed RST syntax (bug 898211) + + - Replaced potentially-legal wiki syntax with proper RST + - Improved consistency among docs + + Change-Id: I24d5cb3ec5510ec629c9948b844a5d3a2046a9cf + + doc/source/configuringservices.rst | 94 ++++---- + doc/source/controllingservers.rst | 265 +++++++++++------------ + doc/source/middleware_architecture.rst | 382 +++++++++++++++++++-------------- + 3 files changed, 393 insertions(+), 348 deletions(-) + +commit 8ca0402cb6a4dbc7aa104d4e845c7423e6290b56 +Merge: ffbb5ab cb2da13 +Author: Jenkins +Date: Wed Nov 30 20:10:36 2011 +0000 + + Merge "Revised schema migration docs" + +commit ffbb5abe0ddd204df4b903184685af319c95d654 +Merge: 1778dcf 47f8697 +Author: Jenkins +Date: Wed Nov 30 17:48:49 2011 +0000 + + Merge "Update documentation and examples following API 1.1 removal" + +commit cb2da13571fbdc8d793d676e226ed1358e4a60fa +Author: Dolph Mathews +Date: Wed Nov 30 11:06:44 2011 -0600 + + Revised schema migration docs + + Change-Id: I484964d1012163922d619ae3a7a66ea3d07d6b19 + + doc/source/migration.rst | 41 +++++++++++++++++++++-------------------- + doc/source/testing.rst | 28 ++++++++-------------------- + 2 files changed, 29 insertions(+), 40 deletions(-) + +commit 0ea013a05908d4dd4c5c78222215cee5d479377d +Author: Dolph Mathews +Date: Wed Nov 30 10:33:27 2011 -0600 + + Improved doc formatting consistency (bug 898211) + + Change-Id: I588a87fe9004c32946a6af0637688838f43c46b1 + + doc/source/community.rst | 2 +- + doc/source/configuration.rst | 13 +- + doc/source/developing.rst | 55 +++----- + doc/source/endpoints.rst | 256 ++++++++++++++++++------------------- + doc/source/man/keystone-admin.rst | 9 +- + doc/source/man/keystone-manage.rst | 19 ++- + 6 files changed, 159 insertions(+), 195 deletions(-) + +commit e9b54cdd1270453e29dbd34e2fe8f042dbf411a2 +Author: Dolph Mathews +Date: Wed Nov 30 10:24:24 2011 -0600 + + Fixed RST syntax in doc strings (bug 898211) + + Change-Id: Iab37fe07880ce366dac68ddd0cdac4d2c10e1e60 + + keystone/common/bufferedhttp.py | 8 ++++---- + keystone/test/functional/common.py | 11 ++++++----- + 2 files changed, 10 insertions(+), 9 deletions(-) + +commit a461eda42f1344e1aa4019986b56e72f2ab4f9fd +Author: Dolph Mathews +Date: Wed Nov 30 10:18:57 2011 -0600 + + Added ssl docs to index; fixed rst syntax (bug 898211) + + Change-Id: I21a810254c4985faad8c43b064f7cf10b3c4b4b2 + + doc/source/index.rst | 1 + + doc/source/ssl.rst | 127 +++++++++++++++++++++++++++++++-------------------- + 2 files changed, 79 insertions(+), 49 deletions(-) + +commit a9326955d92740fbf206841de9b54436a44922a5 +Author: Yogeshwar Srikrishnan +Date: Tue Nov 29 23:00:22 2011 -0600 + + Bug-897724: + Added method to list endpoints specific to a service and related tests. + + Bug-897730: + Code fix to return correct status/message when an attempt is made to delete a + non existent enpoint template.Related tests. + + Bug-897719: + Fixing example that illustrates adding endpoint to a tenant. + + Minor code refactorings. + Got rid of additional quotes in pagination links. + + Change-Id: I90470d775be87c76e4345ca9aeb7dc5f18c11410 + + keystone/backends/api.py | 6 ++ + .../backends/sqlalchemy/api/endpoint_template.py | 64 +++++++++++++ + .../common/samples/endpointTemplateWithOnlyId.json | 2 +- + keystone/controllers/endpointtemplates.py | 12 ++- + keystone/logic/service.py | 102 +++++++++------------ + keystone/test/functional/common.py | 14 ++- + keystone/test/functional/test_endpoints.py | 84 +++++++++++++++++ + 7 files changed, 220 insertions(+), 64 deletions(-) + +commit ae038ead8e94e7fb9362420198226f0144924150 +Author: Dolph Mathews +Date: Wed Nov 30 10:12:09 2011 -0600 + + Eliminated debug output from sphinx_build (bug 898211) + + - Fixed the EXCLUDE_MODULE behavior to exclude recursively, as intended + + Change-Id: I1ac013549222128ab4f2dd2d4601508b1d1071dc + + doc/generate_autodoc_index.py | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit 1778dcf00668b3e1a48f21a3919c39a91a436b5c +Author: Ziad Sawalha +Date: Mon Nov 28 08:15:32 2011 -0600 + + Updated testing + + - Leveraging other OpenStack code (mainly Nova) + - Enabled duration and colorized reporting + - Support for python setup.py test + - Updated testing to run with in-memory database + - load_fixture called from test (no longer in core code) + + Change-Id: Ic602f7fb9be38f0aceed521c41e83a71bbc20e2f + + keystone/backends/ldap/fakeldap.py | 2 +- + keystone/backends/ldap/models.py | 11 +- + keystone/backends/models.py | 2 + + keystone/backends/sqlalchemy/__init__.py | 26 +- + keystone/common/wsgi.py | 16 +- + keystone/test/__init__.py | 561 ++++++++++++++++++++++---- + keystone/test/etc/ldap.conf.template | 4 +- + keystone/test/etc/memcache.conf.template | 2 +- + keystone/test/etc/sql.conf.template | 2 +- + keystone/test/etc/ssl.conf.template | 2 +- + keystone/test/functional/common.py | 5 +- + keystone/test/functional/test_credentials.py | 4 +- + keystone/test/functional/test_static_files.py | 12 +- + run_tests.py | 67 +-- + run_tests.sh | 130 ++++-- + setup.py | 12 +- + tools/pip-requires | 1 + + 17 files changed, 682 insertions(+), 177 deletions(-) + +commit d410637b9029b31e7c7e48e07b6124c813acf8fd +Merge: c01d21f 4a44384 +Author: Jenkins +Date: Wed Nov 30 04:05:30 2011 +0000 + + Merge "Fixes bug lp:897819" + +commit 4a443840c0cc04c118c83e6a68e95bd4715bbd28 +Author: Justin Shepherd +Date: Tue Nov 29 13:22:56 2011 -0600 + + Fixes bug lp:897819 + + Output of keystone-manage role list now lists User.name and Role.name instead of IDs. + + Change-Id: I8a3363c7563b80fbc5968bd2878a2cb90eb12b7f + + keystone/backends/sqlalchemy/models.py | 1 + + keystone/manage/__init__.py | 3 ++- + keystone/manage/api.py | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) + +commit c01d21fc7e46ce283571bffb1a70530e48108f58 +Author: Mark McLoughlin +Date: Tue Nov 29 15:43:35 2011 +0000 + + Check that endpointTemplate ID is valid in endpoint add cmd (#897749) + + Doing something like this: + + $> keystone-manage endpoint add myTenant nova + + and it appears to work. We should validate that the endpointTemplate arg + is a valid endpointTemplate ID. + + Change-Id: Iecc7e4057cf3009ff56624733951eb032ce7acb6 + + keystone/manage/api.py | 1 + + 1 file changed, 1 insertion(+) + +commit c7c2eee5e3f97fc77f4786f4beeabae45c8294d2 +Author: Ziad Sawalha +Date: Sat Nov 26 14:09:27 2011 -0600 + + Added Endpoint and Endpoint Template documentation + + Additional commit to bp/keystone-documentation + Fixed bad URL and incorrect example for swift + showing [TENANT_ID] instead of %tenant_id% in the examples + + Change-Id: I4904ab464ff526fbff9c7dade1569f676d9ca016 + + doc/source/configuringservices.rst | 7 +- + doc/source/endpoints.rst | 441 +++++++++++++++++++++++++++++++++++++ + doc/source/index.rst | 1 + + 3 files changed, 445 insertions(+), 4 deletions(-) + +commit eaf3b929f53572bfceb9271cc5496493708aa0cb +Author: Yogeshwar Srikrishnan +Date: Fri Nov 11 02:35:32 2011 -0600 + + Bug #854104 + - Changes to allow admin url to be shown only for admin users. + - Additional test asserts to verify. + + This was implemented by adding a parameter to the AuthData __init__ + (the class that renders auth call responses). The url_types parameter + filters which types of URLs to return; admin, intenrnal, public. + And in logic/service.py, there is authorization logic which checks + the caller's rights and based on that determines if they can see + the 'admin' URL. If not, it takes it out of the array passed to + the url_types paramater passed to the AuthData initializer. + + Added method documentation and renamed a couple in service.py in + the process to improve code understandability. More needs to be + done, but moving the ball forward. + + Change-Id: I3fb90c31617da7647a211901d647cfb53f182be2 + + keystone/logic/service.py | 201 ++++++++++------ + keystone/logic/types/auth.py | 22 +- + keystone/test/functional/common.py | 70 +++++- + keystone/test/functional/test_auth.py | 41 ++-- + keystone/test/functional/test_authentication.py | 295 ++++++++++++++++++++++-- + 5 files changed, 512 insertions(+), 117 deletions(-) + +commit 8dacf6fd985ed523a2ed44ae47f0bb59a67a85ec +Author: Ziad Sawalha +Date: Thu Nov 24 01:37:44 2011 -0600 + + Fixed memcache tests + + Addresses bug 843069 + + Change-Id: Icdf4df3cc965bba3d69f3906157d9f0285fa74cb + + keystone/backends/memcache/api/token.py | 33 +++++++++++++++++---------------- + keystone/manage/api.py | 2 +- + keystone/test/functional/test_roles.py | 3 ++- + run_tests.py | 4 +++- + 4 files changed, 23 insertions(+), 19 deletions(-) + +commit 47f86970587e1a2f7f868e23b45474b4f3ca8459 +Author: Julien Danjou +Date: Fri Nov 25 16:38:19 2011 +0100 + + Update documentation and examples following API 1.1 removal + + This updates the default templates so it stops talking about things that + does not exist anymore. + + Change-Id: If60dfe1ad80c993f4ad41c46da271e28cd36c664 + Signed-off-by: Julien Danjou + + doc/source/nova-api-paste.rst | 17 +++++------------ + examples/paste/nova-api-paste.ini | 17 +++++------------ + 2 files changed, 10 insertions(+), 24 deletions(-) + +commit f721abd9ea127df6b289ca27aeb6f1f098eae8f0 +Author: Ziad Sawalha +Date: Wed Nov 23 23:22:48 2011 -0600 + + Fixes bug 843065 + + Stopped defaults from option parser overriding arguments. Arguments take precendence. + + Change-Id: I40847efce567a37e7d41ca7b409c0411f13d383f + + bin/keystone | 19 ++++++++++++------- + bin/keystone-admin | 9 ++++++--- + bin/keystone-auth | 9 ++++++--- + keystone/common/config.py | 4 ++-- + 4 files changed, 26 insertions(+), 15 deletions(-) + +commit 5479838666f250d39e669704075e0e13173b1f91 +Merge: f156836 744c78d +Author: Jenkins +Date: Fri Nov 25 14:45:01 2011 +0000 + + Merge "Add keystone_tenant_user_admin option and fixes." + +commit f1568369f5950dea86544f96cf30d0a88982ec48 +Author: Ziad Sawalha +Date: Tue Nov 22 21:08:25 2011 -0600 + + Additional middleware test coverage + + Addresses bug 888142 + Adds testing for Glance and Quantum middleware + Abstracts some middleware tests to reuse MiddlewareTestCase class + Minor fixes to quantum_auth_token.py based on issues raised by test + + ZNS: rebased, pep8ed and had to update to support SSL communication between + middleware and Keystone which has since been merged. + + Change-Id: I5b52b646487aa0fb0aeeff34ec5ee0c0d76099a9 + + keystone/middleware/auth_token.py | 2 +- + keystone/middleware/quantum_auth_token.py | 81 ++++++++++--- + keystone/test/functional/common.py | 135 ++++++++++++++++++++++ + keystone/test/functional/test_middleware.py | 169 +++++++++++----------------- + 4 files changed, 266 insertions(+), 121 deletions(-) + +commit 4b9c2d9e2e2a60241597230845403c0841402583 +Author: Ziad Sawalha +Date: Wed Nov 23 02:47:21 2011 -0600 + + Enforce service ownership + + Partially addresses 890411 + Implements missed features from BP keystone-service-registration + + The service registration blueprints centered around a service + registering itself and then owning the resources (roles, endpoints) + it created for that service. This patch enforces that. + Admins still have full rights on all roles and endpoints, but service + admins only have rights on services they own. + + This includes a schema change (adding an owner_id field to services) which + is implemented as schema change 004 in sqlalchemy_migrate. + + This patch also includes updates to tests and documentation matching + the changes. + + Additional documentation + + Addressing BP keystone-documentation + + - Added documentation on configuring keystone, configuring middleware, + debugging + - pylint fixes + + Change-Id: Ia03946ec10704882cb1ac5efac95d45ec8370e29 + + doc/source/community.rst | 58 +- + doc/source/configuration.rst | 261 +------ + doc/source/configuringservices.rst | 317 ++++++++ + doc/source/controllingservers.rst | 295 ++++++++ + doc/source/developing.rst | 16 +- + doc/source/index.rst | 30 +- + doc/source/man/keystone-manage.rst | 4 +- + doc/source/migration.rst | 23 +- + doc/source/setup.rst | 6 + + doc/source/ssl.rst | 3 + + doc/source/testing.rst | 4 +- + .../migrate_repo/versions/004_add_service_owner.py | 39 + + keystone/backends/sqlalchemy/models.py | 1 + + .../content/common/samples/endpointTemplate.json | 1 + + .../content/common/samples/endpointTemplate.xml | 2 +- + keystone/logic/service.py | 795 ++++++++++++--------- + keystone/manage/__init__.py | 23 +- + keystone/manage/api.py | 14 +- + keystone/routers/__init__.py | 16 - + keystone/test/__init__.py | 2 +- + keystone/test/functional/test_endpoints.py | 13 +- + 21 files changed, 1308 insertions(+), 615 deletions(-) + +commit 744c78d093e91ea191491d04c6f6bf072f5ce4c3 +Author: Chmouel Boudjnah +Date: Wed Nov 23 15:03:13 2011 +0100 + + Add keystone_tenant_user_admin option and fixes. + + - Make the automatic if tenantName == userName: then make him owner + and option off by default. + - rename keystone_admin_group to keystone_swift_operator_roles and + allow it to have multiple roles (Admin and SwiftOperator by + default). + - Update documentation. + - Add more logging. + - remove the timeout arg to http_connect. + + Change-Id: I67e139eecd862da9cc4f1ebd0d62952ca4bfdeb3 + + keystone/middleware/swift_auth.py | 53 ++++++++++++++++++++++++--------------- + 1 file changed, 33 insertions(+), 20 deletions(-) + +commit cf6900469ab69a9841601667e4cf5a1abd1638f1 +Author: Chmouel Boudjnah +Date: Thu Nov 17 15:47:53 2011 +0000 + + Make owner the user named same as tenant/account + + This maps tenants to account in Swift. The user who's able to give + ACL / Create Containers permision will be the same user as the account. + + Example: If we have the account called hellocorp with a user + hellocorp that user will be admin on that account and can give ACL + to all other users for hellocorp. + + If there is a user who has not the same name the account and if it + is inside the group (or roles in keystone lingua) + keystone_admin_group as specifed in the configuration variable + (Admin by default) it will be allowed to be an admin the account. + + Change-Id: Icfabea296f54d8192ad2af2fb175a27c4a65ef19 + + keystone/middleware/swift_auth.py | 41 ++++++++++++++++++++++++++++++--------- + 1 file changed, 32 insertions(+), 9 deletions(-) + +commit 9ac6a70a149c4e60610b6ea803d66e5717cd3430 +Author: Ziad Sawalha +Date: Sun Nov 20 10:00:57 2011 -0600 + + Restored developer default log dir + + The default was changed to /var/log/keystone which does not exist by default + and requires sudo. I added the log_dir setting to keystone.conf so that + the original behaviour for development is restored - that is a local log + in the current directory. + + Change-Id: I7939b6833c1123324a248c4cdb68817bdc40ab82 + + etc/keystone.conf | 1 + + 1 file changed, 1 insertion(+) + +commit 123acfd3d0d77f14f9a6df0d1300d25a135937d0 +Author: Joseph W. Breu +Date: Tue Nov 15 16:52:23 2011 -0600 + + Add default for log directory and log filenames + + 1) Defines DEFAULT_LOG_DIR and DEFAULT_LOG_FILE to be used as defaults for log_dir and log_file. These + defaults are overridden by config file options. + 2) Add myself to the AUTHORS file also. + 3) add sandboxed log_dir to templates for tests + + Change-Id: I2574f5e4803f31f22ffe4de640b82a3ab68a9ccd + + AUTHORS | 3 ++- + keystone/common/config.py | 30 ++++++++++++++---------------- + keystone/test/etc/ldap.conf.template | 1 + + keystone/test/etc/memcache.conf.template | 1 + + keystone/test/etc/sql.conf.template | 1 + + keystone/test/etc/ssl.conf.template | 3 ++- + 6 files changed, 21 insertions(+), 18 deletions(-) + +commit 253a65bcaf180b4b7a03d3f1fb900fae6e912644 +Author: Dolph Mathews +Date: Fri Nov 18 10:38:09 2011 -0800 + + Added wadls, pdfs, samples and functional test confs (bug 891093) + + Change-Id: If8bb42bdbae62e068dd42a2c4d0e4c16b0b41248 + + MANIFEST.in | 2 ++ + 1 file changed, 2 insertions(+) + +commit 038b5e13d0da17119ac51ca1aea482df77f6f991 +Merge: 6a739c0 77b13dd +Author: Jenkins +Date: Fri Nov 18 18:26:43 2011 +0000 + + Merge "Bug #891451: Changes to support update endpointTemplates call in the WADL." + +commit 6a739c0feb4b216999cf387d0ba26f304e645eb0 +Merge: 19bcd8f f6aa23c +Author: Jenkins +Date: Fri Nov 18 18:12:06 2011 +0000 + + Merge "Bug #890399" + +commit 19bcd8fd9654d5d1c16f397f10d336d196b5a3c3 +Author: Ziad Sawalha +Date: Thu Nov 17 21:29:21 2011 -0600 + + Additional documentation + + blueprint keystone-documentation + + Added use case flows in the doc/design folder showing these scenarios: + - User only knows Keystone URL and not their tenant or Nova URL + - User knows their tenant; shortcut of first scenario + - User knows Nova URL only and wants to authenticate + + Also added Middleware Architecture explanation to RST docs showing + the many supported deployment scenarios. + + Change-Id: I308ac26b2b8748e8a80f4c5952f8311f99d50b40 + + doc/design/use_case_1.pdf | 8183 ++++++++++++++++++++ + doc/design/use_case_1.png | Bin 0 -> 46469 bytes + doc/design/use_case_1.sdx | 83 + + doc/design/use_case_2.pdf | 6006 ++++++++++++++ + doc/design/use_case_2.png | Bin 0 -> 32030 bytes + doc/design/use_case_2.sdx | 76 + + doc/design/use_case_3.pdf | 7995 +++++++++++++++++++ + doc/design/use_case_3.png | Bin 0 -> 42759 bytes + doc/design/use_case_3.sdx | 80 + + doc/generate_autodoc_index.py | 2 +- + doc/source/conf.py | 2 +- + doc/source/images/305.svg | 158 + + doc/source/images/authComp.svg | 174 + + doc/source/images/both.svg | 135 + + doc/source/images/graphs_305.svg | 41 + + doc/source/images/graphs_authComp.svg | 48 + + doc/source/images/graphs_authCompDelegate.svg | 53 + + doc/source/images/graphs_both.svg | 36 + + doc/source/images/graphs_delegate_accept.svg | 52 + + .../images/graphs_delegate_forbiden_basic.svg | 53 + + .../images/graphs_delegate_forbiden_proxy.svg | 52 + + doc/source/images/graphs_delegate_reject_basic.svg | 55 + + doc/source/images/graphs_delegate_reject_oauth.svg | 56 + + .../images/graphs_delegate_unimplemented.svg | 53 + + doc/source/images/graphs_mapper.svg | 73 + + doc/source/images/graphs_proxyAuth.svg | 51 + + doc/source/images/graphs_separate.svg | 30 + + doc/source/images/graphs_standard_accept.svg | 51 + + doc/source/images/graphs_standard_reject.svg | 39 + + doc/source/images/graphs_together.svg | 24 + + doc/source/images/images_layouts.svg | 200 + + doc/source/images/layouts.svg | 215 + + doc/source/images/mapper.svg | 237 + + doc/source/images/proxyAuth.svg | 238 + + doc/source/index.rst | 1 + + doc/source/middleware_architecture.rst | 475 ++ + 36 files changed, 25025 insertions(+), 2 deletions(-) + +commit da58d5e0cb7405f4670275c1aaad02ad35793510 +Author: Dolph Mathews +Date: Thu Nov 17 14:15:18 2011 -0800 + + ./keystone-manage endpointTemplates list missing arg (bug 891843) + + Change-Id: Ibd190d34590176e52e29325f26fe7d8b0525ddf1 + + keystone/manage/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 964376151c1d0ad0d156353edd205433b0267ac0 +Merge: 3b36c98 1a3b810 +Author: Jenkins +Date: Thu Nov 17 22:06:01 2011 +0000 + + Merge "Added timeout to bufferedhttp class and timeout setting for middleware - bug 891687" + +commit f6aa23c444dce6637a127905812810073c9930cb +Author: Yogeshwar Srikrishnan +Date: Thu Nov 17 10:39:29 2011 -0600 + + Bug #890399 + + - Made create service calls to fail when there is no service name. + - Along the way fixed incorrect equality checks for a string for various other calls. + - Added tests to other api calls that were also failing + - Made ==None checks to is None checks + + Change-Id: I2fa30442c60667b793ebca30efd9f79253fc740e + + keystone/controllers/staticfiles.py | 4 +- + keystone/logic/service.py | 78 ++++++++++++---------------- + keystone/logic/types/auth.py | 36 +++++-------- + keystone/logic/types/credential.py | 9 ++-- + keystone/logic/types/endpoint.py | 3 +- + keystone/logic/types/fault.py | 4 +- + keystone/logic/types/role.py | 10 ++-- + keystone/logic/types/service.py | 19 +++---- + keystone/logic/types/tenant.py | 7 ++- + keystone/logic/types/user.py | 31 +++++------ + keystone/manage/api.py | 20 +++---- + keystone/test/functional/common.py | 5 +- + keystone/test/functional/test_credentials.py | 12 +++++ + keystone/test/functional/test_endpoints.py | 56 ++++++++++++++++++++ + keystone/test/functional/test_roles.py | 11 ++++ + keystone/test/functional/test_services.py | 24 +++++++++ + keystone/test/functional/test_tenants.py | 12 +++++ + keystone/test/functional/test_users.py | 7 +++ + keystone/test/unit/test_utils.py | 18 +++++++ + keystone/utils.py | 22 ++++++++ + 20 files changed, 257 insertions(+), 131 deletions(-) + +commit 77b13dddd460b388d0933b51dbbc57755f46f8c9 +Author: Yogeshwar Srikrishnan +Date: Thu Nov 17 14:03:40 2011 -0600 + + Bug #891451: + Changes to support update endpointTemplates call in the WADL. + + Change-Id: I8ae4aeb11342a9917f06d8a5de997f96151f8572 + + keystone/content/admin/OS-KSCATALOG-admin.wadl | 34 ++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +commit 91f209712599a00979cb3aacff1f30f538972c38 +Author: termie +Date: Thu Nov 17 12:13:09 2011 -0800 + + add an example for capability rbac + + README.rst | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit e5d1050da930eac9f8cec339e2dbea140303eeb2 +Author: termie +Date: Thu Nov 17 12:00:42 2011 -0800 + + make readme use code style + + README.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 860aa86e0305c8cdc4cc509e971c39003ef0a5ea +Author: termie +Date: Thu Nov 17 11:58:43 2011 -0800 + + add the policy code + + keystonelight/backends/policy.py | 23 +++++++++++++++++++++++ + keystonelight/keystone_compat.py | 11 +++++++++-- + keystonelight/policy.py | 18 ++++++++++++++++++ + 3 files changed, 50 insertions(+), 2 deletions(-) + +commit 63943c98c6ed74d42398bda38b4ddfbc3ddd4283 +Author: termie +Date: Thu Nov 17 11:40:52 2011 -0800 + + describe and add a policy backend + + README.rst | 45 +++++++++++++++++++++++++++++++++ + etc/default.conf | 1 + + tests/default.conf | 2 +- + tests/keystone_compat_diablo.conf | 2 +- + tests/keystoneclient_compat_master.conf | 2 +- + 5 files changed, 49 insertions(+), 3 deletions(-) + +commit d820917da0d57fe18bb7ab85b1bf8129d25c2208 +Author: termie +Date: Thu Nov 17 10:58:55 2011 -0800 + + policty stub + + keystonelight/backends/kvs.py | 12 ++++++++++++ + keystonelight/keystone_compat.py | 2 ++ + tests/default.conf | 1 + + tests/keystone_compat_diablo.conf | 1 + + tests/keystoneclient_compat_master.conf | 1 + + 5 files changed, 17 insertions(+) + +commit 834301a731782faee761d910ea284684651626eb +Author: termie +Date: Thu Nov 17 10:58:35 2011 -0800 + + re-indent + + keystonelight/middleware.py | 104 ++++++++++++++++++++++---------------------- + 1 file changed, 52 insertions(+), 52 deletions(-) + +commit 1a3b810f70b6e300dcfa008d7ad4c7ff37828ada +Author: Ziad Sawalha +Date: Thu Nov 17 11:34:22 2011 -0600 + + Added timeout to bufferedhttp class and timeout setting for middleware - bug 891687 + + Change-Id: Ib3f30ac6b78c5064ad2eb6257f8739a75b629fa3 + + examples/paste/auth_token.ini | 5 +++-- + examples/paste/glance-api.conf | 1 + + examples/paste/glance-registry.conf | 1 + + examples/paste/nova-api-paste.ini | 1 + + keystone/common/bufferedhttp.py | 16 +++++++++++----- + keystone/middleware/auth_token.py | 8 ++++++-- + keystone/middleware/swift_auth.py | 4 +++- + 7 files changed, 26 insertions(+), 10 deletions(-) + +commit 3b36c98e9e066a1d476bdd2a01adcfaa0b649560 +Author: Dolph Mathews +Date: Thu Nov 17 09:03:16 2011 -0800 + + Refactoring master to match stable/diablo fix for bug 891710 + + This is not a bug fix (and contains no functional changes), + as the bug found in stable/diablo was already fixed in master. + + Change-Id: Ic0109819a56d8d815ec7708f9b954a9a7eb67baa + + keystone/manage/__init__.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit ebb00b49d19b1ccc7636b4e48b3a068c151d09b4 +Merge: a70da89 0a67428 +Author: Jenkins +Date: Wed Nov 16 22:33:28 2011 +0000 + + Merge "Added files missing from dist packaging (bug 891093)" + +commit a70da8946443f0127a8f43fa76b77f7144118fa1 +Merge: 316e2bc d63247e +Author: Jenkins +Date: Wed Nov 16 22:31:08 2011 +0000 + + Merge "pylintrc should not be hidden (bug 891093)" + +commit 316e2bca9f267d08fde2ad52350810da9f121442 +Author: Kevin L. Mitchell +Date: Tue Nov 15 17:43:35 2011 -0600 + + Refactor auth_token.py to only call out to Keystone once. + + Fixes bug 890881. + + Change-Id: I096d2c63e8f2c996dc1e5dd7315f57e2303d24cb + + keystone/middleware/auth_token.py | 50 ++++++++++----------------------------- + 1 file changed, 12 insertions(+), 38 deletions(-) + +commit e74ad8ad71b1d004497e1507ed53cbd6473c6aaa +Merge: fc84e17 719d6ed +Author: Jenkins +Date: Wed Nov 16 17:57:25 2011 +0000 + + Merge "Adding middleware tests" + +commit 0a674282dc8ad6037743d8906f22274a1e4c81bd +Author: Dolph Mathews +Date: Wed Nov 16 09:37:26 2011 -0800 + + Added files missing from dist packaging (bug 891093) + + Change-Id: Ic515db5e3392a4eda18d3791fd0e2a6990b42efd + + MANIFEST.in | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +commit d63247e10f36dbb7feb13c6ceae096b651321cc3 +Author: Dolph Mathews +Date: Wed Nov 16 08:30:17 2011 -0800 + + pylintrc should not be hidden (bug 891093) + + Change-Id: Ifa7e22b31dd852eecfa3a546fdb8fa30ea96337f + + .pylintrc | 42 ------------------------------------------ + pylintrc | 42 ++++++++++++++++++++++++++++++++++++++++++ + run_tests.sh | 2 +- + 3 files changed, 43 insertions(+), 43 deletions(-) + +commit fc84e174a2fc127d5a6a21a63e9c4d574c3b4ff7 +Author: Dolph Mathews +Date: Wed Nov 16 08:26:14 2011 -0800 + + Simplified gitignore (in pursuit of bug 891093) + + - Added dist/ (setup.py sdist output) + - Assumed we never want to track any *.db files + + Change-Id: I5b59e55064ad2abc315790512c2b87c8cc4704c9 + + .gitignore | 17 +++++++---------- + 1 file changed, 7 insertions(+), 10 deletions(-) + +commit 87e24cc3796fe57a59cde17d4ab0f2a28255ded2 +Author: annegentle +Date: Wed Nov 16 10:04:08 2011 -0600 + + Fixes typo in setup document + + Change-Id: Ifa2097412a1c9664341228ec5de29c4608e2a2f5 + + doc/source/setup.rst | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 719d6ed06a6f26cbbf7d03a490aaf9b28bfab593 +Author: Ziad Sawalha +Date: Fri Nov 11 17:16:41 2011 -0600 + + Adding middleware tests + + Middleware tests start a fake echo app and put the auth_token.py + middleware in front of it and then simulate calls. The tests + check the correct response for unauthenticated calls and also + that the right headers are being passed down to the fake app from + the middleware (the fake app echos the headers it receives) + + Includes fixes discovered in testing and non-breaking fix + for Bug 878431 + + Update testing options to support verbosity and selecting + individual tests + + Addresses bug 890777 + + Fixes to middleware tests that were hanging Jenkins + - needed to add support for SSL tests + + Change-Id: Iea273196f1782653eccdcf0f2391eacb1434aa8e + + keystone/logic/types/auth.py | 4 +- + keystone/middleware/auth_token.py | 13 +-- + keystone/test/__init__.py | 44 ++++++--- + keystone/test/etc/ldap.conf.template | 2 +- + keystone/test/etc/memcache.conf.template | 2 +- + keystone/test/etc/sql.conf.template | 2 +- + keystone/test/etc/ssl.conf.template | 2 +- + keystone/test/functional/test_middleware.py | 135 ++++++++++++++++++++++++++++ + run_tests.py | 14 +++ + run_tests.sh | 4 + + 10 files changed, 197 insertions(+), 25 deletions(-) + +commit 7bb47334506634914b78f6fe3044a601ac0da1c6 +Author: Julien Danjou +Date: Wed Nov 16 11:47:26 2011 +0100 + + Remove executable bit on template + + Change-Id: I6048470641350c2ac4843a606e75f9ebd187ad71 + Signed-off-by: Julien Danjou + + keystone/test/etc/ldap.conf.template | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit b0733cab49f118d008f6951bb542f69c1f0f616a +Author: termie +Date: Tue Nov 15 16:13:13 2011 -0800 + + change array syntax + + bin/ksl | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 3479575623233c277af611ff8e8ab058b935192a +Author: termie +Date: Tue Nov 15 15:50:29 2011 -0800 + + updates to make compatible with middleware + + keystonelight/backends/templated.py | 3 ++- + keystonelight/keystone_compat.py | 8 +++++++- + tests/test_keystone_compat.py | 1 + + 3 files changed, 10 insertions(+), 2 deletions(-) + +commit 58b8ca858c7e532bd318ae10c0b0eb4c6413dd82 +Author: termie +Date: Tue Nov 15 15:47:25 2011 -0800 + + mergeish dolph's port change + + etc/default.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3dac7734c6d7b8504816b77c894320d05b9a8b41 +Author: termie +Date: Tue Nov 15 14:05:07 2011 -0800 + + fix tests + + keystonelight/service.py | 4 ++-- + tests/test_backend_kvs.py | 2 +- + tests/test_identity_api.py | 2 +- + tests/test_novaclient_compat.py | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit aaf76955182da7196c9301300ea825e0e3403b11 +Author: termie +Date: Tue Nov 15 13:49:27 2011 -0800 + + handle unscoped requests + + keystonelight/backends/kvs.py | 6 +++++- + keystonelight/keystone_compat.py | 20 ++++++++++++-------- + 2 files changed, 17 insertions(+), 9 deletions(-) + +commit 20bebd9f6056f8b3c23140c9297eee2567f6dc73 +Author: termie +Date: Tue Nov 15 13:48:46 2011 -0800 + + adjust default port + + etc/default.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 212797c56e7dab0e170443dcc462cdfbc860e048 +Author: Dolph Mathews +Date: Tue Nov 15 10:41:50 2011 -0800 + + Revised version status response (bug 890807) + + Change-Id: I44706d6bb05c9b40d0793e801708486d8ec83f41 + + doc/source/adminAPI_curl_examples.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0bb26b959e856be12f75c403f444bcf706ee7660 +Merge: 3b028db f3d497b +Author: Jenkins +Date: Tue Nov 15 18:03:24 2011 +0000 + + Merge "'text/json' should be 'application/json' (bug 843226)" + +commit 3b028db6c9ff5b464fc3ac399dbc93a43425f4d5 +Author: Dolph Mathews +Date: Fri Nov 11 10:24:51 2011 -0600 + + Refactored headers produced by middleware (bug 835087) + + - Renamed HTTP_X_ROLE to HTTP_X_ROLES (bug 835087) + - Simplified logic to build the list of roles + - Introduced HTTP_X_USER_ID and HTTP_X_USER_NAME headers + - Retained support for HTTP_X_USER and HTTP_X_ROLE, but + documented them as *Deprecated* + - Documented all headers produced by middleware + + Change-Id: I03fb45879ba3bf37d0bef1d0c110b44f55b7c10c + + keystone/middleware/auth_token.py | 166 +++++++++++++++++++++++--------------- + 1 file changed, 101 insertions(+), 65 deletions(-) + +commit 17e03b82cb09d97545bd5a45d846d3d98688408d +Author: termie +Date: Tue Nov 15 09:43:42 2011 -0800 + + move noop to identity controller + + keystonelight/service.py | 8 ++++---- + tools/pip-requires | 1 + + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit 33c1c9390331b3bacd3791b537b6a1147715925c +Author: Dolph Mathews +Date: Sun Nov 13 23:56:24 2011 -0600 + + Ignoring db migrate mgmt module to workaround bug 889287 + + Change-Id: Ibe436da7f8cf4f3fc0a09c3cecb59da95726cad0 + + doc/generate_autodoc_index.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit f3d497b241c4685c5429866b6d3176f0faadf904 +Author: Dolph Mathews +Date: Thu Nov 10 20:12:35 2011 -0600 + + 'text/json' should be 'application/json' (bug 843226) + + Change-Id: Ic0a6c211a078a43160d4193d6fe3aaa2c4b18b66 + + keystone/middleware/quantum_auth_token.py | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit e789a03d5dacd9264d9fa98722fd6f03f2879785 +Author: Dolph Mathews +Date: Tue Nov 8 18:01:32 2011 -0600 + + Revised curl examples (bug 884789) + + - Added & removed examples to match the core API in master + + Change-Id: Icabf1f32c86a3288cf6b07ba3609d74e3e5f523f + + doc/source/adminAPI_curl_examples.rst | 443 +++++++++++++++++++++++++------- + doc/source/serviceAPI_curl_examples.rst | 54 +++- + 2 files changed, 397 insertions(+), 100 deletions(-) + +commit 34b3cee38d48e36b40eb583d682ac71c993b932a +Merge: eed8a93 fb98f6b +Author: Jenkins +Date: Tue Nov 15 00:42:56 2011 +0000 + + Merge "Bug 888170: Fixing references to incorrect schema." + +commit 90243515b1216a5d5bc36c5fbe5b3645bb7afb76 +Author: termie +Date: Mon Nov 14 16:37:34 2011 -0800 + + allow setting user_id on create + + keystonelight/service.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 776a15920e171c73c5bfc3ec75aa826e7fff6d43 +Author: termie +Date: Mon Nov 14 16:24:59 2011 -0800 + + users require a name + + keystonelight/backends/kvs.py | 25 +++++++++++-------------- + keystonelight/identity.py | 3 +++ + keystonelight/keystone_compat.py | 9 ++++++++- + tests/test_backend_kvs.py | 6 +++--- + tests/test_identity_api.py | 9 +++++---- + tests/test_keystone_compat.py | 16 ++++++++-------- + tests/test_keystoneclient_compat.py | 8 ++++---- + tests/test_novaclient_compat.py | 6 +++--- + 8 files changed, 45 insertions(+), 37 deletions(-) + +commit c8b28b59eda06a95aba3827090c283085358ea1b +Author: termie +Date: Mon Nov 14 15:52:25 2011 -0800 + + pep8 + + bin/ksl | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 8eea6b390b51f40130a96dd745cc907483a882a4 +Author: termie +Date: Mon Nov 14 15:51:29 2011 -0800 + + update test conf too + + tests/default.conf | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 1335e4c2ea5a9edac23d00a235016d88887fb701 +Author: termie +Date: Mon Nov 14 15:50:46 2011 -0800 + + cli for adding users, tenants, extras + + bin/keystone | 5 ++-- + bin/ksl | 75 ++++++++++++++++++++++++++++++++++++++++++++++++- + etc/default.conf | 7 +++-- + keystonelight/client.py | 7 +++-- + 4 files changed, 85 insertions(+), 9 deletions(-) + +commit 9d998211529fb6de24d7a62718ad2a850f19557e +Author: termie +Date: Mon Nov 14 11:46:32 2011 -0800 + + adjust paths and use composite apps + + bin/keystone | 2 +- + etc/default.conf | 15 ++++++++++----- + keystonelight/backends/templated.py | 1 - + keystonelight/keystone_compat.py | 6 +++--- + keystonelight/service.py | 4 ++++ + keystonelight/test.py | 28 +++++++++++++++++++++++----- + keystonelight/wsgi.py | 1 + + tests/keystone_compat_diablo.conf | 13 ++++++++++++- + tests/keystoneclient_compat_master.conf | 13 ++++++++++++- + tests/test_keystoneclient_compat.py | 2 +- + 10 files changed, 67 insertions(+), 18 deletions(-) + +commit 2545907561e3a0c943c204b0eec491555dd5c537 +Author: termie +Date: Mon Nov 14 11:12:26 2011 -0800 + + add tests for extras + + keystonelight/backends/kvs.py | 8 ++++++++ + keystonelight/service.py | 21 +++++++++++++++++++++ + tests/test_identity_api.py | 30 ++++++++++++++++++++++++++++++ + 3 files changed, 59 insertions(+) + +commit 3ab9d87465d7aa96c7b3da4d6425540bc67c1a5b +Author: termie +Date: Mon Nov 14 10:51:17 2011 -0800 + + add tenant crud + + keystonelight/backends/kvs.py | 14 ++++++++++++++ + keystonelight/service.py | 22 ++++++++++++++++++++++ + tests/test_identity_api.py | 44 +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 80 insertions(+) + +commit f8e6fae92f9defb23ee80abea6126d6753574393 +Author: termie +Date: Mon Nov 14 10:37:24 2011 -0800 + + oops, forgot update in crud + + keystonelight/backends/kvs.py | 4 ++++ + keystonelight/service.py | 5 +++++ + tests/test_identity_api.py | 8 ++++++++ + 3 files changed, 17 insertions(+) + +commit 7035e4aa783e6423f1ba691c19f596386c7e12e4 +Author: termie +Date: Mon Nov 14 10:33:13 2011 -0800 + + add crud tests + + keystonelight/service.py | 1 + + 1 file changed, 1 insertion(+) + +commit 54f32f96fe43302c9e4129b6e1ca1954882f7555 +Author: termie +Date: Mon Nov 14 10:32:40 2011 -0800 + + add crud tests + + keystonelight/service.py | 1 - + 1 file changed, 1 deletion(-) + +commit d0009db73564aee8eb8cd34df21457e7d3d8c851 +Author: termie +Date: Mon Nov 14 10:29:56 2011 -0800 + + add crud tests + + keystonelight/backends/kvs.py | 4 ++++ + keystonelight/service.py | 1 - + tests/test_identity_api.py | 5 ++++- + 3 files changed, 8 insertions(+), 2 deletions(-) + +commit 8ff5606b3d63a6ab31e69f5605b1fbe4ce59dda4 +Author: termie +Date: Mon Nov 14 10:24:45 2011 -0800 + + add test for create user and get user + + keystonelight/service.py | 8 ++++++-- + tests/test_identity_api.py | 11 ++++++++--- + 2 files changed, 14 insertions(+), 5 deletions(-) + +commit 2c7770fc0d1ef0f55a2e96c8ef6086a2f7d29937 +Author: termie +Date: Mon Nov 14 10:23:05 2011 -0800 + + add test for create user and get user + + keystonelight/identity.py | 12 ++++++------ + keystonelight/service.py | 9 +++++++++ + tests/test_identity_api.py | 13 +++++++++++++ + 3 files changed, 28 insertions(+), 6 deletions(-) + +commit 2d154828e7564f4025436d40cd5183c5f93b4273 +Author: termie +Date: Mon Nov 14 10:08:51 2011 -0800 + + re-indent identity.py + + keystonelight/identity.py | 72 +++++++++++++++++++++++------------------------ + 1 file changed, 36 insertions(+), 36 deletions(-) + +commit 91059352640965765afd2e97ac37656e445927cf +Author: termie +Date: Mon Nov 14 10:08:35 2011 -0800 + + don't pep8 swp files + + run_tests.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e8f72ed91488e1736c65dca467827c4a1adf215b +Author: termie +Date: Mon Nov 14 10:05:50 2011 -0800 + + accept data as kwargs for crud + + keystonelight/identity.py | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit 096eb3fa568f3dd14df3703c2d15a499ff4e5712 +Merge: adbbe01 f2e73bc +Author: termie +Date: Mon Nov 14 09:57:41 2011 -0800 + + Merge branch 'crud' of github.com:termie/keystonelight into crud + +commit adbbe0147e9e726db2dc6f2c2d4e446fa589c5ba +Author: termie +Date: Mon Nov 14 09:57:24 2011 -0800 + + use the keystone app in the conf + + bin/keystone | 4 ++-- + etc/default.conf | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 32 insertions(+), 2 deletions(-) + +commit 6c84c1bf6a80399e7d1c9695eb01b8ba9fad1fc6 +Author: termie +Date: Mon Nov 14 09:54:24 2011 -0800 + + reorg + + keystonelight/keystone_compat.py | 106 +++++++++++++++++++-------------------- + 1 file changed, 53 insertions(+), 53 deletions(-) + +commit f2e73bc9b20b26947980067bcf95c9989e37907d +Author: termie +Date: Mon Nov 14 09:33:17 2011 -0800 + + re-indent service.py + + keystonelight/service.py | 187 +++++++++++++++++++++++------------------------ + 1 file changed, 93 insertions(+), 94 deletions(-) + +commit eed8a937a61b564614deed933ef6159f42a7c814 +Author: Yogeshwar Srikrishnan +Date: Thu Nov 10 10:00:53 2011 -0600 + + Bug 888448: + - Changes to allow validate token call return user name as per contract. + - Additional test assertions to test the same. + - Changes to middleware. + + Change-Id: I7138deb4a260e47a50625b2c49132691f7e5a970 + + keystone/logic/types/auth.py | 4 ++-- + keystone/middleware/quantum_auth_token.py | 2 +- + keystone/middleware/swift_auth.py | 2 +- + keystone/test/functional/test_auth.py | 12 ++++++------ + keystone/test/functional/test_client.py | 2 +- + keystone/test/functional/test_token.py | 5 +++++ + keystone/test/unit/test_server.py | 4 ++-- + 7 files changed, 18 insertions(+), 13 deletions(-) + +commit e10512b2b879e4e70a59722d00dcb21f6a940dff +Author: termie +Date: Thu Nov 10 15:57:54 2011 -0800 + + more dyanmic client + + keystonelight/client.py | 33 ++++++++++++++++++++ + keystonelight/service.py | 77 ++++++++++++++++++++++++++++++++++++---------- + tests/test_identity_api.py | 6 ++-- + 3 files changed, 96 insertions(+), 20 deletions(-) + +commit 84644998b3d4b6321bd27ca21ded89b371ef1957 +Author: termie +Date: Thu Nov 10 14:57:42 2011 -0800 + + get some initial identity api tests working + + bin/ksl | 1 - + keystonelight/client.py | 67 ++++++++++++++++++ + keystonelight/middleware.py | 2 - + keystonelight/service.py | 35 +++++----- + tests/test_identity_api.py | 161 ++++++++++---------------------------------- + 5 files changed, 122 insertions(+), 144 deletions(-) + +commit 4b4969f7dc9f895cf03286fbcd6ff006503b6d71 +Author: termie +Date: Thu Nov 10 14:12:25 2011 -0800 + + update service to middleware in confs + + tests/keystone_compat_diablo.conf | 6 +++--- + tests/keystoneclient_compat_master.conf | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit d7f364e2098a10a8922996618acc11a8c341a117 +Author: termie +Date: Thu Nov 10 11:17:07 2011 -0800 + + move around middleware + + keystonelight/middleware.py | 96 +++++++++++++++++++++++++ + keystonelight/service.py | 126 +++------------------------------ + tests/default.conf | 6 +- + tests/test_identity_api.py | 166 ++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 275 insertions(+), 119 deletions(-) + +commit 716c450fbfb372245c7fb4b24567df7782a4b28b +Author: termie +Date: Thu Nov 10 11:03:54 2011 -0800 + + make a composite app + + tests/default.conf | 31 +++++++++++++++++++++++++++++-- + 1 file changed, 29 insertions(+), 2 deletions(-) + +commit 59c2dea30f0fc4db438c4515883f2667c989939c +Author: termie +Date: Thu Nov 10 11:03:40 2011 -0800 + + add crud methods to identity manager + + keystonelight/identity.py | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit 0777f2d6fb0816c39c77a3ce7a07f4313085f3ec +Author: Chmouel Boudjnah +Date: Thu Nov 10 17:09:21 2011 +0100 + + Add a new swift auth middleware. + + - This is based on the same other swift middleware like tempauth/swauth. + - It handle ACL mapping roles to swift groups. + - Container sync. + + Future: + + - let validation by auth_token. + - s3 compatibility. + + Change-Id: I5c1f21dfde7b2c77de62a6c77438c56c4288c370 + + keystone/middleware/swift_auth.py | 356 ++++++++++++++++++-------------------- + 1 file changed, 173 insertions(+), 183 deletions(-) + +commit 91388bc6da32777f25d509b641e9c3978d9538c5 +Author: Ziad Sawalha +Date: Mon Nov 7 11:25:26 2011 -0600 + + Use TENANT_ID if it exists, but still support X_TENANT. + + This continues support for middleware that is using the older data model where tenantId and tenantName were the same thing. X_TENANT is what is in the URL in Keystoe. + + Added documentation on Middleware headers and HTTP API interactions. + + Change-Id: I65a31ab07eb18d6882977acc64679c873b951bfb + + doc/source/index.rst | 1 + + doc/source/middleware.rst | 65 ++++++++++++++++++++++++++++ + keystone/middleware/auth_token.py | 7 +++ + keystone/middleware/nova_auth_token.py | 8 +++- + keystone/middleware/nova_keystone_context.py | 8 +++- + 5 files changed, 87 insertions(+), 2 deletions(-) + +commit 570b08d189dd33d74afa45dc0270ffc6ba2030b8 +Author: termie +Date: Wed Nov 9 14:38:34 2011 -0800 + + cli beginnings + + bin/ksl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +commit fb98f6bfcb18b2531167c82f6c3df82327249b96 +Author: Yogeshwar Srikrishnan +Date: Wed Nov 9 11:35:59 2011 -0600 + + Bug 888170: Fixing references to incorrect schema. + + Change-Id: I738d8c45078a17481856a3b2661fa9436d86df78 + + keystone/logic/types/endpoint.py | 6 +++--- + keystone/test/functional/common.py | 2 +- + keystone/test/functional/test_endpoints.py | 26 +++++++++++++------------- + 3 files changed, 17 insertions(+), 17 deletions(-) + +commit 64b369f4d34ec2aafd383dfc15b4293db6b7a14e +Author: termie +Date: Wed Nov 9 12:37:58 2011 -0800 + + add admin port + + bin/keystone | 1 + + 1 file changed, 1 insertion(+) + +commit 4885d4a2d3673c6a892cb6724797544be62cca69 +Author: termie +Date: Wed Nov 9 11:57:59 2011 -0800 + + add an etc dir + + etc/keystone.conf | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit e2f4e8dc9d8bf9af1b463cc2985fe5abdd38ea67 +Author: Yogeshwar Srikrishnan +Date: Wed Nov 9 12:16:13 2011 -0600 + + Bug #888210: Changes to fix calls to use the right path. + + Change-Id: Ie9f1a6a088c8f00979ee5b70190544763709442c + + keystone/contrib/extensions/admin/osksadm/__init__.py | 6 +++--- + keystone/test/functional/common.py | 12 ++++++------ + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit 009f2c9ce50582fc3dd44690d2495f77e079ede0 +Author: Yogeshwar Srikrishnan +Date: Wed Nov 9 10:11:20 2011 -0600 + + bug 878431: Minor changes to auth_token middleware. + + Change-Id: I3aa28db2dcd0be0f19f7e25ac1741e34fb145220 + + keystone/middleware/auth_token.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cd712b2643b818ffb4272c4b3b546685c48e9640 +Author: termie +Date: Tue Nov 8 16:05:48 2011 -0800 + + add a default handler for / + + bin/keystone | 2 ++ + keystonelight/keystone_compat.py | 6 ++++++ + 2 files changed, 8 insertions(+) + +commit c32564325fdd8904e222dbf947272cb87f97026b +Author: Salvatore Orlando +Date: Fri Nov 4 10:40:14 2011 +0000 + + Bug #886046 + Add Quantum auth middleware to Keystone source code tree + + Further improving pylint score + ./run_tests.sh -l now report 2 violation more than master branch + ./run_tests.sh -p does not report any pep8 violation + + Change-Id: Id83de533055baf10662ea6c2b62c1657e9aa8aa7 + + bin/keystone | 18 +- + keystone/backends/sqlalchemy/api/user.py | 2 +- + keystone/common/template.py | 1 - + keystone/logic/service.py | 6 +- + keystone/middleware/auth_basic.py | 4 +- + keystone/middleware/auth_token.py | 17 +- + keystone/middleware/quantum_auth_token.py | 370 ++++++++++++++++++++++++++++++ + keystone/routers/__init__.py | 16 ++ + 8 files changed, 417 insertions(+), 17 deletions(-) + +commit 8ae627a317f91797fc3331f8f8eda0e7682ecc36 +Author: termie +Date: Tue Nov 8 15:03:15 2011 -0800 + + add a stubby setup.py + + bin/ksl | 0 + keystonelight/backends/kvs.py | 13 +++++++++++++ + setup.py | 13 +++++++++++++ + 3 files changed, 26 insertions(+) + +commit 3117b4188649556fe9f6487b667e20a0acbc9f7e +Author: termie +Date: Tue Nov 8 13:43:03 2011 -0800 + + use paste for the binary + + bin/keystone | 29 +++++++---------------------- + keystonelight/logging.py | 4 ++-- + 2 files changed, 9 insertions(+), 24 deletions(-) + +commit 3d79099bace07244a0332fc8e2b1e74a548f6049 +Author: termie +Date: Tue Nov 8 13:28:40 2011 -0800 + + add a trivial admin-only middleware + + README.rst | 2 +- + keystonelight/keystone_compat.py | 4 ++++ + keystonelight/service.py | 14 ++++++++++++++ + tests/default.conf | 6 +++++- + tests/keystone_compat_diablo.conf | 6 +++++- + tests/keystoneclient_compat_master.conf | 6 +++++- + tests/test_keystone_compat.py | 11 +++-------- + 7 files changed, 37 insertions(+), 12 deletions(-) + +commit da28d05dcdabdd1c22d7f571e5cf471d1da3abe7 +Merge: 8fd8220 8a33ab1 +Author: termie +Date: Tue Nov 8 13:05:50 2011 -0800 + + Merge branch 'master' of github.com:termie/keystonelight + +commit 8fd822002ea52c156bcb04319b36c9fe5272c816 +Author: termie +Date: Tue Nov 8 13:04:26 2011 -0800 + + update keystone sample tests, skip one + + tests/test_keystone_compat.py | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 7fddfad484d34e26d36f504a030a400d12617386 +Merge: 882e015 9e4dee8 +Author: Jenkins +Date: Tue Nov 8 20:07:44 2011 +0000 + + Merge "Bug #887236: - Changes to allow extensions to be configured. - Introduced a new property that holds list of extensions that are to be enabled." + +commit 9e4dee8dd60b3b8d5edc9a10a2364e14eca98052 +Author: Yogeshwar Srikrishnan +Date: Mon Nov 7 12:18:18 2011 -0600 + + Bug #887236: + - Changes to allow extensions to be configured. + - Introduced a new property that holds list of extensions that are to be enabled. + + Change-Id: If66f1d9266e075f08c197dd7aa4f0ef9226772c9 + + etc/keystone.conf | 3 + + keystone/backends/sqlalchemy/api/tenant.py | 1 + + keystone/contrib/extensions/__init__.py | 44 ++++++ + keystone/contrib/extensions/admin/__init__.py | 29 ++-- + .../contrib/extensions/admin/osksadm/__init__.py | 149 +++++++++++++++++++++ + .../extensions/admin/osksadm/extension_handler.py | 149 --------------------- + .../extensions/admin/oskscatalog/__init__.py | 63 +++++++++ + .../admin/oskscatalog/extension_handler.py | 63 --------- + keystone/routers/admin.py | 2 +- + keystone/test/etc/ldap.conf.template | 1 + + keystone/test/etc/memcache.conf.template | 1 + + keystone/test/etc/sql.conf.template | 1 + + 12 files changed, 283 insertions(+), 223 deletions(-) + +commit 8a33ab183f9bee7d3304e298204712c73b8b3049 +Merge: 3212101 44a07fd +Author: termie +Date: Mon Nov 7 19:27:44 2011 -0800 + + Merge branch 'novaclient' + +commit 32121019dcf5448070942752f633eab3db5559ff +Author: termie +Date: Fri Nov 4 15:56:17 2011 -0700 + + add crud info to readme + + README.rst | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 44a07fd887e6ae46a5fca2958dc776979338c2c6 +Author: termie +Date: Mon Nov 7 19:26:39 2011 -0800 + + get novaclient tests working + + tests/keystoneclient_compat_master.conf | 9 ++++++--- + tests/test_novaclient_compat.py | 17 +++++++++++------ + 2 files changed, 17 insertions(+), 9 deletions(-) + +commit 3439a776534a90fc0a5ad3414b115ac1aee04c12 +Author: termie +Date: Mon Nov 7 14:54:50 2011 -0800 + + add novaclient, intermediate + + run_tests.py | 4 +- + tests/test_keystoneclient_compat.py | 1 + + tests/test_novaclient_compat.py | 75 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 79 insertions(+), 1 deletion(-) + +commit 2bc437609d0ab1faa2e474f5710665fc427f74f9 +Author: termie +Date: Mon Nov 7 14:34:13 2011 -0800 + + add run_tests.sh and pep8 stuff + + bin/keystone | 4 +- + keystonelight/backends/kvs.py | 1 - + keystonelight/backends/templated.py | 7 - + keystonelight/identity.py | 3 +- + keystonelight/service.py | 3 +- + keystonelight/test.py | 2 - + keystonelight/utils.py | 1 + + keystonelight/wsgi.py | 55 ------ + run_tests.py | 360 ++++++++++++++++++++++++++++++++++++ + run_tests.sh | 153 +++++++++++++++ + tools/install_venv.py | 132 +++++++++++++ + tools/pip-requires-test | 12 ++ + tools/with_venv.sh | 4 + + 13 files changed, 669 insertions(+), 68 deletions(-) + +commit d17e1cf533e72d0912eeed76c133357da4b60123 +Author: termie +Date: Mon Nov 7 14:13:35 2011 -0800 + + remove italics on Light + + README.rst | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 29e4e54ce31292becc28d14012c09972efa70404 +Author: termie +Date: Mon Nov 7 14:11:27 2011 -0800 + + modify requirements + + README.rst | 1 + + keystonelight/wsgi.py | 4 ---- + tools/pip-requires | 1 - + tools/pip-requires-test | 2 ++ + 4 files changed, 3 insertions(+), 5 deletions(-) + +commit c2ac84e4ca72c1ceddfd982a39b508d0a982b5c6 +Merge: 6cb7e6c 002ae33 +Author: termie +Date: Mon Nov 7 10:59:54 2011 -0800 + + Merge branch 'master' of github.com:termie/keystonelight + +commit 6cb7e6cb337844ecd265727302108354becadccb +Author: termie +Date: Mon Nov 7 10:38:40 2011 -0800 + + link diagrams + + README.rst | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 882e0154cebab9760dadea9706920857cdddd4a2 +Author: Dolph Mathews +Date: Fri Oct 28 09:30:56 2011 -0500 + + Track post-Diablo database evolution using migrations (BP: database-migrations) + + - Added SQLAlchemy Migrations as a dependency (pip install sqlalchemy-migrate) + - Added empty migration repo + - Made migration manage.py executable + - Added initial migration matching diablo-tagged release + - Added incremental migrations to catch up to trunk + - Added usage docs for contributors + - Added doc that explains how to migrate. + + Change-Id: I4fa8f930645ac6b7f82d0472361fe114b71bb489 + + .gitignore | 1 + + doc/source/index.rst | 1 + + doc/source/migration.rst | 35 ++++ + doc/source/testing.rst | 27 +++ + keystone/backends/sqlalchemy/migrate_repo/README | 4 + + .../backends/sqlalchemy/migrate_repo/__init__.py | 0 + .../backends/sqlalchemy/migrate_repo/manage.py | 3 + + .../backends/sqlalchemy/migrate_repo/migrate.cfg | 20 +++ + .../migrate_repo/versions/001_initial_migration.py | 196 +++++++++++++++++++++ + .../versions/002_rename_token_table.py | 24 +++ + .../versions/003_add_endpoint_template_versions.py | 64 +++++++ + .../sqlalchemy/migrate_repo/versions/__init__.py | 0 + tools/pip-requires | 1 + + 13 files changed, 376 insertions(+) + +commit 227f569be4382fce4df9bcb64f739a744c9f6b26 +Merge: 821753a d63875b +Author: Jenkins +Date: Mon Nov 7 16:43:34 2011 +0000 + + Merge "Use TENANT_ID instead of TENANT for project_id" + +commit 821753a648b8738a432a61213a9d0c96230e83ca +Author: Ziad Sawalha +Date: Mon Nov 7 09:13:09 2011 -0600 + + Changed blatant hack (fixed spelling also) to 5 second timout as tests were not completing + + Change-Id: I65de480b0cc2f55453808ad5755421f5ff932fa8 + + keystone/test/__init__.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d63875b45bff3951097da815de1f097fbfd132e2 +Author: Vishvananda Ishaya +Date: Sat Nov 5 17:29:21 2011 -0700 + + Use TENANT_ID instead of TENANT for project_id + + Change-Id: Ia35dd1d1041a8a9f14e4f54e2483d3af9c847904 + Cc: stable-maintainers + + keystone/middleware/nova_keystone_context.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 96f2fc18ee2bb562e99cb966d33758b929ec2c60 +Author: Liem Nguyen +Date: Thu Oct 20 15:54:58 2011 -0700 + + X.509 client authentication with Keystone. Implements blueprint 2-way-ssl + + Change-Id: I5648acb8980782d2f1f932ee4947dd2deb490de5 + + bin/keystone | 38 ++++++++++---- + doc/source/ssl.rst | 86 ++++++++++++++++++++++++++++++++ + etc/keystone.conf | 22 ++++++++ + examples/echo/echo/echo.ini | 7 +++ + examples/echo/echo_client.py | 26 +++++++--- + examples/ssl/certs/ca.pem | 22 ++++++++ + examples/ssl/certs/keystone.pem | 62 +++++++++++++++++++++++ + examples/ssl/certs/middleware-key.pem | 77 ++++++++++++++++++++++++++++ + examples/ssl/private/cakey.pem | 18 +++++++ + examples/ssl/private/keystonekey.pem | 15 ++++++ + keystone/client.py | 16 ++++-- + keystone/common/bufferedhttp.py | 28 +++++------ + keystone/common/wsgi.py | 19 +++++++ + keystone/middleware/auth_token.py | 34 ++++--------- + keystone/test/__init__.py | 14 ++++-- + keystone/test/etc/ldap.conf.template | 2 + + keystone/test/etc/memcache.conf.template | 2 + + keystone/test/etc/sql.conf.template | 2 + + keystone/test/etc/ssl.conf.template | 55 ++++++++++++++++++++ + keystone/test/functional/common.py | 19 +++++-- + keystone/test/functional/test_client.py | 9 +++- + run_tests.py | 7 +++ + run_tests.sh | 2 +- + 23 files changed, 513 insertions(+), 69 deletions(-) + +commit 002ae338be2d9dd8ba742e322bd97c732f3e0e60 +Author: termie +Date: Fri Nov 4 15:17:18 2011 -0700 + + whitespace + + keystonelight/backends/kvs.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit 344d21ca699eb87c7fa9086c67a43758d60db8bf +Author: termie +Date: Thu Nov 3 14:48:50 2011 -0700 + + added catalog tests + + keystonelight/backends/kvs.py | 5 +++-- + tests/test_backend_kvs.py | 25 +++++++++++++++++++++++++ + 2 files changed, 28 insertions(+), 2 deletions(-) + +commit f86bf25f3275a43d438409ffb4213beb70ecc673 +Author: termie +Date: Thu Nov 3 14:41:21 2011 -0700 + + added tests for tokens + + keystonelight/backends/kvs.py | 4 ++++ + tests/test_backend_kvs.py | 22 ++++++++++++++++++++++ + 2 files changed, 26 insertions(+) + +commit 3f0137aeaea9f9832fc43d86e159cf2131893eec +Author: termie +Date: Thu Nov 3 14:32:48 2011 -0700 + + test the other methods too + + tests/test_backend_kvs.py | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +commit 912c2227031f4da30ffb04b6daa9349951bb3c11 +Author: termie +Date: Thu Nov 3 14:24:51 2011 -0700 + + add some tests and get others to pass + + keystonelight/backends/kvs.py | 9 +++++---- + keystonelight/test.py | 19 ++++++++++++------- + tests/test_backend_kvs.py | 22 ++++++++++++++++++++-- + 3 files changed, 37 insertions(+), 13 deletions(-) + +commit 4c8a5ac747aa6165bfa1a3f30e93491f0cda730a +Author: termie +Date: Thu Nov 3 14:11:36 2011 -0700 + + add some failing tests + + keystonelight/backends/kvs.py | 8 ++++++++ + tests/test_backend_kvs.py | 46 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 54 insertions(+) + +commit b514897be6fc1334b7cfc4d29137563286c2912c +Author: termie +Date: Thu Nov 3 14:10:13 2011 -0700 + + add a default conf + + keystonelight/service.py | 5 +++++ + tests/default.conf | 19 +++++++++++++++++++ + 2 files changed, 24 insertions(+) + +commit 4b48845c221839efd6a22b11fb498ece2bfebbc2 +Author: termie +Date: Thu Nov 3 14:09:17 2011 -0700 + + minor whitespace cleanup + + keystonelight/keystone_compat.py | 1 - + 1 file changed, 1 deletion(-) + +commit f8ec4f6d6a307d21cd9c8d6a6ab7ebfdf7897173 +Author: termie +Date: Thu Nov 3 14:08:38 2011 -0700 + + add some todo + + README.rst | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 37ff5b68836b09848ce2213eca961402e99c8d8c +Author: Yun Mao +Date: Fri Oct 28 16:44:31 2011 -0400 + + fixed the output message error on granting user a role + + Change-Id: Ieb32aeac68c1c920b6a0c9a6d738bf45f3882366 + + keystone/manage/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6b464d58a68fc54f55349c06b5f5d5228d7dbc59 +Merge: 11f01b6 c312c25 +Author: Jenkins +Date: Thu Nov 3 20:24:24 2011 +0000 + + Merge "Bug #884930 Support/Remove additional calls for for Tenant. - Supported call to get users for a tenant for a specific role. - Removed calls to get specific role for a user and to get all the roles for a specific tenant as they are not useful. - Fixed LDAP backend call to get users for a tenant. - Disabling Invalid pylint check." + +commit c312c25ab486313f024a3a517d6082d4a3d98341 +Author: Yogeshwar Srikrishnan +Date: Tue Nov 1 17:15:22 2011 -0500 + + Bug #884930 Support/Remove additional calls for for Tenant. + - Supported call to get users for a tenant for a specific role. + - Removed calls to get specific role for a user and to get + all the roles for a specific tenant as they are not useful. + - Fixed LDAP backend call to get users for a tenant. + - Disabling Invalid pylint check. + + Change-Id: I8c9dbc206d06a55e5c5ddc1163680103563eacc4 + + keystone/backends/api.py | 5 +- + keystone/backends/ldap/api/tenant.py | 17 ++++-- + keystone/backends/ldap/api/user.py | 9 ++-- + keystone/backends/sqlalchemy/api/user.py | 59 +++++++++++--------- + keystone/content/admin/OS-KSADM-admin.wadl | 53 ------------------ + keystone/controllers/user.py | 3 +- + keystone/logic/service.py | 12 +++-- + keystone/test/functional/common.py | 15 ++++-- + keystone/test/functional/test_tenants.py | 87 ++++++++++++++++++++++++++++++ + 9 files changed, 162 insertions(+), 98 deletions(-) + +commit 11f01b6c2305903847ccb39490fb1b1c2d104629 +Merge: bc8a02b 6de9786 +Author: Jenkins +Date: Thu Nov 3 19:33:05 2011 +0000 + + Merge "adding in doc and setup to cover existing scripts adding doc around credentials command usage (for EC2)" + +commit bc8a02b2e3b457122e51c052f46b688dca7f02ec +Author: Joe Heck +Date: Wed Nov 2 05:53:27 2011 -0700 + + adding docs to test classes, + updating run_tests.sh to match reality + adding debug middleware factory + adding docs on enabling debug middleware + resolving pep8 issues + + blueprint keystone-documentation + + Change-Id: If16e908f21082bab770b19e1aa384fccc7ee5643 + + doc/source/developing.rst | 139 +++++++++++++++++++++++++++++++++++++ + doc/source/index.rst | 1 + + etc/keystone.conf | 9 ++- + keystone/common/wsgi.py | 8 +++ + keystone/test/__init__.py | 12 ++++ + keystone/test/functional/common.py | 49 +++++++++++-- + run_tests.py | 3 + + run_tests.sh | 16 ++--- + 8 files changed, 217 insertions(+), 20 deletions(-) + +commit 626250c5772c1b8f66cef37f57aa71af11c80d00 +Merge: fafb411 68c0f1c +Author: Jenkins +Date: Thu Nov 3 03:25:32 2011 +0000 + + Merge "bug 885364" + +commit fafb4110194f15793723291f058d6d3924369eca +Author: Ziad Sawalha +Date: Wed Nov 2 22:13:41 2011 -0500 + + Fixes LP Bug#885434 - Documentation showing multiple tenants misleading + + While the Keystone API Spec supports multiple tenants, the Keystone + implementation does not. The samples have been simplified to show + only one tenant returned. + + Change-Id: I6aecb603cab83a4fb987a2cdaddbd366443615ec + + keystone/content/common/samples/auth.json | 78 ++++++++++++++++--------------- + keystone/content/common/samples/auth.xml | 78 +++++++++++++++---------------- + 2 files changed, 79 insertions(+), 77 deletions(-) + +commit d3cc7983a168366cd262accec3cfc98f74317836 +Author: termie +Date: Wed Nov 2 16:43:47 2011 -0700 + + add example + + README.rst | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 1d1db0f7c0ae338463a6b56cf17580322587e849 +Author: termie +Date: Wed Nov 2 16:41:01 2011 -0700 + + rst blah blah + + README.rst | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 169c4fb8c0cfcb0e03dc6208715e8ea21c9dd0ee +Author: termie +Date: Wed Nov 2 16:39:54 2011 -0700 + + updated readme + + README.rst | 87 +++++++++++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 69 insertions(+), 18 deletions(-) + +commit 0d4e11c48a9082ccc6c56aee2643c87f28367634 +Author: termie +Date: Wed Nov 2 15:04:01 2011 -0700 + + authenticate and tenants working + + keystonelight/backends/templated.py | 4 ++++ + keystonelight/test.py | 21 +++++++++++++++++++-- + keystonelight/wsgi.py | 1 + + tests/keystoneclient_compat_master.conf | 6 +++--- + tests/test_keystoneclient_compat.py | 15 +++++++++++++-- + 5 files changed, 40 insertions(+), 7 deletions(-) + +commit 2f2465eafa483c1ce365bef01e56211788c8c29d +Author: termie +Date: Wed Nov 2 14:28:28 2011 -0700 + + working authenticate in keystoneclient + + keystonelight/identity.py | 3 +++ + keystonelight/keystone_compat.py | 32 ++++++++++++++++++++++++-------- + tests/keystoneclient_compat_master.conf | 1 + + 3 files changed, 28 insertions(+), 8 deletions(-) + +commit 3caf2a8db462c512f25b76f0074113daa0bbb7e3 +Author: termie +Date: Wed Nov 2 14:07:56 2011 -0700 + + remove test_keystone_compat's catalog tests + + the sample data is clearly insane + + keystonelight/backends/templated.py | 1 - + keystonelight/keystone_compat.py | 38 ++++++++++++++++++++++++++++++++++++- + tests/test_keystone_compat.py | 19 +++++++++++-------- + tests/test_keystoneclient_compat.py | 2 +- + 4 files changed, 49 insertions(+), 11 deletions(-) + +commit 4ba33be08e2ef24f61ec9a840df3f28cdb569818 +Author: termie +Date: Wed Nov 2 13:35:27 2011 -0700 + + add templated catalog backend + + Fix a few other issues, and adds passive aggressive comments and + documentation. + + keystonelight/backends/templated.py | 81 +++++++++++++++++++++++++++++++++ + keystonelight/keystone_compat.py | 5 +- + keystonelight/test.py | 9 ++++ + tests/keystone_compat_diablo.conf | 3 +- + tests/keystoneclient_compat_master.conf | 31 +++++++++++++ + tests/test_keystone_compat.py | 11 ++++- + tests/test_keystoneclient_compat.py | 11 +++-- + 7 files changed, 142 insertions(+), 9 deletions(-) + +commit 4d774dbdbf68b8e6ac267e6b2db359d4a7b49aff +Author: Thierry Carrez +Date: Wed Nov 2 15:33:14 2011 -0400 + + Use pure version number ("2012.1") in tarball name + + Makes setup.py use a canonical_version() function that returns the pure + (final) version number. That version number is used in tarball name and + as the main tarball directory. This brings Keystone in line with the + other core projects and needs to be in before Essex-1 delivery. + + Change-Id: I8adb45ccc619a9a77d7a4da013d7cc9cf6277f86 + + AUTHORS | 1 + + keystone/__init__.py | 4 ++++ + setup.py | 2 +- + 3 files changed, 6 insertions(+), 1 deletion(-) + +commit 647f6a91f2026b9ab77ee92605d65cd5c23b361d +Merge: f3e7c59 700e2db +Author: Jenkins +Date: Wed Nov 2 19:43:23 2011 +0000 + + Merge "Set run_tests.sh so pep8 runs in the virtualenv." + +commit f3e7c59dabdaaf66f82725f13562e18b163264ab +Merge: bbf4540 5cf7358 +Author: Jenkins +Date: Wed Nov 2 19:04:29 2011 +0000 + + Merge "bug:884518 Changes to support passwordcredentials calls as per API contract. Minor LDAP code change to support tests." + +commit 700e2db3f9c5fb882c10e48738dda3cd6a0dde2e +Author: Justin Shepherd +Date: Wed Nov 2 14:02:09 2011 -0500 + + Set run_tests.sh so pep8 runs in the virtualenv. + + fixes bug 885380 + + Change-Id: I95af25bd230452c1e4d30ebcd29ef98d211f6824 + + run_tests.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 68c0f1c4ab18608c0705593f38646e287b68171e +Author: Justin Shepherd +Date: Wed Nov 2 13:38:56 2011 -0500 + + bug 885364 + + fixed 2 errors in self.assertRaises calls + + Change-Id: Ic31347348b6e4e5b769d2e09fe3a11f95642e824 + + AUTHORS | 1 + + keystone/test/functional/test_client.py | 8 ++++---- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit 5cf73585402a5b3aa071ea7059d95a248c2a0761 +Author: Yogeshwar Srikrishnan +Date: Mon Oct 31 18:32:30 2011 -0500 + + bug:884518 Changes to support passwordcredentials calls as per API contract. + Minor LDAP code change to support tests. + + Change-Id: I3136e186c146fcf51d0a7b250d4c04342b11ba20 + + keystone/backends/ldap/api/base.py | 5 +- + .../extensions/admin/osksadm/extension_handler.py | 26 +++ + keystone/controllers/credentials.py | 46 +++++ + keystone/logic/service.py | 76 +++++++- + keystone/logic/types/credential.py | 119 +++++++++++ + keystone/test/functional/common.py | 63 ++++++ + keystone/test/functional/test_credentials.py | 217 +++++++++++++++++++++ + 7 files changed, 550 insertions(+), 2 deletions(-) + +commit bbf4540268657d04d470352081476727ffde464c +Author: Dolph Mathews +Date: Tue Nov 1 20:18:05 2011 -0500 + + Fixed spelling of 'Resources' (Resoruces) + + Change-Id: Ibbe321a9ef52c32e4d704509798ba3ba1b88d8a2 + + keystone/content/admin/OS-KSADM-admin.wadl | 2 +- + keystone/content/admin/OS-KSCATALOG-admin.wadl | 2 +- + keystone/content/admin/OS-KSEC2-admin.wadl | 2 +- + keystone/content/admin/RAX-KSGRP-admin.wadl | 4 ++-- + keystone/content/admin/RAX-KSKEY-admin.wadl | 2 +- + keystone/content/admin/RAX-KSQA-admin.wadl | 2 +- + keystone/content/admin/identity-admin.wadl | 2 +- + keystone/content/service/identity.wadl | 2 +- + 8 files changed, 9 insertions(+), 9 deletions(-) + +commit ad0a759b394090ad023220acb16a225ba8b89cbd +Author: Joe Heck +Date: Mon Oct 31 11:56:41 2011 -0700 + + pep8 cleanup + + Change-Id: Ib6d1d9250b7e566c89486e2ec258ac99d4c77698 + + bin/keystone | 2 +- + bin/keystone-admin | 2 +- + bin/keystone-auth | 2 +- + bin/keystone-import | 5 +++-- + examples/echo/echo_client.py | 3 ++- + 5 files changed, 8 insertions(+), 6 deletions(-) + +commit 2ac753edfd662d0e5a24531f47c8f16feab16de8 +Author: termie +Date: Mon Oct 31 11:52:37 2011 -0700 + + everything but the catalog + + keystonelight/backends/kvs.py | 4 ++++ + keystonelight/identity.py | 3 +++ + keystonelight/keystone_compat.py | 12 +++++++++--- + keystonelight/service.py | 1 - + keystonelight/test.py | 6 ++++++ + tests/keystone_compat_diablo.conf | 2 ++ + tests/test_keystoneclient_compat.py | 26 ++++++++++++++++++++++++++ + 7 files changed, 50 insertions(+), 4 deletions(-) + +commit 576f2da4ae2be29df72c276f609563c6ddf41e12 +Author: Julien Danjou +Date: Mon Oct 31 10:50:00 2011 +0100 + + Remove execute bit on keystone.conf + + Change-Id: Ic419c950b87cdb512628f9be35e35279ef4e6845 + Signed-off-by: Julien Danjou + + etc/keystone.conf | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit edad18da84e8829e8f09be591e1f7dde000edfa0 +Merge: b21d8e0 afb2bf1 +Author: Jenkins +Date: Fri Oct 28 22:06:46 2011 +0000 + + Merge "fixing search sequence to not include directory structure from os.walk()" + +commit b21d8e03c507f58aab32dce671cd9cdb6c136d6d +Merge: 9655cde 8bd9225 +Author: Jenkins +Date: Fri Oct 28 22:04:57 2011 +0000 + + Merge "Adding the concept of creating a Keystone HTTP client in Python which can be used in Keystone and imported from Keystone to allow for easier Keystone integration." + +commit 9655cde434deb633a761d2ece6324d2a3bbb60f9 +Merge: 043715e ac9e400 +Author: Jenkins +Date: Fri Oct 28 20:56:38 2011 +0000 + + Merge "Fixes LP882760.Changes to return TenantId properly as part of roles.Additional tests to support the same." + +commit ac9e400de98e198d37591bfd7a08da2a7b3aa45c +Author: Yogeshwar Srikrishnan +Date: Fri Oct 28 13:49:33 2011 -0500 + + Fixes LP882760.Changes to return TenantId properly as part of roles.Additional tests to support the same. + + Change-Id: Iffc005a87dfa0ac36802d8f1f3cfed5dba337366 + + keystone/logic/service.py | 4 ++-- + keystone/test/functional/test_auth.py | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 043715e95cd206ddef2d3f23bb4d183359bf1784 +Author: Dolph Mathews +Date: Wed Oct 26 10:54:41 2011 -0500 + + Moving contributor docs into rst (bug #843056) + + - Added "Setting up a development environment" doc + - Removed related info from pip-requires & project README + - Added "Testing" doc + - Removed related info from project README + - Also removed contributor doc build info from project README (bug #843056) + - Updated version string to '2012.1-dev' + + Change-Id: I58c79acd91dc391e3fa85911d09f74ad54d9d444 + + README.md | 51 +-------- + doc/source/community.rst | 19 +++- + doc/source/configuration.rst | 259 +++++++++++++++++++++++++++++++++++++++++++ + doc/source/configuring.rst | 259 ------------------------------------------- + doc/source/index.rst | 60 +++++----- + doc/source/installing.rst | 155 -------------------------- + doc/source/setup.rst | 132 ++++++++++++++++++++++ + doc/source/testing.rst | 62 +++++++++++ + keystone/__init__.py | 2 +- + tools/pip-requires | 5 +- + 10 files changed, 498 insertions(+), 506 deletions(-) + +commit afb2bf1068ed3b5884dc9689c25708b8780a0f91 +Author: Joe Heck +Date: Thu Oct 27 13:51:06 2011 -0700 + + fixing search sequence to not include directory structure from os.walk() + + Change-Id: Id2763e224671c0dc75bbb00feb7318205192eae8 + + doc/generate_autodoc_index.py | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit 3c1ae8bc1838f202a12667a9c669baf281629f06 +Merge: 5639a41 2b4e9ed +Author: Jenkins +Date: Thu Oct 27 19:48:53 2011 +0000 + + Merge "bug lp:865448 change abspath to dirname in controllers/version.py to correct path problems." + +commit 5639a4168e3c0801bad9f2425541f55a24808b6b +Author: Yogeshwar Srikrishnan +Date: Thu Oct 27 00:24:10 2011 -0500 + + bug lp:882371 Standardize Json pagination structures. + + Change-Id: I714e391f7bb3800d9cd314357b21d0449ff46a15 + + keystone/logic/types/role.py | 2 +- + keystone/logic/types/tenant.py | 2 +- + keystone/logic/types/user.py | 2 +- + keystone/test/functional/test_auth.py | 2 +- + keystone/test/functional/test_roles.py | 8 ++++---- + keystone/test/functional/test_tenants.py | 2 +- + 6 files changed, 9 insertions(+), 9 deletions(-) + +commit 583e3c93e134ce05b32bedaf039e9da7ab2d3146 +Author: termie +Date: Wed Oct 26 17:01:11 2011 -0700 + + get a checkout of keystoneclient + + keystonelight/backends/kvs.py | 7 +++---- + keystonelight/logging.py | 30 ++++++++++++++++++++++++++- + keystonelight/test.py | 35 +++++++++++++++++++++++++++++++ + keystonelight/utils.py | 3 ++- + tests/test_keystone_compat.py | 22 ++++---------------- + tests/test_keystoneclient_compat.py | 41 +++++++++++++++++++++++++++++++++++++ + 6 files changed, 114 insertions(+), 24 deletions(-) + +commit 779a74c72514524d4aadc314d927ea5c5cc34705 +Merge: 6fc3e76 f09d84a +Author: Jenkins +Date: Thu Oct 27 00:01:07 2011 +0000 + + Merge "bug lp:882233 Code changes to support API calls to fetch services/roles by name." + +commit f09d84a0ef528cf50503f7e9bdc77c049b2b5bba +Author: Yogeshwar Srikrishnan +Date: Wed Oct 26 15:09:22 2011 -0500 + + bug lp:882233 Code changes to support API calls to fetch services/roles by name. + + Change-Id: Iac3687940c3dac6e0d4924ff9dc7cf50d1f31e74 + + keystone/content/admin/OS-KSADM-admin.wadl | 71 +++++++++++++++++++++++++++--- + keystone/controllers/roles.py | 14 ++++-- + keystone/controllers/services.py | 14 ++++-- + keystone/logic/service.py | 16 +++++++ + keystone/test/functional/common.py | 18 ++++++++ + keystone/test/functional/test_roles.py | 68 ++++++++++++++++++++++++++++ + keystone/test/functional/test_services.py | 43 ++++++++++++++++++ + 7 files changed, 229 insertions(+), 15 deletions(-) + +commit 6fc3e76f09e3de595d4cace909c874b48eead9a5 +Author: Dolph Mathews +Date: Wed Oct 26 10:54:41 2011 -0500 + + Removed contributor doc build info from project README (bug #843056) + + Change-Id: I4a427284ebdaa104a89435945bbe88f3bf4d6299 + + README.md | 12 +----------- + doc/README.rst | 16 ++++++++++++---- + 2 files changed, 13 insertions(+), 15 deletions(-) + +commit cf803ba266438338947e080332ba680209cab786 +Author: Dolph Mathews +Date: Wed Oct 26 10:14:44 2011 -0500 + + Revised documentation build process (bug #843056) + + - Manual method now produces docs in the same location as setup.py + - Added manual command to build man pages + - Manual method is now executable from the project root + - To conform with similar commands + - Generated sourcecode rst's are now ignored by git + - Removed unused gitignore entries related to docs + + Change-Id: I86fb38cdee957f5ba6717e1438494c7a148f4855 + + .gitignore | 3 +-- + doc/README.rst | 28 ++++++++++++++-------------- + doc/generate_autodoc_index.py | 13 ++++++++----- + 3 files changed, 23 insertions(+), 21 deletions(-) + +commit c18c093573975e0ac29276acc7ef1f6f40c4f91f +Author: Joe Heck +Date: Tue Oct 25 10:03:31 2011 -0700 + + updates to keystone documentation - install & conf + bug 843056 + blueprint keystone-documentation + + Change-Id: I34004c8b75bc2c593d959af155b2749c09c2276d + + doc/source/conf.py | 4 +- + doc/source/configuring.rst | 259 ++++++++++++++++++++++++++++++++++++++ + doc/source/gettingstarted.rst | 66 ---------- + doc/source/index.rst | 44 ++++--- + doc/source/installing.rst | 202 +++-------------------------- + doc/source/man/keystonemanage.rst | 16 +-- + doc/source/usingkeystone.rst | 28 +++++ + 7 files changed, 347 insertions(+), 272 deletions(-) + +commit bd2e4e8f1d078934ed68f6bb4c9d62123fd7a725 +Author: Dolph Mathews +Date: Mon Oct 24 20:24:29 2011 -0500 + + Specific LDAP version causing hiccups installing on latest ubuntu & fedora + + Change-Id: I457a40444918e6628b3c38caeb2cee822303df32 + + tools/pip-requires | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8bd9225b4e0594259c59dc007a3f7d7de2591dc8 +Author: Brian Lamar +Date: Thu Oct 20 23:58:36 2011 -0400 + + Adding the concept of creating a Keystone HTTP client in Python which can be + used in Keystone and imported from Keystone to allow for easier Keystone + integration. + + Currently this client is only v2.0. One client for dealing with the Service + API and one client for dealing with the Admin API. + + Tests included. + + Change-Id: I1ea74c105e1f641a8ee96de7573c93dffba2e17a + + keystone/client.py | 181 ++++++++++++++++++++++++++++++++ + keystone/common/exception.py | 4 + + keystone/test/functional/test_client.py | 88 ++++++++++++++++ + 3 files changed, 273 insertions(+) + +commit 381e2abf144139167591b05d05fe571a50b1a9a9 +Author: James E. Blair +Date: Thu Oct 20 13:47:35 2011 -0400 + + Add .gitreview config file for gerrit. + + Change-Id: I1cd78d9d39eb911e319a8564fc6f24b8afb2de5a + + .gitreview | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 024e9ae397f0b1efb4fef1b092b8ac556abe39e9 +Merge: 135b61b 20c2adb +Author: Jenkins +Date: Mon Oct 24 15:08:05 2011 +0000 + + Merge "updating keystone developer documentation updating docstrings to remove errors in automodule generation updating setup.py to generate source documentation blueprint keystone-documentation bug 843056" + +commit 20c2adb9acdc5a16c4e0234eb9f4708292a30bec +Author: Joe Heck +Date: Thu Oct 20 17:06:44 2011 -0700 + + updating keystone developer documentation + updating docstrings to remove errors in automodule generation + updating setup.py to generate source documentation + blueprint keystone-documentation + bug 843056 + + Change-Id: Ie8dfedc89c1a6d9ffa5106d29dd19837b02746ce + + doc/README.rst | 30 ++++ + doc/generate_autodoc_index.py | 57 +++++++ + doc/source/architecture.rst | 78 +++++++++ + doc/source/conf.py | 1 + + doc/source/gettingstarted.rst | 2 +- + doc/source/index.rst | 28 +++- + doc/source/installing.rst | 183 +++++++++++++++++++++ + doc/source/keystone.conf.rst | 107 +++++++++++++ + doc/source/man/keystonemanage.rst | 184 ++++++++++++++++++++-- + doc/source/nova-api-paste.rst | 148 +++++++++++++++++ + keystone/backends/ldap/fakeldap.py | 8 +- + keystone/common/config.py | 34 ++-- + keystone/contrib/extensions/service/raxgrp/api.py | 2 +- + keystone/middleware/auth_basic.py | 9 +- + keystone/middleware/auth_token.py | 56 ++++--- + keystone/middleware/remoteauth.py | 41 +++-- + keystone/server.py | 41 +++-- + keystone/test/functional/common.py | 10 +- + keystone/test/unit/base.py | 8 +- + setup.py | 8 +- + 20 files changed, 935 insertions(+), 100 deletions(-) + +commit 135b61b0ac6eb9466f49b7ca71e0f2be1117b33f +Author: Yogeshwar Srikrishnan +Date: Fri Oct 21 16:34:01 2011 -0500 + + Changes to support getuser by name and gettenant by name calls. + + Change-Id: Iac15fdd7588b383e04d5eb0fc6d3a48d9cb7e2e3 + + keystone/controllers/tenant.py | 15 +++++++++++---- + keystone/controllers/user.py | 15 +++++++++++---- + keystone/logic/service.py | 16 ++++++++++++++++ + keystone/test/functional/common.py | 14 ++++++++++++-- + keystone/test/functional/test_tenants.py | 22 ++++++++++++++++++++++ + 5 files changed, 72 insertions(+), 10 deletions(-) + +commit 47529ee1953a16be775094f0ca38a0aa6f183af9 +Author: Yogeshwar Srikrishnan +Date: Fri Oct 21 15:02:07 2011 -0500 + + Changes to support get endpoints for token call. + + Change-Id: Iee4625eb1fae04f31d977bb024fa84ea03c5b98d + + keystone/controllers/auth.py | 10 +++-- + keystone/logic/service.py | 21 +++++---- + keystone/logic/types/endpoint.py | 14 ++++-- + keystone/test/functional/common.py | 7 +++ + keystone/test/functional/test_endpoints.py | 68 ++++++++++++++++++++++++++++++ + 5 files changed, 101 insertions(+), 19 deletions(-) + +commit 6e1955482252011bc61c6e55f83e7dc6feb45ac7 +Merge: a57d56e 611df27 +Author: Jenkins +Date: Fri Oct 21 15:07:55 2011 +0000 + + Merge "Additional changes to support endpointtemplates operations.Disabling pylint msgs that dont fit." + +commit 611df2752f4380d57e36c55f00f733b9182b0b12 +Author: Yogeshwar Srikrishnan +Date: Thu Oct 20 17:09:46 2011 -0500 + + Additional changes to support endpointtemplates operations.Disabling pylint + msgs that dont fit. + + Change-Id: Iad246e58a21fa6543f92fd6268d939ea65e8451e + + keystone/backends/api.py | 3 ++ + keystone/backends/sqlalchemy/api/role.py | 1 + + keystone/backends/sqlalchemy/api/service.py | 9 ++++ + keystone/content/common/xsd/OS-KSADM.xsd | 1 + + keystone/logic/service.py | 58 +++++++++++++------- + keystone/logic/types/endpoint.py | 54 ++++++++++++------- + keystone/test/functional/common.py | 17 +++--- + keystone/test/functional/test_authentication.py | 3 +- + keystone/test/functional/test_endpoints.py | 71 ++++++++++++++++--------- + keystone/test/functional/test_services.py | 4 +- + 10 files changed, 150 insertions(+), 71 deletions(-) + +commit a57d56e9cfd1c58a9ea34ec8b01449e5467c0283 +Author: Dolph Mathews +Date: Thu Oct 20 15:53:44 2011 -0500 + + Github markdown doens't seem to like irc:// links + + Change-Id: I00dca6ba19dfe741de6524ef232453fdfd5debdf + + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1a408bbcc52cf359167f5071f77b2c6afd1f7c72 +Author: Dolph Mathews +Date: Thu Oct 20 13:22:13 2011 -0500 + + Removed 'under construction' docs provided elsewhere + + Change-Id: Ia1017cc4597220718741c3c3bcf518e9e71ab979 + + doc/source/gettingstarted.rst | 43 +++++++++++++++++++++---------------------- + doc/source/groups.rst | 19 ------------------- + doc/source/index.rst | 24 ++++++++---------------- + doc/source/roles.rst | 19 ------------------- + doc/source/tenants.rst | 19 ------------------- + doc/source/users.rst | 19 ------------------- + 6 files changed, 29 insertions(+), 114 deletions(-) + +commit 4b30f08fdb1d5354747997bea1cd9558b1f4ca2e +Author: Dolph Mathews +Date: Thu Oct 20 13:22:13 2011 -0500 + + Updated self-documentation to point to docs.openstack.org + + Change-Id: Ib92cb08abaead1578218ff52bc86d89b30cefa76 + + keystone/content/admin/version.json.tpl | 13 +++++++++---- + keystone/content/admin/version.xml.tpl | 12 ++++++++---- + keystone/content/service/version.json.tpl | 7 ++++++- + keystone/content/service/version.xml.tpl | 12 ++++++++---- + 4 files changed, 31 insertions(+), 13 deletions(-) + +commit 8dcd49d8e48122909a262448c0c0ca3337348837 +Author: Dolph Mathews +Date: Thu Oct 20 15:09:45 2011 -0500 + + Revised documentation + + - Eliminated all but 1 Sphinx build warning + - I think the last one is being addressed by bug #878759 + - Pointed contributors to http://keystone.openstack.org/ + + Change-Id: I20c26909034b15d46f78c90582238f44dd859d83 + + README.md | 36 ++++++-- + doc/source/adminAPI_curl_examples.rst | 149 +++++++++++++++++--------------- + doc/source/serviceAPI_curl_examples.rst | 15 ++-- + 3 files changed, 113 insertions(+), 87 deletions(-) + +commit 273e0e798e37974a4548f6a6281df793eea957b1 +Merge: 353a542 aa860e5 +Author: Jenkins +Date: Thu Oct 20 19:40:49 2011 +0000 + + Merge "Refactored version attributes" + +commit 353a542ca3014874f5d99a5dc68796b0c38acfa6 +Author: Yogeshwar Srikrishnan +Date: Thu Oct 20 12:00:21 2011 -0500 + + Changes to endpoint operations as per OSKSCATALOG contract. + Adding couple of pylint fixes. + + Change-Id: I5eecd80f5f2cebaf1e8f7c4aeedf2a9aded02177 + + keystone/backends/api.py | 3 - + keystone/backends/sqlalchemy/api/credentials.py | 2 +- + keystone/controllers/endpointtemplates.py | 2 +- + keystone/logic/service.py | 33 +++++++++-- + keystone/logic/types/endpoint.py | 74 ++++++++++++++++++----- + keystone/test/functional/test_endpoints.py | 79 +++++++++++-------------- + 6 files changed, 124 insertions(+), 69 deletions(-) + +commit aa860e59e67df254e63171238e0a938a03b19395 +Author: Dolph Mathews +Date: Wed Oct 19 14:39:43 2011 -0500 + + Refactored version attributes + + - Promoted the api version status from 'alpha' to 'beta' + - Adopted openstack release names in lieu of arbitrary version #'s + + Change-Id: I23d58fa7417886cceb09d740efa99bc276b435d8 + + keystone/__init__.py | 23 +++++++++++++++-------- + keystone/config.py | 3 +-- + keystone/content/admin/version.json.tpl | 6 +++--- + keystone/content/admin/version.xml.tpl | 2 +- + keystone/content/service/version.json.tpl | 6 +++--- + keystone/content/service/version.xml.tpl | 2 +- + keystone/controllers/version.py | 7 ++++--- + setup.py | 5 ++--- + 8 files changed, 30 insertions(+), 24 deletions(-) + +commit b25c6803c6477e733351af44616a126117956880 +Merge: dd119c7 c3aabe4 +Author: Jenkins +Date: Wed Oct 19 22:10:33 2011 +0000 + + Merge "Changes to support endpointTemplate operations as per new API.Fixed issues with command line manage stuff." + +commit c3aabe4595c6ed79f138dfaefa12c751b5a97050 +Author: Yogeshwar Srikrishnan +Date: Wed Oct 19 16:32:31 2011 -0500 + + Changes to support endpointTemplate operations as per new API.Fixed issues with command line manage stuff. + + Change-Id: Iff495917cc6101aa4d43ab023b96333d29cc1496 + + keystone/backends/sqlalchemy/models.py | 3 + + keystone/logic/service.py | 24 +++++- + keystone/logic/types/endpoint.py | 100 +++++++++++++++++++----- + keystone/manage/__init__.py | 13 ++- + keystone/manage/api.py | 5 +- + keystone/test/functional/common.py | 47 +++++++---- + keystone/test/functional/test_authentication.py | 3 +- + keystone/test/functional/test_endpoints.py | 67 +++++++++++----- + keystone/test/sampledata.py | 3 +- + 9 files changed, 201 insertions(+), 64 deletions(-) + +commit dd119c7a96b867bb2931c3aa9de51994f17b1ccd +Author: Carlos Marin +Date: Tue Oct 18 19:18:56 2011 -0500 + + Updated Secret Q&A to extend CredentialType + + Replaced tabs by spaces. + + Change-Id: Ibeae28f356c43dab04d91c4890ff3d03f6d9debf + + keystone/content/common/xsd/RAX-KSQA-secretQA.xsd | 90 ++++++++++++----------- + 1 file changed, 47 insertions(+), 43 deletions(-) + +commit 8af1a2252a252d4608d9f4086bcad9de73590786 +Merge: c657290 37ff1d6 +Author: Jenkins +Date: Wed Oct 19 15:44:55 2011 +0000 + + Merge "Changes to support API calls as per OS-KSCATALOG extension." + +commit 37ff1d676236aa9fe50b4cacbe0dfd5544ede9a0 +Author: Yogeshwar Srikrishnan +Date: Wed Oct 19 10:38:43 2011 -0500 + + Changes to support API calls as per OS-KSCATALOG extension. + + Change-Id: I087b6f06528e4751d92fd9a98d5dc4d7f4c1c774 + + keystone/contrib/extensions/admin/__init__.py | 5 ++ + .../admin/oskscatalog/extension_handler.py | 63 ++++++++++++++++++++++ + keystone/routers/admin.py | 38 ------------- + keystone/test/functional/common.py | 40 ++++++++------ + 4 files changed, 92 insertions(+), 54 deletions(-) + +commit c6572908946a04fe79d0c9d347a28da77e16f501 +Merge: 4984969 2bb4743 +Author: Jenkins +Date: Wed Oct 19 15:34:08 2011 +0000 + + Merge "Fix issues in the ec2 middleware" + +commit 498496938e77226b01c00bbb9fe4ebc0bdc61211 +Author: Dolph Mathews +Date: Wed Oct 19 09:08:31 2011 -0500 + + Improved CLI error feedback (bug 877504) + + - Renamed 'commands' to 'actions' to avoid confusion + - Fixed: --help not showing usage options + - Fixed: lists of 'objects' and 'actions' were out of date + - They are now generated at runtime + + Change-Id: I055ae6c40d846efa3cea96f822aa6bec02afdfd2 + + keystone/manage/__init__.py | 154 +++++++++++++++++++++++++++----------------- + 1 file changed, 94 insertions(+), 60 deletions(-) + +commit d920d8432aa465c2ef19d66af1c3f8726985a9d2 +Author: termie +Date: Wed Oct 19 16:23:33 2011 +0300 + + authenticate working, too + + keystonelight/backends/kvs.py | 29 +++++++++- + keystonelight/catalog.py | 4 +- + keystonelight/keystone_compat.py | 51 ++++++++++-------- + keystonelight/service.py | 1 + + keystonelight/test.py | 10 ++-- + keystonelight/wsgi.py | 9 +++- + tests/keystone_compat_diablo_sample_catalog.json | 53 ++++++++++++++++++ + tests/test_keystone_compat.py | 68 +++++++++++++++++++----- + 8 files changed, 179 insertions(+), 46 deletions(-) + +commit ba4913f4630997600c9256bc5a269431d4934dbb +Author: termie +Date: Wed Oct 19 15:08:09 2011 +0300 + + base tests on keystone-diablo/stable + + keystonelight/backends/kvs.py | 8 ------ + keystonelight/keystone_compat.py | 18 +++++++++++-- + keystonelight/test.py | 12 ++++----- + tests/keystone_compat_HEAD.conf | 19 -------------- + tests/keystone_compat_diablo.conf | 19 ++++++++++++++ + tests/test_keystone_compat.py | 54 ++++++++++++++++++++++++++++++--------- + 6 files changed, 82 insertions(+), 48 deletions(-) + +commit a98b2ed7064d01696b8fc980cf90cefd7cbbd6d7 +Author: termie +Date: Wed Oct 19 13:28:22 2011 +0300 + + get tenants passing, yay + + keystonelight/backends/kvs.py | 8 ++++++++ + keystonelight/identity.py | 7 +++++-- + keystonelight/keystone_compat.py | 3 ++- + keystonelight/logging.py | 19 +++++++++++++++++++ + keystonelight/models.py | 2 +- + keystonelight/test.py | 41 +++++++++++++++++++++++++++++++++++++--- + keystonelight/token.py | 2 ++ + tests/test_keystone_compat.py | 8 ++++---- + 8 files changed, 79 insertions(+), 11 deletions(-) + +commit f886ab990d169097ac815ca83c78f995f2625936 +Author: termie +Date: Wed Oct 19 12:42:03 2011 +0300 + + flow working, added debugging + + keystonelight/keystone_compat.py | 1 - + keystonelight/service.py | 7 ++----- + keystonelight/test.py | 4 ++++ + keystonelight/wsgi.py | 13 +++++++------ + tests/keystone_compat_HEAD.conf | 5 ++++- + tests/test_keystone_compat.py | 8 ++++---- + 6 files changed, 21 insertions(+), 17 deletions(-) + +commit 06944e8d69473080d74637972d6d293658469ecd +Author: termie +Date: Wed Oct 19 12:23:32 2011 +0300 + + add context to calls + + keystonelight/keystone_compat.py | 41 +++++++++++++++++++++++++--------------- + keystonelight/test.py | 5 +++++ + keystonelight/wsgi.py | 7 +++++-- + tests/keystone_compat_HEAD.conf | 13 ++++++++++++- + tests/test_keystone_compat.py | 7 +++++-- + 5 files changed, 53 insertions(+), 20 deletions(-) + +commit ef9f0392a3614439ab5b3c9d4a79f9516f1880e5 +Author: termie +Date: Wed Oct 19 12:19:32 2011 +0300 + + move diagram into docs dir + + docs/keystone_compat_flows.sdx | 99 ++++++++++++++++++++++++++++++++++++++++++ + keystone_compat_flows.sdx | 99 ------------------------------------------ + 2 files changed, 99 insertions(+), 99 deletions(-) + +commit 7427b1a2e20598a192d32188394194b4751cd1e4 +Author: termie +Date: Wed Oct 19 12:01:58 2011 +0300 + + refactor keystone compat and add catalog service + + keystonelight/backends/kvs.py | 11 +++ + keystonelight/catalog.py | 18 +++++ + keystonelight/keystone_compat.py | 163 +++++++++++++++++++++++++++++++-------- + keystonelight/service.py | 4 +- + keystonelight/token.py | 4 +- + tests/keystone_compat_HEAD.conf | 5 +- + 6 files changed, 165 insertions(+), 40 deletions(-) + +commit c8d4e885df91c5c222b69d21ccb8d58bb1003f06 +Author: termie +Date: Wed Oct 19 12:00:19 2011 +0300 + + added sequence diagrams for keystone compat + + keystone_compat_flows.sdx | 99 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 99 insertions(+) + +commit 8b60d675d4d452ac8d1f63f40b751172d8c5ff67 +Merge: 831a755 ec72417 +Author: Jenkins +Date: Wed Oct 19 00:46:27 2011 +0000 + + Merge "Fixes LP844959, typo in Authors file" + +commit 831a755a77a2c293d1557031d367d9f8633a4e63 +Author: Yogeshwar Srikrishnan +Date: Fri Oct 14 13:56:00 2011 -0500 + + Resubmitting change. + Fixing issue #843226. + Changes to throw appropriate faults during token validation. + + Change-Id: I2e26fc846913910815fc3cceb9748a9a2a5ec1f9 + + examples/echo/echo_client.py | 6 ++--- + keystone/frontends/legacy_token_auth.py | 2 +- + keystone/logic/service.py | 35 +++++++++++++++++------------- + keystone/middleware/swift_auth.py | 2 +- + keystone/test/functional/test_endpoints.py | 18 +++++++-------- + keystone/test/functional/test_roles.py | 20 ++++++++--------- + keystone/test/functional/test_services.py | 8 +++---- + keystone/test/functional/test_tenants.py | 4 ++-- + keystone/test/functional/test_token.py | 14 ++++++------ + keystone/test/functional/test_users.py | 18 +++++++-------- + 10 files changed, 66 insertions(+), 61 deletions(-) + +commit 2b4e9ed3f9b14c02e87ff30f25bf6add4a7374c2 +Author: Jason Cannavale +Date: Tue Oct 18 15:52:40 2011 -0500 + + bug lp:865448 + change abspath to dirname in controllers/version.py to correct path problems. + + Change-Id: Ia483d4766652c6b46dadf7d97bc7dfceca1e4b9c + + keystone/controllers/version.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 8c1311f7264ba5de91f461bb3aaf230d2b44db6c +Author: Yogeshwar Srikrishnan +Date: Tue Oct 18 15:50:01 2011 -0500 + + Moving non core users and tenants calls to appropriate extensions. + + Change-Id: I0460abf5d045dd5e64ba5cfd8dcb47af8eacef07 + + .../extensions/admin/osksadm/extension_handler.py | 93 +++++++++++++++++----- + keystone/routers/admin.py | 52 ++---------- + keystone/test/functional/common.py | 14 ++-- + keystone/test/functional/test_issue_85.py | 3 +- + keystone/test/functional/test_tenants.py | 12 ++- + keystone/test/functional/test_users.py | 3 +- + 6 files changed, 95 insertions(+), 82 deletions(-) + +commit 2bb474331d73e7c6d2a507cb097c50cfe65ad6b6 +Author: Anthony Young +Date: Tue Oct 18 12:41:37 2011 -0700 + + Fix issues in the ec2 middleware + + Change-Id: I3ea371b70f6acc2d06175367cb20b217376ec0d2 + + keystone/middleware/ec2_token.py | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 29a87a82d9a7aba74117ef82ec44ce752fed0bbd +Author: Yogeshwar Srikrishnan +Date: Tue Oct 18 13:56:27 2011 -0500 + + Adding calls to get roles for user as per new format.Cleaning references to old code. + + Change-Id: I996ce187fd5319591ac9e49ac398d525c038da99 + + keystone/backends/api.py | 4 +- + keystone/backends/ldap/api/role.py | 22 ++- + keystone/backends/sqlalchemy/api/role.py | 38 +++-- + keystone/content/admin/OS-KSADM-admin.wadl | 52 ------ + .../extensions/admin/osksadm/extension_handler.py | 8 +- + keystone/controllers/roles.py | 9 +- + keystone/logic/service.py | 78 +++------ + keystone/logic/types/role.py | 177 +-------------------- + keystone/routers/admin.py | 8 + + keystone/test/functional/common.py | 18 +-- + keystone/test/functional/test_roles.py | 24 +-- + 11 files changed, 103 insertions(+), 335 deletions(-) + +commit ec72417b9fb625f0d0323ddf738d2aa3fc87a7cd +Author: Paul Voccio +Date: Tue Oct 18 11:55:45 2011 -0500 + + Fixes LP844959, typo in Authors file + + Change-Id: I72f84c8277fb3f59a39e6a679f13460f778f1b06 + + AUTHORS | 2 +- + keystone/common/config.py | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 63c18186019754495a970773c0cc83dd330decbd +Merge: 750e891 c3ce4b6 +Author: Jenkins +Date: Tue Oct 18 15:35:20 2011 +0000 + + Merge "Simplified README" + +commit 750e891628013b50af5688532de881ce17d01a75 +Author: Yogeshwar Srikrishnan +Date: Mon Oct 17 17:19:17 2011 -0500 + + Changes to support roles and services calls via extensions. + Change-Id: I1316633b30c2be07353dacdffb321791a4e2e231 + + keystone/backends/api.py | 3 + + keystone/backends/ldap/api/role.py | 36 ++++++++ + keystone/backends/sqlalchemy/api/role.py | 13 +++ + .../extensions/admin/osksadm/extension_handler.py | 25 +++-- + keystone/controllers/roles.py | 28 +++--- + keystone/logic/service.py | 23 ++++- + keystone/test/functional/common.py | 55 +++++++---- + keystone/test/functional/test_roles.py | 101 +++++++++++++-------- + keystone/test/functional/test_token.py | 2 +- + 9 files changed, 205 insertions(+), 81 deletions(-) + +commit c3ce4b6840b70a14eafa0738f99f9957750cf0ad +Author: Dolph Mathews +Date: Mon Oct 17 13:13:09 2011 -0500 + + Simplified README + + Change-Id: I3bce24bdaed08de5bf8c103f9429022080096581 + + README.md | 271 ++++++++++++++++++++++---------------------------------------- + 1 file changed, 94 insertions(+), 177 deletions(-) + +commit 85a49ae61279f10318adf80b1ca9c33fdf1fa1df +Author: Carlos Marin +Date: Wed Oct 12 17:44:12 2011 -0500 + + First commit for Secret Question and Answer Extension: RAX-KSQA + + Changed: POST to PUT on create/update Secret Q&A. + + Change-Id: I0f8130ac0daf59f660a7deadf5091202cf0e93db + + keystone/content/admin/RAX-KSQA-admin.wadl | 106 +++++++++++++++++++++ + .../content/common/samples/RAX-KSQA-secretQA.json | 6 ++ + .../content/common/samples/RAX-KSQA-secretQA.xml | 7 ++ + keystone/content/common/xsd/RAX-KSQA-secretQA.xsd | 47 +++++++++ + 4 files changed, 166 insertions(+) + +commit 70da539b77188bee8396f1d6d56f37b228020f1b +Merge: 3b08b94 d509794 +Author: Jenkins +Date: Fri Oct 14 14:46:35 2011 +0000 + + Merge "Fixing issue 854425.ie chaning token table name to tokens. Fixing issue 863667.Changes to support updation of user/tenant name as well using api calls. Fixing LDAP backend to have id independent of name.Fixing getuser call to also return name." + +commit d50979411ef9fad4398a358421e506836f7cd262 +Author: Yogeshwar Srikrishnan +Date: Thu Oct 13 14:10:25 2011 -0500 + + Fixing issue 854425.ie chaning token table name to tokens. + Fixing issue 863667.Changes to support updation of user/tenant name as well using api calls. + Fixing LDAP backend to have id independent of name.Fixing getuser call to also return name. + + Change-Id: I8f88d24829d6817dba736ddabcf7bd5b90225a05 + + keystone/backends/ldap/api/tenant.py | 15 ++++++++++----- + keystone/backends/ldap/api/user.py | 13 +++++++++---- + keystone/backends/ldap/keystone.ldif | 8 ++++++++ + keystone/backends/ldap/keystone.schema | 9 ++++++++- + keystone/backends/ldap/models.py | 4 ++-- + keystone/backends/sqlalchemy/models.py | 2 +- + keystone/logic/service.py | 26 +++++++++++++++++++++----- + keystone/test/functional/common.py | 5 +++-- + keystone/test/functional/test_issue_85.py | 1 + + keystone/test/functional/test_tenants.py | 9 +++++++-- + keystone/test/functional/test_users.py | 12 +++++++++++- + 11 files changed, 81 insertions(+), 23 deletions(-) + +commit 3b08b94791a23fe1a2c000e738ab161868950c33 +Merge: 4b07efe 8ff740d +Author: Jenkins +Date: Thu Oct 13 16:46:41 2011 +0000 + + Merge " Fixing bug 859937. Removing incorrect atom feed references from roles.xsd." + +commit 8ff740d6b401094d618a70a327c4f4c1e4ad16e3 +Author: Yogeshwar Srikrishnan +Date: Thu Oct 13 10:43:16 2011 -0500 + + Fixing bug 859937. + Removing incorrect atom feed references from roles.xsd. + + Change-Id: I3fabbf280c372bdd7cbc920adf62fabe7c292f58 + + keystone/content/common/xsd/roles.xsd | 4 ---- + keystone/controllers/roles.py | 2 +- + keystone/utils.py | 1 - + 3 files changed, 1 insertion(+), 6 deletions(-) + +commit 4b07efe5a52803c0bad286c9c05c89cbfbdb563c +Author: Yogeshwar Srikrishnan +Date: Wed Oct 12 15:36:43 2011 -0500 + + Minor corrections to the middleware and wadl. + + Change-Id: I608a547dc16178c866a932d8ced449c64eb8c9db + + keystone/content/admin/identity-admin.wadl | 5 +---- + keystone/content/service/identity.wadl | 2 +- + keystone/middleware/auth_token.py | 7 ++++--- + 3 files changed, 6 insertions(+), 8 deletions(-) + +commit 1bf12cc41577c0f0cb3e3fbe99fad538567f0abe +Merge: 0a5f1fe a4043c8 +Author: Jenkins +Date: Wed Oct 12 19:52:01 2011 +0000 + + Merge "Changes to show name also for the user list." + +commit 0a5f1fe24fefe55b75cd217492a04367128cd548 +Merge: 0c16167 b13b19b +Author: Jenkins +Date: Wed Oct 12 19:50:35 2011 +0000 + + Merge "Changes to show admin URL also as a part of json in endpoints listing" + +commit 0c1616725a9edeaf48966634f51c30f8ea65a464 +Merge: 625fceb 634cd66 +Author: Jenkins +Date: Wed Oct 12 19:49:06 2011 +0000 + + Merge "Fix possible_topdir computing" + +commit a4043c83caf7713dd930c9285859e911a427b27c +Author: Yogeshwar Srikrishnan +Date: Wed Oct 12 11:29:03 2011 -0500 + + Changes to show name also for the user list. + + Change-Id: I1a720be5b1bacde6679c20f35d6103c47b78c451 + + keystone/manage/__init__.py | 2 +- + keystone/manage/api.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b13b19b21c5119a76f08cabe784f5a3f1d64b589 +Author: Yogeshwar Srikrishnan +Date: Wed Oct 12 11:07:12 2011 -0500 + + Changes to show admin URL also as a part of json in endpoints listing + + Change-Id: I0c0ca88b28db21c4ad3b3f20df3be44f9e697d95 + + keystone/content/common/samples/endpoint.json | 1 + + keystone/content/common/samples/endpoints.json | 5 +++++ + 2 files changed, 6 insertions(+) + +commit 50d64c3e07255563c44cdc50a4b5a27cbdeeedcf +Author: termie +Date: Tue Oct 11 16:26:55 2011 -0700 + + getting closer, need to match api now + + keystonelight/backends/kvs.py | 30 +++++++++++++++++++++++------- + keystonelight/keystone_compat.py | 3 ++- + keystonelight/service.py | 2 +- + keystonelight/token.py | 14 ++++++++------ + tests/keystone_compat_HEAD.conf | 1 + + tests/test_keystone_compat.py | 14 ++++++++------ + 6 files changed, 43 insertions(+), 21 deletions(-) + +commit 35ec29740681f0e016f66a1be82aa5469db6c59b +Author: termie +Date: Tue Oct 11 15:57:07 2011 -0700 + + tests running through, still failing + + keystonelight/backends/kvs.py | 11 +++++--- + keystonelight/identity.py | 14 +++------- + keystonelight/keystone_compat.py | 3 ++- + keystonelight/service.py | 56 +++++++++++++++++++++------------------- + keystonelight/test.py | 18 ++++++++++--- + keystonelight/token.py | 3 +++ + keystonelight/utils.py | 4 +-- + tests/keystone_compat_HEAD.conf | 5 ++++ + tests/test_keystone_compat.py | 9 +++++-- + 9 files changed, 76 insertions(+), 47 deletions(-) + +commit a200e5007e0b0ba5b88a3555dea5600a1915701c +Author: termie +Date: Tue Oct 11 15:11:27 2011 -0700 + + add a test client + + keystonelight/test.py | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +commit 03b75a5e696c1d7423b498f0dbc4752d29aa4dd0 +Author: termie +Date: Tue Oct 11 14:55:25 2011 -0700 + + added a test, need to get it working now + + keystonelight/backends/kvs.py | 30 +++++++++++++++ + keystonelight/identity.py | 1 - + keystonelight/models.py | 17 ++++++++ + keystonelight/test.py | 20 ++++++++++ + keystonelight/utils.py | 39 +++++++++++++++++++ + tests/test_keystone_compat.py | 90 +++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 196 insertions(+), 1 deletion(-) + +commit 625fcebc0c572ecf8fa738d720d5424dc8d39546 +Author: Kevin L. Mitchell +Date: Mon Oct 10 14:24:32 2011 -0500 + + Use the tenant name for X_TENANT + + Fixes bug 870351 + + Change-Id: I2cf12a28c6dc29595ef490acdb511f604d86d3ee + + keystone/logic/service.py | 10 ++++++++-- + keystone/logic/types/auth.py | 8 +++++++- + keystone/middleware/auth_token.py | 8 ++++++++ + keystone/test/unit/test_server.py | 2 +- + 4 files changed, 24 insertions(+), 4 deletions(-) + +commit 634cd664f7572f70ffaeffa52a9a61607cd1ddca +Author: Julien Danjou +Date: Fri Oct 7 17:00:30 2011 +0200 + + Fix possible_topdir computing + + Using sys.argv[0] is wrong: if you run /usr/bin/keystone, it will look for + templates in /usr/keystone/… which will not work. The template path is + relative to the version.py file, so using __file__ makes things work. + + Change-Id: I90e930bbb320b148df0fb7234a824b3644bd7369 + Signed-off-by: Julien Danjou + + AUTHORS | 1 + + keystone/controllers/version.py | 8 ++++---- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit 5fa576a1b772801bf35bd74875b1a1efae3ce086 +Author: Chmouel Boudjnah +Date: Tue Oct 4 11:45:35 2011 -0400 + + Change roleId to role.id for swift middleware. + + Change-Id: I61591ff5c8ae944e3006449dbc300a0cfe32a4de + + keystone/middleware/swift_auth.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 6de9786cc310ec74277413eb692412a1b944b959 +Author: Joe Heck +Date: Mon Oct 31 12:22:53 2011 -0700 + + adding in doc and setup to cover existing scripts + adding doc around credentials command usage (for EC2) + + Change-Id: Ia5f0ef92caf6e75c8a55fc75a898d835b90b44ac + + doc/source/conf.py | 14 ++- + doc/source/configuration.rst | 28 ++++- + doc/source/index.rst | 9 +- + doc/source/man/keystone-admin.rst | 86 +++++++++++++++ + doc/source/man/keystone-auth.rst | 87 +++++++++++++++ + doc/source/man/keystone-control.rst | 101 +++++++++++++++++ + doc/source/man/keystone-import.rst | 86 +++++++++++++++ + doc/source/man/keystone-manage.rst | 193 ++++++++++++++++++++++++++++++++ + doc/source/man/keystone.rst | 90 +++++++++++++++ + doc/source/man/keystonemanage.rst | 214 ------------------------------------ + doc/source/man/sampledata.rst | 85 ++++++++++++++ + setup.py | 3 +- + 12 files changed, 773 insertions(+), 223 deletions(-) + +commit 61148fbdbc41f8791243381a19dfc2136cd0594d +Author: Dolph Mathews +Date: Fri Sep 30 16:21:04 2011 -0500 + + Updating legacy auth translation to 2.0 (bug #863661) + + Change-Id: I3a31beec9a5bd0ced70c2e93e7dbdaba072b1f0c + + keystone/middleware/auth_token.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 715544345d5c56e6b3366b0cb29bf15b93041707 +Merge: 308575e b46b023 +Author: Jenkins +Date: Fri Sep 30 18:54:33 2011 +0000 + + Merge "Shouldn't look in /etc/init/ for config files" + +commit b46b023b22336834b6a032a490c3f9fa35fcde9b +Author: Dolph Mathews +Date: Fri Sep 30 13:46:38 2011 -0500 + + Shouldn't look in /etc/init/ for config files + + Change-Id: Iedf372e8942ddc0c924c0e0c0708d41412a13d68 + + keystone/common/config.py | 2 -- + 1 file changed, 2 deletions(-) + +commit 308575e2b0ba67de294e68b099e20c1ac0121faf +Author: Dolph Mathews +Date: Fri Sep 30 13:32:57 2011 -0500 + + Changing default admin port from 5001 to 35357, per IANA/IETF (bug #843054) + + See: http://www.ietf.org/assignments/port-numbers + + Change-Id: Ide9f484160e60e350590841d00d95487e7153b1c + + README.md | 8 ++++---- + bin/keystone | 2 +- + doc/source/adminAPI_curl_examples.rst | 24 ++++++++++++------------ + etc/keystone.conf | 2 +- + examples/echo/echo/echo.ini | 4 ++-- + examples/echo/echo/echo_basic.ini | 4 ++-- + examples/paste/auth_token.ini | 2 +- + examples/paste/glance-api.conf | 2 +- + examples/paste/glance-registry.conf | 2 +- + examples/paste/nova-api-paste.ini | 2 +- + keystone/content/admin/OS-KSADM-admin.wadl | 2 +- + keystone/content/admin/OS-KSCATALOG-admin.wadl | 2 +- + keystone/content/admin/OS-KSEC2-admin.wadl | 2 +- + keystone/content/admin/RAX-KSGRP-admin.wadl | 2 +- + keystone/content/admin/RAX-KSKEY-admin.wadl | 2 +- + keystone/content/admin/identity-admin.wadl | 2 +- + keystone/test/etc/ldap.conf.template | 2 +- + keystone/test/etc/memcache.conf.template | 2 +- + keystone/test/etc/sql.conf.template | 2 +- + keystone/test/functional/common.py | 2 +- + keystone/test/sampledata.py | 2 +- + 21 files changed, 37 insertions(+), 37 deletions(-) + +commit d800ed2791d6e8bda6393dcd2a2678c7eccdab6c +Merge: 23e0713 4c77978 +Author: Jenkins +Date: Fri Sep 30 16:13:51 2011 +0000 + + Merge "Organizing and documenting pypi requirements" + +commit 23e07130976e96283bf430b580a558072b39f0dc +Merge: e3a26aa 029e0c5 +Author: Jenkins +Date: Fri Sep 30 16:11:40 2011 +0000 + + Merge "POST /tokens: Added tenant id & name to scoped tokens in XML (#862752)" + +commit 4c77978ed2a3d03ebf32df3d5eca6c81b8cc26e7 +Author: Dolph Mathews +Date: Fri Sep 30 11:08:04 2011 -0500 + + Organizing and documenting pypi requirements + + Change-Id: I94d82f55eab5f4ce953fda3b3cb989b7660a7f80 + + tools/pip-requires | 37 ++++++++++++++++++------------------- + 1 file changed, 18 insertions(+), 19 deletions(-) + +commit e3a26aab47c6ee14536eb1b7c6123998b21a2cf8 +Author: Joe Savak +Date: Fri Sep 30 11:02:45 2011 -0500 + + sample data updates to remove -service from image and identity + + Change-Id: Ib9ed4378ab0730c6106df88e0924c850a963f1e1 + + keystone/test/sampledata.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 9374954662958096d2e20601cc5f09d123ba99dd +Merge: 12b501e cc476c9 +Author: Jenkins +Date: Fri Sep 30 16:00:20 2011 +0000 + + Merge "Error message expecting 'e' in local scope" + +commit 12b501e557370a8b3be0fbb527285f6c31d9f865 +Author: Mark McLoughlin +Date: Fri Sep 30 14:28:02 2011 +0100 + + Refactor and unit test json auth parsing + + There's a bunch of code copied-and-pasted between the json parsers + in the two auth types. Refactor the code out into a base class. + + First, though, unit test the code to ensure no regressions. + + v2: update test_user_auth_with_no_{name,password} to expect a + 400 return instead of 401. + + Change-Id: I50802419ec82d98f4cb56e93c163158d3326c5c9 + + AUTHORS | 1 + + keystone/logic/types/auth.py | 107 +++++++++++---------- + keystone/test/functional/test_auth.py | 9 +- + keystone/test/unit/test_auth.py | 169 +++++++++++++++++++++++++++++++++- + 4 files changed, 231 insertions(+), 55 deletions(-) + +commit cc476c9d2a859aa8d541d5aa99752807f3fe443f +Author: Dolph Mathews +Date: Fri Sep 30 10:41:32 2011 -0500 + + Error message expecting 'e' in local scope + + Change-Id: I65594f6cab0a935847b7595c28e88db375c14a32 + + keystone/common/config.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ed44af629a9709ffe027ee3d49c1d431af36a94 +Merge: 11ad2c1 40a507d +Author: Jenkins +Date: Fri Sep 30 15:37:57 2011 +0000 + + Merge "Update auth examples in README" + +commit 11ad2c1cb7e41cd7f7e8253184750f1a79b3683e +Merge: 9e59bd2 e7c4c4b +Author: Jenkins +Date: Fri Sep 30 15:36:32 2011 +0000 + + Merge "Do not return identical error messages twice" + +commit 9e59bd29d5988300d6c99991929342dd52489be6 +Merge: 9f6336c b2b37a8 +Author: Jenkins +Date: Fri Sep 30 15:33:38 2011 +0000 + + Merge "README.md changes to point to openstack repo" + +commit e7c4c4b028c2f8bdb371207eeb915065f10e7e30 +Author: Mark McLoughlin +Date: Fri Sep 30 12:06:24 2011 +0100 + + Do not return identical error messages twice + + e.g. + + $> curl -d '{"passwordCredentials": ...}' -H "Content-type: application/json" http://localhost:5000/v2.0/tokens + + should return: + + {"badRequest": {"message": "Expecting auth", "code": "400"}} + + not: + + {"badRequest": {"message": "Expecting auth or Expecting auth", "code": "400"}} + + Change-Id: I76a432cbb4c964f4050b8596c773e0a553120ca3 + + keystone/controllers/auth.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 40a507d1a46b78f43c2cb628ae2acced46432e9f +Author: Mark McLoughlin +Date: Fri Sep 30 12:08:19 2011 +0100 + + Update auth examples in README + + The format was changed by commit 012b2125f. + + Change-Id: Ifb4b171b45d643153a0306f701d22149859c14a7 + + README.md | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit b2b37a8ad1ae2675ff95ad3e2a2f8458b9e54089 +Author: Joe Savak +Date: Fri Sep 30 09:12:09 2011 -0500 + + README.md changes to point to openstack repo + + Change-Id: Idb1dd4cf1ccd0243cdb7e039d081c46b884f9892 + + README.md | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 9f6336ceb04732038135ced51ea0c5b3321b2c19 +Author: Joe Heck +Date: Thu Sep 29 16:39:19 2011 -0700 + + updating docs for Mac source install, no docs for mac package install relevant + + Change-Id: Ife997e0f7deb7c021b692d5abab641191c332a5c + + doc/source/installing.rst | 34 ++++++++++++++++++++++++++-------- + 1 file changed, 26 insertions(+), 8 deletions(-) + +commit 029e0c52562f649f005f25aad1e465ff6eb37d6d +Author: Dolph Mathews +Date: Thu Sep 29 17:37:03 2011 -0500 + + POST /tokens: Added tenant id & name to scoped tokens in XML (#862752) + + - Added functional test for auth by xml + - Fixed & tested default tenantId's returned as 'None' when empty + + Change-Id: Id38bd062641f40521f25cc69c6c68670de7b9407 + + keystone/logic/types/auth.py | 19 +++++--- + keystone/test/functional/test_auth.py | 84 +++++++++++++++++++++++++++++++++++ + 2 files changed, 98 insertions(+), 5 deletions(-) + +commit 8948d10db417b13d6f3c07ad0d77b70c21a87498 +Merge: 50542df 011005c +Author: Jenkins +Date: Thu Sep 29 22:33:55 2011 +0000 + + Merge "Changes to stored hashed password in backends. Using passlib a password hashing library. Using sha512. Setting hashing to be the default behavior." + +commit 50542df3facacb0438b6617a89c8aeb63811a990 +Author: Yogeshwar Srikrishnan +Date: Thu Sep 29 17:05:40 2011 -0500 + + Updated guides.Have recompiled to use the latest examples. + + Change-Id: I032779bbe63eb44aff71d36c792de893d74e57d5 + + keystone/content/admin/OS-KSADM-admin-devguide.pdf | Bin 237659 -> 257371 bytes + .../content/admin/OS-KSCATALOG-admin-devguide.pdf | Bin 130093 -> 136602 bytes + keystone/content/admin/OS-KSEC2-admin-devguide.pdf | Bin 122480 -> 126891 bytes + .../content/admin/RAX-KSKEY-admin-devguide.pdf | Bin 123489 -> 127941 bytes + keystone/content/admin/identityadminguide.pdf | Bin 263443 -> 274329 bytes + .../content/service/OS-KSEC2-service-devguide.pdf | Bin 95210 -> 95313 bytes + .../content/service/RAX-KSGRP-service-devguide.pdf | Bin 97693 -> 97711 bytes + .../content/service/RAX-KSKEY-service-devguide.pdf | Bin 96571 -> 96715 bytes + keystone/content/service/identitydevguide.pdf | Bin 263443 -> 274329 bytes + 9 files changed, 0 insertions(+), 0 deletions(-) + +commit 612442f662b25025085933ce42e7ce85a7ede2a7 +Author: Brian Lamar +Date: Wed Sep 28 12:17:11 2011 -0400 + + Fix bug 861546 + + (Patch Set 2) Added comment to show why this try/except is needed. + + Change-Id: Ie12ad3226b0e805e1f65b7e685f2ae29cf666a3f + + keystone/middleware/url.py | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit 7d6a656fdd3b736d5412099a3286cacd19ff4fb9 +Merge: 44e9059 bf903cc +Author: Jenkins +Date: Thu Sep 29 16:03:24 2011 +0000 + + Merge "Fix swift middleware with regard to latest changes." + +commit 44e9059751fc066a500f6a7daef7d1bfd8543958 +Merge: 76d8181 2fc9527 +Author: Jenkins +Date: Thu Sep 29 15:45:42 2011 +0000 + + Merge "Changes to support getTenants to behave differntly for admin users when invoked as a service api or admin api." + +commit 76d81818c1ed88a55c808a76d9d6a6d8f1c3334f +Merge: 602557f 33a3874 +Author: Jenkins +Date: Thu Sep 29 15:38:50 2011 +0000 + + Merge "Revised docstring" + +commit bf903cc457af1b058167327cf211ee3c049739cd +Author: Chmouel Boudjnah +Date: Thu Sep 29 17:36:34 2011 +0200 + + Fix swift middleware with regard to latest changes. + + Change roleRefs to roles. + + Change-Id: I6cafdb571e42c7ebfe3e663271359f93c7328c0a + + keystone/middleware/swift_auth.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2fc9527fdf85c093bd974a0a6e0dbd1844100923 +Author: Yogeshwar Srikrishnan +Date: Wed Sep 28 21:05:20 2011 -0500 + + Changes to support getTenants to behave differntly for admin users when invoked + as a service api or admin api. + + Change-Id: Ic9b85b3cbb8fed4c49391fd0f0e58a0a66a5b9aa + + keystone/controllers/tenant.py | 5 +++-- + keystone/logic/service.py | 22 +++++++++++----------- + keystone/routers/service.py | 2 +- + keystone/test/functional/common.py | 7 ++++++- + keystone/test/functional/test_tenants.py | 4 ++++ + 5 files changed, 25 insertions(+), 15 deletions(-) + +commit 011005cdc67dd8176160b74152ba86308921da3f +Author: Yogeshwar Srikrishnan +Date: Wed Sep 28 15:41:40 2011 -0500 + + Changes to stored hashed password in backends. + Using passlib a password hashing library. + Using sha512. + Setting hashing to be the default behavior. + + Change-Id: I872f53516180714754ccc157b7e675fdcfd12d02 + + etc/keystone.conf | 3 ++ + keystone/backends/__init__.py | 6 ++++ + keystone/backends/backendutils.py | 49 ++++++++++++++++++++++++++++++++ + keystone/backends/ldap/api/user.py | 13 +++------ + keystone/backends/sqlalchemy/api/user.py | 14 +++------ + keystone/test/etc/ldap.conf.template | 1 + + keystone/test/etc/sql.conf.template | 3 +- + keystone/test/unit/base.py | 1 + + keystone/utils.py | 13 --------- + tools/pip-requires | 2 ++ + 10 files changed, 72 insertions(+), 33 deletions(-) + +commit 602557f5f9f0add29bbc30c96420f79da64790c1 +Merge: 678977e f15b649 +Author: Jenkins +Date: Wed Sep 28 21:29:29 2011 +0000 + + Merge "Changes to WADLs to refer actual types." + +commit f15b6491d9aec8e22694e3abd346f2fb6e9a9df2 +Author: Yogeshwar Srikrishnan +Date: Wed Sep 28 16:27:32 2011 -0500 + + Changes to WADLs to refer actual types. + + Change-Id: Ibb4ab6f0117284cc80420d1cec6909517c199907 + + keystone/content/admin/OS-KSADM-admin.wadl | 10 +++++----- + keystone/content/admin/OS-KSEC2-admin.wadl | 10 +++++----- + keystone/content/admin/RAX-KSKEY-admin.wadl | 10 +++++----- + 3 files changed, 15 insertions(+), 15 deletions(-) + +commit 33a3874f7e5573cd46d52df6e4c4ba1fdacc2f09 +Author: Dolph Mathews +Date: Wed Sep 28 16:18:41 2011 -0500 + + Revised docstring + + Change-Id: I49cc1d5f9dc4ec50e73a1cf91fa56d0dea7cc15e + + keystone/common/config.py | 1 + + 1 file changed, 1 insertion(+) + +commit 678977edac5ce90c7ce816c055a30b8e134b1f32 +Author: Dolph Mathews +Date: Wed Sep 28 15:49:47 2011 -0500 + + Added /etc/init/keystone.conf to list of known configuration paths + + Change-Id: I84da8d8d60689718e1ed11802c897a88cee2f809 + + keystone/common/config.py | 1 + + 1 file changed, 1 insertion(+) + +commit 67264e70edc534dcf1512834708a8e4a1dc8af06 +Merge: 74c4531 fa8f0b8 +Author: Jenkins +Date: Wed Sep 28 20:30:24 2011 +0000 + + Merge "Revising tenant IDs & Names in samples (#854228)" + +commit fa8f0b88c228a320405290afcb0e3280f128fa78 +Author: Dolph Mathews +Date: Wed Sep 28 14:44:28 2011 -0500 + + Revising tenant IDs & Names in samples (#854228) + + Change-Id: Ie6dfa3b4d4107aa3e0f64ee8a16e34c9c648579d + + README.md | 4 ++-- + doc/source/adminAPI_curl_examples.rst | 10 +++++----- + examples/echo/echo_client.py | 2 +- + keystone/content/common/samples/auth_credentials.json | 2 +- + keystone/content/common/samples/auth_credentials.xml | 3 +-- + keystone/content/common/samples/auth_with_token.json | 2 +- + keystone/content/common/samples/auth_with_token.xml | 2 +- + keystone/content/common/samples/ext-getuser.json | 2 +- + 8 files changed, 13 insertions(+), 14 deletions(-) + +commit 74c453122b10185acb60dbd6d68bce9045032144 +Merge: 6bb2ba8 e1deec3 +Author: Jenkins +Date: Wed Sep 28 19:38:04 2011 +0000 + + Merge "Authenticating against non-existent tenant (fixed #859927)" + +commit e1deec3368aefdf93b4e4db43dd83553f386dfb3 +Author: Dolph Mathews +Date: Wed Sep 28 13:48:00 2011 -0500 + + Authenticating against non-existent tenant (fixed #859927) + + - Revised sampledata & management api to utlize object names exclusively (related to #849007) + - Partial fix for bug #854228 + + Change-Id: I026d3e543e183266ba023a961c9652f5ba9e34c6 + + keystone/logic/service.py | 44 +++++++++++++++++++++++----------- + keystone/manage/api.py | 45 ++++++++++++++--------------------- + keystone/test/functional/test_auth.py | 36 ++++++++++++++++++++++++++++ + keystone/test/sampledata.py | 44 ++++++++++++++++++---------------- + 4 files changed, 108 insertions(+), 61 deletions(-) + +commit 6bb2ba8ddbccbd68e288cc9579ae489e415a2ff1 +Author: Anne Gentle +Date: Mon Sep 26 11:32:53 2011 -0500 + + Adds list of dependencies to dev install + + Change-Id: I96450d614209ec9e7f1c51f72805d5d7495728ff + + doc/source/installing.rst | 41 +++++++++++++++++++++++++++++------------ + 1 file changed, 29 insertions(+), 12 deletions(-) + +commit 908088bd7c0724438c9421364593f99117ba1033 +Author: Anne Gentle +Date: Mon Sep 26 14:01:23 2011 -0500 + + Fixed Anne's email address & list position (alphabetical) + + Change-Id: I0540ce63d006eb7bcde7a036e60f4c93a3538f04 + + AUTHORS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 2ac7b61ce8f40fd2a9dd9c693c3a0c0fef7605bc +Author: Dolph Mathews +Date: Mon Sep 26 15:47:11 2011 -0500 + + Added support for scoping by tenantName + + - Added support & tests for auth w/ passwordCredentials + tenantName + - Includes XSD revision + + Change-Id: I0ea359290e9e0d7d5cb4ded40ea4c809d7084728 + + keystone/content/common/xsd/credentials.xsd | 16 +++++- + keystone/controllers/auth.py | 12 ++-- + keystone/logic/service.py | 8 +++ + keystone/logic/types/auth.py | 58 +++++++++++-------- + keystone/test/functional/test_auth.py | 86 +++++++++++++++++++++++++++-- + 5 files changed, 145 insertions(+), 35 deletions(-) + +commit 661d1a0af757f6b83bc1d8712e45015c73dccc49 +Merge: da0a47c fd1e730 +Author: Jenkins +Date: Wed Sep 28 01:15:32 2011 +0000 + + Merge "Changes to support authenticate call to accept token as per agreed format." + +commit da0a47c27eeea33b9ec787148d6fa2fa62fc36f2 +Merge: 82df88e f2bde17 +Author: Jenkins +Date: Wed Sep 28 01:14:55 2011 +0000 + + Merge "Changes to return groups as a part of RAXKSGRP extension.Also fixed incorrect schema version references in wadls and examples." + +commit f2bde1718fe83c979b179ce5ac201b8722dedee8 +Author: Yogeshwar Srikrishnan +Date: Tue Sep 27 17:42:16 2011 -0500 + + Changes to return groups as a part of RAXKSGRP extension.Also fixed incorrect + schema version references in wadls and examples. + + Change-Id: I866409e6d869daab80b33b0605966a013d2ada42 + + keystone/content/admin/OS-KSADM-admin.wadl | 2 +- + keystone/content/admin/OS-KSCATALOG-admin.wadl | 2 +- + keystone/content/admin/OS-KSEC2-admin.wadl | 2 +- + keystone/content/admin/RAX-KSGRP-admin.wadl | 74 ++++++++++++++++++++++ + keystone/content/admin/RAX-KSKEY-admin.wadl | 2 +- + keystone/content/admin/extensions.xml | 2 +- + keystone/content/admin/identity-admin.wadl | 2 +- + keystone/content/common/xsd/extensions.xsd | 2 +- + .../contrib/extensions/admin/osksadm/extension.xml | 2 +- + .../extensions/admin/oskscatalog/extension.xml | 2 +- + .../contrib/extensions/admin/raxgrp/extension.json | 19 ++++++ + .../contrib/extensions/admin/raxgrp/extension.xml | 15 +++++ + .../contrib/extensions/admin/raxkey/extension.xml | 2 +- + .../extensions/service/raxgrp/extension.xml | 2 +- + .../extensions/service/raxkey/extension.xml | 2 +- + keystone/test/functional/test_ext_raxkskey.py | 2 +- + 16 files changed, 121 insertions(+), 13 deletions(-) + +commit fd1e7306f39b04a2b08d7c1992c6d21746248c09 +Author: Yogeshwar Srikrishnan +Date: Tue Sep 27 14:30:22 2011 -0500 + + Changes to support authenticate call to accept token as per agreed format. + + Change-Id: I3853de4201f8bb421ee22f4e9e936d7f0ee52a5f + + keystone/logic/types/auth.py | 19 ++++++++++++------- + keystone/test/functional/test_auth.py | 14 ++++++++++---- + 2 files changed, 22 insertions(+), 11 deletions(-) + +commit 82df88e067570d73d6e1f433899ce34ab4eb9e98 +Author: Yogeshwar Srikrishnan +Date: Tue Sep 27 10:37:00 2011 -0500 + + Minor changes to wadl. + + Change-Id: I39b467a72c6230d406cc1175f39d987e8060ea22 + + keystone/content/admin/OS-KSADM-admin.wadl | 4 +++- + keystone/content/admin/OS-KSEC2-admin.wadl | 3 +++ + keystone/content/admin/RAX-KSKEY-admin.wadl | 3 +++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +commit e139f4e74f630a14b8ba2d86a57fd906a0cf4efd +Author: Yogeshwar Srikrishnan +Date: Mon Sep 26 14:59:33 2011 -0500 + + Making type mandatory as per sandy's request and minor fixes to wadl examples. + Adding Ann as an author. + + Change-Id: I859ec44bdf48b02d79333f8ae852e3c431b5656c + + AUTHORS | 1 + + keystone/content/admin/OS-KSEC2-admin.wadl | 6 +++--- + keystone/manage/__init__.py | 2 ++ + 3 files changed, 6 insertions(+), 3 deletions(-) + +commit b2b154df9ae5b0c96a6cc72263ee906b9d458d64 +Author: Yogeshwar Srikrishnan +Date: Mon Sep 26 13:46:13 2011 -0500 + + Changes to structures to support authenticate using token. + Minor wadl fixes. + Adding Anne as an author. + + Change-Id: Ic440eb84ff71d90a473733457223f6e22710850d + + keystone/content/admin/OS-KSEC2-admin.wadl | 6 +++--- + keystone/content/admin/RAX-KSKEY-admin.wadl | 6 +++--- + keystone/content/admin/identity-admin.wadl | 6 ++++-- + .../content/common/samples/auth_with_token.json | 8 +++++++ + .../content/common/samples/auth_with_token.xml | 7 ++++++ + keystone/content/common/xsd/credentials.xsd | 25 ++++++++++++++-------- + 6 files changed, 41 insertions(+), 17 deletions(-) + +commit f7f777900abcf5495f29351436bdacd9f40603c8 +Author: Dolph Mathews +Date: Mon Sep 26 12:43:53 2011 -0500 + + Removing token element from token.xsd + + Change-Id: Ib3e89c4b7a26cc069399779137a1a697c6a92a4f + + keystone/content/common/xsd/token.xsd | 1 - + 1 file changed, 1 deletion(-) + +commit 9ddffa1f8bf3111502d43689a7e6471493c4ae6c +Author: Carlos Marin +Date: Sat Sep 24 00:57:37 2011 -0500 + + Update to token.xsd to allow element token as a root element in relation tu bug: https://bugs.launchpad.net/keystone/+bug/855216 + - apiKeyCredentials Samples casing apiKey update. + + Change-Id: I3a3facaee16d7a86378665d9efc1d9a28b79483d + + keystone/content/common/samples/apiKeyCredentials.json | 2 +- + keystone/content/common/samples/apiKeyCredentials.xml | 2 +- + keystone/content/common/samples/auth_credentials-RAX-KSKEY.json | 4 ++-- + keystone/content/common/samples/auth_credentials-RAX-KSKEY.xml | 2 +- + keystone/content/common/samples/credentialswithapikey.json | 2 +- + keystone/content/common/samples/credentialswithapikey.xml | 2 +- + keystone/content/common/xsd/token.xsd | 1 + + 7 files changed, 8 insertions(+), 7 deletions(-) + +commit c2a27eef2c0df721d784c3cd82e5e84c6b9a5b1b +Author: Yogeshwar Srikrishnan +Date: Mon Sep 26 11:09:45 2011 -0500 + + Changes to support endpoint template addition/listing by service names. + Changes to list service details as well. + + Change-Id: I0b5f0e1ec9cb71ea73a242893599e5b9b58428b7 + + keystone/manage/__init__.py | 2 +- + keystone/manage/api.py | 13 +++++++++---- + keystone/test/sampledata.py | 22 +++++++++++----------- + 3 files changed, 21 insertions(+), 16 deletions(-) + +commit 5056464e73399ae9e4daeee92d10f61bbfe0d510 +Author: Carlos Marin +Date: Thu Sep 22 18:09:47 2011 -0500 + + Modified apiKeyCredentials to extend single entity and use restriction + + Added samples and WADL updated with this change. + + Change-Id: Ia4334827e6acae9eba433f21016b9d7edd28bc64 + + keystone/content/admin/RAX-KSKEY-admin.wadl | 23 +++++++++-------- + .../content/common/samples/apiKeyCredentials.json | 6 +++++ + .../content/common/samples/apiKeyCredentials.xml | 6 +++++ + .../content/common/samples/apikeyCredentials.json | 6 ----- + .../content/common/samples/apikeyCredentials.xml | 6 ----- + .../common/samples/auth_credentials-RAX-KSKEY.json | 2 +- + .../common/samples/auth_credentials-RAX-KSKEY.xml | 2 +- + .../common/samples/credentialswithapikey.json | 2 +- + .../common/samples/credentialswithapikey.xml | 2 +- + .../content/common/xsd/RAX-KSKEY-credentials.xsd | 29 +++++++++++++++------- + 10 files changed, 48 insertions(+), 36 deletions(-) + +commit 019b3348f21dc59ebae0b629eb374ac3bf305a5d +Author: Anthony Young +Date: Thu Sep 22 23:36:18 2011 -0700 + + Reorder params in User() constructor + + Change-Id: Ie90d0f2020bed52b9a2c1e20c7bd6e42a0c00284 + + keystone/logic/service.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bb1d302a50e8098e348b8d449f25128ff0f649c6 +Merge: 538c605 f8ec11d +Author: Jenkins +Date: Fri Sep 23 03:27:49 2011 +0000 + + Merge "Fix for bug 856857 - add user.name to User() constructor to re-align param" + +commit f8ec11d75fbdc58e5c9700b4afdd3baaeae2e9e6 +Author: Anthony Young +Date: Thu Sep 22 15:34:14 2011 -0700 + + Fix for bug 856857 - add user.name to User() constructor to re-align param + + * Also fix the Tenant() constructor in get_tenant + + Change-Id: I473af83f270a38eac934f0d656aee6e20e8d20c3 + + keystone/logic/service.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 538c605bf2656bee01323d3753e7052296c04370 +Author: Anthony Young +Date: Thu Sep 22 15:12:07 2011 -0700 + + Fix for bug 856846 - cast ints to string in users_get_by_tenant_get_page so that they can be joined + + Change-Id: I4bc86a74acb8999e37a60746da4e646a9c66a2bf + + keystone/backends/sqlalchemy/api/user.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b40540f68408f5ae87713dd9c96adaa8542578a4 +Merge: 049a405 fec0c74 +Author: Jenkins +Date: Thu Sep 22 22:02:05 2011 +0000 + + Merge "Initial set of changes to move role operations to extensions." + +commit 049a40573000bfebf4437d07acaf0f908209020e +Merge: 3e0f6a4 a270f87 +Author: Jenkins +Date: Thu Sep 22 21:59:16 2011 +0000 + + Merge "POST /tokens: A chronicle of missing features" + +commit a270f876d2743bf2e86ebcd10b5710b6e3f569de +Author: Dolph Mathews +Date: Wed Sep 21 12:33:00 2011 -0500 + + POST /tokens: A chronicle of missing features + + - Wrote new functional test for unscoped -> scoped token flow + - Revised /tokens samples & XSD + - Updated functional tests + - Added user & roles to POST /tokens + - Also fixed GET /tenants; was returning mixed up attributes + - Added support for POST /tokens w/ an unscoped tokenId w/o credentials + - Revised credentials.xsd + - Revised to accept scoped tokens... temporarily + - Removed the default tenant from the sampledata 'admin' user + - Added functional tests asserting behavior of Admins scoping to tenant + - Keystone Admins should NOT (normally) be able to scope to a tenant, + unless they have some *other* established role on that tenant. + + Change-Id: I1a4bd52978e21a9f806e83ab1d431442ee49f633 + + keystone/content/admin/identity-admin.wadl | 6 +- + keystone/content/common/samples/auth.json | 10 +- + keystone/content/common/samples/auth.xml | 5 +- + keystone/content/common/samples/validatetoken.json | 6 +- + keystone/content/common/samples/validatetoken.xml | 5 +- + keystone/content/common/xsd/credentials.xsd | 1 + + keystone/content/common/xsd/token.xsd | 9 +- + keystone/controllers/auth.py | 14 ++- + keystone/logic/service.py | 82 ++++++++++++--- + keystone/logic/types/auth.py | 110 ++++++++++++++++++--- + keystone/test/functional/common.py | 21 ++-- + keystone/test/functional/test_auth.py | 100 +++++++++++++++++-- + keystone/test/functional/test_issue_85.py | 6 +- + keystone/test/sampledata.py | 2 +- + keystone/test/unit/test_ec2_authn.py | 11 ++- + 15 files changed, 321 insertions(+), 67 deletions(-) + +commit 3e0f6a4928cb8bf3ad6552956af14463678cf309 +Merge: 1bfbceb 32254a0 +Author: Jenkins +Date: Thu Sep 22 21:57:49 2011 +0000 + + Merge "Fixes issues with ldap tests" + +commit 32254a06db0d1bb7f8c912d3a39e0860197084d9 +Author: Vishvananda Ishaya +Date: Thu Sep 22 14:34:37 2011 -0700 + + Fixes issues with ldap tests + + Change-Id: I3a8b98182d0fdb131dba0900b544c8838f2964a3 + + keystone/backends/ldap/api/tenant.py | 9 +++++++-- + keystone/backends/ldap/api/user.py | 6 ++++-- + 2 files changed, 11 insertions(+), 4 deletions(-) + +commit 1bfbceb66b1b32c81e2074ddeb91706f5329cc1e +Author: Sandy Walsh +Date: Thu Sep 22 11:44:49 2011 -0700 + + Get Service Catalog from token + + fixed up .conf back to normal + + - Changed `pymox` to `mox` in pip-requires + + Change-Id: Ied52b5c561a6f07d499044dabe9dcb455bf1e7eb + + keystone/controllers/auth.py | 7 ++++ + keystone/logic/service.py | 15 +++++++ + keystone/routers/admin.py | 4 ++ + keystone/test/functional/test_token.py | 73 ++++++++++++++++++++++++++++++++++ + tools/pip-requires | 1 + + 5 files changed, 100 insertions(+) + +commit 22510c79174f16251e47ed8498f2825dc0b597c2 +Author: Anthony Young +Date: Thu Sep 22 11:44:48 2011 -0700 + + Fixes auth_token middleware to allow admin users in nova + + Change-Id: I50c46fe441e303089d7e12d44f7dbf387f70913e + + keystone/middleware/auth_token.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit fec0c7402b112e2d8795c18807e026a7cb36e54b +Author: Yogeshwar Srikrishnan +Date: Thu Sep 22 13:01:07 2011 -0500 + + Initial set of changes to move role operations to extensions. + + Change-Id: Ibe3dc1f4b428f423ddd5e5c5e8eab171abf36a65 + + keystone/content/admin/OS-KSADM-admin.wadl | 6 ++--- + .../extensions/admin/osksadm/extension_handler.py | 29 +++++++++++++++++++++- + keystone/controllers/roles.py | 6 +++++ + keystone/logic/service.py | 15 +++++++++++ + keystone/middleware/auth_token.py | 2 +- + keystone/routers/admin.py | 21 ---------------- + keystone/test/functional/common.py | 10 +++++--- + 7 files changed, 59 insertions(+), 30 deletions(-) + +commit 10f4511037bacbd1f80f4846acb0baa45751bbc7 +Merge: be05e31 92c1404 +Author: Jenkins +Date: Thu Sep 22 17:51:44 2011 +0000 + + Merge "Updating guide wrt wadl changes." + +commit 92c1404037dc99bb26ed14ee0814d7169e06a01b +Author: Yogeshwar Srikrishnan +Date: Thu Sep 22 11:54:49 2011 -0500 + + Updating guide wrt wadl changes. + + Change-Id: I69104da4afba9c26757dd2595eed3d88743102ff + + keystone/content/admin/OS-KSADM-admin-devguide.pdf | Bin 237691 -> 237659 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit be05e312176bb06c8c8ed6b360c8c8af36b0a064 +Merge: fffde80 79722cf +Author: Jenkins +Date: Thu Sep 22 16:38:54 2011 +0000 + + Merge "Minor Changes to extension WADL." + +commit fffde80d0c1a5d5bb4cf501c08aa03d5c4cd3701 +Merge: 62ff502 ceab91b +Author: Jenkins +Date: Thu Sep 22 16:35:24 2011 +0000 + + Merge "Fixes bug 855823" + +commit 79722cf0cb1496ccddff71540ab1b82bedda26f2 +Author: Yogeshwar Srikrishnan +Date: Thu Sep 22 11:32:27 2011 -0500 + + Minor Changes to extension WADL. + + Change-Id: I120970f886c292939c92b00d0081037e9d3a800c + + keystone/content/admin/OS-KSADM-admin.wadl | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +commit 62ff502cca6b83fce7e859589a4fd667124a3f01 +Author: Yogeshwar Srikrishnan +Date: Wed Sep 21 15:50:24 2011 -0500 + + Changes to support auth catalog as per new format. + + Change-Id: I20a58540463b1667678449c08b4ae425df73d2ab + + keystone/backends/sqlalchemy/__init__.py | 3 ++ + .../backends/sqlalchemy/api/endpoint_template.py | 2 +- + keystone/backends/sqlalchemy/models.py | 2 +- + keystone/frontends/legacy_token_auth.py | 4 +- + keystone/logic/service.py | 17 ++++---- + keystone/logic/types/auth.py | 25 ++++++++--- + keystone/logic/types/endpoint.py | 2 +- + keystone/manage/api.py | 2 +- + keystone/test/functional/test_authentication.py | 2 +- + keystone/test/sampledata.py | 49 +++++++++++++++------- + keystone/test/unit/test_ec2_authn.py | 2 +- + 11 files changed, 74 insertions(+), 36 deletions(-) + +commit 92c78f1cc948b3993c4b89bb1224e66241a4c15c +Author: Yogeshwar Srikrishnan +Date: Wed Sep 21 17:11:22 2011 -0500 + + Changes to docs. + + Change-Id: I1cc171f7579b2bfa557b71a9f637c17db3ed18ca + + keystone/content/admin/OS-KSADM-admin-devguide.pdf | Bin 269519 -> 237691 bytes + .../content/admin/OS-KSCATALOG-admin-devguide.pdf | Bin 136586 -> 130093 bytes + keystone/content/admin/OS-KSEC2-admin-devguide.pdf | Bin 125479 -> 122480 bytes + .../content/admin/RAX-KSKEY-admin-devguide.pdf | Bin 126690 -> 123489 bytes + keystone/content/admin/identityadminguide.pdf | Bin 269594 -> 263443 bytes + .../content/service/OS-KSEC2-service-devguide.pdf | Bin 93858 -> 95210 bytes + .../content/service/RAX-KSGRP-service-devguide.pdf | Bin 97557 -> 97693 bytes + .../content/service/RAX-KSKEY-service-devguide.pdf | Bin 95145 -> 96571 bytes + keystone/content/service/identitydevguide.pdf | Bin 269594 -> 263443 bytes + 9 files changed, 0 insertions(+), 0 deletions(-) + +commit 5f4ed9b70555d8dcef3c4e824ec8637fae9a8f32 +Author: Yogeshwar Srikrishnan +Date: Wed Sep 21 16:45:36 2011 -0500 + + Adding tenantid to user roles and endpoints. + + Change-Id: I7c468d3d0862a72195cc27dfbb907b4136eff0c0 + + keystone/content/common/samples/auth.json | 13 +++++++++++-- + keystone/content/common/samples/auth.xml | 10 ++++++++-- + keystone/content/common/samples/authwithgroups.json | 9 +++++++-- + keystone/content/common/samples/authwithgroups.xml | 8 +++++--- + keystone/content/common/samples/endpoint.json | 1 + + keystone/content/common/samples/endpoint.xml | 1 + + keystone/content/common/samples/endpoints.json | 5 +++++ + keystone/content/common/samples/endpoints.xml | 6 ++++++ + keystone/content/common/samples/validatetoken.json | 7 ++++++- + keystone/content/common/samples/validatetoken.xml | 6 ++---- + keystone/content/common/xsd/endpoints.xsd | 13 ++++++++++++- + 11 files changed, 64 insertions(+), 15 deletions(-) + +commit ac00c1b6c6ffe5f4bf1f35ea879095c61877d913 +Merge: 856ddbc edcec21 +Author: Jenkins +Date: Wed Sep 21 20:58:15 2011 +0000 + + Merge "Making identity-admin.wadl well-formed." + +commit ceab91b4d34332f6b4033e2837ba0d9f51b28833 +Author: Anthony Young +Date: Wed Sep 21 11:50:37 2011 -0700 + + Fixes bug 855823 + + Change-Id: I7d030b1922c7df87ec59632255ee47f8ff0c15a7 + + keystone/middleware/auth_token.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 856ddbcdfc0172ff764510496ed4bfbc0f70d389 +Merge: 14ab2a2 50b01f5 +Author: Jenkins +Date: Wed Sep 21 17:46:59 2011 +0000 + + Merge "Add code removed in https://code.launchpad.net/~vishvananda/nova/remove-keystone-middleware/+merge/76297 to keystone." + +commit 50b01f5e2f425074288123456a41704a9dcfe9f9 +Author: Anthony Young +Date: Tue Sep 20 23:17:43 2011 -0700 + + Add code removed in https://code.launchpad.net/~vishvananda/nova/remove-keystone-middleware/+merge/76297 to keystone. + + * Fix pep8 error + * Fix pylint issues + + Change-Id: I8159b361f37e91cd6814e9618df8cad2ff6c4b20 + + examples/paste/nova-api-paste.ini | 5 +- + keystone/middleware/ec2_token.py | 89 ++++++++++++++++++++++++++++ + keystone/middleware/nova_keystone_context.py | 62 +++++++++++++++++++ + 3 files changed, 153 insertions(+), 3 deletions(-) + +commit 14ab2a2421f2420e2ce3ca54913755ff1501a736 +Merge: 7d38452 64ce8c8 +Author: Jenkins +Date: Wed Sep 21 17:07:44 2011 +0000 + + Merge "Added support for HEAD /tokens/{token_id} Changed POST /tokens response container from 'auth' to 'access'" + +commit 64ce8c8a3b4a1e747c114ca50e3a05e65f36759d +Author: Yogeshwar Srikrishnan +Date: Tue Sep 20 14:54:53 2011 -0500 + + Added support for HEAD /tokens/{token_id} + Changed POST /tokens response container from 'auth' to 'access' + + Change-Id: Ibb8cf43948bce0de08cdbdb0619c4d640ced56cd + + keystone/content/admin/identityadminguide.pdf | Bin 269587 -> 269594 bytes + keystone/content/service/identitydevguide.pdf | Bin 269587 -> 269594 bytes + keystone/controllers/auth.py | 18 ++++++++++---- + keystone/frontends/legacy_token_auth.py | 4 +-- + keystone/logic/service.py | 10 ++++++-- + keystone/logic/types/auth.py | 8 +++--- + keystone/middleware/auth_token.py | 8 +++--- + keystone/middleware/swift_auth.py | 8 +++--- + keystone/routers/admin.py | 3 +++ + keystone/test/functional/common.py | 22 ++++++++++++----- + keystone/test/functional/test_auth.py | 8 +++--- + keystone/test/functional/test_authentication.py | 8 +++--- + keystone/test/functional/test_issue_85.py | 2 +- + keystone/test/functional/test_tenants.py | 4 +-- + keystone/test/functional/test_token.py | 31 +++++++++++++++++++++++- + keystone/test/unit/test_ec2_authn.py | 2 +- + keystone/utils.py | 2 +- + 17 files changed, 97 insertions(+), 41 deletions(-) + +commit edcec21bbf0d3994192919305389df7369c01727 +Author: dcramer +Date: Wed Sep 21 10:44:32 2011 -0500 + + Making identity-admin.wadl well-formed. + + Change-Id: I8a4755e41f6886d8daacc875b48273e107febff0 + + keystone/content/admin/identity-admin.wadl | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 7d3845222cc189bd41593d944d65092b7a6da4df +Author: dcramer +Date: Wed Sep 21 09:24:07 2011 -0500 + + Converting to new doc format for included code samples + + Change-Id: I306af18d587735d86636c5afc0aafd3177bf7246 + + keystone/content/admin/OS-KSADM-admin.wadl | 523 +++++++++++++++---------- + keystone/content/admin/OS-KSCATALOG-admin.wadl | 131 ++++--- + keystone/content/admin/OS-KSEC2-admin.wadl | 118 +++--- + keystone/content/admin/RAX-KSKEY-admin.wadl | 121 +++--- + keystone/content/admin/identity-admin.wadl | 186 +++++---- + 5 files changed, 647 insertions(+), 432 deletions(-) + +commit 012b2125fb121f44a1786bbd21f60568c74be367 +Author: Yogeshwar Srikrishnan +Date: Tue Sep 20 14:54:53 2011 -0500 + + Changing authenticate request content xml as well as json. + + Change-Id: I26e67facf6cf535f851164c41c8c5efcac85fa50 + + AUTHORS | 1 - + keystone/controllers/auth.py | 7 ++-- + keystone/frontends/legacy_token_auth.py | 4 +- + keystone/logic/service.py | 18 +++++---- + keystone/logic/types/auth.py | 49 +++++++++++++++---------- + keystone/test/functional/common.py | 7 ++-- + keystone/test/functional/test_auth.py | 23 +++++++----- + keystone/test/functional/test_authentication.py | 16 ++++---- + keystone/test/unit/test_auth.py | 7 ++-- + keystone/test/unit/test_server.py | 5 ++- + 10 files changed, 79 insertions(+), 58 deletions(-) + +commit 6a9361062c1d17e2ba9a07249da5eea67afb0802 +Author: Dolph Mathews +Date: Tue Sep 20 16:34:05 2011 -0500 + + GET /tokens/{token_id}: Exposing both role ID's and Name's + + Change-Id: I80931b133562a7ad70f1d185ce481e48927887b4 + + keystone/logic/service.py | 11 +++-- + keystone/logic/types/role.py | 81 ++++++++++++++++++++++++++++++++++ + keystone/test/functional/test_token.py | 11 +++-- + 3 files changed, 96 insertions(+), 7 deletions(-) + +commit 091b59931182c6776fbe1298282b50af59ab8fd7 +Author: Dolph Mathews +Date: Tue Sep 20 14:13:36 2011 -0500 + + Renaming 'roleRef' container to 'role' + + Change-Id: I81bcfdd66eb02b2c392e2ee5361fe2eb50bee58c + + keystone/backends/sqlalchemy/api/role.py | 12 ++++++------ + keystone/logic/types/role.py | 20 ++++++++++---------- + keystone/test/functional/common.py | 2 +- + keystone/test/functional/test_roles.py | 2 +- + keystone/test/functional/test_token.py | 8 ++++---- + 5 files changed, 22 insertions(+), 22 deletions(-) + +commit 343b5fc4f2050fd7646a723768f69a6f4ca97b12 +Author: Dolph Mathews +Date: Tue Sep 20 13:00:40 2011 -0500 + + Renaming 'roleRefs' container to 'roles' + + Change-Id: Icda551a4e949bc5fcf4714a7667940d3654b2537 + + keystone/logic/types/auth.py | 2 +- + keystone/logic/types/role.py | 4 ++-- + keystone/test/functional/test_auth.py | 2 +- + keystone/test/functional/test_roles.py | 20 ++++++++++---------- + keystone/test/functional/test_token.py | 14 +++++++------- + 5 files changed, 21 insertions(+), 21 deletions(-) + +commit c18f2c5caf899f4da2bbce29d383cc0adfeed662 +Author: Dolph Mathews +Date: Tue Sep 20 12:53:47 2011 -0500 + + Renaming GET /tokens/{token_id} response container to 'access' + + Change-Id: I51ab8475ae2911dd45817dac526b339edae0c8c5 + + keystone/logic/types/auth.py | 4 ++-- + keystone/test/functional/test_auth.py | 11 ++++++----- + keystone/test/functional/test_issue_85.py | 3 ++- + keystone/test/functional/test_token.py | 10 +++++----- + keystone/test/unit/test_server.py | 10 +++++----- + 5 files changed, 20 insertions(+), 18 deletions(-) + +commit 753de4b2c8b632a82ba413f01bd7c5ba5473d8b8 +Merge: 5db7144 acb2d07 +Author: Jenkins +Date: Tue Sep 20 17:19:15 2011 +0000 + + Merge "Fixed path issues with keystone-import." + +commit 5db71441c9af77de53d3bd3139a55dec3a7087bb +Author: Dolph Mathews +Date: Tue Sep 20 11:55:47 2011 -0500 + + Revised samples + + Change-Id: I0a5b02ad84097ec13d472af7336201dac13f1b39 + + keystone/content/common/samples/auth.json | 5 +++-- + keystone/content/common/samples/auth.xml | 2 +- + keystone/content/common/samples/authwithgroups.json | 5 +++-- + keystone/content/common/samples/authwithgroups.xml | 4 ++-- + keystone/content/common/samples/validatetoken.json | 7 ++++--- + keystone/content/common/samples/validatetoken.xml | 8 ++------ + 6 files changed, 15 insertions(+), 16 deletions(-) + +commit acb2d074d3e0c08d31e1fd3df5ee2da306bb5ab5 +Author: Monty Taylor +Date: Tue Sep 20 12:25:59 2011 -0400 + + Fixed path issues with keystone-import. + + Made it a python script so that we wouldn't be dealing + with load path issues - or execing a python script a + bazillion times. + + Change-Id: Ib0c1b74e8bc2b2f96962e1cee5dc20efff642ad3 + + bin/keystone-import | 25 +++++++++++++++++++++---- + keystone/manage/__init__.py | 11 +++++++---- + 2 files changed, 28 insertions(+), 8 deletions(-) + +commit eee307a8967d5bef6c45b3e4b0ba4a9d8e855158 +Author: Dan Prince +Date: Tue Sep 20 08:47:57 2011 -0400 + + Update validate_service_or_keystone_admin_token so that it doesn't cause + exceptions if the admin or service admin haven't been configured. + + Change-Id: I86e3d6ce439740832aee0351d431e64e17c7a1b2 + + Add logging. + + Change-Id: I06b4ce501bc8c1d9fb2533c4ee793ee179503060 + + keystone/logic/service.py | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit 1656c6570230f310904ad5fec2f6c4a6e7915545 +Author: Yogeshwar Srikrishnan +Date: Mon Sep 19 16:21:32 2011 -0500 + + Changing/introducing actual extension json/xml snippets. + Adding updated documents. + + Change-Id: I42e24afc3cf663cfbd58cc930d3a3166478b87b0 + + keystone/content/admin/OS-KSADM-admin-devguide.pdf | Bin 269146 -> 269519 bytes + .../content/admin/OS-KSCATALOG-admin-devguide.pdf | Bin 138372 -> 136586 bytes + keystone/content/admin/OS-KSEC2-admin-devguide.pdf | Bin 125310 -> 125479 bytes + .../content/admin/RAX-KSKEY-admin-devguide.pdf | Bin 126498 -> 126690 bytes + keystone/content/admin/identityadminguide.pdf | Bin 268472 -> 269587 bytes + .../content/service/OS-KSEC2-service-devguide.pdf | Bin 93922 -> 93858 bytes + .../content/service/RAX-KSGRP-service-devguide.pdf | Bin 97560 -> 97557 bytes + .../content/service/RAX-KSKEY-service-devguide.pdf | Bin 94960 -> 95145 bytes + keystone/content/service/identitydevguide.pdf | Bin 184911 -> 269587 bytes + keystone/contrib/extensions/admin/__init__.py | 2 +- + .../contrib/extensions/admin/osec2/extension.json | 9 +- + .../contrib/extensions/admin/osec2/extension.xml | 7 +- + .../contrib/extensions/admin/osec2/frontend.py | 99 --------------------- + .../extensions/admin/osksadm/extension.json | 20 +++++ + .../contrib/extensions/admin/osksadm/extension.xml | 15 ++++ + .../extensions/admin/osksadm/extensionHandler.py | 42 --------- + .../extensions/admin/osksadm/extension_handler.py | 42 +++++++++ + .../extensions/admin/oskscatalog/__init__.py | 0 + .../extensions/admin/oskscatalog/extension.json | 20 +++++ + .../extensions/admin/oskscatalog/extension.xml | 15 ++++ + .../contrib/extensions/admin/raxkey/extension.json | 14 ++- + .../contrib/extensions/admin/raxkey/extension.xml | 4 +- + .../extensions/service/osec2/extension.json | 2 +- + .../extensions/service/raxgrp/extension.json | 2 +- + .../extensions/service/raxgrp/extension.xml | 2 +- + .../extensions/service/raxkey/extension.json | 2 +- + .../extensions/service/raxkey/extension.xml | 2 +- + keystone/test/functional/test_ext_raxkskey.py | 4 +- + 28 files changed, 145 insertions(+), 158 deletions(-) + +commit 35e4b2579164e763654e507ec215e51c72e5ab22 +Author: Dolph Mathews +Date: Tue Sep 13 09:20:30 2011 -0500 + + Backend-managed role & service ID's (bug #834683) + + - Revised SqlAlchemy Role & Service models + - Revised LDAP-backend 'id'/'name' attribute mgmt + - Only persisting ID's + - Returning id as both 'name' and 'id' + - Updated keystone.manage to CRUD by role/service name + - Revised backends.*ADMIN_ROLE* variables + - Updated json/xml encoding/decoding for roles & services + - Performing KEYSTONE_[SERVICE_]_ADMIN_ID lookups on first auth + - This could be improved! + - Revised role & service samples & XSD's + + Change-Id: I1aee372fb28d429f5e5410d43b7e2c6aa297d998 + + keystone/backends/__init__.py | 24 ++--- + keystone/backends/api.py | 6 ++ + keystone/backends/ldap/api/base.py | 1 + + keystone/backends/ldap/api/role.py | 15 ++++ + keystone/backends/ldap/api/tenant.py | 6 -- + keystone/backends/ldap/api/user.py | 7 -- + keystone/backends/sqlalchemy/api/role.py | 8 +- + keystone/backends/sqlalchemy/api/service.py | 8 +- + keystone/backends/sqlalchemy/models.py | 10 ++- + keystone/content/common/samples/role.json | 3 +- + keystone/content/common/samples/role.xml | 3 +- + keystone/content/common/samples/roles.json | 4 +- + keystone/content/common/samples/roles.xml | 4 +- + keystone/content/common/samples/service.json | 5 +- + keystone/content/common/samples/service.xml | 4 +- + keystone/content/common/samples/services.json | 12 +-- + keystone/content/common/samples/services.xml | 4 +- + keystone/content/common/xsd/roles.xsd | 5 +- + keystone/logic/service.py | 78 +++++++++------- + keystone/logic/types/role.py | 82 ++++++++--------- + keystone/logic/types/service.py | 72 +++++++-------- + keystone/manage/__init__.py | 6 +- + keystone/manage/api.py | 25 +++--- + keystone/test/functional/common.py | 19 ++-- + keystone/test/functional/test_authentication.py | 12 ++- + keystone/test/functional/test_endpoints.py | 20 ++--- + keystone/test/functional/test_roles.py | 114 ++++++++++++++++-------- + keystone/test/functional/test_services.py | 55 +++++++----- + keystone/test/functional/test_tenants.py | 8 +- + keystone/test/functional/test_token.py | 13 +-- + 30 files changed, 362 insertions(+), 271 deletions(-) + +commit 0425fba560e7d68e52f922667972765e64ad17dc +Author: Yogeshwar Srikrishnan +Date: Mon Sep 19 12:07:50 2011 -0500 + + Initial Changes to move service operations to extensions. + + Change-Id: I96e9927d47212ecaf013e82aeff96d98115e9840 + + keystone/backends/sqlalchemy/models.py | 1 + + keystone/content/admin/OS-KSADM-admin.wadl | 7 ++- + keystone/content/admin/OS-KSEC2-admin.wadl | 2 +- + keystone/content/admin/RAX-KSKEY-admin.wadl | 2 +- + keystone/contrib/extensions/admin/__init__.py | 26 +++++++++++ + keystone/contrib/extensions/admin/extension.py | 20 ++++++++ + .../contrib/extensions/admin/osksadm/__init__.py | 0 + .../extensions/admin/osksadm/extensionHandler.py | 42 +++++++++++++++++ + keystone/controllers/services.py | 1 - + keystone/logic/service.py | 5 +- + keystone/logic/types/service.py | 53 +++++++++++++++------- + keystone/manage/__init__.py | 4 +- + keystone/manage/api.py | 4 +- + keystone/routers/admin.py | 22 +-------- + keystone/test/functional/common.py | 19 +++++--- + keystone/test/functional/test_authentication.py | 2 +- + keystone/test/functional/test_endpoints.py | 2 +- + keystone/test/functional/test_roles.py | 4 +- + keystone/test/functional/test_services.py | 37 ++++++++------- + keystone/test/sampledata.py | 3 +- + 20 files changed, 180 insertions(+), 76 deletions(-) + +commit a9132101940ed85e86e44e1cd37cc5bfa07f0713 +Merge: e0b135c f4bd41b +Author: Jenkins +Date: Wed Sep 14 22:07:27 2011 +0000 + + Merge "Docs,wadls,samples,initial code to support RAX-KSKEY and OS-KSEC2 extensions. Removed tenant id from being part of endpoints." + +commit f4bd41bc125d625b23ccbec557dbd57af097a5bf +Author: Yogeshwar Srikrishnan +Date: Tue Sep 13 16:04:40 2011 -0500 + + Docs,wadls,samples,initial code to support RAX-KSKEY and OS-KSEC2 extensions. + Removed tenant id from being part of endpoints. + + Change-Id: Ie004a4a4352be14dceaf955e8944b89c00ceeadb + + keystone/content/admin/OS-KSADM-admin-devguide.pdf | Bin 247508 -> 269146 bytes + keystone/content/admin/OS-KSADM-admin.wadl | 29 ++-- + .../content/admin/OS-KSCATALOG-admin-devguide.pdf | Bin 132729 -> 138372 bytes + keystone/content/admin/OS-KSEC2-admin-devguide.pdf | Bin 0 -> 125310 bytes + keystone/content/admin/OS-KSEC2-admin.wadl | 185 +++++++++++++++++++++ + .../content/admin/RAX-KSKEY-admin-devguide.pdf | Bin 0 -> 126498 bytes + keystone/content/admin/RAX-KSKEY-admin.wadl | 185 +++++++++++++++++++++ + keystone/content/admin/identityadminguide.pdf | Bin 257315 -> 268472 bytes + .../content/common/samples/apikeyCredentials.json | 6 + + .../content/common/samples/apikeyCredentials.xml | 6 + + keystone/content/common/samples/auth.json | 6 +- + keystone/content/common/samples/auth.xml | 4 - + keystone/content/common/samples/credentials.json | 2 +- + keystone/content/common/samples/credentials.xml | 2 +- + .../common/samples/credentialswithapikey.json | 16 ++ + .../common/samples/credentialswithapikey.xml | 9 + + .../content/common/samples/credentialswithec2.json | 17 ++ + .../content/common/samples/credentialswithec2.xml | 7 + + .../content/common/samples/ec2Credentials.json | 7 + + keystone/content/common/samples/ec2Credentials.xml | 7 + + .../content/service/OS-KSEC2-service-devguide.pdf | Bin 93757 -> 93922 bytes + .../content/service/RAX-KSGRP-service-devguide.pdf | Bin 94475 -> 97560 bytes + .../content/service/RAX-KSKEY-service-devguide.pdf | Bin 94715 -> 94960 bytes + .../contrib/extensions/admin/osec2/__init__.py | 0 + .../contrib/extensions/admin/osec2/extension.json | 16 ++ + .../contrib/extensions/admin/osec2/extension.xml | 16 ++ + .../contrib/extensions/admin/osec2/frontend.py | 99 +++++++++++ + .../contrib/extensions/admin/raxkey/__init__.py | 0 + .../contrib/extensions/admin/raxkey/extension.json | 14 ++ + .../contrib/extensions/admin/raxkey/extension.xml | 13 ++ + .../contrib/extensions/admin/raxkey/frontend.py | 99 +++++++++++ + 31 files changed, 720 insertions(+), 25 deletions(-) + +commit e0b135ccdb2bf5466e6c987f9cbee9b6efcdc546 +Author: Brian Waldon +Date: Wed Sep 14 16:01:16 2011 -0400 + + Glance Auth Token Middleware fix + + Change-Id: I0f40be0db986c0e032cb10627e440ab51fbc1af0 + + keystone/middleware/glance_auth_token.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 8dbcd371a07438817f74d7d386f7436d468cc2b2 +Author: Dolph Mathews +Date: Wed Sep 14 12:48:04 2011 -0500 + + Sorted AUTHORS list + + Change-Id: I373b90c0ebf474543687dae85b64b6445422515a + + AUTHORS | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit cfe33172da70912fd0afcfe6cf2597a6f8b1bb0a +Author: Paul Voccio +Date: Wed Sep 14 12:49:40 2011 -0500 + + adding imports from Nova for roles, tenants, users and credentials + + Change-Id: I59a7027e7b405350152f8347d3aabb550a347807 + + adding the actual file + + Change-Id: I2be57dfb12d53e1828df653c0208dd2c0065b14e + + AUTHORS | 1 + + bin/keystone-import | 24 ++++++++++++++++++++++++ + 2 files changed, 25 insertions(+) + +commit a0d2519c783774762e7b9efbcbdb75c55ad69faa +Author: Dan Prince +Date: Tue Sep 13 10:15:54 2011 -0400 + + Update keystone-manage commands to convert tenant name to id. Fixes #lp849007 + + Change-Id: Ibcb5e5627fc9bf7c97d839cc28bc46986199dc2a + + keystone/manage/api.py | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +commit a0689f84bf45e49916f26c28ce7a56cfc58fb591 +Merge: fd34e80 fc6dfe4 +Author: Jenkins +Date: Mon Sep 12 23:58:25 2011 +0000 + + Merge "Add ability to run fakeldap in memory." + +commit fd34e804ad1f856f5be7d675fb54b8a1ac160fce +Merge: a079866 242048a +Author: Jenkins +Date: Mon Sep 12 23:55:04 2011 +0000 + + Merge "Add toggle to run tests in-process, w/ realtime progress feedback" + +commit a07986659434c05d39491cb99dca3934f7ffe0b5 +Merge: 4111267 06f37cc +Author: Jenkins +Date: Mon Sep 12 23:47:00 2011 +0000 + + Merge "1.Changed all Json paginated collection structure. 2.Introduced a type for credential type (path param) and change wadls and xsds. 3.Added List Users call. 4.Changed Endpoint creation example." + +commit 06f37ccd1eb5b87986b3a2f399cbc749fde56822 +Author: Yogeshwar Srikrishnan +Date: Mon Sep 12 11:30:53 2011 -0500 + + 1.Changed all Json paginated collection structure. + 2.Introduced a type for credential type (path param) and change wadls and xsds. + 3.Added List Users call. + 4.Changed Endpoint creation example. + + Change-Id: I1f107bcee60f96c0b67126379fec51cecc7cbcd8 + + keystone/content/admin/OS-KSADM-admin-devguide.pdf | Bin 252678 -> 247508 bytes + keystone/content/admin/OS-KSADM-admin.wadl | 33 +++-- + .../content/admin/OS-KSCATALOG-admin-devguide.pdf | Bin 136286 -> 132729 bytes + keystone/content/admin/OS-KSCATALOG-admin.wadl | 8 +- + .../content/common/samples/RAX-KSGRP-groups.json | 15 +-- + keystone/content/common/samples/auth.json | 129 +++++++++---------- + .../common/samples/auth_credentials-RAX-KSKEY.json | 11 +- + .../content/common/samples/auth_credentials.json | 14 +- + .../content/common/samples/authwithgroups.json | 141 ++++++++++----------- + keystone/content/common/samples/choices.json | 121 +++++++++--------- + keystone/content/common/samples/credentials.json | 19 ++- + .../common/samples/endpointTemplateWithOnlyId.json | 5 + + .../common/samples/endpointTemplateWithOnlyId.xml | 6 + + .../content/common/samples/endpointTemplates.json | 6 +- + keystone/content/common/samples/endpoints.json | 6 +- + keystone/content/common/samples/ext-getuser.json | 7 +- + keystone/content/common/samples/extensions.json | 79 ++++++------ + keystone/content/common/samples/getuser-1.json | 45 +++---- + keystone/content/common/samples/roles.json | 12 +- + keystone/content/common/samples/services.json | 26 ++-- + keystone/content/common/samples/tenants-1.json | 26 ++-- + keystone/content/common/samples/tenants-2.json | 33 +++-- + keystone/content/common/samples/tenants-3.json | 26 ++-- + keystone/content/common/samples/tenants.json | 29 ++--- + keystone/content/common/samples/users.json | 28 ++-- + keystone/content/common/samples/users.xml | 2 +- + .../content/common/samples/userwithenabledonly.xml | 6 +- + keystone/content/common/samples/validatetoken.json | 12 +- + keystone/content/common/samples/versions.json | 69 +++++----- + keystone/content/common/xsd/OS-KSADM.xsd | 40 ++++++ + keystone/content/common/xsd/OS-KSCATALOG.xsd | 22 +++- + keystone/content/common/xsd/RAX-KSADM-users.xsd | 13 -- + keystone/content/common/xsd/user.xsd | 3 +- + 33 files changed, 502 insertions(+), 490 deletions(-) + +commit 4111267480c81902277f08b0ebed79d58bbbe01d +Author: Dan Prince +Date: Mon Sep 12 16:43:29 2011 -0400 + + Don't import keystone.test unless we are in testing. Fixes #lp848267. + + Change-Id: I90212fe072dca3f2949fd3e2d4f21ee83b0c2f3d + + keystone/backends/sqlalchemy/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 242048ad698cde3bd7471ac5c432b1c56f6b9bba +Author: Dolph Mathews +Date: Mon Sep 12 13:40:19 2011 -0500 + + Add toggle to run tests in-process, w/ realtime progress feedback + + Change-Id: I4b4d0c24d2718f2902b71d98e9bde3dcefb19c70 + + keystone/test/__init__.py | 20 ++++++++++++++------ + run_tests.sh | 4 ++++ + 2 files changed, 18 insertions(+), 6 deletions(-) + +commit fc6dfe4768641cf6bebca305718c30cb17a90ce3 +Author: Yuriy Taraday +Date: Tue Aug 23 17:22:02 2011 +0400 + + Add ability to run fakeldap in memory. + + Tests speedup. + + Change-Id: I6c1df5990cf2b6c45ea7cab03905c89b92749c9c + + keystone/backends/ldap/fakeldap.py | 18 +++++++++++++++++- + keystone/test/etc/ldap.conf.template | 2 +- + 2 files changed, 18 insertions(+), 2 deletions(-) + +commit 95f49529a1999802e208f6d4c292395462e4b7be +Author: Dolph Mathews +Date: Mon Aug 22 12:37:34 2011 -0500 + + Added backend-managed primary key to User and Tenant model + + - Revised functional tests to expect auto-generated id + - Revised manage.py to create users by name instead of id + - Functional tests passing with User.id & User.name + - Added User.id to Validate token response XSD/samples/python + - Restored full scope of test discovery + - Completely rewrote unit.test_users.py, because it needed some TLC + - Added assertStatusCode to unit.test_users and refactored + - Added assertContentType to unit.test_users and refactored + - Abstracted out TestUpdateConflict + - Coercing JSON responses to UTF-8, per charset + - Added auto-generated PK to Tenant SQL model + - Updated management API to add, list and disable tenants by name + - Added get_by_name() to backend Tenant API + - Implemented Tenant.get_by_name() for SQL + - Simplified many of the "unit" tests further + - Abstracted keystone resources and their REST verbs away from the keystone test client + - Writing keystone client api for functional tests + - Similar to the API "shortcuts" from the "unit" tests + - Finished common FunctionalTestCase + - Moved 'unit' tests over to the test.functional module... and rewrote them all + - Cleaned up unnecessary debug output + - Added pylint to pip-requires + - Removed alterdb + + Change-Id: I45e689807166fc4f1cb59e385d2c7e680b36449d + + keystone/backends/alterdb/__init__.py | 98 -- + keystone/backends/alterdb/api/__init__.py | 1 - + keystone/backends/alterdb/api/token.py | 64 - + keystone/backends/alterdb/models.py | 82 - + keystone/backends/api.py | 12 +- + keystone/backends/ldap/api/tenant.py | 15 + + keystone/backends/ldap/api/user.py | 23 +- + keystone/backends/memcache/__init__.py | 2 +- + keystone/backends/sqlalchemy/api/service.py | 1 - + keystone/backends/sqlalchemy/api/tenant.py | 10 +- + keystone/backends/sqlalchemy/api/user.py | 27 +- + keystone/backends/sqlalchemy/models.py | 22 +- + keystone/common/config.py | 21 +- + keystone/common/wsgi.py | 1 + + keystone/config.py | 5 +- + keystone/content/common/samples/user.json | 2 +- + keystone/content/common/samples/validatetoken.xml | 4 + + keystone/controllers/auth.py | 13 +- + keystone/controllers/endpointtemplates.py | 25 +- + keystone/controllers/extensions.py | 2 - + keystone/logic/service.py | 148 +- + keystone/logic/types/auth.py | 62 +- + keystone/logic/types/endpoint.py | 16 +- + keystone/logic/types/role.py | 12 +- + keystone/logic/types/tenant.py | 71 +- + keystone/logic/types/user.py | 151 +- + keystone/manage/__init__.py | 55 +- + keystone/manage/api.py | 287 ++-- + keystone/routers/admin.py | 16 +- + keystone/test/__init__.py | 22 +- + keystone/test/functional/common.py | 642 +++++++- + keystone/test/functional/test_auth.py | 165 +- + keystone/test/functional/test_authentication.py | 117 ++ + keystone/test/functional/test_core_api.py | 49 - + keystone/test/functional/test_endpoints.py | 461 ++++++ + keystone/test/functional/test_ext_raxkskey.py | 3 +- + keystone/test/functional/test_extensions.py | 8 +- + keystone/test/functional/test_issue_85.py | 64 +- + keystone/test/functional/test_request_specs.py | 4 +- + keystone/test/functional/test_roles.py | 352 +++++ + keystone/test/functional/test_services.py | 189 +++ + keystone/test/functional/test_static_files.py | 4 +- + keystone/test/functional/test_tenants.py | 259 ++++ + keystone/test/functional/test_token.py | 83 + + keystone/test/functional/test_users.py | 367 +++++ + keystone/test/unit/base.py | 34 +- + keystone/test/unit/test_auth.py | 6 - + keystone/test/unit/test_authentication.py | 184 --- + keystone/test/unit/test_common.py | 854 ----------- + keystone/test/unit/test_ec2_authn.py | 14 +- + keystone/test/unit/test_endpoints.py | 841 ----------- + keystone/test/unit/test_roles.py | 792 ---------- + keystone/test/unit/test_server.py | 29 +- + keystone/test/unit/test_services.py | 342 ----- + keystone/test/unit/test_tenants.py | 661 -------- + keystone/test/unit/test_token.py | 198 --- + keystone/test/unit/test_users.py | 1671 --------------------- + keystone/test/unit/test_version.py | 49 - + tools/pip-requires | 1 + + 59 files changed, 3061 insertions(+), 6652 deletions(-) + +commit 92bb42934798b47879f42895cdcccb43ca84d7cc +Author: Yogeshwar Srikrishnan +Date: Fri Sep 9 16:49:41 2011 -0500 + + Introducing doc to support OS-KSCATALOG extensions.Adding new calls to OS-KSADM extension document. + + Change-Id: Iac701b53f547be254517993388d199ef6980c455 + + keystone/content/admin/OS-KSADM-admin-devguide.pdf | Bin 0 -> 252678 bytes + keystone/content/admin/OS-KSADM-admin.wadl | 100 +++++++++++++++---- + .../content/admin/OS-KSCATALOG-admin-devguide.pdf | Bin 0 -> 136286 bytes + keystone/content/admin/OS-KSCATALOG-admin.wadl | 66 ++++++++++++- + .../content/admin/identity-OS-KSADM-dev-guide.pdf | Bin 219864 -> 0 bytes + keystone/content/admin/identity-admin.wadl | 4 +- + keystone/content/common/samples/credentials.json | 13 +++ + keystone/content/common/samples/credentials.xml | 5 + + .../content/common/samples/endpointTemplates.json | 109 +++++++++++---------- + keystone/content/common/samples/norequestbody.txt | 1 + + keystone/content/common/samples/noresponsebody.txt | 1 + + .../common/samples/passwordcredentials.json | 6 ++ + .../content/common/samples/passwordcredentials.xml | 4 + + 13 files changed, 236 insertions(+), 73 deletions(-) + +commit 8a0fcd001f547d7efe3b25e997ba2010111cc839 +Author: Yogeshwar Srikrishnan +Date: Thu Sep 8 16:49:50 2011 -0500 + + Adding initial document for OS-KSADM-admin extension.Related changes on wadl,json,xsd etc. + + Change-Id: Id95c35e189f992926e08d3e486361d65929f7dcc + + keystone/content/admin/OS-KSADM-admin.wadl | 208 ++++++++++++++++----- + .../content/admin/identity-OS-KSADM-dev-guide.pdf | Bin 0 -> 219864 bytes + keystone/content/admin/identity-admin.wadl | 20 +- + .../content/common/samples/tenantwithoutid.json | 7 + + .../content/common/samples/tenantwithoutid.xml | 5 + + keystone/content/common/samples/users.json | 18 ++ + keystone/content/common/samples/users.xml | 9 + + .../common/samples/userwithenabledonly.json | 5 + + .../content/common/samples/userwithenabledonly.xml | 3 + + keystone/content/common/samples/userwithoutid.json | 7 + + keystone/content/common/samples/userwithoutid.xml | 4 + + keystone/content/common/xsd/user.xsd | 2 +- + 12 files changed, 242 insertions(+), 46 deletions(-) + +commit eac83e5fa00a8357ab7981179a81a8988bcacef1 +Author: Yogeshwar Srikrishnan +Date: Wed Sep 7 17:29:46 2011 -0500 + + Fixing sample content. + + Change-Id: Ib66b28d90a2fc091852f7ef2d3bf2419d335702e + + keystone/content/admin/identityadminguide.pdf | Bin 255342 -> 257315 bytes + keystone/content/admin/samples/auth.json | 67 --------- + keystone/content/admin/samples/auth.xml | 60 -------- + .../admin/samples/auth_credentials-OS-EC2.json | 10 -- + .../admin/samples/auth_credentials-OS-EC2.xml | 11 -- + .../admin/samples/auth_credentials-RAX-KEY.json | 8 - + .../admin/samples/auth_credentials-RAX-KEY.xml | 7 - + .../content/admin/samples/auth_credentials.json | 9 -- + .../content/admin/samples/auth_credentials.xml | 8 - + keystone/content/admin/samples/choices.json | 67 --------- + keystone/content/admin/samples/choices.xml | 38 ----- + keystone/content/admin/samples/endpoint.json | 6 - + keystone/content/admin/samples/endpoint.xml | 6 - + .../content/admin/samples/endpointTemplate.json | 14 -- + .../content/admin/samples/endpointTemplate.xml | 17 --- + .../content/admin/samples/endpointTemplates.json | 54 ------- + .../content/admin/samples/endpointTemplates.xml | 62 -------- + keystone/content/admin/samples/endpoints.json | 20 --- + keystone/content/admin/samples/endpoints.xml | 20 --- + keystone/content/admin/samples/ext-getuser.json | 22 --- + keystone/content/admin/samples/ext-getuser.xml | 13 -- + keystone/content/admin/samples/extension.json | 20 --- + keystone/content/admin/samples/extension.xml | 23 --- + keystone/content/admin/samples/extensions.json | 41 ----- + keystone/content/admin/samples/extensions.xml | 39 ----- + keystone/content/admin/samples/getuser-1.json | 25 ---- + keystone/content/admin/samples/getuser-1.xml | 13 -- + keystone/content/admin/samples/identity_fault.json | 7 - + keystone/content/admin/samples/identity_fault.xml | 6 - + keystone/content/admin/samples/item_not_found.json | 7 - + keystone/content/admin/samples/item_not_found.xml | 6 - + keystone/content/admin/samples/role.json | 6 - + keystone/content/admin/samples/role.xml | 4 - + keystone/content/admin/samples/roles.json | 13 -- + keystone/content/admin/samples/roles.xml | 6 - + .../content/admin/samples/samplerequestheader.txt | 4 - + .../content/admin/samples/sampleresponseheader.txt | 4 - + keystone/content/admin/samples/service.json | 7 - + keystone/content/admin/samples/service.xml | 4 - + keystone/content/admin/samples/services.json | 13 -- + keystone/content/admin/samples/services.xml | 6 - + keystone/content/admin/samples/tenant.json | 8 - + keystone/content/admin/samples/tenant.xml | 5 - + keystone/content/admin/samples/tenantlock.json | 5 - + keystone/content/admin/samples/tenantlock.xml | 4 - + keystone/content/admin/samples/tenants-1.json | 18 --- + keystone/content/admin/samples/tenants-1.xml | 10 -- + keystone/content/admin/samples/tenants-2.json | 21 --- + keystone/content/admin/samples/tenants-2.xml | 13 -- + keystone/content/admin/samples/tenants-3.json | 18 --- + keystone/content/admin/samples/tenants-3.xml | 10 -- + keystone/content/admin/samples/tenants-request.txt | 5 - + keystone/content/admin/samples/tenants.json | 17 --- + keystone/content/admin/samples/tenants.xml | 14 -- + keystone/content/admin/samples/updatedtenant.json | 8 - + keystone/content/admin/samples/updatedtenant.xml | 5 - + keystone/content/admin/samples/user.json | 8 - + keystone/content/admin/samples/user.xml | 5 - + keystone/content/admin/samples/validatetoken.json | 19 --- + keystone/content/admin/samples/validatetoken.xml | 13 -- + keystone/content/admin/samples/version-atom.xml | 19 --- + keystone/content/admin/samples/version.json | 30 ---- + keystone/content/admin/samples/version.xml | 23 --- + keystone/content/admin/samples/versions-atom.xml | 29 ---- + keystone/content/admin/samples/versions.json | 37 ----- + keystone/content/admin/samples/versions.xml | 24 --- + .../content/common/samples/RAX-KSGRP-group.json | 6 - + .../content/common/samples/RAX-KSGRP-group.xml | 4 - + .../content/common/samples/RAX-KSGRP-groups.json | 2 +- + keystone/content/common/samples/auth.json | 157 +++++++++++--------- + keystone/content/common/samples/auth.xml | 2 +- + .../common/samples/auth_credentials-OS-KSEC2.json | 16 +- + .../common/samples/auth_credentials-RAX-KSKEY.json | 10 +- + .../content/common/samples/authwithgroups.json | 165 +++++++++++---------- + keystone/content/common/samples/authwithgroups.xml | 21 ++- + .../content/common/samples/endpointTemplate.json | 26 ++-- + .../content/common/samples/endpointTemplate.xml | 6 +- + .../content/common/samples/endpointTemplates.xml | 38 ++--- + keystone/content/common/samples/endpoints.json | 104 +++++++------ + keystone/content/common/samples/roles.json | 16 +- + keystone/content/common/samples/service.json | 12 +- + keystone/content/common/samples/services.json | 27 ++-- + keystone/content/common/samples/validatetoken.json | 32 ++-- + keystone/content/common/xsd/RAX-KSGRP-groups.xsd | 12 +- + .../content/common/xsd/RAX-KSKEY-credentials.xsd | 6 +- + keystone/content/common/xsd/token.xsd | 2 +- + 86 files changed, 343 insertions(+), 1462 deletions(-) + +commit ae88dafb117b508a88d453fe95f9abb15c964103 +Author: Yogeshwar Srikrishnan +Date: Wed Sep 7 11:34:32 2011 -0500 + + Adding new doc.Changes to sample xmls and jsons. + + Change-Id: I7e9eb9c8cd1f34db528bec183e7184039378cd32 + + keystone/content/admin/identity-admin.wadl | 17 +++--- + keystone/content/admin/identityadminguide.pdf | Bin 240159 -> 255342 bytes + keystone/content/common/samples/auth.json | 2 +- + keystone/content/common/samples/auth.xml | 4 +- + keystone/content/common/samples/endpoint.json | 10 +++- + keystone/content/common/samples/endpoint.xml | 19 +++++-- + keystone/content/common/samples/endpoints.json | 48 +++++++++++++---- + keystone/content/common/samples/endpoints.xml | 70 +++++++++++++++++++++---- + keystone/content/common/samples/roles.json | 2 - + keystone/content/common/samples/roles.xml | 6 +-- + keystone/content/common/xsd/endpoints.xsd | 34 ++++++++++-- + 11 files changed, 166 insertions(+), 46 deletions(-) + +commit 58e7cdcb44457a5d20b98c033c00692396c78950 +Author: Yogeshwar Srikrishnan +Date: Tue Sep 6 16:56:24 2011 -0500 + + Validation content and relavant changes. + + Change-Id: I8ddea418b27f2a2e4b365b79dd5aa628b8ec6a5b + + keystone/content/admin/identity-admin.wadl | 4 +-- + keystone/content/common/samples/auth.json | 10 +++++- + keystone/content/common/samples/auth.xml | 4 +-- + .../content/common/samples/auth_credentials.xml | 10 +++--- + .../content/common/samples/endpointTemplate.json | 2 +- + .../content/common/samples/endpointTemplate.xml | 3 +- + .../content/common/samples/endpointTemplates.json | 10 +++--- + .../content/common/samples/endpointTemplates.xml | 17 +++++---- + keystone/content/common/samples/service.json | 2 +- + keystone/content/common/samples/service.xml | 2 +- + keystone/content/common/samples/services.json | 2 +- + keystone/content/common/samples/services.xml | 2 +- + keystone/content/common/samples/user.xml | 3 +- + keystone/content/common/samples/validatetoken.json | 2 +- + keystone/content/common/samples/validatetoken.xml | 6 ++-- + keystone/content/common/xsd/OS-KSCATALOG.xsd | 40 ++++++++++++++++++---- + keystone/content/common/xsd/credentials.xsd | 4 +-- + keystone/content/common/xsd/token.xsd | 9 ++--- + 18 files changed, 84 insertions(+), 48 deletions(-) + +commit ed316ffb4ab9b3f76197525834952ec02b516c99 +Author: Yogeshwar Srikrishnan +Date: Tue Sep 6 11:00:44 2011 -0500 + + Minor fixes on xsds and sample xmls. + + Change-Id: I822b3bdb36da8203277edd9b50a89229978d9829 + + keystone/content/admin/OS-KSADM-admin.wadl | 663 ++++++++++++--------- + keystone/content/admin/OS-KSCATALOG-admin.wadl | 3 +- + keystone/content/common/samples/auth.xml | 123 ++-- + .../common/xsd/OS-KSADM-endpointtemplates.xsd | 150 ----- + keystone/content/common/xsd/OS-KSADM.xsd | 67 +++ + .../common/xsd/OS-KSCATALOG-endpointtemplates.xsd | 150 ----- + keystone/content/common/xsd/OS-KSCATALOG.xsd | 151 +++++ + .../content/common/xsd/OS-KSEC2-credentials.xsd | 2 +- + .../content/common/xsd/RAX-KSADM-credentials.xsd | 2 +- + keystone/content/common/xsd/api.xsd | 1 + + keystone/content/common/xsd/credentials.xsd | 8 +- + keystone/content/common/xsd/services.xsd | 43 -- + keystone/content/common/xsd/token.xsd | 95 ++- + 13 files changed, 755 insertions(+), 703 deletions(-) + +commit 34120e631a912d6f06aa6a5052901a7daf6c0fca +Author: Yogeshwar Srikrishnan +Date: Wed Aug 31 17:27:06 2011 -0500 + + Fixing existing wadl.Completing wadl for extension OS-KSADM. + + Change-Id: Id024ec29f78486345a9e6cbcb4e2a3bb99ca550c + + keystone/content/admin/identity-admin.wadl | 5 +++-- + keystone/content/common/xsd/credentials.xsd | 4 +++- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit c8052459283d38d6f22280934ed0c60aa0dd6172 +Merge: 64bfcfe 37d928b +Author: Jenkins +Date: Tue Sep 6 15:43:54 2011 +0000 + + Merge "Fix invocations of TemplateError. This exception takes precisely three parameters, so I've added a fake location (0, 0) to keep it happy." + +commit 37d928b1b990aac82c7b17231457eafaf18e7c3a +Author: Ewan Mellor +Date: Mon Sep 5 08:06:27 2011 +0000 + + Fix invocations of TemplateError. This exception takes precisely three + parameters, so I've added a fake location (0, 0) to keep it happy. + + Change-Id: I43bdac33be4f5ba4ef4f60275a504761e870901f + + keystone/common/template.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 64bfcfea2e90f1a1baa7d8b68fed60525da51a82 +Author: Yogeshwar Srikrishnan +Date: Thu Sep 1 12:09:00 2011 -0500 + + Adding wadl for OS-KSCATALOG extension.Fixing existing xsds.Fixing service wadls. + Merging changes. + Change-Id: Id29dc19cbc89f47e21329e531fc33bd66c14cf61 + + keystone/content/admin/OS-KSADM-admin.wadl | 443 ++++++ + keystone/content/admin/OS-KSCATALOG-admin.wadl | 165 +++ + keystone/content/admin/RAX-KSKEY-admin.wadl | 251 ---- + .../content/admin/identity-admin-OS-KSADM.wadl | 640 --------- + .../content/admin/identity-admin-RAX-KSADM.wadl | 1455 -------------------- + .../common/xsd/OS-KSCATALOG-endpointtemplates.xsd | 150 ++ + .../content/common/xsd/RAX-KSADM-credentials.xsd | 1 - + keystone/content/common/xsd/RAX-KSADM-groups.xsd | 47 - + keystone/content/common/xsd/credentials.xsd | 29 +- + keystone/content/common/xsd/token.xsd | 91 +- + keystone/content/service/identity.wadl | 1 - + 11 files changed, 786 insertions(+), 2487 deletions(-) + +commit f9e0c4428166806c590423460e49d3640ac13c4c +Merge: 1f53410 52f59f4 +Author: Jenkins +Date: Fri Sep 2 19:12:43 2011 +0000 + + Merge "Update Nova and Glance paste config examples." + +commit 52f59f429fed2756e805522fe6aa9d56d4057008 +Author: Dan Prince +Date: Fri Sep 2 09:14:52 2011 -0400 + + Update Nova and Glance paste config examples. + + Change-Id: If2dc86abe47bdc36a79ba50250f17ad75642f5d9 + + examples/paste/glance-api.conf | 93 +++++++++++++++++++++++++++++++++---- + examples/paste/glance-registry.conf | 21 ++++++--- + examples/paste/nova-api-paste.ini | 49 ++++++++++++------- + 3 files changed, 130 insertions(+), 33 deletions(-) + +commit 1f53410ece8d8d03008295b83e95c9c1ca145360 +Author: dcramer +Date: Wed Aug 31 15:21:02 2011 -0500 + + Various documentation-related changes. + + Preparing wadl for wadl2docbook processing by adding in content from the doc and related markup. + Adding code samples to be used in documentation. + Merging in some changes that Yogi has made but which have not yet been approved. + Updating paths to samples to be ../common/samples + + Change-Id: I922e7a34877f47ef8cf2a272dfc0947f791ed2f9 + + keystone/content/admin/identity-admin.wadl | 158 +++++++++++++++++---- + keystone/content/admin/samples/auth.json | 67 +++++++++ + keystone/content/admin/samples/auth.xml | 60 ++++++++ + .../admin/samples/auth_credentials-OS-EC2.json | 10 ++ + .../admin/samples/auth_credentials-OS-EC2.xml | 11 ++ + .../admin/samples/auth_credentials-RAX-KEY.json | 8 ++ + .../admin/samples/auth_credentials-RAX-KEY.xml | 7 + + .../content/admin/samples/auth_credentials.json | 9 ++ + .../content/admin/samples/auth_credentials.xml | 8 ++ + keystone/content/admin/samples/choices.json | 67 +++++++++ + keystone/content/admin/samples/choices.xml | 38 +++++ + keystone/content/admin/samples/endpoint.json | 6 + + keystone/content/admin/samples/endpoint.xml | 6 + + .../content/admin/samples/endpointTemplate.json | 14 ++ + .../content/admin/samples/endpointTemplate.xml | 17 +++ + .../content/admin/samples/endpointTemplates.json | 54 +++++++ + .../content/admin/samples/endpointTemplates.xml | 62 ++++++++ + keystone/content/admin/samples/endpoints.json | 20 +++ + keystone/content/admin/samples/endpoints.xml | 20 +++ + keystone/content/admin/samples/ext-getuser.json | 22 +++ + keystone/content/admin/samples/ext-getuser.xml | 13 ++ + keystone/content/admin/samples/extension.json | 20 +++ + keystone/content/admin/samples/extension.xml | 23 +++ + keystone/content/admin/samples/extensions.json | 41 ++++++ + keystone/content/admin/samples/extensions.xml | 39 +++++ + keystone/content/admin/samples/getuser-1.json | 25 ++++ + keystone/content/admin/samples/getuser-1.xml | 13 ++ + keystone/content/admin/samples/identity_fault.json | 7 + + keystone/content/admin/samples/identity_fault.xml | 6 + + keystone/content/admin/samples/item_not_found.json | 7 + + keystone/content/admin/samples/item_not_found.xml | 6 + + keystone/content/admin/samples/role.json | 6 + + keystone/content/admin/samples/role.xml | 4 + + keystone/content/admin/samples/roles.json | 13 ++ + keystone/content/admin/samples/roles.xml | 6 + + .../content/admin/samples/samplerequestheader.txt | 4 + + .../content/admin/samples/sampleresponseheader.txt | 4 + + keystone/content/admin/samples/service.json | 7 + + keystone/content/admin/samples/service.xml | 4 + + keystone/content/admin/samples/services.json | 13 ++ + keystone/content/admin/samples/services.xml | 6 + + keystone/content/admin/samples/tenant.json | 8 ++ + keystone/content/admin/samples/tenant.xml | 5 + + keystone/content/admin/samples/tenantlock.json | 5 + + keystone/content/admin/samples/tenantlock.xml | 4 + + keystone/content/admin/samples/tenants-1.json | 18 +++ + keystone/content/admin/samples/tenants-1.xml | 10 ++ + keystone/content/admin/samples/tenants-2.json | 21 +++ + keystone/content/admin/samples/tenants-2.xml | 13 ++ + keystone/content/admin/samples/tenants-3.json | 18 +++ + keystone/content/admin/samples/tenants-3.xml | 10 ++ + keystone/content/admin/samples/tenants-request.txt | 5 + + keystone/content/admin/samples/tenants.json | 17 +++ + keystone/content/admin/samples/tenants.xml | 14 ++ + keystone/content/admin/samples/updatedtenant.json | 8 ++ + keystone/content/admin/samples/updatedtenant.xml | 5 + + keystone/content/admin/samples/user.json | 8 ++ + keystone/content/admin/samples/user.xml | 5 + + keystone/content/admin/samples/validatetoken.json | 19 +++ + keystone/content/admin/samples/validatetoken.xml | 13 ++ + keystone/content/admin/samples/version-atom.xml | 19 +++ + keystone/content/admin/samples/version.json | 30 ++++ + keystone/content/admin/samples/version.xml | 23 +++ + keystone/content/admin/samples/versions-atom.xml | 29 ++++ + keystone/content/admin/samples/versions.json | 37 +++++ + keystone/content/admin/samples/versions.xml | 24 ++++ + 66 files changed, 1271 insertions(+), 28 deletions(-) + +commit 225dc77d88baad800688f72e051aa4c37eeaceab +Author: Yogeshwar Srikrishnan +Date: Tue Aug 30 15:01:07 2011 -0500 + + Consolidating xsds. + Splitting contrib to admin and service. + + Change-Id: I3374c3470d2ed7b7e16297bae685646c3358258e + + etc/keystone.conf | 2 +- + keystone/content/admin/RAX-KSKEY-admin.wadl | 251 +++++++++++++++ + .../content/admin/identity-admin-OS-KSADM.wadl | 6 +- + .../content/admin/identity-admin-RAX-KSADM.wadl | 14 +- + keystone/content/admin/identity-admin.wadl | 9 +- + .../admin/xsd/OS-KSADM-endpointtemplates.xsd | 150 --------- + .../content/admin/xsd/RAX-KSADM-credentials.xsd | 34 -- + keystone/content/admin/xsd/RAX-KSADM-groups.xsd | 47 --- + keystone/content/admin/xsd/RAX-KSADM-users.xsd | 56 ---- + keystone/content/admin/xsd/api-common.xsd | 55 ---- + keystone/content/admin/xsd/api.xsd | 22 -- + keystone/content/admin/xsd/atom/atom.xsd | 115 ------- + keystone/content/admin/xsd/atom/xml.xsd | 287 ----------------- + keystone/content/admin/xsd/credentials.xsd | 79 ----- + keystone/content/admin/xsd/endpoints.xsd | 123 ------- + keystone/content/admin/xsd/extensions.xsd | 60 ---- + keystone/content/admin/xsd/fault.xsd | 138 -------- + keystone/content/admin/xsd/roles.xsd | 70 ---- + keystone/content/admin/xsd/services.xsd | 146 --------- + keystone/content/admin/xsd/tenant.xsd | 151 --------- + keystone/content/admin/xsd/token.xsd | 213 ------------ + keystone/content/admin/xsd/user.xsd | 132 -------- + keystone/content/admin/xsd/version.xsd | 357 --------------------- + .../common/xsd/OS-KSADM-endpointtemplates.xsd | 150 +++++++++ + .../content/common/xsd/OS-KSEC2-credentials.xsd | 35 ++ + .../content/common/xsd/RAX-KSADM-credentials.xsd | 34 ++ + keystone/content/common/xsd/RAX-KSADM-groups.xsd | 47 +++ + keystone/content/common/xsd/RAX-KSADM-users.xsd | 56 ++++ + keystone/content/common/xsd/RAX-KSGRP-groups.xsd | 45 +++ + .../content/common/xsd/RAX-KSKEY-credentials.xsd | 41 +++ + keystone/content/common/xsd/api-common.xsd | 55 ++++ + keystone/content/common/xsd/api.xsd | 21 ++ + keystone/content/common/xsd/atom/atom.xsd | 115 +++++++ + keystone/content/common/xsd/atom/xml.xsd | 287 +++++++++++++++++ + keystone/content/common/xsd/credentials.xsd | 72 +++++ + keystone/content/common/xsd/endpoints.xsd | 123 +++++++ + keystone/content/common/xsd/extensions.xsd | 60 ++++ + keystone/content/common/xsd/fault.xsd | 138 ++++++++ + keystone/content/common/xsd/roles.xsd | 69 ++++ + keystone/content/common/xsd/services.xsd | 146 +++++++++ + keystone/content/common/xsd/tenant.xsd | 151 +++++++++ + keystone/content/common/xsd/token.xsd | 304 ++++++++++++++++++ + keystone/content/common/xsd/user.xsd | 132 ++++++++ + keystone/content/common/xsd/version.xsd | 357 +++++++++++++++++++++ + keystone/content/service/identity.wadl | 8 +- + .../content/service/xsd/OS-KSEC2-credentials.xsd | 35 -- + keystone/content/service/xsd/RAX-KSGRP-groups.xsd | 45 --- + .../content/service/xsd/RAX-KSKEY-credentials.xsd | 41 --- + keystone/content/service/xsd/api-common.xsd | 55 ---- + keystone/content/service/xsd/api.xsd | 21 -- + keystone/content/service/xsd/atom/atom.xsd | 115 ------- + keystone/content/service/xsd/atom/xml.xsd | 287 ----------------- + keystone/content/service/xsd/credentials.xsd | 72 ----- + keystone/content/service/xsd/endpoints.xsd | 123 ------- + keystone/content/service/xsd/extensions.xsd | 60 ---- + keystone/content/service/xsd/fault.xsd | 138 -------- + keystone/content/service/xsd/roles.xsd | 69 ---- + keystone/content/service/xsd/services.xsd | 146 --------- + keystone/content/service/xsd/tenant.xsd | 151 --------- + keystone/content/service/xsd/token.xsd | 304 ------------------ + keystone/content/service/xsd/user.xsd | 132 -------- + keystone/content/service/xsd/version.xsd | 357 --------------------- + keystone/contrib/extensions/admin/__init__.py | 0 + keystone/contrib/extensions/osec2/__init__.py | 0 + keystone/contrib/extensions/osec2/extension.json | 16 - + keystone/contrib/extensions/osec2/extension.xml | 16 - + keystone/contrib/extensions/osec2/frontend.py | 99 ------ + keystone/contrib/extensions/raxgrp/__init__.py | 0 + keystone/contrib/extensions/raxgrp/api.py | 140 -------- + keystone/contrib/extensions/raxgrp/extension.json | 14 - + keystone/contrib/extensions/raxgrp/extension.xml | 13 - + keystone/contrib/extensions/raxkey/__init__.py | 0 + keystone/contrib/extensions/raxkey/extension.json | 14 - + keystone/contrib/extensions/raxkey/extension.xml | 13 - + keystone/contrib/extensions/raxkey/frontend.py | 99 ------ + keystone/contrib/extensions/service/__init__.py | 0 + .../contrib/extensions/service/osec2/__init__.py | 0 + .../extensions/service/osec2/extension.json | 16 + + .../contrib/extensions/service/osec2/extension.xml | 16 + + .../contrib/extensions/service/osec2/frontend.py | 99 ++++++ + .../contrib/extensions/service/raxgrp/__init__.py | 0 + keystone/contrib/extensions/service/raxgrp/api.py | 140 ++++++++ + .../extensions/service/raxgrp/extension.json | 14 + + .../extensions/service/raxgrp/extension.xml | 13 + + .../contrib/extensions/service/raxkey/__init__.py | 0 + .../extensions/service/raxkey/extension.json | 14 + + .../extensions/service/raxkey/extension.xml | 13 + + .../contrib/extensions/service/raxkey/frontend.py | 99 ++++++ + keystone/routers/admin.py | 4 +- + keystone/routers/service.py | 6 +- + keystone/test/etc/ldap.conf.template | 2 +- + keystone/test/etc/memcache.conf.template | 2 +- + keystone/test/etc/sql.conf.template | 2 +- + 93 files changed, 3140 insertions(+), 4838 deletions(-) + +commit 70a24b437d23aada48b6647fe35ceb28008a5484 +Merge: 9527588 9ec316d +Author: Jenkins +Date: Mon Aug 29 16:58:43 2011 +0000 + + Merge "Adding guides for groups extension." + +commit 9ec316df15fdb6f04322b7502532c4d2b98c466b +Author: Yogeshwar Srikrishnan +Date: Mon Aug 29 11:44:15 2011 -0500 + + Adding guides for groups extension. + + Change-Id: I1141f40e8dba0442ed9491ee64c1e9799c9512ef + + .../content/common/samples/authwithgroups.json | 81 +++++++++++++++++++++ + keystone/content/common/samples/authwithgroups.xml | 71 ++++++++++++++++++ + .../content/service/OS-KSEC2-service-devguide.pdf | Bin 93751 -> 93757 bytes + .../content/service/RAX-KSGRP-service-devguide.pdf | Bin 0 -> 94475 bytes + .../content/service/RAX-KSKEY-service-devguide.pdf | Bin 94718 -> 94715 bytes + keystone/contrib/extensions/raxgrp/extension.json | 2 +- + keystone/contrib/extensions/raxgrp/extension.xml | 2 +- + 7 files changed, 154 insertions(+), 2 deletions(-) + +commit 95275881c3df97ee7164358e716e3e0d352ec047 +Merge: a88aae7 3822e78 +Author: Jenkins +Date: Mon Aug 29 16:37:54 2011 +0000 + + Merge "Fix host/port split code in authenticate_ec2. Resolves an AttributeError: 'Ec2Credentials' object has no attribute 'partition' exception that can occur for EC2 auth validations." + +commit a88aae74a2f3e07b085cc108fa6f1673c060de34 +Merge: f5d73af e1254b4 +Author: Jenkins +Date: Mon Aug 29 16:36:14 2011 +0000 + + Merge "Adding guide for RAX-KSKEY-service extension. Adding guide for OS-KSEC2-service extension." + +commit 3822e787466b6bfdf8e0ecc15c913563d8e16c24 +Author: Dan Prince +Date: Sun Aug 28 15:00:57 2011 -0400 + + Fix host/port split code in authenticate_ec2. Resolves an + AttributeError: 'Ec2Credentials' object has no attribute 'partition' + exception that can occur for EC2 auth validations. + + Change-Id: Ib361c2cd56eb96011c9209ab24837bbab11b2dd3 + + keystone/logic/service.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e1254b4f4e39d49a844d172a594ad20ca46aa6b8 +Author: Yogeshwar Srikrishnan +Date: Fri Aug 26 15:28:08 2011 -0500 + + Adding guide for RAX-KSKEY-service extension. + Adding guide for OS-KSEC2-service extension. + + Change-Id: I7a3882f55c0c1e575282c528d5a8d4075cc6e0ce + + .../common/samples/auth_credentials-OS-KSEC2.json | 2 +- + keystone/content/service/OS-KSEC2-service-devguide.pdf | Bin 0 -> 93751 bytes + keystone/content/service/RAX-KSKEY-service-devguide.pdf | Bin 0 -> 94718 bytes + keystone/contrib/extensions/osec2/extension.json | 4 ++-- + keystone/contrib/extensions/osec2/extension.xml | 8 ++++---- + keystone/contrib/extensions/raxgrp/extension.xml | 2 +- + keystone/contrib/extensions/raxkey/extension.json | 4 ++-- + keystone/contrib/extensions/raxkey/extension.xml | 6 +++--- + keystone/test/functional/test_ext_raxkskey.py | 4 ++-- + 9 files changed, 15 insertions(+), 15 deletions(-) + +commit f5d73af8f1bde3818f6d46cc0ccd327667d53535 +Author: Dan Prince +Date: Fri Aug 26 13:54:51 2011 -0400 + + Fix NameError exceptions in add_credentials. Adds test case on creating + credentials. + + Change-Id: Ie856c532735fce77eecb410c77ae73fd8af79de1 + + keystone/manage/api.py | 4 ++-- + keystone/test/sampledata.py | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit b9eee2cd46a5d60015194a292df262acb00bf340 +Author: Yogeshwar Srikrishnan +Date: Wed Aug 24 17:20:28 2011 -0500 + + Redefining credential types. + Defining additional extensions and renaming extensions. + Removed wadls that are not needed. + + Change-Id: Ib0bebb6c6762214eca42a7410a9c43d2f592a960 + + keystone/content/admin/xsd/credentials.xsd | 14 +-- + keystone/content/common/samples/RAX-GRP-group.json | 6 -- + keystone/content/common/samples/RAX-GRP-group.xml | 4 - + .../content/common/samples/RAX-GRP-groups.json | 11 --- + keystone/content/common/samples/RAX-GRP-groups.xml | 5 -- + .../content/common/samples/RAX-KSGRP-group.json | 6 ++ + .../content/common/samples/RAX-KSGRP-group.xml | 4 + + .../content/common/samples/RAX-KSGRP-groups.json | 11 +++ + .../content/common/samples/RAX-KSGRP-groups.xml | 5 ++ + .../common/samples/auth_credentials-OS-EC2.json | 10 --- + .../common/samples/auth_credentials-OS-EC2.xml | 11 --- + .../common/samples/auth_credentials-OS-KSEC2.json | 10 +++ + .../common/samples/auth_credentials-OS-KSEC2.xml | 10 +++ + .../common/samples/auth_credentials-RAX-KEY.json | 8 -- + .../common/samples/auth_credentials-RAX-KEY.xml | 7 -- + .../common/samples/auth_credentials-RAX-KSKEY.json | 8 ++ + .../common/samples/auth_credentials-RAX-KSKEY.xml | 7 ++ + .../content/common/samples/auth_credentials.xml | 3 +- + keystone/content/service/identity-RAX-KEY.wadl | 87 ------------------- + .../content/service/xsd/OS-KSEC2-credentials.xsd | 35 ++++++++ + keystone/content/service/xsd/RAX-GRP-groups.xsd | 55 ------------ + .../content/service/xsd/RAX-KEY-credentials.xsd | 41 --------- + keystone/content/service/xsd/RAX-KSGRP-groups.xsd | 45 ++++++++++ + .../content/service/xsd/RAX-KSKEY-credentials.xsd | 41 +++++++++ + keystone/content/service/xsd/credentials.xsd | 16 +--- + keystone/contrib/extensions/osec2/__init__.py | 0 + keystone/contrib/extensions/osec2/extension.json | 16 ++++ + keystone/contrib/extensions/osec2/extension.xml | 16 ++++ + keystone/contrib/extensions/osec2/frontend.py | 99 ++++++++++++++++++++++ + keystone/contrib/extensions/raxgrp/extension.json | 12 ++- + keystone/contrib/extensions/raxgrp/extension.xml | 8 +- + keystone/contrib/extensions/raxkey/extension.json | 12 ++- + keystone/contrib/extensions/raxkey/extension.xml | 8 +- + keystone/test/functional/test_ext_raxkskey.py | 31 +++++++ + keystone/test/functional/test_ext_rs_key_auth.py | 30 ------- + 35 files changed, 373 insertions(+), 319 deletions(-) + +commit f42896d23cf85d3f2c06f34b9dc88a70d0d78f4d +Author: Carlos Marin +Date: Thu Aug 25 20:27:09 2011 -0500 + + Fix for duplicate tag on credentials.xsd. + + Change-Id: I2ca766d7f95aab123a69065adadaea9773e3f143 + + keystone/content/admin/xsd/credentials.xsd | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 72450b4a93580d2d0d9fcc64f737ed45dab2c18f +Author: Dan Prince +Date: Thu Aug 25 08:15:41 2011 -0400 + + Move tools/tracer into the keystone code. + Fixes ImportError's when running keystone as a .deb package. + + Change-Id: I194cdca188c5b916f222fd68ad41dc2671023aab + + bin/keystone | 2 +- + bin/keystone-admin | 2 +- + bin/keystone-auth | 2 +- + keystone/common/config.py | 2 +- + keystone/middleware/auth_token.py | 2 +- + keystone/tools/__init__.py | 19 +++++++ + keystone/tools/tracer.py | 113 +++++++++++++++++++++++++++++++++++++ + tools/tracer.py | 115 -------------------------------------- + 8 files changed, 137 insertions(+), 120 deletions(-) + +commit 4f16376c2db0e55d94a606f6443a3f89ecfccaf9 +Merge: 78232aa 2a7181c +Author: Jenkins +Date: Tue Aug 23 18:36:18 2011 +0000 + + Merge "Fixed error where endpoints returned for tenant instead of token" + +commit 78232aacd984290408c4ec8aadf38d016c6b8e05 +Merge: 7a5dc78 f6cdb50 +Author: Jenkins +Date: Tue Aug 23 18:34:34 2011 +0000 + + Merge "Updated the AUTHORS file to test the new rpc script and workflow." + +commit 7a5dc783423da3f9b417068a39bf6fc5225a61c4 +Merge: 6287174 2f76856 +Author: Jenkins +Date: Tue Aug 23 18:32:15 2011 +0000 + + Merge "Made it possible to integrate with external LDAP." + +commit 2a7181cc2405dc8ee9bb7ef0ed0ea6d846c76735 +Author: Ziad Sawalha +Date: Tue Aug 23 13:28:40 2011 -0500 + + Fixed error where endpoints returned for tenant instead of token + + Change-Id: I40a6e2e3c0c95ca2b9968ec2ae2f95a2454cfa94 + + keystone/content/admin/identity-admin.wadl | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +commit f6cdb50f638d18ab998c08d9a026558c8bfb0dd6 +Author: Josh Kearney +Date: Tue Aug 23 09:53:00 2011 -0500 + + Updated the AUTHORS file to test the new rpc script and workflow. + + Change-Id: I015549ebe75d106f3685b98a417b0ab651e23831 + + AUTHORS | 1 + + 1 file changed, 1 insertion(+) + +commit 628717483738144e1c0c4b4f6b8bd24d1242f591 +Author: James E. Blair +Date: Tue Aug 23 07:45:33 2011 -0700 + + Update rfc.sh to use 'true'. + + true is /usr/bin/true os OSX but is in the path + on both GNU/Linux and OSX. + + Change-Id: If7b251ea80fccd04faf428c0c232b918a488623c + + tools/rfc.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2f76856dffeb5224fb1612bb03a74a373a1a528b +Author: Yuriy Taraday +Date: Tue Aug 23 16:28:17 2011 +0400 + + Made it possible to integrate with external LDAP. + + All object classes are made auxiliary, add ability to specify what strutural + classes to use and what attribute type should be treated as object identifier. + + Change-Id: I4b2cc8cc6f2a1d93e82005543ce99be4bae23b5b + + keystone/backends/ldap/api/base.py | 30 ++++++++++++++++++++++++++---- + keystone/backends/ldap/api/role.py | 30 +++++++++++++++++++----------- + keystone/backends/ldap/api/tenant.py | 13 ++++++++++--- + keystone/backends/ldap/api/user.py | 4 +++- + keystone/backends/ldap/keystone.ldif | 28 +++++++++++++++++----------- + keystone/backends/ldap/keystone.schema | 28 ++++++++++++++++++---------- + 6 files changed, 93 insertions(+), 40 deletions(-) + +commit d349b349c50e0683432f5ae843bd2dc83599c1b6 +Author: Ziad Sawalha +Date: Mon Aug 22 23:32:18 2011 -0500 + + Dev guide rebuild and minor fixes + + Change-Id: I99a89a362bd5aaf715f125916d193acf75067b44 + + Change-Id: I4fff366f32f91a1f8f804b71fd89122064506330 + + keystone/content/admin/identityadminguide.pdf | Bin 237544 -> 240159 bytes + keystone/content/common/samples/role.xml | 5 +++-- + keystone/content/common/samples/roles.json | 2 ++ + keystone/content/common/samples/roles.xml | 4 ++-- + keystone/content/service/identitydevguide.pdf | Bin 182137 -> 184911 bytes + 5 files changed, 7 insertions(+), 4 deletions(-) + +commit b7647a2bd7ba6468f9c47da7e2ab2feb8bd18b10 +Author: Ziad Sawalha +Date: Mon Aug 22 22:02:43 2011 -0500 + + Updates to samples, XSDs, and WADLs + + Change-Id: I89a89a362bd5aaf715f125916d193acf75067b32 + + .../content/admin/identity-admin-OS-KSADM.wadl | 6 +- + keystone/content/admin/identity-admin.wadl | 13 +- + .../admin/xsd/OS-KSADM-endpointtemplates.xsd | 150 +++++++++++++++++++++ + keystone/content/admin/xsd/api-common.xsd | 3 +- + keystone/content/admin/xsd/credentials.xsd | 82 ++++++----- + keystone/content/admin/xsd/endpoints.xsd | 116 +++------------- + keystone/content/admin/xsd/extensions.xsd | 2 + + keystone/content/admin/xsd/fault.xsd | 2 + + keystone/content/admin/xsd/roles.xsd | 7 +- + keystone/content/admin/xsd/services.xsd | 5 +- + keystone/content/admin/xsd/tenant.xsd | 10 +- + keystone/content/admin/xsd/token.xsd | 5 +- + keystone/content/admin/xsd/user.xsd | 29 ++-- + keystone/content/common/samples/auth.json | 10 +- + keystone/content/common/samples/ext-getuser.json | 1 - + keystone/content/common/samples/ext-getuser.xml | 2 +- + keystone/content/common/samples/getuser-1.json | 1 - + keystone/content/common/samples/getuser-1.xml | 2 +- + keystone/content/common/samples/service.xml | 2 +- + keystone/content/common/samples/user.json | 4 +- + keystone/content/common/samples/user.xml | 2 +- + keystone/content/common/samples/validatetoken.json | 3 +- + keystone/content/common/samples/validatetoken.xml | 7 +- + keystone/content/service/identity.wadl | 1 + + keystone/content/service/xsd/api-common.xsd | 3 +- + keystone/content/service/xsd/credentials.xsd | 8 +- + keystone/content/service/xsd/endpoints.xsd | 106 ++------------- + keystone/content/service/xsd/extensions.xsd | 2 + + keystone/content/service/xsd/fault.xsd | 2 + + keystone/content/service/xsd/roles.xsd | 3 +- + keystone/content/service/xsd/services.xsd | 2 + + keystone/content/service/xsd/tenant.xsd | 9 +- + keystone/content/service/xsd/token.xsd | 6 +- + keystone/content/service/xsd/user.xsd | 2 +- + 34 files changed, 317 insertions(+), 291 deletions(-) + +commit ce408112fa316b5d21739acbc534ffb6bae3cb5f +Merge: 60eced8 b838694 +Author: Jenkins +Date: Mon Aug 22 22:38:56 2011 +0000 + + Merge changes I6604ea0e,I98a078e4 + + * changes: + Sample changes to support v2.0 api + Sample changes to support v2.0 api + +commit 60eced8ce0e214090c2b9d7e5548e07506bc8b73 +Merge: e2df80c 25d21f7 +Author: Jenkins +Date: Mon Aug 22 21:19:31 2011 +0000 + + Merge "Changes to support endpoint template updates." + +commit e2df80ce41a68973fd8dad5332993da8ce4f7ec1 +Merge: 29a5fa8 3a43f81 +Author: Jenkins +Date: Mon Aug 22 21:17:50 2011 +0000 + + Merge "Fixes bug 831574. Adds missing sys import." + +commit 29a5fa8e20bd805577c9948a0bd4ea81589a1f20 +Author: Josh Kearney +Date: Mon Aug 22 16:12:23 2011 -0500 + + Added AUTHORS, .mailmap and generate_authors.sh. + + Change-Id: I600b3fad14df00dc8c33e20669dfe2edca085efe + + .mailmap | 13 +++++++++++++ + AUTHORS | 33 +++++++++++++++++++++++++++++++++ + tools/generate_authors.sh | 3 +++ + 3 files changed, 49 insertions(+) + +commit 25d21f777f72b7d503055b48266d1e8cd1ed3d01 +Author: Yogeshwar Srikrishnan +Date: Mon Aug 22 15:46:04 2011 -0500 + + Changes to support endpoint template updates. + + Change-Id: I29915584ce87a6646a49c763cb28e0c8d9514a08 + + keystone/backends/api.py | 3 + + .../backends/sqlalchemy/api/endpoint_template.py | 11 +- + keystone/controllers/endpointtemplates.py | 9 ++ + keystone/logic/service.py | 40 +++++- + keystone/routers/admin.py | 4 + + keystone/test/unit/test_common.py | 64 ++++++++-- + keystone/test/unit/test_endpoints.py | 141 ++++++++++++++++++--- + 7 files changed, 240 insertions(+), 32 deletions(-) + +commit 3a43f81cc8487e85961213b51dae9a22df0f972d +Author: Josh Kearney +Date: Mon Aug 22 14:25:16 2011 -0500 + + Fixes bug 831574. Adds missing sys import. + + Change-Id: I945d2d45e4cbb7637b11925b20d9caa7dd03a900 + + keystone/common/template.py | 1 + + 1 file changed, 1 insertion(+) + +commit 6a0b030107187a0ccf8f968f04d750b41610db7b +Author: Ziad Sawalha +Date: Mon Aug 22 12:58:15 2011 -0500 + + Updated schema to reflect id and name changes to Users and Tenants + + Change-Id: I45523888930c8237e60a98873aac1279a0c8ae30 + + keystone/content/admin/xsd/tenant.xsd | 5 +-- + keystone/content/admin/xsd/user.xsd | 52 ++++++++++++++++++++++++++--- + keystone/content/service/xsd/endpoints.xsd | 4 +-- + keystone/content/service/xsd/roles.xsd | 4 +-- + keystone/content/service/xsd/tenant.xsd | 2 +- + keystone/content/service/xsd/token.xsd | 2 +- + keystone/content/service/xsd/user.xsd | 53 +++++++++++++++++++++++++++--- + 7 files changed, 106 insertions(+), 16 deletions(-) + +commit acd108bef40cac8ba71db9095dbc98155dcc8201 +Author: Ziad Sawalha +Date: Sun Aug 21 12:08:48 2011 -0500 + + Updated guides and samples + + Change-Id: I122e389fb4205fa430bcc01ecc19f61e311fe2da + + keystone/content/admin/identityadminguide.pdf | Bin 305127 -> 237544 bytes + keystone/content/common/samples/ext-getuser.json | 5 +++-- + keystone/content/common/samples/ext-getuser.xml | 8 ++++---- + keystone/content/common/samples/getuser-1.json | 9 ++++----- + keystone/content/common/samples/getuser-1.xml | 11 +++++------ + .../common/samples/samplerequestheader.json | 4 ---- + .../content/common/samples/samplerequestheader.txt | 4 ++++ + .../common/samples/sampleresponseheader.json | 4 ---- + .../common/samples/sampleresponseheader.txt | 4 ++++ + keystone/content/common/samples/service.json | 1 + + keystone/content/common/samples/service.xml | 2 +- + keystone/content/common/samples/services.json | 6 ++++-- + keystone/content/common/samples/services.xml | 4 ++-- + keystone/content/common/samples/tenant.json | 1 + + keystone/content/common/samples/tenant.xml | 2 +- + keystone/content/common/samples/tenants-1.json | 1 + + keystone/content/common/samples/tenants-1.xml | 2 +- + keystone/content/common/samples/tenants-2.json | 1 + + keystone/content/common/samples/tenants-2.xml | 2 +- + keystone/content/common/samples/tenants-3.json | 1 + + keystone/content/common/samples/tenants-3.xml | 2 +- + keystone/content/common/samples/tenants.json | 2 ++ + keystone/content/common/samples/tenants.xml | 4 ++-- + keystone/content/common/samples/updatedtenant.json | 1 + + keystone/content/common/samples/updatedtenant.xml | 2 +- + keystone/content/common/samples/user.json | 8 ++++++++ + keystone/content/common/samples/user.xml | 5 +++++ + keystone/content/common/samples/validatetoken.json | 9 +++------ + keystone/content/common/samples/validatetoken.xml | 4 ++-- + keystone/content/service/identitydevguide.pdf | Bin 305127 -> 182137 bytes + 30 files changed, 64 insertions(+), 45 deletions(-) + +commit 88c05ef0f5c7fd9556fc5536f58b96946ac3ba86 +Author: Ziad Sawalha +Date: Sat Aug 20 11:25:49 2011 -0500 + + Additional contract changes + + Change-Id: I727da8684072cab89c8048c6fee44366ba85e500 + + .../content/admin/identity-admin-OS-KSADM.wadl | 638 +++++++++ + keystone/content/admin/identity-admin-OS.wadl | 642 --------- + .../content/admin/identity-admin-RAX-KSADM.wadl | 1455 ++++++++++++++++++++ + keystone/content/admin/identity-admin-RAX.wadl | 1444 ------------------- + keystone/content/admin/identity-admin.wadl | 64 +- + .../content/admin/xsd/RAX-KSADM-credentials.xsd | 34 + + keystone/content/admin/xsd/RAX-KSADM-groups.xsd | 47 + + keystone/content/admin/xsd/RAX-KSADM-users.xsd | 56 + + keystone/content/admin/xsd/RAX-credentials.xsd | 32 - + keystone/content/admin/xsd/RAX-groups.xsd | 47 - + keystone/content/admin/xsd/RAX-users.xsd | 54 - + keystone/content/admin/xsd/token.xsd | 1 - + keystone/content/common/samples/validatetoken.xml | 2 +- + keystone/content/service/identity-RAX-KEY.wadl | 5 +- + keystone/content/service/xsd/RAX-GRP-groups.xsd | 21 +- + .../content/service/xsd/RAX-KEY-credentials.xsd | 11 +- + keystone/content/service/xsd/services.xsd | 2 +- + 17 files changed, 2294 insertions(+), 2261 deletions(-) + +commit 1a49665baf4942b6f1d1f0f674caf920f679069e +Author: Ziad Sawalha +Date: Fri Aug 19 18:52:08 2011 -0500 + + Sample changes + + Change-Id: Icf64f0d116656aa3bb52f09475fa504494425bfc + + keystone/content/common/samples/auth.json | 10 ++-- + keystone/content/common/samples/choices.json | 14 ++--- + keystone/content/common/samples/choices.xml | 67 +++++++++++------------ + keystone/content/common/samples/version-atom.xml | 2 +- + keystone/content/common/samples/version.json | 8 +-- + keystone/content/common/samples/version.xml | 8 +-- + keystone/content/common/samples/versions-atom.xml | 2 +- + keystone/content/common/samples/versions.xml | 14 ++--- + keystone/content/service/xsd/tenant.xsd | 2 +- + 9 files changed, 62 insertions(+), 65 deletions(-) + +commit 90109cb5dc2f29165dc269e42395b6cbdfa09276 +Author: Jorge L. Williams +Date: Fri Aug 19 17:46:14 2011 -0500 + + Atom links on Token. + + Change-Id: Ifeeacb1bc959298b8c50246e7b08d2cc7ac67609 + + keystone/content/service/xsd/token.xsd | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 49c47e5dd37b3e40f694b5139bd9d650ac8905f4 +Author: Jorge L. Williams +Date: Fri Aug 19 17:26:35 2011 -0500 + + Cleanup service it endpoint catalog. + + Change-Id: I79bd57e1d7b66319af219caf8aad4a219f94fc8d + + keystone/content/service/xsd/api.xsd | 1 - + keystone/content/service/xsd/token.xsd | 89 ++++++++++++++++++++++++++++++++-- + 2 files changed, 86 insertions(+), 4 deletions(-) + +commit 7742b27e0cb16e3daa1828be9999cfaa30e057d1 +Merge: a7af1ea d2689ed +Author: Jenkins +Date: Fri Aug 19 22:03:10 2011 +0000 + + Merge "Removed redundant function from base user api" + +commit a7af1eafc4d54e7722e9599e31c2d5045a411bb3 +Merge: 27281b6 c07bff7 +Author: Jenkins +Date: Fri Aug 19 22:01:09 2011 +0000 + + Merge "Updated samples" + +commit 27281b6cfd73ccedb18ac97c1a29a821c3716e51 +Merge: 244ea16 95cb22b +Author: Jenkins +Date: Fri Aug 19 21:58:36 2011 +0000 + + Merge "Reworked XSDs and WADL to support auth and access elements." + +commit d2689eda08f2b741ac3be5bb11721310a8d820ee +Author: Dolph Mathews +Date: Fri Aug 19 16:36:14 2011 -0500 + + Removed redundant function from base user api + + Change-Id: I7b1630019a926841f11fc2766e312b80b1b5896d + + keystone/backends/api.py | 3 --- + 1 file changed, 3 deletions(-) + +commit c07bff7f94f0d8474fd9cb3e0e1abf2220448394 +Author: Ziad Sawalha +Date: Fri Aug 19 16:35:15 2011 -0500 + + Updated samples + + Change-Id: Ie01a113028ddacfd773bd937fdb08a600f380129 + + keystone/content/common/samples/auth.json | 10 +++++----- + keystone/content/common/samples/auth.xml | 16 ++++++++-------- + .../content/common/samples/auth_credentials-OS-EC2.json | 12 +++++++----- + .../content/common/samples/auth_credentials-OS-EC2.xml | 6 +++++- + .../content/common/samples/auth_credentials-RAX-KEY.json | 11 ++++++----- + .../content/common/samples/auth_credentials-RAX-KEY.xml | 8 ++++---- + keystone/content/common/samples/auth_credentials.json | 11 +++++++---- + keystone/content/common/samples/auth_credentials.xml | 9 ++++++--- + 8 files changed, 48 insertions(+), 35 deletions(-) + +commit 244ea16510de9801adfcb2b4a9bee7708db22875 +Author: Dolph Mathews +Date: Fri Aug 19 16:26:40 2011 -0500 + + Fixed reference to unassigned variable + + Change-Id: I27bdccb377fd7c9dc860f14bb165161ca68f39c7 + + keystone/manage/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 95cb22bfa29ce3bf5abed3f9fbe96559e9e1107f +Author: Jorge L. Williams +Date: Fri Aug 19 15:55:56 2011 -0500 + + Reworked XSDs and WADL to support auth and access elements. + + Change-Id: Ibf8cd4311eb56fbd8d2386be7f65ac800e09518c + + keystone/content/service/identity.wadl | 4 +- + keystone/content/service/xsd/credentials.xsd | 70 ++++++++++++++++------------ + keystone/content/service/xsd/token.xsd | 4 +- + 3 files changed, 43 insertions(+), 35 deletions(-) + +commit 7243c2902376ce9dd13d73830f68505cbe0ce267 +Merge: f50ed1e a9f525b +Author: Jenkins +Date: Fri Aug 19 20:27:05 2011 +0000 + + Merge "Remove more group stuff" + +commit a9f525b1a90d83c82a907187cbd65ff9f80fe8bb +Author: Ziad Sawalha +Date: Fri Aug 19 14:29:10 2011 -0500 + + Remove more group stuff + + - PEP8 fixes + + Change-Id: I57768e3fe6560bd65f364ada31074a6d8bcc158f + + keystone/backends/api.py | 81 ------------- + keystone/contrib/extensions/raxgrp/__init__.py | 0 + keystone/contrib/extensions/raxgrp/api.py | 140 ++++++++++++++++++++++ + keystone/contrib/extensions/raxgrp/extension.json | 16 +++ + keystone/contrib/extensions/raxgrp/extension.xml | 15 +++ + keystone/contrib/extensions/raxkey/extension.json | 4 +- + keystone/contrib/extensions/raxkey/extension.xml | 7 +- + keystone/routers/admin.py | 2 +- + 8 files changed, 178 insertions(+), 87 deletions(-) + +commit f50ed1ef8b2620ba5a10b8918543f316b6de20f8 +Merge: ba96209 323a1d3 +Author: Jenkins +Date: Fri Aug 19 20:21:16 2011 +0000 + + Merge "Documentation cleanups." + +commit ba96209fbbc25312b039b53ba107b69e7c3c7016 +Merge: a881062 e710bc0 +Author: Jenkins +Date: Fri Aug 19 20:11:52 2011 +0000 + + Merge "Removed OSX files that shouldn't be in git." + +commit a88106298751e21e802066bee140023e406530ca +Merge: c536e9b c856662 +Author: Jenkins +Date: Fri Aug 19 20:08:38 2011 +0000 + + Merge "Banished .DS_Store" + +commit c536e9bd4a701ca89d6a568d4006f039ca43212f +Merge: ac18f8d bf645d6 +Author: Jenkins +Date: Fri Aug 19 20:06:54 2011 +0000 + + Merge "XSD & sample updates" + +commit e710bc072518c8fb2ccbffcaeb1bc47983aa00d4 +Author: Monty Taylor +Date: Fri Aug 19 16:04:21 2011 -0400 + + Removed OSX files that shouldn't be in git. + + Change-Id: Ib69d5ff62d4e2313dd1ba1708c73fd824e94e9f4 + + keystone/content/admin/.DS_Store | Bin 6148 -> 0 bytes + keystone/content/service/.DS_Store | Bin 6148 -> 0 bytes + 2 files changed, 0 insertions(+), 0 deletions(-) + +commit 323a1d39ee96e7f25bbdf978803a8ae105cf52b8 +Author: Jorge L. Williams +Date: Fri Aug 19 14:38:16 2011 -0500 + + Documentation cleanups. + + Change-Id: Iaccb5f5351034faa8aa3e518d0597ec246886acf + + keystone/content/service/identity.wadl | 45 +++++++++++++++++++--------------- + 1 file changed, 25 insertions(+), 20 deletions(-) + +commit ac18f8d3e7d87d98636b36d96ad604031132ac14 +Merge: a8f2656 2055fbc +Author: Jenkins +Date: Fri Aug 19 19:07:50 2011 +0000 + + Merge "Wrong common namespace." + +commit c8566629c6a05cac1511f18506bc79b4e0f2ac51 +Author: Dolph Mathews +Date: Fri Aug 19 14:00:16 2011 -0500 + + Banished .DS_Store + + - Deleting .DS_Store files + - Added .DS_Store to gitignore + + Change-Id: Iec50ddd09090955dc72ae80101cf152e5462d825 + + .gitignore | 1 + + keystone/content/admin/.DS_Store | Bin 6148 -> 0 bytes + keystone/content/service/.DS_Store | Bin 6148 -> 0 bytes + 3 files changed, 1 insertion(+) + +commit a8f2656cae5b5939ec3c43599881d5af1e1add0a +Author: James E. Blair +Date: Fri Aug 19 11:59:13 2011 -0700 + + Add rfc.sh for git review. + + Adding tools/rfc.sh which facilitates an easier git/gerrit workflow + described at http://wiki.openstack.org/GerritWorkflow + + Adding it to the repository is a pre-requisite, instructions on how + to start using it will be sent to the mailing list soon. + + Change-Id: I155518d90f59fb6a04012c9b2786a260cf8d3ff1 + + tools/rfc.sh | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 136 insertions(+) + +commit 2055fbc2e0aa2e0769f1f373b21fd229604f9e2c +Author: Jorge L. Williams +Date: Fri Aug 19 13:40:52 2011 -0500 + + Wrong common namespace. + + Change-Id: I033d976e4501cf48cdc641d1bbaae07f2bd9c94d + + keystone/content/service/identity.wadl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bf645d67bc6a7be52d0b6109d30ada59e13642d9 +Author: Dolph Mathews +Date: Fri Aug 19 10:58:04 2011 -0500 + + XSD & sample updates + + - Removed default tenant from samples + - Added tenantId to service catalog endpoints + - Removed tenantId from credentials XSD's + - Fixed syntax issues in JSON samples + - Formatted JSON samples + + Change-Id: Ic89001df5fa744321b8ba6a7d6bc47648a30ee08 + + keystone/content/admin/xsd/credentials.xsd | 1 - + keystone/content/common/samples/auth.json | 52 +++++++++---- + keystone/content/common/samples/auth.xml | 4 + + .../common/samples/auth_credentials-OS-EC2.json | 6 +- + .../common/samples/auth_credentials-RAX-KEY.json | 6 +- + .../content/common/samples/auth_credentials.json | 7 +- + .../content/common/samples/auth_credentials.xml | 3 +- + keystone/content/common/samples/choices.json | 85 ++++++++++------------ + keystone/content/common/samples/endpoint.json | 6 +- + .../content/common/samples/endpointTemplate.json | 18 ++--- + .../content/common/samples/endpointTemplates.json | 82 ++++++++++----------- + keystone/content/common/samples/endpoints.json | 34 ++++----- + keystone/content/common/samples/ext-getuser.json | 26 +++---- + keystone/content/common/samples/extension.json | 29 ++++---- + keystone/content/common/samples/extensions.json | 61 ++++++++-------- + keystone/content/common/samples/getuser-1.json | 36 +++++---- + keystone/content/common/samples/group.json | 6 +- + keystone/content/common/samples/groups.json | 12 ++- + .../content/common/samples/identity_fault.json | 8 +- + .../content/common/samples/item_not_found.json | 8 +- + keystone/content/common/samples/role.json | 8 +- + keystone/content/common/samples/roleRef.json | 8 +- + keystone/content/common/samples/roleRefs.json | 17 ++--- + keystone/content/common/samples/roles.json | 13 ++-- + keystone/content/common/samples/service.json | 6 +- + keystone/content/common/samples/services.json | 13 ++-- + keystone/content/common/samples/tenant.json | 8 +- + keystone/content/common/samples/tenantlock.json | 4 +- + keystone/content/common/samples/tenants-1.json | 16 ++-- + keystone/content/common/samples/tenants-2.json | 23 +++--- + keystone/content/common/samples/tenants-3.json | 16 ++-- + keystone/content/common/samples/tenants.json | 24 +++--- + keystone/content/common/samples/updatedtenant.json | 8 +- + keystone/content/common/samples/validatetoken.json | 31 ++++---- + keystone/content/common/samples/version.json | 45 ++++++------ + keystone/content/common/samples/versions.json | 46 ++++++------ + keystone/content/service/identity.wadl | 9 ++- + keystone/content/service/xsd/credentials.xsd | 15 +--- + 38 files changed, 388 insertions(+), 412 deletions(-) + +commit 47fc81f85691b08c8a2027c108f3a31a949de6d1 +Author: Monty Taylor +Date: Fri Aug 19 03:05:14 2011 -0400 + + Added more missing files to MANIFEST.in. + + With all of these added, the tests finally work in an expanded tarball. + + Change-Id: I964efd008cc93e4c3cd97c9e597ff0b3202f70d3 + + MANIFEST.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 00f79857dcdf224dcbc9961bec0eca6e3cda2ec9 +Author: Ziad Sawalha +Date: Thu Aug 18 19:58:10 2011 -0500 + + hanges to allow test to work on python 2.6.*. + + Change-Id: Ie0502662c712295fa6885fc2d06c106003036143 + + keystone/test/functional/test_ext_rs_key_auth.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 22d8c6a938b0ca3c28d5370b852a6e114079211e +Author: Ziad Sawalha +Date: Thu Aug 18 19:44:47 2011 -0500 + + Cleaned up come issues with python2.6. + + While working on packaging, we've discovered that the unittests do not work + on python2.6/Ubuntu Maverick. The first change to + keystone/common/template.py fixes an exception misuse. The rest are all + being explicit about using unittest2, because on 2.6 in some cases if you + just import unittest, you get left with an old API. + + Change-Id: I783ef1cc14860578f8f61ae23e1afe8ac8f293a7 + + keystone/common/template.py | 3 ++- + keystone/test/functional/common.py | 2 +- + keystone/test/functional/test_auth.py | 2 +- + keystone/test/functional/test_extensions.py | 2 +- + keystone/test/functional/test_issue_85.py | 2 +- + keystone/test/functional/test_request_specs.py | 2 +- + keystone/test/functional/test_static_files.py | 2 +- + keystone/test/unit/base.py | 2 +- + keystone/test/unit/test_auth.py | 2 +- + keystone/test/unit/test_authentication.py | 2 +- + keystone/test/unit/test_common.py | 2 +- + keystone/test/unit/test_ec2_authn.py | 2 +- + keystone/test/unit/test_endpoints.py | 2 +- + keystone/test/unit/test_normalizingfilter.py | 2 +- + keystone/test/unit/test_roles.py | 2 +- + keystone/test/unit/test_server.py | 2 +- + keystone/test/unit/test_services.py | 2 +- + keystone/test/unit/test_tenants.py | 2 +- + keystone/test/unit/test_token.py | 2 +- + keystone/test/unit/test_users.py | 2 +- + keystone/test/unit/test_version.py | 2 +- + 21 files changed, 22 insertions(+), 21 deletions(-) + +commit 902497c84c2f1e3ff8630fcfa2c3aa10f4df1210 +Author: Dolph Mathews +Date: Thu Aug 18 14:59:27 2011 -0500 + + Refactored manage.py to be both testable and useful for testing + + - Added keystone.test.functional.test_core_api, with example + - Also revised imports in functional tests + + Change-Id: I2af73d6978c44944554d63283c41e43cc8aca214 + + keystone/manage.py | 459 ----------------------- + keystone/manage/__init__.py | 246 ++++++++++++ + keystone/manage/api.py | 245 ++++++++++++ + keystone/test/__init__.py | 2 +- + keystone/test/functional/test_auth.py | 14 +- + keystone/test/functional/test_core_api.py | 49 +++ + keystone/test/functional/test_ext_rs_key_auth.py | 4 +- + keystone/test/functional/test_extensions.py | 6 +- + keystone/test/functional/test_issue_85.py | 8 +- + keystone/test/functional/test_request_specs.py | 6 +- + keystone/test/functional/test_static_files.py | 6 +- + 11 files changed, 563 insertions(+), 482 deletions(-) + +commit b8386945a5f2018e2ce41f746e7e008f60cdc900 +Author: Joe Savak +Date: Thu Aug 18 10:40:56 2011 -0500 + + Sample changes to support v2.0 api + + Change-Id: I6604ea0ee4b3d22134b7495afe40da65b7b60845 + + keystone/content/common/samples/group.json | 6 ------ + keystone/content/common/samples/group.xml | 4 ---- + keystone/content/common/samples/groups.json | 11 ----------- + keystone/content/common/samples/groups.xml | 5 ----- + 4 files changed, 26 deletions(-) + +commit aaef563abd6e50e78056c9548946272d9e94181e +Author: Joe Savak +Date: Thu Aug 18 10:40:34 2011 -0500 + + Sample changes to support v2.0 api + + Change-Id: I98a078e4e917d519b4f72d0f4d3f7a2c981e3f36 + + keystone/content/common/samples/RAX-GRP-group.json | 6 ++++++ + keystone/content/common/samples/RAX-GRP-group.xml | 4 ++++ + keystone/content/common/samples/RAX-GRP-groups.json | 11 +++++++++++ + keystone/content/common/samples/RAX-GRP-groups.xml | 5 +++++ + keystone/content/common/samples/roleRef.json | 7 ------- + keystone/content/common/samples/roleRef.xml | 4 ---- + keystone/content/common/samples/roleRefs.json | 13 ------------- + keystone/content/common/samples/roleRefs.xml | 9 --------- + 8 files changed, 26 insertions(+), 33 deletions(-) + +commit d43876ce8e103880aa172daf7eff9ee5b24bb334 +Merge: b9898e6 c256b7c +Author: Jenkins +Date: Wed Aug 17 22:41:14 2011 +0000 + + Merge "Admin WADL Revisions" + +commit c256b7c7d5f5402d12681efd0f6d81c24e2fc933 +Author: Dolph Mathews +Date: Tue Aug 16 17:43:03 2011 -0500 + + Admin WADL Revisions + + - Based on http://etherpad.openstack.org/KeystoneV2APIcore + - Switched to imported faults + - Revised method identifiers + - Documented all methods + + Change-Id: I122da8ca052e564f47bf2a60adeacce332af01e3 + + keystone/content/admin/identity-admin-OS.wadl | 884 ++++++++------- + keystone/content/admin/identity-admin.wadl | 1471 ++++--------------------- + keystone/content/common/common.ent | 12 +- + keystone/routers/admin.py | 2 + + 4 files changed, 633 insertions(+), 1736 deletions(-) + +commit b9898e6d36813a57a82a345059f8af91b4cbd342 +Author: Monty Taylor +Date: Wed Aug 17 17:33:34 2011 -0400 + + Add the files in keystone/test/etc. + + Change-Id: Ic9de1adb8bc2116836f7ab060ab54a2552496f49 + + MANIFEST.in | 1 + + 1 file changed, 1 insertion(+) + +commit 36629f98c2b7cf53d60c924a674480e345b36a6d +Author: Monty Taylor +Date: Wed Aug 17 17:15:02 2011 -0400 + + Add run_tests.* to the MANIFEST.in. + + Change-Id: I2907628fa65ff7cf843ab4109e53116a35429b93 + + MANIFEST.in | 2 ++ + 1 file changed, 2 insertions(+) + +commit c6a0ca3e0484ccacc075691f525233bdb7bcc008 +Merge: 73d2673 8e3298c +Author: Jenkins +Date: Wed Aug 17 17:37:06 2011 +0000 + + Merge "Keystone manage.py cleanup" + +commit 8e3298c4be6a4c9e5bf4c5d727deab366154a01c +Author: Dolph Mathews +Date: Wed Aug 17 12:01:08 2011 -0500 + + Keystone manage.py cleanup + + Change-Id: Iaced09f5ad8b20618ddba29f4cb24f4df2fdc359 + + keystone/manage.py | 134 ++++++++++++++++++++++++----------------------------- + 1 file changed, 60 insertions(+), 74 deletions(-) + +commit 73d26734d63f36044d108d7e4670dbc868dae396 +Author: Dolph Mathews +Date: Wed Aug 17 11:00:07 2011 -0500 + + Tests running on in-memory sqlite db + + Change-Id: I79e26b38416f0c143a0e83bb601c0046bb3dcf02 + + keystone/backends/sqlalchemy/__init__.py | 20 ++++++++++++++++++-- + keystone/test/__init__.py | 6 +----- + keystone/test/etc/ldap.conf.template | 10 +++++----- + keystone/test/etc/memcache.conf.template | 10 +++++----- + keystone/test/etc/sql.conf.template | 10 +++++----- + run_tests.py | 2 +- + 6 files changed, 35 insertions(+), 23 deletions(-) + +commit fabeec250510003cc05012cf9649472410066feb +Author: Yogeshwar Srikrishnan +Date: Mon Aug 15 03:25:27 2011 -0500 + + Additional changes to fix minor service support stuff and increase test coverage. + Also making validate token call available using service admin tokens + + Change-Id: Ic558ed9cb2bd3e9dafb5ea0e47cd020938ca1e57 + + keystone/backends/ldap/api/role.py | 5 +- + .../backends/sqlalchemy/api/endpoint_template.py | 3 +- + keystone/logic/service.py | 25 +- + keystone/test/unit/test_authentication.py | 1 + + keystone/test/unit/test_common.py | 25 +- + keystone/test/unit/test_endpoints.py | 266 ++++++++++----------- + keystone/test/unit/test_roles.py | 200 ++-------------- + keystone/test/unit/test_services.py | 70 ++++-- + keystone/test/unit/test_token.py | 23 ++ + 9 files changed, 269 insertions(+), 349 deletions(-) + +commit 8f32ce329b448cd5814485433f9214e479a32beb +Author: Yuriy Taraday +Date: Wed Aug 17 14:21:35 2011 +0400 + + Made all sample data loading in one script. + + Both keystone-manage and sampledata.sh logic moved to keystone package, kept + simple starter scripts in bin/ dir. + New sampledata module can theoretically be suitable for loading different + fixtures in one Python interpreter. + Snuck in a couple of extensions changes while fixing PEP8 + + Change-Id: Ie05a9afb528d41b93e56f41d252363b6de2d600d + + README.md | 15 +- + bin/keystone-manage | 442 +------------------- + bin/sampledata | 16 + + bin/sampledata.sh | 78 ---- + etc/keystone.conf | 6 +- + keystone/common/template.py | 4 +- + keystone/contrib/extensions/raxkey/__init__.py | 0 + keystone/contrib/extensions/raxkey/extension.json | 16 + + keystone/contrib/extensions/raxkey/extension.xml | 14 + + keystone/contrib/extensions/raxkey/frontend.py | 99 +++++ + keystone/contrib/extensions/rskey/__init__.py | 0 + keystone/contrib/extensions/rskey/extension.json | 16 - + keystone/contrib/extensions/rskey/extension.xml | 14 - + keystone/contrib/extensions/rskey/frontend.py | 102 ----- + keystone/controllers/extensions.py | 10 +- + keystone/manage.py | 473 ++++++++++++++++++++++ + keystone/test/__init__.py | 2 +- + keystone/test/etc/ldap.conf.template | 6 +- + keystone/test/etc/memcache.conf.template | 6 +- + keystone/test/etc/sql.conf.template | 6 +- + keystone/test/sampledata.py | 96 +++++ + 21 files changed, 741 insertions(+), 680 deletions(-) + +commit 71991dba70843e70f713bddd803702d3d8907bb3 +Author: Ziad Sawalha +Date: Wed Aug 17 09:33:03 2011 -0500 + + Minor fix to run_tests + + Change-Id: Idce6289290f9303ce89ed28ff54c3cbe2db296af + + run_tests.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6af517348e9be2c259362311372e952149575740 +Author: Ziad Sawalha +Date: Tue Aug 16 16:31:20 2011 -0500 + + Contract changes + + Change-Id: Idc44eebb9e3312e8dddb93efc9fecff9a540f138 + + keystone/content/admin/extensions.xml | 13 ---- + keystone/content/admin/identity-admin.wadl | 6 +- + keystone/content/common/samples/auth.json | 4 +- + .../common/samples/auth_credentials-OS-EC2.json | 8 ++ + .../common/samples/auth_credentials-OS-EC2.xml | 7 ++ + .../common/samples/auth_credentials-RAX-KEY.json | 7 ++ + .../common/samples/auth_credentials-RAX-KEY.xml | 7 ++ + .../content/common/samples/auth_credentials.xml | 5 +- + keystone/content/common/samples/endpoint.json | 2 +- + keystone/content/common/samples/endpoint.xml | 4 +- + .../content/common/samples/endpointTemplate.json | 11 ++- + .../content/common/samples/endpointTemplate.xml | 13 +++- + .../content/common/samples/endpointTemplates.json | 47 ++++++++---- + .../content/common/samples/endpointTemplates.xml | 60 ++++++++++----- + keystone/content/common/samples/endpoints.json | 10 +-- + keystone/content/common/samples/endpoints.xml | 10 +-- + keystone/content/service/identity-RAX-KEY.wadl | 86 ++++++++++++++++++++++ + keystone/content/service/identity-RS-KEY.wadl | 67 ----------------- + keystone/content/service/identity.wadl | 36 +++++++-- + keystone/content/service/xsd/RAX-GRP-groups.xsd | 48 ++++++++++++ + .../content/service/xsd/RAX-KEY-credentials.xsd | 34 +++++++++ + keystone/content/service/xsd/RS-GRP-groups.xsd | 47 ------------ + .../content/service/xsd/RS-KEY-credentials.xsd | 32 -------- + keystone/content/service/xsd/credentials.xsd | 28 +++++-- + keystone/content/service/xsd/services.xsd | 1 + + keystone/contrib/extensions/rskey/extension.json | 2 +- + keystone/contrib/extensions/rskey/extension.xml | 2 +- + keystone/controllers/staticfiles.py | 13 +++- + keystone/routers/admin.py | 2 +- + keystone/routers/service.py | 2 +- + keystone/test/functional/test_ext_rs_key_auth.py | 6 +- + keystone/test/functional/test_static_files.py | 4 +- + 32 files changed, 376 insertions(+), 248 deletions(-) + +commit 4f1f3d422bb026700e39da002fffb8e15c1e5c74 +Merge: d0a8237 7993563 +Author: Jenkins +Date: Tue Aug 16 21:42:15 2011 +0000 + + Merge "Admin WADL updates" + +commit 7993563cc248ee39c3d5276abc73861d9a022aa6 +Author: Dolph Mathews +Date: Tue Aug 16 13:19:18 2011 -0500 + + Admin WADL updates + + - Autoformatted file + - Spelling corrections + - Removed redundant X-Auth-Tokens + + Change-Id: I9860007cf30403e4bc2990751b1fc9fb65dbf7b6 + + keystone/content/admin/identity-admin-RAX.wadl | 38 ++-- + keystone/content/admin/identity-admin.wadl | 271 ++++++++++++------------- + keystone/content/common/common.ent | 16 +- + keystone/content/service/identity.wadl | 61 +++--- + 4 files changed, 178 insertions(+), 208 deletions(-) + +commit d0a8237543cbd6e668a9956670ca52850e2a89f6 +Author: Kevin L. Mitchell +Date: Tue Aug 16 15:37:17 2011 -0500 + + Port of glance-control to keystone. This will make writing certain + keystone integration functional tests a little easier to do. + + Change-Id: I0d6ac226f3d2ad5683dad6f94c68796fc4700fe0 + + bin/keystone-control | 235 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 235 insertions(+) + +commit f637ecad8ebabaa4f5282fa0a52a388008835dea +Merge: 99c25b8 c85b278 +Author: Jenkins +Date: Tue Aug 16 20:11:05 2011 +0000 + + Merge "Updates to XML and JSON changes for validateToken" + +commit c85b278cb02089aefc2860c27b72829e5c62f9f8 +Author: Joe Savak +Date: Tue Aug 16 15:01:08 2011 -0500 + + Updates to XML and JSON changes for validateToken + + Change-Id: I6fa808cd6d9bd09fe4d8bb29905c33c32a4c0a68 + + keystone/content/common/samples/validatetoken.json | 8 ++++++-- + keystone/content/common/samples/validatetoken.xml | 10 ++++++---- + 2 files changed, 12 insertions(+), 6 deletions(-) + +commit 99c25b83fd4c62405b3707cb19ad24b54f419be9 +Author: Dolph Mathews +Date: Tue Aug 16 09:29:14 2011 -0500 + + Added pylint message count as run_tests.sh -l + + Change-Id: I73f4e3cba6493da9b4faf62c9672e055127b9737 + + run_tests.sh | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) + +commit fad4c276de755e76269b859f87f9956abb626dbe +Author: Ziad Sawalha +Date: Sun Aug 14 16:59:17 2011 -0500 + + Added reponse handling for xsd static file rendering III + Extra extension tests (for RS-KEY) + + Change-Id: I0a9c18363947784b25c7164ded14c96a8e66a37f + + bin/keystone-manage | 18 +- + etc/keystone.conf | 4 + + examples/echo/echo/server.py | 1 - + keystone/content/identity-RAX.wadl | 64 - + keystone/content/identity-admin-OS.wadl | 639 ---------- + keystone/content/identity-admin-RAX.wadl | 1455 ---------------------- + keystone/content/js/shjs/sh_java.js | 337 ----- + keystone/content/js/shjs/sh_javascript.js | 347 ------ + keystone/content/js/shjs/sh_main.js | 538 -------- + keystone/content/js/shjs/sh_xml.js | 115 -- + keystone/content/js/trc/schema/controller.js | 184 --- + keystone/content/js/trc/schema/layoutManager.js | 137 -- + keystone/content/js/trc/schema/sampleManager.js | 342 ----- + keystone/content/js/trc/util.js | 564 --------- + keystone/content/service/extensions.json | 17 +- + keystone/content/service/extensions.xml | 12 - + keystone/content/style/schema.css | 82 -- + keystone/content/style/shjs/sh_acid.css | 151 --- + keystone/content/style/shjs/sh_darkblue.css | 151 --- + keystone/content/style/shjs/sh_emacs.css | 139 --- + keystone/content/style/shjs/sh_night.css | 151 --- + keystone/content/style/shjs/sh_pablo.css | 151 --- + keystone/content/style/shjs/sh_print.css | 145 --- + keystone/content/style/shjs/sh_style.css | 66 - + keystone/content/style/shjs/sh_whitengrey.css | 139 --- + keystone/content/xsd/RAX-credentials.xsd | 32 - + keystone/content/xsd/RAX-groups.xsd | 47 - + keystone/content/xsd/RAX-users.xsd | 54 - + keystone/content/xsd/credentials.xsd | 69 - + keystone/content/xslt/schema.xslt | 1342 -------------------- + keystone/contrib/__init__.py | 0 + keystone/contrib/extensions/__init__.py | 0 + keystone/contrib/extensions/rskey/__init__.py | 0 + keystone/contrib/extensions/rskey/extension.json | 16 + + keystone/contrib/extensions/rskey/extension.xml | 14 + + keystone/contrib/extensions/rskey/frontend.py | 102 ++ + keystone/controllers/extensions.py | 1 - + keystone/controllers/staticfiles.py | 23 +- + keystone/routers/admin.py | 73 +- + keystone/routers/service.py | 28 +- + keystone/test/etc/ldap.conf.template | 10 +- + keystone/test/etc/memcache.conf.template | 10 +- + keystone/test/etc/sql.conf.template | 10 +- + keystone/test/functional/test_ext_rs_key_auth.py | 29 + + keystone/test/functional/test_extensions.py | 26 + + keystone/test/functional/test_static_files.py | 45 + + keystone/utils.py | 7 + + run_tests.sh | 4 +- + tools/install_venv.py | 1 + + tools/tracer.py | 8 +- + 50 files changed, 332 insertions(+), 7568 deletions(-) + +commit 4c574955a70cea295d7b0152f57e094f4776cc47 +Merge: eb80307 10d8246 +Author: Jenkins +Date: Tue Aug 16 15:07:22 2011 +0000 + + Merge "Creating an artificial whitespace merge conflict" + +commit 10d824624dc3a3558fa9bfda3e4f9b6941f89199 +Author: Dolph Mathews +Date: Tue Aug 16 09:59:57 2011 -0500 + + Creating an artificial whitespace merge conflict + + Change-Id: I784d585d1dad3936e237ebea0a05ac5fa6b65a2c + + keystone/test/etc/ldap.conf.template | 8 ++++---- + keystone/test/etc/memcache.conf.template | 8 ++++---- + keystone/test/etc/sql.conf.template | 8 ++++---- + 3 files changed, 12 insertions(+), 12 deletions(-) + +commit eb803079d6dd5920d3e6df9bd574873ae2090ff8 +Author: Yuriy Taraday +Date: Tue Aug 16 12:53:10 2011 +0400 + + Moved run_test logic into abstract class. + + Useful for testing in some custom environment, e.g. during backend writing. + Example using of new class is at http://paste.openstack.org/show/2180/. + This script runs all unittests with the real LDAP connection. + The config template is at http://paste.openstack.org/show/2181/. + + Change-Id: I4d89e8c4e9458cd982d73dd973d2da63989f4c93 + + keystone/test/__init__.py | 107 ++++++++++++++++++++++++++++++++++++++ + run_tests.py | 129 +++++++--------------------------------------- + 2 files changed, 126 insertions(+), 110 deletions(-) + +commit 920298f5e864299f5321871ab6d6e8bdd7195503 +Author: Dolph Mathews +Date: Mon Aug 15 15:21:39 2011 -0500 + + Git-ignore python coverage data + + Change-Id: I8581e105e070e153d1711117963b1505b18081bd + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit d9d6a2dd7e01a9ff502b35a1c7b08149c11b362c +Author: Ziad Sawalha +Date: Sun Aug 14 16:59:17 2011 -0500 + + Added reponse handling for xsd static file rendering + + Change-Id: Iccf2b5b4947d2d8c16ddcf4412657d01bd570729 + + Schema updates. Split WADLs and extensions and got xsds to compile + + Change-Id: I68d34df56f76d86c3764da74b4afe7e67f8ee616 + + Added reponse handling for xsd static file rendering + + Change-Id: Iccf2b5b4947d2d8c16ddcf4412657d01bd570729 + + Added reponse handling for xsd static file rendering + + Change-Id: Iccf2b5b4947d2d8c16ddcf4412657d01bd570729 + + Extension handling and static file content reorganization + + Change-Id: I9f0f66c90df3f43933dc1a578cef2691f4fb332f + + keystone/content/admin/.DS_Store | Bin 0 -> 6148 bytes + keystone/content/admin/extensions.json | 1 + + keystone/content/admin/extensions.xml | 18 + + keystone/content/admin/identity-admin-OS.wadl | 648 +++++++++ + keystone/content/admin/identity-admin-RAX.wadl | 1444 +++++++++++++++++++ + keystone/content/admin/identity-admin.wadl | 1447 ++++++++++++++++++++ + keystone/content/admin/identityadminguide.pdf | Bin 0 -> 305127 bytes + keystone/content/admin/version.json.tpl | 33 + + keystone/content/admin/version.xml.tpl | 23 + + keystone/content/admin/xsd/RAX-credentials.xsd | 32 + + keystone/content/admin/xsd/RAX-groups.xsd | 47 + + keystone/content/admin/xsd/RAX-users.xsd | 54 + + keystone/content/admin/xsd/api-common.xsd | 56 + + keystone/content/admin/xsd/api.xsd | 22 + + keystone/content/admin/xsd/atom/atom.xsd | 115 ++ + keystone/content/admin/xsd/atom/xml.xsd | 287 ++++ + keystone/content/admin/xsd/credentials.xsd | 69 + + keystone/content/admin/xsd/endpoints.xsd | 203 +++ + keystone/content/admin/xsd/extensions.xsd | 58 + + keystone/content/admin/xsd/fault.xsd | 136 ++ + keystone/content/admin/xsd/roles.xsd | 67 + + keystone/content/admin/xsd/services.xsd | 143 ++ + keystone/content/admin/xsd/tenant.xsd | 148 ++ + keystone/content/admin/xsd/token.xsd | 213 +++ + keystone/content/admin/xsd/user.xsd | 87 ++ + keystone/content/admin/xsd/version.xsd | 357 +++++ + keystone/content/common.ent | 56 - + keystone/content/common/common.ent | 56 + + keystone/content/common/js/shjs/sh_java.js | 337 +++++ + keystone/content/common/js/shjs/sh_javascript.js | 347 +++++ + keystone/content/common/js/shjs/sh_main.js | 538 ++++++++ + keystone/content/common/js/shjs/sh_xml.js | 115 ++ + .../content/common/js/trc/schema/controller.js | 184 +++ + .../content/common/js/trc/schema/layoutManager.js | 137 ++ + .../content/common/js/trc/schema/sampleManager.js | 342 +++++ + keystone/content/common/js/trc/util.js | 564 ++++++++ + keystone/content/common/samples/auth.json | 47 + + keystone/content/common/samples/auth.xml | 56 + + .../content/common/samples/auth_credentials.json | 7 + + .../content/common/samples/auth_credentials.xml | 5 + + keystone/content/common/samples/choices.json | 72 + + keystone/content/common/samples/choices.xml | 41 + + keystone/content/common/samples/endpoint.json | 6 + + keystone/content/common/samples/endpoint.xml | 4 + + .../content/common/samples/endpointTemplate.json | 11 + + .../content/common/samples/endpointTemplate.xml | 12 + + .../content/common/samples/endpointTemplates.json | 43 + + .../content/common/samples/endpointTemplates.xml | 42 + + keystone/content/common/samples/endpoints.json | 24 + + keystone/content/common/samples/endpoints.xml | 20 + + keystone/content/common/samples/ext-getuser.json | 22 + + keystone/content/common/samples/ext-getuser.xml | 13 + + keystone/content/common/samples/extension.json | 21 + + keystone/content/common/samples/extension.xml | 23 + + keystone/content/common/samples/extensions.json | 44 + + keystone/content/common/samples/extensions.xml | 39 + + keystone/content/common/samples/getuser-1.json | 29 + + keystone/content/common/samples/getuser-1.xml | 14 + + keystone/content/common/samples/group.json | 6 + + keystone/content/common/samples/group.xml | 4 + + keystone/content/common/samples/groups.json | 13 + + keystone/content/common/samples/groups.xml | 5 + + .../content/common/samples/identity_fault.json | 7 + + keystone/content/common/samples/identity_fault.xml | 6 + + .../content/common/samples/item_not_found.json | 7 + + keystone/content/common/samples/item_not_found.xml | 6 + + keystone/content/common/samples/role.json | 6 + + keystone/content/common/samples/role.xml | 4 + + keystone/content/common/samples/roleRef.json | 7 + + keystone/content/common/samples/roleRef.xml | 4 + + keystone/content/common/samples/roleRefs.json | 14 + + keystone/content/common/samples/roleRefs.xml | 9 + + keystone/content/common/samples/roles.json | 12 + + keystone/content/common/samples/roles.xml | 6 + + .../common/samples/samplerequestheader.json | 4 + + .../common/samples/sampleresponseheader.json | 4 + + keystone/content/common/samples/service.json | 6 + + keystone/content/common/samples/service.xml | 4 + + keystone/content/common/samples/services.json | 12 + + keystone/content/common/samples/services.xml | 6 + + keystone/content/common/samples/tenant.json | 7 + + keystone/content/common/samples/tenant.xml | 5 + + keystone/content/common/samples/tenantlock.json | 5 + + keystone/content/common/samples/tenantlock.xml | 4 + + keystone/content/common/samples/tenants-1.json | 17 + + keystone/content/common/samples/tenants-1.xml | 10 + + keystone/content/common/samples/tenants-2.json | 21 + + keystone/content/common/samples/tenants-2.xml | 13 + + keystone/content/common/samples/tenants-3.json | 17 + + keystone/content/common/samples/tenants-3.xml | 10 + + .../content/common/samples/tenants-request.txt | 5 + + keystone/content/common/samples/tenants.json | 21 + + keystone/content/common/samples/tenants.xml | 14 + + keystone/content/common/samples/updatedtenant.json | 7 + + keystone/content/common/samples/updatedtenant.xml | 5 + + keystone/content/common/samples/validatetoken.json | 20 + + keystone/content/common/samples/validatetoken.xml | 12 + + keystone/content/common/samples/version-atom.xml | 19 + + keystone/content/common/samples/version.json | 33 + + keystone/content/common/samples/version.xml | 23 + + keystone/content/common/samples/versions-atom.xml | 29 + + keystone/content/common/samples/versions.json | 39 + + keystone/content/common/samples/versions.xml | 24 + + keystone/content/common/style/schema.css | 82 ++ + keystone/content/common/style/shjs/sh_acid.css | 151 ++ + keystone/content/common/style/shjs/sh_darkblue.css | 151 ++ + keystone/content/common/style/shjs/sh_emacs.css | 139 ++ + keystone/content/common/style/shjs/sh_night.css | 151 ++ + keystone/content/common/style/shjs/sh_pablo.css | 151 ++ + keystone/content/common/style/shjs/sh_print.css | 145 ++ + keystone/content/common/style/shjs/sh_style.css | 66 + + .../content/common/style/shjs/sh_whitengrey.css | 139 ++ + keystone/content/common/xslt/schema.xslt | 1342 ++++++++++++++++++ + keystone/content/extensions.json | 1 - + keystone/content/extensions.xml | 5 - + keystone/content/identity-admin.wadl | 1437 ------------------- + keystone/content/identity.wadl | 184 --- + keystone/content/identityadminguide.pdf | Bin 305127 -> 0 bytes + keystone/content/identitydevguide.pdf | Bin 305127 -> 0 bytes + keystone/content/samples/auth.json | 47 - + keystone/content/samples/auth.xml | 56 - + keystone/content/samples/auth_credentials.json | 7 - + keystone/content/samples/auth_credentials.xml | 5 - + keystone/content/samples/choices.json | 72 - + keystone/content/samples/choices.xml | 41 - + keystone/content/samples/endpoint.json | 6 - + keystone/content/samples/endpoint.xml | 4 - + keystone/content/samples/endpointTemplate.json | 11 - + keystone/content/samples/endpointTemplate.xml | 12 - + keystone/content/samples/endpointTemplates.json | 43 - + keystone/content/samples/endpointTemplates.xml | 42 - + keystone/content/samples/endpoints.json | 24 - + keystone/content/samples/endpoints.xml | 20 - + keystone/content/samples/ext-getuser.json | 22 - + keystone/content/samples/ext-getuser.xml | 13 - + keystone/content/samples/extension.json | 21 - + keystone/content/samples/extension.xml | 23 - + keystone/content/samples/extensions.json | 44 - + keystone/content/samples/extensions.xml | 39 - + keystone/content/samples/getuser-1.json | 29 - + keystone/content/samples/getuser-1.xml | 14 - + keystone/content/samples/group.json | 6 - + keystone/content/samples/group.xml | 4 - + keystone/content/samples/groups.json | 13 - + keystone/content/samples/groups.xml | 5 - + keystone/content/samples/identity_fault.json | 7 - + keystone/content/samples/identity_fault.xml | 6 - + keystone/content/samples/item_not_found.json | 7 - + keystone/content/samples/item_not_found.xml | 6 - + keystone/content/samples/role.json | 6 - + keystone/content/samples/role.xml | 4 - + keystone/content/samples/roleRef.json | 7 - + keystone/content/samples/roleRef.xml | 4 - + keystone/content/samples/roleRefs.json | 14 - + keystone/content/samples/roleRefs.xml | 9 - + keystone/content/samples/roles.json | 12 - + keystone/content/samples/roles.xml | 6 - + keystone/content/samples/samplerequestheader.json | 4 - + keystone/content/samples/sampleresponseheader.json | 4 - + keystone/content/samples/service.json | 6 - + keystone/content/samples/service.xml | 4 - + keystone/content/samples/services.json | 12 - + keystone/content/samples/services.xml | 6 - + keystone/content/samples/tenant.json | 7 - + keystone/content/samples/tenant.xml | 5 - + keystone/content/samples/tenantlock.json | 5 - + keystone/content/samples/tenantlock.xml | 4 - + keystone/content/samples/tenants-1.json | 17 - + keystone/content/samples/tenants-1.xml | 10 - + keystone/content/samples/tenants-2.json | 21 - + keystone/content/samples/tenants-2.xml | 13 - + keystone/content/samples/tenants-3.json | 17 - + keystone/content/samples/tenants-3.xml | 10 - + keystone/content/samples/tenants-request.txt | 5 - + keystone/content/samples/tenants.json | 21 - + keystone/content/samples/tenants.xml | 14 - + keystone/content/samples/updatedtenant.json | 7 - + keystone/content/samples/updatedtenant.xml | 5 - + keystone/content/samples/validatetoken.json | 20 - + keystone/content/samples/validatetoken.xml | 12 - + keystone/content/samples/version-atom.xml | 19 - + keystone/content/samples/version.json | 33 - + keystone/content/samples/version.xml | 23 - + keystone/content/samples/versions-atom.xml | 29 - + keystone/content/samples/versions.json | 39 - + keystone/content/samples/versions.xml | 24 - + keystone/content/service/.DS_Store | Bin 0 -> 6148 bytes + keystone/content/service/extensions.json | 20 + + keystone/content/service/extensions.xml | 17 + + keystone/content/service/identity-RS-KEY.wadl | 67 + + keystone/content/service/identity.wadl | 167 +++ + keystone/content/service/identitydevguide.pdf | Bin 0 -> 305127 bytes + keystone/content/service/version.json.tpl | 33 + + keystone/content/service/version.xml.tpl | 23 + + keystone/content/service/xsd/RS-GRP-groups.xsd | 47 + + .../content/service/xsd/RS-KEY-credentials.xsd | 32 + + keystone/content/service/xsd/api-common.xsd | 56 + + keystone/content/service/xsd/api.xsd | 22 + + keystone/content/service/xsd/atom/atom.xsd | 115 ++ + keystone/content/service/xsd/atom/xml.xsd | 287 ++++ + keystone/content/service/xsd/credentials.xsd | 69 + + keystone/content/service/xsd/endpoints.xsd | 203 +++ + keystone/content/service/xsd/extensions.xsd | 58 + + keystone/content/service/xsd/fault.xsd | 136 ++ + keystone/content/service/xsd/roles.xsd | 68 + + keystone/content/service/xsd/services.xsd | 143 ++ + keystone/content/service/xsd/tenant.xsd | 148 ++ + keystone/content/service/xsd/token.xsd | 213 +++ + keystone/content/service/xsd/user.xsd | 87 ++ + keystone/content/service/xsd/version.xsd | 357 +++++ + keystone/content/version-admin.json.tpl | 33 - + keystone/content/version-admin.xml.tpl | 23 - + keystone/content/version.json.tpl | 33 - + keystone/content/version.xml.tpl | 23 - + keystone/content/xsd/api-common.xsd | 56 - + keystone/content/xsd/api.xsd | 22 - + keystone/content/xsd/atom/atom.xsd | 115 -- + keystone/content/xsd/atom/xml.xsd | 287 ---- + keystone/content/xsd/endpoints.xsd | 203 --- + keystone/content/xsd/extensions.xsd | 58 - + keystone/content/xsd/fault.xsd | 136 -- + keystone/content/xsd/roles.xsd | 68 - + keystone/content/xsd/services.xsd | 143 -- + keystone/content/xsd/tenant.xsd | 148 -- + keystone/content/xsd/token.xsd | 213 --- + keystone/content/xsd/user.xsd | 87 -- + keystone/content/xsd/version.xsd | 357 ----- + keystone/controllers/extensions.py | 35 + + keystone/controllers/staticfiles.py | 20 +- + keystone/routers/admin.py | 85 +- + keystone/routers/service.py | 24 +- + 231 files changed, 14466 insertions(+), 4813 deletions(-) + +commit b71ce6e401819c3614dc82c1b8aa86dec2a3482e +Author: Yogeshwar Srikrishnan +Date: Mon Aug 15 03:25:27 2011 -0500 + + Additional tests and minor changes to support services CRUD. + + And PEP8 fixes. + + Change-Id: I4837c58f68ed461b65ac85c591f5e19dbbe034d3 + + keystone/backends/memcache/api/token.py | 7 +- + keystone/logic/types/endpoint.py | 12 +-- + keystone/test/unit/test_common.py | 6 +- + keystone/test/unit/test_endpoints.py | 6 +- + keystone/test/unit/test_roles.py | 151 ++++++++++++++++++++++++++++++++ + keystone/test/unit/test_services.py | 43 ++++++--- + 6 files changed, 200 insertions(+), 25 deletions(-) + +commit e8c35a7f23eeb3156102716463dfce14e7dab00e +Author: Ziad Sawalha +Date: Sun Aug 14 16:59:17 2011 -0500 + + Added reponse handling for xsd static file rendering + + Change-Id: Iccf2b5b4947d2d8c16ddcf4412657d01bd570729 + + keystone/common/template.py | 19 +- + keystone/content/js/shjs/sh_java.js | 337 ++++++++++++++ + keystone/content/js/shjs/sh_javascript.js | 347 +++++++++++++++ + keystone/content/js/shjs/sh_main.js | 538 ++++++++++++++++++++++ + keystone/content/js/shjs/sh_xml.js | 115 +++++ + keystone/content/js/trc/schema/controller.js | 184 ++++++++ + keystone/content/js/trc/schema/layoutManager.js | 137 ++++++ + keystone/content/js/trc/schema/sampleManager.js | 342 ++++++++++++++ + keystone/content/js/trc/util.js | 564 ++++++++++++++++++++++++ + keystone/content/style/schema.css | 82 ++++ + keystone/content/style/shjs/sh_acid.css | 151 +++++++ + keystone/content/style/shjs/sh_darkblue.css | 151 +++++++ + keystone/content/style/shjs/sh_emacs.css | 139 ++++++ + keystone/content/style/shjs/sh_night.css | 151 +++++++ + keystone/content/style/shjs/sh_pablo.css | 151 +++++++ + keystone/content/style/shjs/sh_print.css | 145 ++++++ + keystone/content/style/shjs/sh_style.css | 66 +++ + keystone/content/style/shjs/sh_whitengrey.css | 139 ++++++ + keystone/content/xsd/RAX-credentials.xsd | 1 + + keystone/content/xsd/RAX-groups.xsd | 1 + + keystone/content/xsd/RAX-users.xsd | 1 + + keystone/content/xsd/endpoints.xsd | 2 + + keystone/content/xsd/extensions.xsd | 1 + + keystone/content/xsd/fault.xsd | 1 + + keystone/content/xsd/roles.xsd | 1 + + keystone/content/xsd/services.xsd | 1 + + keystone/content/xsd/tenant.xsd | 1 + + keystone/content/xsd/token.xsd | 52 ++- + keystone/controllers/staticfiles.py | 6 + + keystone/routers/admin.py | 20 + + 30 files changed, 3839 insertions(+), 7 deletions(-) + +commit 6449ae382d8f91f17aa019853e6f16f6544fd52b +Author: Ziad Sawalha +Date: Sun Aug 14 15:14:41 2011 -0500 + + Schema updates. Split WADLs and extensions and got xsds to compile + + Change-Id: I68d34df56f76d86c3764da74b4afe7e67f8ee616 + + keystone/content/identity-RAX.wadl | 64 ++ + keystone/content/identity-admin-OS.wadl | 639 +++++++++++++ + keystone/content/identity-admin-RAX.wadl | 1455 ++++++++++++++++++++++++++++++ + keystone/content/identity-admin.wadl | 89 +- + keystone/content/identity.wadl | 143 +-- + keystone/content/xsd/RAX-credentials.xsd | 31 + + keystone/content/xsd/RAX-groups.xsd | 46 + + keystone/content/xsd/RAX-users.xsd | 53 ++ + keystone/content/xsd/api.xsd | 4 + + keystone/content/xsd/credentials.xsd | 69 ++ + keystone/content/xsd/endpoints.xsd | 19 +- + keystone/content/xsd/extensions.xsd | 7 +- + keystone/content/xsd/roles.xsd | 60 +- + keystone/content/xsd/services.xsd | 85 +- + keystone/content/xsd/tenant.xsd | 61 +- + keystone/content/xsd/token.xsd | 96 +- + keystone/content/xsd/user.xsd | 65 +- + keystone/content/xsd/version.xsd | 217 ++++- + keystone/content/xslt/schema.xslt | 1342 +++++++++++++++++++++++++++ + 19 files changed, 4147 insertions(+), 398 deletions(-) + +commit dd346967e1cd9e9c55e901cd2b03f4dc8f058b09 +Author: Yogeshwar Srikrishnan +Date: Sun Aug 14 02:30:06 2011 -0500 + + Ziads changes and fixes for them. + + Change-Id: I86f3dc08ffb602c74491821d37adab0088fe3948 + + PEP8 + + Change-Id: Ia4db15cbcf6bdcd8e5537943d94b371c7260a9dc + + keystone/content/common.ent | 56 + + keystone/content/identity-admin.wadl | 1448 +++++++++++++++++++++++++ + keystone/content/identity.wadl | 1372 +++-------------------- + keystone/content/identityadminguide.pdf | Bin 0 -> 305127 bytes + keystone/content/samples/auth.json | 68 +- + keystone/content/samples/auth.xml | 55 +- + keystone/content/version-admin.json.tpl | 33 + + keystone/content/version-admin.xml.tpl | 23 + + keystone/content/xsd/services.xsd | 8 +- + keystone/content/xsd/tenant.xsd | 7 +- + keystone/controllers/staticfiles.py | 8 +- + keystone/controllers/version.py | 7 +- + keystone/routers/admin.py | 39 +- + keystone/routers/service.py | 39 +- + keystone/test/functional/test_static_files.py | 23 +- + 15 files changed, 1869 insertions(+), 1317 deletions(-) + +commit a9d5441ac83a4478cc7f0631d4d983d04a2737e9 +Merge: 66df0c2 f9abcf3 +Author: Jenkins +Date: Sat Aug 13 03:16:28 2011 +0000 + + Merge "Added check_password to abstract backend user API" + +commit 66df0c2453bbbd6a0ba29388a4cbb3ad184a0105 +Merge: 6e341c4 f983a27 +Author: Jenkins +Date: Sat Aug 13 03:14:18 2011 +0000 + + Merge "Doc changes, including service catalog xsd." + +commit 6e341c4baba491e08263e4f3df3e435123e76dcb +Merge: 32eb42a 3427e6c +Author: Jenkins +Date: Sat Aug 13 03:12:04 2011 +0000 + + Merge "fix ec2 and add keystone-manage command for creating credentials" + +commit f9abcf31ec4c4911c48aa6ce87625fd2f1bdf0fb +Author: Dolph Mathews +Date: Fri Aug 12 17:47:00 2011 -0500 + + Added check_password to abstract backend user API + + Change-Id: Ibb05f7842ae6e2b1f42c9956aee20a72472c3cef + + keystone/backends/api.py | 3 +++ + 1 file changed, 3 insertions(+) + +commit f983a2736dffb24ea64d98661d82c4fa47c479ce +Author: Ziad Sawalha +Date: Fri Aug 12 15:57:18 2011 -0500 + + Doc changes, including service catalog xsd. + + Change-Id: I84266bd55883594fa1f1a35666530e0fc78157e7 + + keystone/content/xsd/services.xsd | 10 ++-- + keystone/content/xsd/token.xsd | 96 +++++++++++++++++++++++++++------------ + 2 files changed, 71 insertions(+), 35 deletions(-) + +commit 32eb42a6bf3689fa6986b648f2b91fe927b45c49 +Merge: b048286 139ce5e +Author: Jenkins +Date: Fri Aug 12 18:52:26 2011 +0000 + + Merge "Replacing tokens with the dummy tokens from sampledata.sh" + +commit b048286e154b541312ea476d9758f680142ed205 +Author: Yuriy Taraday +Date: Fri Aug 12 16:58:02 2011 +0400 + + Fixed service-bound roles implementation in LDAP backend. + + Change-Id: If3775bf32d610750ac3bddfa83de642765982106 + + keystone/backends/ldap/api/role.py | 54 ++++++++++++++++++++++------------ + keystone/backends/ldap/api/user.py | 7 +++++ + keystone/backends/ldap/keystone.ldif | 10 ++++++- + keystone/backends/ldap/keystone.schema | 11 ++++++- + 4 files changed, 61 insertions(+), 21 deletions(-) + +commit 5671cda1d324e81329fa76b6a22ec0dfe9a2ffbf +Author: Yuriy Taraday +Date: Fri Aug 12 11:09:03 2011 +0400 + + Removed ldap names import from fakeldap module. + + Change-Id: I97d5f63103d3bc4223c603ecd749004fa2062cf3 + + keystone/backends/ldap/fakeldap.py | 53 ++++++++++++++++++-------------------- + 1 file changed, 25 insertions(+), 28 deletions(-) + +commit 3427e6c230111e0acb4d1aedcb435eda65d5f4ce +Author: Vishvananda Ishaya +Date: Fri Aug 12 03:59:13 2011 +0000 + + fix ec2 and add keystone-manage command for creating credentials + + Change-Id: I8d39e75e150806b0ff842ab6daf6fa3ce0087e52 + + bin/keystone-manage | 21 ++++++++++++++++++++- + keystone/routers/service.py | 2 +- + keystone/test/unit/base.py | 3 +-- + 3 files changed, 22 insertions(+), 4 deletions(-) + +commit d7d4f51a2e9a9f9c2ed5d2b7526c269ad2a6b27f +Merge: f3e99da 932683a +Author: Jenkins +Date: Fri Aug 12 00:21:58 2011 +0000 + + Merge "Legacy auth fix and doc, wadl, and xsd updates" + +commit 932683ab3e7730530c721b527f847da7d5d0537b +Author: Ziad Sawalha +Date: Thu Aug 11 19:18:13 2011 -0500 + + Legacy auth fix and doc, wadl, and xsd updates + + Change-Id: I3b18b5e4f49f583dccbc283b1ba5f7200b071d0a + + keystone/content/identity.wadl | 88 ++++++++++++++++++++++++++++++++- + keystone/content/xsd/token.xsd | 41 +++++++++++++-- + keystone/frontends/legacy_token_auth.py | 13 ++--- + 3 files changed, 127 insertions(+), 15 deletions(-) + +commit 139ce5e571e80556d6c02de06a9335a8d9c6ee2a +Author: Joe Savak +Date: Thu Aug 11 17:08:57 2011 -0500 + + Replacing tokens with the dummy tokens from sampledata.sh + + Change-Id: Ife8b34b3ba0aa21f3fea5d5348f248babff8b5b2 + + doc/source/adminAPI_curl_examples.rst | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit f3e99dac6eb666de8fc024410c1936ec150a3827 +Merge: e1b3037 d9d15dc +Author: Jenkins +Date: Thu Aug 11 20:30:29 2011 +0000 + + Merge "Changes to improve performance." + +commit e1b30373794ea39c39473cf0d49649f1dccc89e2 +Merge: 1cd3878 54918d1 +Author: Jenkins +Date: Thu Aug 11 19:17:35 2011 +0000 + + Merge "Add option for running coverage with unit2." + +commit 1cd3878e74d220d366a6a3e47e43257ce38b6b72 +Merge: da69b28 aa31899 +Author: Jenkins +Date: Thu Aug 11 19:13:58 2011 +0000 + + Merge "Adding curl documentation and additional installation doc. Also updated man documentation for keystone-manage" + +commit 54918d1858f851a0b28ef25990d50deebce268e6 +Author: Monty Taylor +Date: Thu Aug 11 14:36:28 2011 -0400 + + Add option for running coverage with unit2. + + Change-Id: I43cada3a7cb2a4a82b63305a1757d095f7692ec4 + + run_tests.py | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit aa318993185f7eedc4cbed739ac4226999347c58 +Author: Joe Savak +Date: Thu Aug 11 14:02:19 2011 -0500 + + Adding curl documentation and additional installation doc. Also + updated man documentation for keystone-manage + + Change-Id: I9aef365b6fdac2c10cd3c7f0864c8f375a878136 + + bin/keystone-manage | 6 +- + doc/source/adminAPI_curl_examples.rst | 123 ++++++++++++++++++++++++++++++++ + doc/source/gettingstarted.rst | 46 +++++++++++- + doc/source/index.rst | 4 +- + doc/source/installing.rst | 16 ++--- + doc/source/serviceAPI_curl_examples.rst | 32 +++++++++ + 6 files changed, 213 insertions(+), 14 deletions(-) + +commit d9d15dc18663b16e7ce783bfa548277553dedfeb +Author: Yogeshwar Srikrishnan +Date: Thu Aug 11 13:47:18 2011 -0500 + + Changes to improve performance. + + Change-Id: Iaec2252a197ed5c23ee2c604dadf57e1ef00d2e6 + + keystone/frontends/legacy_token_auth.py | 13 ++--- + keystone/middleware/auth_token.py | 91 +++++++++++++++++---------------- + 2 files changed, 51 insertions(+), 53 deletions(-) + +commit da69b285094c1cdd4f080566790df3ef9f0e6a2e +Author: Monty Taylor +Date: Thu Aug 11 14:33:42 2011 -0400 + + Removed the need to set PYTHONPATH before tests. + + Change-Id: I10875d88903da3d108c7fd39636c8f84a618a062 + + run_tests.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit e2f0ce0f8accb58ea4ff0d793634c773c0b0ed04 +Merge: ffdd0cd 84750a8 +Author: Jenkins +Date: Thu Aug 11 18:15:54 2011 +0000 + + Merge "Back to zero PEP8 violations" + +commit 84750a8fb0f0f3fbe59a96239e4f022842190d58 +Author: Dolph Mathews +Date: Thu Aug 11 13:11:57 2011 -0500 + + Back to zero PEP8 violations + + Change-Id: I2081038f362e0de520fa52227eb1dba2ac060624 + + keystone/logic/types/auth.py | 10 +++++----- + keystone/logic/types/user.py | 3 ++- + keystone/middleware/nova_auth_token.py | 2 +- + keystone/middleware/swift_auth.py | 2 +- + 4 files changed, 9 insertions(+), 8 deletions(-) + +commit ffdd0cd2457aec55f0cdb30d49c3e52b950381e5 +Author: Ziad Sawalha +Date: Thu Aug 11 13:04:58 2011 -0500 + + Schema and WADL updates + + Change-Id: I6e8d0efa2395178ce58692b2f117040833bbb1ef + + keystone/content/identity.wadl | 64 ++++++++++++++--------------- + keystone/content/xsd/endpoints.xsd | 14 +++---- + keystone/content/xsd/tenant.xsd | 82 +++++++++++++++++++++++++++++--------- + 3 files changed, 102 insertions(+), 58 deletions(-) + +commit 07874f668fa9027a524498f20fd7abb35e5087f7 +Author: Ziad Sawalha +Date: Thu Aug 11 11:01:41 2011 -0500 + + Adding documentation to WADL + + Change-Id: Icbfad5c13454cc458a60dd9e20792d3e5c2e8227 + + keystone/content/samples/auth.json | 37 +++++++++++ + keystone/content/samples/auth.xml | 29 +++++++++ + keystone/content/samples/auth_credentials.json | 7 +++ + keystone/content/samples/auth_credentials.xml | 5 ++ + keystone/content/samples/choices.json | 72 ++++++++++++++++++++++ + keystone/content/samples/choices.xml | 41 ++++++++++++ + keystone/content/samples/endpoint.json | 6 ++ + keystone/content/samples/endpoint.xml | 4 ++ + keystone/content/samples/endpointTemplate.json | 11 ++++ + keystone/content/samples/endpointTemplate.xml | 12 ++++ + keystone/content/samples/endpointTemplates.json | 43 +++++++++++++ + keystone/content/samples/endpointTemplates.xml | 42 +++++++++++++ + keystone/content/samples/endpoints.json | 24 ++++++++ + keystone/content/samples/endpoints.xml | 20 ++++++ + keystone/content/samples/ext-getuser.json | 22 +++++++ + keystone/content/samples/ext-getuser.xml | 13 ++++ + keystone/content/samples/extension.json | 21 +++++++ + keystone/content/samples/extension.xml | 23 +++++++ + keystone/content/samples/extensions.json | 44 +++++++++++++ + keystone/content/samples/extensions.xml | 39 ++++++++++++ + keystone/content/samples/getuser-1.json | 29 +++++++++ + keystone/content/samples/getuser-1.xml | 14 +++++ + keystone/content/samples/group.json | 6 ++ + keystone/content/samples/group.xml | 4 ++ + keystone/content/samples/groups.json | 13 ++++ + keystone/content/samples/groups.xml | 5 ++ + keystone/content/samples/identity_fault.json | 7 +++ + keystone/content/samples/identity_fault.xml | 6 ++ + keystone/content/samples/item_not_found.json | 7 +++ + keystone/content/samples/item_not_found.xml | 6 ++ + keystone/content/samples/role.json | 6 ++ + keystone/content/samples/role.xml | 4 ++ + keystone/content/samples/roleRef.json | 7 +++ + keystone/content/samples/roleRef.xml | 4 ++ + keystone/content/samples/roleRefs.json | 14 +++++ + keystone/content/samples/roleRefs.xml | 9 +++ + keystone/content/samples/roles.json | 12 ++++ + keystone/content/samples/roles.xml | 6 ++ + keystone/content/samples/samplerequestheader.json | 4 ++ + keystone/content/samples/sampleresponseheader.json | 4 ++ + keystone/content/samples/service.json | 6 ++ + keystone/content/samples/service.xml | 4 ++ + keystone/content/samples/services.json | 12 ++++ + keystone/content/samples/services.xml | 6 ++ + keystone/content/samples/tenant.json | 7 +++ + keystone/content/samples/tenant.xml | 5 ++ + keystone/content/samples/tenantlock.json | 5 ++ + keystone/content/samples/tenantlock.xml | 4 ++ + keystone/content/samples/tenants-1.json | 17 +++++ + keystone/content/samples/tenants-1.xml | 10 +++ + keystone/content/samples/tenants-2.json | 21 +++++++ + keystone/content/samples/tenants-2.xml | 13 ++++ + keystone/content/samples/tenants-3.json | 17 +++++ + keystone/content/samples/tenants-3.xml | 10 +++ + keystone/content/samples/tenants-request.txt | 5 ++ + keystone/content/samples/tenants.json | 21 +++++++ + keystone/content/samples/tenants.xml | 14 +++++ + keystone/content/samples/updatedtenant.json | 7 +++ + keystone/content/samples/updatedtenant.xml | 5 ++ + keystone/content/samples/validatetoken.json | 20 ++++++ + keystone/content/samples/validatetoken.xml | 12 ++++ + keystone/content/samples/version-atom.xml | 19 ++++++ + keystone/content/samples/version.json | 33 ++++++++++ + keystone/content/samples/version.xml | 23 +++++++ + keystone/content/samples/versions-atom.xml | 29 +++++++++ + keystone/content/samples/versions.json | 39 ++++++++++++ + keystone/content/samples/versions.xml | 24 ++++++++ + keystone/content/xsd/tenant.xsd | 15 +++++ + 68 files changed, 1085 insertions(+) + +commit 616464af78d1a274a8fdf6fd15f76294105573f1 +Merge: d1613c5 0548ee4 +Author: Jenkins +Date: Thu Aug 11 15:40:23 2011 +0000 + + Merge "Correct 401, 305, and www-authenticate responses" + +commit 0548ee4df16756548c5a1b76cf8623a0ede069a5 +Author: Ziad Sawalha +Date: Thu Aug 11 02:03:26 2011 -0500 + + Correct 401, 305, and www-authenticate responses + + Change-Id: I6205567e7b68917d5ecabcf336a4891802ab7381 + + Fixing memcache issues.Fixing pep8 changes. + + Change-Id: I4e941efec2fad4b945481072b43334bf6477580f + + Allow to parse roleRef without tenantId + + Change-Id: I9171a73a8646afffba0f8bea67530dbdea7c4428 + + Return user's roles in response to tenants tenantId + + Get tenant from token (if available) instead of user's default tenant + + Change-Id: I9171a73a8646afffba0f8bea67530dbdea7c4428 + + Return endpoints for token without tenant + + Change-Id: I9171a73a8646afffba0f8bea67530dbdea7c4428 + + Parse user roles for nova as csv + + Change-Id: I9171a73a8646afffba0f8bea67530dbdea7c4428 + + Merged in pull request 128 + + Change-Id: I1e1e040dd5a18b1b70b5a14b01ba7400371e9308 + + keystone/backends/memcache/api/token.py | 34 +++++++++++++++++++---------- + keystone/backends/sqlalchemy/api/tenant.py | 15 +++++++------ + keystone/backends/sqlalchemy/api/user.py | 5 +++++ + keystone/logic/service.py | 8 +++++-- + keystone/logic/types/auth.py | 35 ++++++++++++------------------ + keystone/logic/types/role.py | 2 -- + keystone/logic/types/user.py | 12 +++++++++- + keystone/middleware/auth_token.py | 8 ++++++- + keystone/middleware/nova_auth_token.py | 27 ++++++++++++++--------- + keystone/middleware/swift_auth.py | 11 ++++++++-- + run_tests.py | 2 +- + 11 files changed, 100 insertions(+), 59 deletions(-) + +commit d1613c5d5b142bfbf57c660b4c159f9d561fbb6f +Merge: 4e773aa d52cde6 +Author: Jenkins +Date: Thu Aug 11 07:45:51 2011 +0000 + + Merge "Correct 401, 305, and www-authenticate responses" + +commit d52cde680b2e968c60f59638ada9f651b4b4cab2 +Author: Ziad Sawalha +Date: Thu Aug 11 02:03:26 2011 -0500 + + Correct 401, 305, and www-authenticate responses + + Change-Id: I6205567e7b68917d5ecabcf336a4891802ab7381 + + Fixing memcache issues.Fixing pep8 changes. + + Change-Id: I4e941efec2fad4b945481072b43334bf6477580f + + examples/echo/echo/echo.ini | 1 + + examples/echo/echo/echo_remote.ini | 2 +- + examples/paste/auth_token.ini | 3 ++- + examples/paste/glance-api.conf | 1 + + examples/paste/glance-registry.conf | 1 + + examples/paste/nova-api-paste.ini | 1 + + keystone/backends/memcache/api/token.py | 34 ++++++++++++++++++---------- + keystone/middleware/auth_token.py | 40 ++++++++++++++++++++++++--------- + keystone/middleware/remoteauth.py | 12 +++++----- + run_tests.py | 2 +- + 10 files changed, 66 insertions(+), 31 deletions(-) + +commit 4e773aa9c9778946e9ec9399159f6ee202eb0bc0 +Author: Ziad Sawalha +Date: Thu Aug 11 02:03:26 2011 -0500 + + Correct 401, 305, and www-authenticate responses + + Change-Id: I6205567e7b68917d5ecabcf336a4891802ab7381 + + examples/echo/echo/echo.ini | 1 + + examples/echo/echo/echo_remote.ini | 2 +- + examples/paste/auth_token.ini | 3 ++- + examples/paste/glance-api.conf | 1 + + examples/paste/glance-registry.conf | 1 + + examples/paste/nova-api-paste.ini | 1 + + keystone/middleware/auth_token.py | 40 +++++++++++++++++++++++++++---------- + keystone/middleware/remoteauth.py | 12 ++++++----- + 8 files changed, 43 insertions(+), 18 deletions(-) + +commit b1fd6aac34a2e96d7e71f307f31f40fa3bf3fac1 +Author: Ziad Sawalha +Date: Wed Aug 10 23:42:52 2011 -0500 + + Added xsd content, update static controller, and static tests + + Change-Id: Ibb56ac3273a5f29d5a6dc96d8f14e2e7b058c7c5 + + keystone/content/xsd/api-common.xsd | 56 +++++ + keystone/content/xsd/api.xsd | 18 ++ + keystone/content/xsd/atom/atom.xsd | 115 +++++++++++ + keystone/content/xsd/atom/xml.xsd | 287 ++++++++++++++++++++++++++ + keystone/content/xsd/endpoints.xsd | 200 ++++++++++++++++++ + keystone/content/xsd/extensions.xsd | 56 +++++ + keystone/content/xsd/fault.xsd | 135 ++++++++++++ + keystone/content/xsd/roles.xsd | 113 ++++++++++ + keystone/content/xsd/services.xsd | 59 ++++++ + keystone/content/xsd/tenant.xsd | 40 ++++ + keystone/content/xsd/token.xsd | 172 +++++++++++++++ + keystone/content/xsd/user.xsd | 100 +++++++++ + keystone/content/xsd/version.xsd | 200 ++++++++++++++++++ + keystone/controllers/staticfiles.py | 21 +- + keystone/routers/admin.py | 17 ++ + keystone/routers/service.py | 21 +- + keystone/test/functional/test_static_files.py | 10 +- + 17 files changed, 1612 insertions(+), 8 deletions(-) + +commit bd5bdb5d881f04d3a5515ed35dca3c488864ce0a +Author: Ziad Sawalha +Date: Wed Aug 10 23:20:21 2011 -0500 + + Updated wadl + + Change-Id: I95e961d524101aff54fe7f98fdd9af7a7893134d + + keystone/content/identity.wadl | 301 +++++++++++++++++++++++++++++++++++++---- + 1 file changed, 274 insertions(+), 27 deletions(-) + +commit f980035e824c72c50aab116c8512a47e83882d11 +Author: Ziad Sawalha +Date: Wed Aug 10 22:12:00 2011 -0500 + + Fix LDAP requires to compatible version + + Change-Id: Ic9e14b51f698db85526b9064cba6d146371c7100 + + tools/pip-requires | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c358708825dda13833199eaa408472e928d02f23 +Merge: 85f930f e5427f6 +Author: Jenkins +Date: Thu Aug 11 02:21:23 2011 +0000 + + Merge "Moved run_tests.py to match other projects." + +commit 85f930f41951248c926dd46d99853759ab8c8a76 +Author: Yuriy Taraday +Date: Thu Jul 21 17:45:18 2011 +0400 + + Moved password check logic to backend + + Change-Id: I774dd7a2c96a9c32cee597ef95331e9d6b5304a3 + + keystone/backends/ldap/api/user.py | 21 +++++++++++++-------- + keystone/backends/sqlalchemy/api/user.py | 3 +++ + keystone/logic/service.py | 12 +++++------- + 3 files changed, 21 insertions(+), 15 deletions(-) + +commit 91a4b9e287385c8d8d29773358a28056997b3cc5 +Author: Yogeshwar Srikrishnan +Date: Tue Aug 9 18:06:36 2011 -0500 + + Changes to delete dependencies when services,endpoint_templates,roles are being deleted. + PEP8 and Pylint fixes.Also do ldap related changes. + + Change-Id: I0c07aceef8815303ac8f3e83dd44cd74c0a7f6df + + keystone/backends/api.py | 25 +++++- + keystone/backends/ldap/api/role.py | 40 ++++++++++ + .../backends/sqlalchemy/api/endpoint_template.py | 16 +++- + keystone/backends/sqlalchemy/api/role.py | 14 ++++ + keystone/logic/service.py | 91 +++++++++++++++------- + 5 files changed, 153 insertions(+), 33 deletions(-) + +commit e2c3c7d67c40312b0202fa48ede59e6ef688e40a +Author: Yuriy Taraday +Date: Fri Jul 29 15:29:13 2011 +0400 + + Add LDAP schema. + + Change-Id: I6d1db62c6c09eb6645b734f351b0aa448adf16d8 + + keystone/backends/ldap/api/role.py | 2 +- + keystone/backends/ldap/api/tenant.py | 2 +- + keystone/backends/ldap/api/user.py | 6 +++- + keystone/backends/ldap/keystone.ldif | 54 ++++++++++++++++++++++++++++++ + keystone/backends/ldap/keystone.schema | 61 ++++++++++++++++++++++++++++++++++ + 5 files changed, 122 insertions(+), 3 deletions(-) + +commit 5e78bb42c8af5c014f5fc942b94fa8ab06f2f88e +Author: Yuriy Taraday +Date: Fri Jul 29 15:28:09 2011 +0400 + + Add wrapper for real LDAP connection with logging and type converting. + + Also includes PEP8 fixes. + + Change-Id: I03f38f1e99a62f665276fff718669a5481d0725e + + keystone/backends/api.py | 4 +- + keystone/backends/ldap/api/__init__.py | 91 ++++++++++++++++++++++++++++++++-- + keystone/test/unit/test_ec2_authn.py | 8 +-- + 3 files changed, 94 insertions(+), 9 deletions(-) + +commit d24c0108d684b8e9b79b3bbaeddd1f6e9032cea3 +Author: Yuriy Taraday +Date: Fri Jul 29 15:25:27 2011 +0400 + + Fix console and debug logging. + + Change-Id: I9a970a7dafc4d2221aefbe226674d5310611e822 + + keystone/common/config.py | 7 ++++--- + keystone/common/wsgi.py | 7 ++++--- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit c2b42851e67a8a125935acbe23598390b976bfa0 +Merge: df88cce 238f828 +Author: Jenkins +Date: Tue Aug 9 22:16:33 2011 +0000 + + Merge "Redux: Add proper simple_bind_s to fakeldap" + +commit 238f828f919503f553c1a9bccfa7e63800669915 +Author: Dolph Mathews +Date: Tue Aug 9 11:30:20 2011 -0500 + + Redux: Add proper simple_bind_s to fakeldap + + Change-Id: I01f0043b50c6ae1ed333f055a521e230ef3e70b8 + + keystone/backends/ldap/fakeldap.py | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +commit df88ccecc286ead41dff379b7df9a9380c7d6267 +Merge: 725a32b dea6aff +Author: Jenkins +Date: Tue Aug 9 20:16:43 2011 +0000 + + Merge "Adds support for authenticating via ec2 signatures" + +commit dea6aff92791cc8077c81841b3ba9942eb207ad2 +Author: Vishvananda Ishaya +Date: Tue Aug 2 12:40:22 2011 -0700 + + Adds support for authenticating via ec2 signatures + + * modifies credentials to store tenant id + * adds credentials backend api + * cleans up a bunch of whitespace errors + * adds new /ec2token endpoint for new logic + * fixes unit/base.py test case + * adds unittests for ec2_authn + * includes compatibility for clients that ignore ports + + Change-Id: I1bd1e549cc74cbb708059b07b2928bf09c8ba1ca + + etc/keystone.conf | 7 +- + keystone/backends/api.py | 24 +++- + keystone/backends/sqlalchemy/api/credentials.py | 51 +++++++ + keystone/backends/sqlalchemy/api/user.py | 6 +- + keystone/backends/sqlalchemy/models.py | 7 +- + keystone/controllers/auth.py | 13 +- + keystone/logic/service.py | 66 ++++++--- + keystone/logic/signer.py | 136 ++++++++++++++++++ + keystone/logic/types/auth.py | 101 +++++++++++++ + keystone/middleware/auth_basic.py | 12 +- + keystone/routers/service.py | 3 + + keystone/test/unit/base.py | 63 ++++++--- + keystone/test/unit/test_ec2_authn.py | 180 ++++++++++++++++++++++++ + 13 files changed, 617 insertions(+), 52 deletions(-) + +commit 725a32beeb03aed3d77e2652629902779c0ca09d +Merge: 1bfcb5c cb92ef7 +Author: Jenkins +Date: Tue Aug 9 16:59:24 2011 +0000 + + Merge " Committer: Joe Savak " + +commit 1bfcb5c00c11c91561768dd9e1ceb66fd6d57ceb +Author: Yogeshwar Srikrishnan +Date: Mon Aug 8 17:31:26 2011 -0500 + + Changes to allow additional calls to support endpoint template CRUD and additional checks on existing method. + + Fixing issues that did not allow ldap to pass. + + Change-Id: Ie98e50f8731105f24ebad2691a9e38d20edead28 + + keystone/backends/api.py | 8 +- + keystone/backends/ldap/models.py | 2 +- + .../backends/sqlalchemy/api/endpoint_template.py | 7 ++ + keystone/backends/sqlalchemy/models.py | 3 +- + keystone/controllers/endpointtemplates.py | 15 +++ + keystone/logic/service.py | 124 +++++++++++++-------- + keystone/logic/types/endpoint.py | 2 - + keystone/logic/types/role.py | 24 ++-- + keystone/routers/admin.py | 18 +-- + keystone/test/unit/test_common.py | 106 ++++++++++++++++++ + keystone/test/unit/test_endpoints.py | 83 ++++++++++++++ + keystone/test/unit/test_roles.py | 81 ++++++++++++++ + tools/pip-requires | 4 +- + 13 files changed, 406 insertions(+), 71 deletions(-) + +commit cb92ef7dbac6e85a52348337c0575c2e3ea28eb3 +Author: Joe Savak +Date: Tue Aug 9 11:00:34 2011 -0500 + + Committer: Joe Savak + + On branch JS-KEYSTONE-DOC + Changes to be committed: + + modified: installing.rst + + Updated install instructions for Debian/Ubuntu to pull code from git repo instead of using bzr + + Change-Id: I645759b5d675f0717bc3fc1f910af8236dd8cdff + + doc/source/installing.rst | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 4c6ed61ed1c6f7fdc6cbf496c9abf7f1c34acfa3 +Author: Dolph Mathews +Date: Mon Aug 8 16:20:46 2011 -0500 + + Refactoring business logic behind GET /tenants to make it less convoluted. + + (And to answer Carlos' question.) + + Change-Id: I90c6c2259542a21cf0ea5827660618b64cfe10ca + + keystone/logic/service.py | 57 +++++++++++++++++++++-------------------------- + 1 file changed, 25 insertions(+), 32 deletions(-) + +commit e5427f61b95f50ef44c7521c7d4e98708c34c816 +Author: Monty Taylor +Date: Mon Aug 8 12:36:09 2011 -0700 + + Moved run_tests.py to match other projects. + + Moving it to the trunk removes the need to do setup.py develop or + PYTHONPATH=`pwd` + + Change-Id: Ifd63eeed1c7590755a9872e7432ee1dc09065a54 + + keystone/test/run_tests.py | 113 ------------------------------------------- + run_tests.py | 116 +++++++++++++++++++++++++++++++++++++++++++++ + run_tests.sh | 2 +- + 3 files changed, 117 insertions(+), 114 deletions(-) + +commit 243b5d440d9f376f1ea5e6e6a56a063894281df0 +Merge: 5ca27a1 25f5e3a +Author: Jenkins +Date: Mon Aug 8 19:31:46 2011 +0000 + + Merge "Gets Keystone a bit more inline with the way that other OpenStack projects run tests. Basically, adds the standard run_tests.sh script, modifies the run_tests.py script to do the following:" + +commit 5ca27a1f55304783fe174cecb8ea8e0c11af49be +Author: Dolph Mathews +Date: Mon Aug 8 19:24:21 2011 +0000 + + Revert "Add proper simple_bind_s to fakeldap, removed all imports from ldap." + + This reverts commit bd34551cf397b4959f2266692e492bd539706bee + + This appears to have broken the build, after expanding test coverage in another change. + + keystone/backends/ldap/fakeldap.py | 67 +++++++++++++++----------------------- + 1 file changed, 26 insertions(+), 41 deletions(-) + +commit bd34551cf397b4959f2266692e492bd539706bee +Author: Yuriy Taraday +Date: Thu Jul 21 15:51:14 2011 +0400 + + Add proper simple_bind_s to fakeldap, removed all imports from ldap. + + Change-Id: Ic41ed8f57e734c56861ad0a1a92ca03fa171aa5e + + keystone/backends/ldap/fakeldap.py | 67 +++++++++++++++++++++++--------------- + 1 file changed, 41 insertions(+), 26 deletions(-) + +commit 25f5e3a85571fb5b3a28b44a30d0eb7fbb6e026d +Author: Dolph Mathews +Date: Fri Aug 5 21:45:09 2011 -0500 + + Gets Keystone a bit more inline with the way that + other OpenStack projects run tests. Basically, adds the standard + run_tests.sh script, modifies the run_tests.py script to do the + following: + + a) Correctly create a test configuration file that is passed + to keystone-manage and keystone. This allows you to test + keystone on a server that already has keystone running on it + b) Some DRY cleanup around the removal of database files that + get created in the course of testing + c) Creates a virtualenv automatically with the -V (-f) flag, + which reads the tools/pip-requires file and constructs a virtualenv + with all dependencies installed + + Change-Id: I8defa5956a7f23258936d04a11655d36a71226ec + + .gitignore | 3 + + README.md | 50 ++++------- + etc/keystone.ldap.conf | 49 ----------- + etc/keystone.memcache.conf | 48 ----------- + etc/keystone.sql.conf | 43 ---------- + keystone/identity.wadl | 1 - + keystone/test/etc/ldap.conf.template | 50 +++++++++++ + keystone/test/etc/memcache.conf.template | 49 +++++++++++ + keystone/test/etc/sql.conf.template | 44 ++++++++++ + keystone/test/run_tests.py | 124 +++++++++++++++++++-------- + keystone/xsd | 1 - + run_tests.sh | 102 ++++++++++++++++++++++ + setup.py | 1 + + tools/install_venv.py | 140 +++++++++++++++++++++++++++++++ + tools/pip-requires | 20 ++++- + tools/pip-requires-development | 2 - + tools/pip-requires-testing | 3 - + tools/with_venv.sh | 4 + + 18 files changed, 520 insertions(+), 214 deletions(-) + +commit cea7fca224c29d4edf621c59f7402d53cb9fd6cd +Author: Yogeshwar Srikrishnan +Date: Fri Aug 5 13:44:01 2011 -0500 + + Changes to support CRUD on services/roles. + + Change-Id: I5fd653b351bed115942fbbc9845b8f413065adcd + + .pylintrc | 8 +- + bin/keystone-manage | 67 ++++--- + bin/sampledata.sh | 7 + + etc/keystone.conf | 5 +- + keystone/backends/__init__.py | 12 +- + keystone/backends/api.py | 65 ++++-- + keystone/backends/models.py | 4 + + keystone/backends/sqlalchemy/api/role.py | 7 + + keystone/backends/sqlalchemy/api/service.py | 103 ++++++++++ + keystone/backends/sqlalchemy/models.py | 10 + + keystone/controllers/roles.py | 5 + + keystone/controllers/services.py | 38 ++++ + keystone/logic/service.py | 228 ++++++++++++++-------- + keystone/logic/types/fault.py | 8 + + keystone/logic/types/role.py | 26 ++- + keystone/logic/types/service.py | 109 +++++++++++ + keystone/middleware/auth_basic.py | 10 +- + keystone/routers/admin.py | 20 ++ + keystone/test/run_tests.py | 1 + + keystone/test/unit/test_common.py | 90 +++++++++ + keystone/test/unit/test_roles.py | 116 ++++++----- + keystone/test/unit/test_services.py | 293 ++++++++++++++++++++++++++++ + 22 files changed, 1045 insertions(+), 187 deletions(-) + +commit 8b316b713098ee5d2f5d6722cc1af04b6f3d93b9 +Author: Dolph Mathews +Date: Tue Aug 2 16:23:50 2011 -0500 + + Issue #115: Added support for testing multiple keystone configurations (sql-only, memcache, ldap) + + Change-Id: Ia539b93d244f98fdbf20692003f34edf2b9276aa + + etc/keystone.conf | 28 ++---------------- + etc/keystone.ldap.conf | 49 ++++++++++++++++++++++++++++++++ + etc/keystone.memcache.conf | 48 +++++++++++++++++++++++++++++++ + etc/keystone.sql.conf | 43 ++++++++++++++++++++++++++++ + keystone/test/run_tests.py | 71 +++++++++++++++++++++++++++------------------- + 5 files changed, 184 insertions(+), 55 deletions(-) + +commit 5102bdd3f2621d814a9fb347f0519a7434538de5 +Author: Dolph Mathews +Date: Wed Aug 3 13:40:50 2011 -0500 + + Added automatic test discovery to unit tests and removed all dead tests. + + - Removing unused functional test suite + - Revised normalizing filter tests + - Fix for all tests cases in unit.test_server + - Removing unused test class with ambiguous inheritence + - Migrated broken unit tests to system test + - Migrated tests to system tests + - Replaced test_keystone.py with automatic test discovery + - Renamed test/system to test/functional + - Removed proprietary run_tests.py which is now redundant/deprecated + - Removed bootstrap.sh, as it was only used by system tests. + + Change-Id: Ied6865f611275a2408a5d1458a9edd7d0375ffa0 + + bin/bootstrap.sh | 28 -- + keystone/test/functional/base.py | 77 --- + keystone/test/functional/common.py | 183 +++++++ + keystone/test/functional/ksapi.py | 146 ------ + keystone/test/functional/run_tests.py | 61 --- + keystone/test/functional/sample_test.py | 84 ---- + keystone/test/functional/simplerest.py | 641 ------------------------- + keystone/test/functional/test_auth.py | 177 +++++++ + keystone/test/functional/test_issue_85.py | 73 +++ + keystone/test/functional/test_request_specs.py | 91 ++++ + keystone/test/functional/test_static_files.py | 22 + + keystone/test/functional/test_tokens.py | 51 -- + keystone/test/run_tests.py | 10 +- + keystone/test/system/__init__.py | 0 + keystone/test/system/common.py | 183 ------- + keystone/test/system/run_tests.py | 38 -- + keystone/test/system/test_auth.py | 120 ----- + keystone/test/system/test_issue_85.py | 73 --- + keystone/test/system/test_request_specs.py | 91 ---- + keystone/test/system/test_static_files.py | 22 - + keystone/test/unit/test_authn_v2.py | 436 ----------------- + keystone/test/unit/test_keystone.py | 70 --- + keystone/test/unit/test_normalizingfilter.py | 79 +++ + keystone/test/unit/test_server.py | 2 +- + keystone/test/unit/test_urlrewritefilter.py | 79 --- + 25 files changed, 629 insertions(+), 2208 deletions(-) + +commit 597e8084e09656d9875116bcd6d2eb5f534544ca +Merge: 359ba41 e3b9d24 +Author: Jenkins +Date: Thu Aug 4 22:09:04 2011 +0000 + + Merge changes I2c7b3a9a,I54206339 + + * changes: + Small licensing change to test Gerrit + Small change to test Gerrit + +commit 359ba417c99c73efeb257ccc62714a1189b8b664 +Merge: b00050f e26681c +Author: Jenkins +Date: Thu Aug 4 22:07:25 2011 +0000 + + Merge "updated README with more accurate swift info" + +commit b00050f3f0a5c9c66f9ee7f685afd67dec1c58da +Merge: b9d67ae c05a757 +Author: Jenkins +Date: Thu Aug 4 22:06:35 2011 +0000 + + Merge "Fix brain-o--we may not need project_ref, but we do need to create the project!" + +commit b9d67ae1e59177ef54cc688b2c4e3ae78944504b +Author: Dolph Mathews +Date: Wed Aug 3 15:31:56 2011 -0500 + + PEP8 fixes... all of them. + + Change-Id: I42f83b54d331295fcbc8866b527b779b17836454 + + bin/keystone | 18 +-- + bin/keystone-admin | 4 +- + bin/keystone-auth | 14 +- + bin/keystone-manage | 43 +++--- + keystone/__init__.py | 1 - + keystone/backends/__init__.py | 3 +- + keystone/backends/alterdb/api/token.py | 8 +- + keystone/backends/alterdb/models.py | 4 +- + keystone/backends/api.py | 2 + + keystone/backends/ldap/api/__init__.py | 3 +- + keystone/backends/ldap/api/base.py | 13 +- + keystone/backends/ldap/api/role.py | 26 ++-- + keystone/backends/ldap/api/tenant.py | 11 +- + keystone/backends/ldap/api/user.py | 7 +- + keystone/backends/ldap/fakeldap.py | 36 ++--- + keystone/backends/ldap/models.py | 23 ++-- + keystone/backends/memcache/models.py | 1 - + keystone/backends/sqlalchemy/api/__init__.py | 2 +- + .../backends/sqlalchemy/api/endpoint_template.py | 46 ++++--- + keystone/backends/sqlalchemy/api/role.py | 42 +++--- + keystone/backends/sqlalchemy/api/tenant.py | 64 +++++---- + keystone/backends/sqlalchemy/api/token.py | 24 ++-- + keystone/backends/sqlalchemy/api/user.py | 69 +++++----- + keystone/backends/sqlalchemy/models.py | 5 +- + keystone/common/config.py | 29 ++-- + keystone/common/template.py | 78 ++++++----- + keystone/common/wsgi.py | 38 +++--- + keystone/controllers/__init__.py | 3 +- + keystone/controllers/auth.py | 3 +- + keystone/controllers/endpointtemplates.py | 1 + + keystone/controllers/roles.py | 1 + + keystone/controllers/staticfiles.py | 1 + + keystone/controllers/tenant.py | 1 + + keystone/controllers/user.py | 1 + + keystone/controllers/version.py | 5 +- + keystone/logic/service.py | 60 ++++----- + keystone/logic/types/auth.py | 3 +- + keystone/logic/types/endpoint.py | 4 +- + keystone/logic/types/fault.py | 1 + + keystone/logic/types/tenant.py | 3 +- + keystone/logic/types/user.py | 4 +- + keystone/middleware/auth_basic.py | 1 - + keystone/middleware/auth_openid.py | 1 - + keystone/middleware/auth_token.py | 4 +- + keystone/middleware/nova_auth_token.py | 1 - + keystone/middleware/swift_auth.py | 17 +-- + keystone/middleware/url.py | 40 +++--- + keystone/routers/__init__.py | 1 - + keystone/routers/admin.py | 4 +- + keystone/routers/service.py | 7 +- + keystone/server.py | 2 + + keystone/test/functional/run_tests.py | 4 +- + keystone/test/functional/simplerest.py | 2 +- + keystone/test/run_tests.py | 8 +- + keystone/test/system/__init__.py | 1 - + keystone/test/system/common.py | 87 ++++++------ + keystone/test/system/run_tests.py | 12 +- + keystone/test/system/test_auth.py | 40 +++--- + keystone/test/system/test_issue_85.py | 50 +++---- + keystone/test/system/test_request_specs.py | 33 ++--- + keystone/test/system/test_static_files.py | 6 +- + keystone/test/unit/base.py | 19 ++- + keystone/test/unit/test_auth.py | 10 +- + keystone/test/unit/test_authentication.py | 2 + + keystone/test/unit/test_authn_v2.py | 65 +++------ + keystone/test/unit/test_common.py | 40 ++++-- + keystone/test/unit/test_endpoints.py | 52 +++---- + keystone/test/unit/test_keystone.py | 10 +- + keystone/test/unit/test_roles.py | 149 +++++++++++---------- + keystone/test/unit/test_server.py | 37 ++--- + keystone/test/unit/test_tenants.py | 3 +- + keystone/test/unit/test_token.py | 39 +++--- + keystone/test/unit/test_urlrewritefilter.py | 6 +- + keystone/test/unit/test_users.py | 84 ++++++------ + keystone/utils.py | 12 +- + 75 files changed, 798 insertions(+), 756 deletions(-) + +commit e3b9d24fea34b405a2c67cccd0c1955b35fb9c6b +Author: Ziad Sawalha +Date: Thu Aug 4 12:33:17 2011 -0500 + + Small licensing change to test Gerrit + + Change-Id: I2c7b3a9aa2eb8e7d1118c8e72bb9e1af00b9f8d5 + + keystone/backends/api.py | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 552590aa466d78dee7240996f781773290433054 +Author: Ziad Sawalha +Date: Thu Aug 4 12:31:41 2011 -0500 + + Small change to test Gerrit + + Change-Id: I54206339ad6ed13f7b7e34c1432e22da3dd81f67 + + keystone/backends/memcache/api/__init__.py | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit c05a75752476454cfff8483b69683b32d3ed394a +Author: Kevin L. Mitchell +Date: Thu Aug 4 10:51:05 2011 -0500 + + Fix brain-o--we may not need project_ref, but we do need to create the project! + + Change-Id: Iba074fc05fbc150de2ffe813f49d3721aea4bcf5 + + keystone/middleware/nova_auth_token.py | 4 ++++ + 1 file changed, 4 insertions(+) + +commit e26681cc86810ce15ad5a48fd5aa266541d7e48f +Author: John Dickinson +Date: Wed Aug 3 13:26:40 2011 -0500 + + updated README with more accurate swift info + + Change-Id: If65f38ffe317b222297d56067ff71900f0cab9d0 + + README.md | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 5997d943294647bc80b7d8ce68db91946ba9c032 +Merge: b4491d9 f9ca571 +Author: Jenkins +Date: Wed Aug 3 18:07:01 2011 +0000 + + Merge "Determine is_admin based on 'Admin' role; remove dead project_ref code; pass auth_token into request context; pass user_id/project_id into request context instead of their refs" + +commit b4491d96705aa6070802d2c5a798723de261a9dc +Merge: 8ff14cd b3c4f16 +Author: Jenkins +Date: Wed Aug 3 15:12:05 2011 +0000 + + Merge "Added support for versioned openstack MIME types" + +commit f9ca57105e49a1640eb4e04a801591069064f352 +Author: Kevin L. Mitchell +Date: Tue Aug 2 15:34:18 2011 -0500 + + Determine is_admin based on 'Admin' role; remove dead project_ref code; + pass auth_token into request context; pass user_id/project_id into + request context instead of their refs + + Change-Id: Ib23f59694301dcfc91cf8e8deff8ae0a090e82df + + keystone/middleware/nova_auth_token.py | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +commit 8ff14cde887ac59adf3d682f0b4f81dae0d4dd76 +Merge: 979bc77 9dcce1f +Author: Jenkins +Date: Mon Aug 1 18:50:50 2011 +0000 + + Merge "Add unittest2 to pip requires for testing" + +commit b3c4f16ca84e4d19caef1c40266310bf090c0927 +Author: Dolph Mathews +Date: Mon Aug 1 12:07:27 2011 -0500 + + Added support for versioned openstack MIME types + + Additional MIME types are normalized down to 'application/xml' + and 'application/json' to minimize impact on underlying layers. + Also added normalized KEYSTONE_API_VERSION and + KEYSTONE_RESPONSE_ENCODING (simplified prefferred Accept + encoding) to the wsgi environment for underlying apps to + optionally utilize. (note: the legacy layer now looks for the + KEYSTONE_API_VERSION). + + Includes additional pylint fixes. + + Change-Id: I06b82e603799ed89a2e2d92005892ede0a295225 + + .../backends/sqlalchemy/api/endpoint_template.py | 64 ++++----- + keystone/common/template.py | 68 ++++++---- + keystone/frontends/legacy_token_auth.py | 5 +- + keystone/middleware/url.py | 147 ++++++++++++++++----- + keystone/routers/admin.py | 70 +++++----- + keystone/routers/service.py | 14 +- + keystone/test/functional/sample_test.py | 7 +- + keystone/test/system/test_request_specs.py | 12 ++ + 8 files changed, 246 insertions(+), 141 deletions(-) + +commit 979bc77e7cb570e807675be27c4607852009ab38 +Author: Yogeshwar Srikrishnan +Date: Wed Jul 27 18:28:53 2011 -0500 + + #16 Changes to remove unused group clls. + + Change-Id: Ia5a6f74ccfa5fb9975950c63db7828441a8ba4a0 + + Issue #16 Pylint changes.Changes to remove unused group calls. + + Change-Id: Ia5a6f74ccfa5fb9975950c63db7828441a8ba4a0 + + bin/sampledata.sh | 11 - + etc/keystone.conf | 6 +- + examples/echo/echo/server.py | 2 - + keystone/backends/ldap/api/user.py | 4 +- + keystone/backends/memcache/__init__.py | 3 - + keystone/backends/memcache/api/token.py | 1 - + keystone/backends/models.py | 10 +- + keystone/backends/sqlalchemy/api/__init__.py | 2 +- + keystone/backends/sqlalchemy/api/group.py | 176 ---- + keystone/backends/sqlalchemy/api/tenant.py | 3 - + keystone/backends/sqlalchemy/api/tenant_group.py | 123 --- + keystone/backends/sqlalchemy/api/user.py | 131 --- + keystone/backends/sqlalchemy/models.py | 17 - + keystone/controllers/groups.py | 66 -- + keystone/controllers/tenant.py | 55 +- + keystone/controllers/user.py | 7 - + keystone/logic/service.py | 459 +-------- + keystone/logic/types/auth.py | 37 +- + keystone/logic/types/fault.py | 17 - + keystone/logic/types/tenant.py | 223 +---- + keystone/logic/types/user.py | 10 +- + keystone/middleware/auth_basic.py | 3 - + keystone/middleware/auth_token.py | 12 +- + keystone/middleware/swift_auth.py | 1 - + keystone/routers/admin.py | 66 -- + keystone/test/unit/test_common.py | 248 +---- + keystone/test/unit/test_groups.py | 965 ------------------- + keystone/test/unit/test_keystone.py | 2 - + keystone/test/unit/test_server.py | 2 +- + keystone/test/unit/test_tenant_groups.py | 1110 ---------------------- + keystone/test/unit/test_users.py | 107 --- + 31 files changed, 22 insertions(+), 3857 deletions(-) + +commit 9dcce1f163ddc5313e65fbc01953c7a7362fa22a +Author: Ziad Sawalha +Date: Thu Jul 28 23:44:53 2011 -0500 + + Add unittest2 to pip requires for testing + + Change-Id: I425ab1b53fd4519902af017e39a4cfd638984f49 + + tools/pip-requires-testing | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 637f3692dceccee98df141a26123db0a32af6f7f +Author: Yogeshwar Srikrishnan +Date: Tue Jul 26 12:02:59 2011 -0500 + + #66 Change in variable cases. + + keystone/backends/memcache/__init__.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 7278588a3b150b239abf319a0fc9b79513bb5095 +Author: Yogeshwar Srikrishnan +Date: Tue Jul 26 12:00:56 2011 -0500 + + #66 Change in variable cases. + + keystone/backends/memcache/__init__.py | 16 ++++++++-------- + keystone/backends/memcache/api/token.py | 22 +++++++++++----------- + 2 files changed, 19 insertions(+), 19 deletions(-) + +commit eced013df6b56d7c216b600769ee67b75fc4f0b7 +Author: Yogeshwar Srikrishnan +Date: Tue Jul 26 10:25:52 2011 -0500 + + Changes to make cache time configurable. + + etc/keystone.conf | 2 ++ + keystone/backends/memcache/__init__.py | 4 +++- + keystone/backends/memcache/api/token.py | 13 +++---------- + 3 files changed, 8 insertions(+), 11 deletions(-) + +commit 17743367b6710babb2a0596a6002e7f415624bc0 +Author: Yogeshwar Srikrishnan +Date: Mon Jul 25 17:07:47 2011 -0500 + + Changes to store tokens using memcache #66. + + README.md | 2 + + etc/keystone.conf | 3 ++ + keystone/backends/memcache/__init__.py | 80 ++++++++++++++++++++++++++++++ + keystone/backends/memcache/api/__init__.py | 1 + + keystone/backends/memcache/api/token.py | 61 +++++++++++++++++++++++ + keystone/backends/memcache/models.py | 20 ++++++++ + tools/pip-requires | 1 + + 7 files changed, 168 insertions(+) + +commit 1181778b43b5e7a9a48448e842c7f72142ed74be +Author: Yogeshwar Srikrishnan +Date: Wed Jul 27 10:16:28 2011 -0500 + + Changes suggested by Ziad.Adding validateToken operation. + + doc/design/keystone-service-registration.sdx | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit df509796c618702a56db6ea53805c3384a2e6275 +Author: Yogeshwar Srikrishnan +Date: Tue Jul 26 17:55:45 2011 -0500 + + Flow diagram to support keystone service registration. + + doc/design/keystone-service-registration.sdx | 96 ++++++++++++++++++++++++++++ + 1 file changed, 96 insertions(+) + +commit bd4f870f96501eb3912c8177cd8a5830451b313e +Author: Dolph Mathews +Date: Wed Jul 27 14:57:55 2011 -0500 + + Restored identity.wadl w/ system test + + Change-Id: I03899a3cc842f8f8ddaaa26c7681dcda43c2bc17 + + keystone/content/identity.wadl | 1024 +++++++++++++++++++++++++++++ + keystone/controllers/staticfiles.py | 2 +- + keystone/test/system/test_static_files.py | 20 + + 3 files changed, 1045 insertions(+), 1 deletion(-) + +commit 4802e21919d6628f3493e80dfb7bae50f42e7f6f +Author: Dolph Mathews +Date: Wed Jul 27 12:31:36 2011 -0500 + + pylint fixes for role api + + Change-Id: Id39a117a49ebc560b6e50fb0ed4db7691794899c + + keystone/backends/sqlalchemy/api/role.py | 90 +++++++++++++++++--------------- + 1 file changed, 48 insertions(+), 42 deletions(-) + +commit 957ceec56dbeb7dc479ae1c5fbcc69ef14fde0fc +Author: Dolph Mathews +Date: Wed Jul 27 11:06:47 2011 -0500 + + Removing attribute duplicated from superclass; causes an issue in py 2.7 + + Change-Id: I9241b3d0869a4e37910c7de57ff04da0f98f74d8 + + keystone/common/wsgi.py | 6 ------ + 1 file changed, 6 deletions(-) + +commit 6d551a380a4f3486b70ad9c6a9d8af83f94082e2 +Author: Dolph Mathews +Date: Tue Jul 26 22:34:06 2011 -0500 + + pylint fixes for tenant-group unit tests + + Change-Id: I1ec37fca7f815c17dc8efce1ed6e177d0de95b95 + + keystone/test/unit/test_tenant_groups.py | 530 +++++++++++++------------------ + 1 file changed, 215 insertions(+), 315 deletions(-) + +commit 8ec8506c954db0cc60783d5c4f0a70519e6f55a4 +Author: Dolph Mathews +Date: Tue Jul 26 22:33:45 2011 -0500 + + pylint fixes for server unit tests + + Change-Id: I4806897a0a61f2900ba14a2d1f3aa0348207fd78 + + keystone/test/unit/test_server.py | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) + +commit 37cdc7d263b3724990d35078a2d584a573da54be +Author: Dolph Mathews +Date: Tue Jul 26 10:17:25 2011 -0500 + + Making the API version configurable per API request + + keystone/test/system/common.py | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +commit b7a02244c1c22ba8fc99f098e17031a18588cb5b +Author: Dolph Mathews +Date: Mon Jul 25 17:13:53 2011 -0500 + + PEP8 fixes for system tests + + keystone/test/system/common.py | 96 ++++++++++++++++++----------------- + keystone/test/system/test_auth.py | 19 +++---- + keystone/test/system/test_issue_85.py | 8 +-- + 3 files changed, 64 insertions(+), 59 deletions(-) + +commit 0c0c5a6ccb2ca5f5daa5a9cc38106bb7ea87d5f5 +Author: Dolph Mathews +Date: Mon Jul 25 17:08:42 2011 -0500 + + Issue #13: Added support for Accept-appropriate 404 responses w/ tests for json & xml. + + keystone/common/wsgi.py | 114 ++++++++++++++++++++++++++--- + keystone/test/system/test_request_specs.py | 18 ++++- + 2 files changed, 119 insertions(+), 13 deletions(-) + +commit fc6deda37b1d2dbc05144ca36b94139a26f1e3ba +Author: Dolph Mathews +Date: Mon Jul 25 10:33:01 2011 -0500 + + Simple change to test gerrit + + keystone/utils.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit ca5efebfd395b3e2c7ebbf3a3a4a7f45c0ad1746 +Merge: f0f84ef f408062 +Author: Ziad Sawalha +Date: Mon Jul 25 14:26:35 2011 -0700 + + Merge pull request #121 from klmitch/master + + Document anonymous access for glance + +commit f408062c91501315f73cab9c9a4cc28ea9cba83f +Merge: 0f4a032 f0f84ef +Author: Kevin L. Mitchell +Date: Mon Jul 25 16:18:57 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit 0f4a0325ca09f7680f21ba3830cfc0eb84802d8c +Author: Kevin L. Mitchell +Date: Mon Jul 25 16:17:09 2011 -0500 + + Document how to allow anonymous access + + examples/paste/glance-api.conf | 3 +++ + examples/paste/glance-registry.conf | 3 +++ + 2 files changed, 6 insertions(+) + +commit f0f84ef6bdd0ede6d63e6516cc6ec982e07bdeb2 +Merge: 52b36c6 03bcc2a +Author: Ziad Sawalha +Date: Mon Jul 25 13:52:50 2011 -0700 + + Merge pull request #120 from robin-norwood/master + + Added instructions to work around segfault on Fedora 15 + +commit 52b36c607e7fc853ce1a2189869235664d73a1ca +Merge: 4d11375 2c1ddfa +Author: Ziad Sawalha +Date: Mon Jul 25 13:52:39 2011 -0700 + + Merge pull request #119 from klmitch/master + + Add glance integration middleware + +commit 03bcc2ae265aa691495671c1e5880dca1550f4b6 +Author: Robin Norwood +Date: Mon Jul 25 15:43:07 2011 -0500 + + Sigh. Proofreading... + + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 54f85d8d8780dc563bf0bfc9241bc92141156685 +Author: Robin Norwood +Date: Mon Jul 25 15:38:37 2011 -0500 + + Update README with instructions to fix segfault. + + README.md | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 2c1ddfa03b5e3d8b553132a8a7bd5b6d123275d9 +Author: Kevin L. Mitchell +Date: Mon Jul 25 11:03:51 2011 -0500 + + These changes make no sense--I didn't do them, and I'm in sync! + + keystone/test/functional/base.py | 50 +++++++------------------- + keystone/test/functional/run_tests.py | 22 +----------- + keystone/test/functional/sample_test.py | 19 +++++----- + keystone/test/functional/simplerest.py | 2 +- + keystone/test/functional/test_tokens.py | 63 ++++++--------------------------- + 5 files changed, 34 insertions(+), 122 deletions(-) + +commit 547b63d2e318e86a15bfe585425f095ec5bfb76a +Author: Kevin L. Mitchell +Date: Mon Jul 25 10:49:22 2011 -0500 + + Add middleware for glance integration + + examples/paste/glance-api.conf | 88 ++++++++++++++++++++++++++++++++ + examples/paste/glance-registry.conf | 52 +++++++++++++++++++ + keystone/middleware/glance_auth_token.py | 74 +++++++++++++++++++++++++++ + 3 files changed, 214 insertions(+) + +commit 6280e42e8a94a0face838702ca9f7d903ccbe95a +Merge: fe1236e 4d11375 +Author: Kevin L. Mitchell +Date: Mon Jul 25 10:18:09 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit 4d113753a97247734dac0e7243aa272bd9124911 +Merge: cd6dc52 c64f4be +Author: Ziad Sawalha +Date: Mon Jul 25 06:56:42 2011 -0700 + + Merge pull request #117 from dolph/master + + Fixed naming-conflict with a builtin function, next() + +commit c64f4bea97cd37621db728551934fe2b92382344 +Merge: f22194a cd6dc52 +Author: Dolph Mathews +Date: Mon Jul 25 08:42:28 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit cd6dc5263ce0b8a24edec7603e51edf8e41231dd +Merge: 66b16c5 f415cf6 +Author: Ziad Sawalha +Date: Mon Jul 25 05:38:16 2011 -0700 + + Merge pull request #116 from yogirackspace/master + + Fix for #3 + +commit f415cf64b68fe5bc49aebbec363f5647a900983b +Author: Yogeshwar Srikrishnan +Date: Fri Jul 22 15:56:29 2011 -0500 + + #3 Preventing creation of users with empty user id and pwds. + + keystone/logic/service.py | 2 +- + keystone/logic/types/user.py | 11 +++++++++-- + keystone/test/unit/test_common.py | 8 ++++---- + keystone/test/unit/test_users.py | 33 +++++++++++++++++++++++++++++++-- + 4 files changed, 45 insertions(+), 9 deletions(-) + +commit f22194af48d01bf14395101ce5266326f5edc063 +Author: Dolph Mathews +Date: Fri Jul 22 15:29:32 2011 -0500 + + Fixing naming conflict with builtin function next() + + keystone/backends/sqlalchemy/api/tenant.py | 68 +++++++-------- + keystone/backends/sqlalchemy/api/user.py | 128 ++++++++++++++--------------- + 2 files changed, 98 insertions(+), 98 deletions(-) + +commit fe1236e0723e25ad67f5d8c480dce640a230e304 +Merge: f57b84c 66b16c5 +Author: Kevin L. Mitchell +Date: Fri Jul 22 14:28:51 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit 66b16c5edec28a01e064075fb52f50179b23eb56 +Merge: e574736 d00083f +Author: Ziad Sawalha +Date: Thu Jul 21 18:02:47 2011 -0700 + + Merge pull request #114 from mgius/master + + Fix failing test since disabled check merge + +commit e5747365e40fa30317c1d18cd83bed74588eb003 +Merge: 0a823b7 6a29158 +Author: Ziad Sawalha +Date: Thu Jul 21 18:02:36 2011 -0700 + + Merge pull request #113 from yogirackspace/master + + Changes to allow password updates even when the user is disabled + +commit d00083fe788182a652f4d0fd1990a37c4f060c96 +Author: Mark Gius +Date: Thu Jul 21 14:07:09 2011 -0700 + + This makes the use of set_enabled more clear + + keystone/test/unit/test_common.py | 2 +- + keystone/test/unit/test_users.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit e4787d18358d8d62706bb721ee425f0e4b04795d +Author: Mark Gius +Date: Thu Jul 21 14:03:39 2011 -0700 + + Fixes failing test introduced after disabled check remove. + + Also includes some cleanup in UpdateUsers test class. + + keystone/test/unit/test_common.py | 10 ++++++++++ + keystone/test/unit/test_users.py | 31 +++++++++++-------------------- + 2 files changed, 21 insertions(+), 20 deletions(-) + +commit 6a29158b6e17155e922c055be01d14823e8bb920 +Author: Yogeshwar Srikrishnan +Date: Thu Jul 21 15:41:56 2011 -0500 + + Changes to allow password updates even when the user is disabled.Also fixed failing tests. + + keystone/logic/service.py | 3 --- + keystone/test/unit/test_keystone.py | 2 +- + keystone/test/unit/test_users.py | 11 +++++++++-- + 3 files changed, 10 insertions(+), 6 deletions(-) + +commit 0a823b7a7d5c2f0f25c688baafe42ba8e0afbf68 +Merge: c842387 7b94ecb +Author: Ziad Sawalha +Date: Thu Jul 21 10:40:22 2011 -0700 + + Merge pull request #110 from dolph/master + + Includes unit test updates for commit c84238711eb4151cd093 + +commit 7b94ecb967b2bb0dda9096cd22315bebc26406d2 +Author: Dolph Mathews +Date: Thu Jul 21 12:30:27 2011 -0500 + + Disabled users should now be returned by GET /users/{user_id} + + keystone/test/unit/test_users.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f3c983699ef26aec53804773e85e500f1ec865b2 +Author: Dolph Mathews +Date: Thu Jul 21 12:25:43 2011 -0500 + + Updating a disabled user (via xml) should now succeed + + keystone/test/unit/test_users.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 804f4d5db8d78b3462bf0acb693e4dd76209c413 +Author: Dolph Mathews +Date: Thu Jul 21 12:19:32 2011 -0500 + + Updating a disabled user should now succeed + + keystone/test/unit/test_users.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0c1dab520993ac40dbb0b2a298bff451c68dcbdc +Author: Dolph Mathews +Date: Thu Jul 21 11:00:10 2011 -0500 + + Noted potential issue, but I'm not sure if this is dead code or not anyway? + + keystone/test/unit/base.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 77e5404afeea308902f28f15959654e34e20e8ad +Author: Dolph Mathews +Date: Thu Jul 21 10:55:26 2011 -0500 + + Assigned Base API classes so downstream code knows what to expect + + keystone/backends/api.py | 71 +++++++++++++++++++++++------------------------- + 1 file changed, 34 insertions(+), 37 deletions(-) + +commit 9cd5caff10cd9de9357efccba396914bb62e8554 +Merge: 5b2f360 c842387 +Author: Dolph Mathews +Date: Thu Jul 21 09:13:24 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit c84238711eb4151cd093312eb8c5f1a7f89e5984 +Merge: 49cfcd5 4cf95f7 +Author: Ziad Sawalha +Date: Wed Jul 20 15:37:29 2011 -0700 + + Merge pull request #105 from mgius/remove_disabled_checks + + Removes disabled checks from get_user and update_user + +commit 5b2f3602af60325660669d9ecb9a1fae588dd6db +Author: Dolph Mathews +Date: Wed Jul 20 17:33:33 2011 -0500 + + Adding missing class variable declaration + + keystone/backends/sqlalchemy/models.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit ab7992738d74ed1186af28c180efd0d122bc652d +Author: Dolph Mathews +Date: Wed Jul 20 17:33:04 2011 -0500 + + Cleaning up unit tests + + keystone/test/unit/test_authentication.py | 14 +- + keystone/test/unit/test_authn_v2.py | 25 ++- + keystone/test/unit/test_common.py | 33 +-- + keystone/test/unit/test_endpoints.py | 338 ++++++++++++---------------- + keystone/test/unit/test_groups.py | 228 +++++++++---------- + keystone/test/unit/test_roles.py | 243 ++++++++++---------- + keystone/test/unit/test_tenant_groups.py | 104 +++++---- + keystone/test/unit/test_tenants.py | 58 ++--- + keystone/test/unit/test_token.py | 28 +-- + keystone/test/unit/test_users.py | 354 +++++++++++++++--------------- + keystone/test/unit/test_version.py | 4 +- + 11 files changed, 685 insertions(+), 744 deletions(-) + +commit 4cf95f778395403038e4d3d7ce1cc59225c0547c +Author: Mark Gius +Date: Wed Jul 20 15:08:09 2011 -0700 + + Removes disabled checks from get_user and update_user + + keystone/logic/service.py | 6 ------ + 1 file changed, 6 deletions(-) + +commit 5b8596f54688b7887d93fe46810ad1dffa202d1a +Author: Dolph Mathews +Date: Wed Jul 20 16:03:53 2011 -0500 + + Fixing module-level variable naming issues + + keystone/test/unit/test_common.py | 126 +++++++++++++++++++------------------- + 1 file changed, 62 insertions(+), 64 deletions(-) + +commit 09fe6a312841d0e6918ba48f4310a03b01a1c5cb +Author: Dolph Mathews +Date: Wed Jul 20 16:02:16 2011 -0500 + + Improving variable naming consistency + + keystone/test/unit/test_common.py | 73 ++++++++++++++++++++------------------- + 1 file changed, 37 insertions(+), 36 deletions(-) + +commit 720f62232dc024c7a2b2cc59b66f06a5e0ba44bc +Author: Dolph Mathews +Date: Wed Jul 20 15:57:34 2011 -0500 + + Avoiding overloading of built-in: type() + + keystone/test/unit/test_common.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c42075dc82770e8b05f86da4d6ddc14d32ee011c +Author: Dolph Mathews +Date: Wed Jul 20 15:51:40 2011 -0500 + + Fixing indentation + + keystone/test/unit/test_common.py | 59 +++++++++++++++------------------------ + 1 file changed, 23 insertions(+), 36 deletions(-) + +commit fbc446958d83b5d40620f1f05f1e11c82a6c7512 +Author: Dolph Mathews +Date: Wed Jul 20 10:35:01 2011 -0500 + + Specified python-ldap version, which appears to avoid the packaging issues we've experienced + + tools/pip-requires | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9737e80def17b25838d8d88be1fbb97cabfbe805 +Author: Dolph Mathews +Date: Wed Jul 20 10:33:30 2011 -0500 + + Added missing import + + keystone/backends/ldap/api/base.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f57b84ce9e5d93ad04628d346114ca22d875266d +Merge: 9fe9189 49cfcd5 +Author: Kevin L. Mitchell +Date: Wed Jul 20 10:31:02 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit 49cfcd5ca7022743abbc501a8640aac5c94cf6ae +Author: Ziad Sawalha +Date: Tue Jul 19 22:23:30 2011 -0500 + + More LDAP tweaks + + README.md | 20 ++++++++++++++++++++ + bin/keystone-manage | 5 +++-- + etc/keystone.conf | 6 ++++-- + keystone/backends/ldap/__init__.py | 17 +++++++++++++++++ + keystone/test/run_tests.py | 4 ++++ + tools/pip-requires | 2 +- + 6 files changed, 49 insertions(+), 5 deletions(-) + +commit 12004184f63f3616e91a013da832fcf6a65dc363 +Author: Ziad Sawalha +Date: Tue Jul 19 20:54:00 2011 -0500 + + LDAP backend updates + + etc/keystone.conf | 6 ++ + keystone/backends/api.py | 118 +++++++++++++++++++------------------ + keystone/backends/ldap/__init__.py | 16 +++++ + keystone/backends/models.py | 2 +- + 4 files changed, 83 insertions(+), 59 deletions(-) + +commit 16c0a5e03372daa6f3f66feffc5383a8efb5f418 +Author: Ziad Sawalha +Date: Tue Jul 19 20:32:07 2011 -0500 + + More test fixes + + keystone/test/unit/test_roles.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit df2015ba3dc0a30f0a311df0a2891b0d489004ce +Author: Ziad Sawalha +Date: Tue Jul 19 20:19:11 2011 -0500 + + Fixed deprecation warning + + keystone/utils.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 65df46ac3289d3f85b9c04be4323c67ed62914d3 +Author: Ziad Sawalha +Date: Tue Jul 19 18:12:35 2011 -0500 + + Updated test to allow for additional role + + keystone/test/unit/test_roles.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0a20d474842774ba1c2949e70ecbb70de10db5dc +Merge: 9f6953e 6a012ff +Author: Ziad Sawalha +Date: Tue Jul 19 16:08:50 2011 -0700 + + Merge pull request #104 from dolph/master + + Fix for issue #85 + +commit 9f6953e22345ce012815b53b61c721e6cbd7d3de +Merge: 25380b0 0f701ba +Author: Ziad Sawalha +Date: Tue Jul 19 16:08:37 2011 -0700 + + Merge pull request #103 from mgius/master + + Add Member to sampledata + +commit 25380b0eb367fa2cb5fa5dbb075d6f4016ffc60f +Merge: 6b9e4b4 39b944e +Author: Ziad Sawalha +Date: Tue Jul 19 18:08:06 2011 -0500 + + Merge LDAP changes + +commit 6a012ffd3b46518019a8ecbf7c5285e890ab15fa +Author: Dolph Mathews +Date: Tue Jul 19 15:49:22 2011 -0500 + + Restored UnauthorizedFaults to token validation requests + + keystone/logic/service.py | 5 +++++ + 1 file changed, 5 insertions(+) + +commit d4727d4b746db8a1fb4b2a7519b30ffa8f4bec7f +Author: Dolph Mathews +Date: Tue Jul 19 15:31:35 2011 -0500 + + Fix for issue #85 + + keystone/logic/service.py | 184 +++++++++++++++++++++++++--------------------- + 1 file changed, 99 insertions(+), 85 deletions(-) + +commit 9dcd6c1cd2d6f3f25b97f16ea405a0f3b1c9073f +Author: Dolph Mathews +Date: Tue Jul 19 15:25:21 2011 -0500 + + - System test framework can now assert specific response codes automatically + - Revised system test for issue #85 based on clarification from Ziad + - Added system test to attempt admin action using a service token + + keystone/test/system/common.py | 26 +++++++------- + keystone/test/system/test_auth.py | 54 +++++++++++++++++++++++++++++- + keystone/test/system/test_issue_85.py | 21 +++++++----- + keystone/test/system/test_request_specs.py | 2 +- + 4 files changed, 79 insertions(+), 24 deletions(-) + +commit 0f701ba65870de316cd896b6c43aaab15f00ee57 +Author: Mark Gius +Date: Mon Jul 18 15:41:08 2011 -0700 + + Adds the member role to sampledata, gives it to joeuser. + + bin/sampledata.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit a93bc04ddefa8de9eeeaedca95e76deedbe3157d +Author: Dolph Mathews +Date: Mon Jul 18 16:37:13 2011 -0500 + + PEP8 fixes + + keystone/backends/sqlalchemy/models.py | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) + +commit 95a7a4bff460b11b155f42c2ca35f6121319d731 +Author: Dolph Mathews +Date: Mon Jul 18 15:52:30 2011 -0500 + + Formatting + + etc/keystone.conf | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +commit 98257894d4de09d60411caf30b37df10c76e4713 +Merge: 15d719e 6b9e4b4 +Author: Dolph Mathews +Date: Mon Jul 18 15:47:27 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit 9fe9189a20b3529311ed8d612d58dc986ae66224 +Merge: f056781 6b9e4b4 +Author: Kevin L. Mitchell +Date: Mon Jul 18 13:41:29 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit 15d719e82c7ca96428caa25fc29bdf41a3e9e150 +Author: Dolph Mathews +Date: Mon Jul 18 12:37:18 2011 -0500 + + Merged duplicate code + + keystone/common/config.py | 33 ++------------------------------- + keystone/common/wsgi.py | 23 ++++++++++++----------- + 2 files changed, 14 insertions(+), 42 deletions(-) + +commit 39b944eefbc3a84b6277d8002d6a6a42289c4ffd +Author: Yuriy Taraday +Date: Mon Jul 18 20:04:23 2011 +0400 + + Add first implementation of LDAP backend. + + .gitignore | 1 + + keystone/backends/ldap/__init__.py | 16 ++ + keystone/backends/ldap/api/__init__.py | 25 +++ + keystone/backends/ldap/api/base.py | 150 ++++++++++++++++++ + keystone/backends/ldap/api/role.py | 154 ++++++++++++++++++ + keystone/backends/ldap/api/tenant.py | 53 +++++++ + keystone/backends/ldap/api/user.py | 97 ++++++++++++ + keystone/backends/ldap/fakeldap.py | 278 +++++++++++++++++++++++++++++++++ + keystone/backends/ldap/models.py | 48 ++++++ + 9 files changed, 822 insertions(+) + +commit b2839ad32f3ce7ac935ea1edac59bcb2bdc0b6ed +Author: Dolph Mathews +Date: Mon Jul 18 11:00:37 2011 -0500 + + Added (failing) system test for issue #13 + + keystone/test/system/test_request_specs.py | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 07cf9bd5c65e42a11495728136bb06556624bac2 +Author: Dolph Mathews +Date: Mon Jul 18 11:00:21 2011 -0500 + + Minor cleanup + + keystone/backends/alterdb/models.py | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 662d24575872265430abe039b748429cd668347c +Author: Yuriy Taraday +Date: Mon Jul 18 19:58:00 2011 +0400 + + Made all API methods raise NotImplementedError if they are not implemented in backend. + + keystone/backends/api.py | 164 +++++++++++++++++++++++------------------------ + 1 file changed, 82 insertions(+), 82 deletions(-) + +commit 2a20fa36afa742200c34620c58db597c6a581452 +Author: Yuriy Taraday +Date: Mon Jul 18 19:57:04 2011 +0400 + + Made delete_all_endpoint calm if there is nothing to do. + + keystone/test/unit/test_common.py | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit decdad2c1849d721062ef35930604f9ceb5f3c11 +Author: Yuriy Taraday +Date: Mon Jul 18 19:56:08 2011 +0400 + + Fixed bug causing request body setting to fail. + + keystone/frontends/legacy_token_auth.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 18ad51c566b4d18faf0710b9b7e606d5113cca08 +Author: Yuriy Taraday +Date: Mon Jul 18 19:55:25 2011 +0400 + + Add check to sqlalchemy backed to prevent loud crush. + + keystone/backends/sqlalchemy/api/user.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit e01b61046275d4a04d47e23c75afe8b01845f0c1 +Author: Yuriy Taraday +Date: Mon Jul 18 19:53:56 2011 +0400 + + Tweaked import_module to clearly import module if it can. + + keystone/utils.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 2bb3ebf5f02ff05b1c920e0fbb33e3d3d77e8cd4 +Author: Yuriy Taraday +Date: Mon Jul 18 19:51:25 2011 +0400 + + Removed hardcoded references to sql backends. + + bin/keystone-manage | 2 +- + keystone/server.py | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +commit e159e829c6357bd2160a4b1fdcd3c62e8f8d9507 +Author: Yuriy Taraday +Date: Mon Jul 18 19:48:35 2011 +0400 + + Add exception throwing and logging to keystone-manage. + + bin/keystone-manage | 64 ++++++++++++++++++++++++++++++----------------------- + 1 file changed, 36 insertions(+), 28 deletions(-) + +commit 6b9e4b4fbff741a672cbdc9e7f7feafc583cd7a0 +Merge: f9607a3 48962d3 +Author: Ziad Sawalha +Date: Mon Jul 18 08:44:02 2011 -0700 + + Merge pull request #101 from dolph/master + + Merging keystone.auth_protocols into keystone.middleware + +commit 48962d30496436e98af88857bdb34c74e83c7394 +Author: Dolph Mathews +Date: Mon Jul 18 10:39:33 2011 -0500 + + Merging keystone.auth_protocols package into keystone.middleware + + examples/README.md | 2 +- + examples/echo/echo/echo.ini | 6 +- + examples/echo/echo/echo_basic.ini | 6 +- + examples/paste/nova-api-paste.ini | 4 +- + keystone/auth_protocols/__init__.py | 0 + keystone/auth_protocols/auth_basic.py | 189 ---------------- + keystone/auth_protocols/auth_openid.py | 123 ---------- + keystone/auth_protocols/auth_token.py | 348 ----------------------------- + keystone/auth_protocols/nova_auth_token.py | 82 ------- + keystone/middleware/auth_basic.py | 189 ++++++++++++++++ + keystone/middleware/auth_openid.py | 123 ++++++++++ + keystone/middleware/auth_token.py | 348 +++++++++++++++++++++++++++++ + keystone/middleware/nova_auth_token.py | 82 +++++++ + setup.py | 2 +- + 14 files changed, 752 insertions(+), 752 deletions(-) + +commit f9607a37b38466bf2066893eb6960f065bf986af +Merge: 3ff4650 dad61a5 +Author: Ziad Sawalha +Date: Mon Jul 18 07:52:26 2011 -0700 + + Merge pull request #100 from dolph/master + + System test improvements + +commit dad61a54386320ff969a40327aec8c258b0eecd9 +Author: Dolph Mathews +Date: Fri Jul 15 14:56:31 2011 -0500 + + - Added 'automatic' admin authentication to KeystoneTestCase using bootstrapped user + - Added system tests for admin & service authentication + - Abstracted '/v2.0' path prefix away from system tests + - Added simple uuid function to generate data for system tests (random number gen w/ seeds might work better?) + - Refactored issue #85 tests with setUp & tearDown methods + + keystone/test/system/common.py | 33 +++++++++++++--- + keystone/test/system/test_auth.py | 63 ++++++++++++++++++++++++++++++ + keystone/test/system/test_issue_85.py | 47 ++++++++++++---------- + keystone/test/system/test_request_specs.py | 20 +++++----- + 4 files changed, 127 insertions(+), 36 deletions(-) + +commit 4a5a8dc8980bb7fc1e061d46f35212f19d7f641a +Author: Dolph Mathews +Date: Fri Jul 15 12:53:06 2011 -0500 + + Clarifying test case + + keystone/test/system/test_issue_85.py | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 1579ca85b5daba55987826fa7a9b145f59ef1674 +Merge: 1409a4f 3ff4650 +Author: Dolph Mathews +Date: Fri Jul 15 12:37:42 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit 1409a4fe216a70d7e0553128869adf9c59cfb3a8 +Author: Dolph Mathews +Date: Fri Jul 15 12:36:59 2011 -0500 + + Fixed minor pylint issues + + bin/keystone-manage | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) + +commit 309c6ce143c2aa2a910f6e8206fbcc58f5ffd67e +Author: Dolph Mathews +Date: Fri Jul 15 12:28:56 2011 -0500 + + Removed tenant id from admin user + + bin/bootstrap.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3ff465077849d66f62219fb6e84f9feec8a6a670 +Author: Ziad Sawalha +Date: Thu Jul 14 23:32:28 2011 -0500 + + Move dev guide to OpenStack + + README.md | 6 +- + doc/guide/pom.xml | 99 - + doc/guide/src/docbkx/identity.wadl | 1024 ----------- + doc/guide/src/docbkx/identitydevguide.xml | 1915 -------------------- + doc/guide/src/docbkx/img/Check_mark_23x20_02.svg | 60 - + doc/guide/src/docbkx/samples/auth.json | 37 - + doc/guide/src/docbkx/samples/auth.xml | 29 - + doc/guide/src/docbkx/samples/auth_credentials.json | 7 - + doc/guide/src/docbkx/samples/auth_credentials.xml | 5 - + doc/guide/src/docbkx/samples/choices.json | 72 - + doc/guide/src/docbkx/samples/choices.xml | 41 - + doc/guide/src/docbkx/samples/endpoint.json | 6 - + doc/guide/src/docbkx/samples/endpoint.xml | 4 - + doc/guide/src/docbkx/samples/endpointTemplate.json | 11 - + doc/guide/src/docbkx/samples/endpointTemplate.xml | 12 - + .../src/docbkx/samples/endpointTemplates.json | 43 - + doc/guide/src/docbkx/samples/endpointTemplates.xml | 42 - + doc/guide/src/docbkx/samples/endpoints.json | 24 - + doc/guide/src/docbkx/samples/endpoints.xml | 20 - + doc/guide/src/docbkx/samples/ext-getuser.json | 22 - + doc/guide/src/docbkx/samples/ext-getuser.xml | 13 - + doc/guide/src/docbkx/samples/extension.json | 21 - + doc/guide/src/docbkx/samples/extension.xml | 23 - + doc/guide/src/docbkx/samples/extensions.json | 44 - + doc/guide/src/docbkx/samples/extensions.xml | 39 - + doc/guide/src/docbkx/samples/getuser-1.json | 29 - + doc/guide/src/docbkx/samples/getuser-1.xml | 14 - + doc/guide/src/docbkx/samples/group.json | 6 - + doc/guide/src/docbkx/samples/group.xml | 4 - + doc/guide/src/docbkx/samples/groups.json | 13 - + doc/guide/src/docbkx/samples/groups.xml | 5 - + doc/guide/src/docbkx/samples/identity_fault.json | 7 - + doc/guide/src/docbkx/samples/identity_fault.xml | 6 - + doc/guide/src/docbkx/samples/item_not_found.json | 7 - + doc/guide/src/docbkx/samples/item_not_found.xml | 6 - + doc/guide/src/docbkx/samples/role.json | 7 - + doc/guide/src/docbkx/samples/role.xml | 4 - + doc/guide/src/docbkx/samples/roleRef.json | 7 - + doc/guide/src/docbkx/samples/roleRef.xml | 4 - + doc/guide/src/docbkx/samples/roleRefs.json | 14 - + doc/guide/src/docbkx/samples/roleRefs.xml | 9 - + doc/guide/src/docbkx/samples/roles.json | 12 - + doc/guide/src/docbkx/samples/roles.xml | 6 - + .../src/docbkx/samples/samplerequestheader.json | 4 - + .../src/docbkx/samples/sampleresponseheader.json | 4 - + doc/guide/src/docbkx/samples/tenant.json | 7 - + doc/guide/src/docbkx/samples/tenant.xml | 5 - + doc/guide/src/docbkx/samples/tenantlock.json | 5 - + doc/guide/src/docbkx/samples/tenantlock.xml | 4 - + doc/guide/src/docbkx/samples/tenants-1.json | 17 - + doc/guide/src/docbkx/samples/tenants-1.xml | 10 - + doc/guide/src/docbkx/samples/tenants-2.json | 21 - + doc/guide/src/docbkx/samples/tenants-2.xml | 13 - + doc/guide/src/docbkx/samples/tenants-3.json | 17 - + doc/guide/src/docbkx/samples/tenants-3.xml | 10 - + doc/guide/src/docbkx/samples/tenants-request.txt | 5 - + doc/guide/src/docbkx/samples/tenants.json | 21 - + doc/guide/src/docbkx/samples/tenants.xml | 14 - + doc/guide/src/docbkx/samples/updatedtenant.json | 7 - + doc/guide/src/docbkx/samples/updatedtenant.xml | 5 - + doc/guide/src/docbkx/samples/validatetoken.json | 20 - + doc/guide/src/docbkx/samples/validatetoken.xml | 12 - + doc/guide/src/docbkx/samples/version-atom.xml | 19 - + doc/guide/src/docbkx/samples/version.json | 33 - + doc/guide/src/docbkx/samples/version.xml | 23 - + doc/guide/src/docbkx/samples/versions-atom.xml | 29 - + doc/guide/src/docbkx/samples/versions.json | 39 - + doc/guide/src/docbkx/samples/versions.xml | 24 - + doc/guide/src/docbkx/xsd/api-common.xsd | 56 - + doc/guide/src/docbkx/xsd/api.xsd | 17 - + doc/guide/src/docbkx/xsd/atom/atom.xsd | 115 -- + doc/guide/src/docbkx/xsd/atom/xml.xsd | 287 --- + doc/guide/src/docbkx/xsd/endpoints.xsd | 200 -- + doc/guide/src/docbkx/xsd/extensions.xsd | 56 - + doc/guide/src/docbkx/xsd/fault.xsd | 135 -- + doc/guide/src/docbkx/xsd/roles.xsd | 112 -- + doc/guide/src/docbkx/xsd/tenant.xsd | 40 - + doc/guide/src/docbkx/xsd/token.xsd | 170 -- + doc/guide/src/docbkx/xsd/user.xsd | 100 - + doc/guide/src/docbkx/xsd/version.xsd | 200 -- + 80 files changed, 3 insertions(+), 5632 deletions(-) + +commit 6f1b98c3c738daf0b48349fd0e88a311d0e70e90 +Merge: 3873d2a f5744dc +Author: Ziad Sawalha +Date: Thu Jul 14 20:19:34 2011 -0700 + + Merge pull request #97 from dolph/master + + System test framework improvements + +commit f5744dc8190f3e0a8c99e2ffda5c43f548212e66 +Author: Dolph Mathews +Date: Thu Jul 14 15:26:15 2011 -0500 + + Commented out failing request, until it's review + + keystone/test/system/test_issue_85.py | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit ab17a57d205491ab5a2bc5df2b8549e156b5769a +Author: Dolph Mathews +Date: Thu Jul 14 15:20:34 2011 -0500 + + Wrote test case for github issue #85 + + keystone/test/system/test_issue_85.py | 68 +++++++++++++++++++++++++++++++++++ + 1 file changed, 68 insertions(+) + +commit 2afe2bf2d1515fc23869d12b374863fa25b04d9f +Author: Dolph Mathews +Date: Thu Jul 14 15:19:38 2011 -0500 + + Formatting change + + keystone/test/system/common.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5a94d0f183ce9466c71546127d6d7fedbf9fba42 +Author: Dolph Mathews +Date: Thu Jul 14 15:08:05 2011 -0500 + + Was this a typo or an incredibly lame joke? + + keystone/logic/service.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9873f4301571c849a20f3907daf3a2759407e197 +Author: Dolph Mathews +Date: Thu Jul 14 14:44:08 2011 -0500 + + Added missing imports and fixed a few pylint issues + + keystone/common/template.py | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 0a557b17995fdba9e6295086c3371e713276a1e3 +Author: Dolph Mathews +Date: Thu Jul 14 13:29:45 2011 -0500 + + Improved dict formatting + + keystone/test/system/common.py | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit edf1963ea5e61422f16e281e3f244c78d8ca0c48 +Author: Dolph Mathews +Date: Thu Jul 14 13:29:27 2011 -0500 + + Improved readability a bit + + keystone/common/wsgi.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b9e24f93a6d9d3814a7cced6ddac47a0b49d0ccb +Author: Dolph Mathews +Date: Thu Jul 14 13:23:56 2011 -0500 + + Abstracted underlying HTTP behavior away from RestfulTestCase + Added 'automatic' JSON body encoding (TODO: automatic XML encoding) + Improved user-feedback on automatic response status assertion + + Known bug: Content-Type header does not appear to be set properly + + keystone/test/system/common.py | 114 +++++++++++++++++++++++++++++------------ + 1 file changed, 82 insertions(+), 32 deletions(-) + +commit 6e184df0c8782eaf90f958cc03cb44ad5b4188f6 +Author: Dolph Mathews +Date: Thu Jul 14 13:20:49 2011 -0500 + + Added run_tests.py to keystone.test.system, which uses bootstrap db script + + keystone/test/system/run_tests.py | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit 07bba12d2fc644d4360eb1a14791fca636bdbc70 +Author: Dolph Mathews +Date: Thu Jul 14 13:19:24 2011 -0500 + + Added bootstrap configuration script (with admin user assigned an Admin role) + + bin/bootstrap.sh | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit 67bb79fb61d77d3878b0d5be29eed8263f81e6ef +Author: Dolph Mathews +Date: Thu Jul 14 11:38:13 2011 -0500 + + Added 'automatic' token auth for each API + + keystone/test/system/common.py | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +commit 936670fd65bf9845d82781a57ffb385efcfa19c0 +Author: Dolph Mathews +Date: Thu Jul 14 10:55:10 2011 -0500 + + Refactored port configuration strategy to allow a single test case to address both the admin and service API's + + keystone/test/system/common.py | 40 ++++++++++++------------------ + keystone/test/system/test_request_specs.py | 24 +++++++++--------- + 2 files changed, 28 insertions(+), 36 deletions(-) + +commit 3873d2a409882b5f9dddfe96aa26fe1f3645a54f +Merge: d59fc3a 0d8f222 +Author: Ziad Sawalha +Date: Wed Jul 13 14:03:12 2011 -0700 + + Merge pull request #95 from dolph/master + + Added system test discovery to run_tests.py + +commit 0d8f222173ad23808561ff66d762f36aa04b92f1 +Author: Dolph Mathews +Date: Wed Jul 13 14:59:18 2011 -0500 + + Added automatic json/xml parsing to system test framework + + keystone/test/system/common.py | 43 ++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 39 insertions(+), 4 deletions(-) + +commit 00373a8b885b7ce41d9b9c03915c9ce4e449d659 +Author: Dolph Mathews +Date: Wed Jul 13 14:18:12 2011 -0500 + + Added system test discovery to run_tests.py + + keystone/test/run_tests.py | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 8c6d610de32bf74918d6393eebb35418114038fb +Author: Dolph Mathews +Date: Wed Jul 13 14:17:39 2011 -0500 + + Added system tests for content type handling and url rewriting + + keystone/test/system/__init__.py | 65 ------------------------------ + keystone/test/system/common.py | 63 +++++++++++++++++++++++++++++ + keystone/test/system/test_content_types.py | 5 --- + keystone/test/system/test_request_specs.py | 58 ++++++++++++++++++++++++++ + 4 files changed, 121 insertions(+), 70 deletions(-) + +commit fe3d4328ecb3900585cdf8979ae58c4f2bacd885 +Author: Dolph Mathews +Date: Wed Jul 13 13:58:23 2011 -0500 + + Updated tests to reflect last bug fix + + keystone/test/unit/test_urlrewritefilter.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 39765dfd2f19d8565e83066672faf508e031cecc +Author: Dolph Mathews +Date: Wed Jul 13 11:59:27 2011 -0500 + + Extracted sample test from framework and moved system test framework into __init__ + + keystone/test/system/__init__.py | 66 ++++++++++++++++++++++++++++ + keystone/test/system/test.py | 70 ------------------------------ + keystone/test/system/test_content_types.py | 5 +++ + 3 files changed, 71 insertions(+), 70 deletions(-) + +commit 02360171a41f7b0a644e5cfc557142ae365c6a2d +Author: Dolph Mathews +Date: Wed Jul 13 11:52:54 2011 -0500 + + Converted system test framework to use httplib + + keystone/test/system/test.py | 95 ++++++++++++++++++++++++-------------------- + 1 file changed, 52 insertions(+), 43 deletions(-) + +commit c69e550baf5e46aa584032a1824714ca6d5b6ad6 +Author: Dolph Mathews +Date: Wed Jul 13 11:04:09 2011 -0500 + + Initial system test approach, using urllib2 + + keystone/test/system/__init__.py | 0 + keystone/test/system/test.py | 61 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 61 insertions(+) + +commit 987e9fd69cf75cb0ea254112e3fd490cf37d3a71 +Author: Dolph Mathews +Date: Wed Jul 13 10:46:38 2011 -0500 + + Fixed bug: traceback thrown when the path '/' is requested + + keystone/middleware/url.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e055a03de209012223c4d156fe1e68c46aca8823 +Author: Dolph Mathews +Date: Wed Jul 13 10:30:03 2011 -0500 + + Updated *unused* tests to reflect refactored API's + + keystone/test/unit/base.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e44b240cb1013ca51272b449baca48f83bfe2662 +Author: Dolph Mathews +Date: Wed Jul 13 10:24:43 2011 -0500 + + Removed some useless/dead code + + keystone/logic/types/tenant.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 08008a131b2981802011181df5f6299878768de2 +Merge: 8542453 d59fc3a +Author: Dolph Mathews +Date: Tue Jul 12 15:47:04 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit 8542453174f05da98acc8db1847d8884989efd1e +Author: Dolph Mathews +Date: Tue Jul 12 15:20:39 2011 -0500 + + Cleaned up authentication tests + + keystone/test/unit/test_authentication.py | 72 ++++++++----------------------- + 1 file changed, 17 insertions(+), 55 deletions(-) + +commit 00b0fc247a2913e3e6d72a710356e74347c99ceb +Author: Dolph Mathews +Date: Tue Jul 12 13:58:22 2011 -0500 + + Improved readability slightly + + keystone/logic/service.py | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 8e85047568a50b3857488a6cc6ded09941d23be9 +Author: Dolph Mathews +Date: Tue Jul 12 13:58:00 2011 -0500 + + Moved db imports to config module + Removed useless try/except blocks + + keystone/config.py | 9 +++++++-- + keystone/server.py | 16 ++++------------ + 2 files changed, 11 insertions(+), 14 deletions(-) + +commit f71d2045efbd404076cbcdd68bfe405d1d2560bd +Author: Dolph Mathews +Date: Tue Jul 12 12:16:30 2011 -0500 + + Organized imports + + keystone/utils.py | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit 86522f9103c87b02a4bd13e6d2655c2a1a2039ec +Author: Dolph Mathews +Date: Tue Jul 12 11:22:52 2011 -0500 + + Simplified a few util functions + + keystone/utils.py | 24 +++++++++--------------- + 1 file changed, 9 insertions(+), 15 deletions(-) + +commit 37cdc194d00dc7c18a15e9656e7485a3cd8b3c4b +Author: Dolph Mathews +Date: Tue Jul 12 11:17:32 2011 -0500 + + Fixed line length + + keystone/controllers/user.py | 27 ++++++++++++++------------- + keystone/utils.py | 8 +++----- + 2 files changed, 17 insertions(+), 18 deletions(-) + +commit 96c288e9853ca5876bf8fa9726adb4cb525e0171 +Author: Dolph Mathews +Date: Tue Jul 12 10:58:22 2011 -0500 + + Renamed service API configuration options + + bin/keystone | 6 +++--- + bin/keystone-auth | 4 ++-- + etc/keystone.conf | 14 +++++++------- + keystone/routers/service.py | 2 +- + keystone/server.py | 2 +- + 5 files changed, 14 insertions(+), 14 deletions(-) + +commit aff79a3695f89cd91381c9496b6f9b24d253872f +Author: Dolph Mathews +Date: Tue Jul 12 10:51:09 2011 -0500 + + Renamed ServiceApi router module + + keystone/routers/public.py | 55 --------------------------------------------- + keystone/routers/service.py | 55 +++++++++++++++++++++++++++++++++++++++++++++ + keystone/server.py | 2 +- + 3 files changed, 56 insertions(+), 56 deletions(-) + +commit 8628fb5f7d5476c2056707ae2d0fbb0792ed9698 +Author: Dolph Mathews +Date: Tue Jul 12 10:48:40 2011 -0500 + + Renamed ServiceApi router + + keystone/routers/public.py | 4 ++-- + keystone/server.py | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 8569af8ed0e5390311ed992f070b49f08c3f468c +Author: Dolph Mathews +Date: Tue Jul 12 10:46:28 2011 -0500 + + Cleaned up keystone.logic + + Identified duplicate user-related objects between the following two modules: + - keystone.logic.types.tenant + - keystone.logic.types.user + + keystone/logic/service.py | 193 +++++++++++++++++++++----------------- + keystone/logic/types/atom.py | 2 +- + keystone/logic/types/auth.py | 28 +++--- + keystone/logic/types/endpoint.py | 11 ++- + keystone/logic/types/fault.py | 30 +++--- + keystone/logic/types/role.py | 2 +- + keystone/logic/types/tenant.py | 47 +++------- + keystone/logic/types/user.py | 8 +- + keystone/server.py | 1 + + keystone/test/unit/test_groups.py | 3 +- + 10 files changed, 161 insertions(+), 164 deletions(-) + +commit d59fc3a22cfdc50715a3831b6bff202bfc079169 +Merge: b9f856a fb0cb91 +Author: Ziad Sawalha +Date: Mon Jul 11 20:39:10 2011 -0700 + + Merge pull request #83 from dolph/master + + Fix for Issues #44 and #78 + +commit fb0cb917b9f744442b386a5d407a8f41f9fd40ec +Author: Dolph Mathews +Date: Mon Jul 11 13:26:34 2011 -0500 + + Removed unused logger + + keystone/server.py | 5 ----- + 1 file changed, 5 deletions(-) + +commit 640a0b8ea776d710b9404db35cee713f7026d9a0 +Author: Dolph Mathews +Date: Mon Jul 11 13:18:02 2011 -0500 + + Refactored routers and controllers into their own modules (issue #44) + + keystone/backends/api.py | 65 ++- + keystone/common/config.py | 6 +- + keystone/config.py | 5 + + keystone/controllers/__init__.py | 13 + + keystone/controllers/auth.py | 33 ++ + keystone/controllers/endpointtemplates.py | 44 ++ + keystone/controllers/groups.py | 66 +++ + keystone/controllers/roles.py | 50 ++ + keystone/controllers/staticfiles.py | 34 ++ + keystone/controllers/tenant.py | 94 ++++ + keystone/controllers/user.py | 75 +++ + keystone/controllers/version.py | 44 ++ + keystone/routers/__init__.py | 1 + + keystone/routers/admin.py | 222 +++++++++ + keystone/routers/public.py | 55 +++ + keystone/server.py | 747 +----------------------------- + 16 files changed, 776 insertions(+), 778 deletions(-) + +commit 3954de5744f87e16f8be010530d98c0de441e6dc +Author: Dolph Mathews +Date: Mon Jul 11 12:26:08 2011 -0500 + + Fixed doc string + + keystone/logic/service.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f53a312b6e97a294af21fbe3ecf034d0a89492aa +Author: Dolph Mathews +Date: Mon Jul 11 12:06:12 2011 -0500 + + Improved PEP8 compliance + + keystone/logic/service.py | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +commit 5a5d20525a578395a6e2f620f26ea69c9e573a09 +Author: Dolph Mathews +Date: Mon Jul 11 11:51:48 2011 -0500 + + Fixed spelling + + keystone/backends/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1eb8f0c5d8c49a0341435bb86278d176ff56eacc +Author: Dolph Mathews +Date: Mon Jul 11 11:50:10 2011 -0500 + + Removed unused import + + keystone/auth_protocols/auth_token.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c0570817f1e9658d748aef30edaa4105a6096294 +Author: Dolph Mathews +Date: Mon Jul 11 11:45:50 2011 -0500 + + Slightly simplified base wsgi router + + keystone/common/wsgi.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 755d471a6158b645300aa4fc2e56e428973b184a +Author: Dolph Mathews +Date: Mon Jul 11 11:45:17 2011 -0500 + + Added note about run_tests.py to readme + + README.md | 4 ++++ + 1 file changed, 4 insertions(+) + +commit ce64b1221b3d3f6cabd3c67f09698fe1b0476775 +Author: Dolph Mathews +Date: Mon Jul 11 11:44:56 2011 -0500 + + Organized imports + + bin/keystone-admin | 3 +-- + bin/keystone-auth | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +commit 3d43db4afc4b54afa913350a202a91c42769de02 +Author: Dolph Mathews +Date: Mon Jul 11 09:45:16 2011 -0500 + + Improved readme consistency + + README.md | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit b9f856ab97314223ba199b2c926822bf6839717f +Author: Ziad Sawalha +Date: Fri Jul 8 22:49:09 2011 -0500 + + pep8 + + keystone/auth_protocols/auth_token.py | 14 ++-- + keystone/auth_protocols/nova_auth_token.py | 3 +- + keystone/backends/api.py | 106 ++++++++++++++--------------- + 3 files changed, 63 insertions(+), 60 deletions(-) + +commit f0c75bd499a1372490a9d96d9ca4ae08f8b68ba5 +Author: Ziad Sawalha +Date: Fri Jul 8 22:23:38 2011 -0500 + + Pylint an pep8 fixes + + keystone/frontends/legacy_token_auth.py | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +commit cf643991ada142e55f7bec4e7054a6134d35804d +Author: Ziad Sawalha +Date: Fri Jul 8 22:06:23 2011 -0500 + + Fixing bug reported using with swift + + keystone/frontends/legacy_token_auth.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ebe8e255ac42c07da7bfc44fd19c1f052d3f8853 +Merge: 9528697 418a9e5 +Author: Ziad Sawalha +Date: Fri Jul 8 14:06:49 2011 -0700 + + Merge pull request #82 from dolph/master + + Global fixes for issues #33 and #65 + +commit 9528697d2fcfbe9b7ba1d445280d10dc4c8e1e8d +Merge: 7f2451b 4497aad +Author: Ziad Sawalha +Date: Fri Jul 8 14:04:51 2011 -0700 + + Merge pull request #81 from xtoddx/master + + Many-to-many users to tenants + +commit 418a9e5913fe25fb4c5e704655d2497da3bc5d41 +Author: Dolph Mathews +Date: Fri Jul 8 15:03:06 2011 -0500 + + Fixed default content type behavior (was defaulting to XML) + + keystone/middleware/url.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 87f6faab6eeb1037de675b559436b53c35415675 +Author: Dolph Mathews +Date: Fri Jul 8 14:25:26 2011 -0500 + + Removed redundant action mappings (for version controller) + + keystone/server.py | 6 ------ + 1 file changed, 6 deletions(-) + +commit f9c44f02b86d87f928a894ca4cf353202b01d3ff +Author: Dolph Mathews +Date: Fri Jul 8 14:22:14 2011 -0500 + + Renamed exthandler to urlrewritefilter to better illustrate it's purpose + + etc/keystone.conf | 8 +-- + keystone/middleware/exthandler.py | 82 ---------------------------- + keystone/middleware/url.py | 83 +++++++++++++++++++++++++++++ + keystone/test/unit/test_exthandler.py | 78 --------------------------- + keystone/test/unit/test_keystone.py | 2 +- + keystone/test/unit/test_urlrewritefilter.py | 78 +++++++++++++++++++++++++++ + setup.py | 2 +- + 7 files changed, 167 insertions(+), 166 deletions(-) + +commit eeeb55e4a29a24a24e9b9f793eb9d38568ec9cee +Author: Dolph Mathews +Date: Fri Jul 8 14:11:36 2011 -0500 + + Minor comment change + + keystone/middleware/exthandler.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7845e7223487cea955c94a77e6a018a2ab37b419 +Author: Dolph Mathews +Date: Fri Jul 8 14:06:54 2011 -0500 + + Refactored URL extensions handling (for .json/.xml) + Added universal support for optional trailing slashes + + keystone/middleware/exthandler.py | 38 ++++++++++++++++++++++++++++------- + keystone/test/unit/test_exthandler.py | 12 ++++++++++- + 2 files changed, 42 insertions(+), 8 deletions(-) + +commit 4497aadce3537e122042bae7760dbc2ee634d030 +Author: Todd Willey +Date: Thu Jul 7 16:18:16 2011 -0400 + + Return users in a tenant as part of a many-to-many relationship. + + keystone/backends/sqlalchemy/api/user.py | 38 +++++++++++++++++++++----------- + keystone/backends/sqlalchemy/models.py | 1 + + 2 files changed, 26 insertions(+), 13 deletions(-) + +commit 73ee608acff551378a998b4dc60b4c21ff8701a1 +Author: Dolph Mathews +Date: Thu Jul 7 15:11:37 2011 -0500 + + Added import, autoformatting + + keystone/test/run_tests.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 2ff9f978504599faa053509c4cbd7769469faf4c +Author: Dolph Mathews +Date: Thu Jul 7 14:55:27 2011 -0500 + + Removed unused imports + + keystone/test/unit/test_exthandler.py | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit 55e1af6a1c0b34acc9dfdc73cbdd58efc09d3b3f +Author: Dolph Mathews +Date: Thu Jul 7 14:53:34 2011 -0500 + + Moved exthandler to keystone.middleware + + etc/keystone.conf | 2 +- + keystone/middleware/exthandler.py | 58 +++++++++++++++++++++++++++++++++++ + keystone/queryext/__init__.py | 0 + keystone/queryext/exthandler.py | 58 ----------------------------------- + keystone/test/unit/test_exthandler.py | 2 +- + setup.py | 2 +- + 6 files changed, 61 insertions(+), 61 deletions(-) + +commit 1b0ef39d51dcb5f3d21c5038cfbf142de108ad36 +Author: Dolph Mathews +Date: Thu Jul 7 14:13:02 2011 -0500 + + ** keystone.conf refactoring ** + + Added support for exthandler + Added admin pipeline + Moved public/admin host/port configs in support of pipeline configuration + + bin/keystone | 22 +++++++++++----------- + bin/keystone-admin | 7 ++++--- + bin/keystone-auth | 10 ++++++---- + etc/keystone.conf | 49 ++++++++++++++++++++++++++++++++----------------- + setup.py | 1 + + 5 files changed, 54 insertions(+), 35 deletions(-) + +commit aa5fdac7b66c50b24a21a64cba7ee96e525546de +Author: Dolph Mathews +Date: Thu Jul 7 14:10:36 2011 -0500 + + Fixed 'is_xml_response' function, which had no clear intention + + keystone/utils.py | 19 ++++--------------- + 1 file changed, 4 insertions(+), 15 deletions(-) + +commit 183da0cc89529e88999914cffd365efe105c4478 +Author: Dolph Mathews +Date: Thu Jul 7 14:08:10 2011 -0500 + + Removed unused function + + keystone/server.py | 23 +++++++---------------- + 1 file changed, 7 insertions(+), 16 deletions(-) + +commit ef7689cf6dd4029240116515253182c0738a857e +Author: Dolph Mathews +Date: Thu Jul 7 14:07:45 2011 -0500 + + Rewrote .json/.xml extension handler with additional unit test + + keystone/queryext/exthandler.py | 45 ++++++++++++++--------------------- + keystone/test/unit/test_exthandler.py | 11 +++++++-- + 2 files changed, 27 insertions(+), 29 deletions(-) + +commit 7cf20a0a3a98448ff4088026e20d8bce979a7e63 +Merge: 44313df 7f2451b +Author: Dolph Mathews +Date: Wed Jul 6 13:34:10 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit 7f2451beccd1bdc17c98d4b271096faafc823af1 +Author: Ziad Sawalha +Date: Wed Jul 6 12:18:29 2011 -0500 + + Added links to readme + + README.md | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 44313df0c49352ebfea19b88c72ff9d4717f6846 +Author: Dolph Mathews +Date: Tue Jul 5 12:00:18 2011 -0500 + + Added python-ldap to pip-requires + + tools/pip-requires | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3b0efe44c6ecb99c256e82d8b82d503feebd5f02 +Author: Dolph Mathews +Date: Tue Jul 5 11:53:06 2011 -0500 + + Initialized LDAP backend + + keystone/backends/ldap/__init__.py | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit ca62250b82e0816213bdf9a6f9674fd02abd1a65 +Merge: c48bd13 0dd9400 +Author: Ziad Sawalha +Date: Tue Jul 5 09:26:44 2011 -0700 + + Merge pull request #80 from Mirantis/test-fix + + Various fixes for test running. + +commit 13ee5898011e06161955d4afd58957aedf907679 +Merge: c48bd13 0dd9400 +Author: Yuriy Taraday +Date: Tue Jul 5 18:21:09 2011 +0400 + + Merge branch 'test-fix' into ldap + +commit 0dd9400aa339eeeef85d30828b7960ea5de77954 +Author: Yuriy Taraday +Date: Tue Jul 5 18:08:41 2011 +0400 + + Various fixes for test running. + + Made sampledata.sh fail if one step fails. + Made run_tests.py use all files related to its dir. + Add check whether data is loaded and server is started. + + bin/sampledata.sh | 2 +- + keystone/test/run_tests.py | 52 +++++++++++++++++++++++++++------------------- + 2 files changed, 32 insertions(+), 22 deletions(-) + +commit c48bd132e8a2a4fa9ca8ddec2599af0b63ead102 +Merge: e9b406e ec287ec +Author: Ziad Sawalha +Date: Fri Jul 1 15:15:44 2011 -0700 + + Merge pull request #79 from dolph/master + + Added test automation script + +commit ec287ec190936aae0cab60d7f5cf63e33bb536cb +Author: Dolph Mathews +Date: Fri Jul 1 17:11:08 2011 -0500 + + Commented out suspicious unit tests...... + + keystone/test/unit/test_endpoints.py | 102 +++++++++++++++++------------------ + 1 file changed, 51 insertions(+), 51 deletions(-) + +commit 9faae5d0e42bbb7b06b51b9ac15ce6babc8f7727 +Author: Dolph Mathews +Date: Fri Jul 1 17:10:35 2011 -0500 + + Added test automation script + + keystone/test/run_tests.py | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +commit 79d110e33ba328c671e5e9fa375b76b8a0a1422b +Merge: 806b237 e9b406e +Author: Dolph Mathews +Date: Fri Jul 1 17:07:39 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit 806b2372500b9ef2626e797d463817175de85d12 +Author: Dolph Mathews +Date: Fri Jul 1 15:51:26 2011 -0500 + + Cleaned up file + + keystone/test/unit/test_auth.py | 17 ++++------------- + 1 file changed, 4 insertions(+), 13 deletions(-) + +commit 707d35c20e83a60c96a685c0b6429dd3dbd1f77d +Author: Dolph Mathews +Date: Fri Jul 1 15:50:20 2011 -0500 + + Added missing test files to test collection + + keystone/test/unit/test_keystone.py | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit 40659f71c0ab227803265bad2fdf5b1ff38c022c +Author: Dolph Mathews +Date: Fri Jul 1 15:42:10 2011 -0500 + + Made unit tests executable from the cmd line + + keystone/test/unit/test_authn_v2.py | 4 ++++ + 1 file changed, 4 insertions(+) + +commit b500530be8ba700b1bfb4b2e6cd674982f51af19 +Author: Dolph Mathews +Date: Fri Jul 1 15:40:02 2011 -0500 + + Added test_auth to list of unit tests + + keystone/test/unit/test_keystone.py | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +commit e9b406ea4bda2a34e64d52c86b7ace41a5f42c4c +Author: Ziad Sawalha +Date: Fri Jul 1 15:36:01 2011 -0500 + + Update auth test to account for generic service names + + bin/sampledata.sh | 11 +++++++++-- + keystone/test/unit/test_authentication.py | 2 +- + 2 files changed, 10 insertions(+), 3 deletions(-) + +commit 9d461d373757d0559248c468644d6d012f1720ee +Merge: db6ee1c 3281c44 +Author: Ziad Sawalha +Date: Fri Jul 1 15:31:17 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit 3281c44d0c8b159ef09737e68792b188c56499d7 +Merge: 5970b72 9c7822e +Author: Ziad Sawalha +Date: Fri Jul 1 13:31:11 2011 -0700 + + Merge pull request #77 from yogirackspace/master + + Support configuring keystone admin role. + +commit 9c7822ef3e9ad5280c216063d59b13adff7a7bc1 +Author: Yogeshwar Srikrishnan +Date: Fri Jul 1 11:47:41 2011 -0500 + + Changes to make Admin for keystone configurable.#27. + + etc/keystone.conf | 3 ++ + keystone/backends/__init__.py | 8 +++++ + keystone/backends/models.py | 2 +- + keystone/logic/service.py | 73 ++++++++++++++++++++++++++----------------- + 4 files changed, 56 insertions(+), 30 deletions(-) + +commit db6ee1cdcc31c8c1c2899d100cb0d1a9baf0e71e +Author: Ziad Sawalha +Date: Wed Jun 29 21:19:30 2011 -0500 + + Remove old initializers + + keystone/__init__.py | 18 ------------------ + 1 file changed, 18 deletions(-) + +commit 5970b7296f74efa0231688fac46964e1d19812a9 +Merge: 5661cf0 59d2b69 +Author: Ziad Sawalha +Date: Wed Jun 29 19:02:45 2011 -0700 + + Merge pull request #76 from yogirackspace/master + + Additional changes to support multiple back ends. + +commit b11b9a1e27226ee556f31cb657fdff1142ba993b +Merge: 59d2b69 5661cf0 +Author: Yogeshwar Srikrishnan +Date: Wed Jun 29 17:38:35 2011 -0500 + + Merge remote branch 'rackspace/master' + +commit 59d2b69335a3aa7f54d372962844d193034cf51e +Author: Yogeshwar Srikrishnan +Date: Wed Jun 29 17:37:25 2011 -0500 + + Changes to introduce BaseAPI to support multiple back ends. + + keystone/backends/alterdb/__init__.py | 6 +- + keystone/backends/alterdb/api/token.py | 79 +- + keystone/backends/api.py | 261 +++++++ + keystone/backends/sqlalchemy/__init__.py | 5 +- + .../backends/sqlalchemy/api/endpoint_template.py | 326 ++++---- + keystone/backends/sqlalchemy/api/group.py | 304 ++++---- + keystone/backends/sqlalchemy/api/role.py | 313 ++++---- + keystone/backends/sqlalchemy/api/tenant.py | 368 ++++----- + keystone/backends/sqlalchemy/api/tenant_group.py | 201 ++--- + keystone/backends/sqlalchemy/api/token.py | 86 ++- + keystone/backends/sqlalchemy/api/user.py | 821 +++++++++++---------- + keystone/logic/service.py | 286 ++++--- + 12 files changed, 1676 insertions(+), 1380 deletions(-) + +commit 74e9b8009365729ceefa188866cf51f909cedaa9 +Author: Yogeshwar Srikrishnan +Date: Wed Jun 29 14:01:42 2011 -0500 + + Changes to support dynamic loading of models. + + etc/keystone.conf | 2 +- + keystone/backends/alterdb/__init__.py | 2 ++ + keystone/backends/models.py | 35 +++++++++++++++++++++++++++++++- + keystone/backends/sqlalchemy/__init__.py | 2 ++ + keystone/logic/service.py | 24 +++++++++++----------- + keystone/server.py | 1 + + 6 files changed, 52 insertions(+), 14 deletions(-) + +commit 5661cf0cbd0ac6abbbdea78d71ef0a9beea0db44 +Merge: bb7303d e3f07c7 +Author: Ziad Sawalha +Date: Wed Jun 29 02:15:02 2011 -0700 + + Merge pull request #73 from yogirackspace/master + + Initial changes to support multiple back ends. + +commit e3f07c770720532ff48210797073fa34420e69ab +Author: Yogeshwar Srikrishnan +Date: Tue Jun 28 16:54:56 2011 -0500 + + Adding list of todos. + + keystone/backends/api.py | 2 +- + keystone/logic/service.py | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 260dd3b2da352e2e2d56559999e726ff43fd20dc +Merge: 6f3c42c bb7303d +Author: Yogeshwar Srikrishnan +Date: Tue Jun 28 16:49:12 2011 -0500 + + Merge remote branch 'rackspace/master' + +commit 6f3c42c02f0fe1a1d48297fffb691d190e98cb8e +Author: Yogeshwar Srikrishnan +Date: Tue Jun 28 16:29:08 2011 -0500 + + Initial changes to support multiple backends. + + .gitignore | 1 + + bin/keystone | 1 - + bin/keystone-manage | 10 +- + etc/keystone.conf | 34 +- + keystone/backends/__init__.py | 30 ++ + keystone/backends/alterdb/__init__.py | 94 +++++ + keystone/backends/alterdb/api/__init__.py | 1 + + keystone/backends/alterdb/api/token.py | 61 +++ + keystone/backends/alterdb/models.py | 85 ++++ + keystone/backends/api.py | 47 +++ + keystone/backends/models.py | 28 ++ + keystone/backends/sqlalchemy/__init__.py | 95 +++++ + keystone/backends/sqlalchemy/api/__init__.py | 1 + + .../backends/sqlalchemy/api/endpoint_template.py | 185 +++++++++ + keystone/backends/sqlalchemy/api/group.py | 170 ++++++++ + keystone/backends/sqlalchemy/api/role.py | 174 +++++++++ + keystone/backends/sqlalchemy/api/tenant.py | 203 ++++++++++ + keystone/backends/sqlalchemy/api/tenant_group.py | 118 ++++++ + keystone/backends/sqlalchemy/api/token.py | 61 +++ + keystone/backends/sqlalchemy/api/user.py | 429 +++++++++++++++++++++ + keystone/backends/sqlalchemy/models.py | 171 ++++++++ + keystone/common/config.py | 28 +- + keystone/db/__init__.py | 0 + keystone/db/sqlalchemy/__init__.py | 78 ---- + keystone/db/sqlalchemy/api/__init__.py | 1 - + keystone/db/sqlalchemy/api/endpoint_template.py | 185 --------- + keystone/db/sqlalchemy/api/group.py | 170 -------- + keystone/db/sqlalchemy/api/role.py | 174 --------- + keystone/db/sqlalchemy/api/tenant.py | 203 ---------- + keystone/db/sqlalchemy/api/tenant_group.py | 118 ------ + keystone/db/sqlalchemy/api/token.py | 61 --- + keystone/db/sqlalchemy/api/user.py | 429 --------------------- + keystone/db/sqlalchemy/models.py | 173 --------- + keystone/logic/service.py | 5 +- + keystone/server.py | 12 +- + keystone/test/unit/base.py | 4 +- + keystone/utils.py | 18 +- + setup.py | 0 + 38 files changed, 2035 insertions(+), 1623 deletions(-) + +commit bb7303d96e65226ad428e08db9463231bcb4274c +Author: Ziad Sawalha +Date: Mon Jun 27 21:06:21 2011 -0500 + + Fixed identity.wadl response - issue #71# + + keystone/server.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 19619a0e772171d2a79e35b465b07186aee2c222 +Author: Ziad Sawalha +Date: Wed Jun 22 23:59:23 2011 -0500 + + Recompiled devguide with endpoints and templates + + doc/guide/src/docbkx/identitydevguide.xml | 2 +- + keystone/content/identitydevguide.pdf | Bin 303240 -> 305127 bytes + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 5f49464311e6d8a8a7b944bddb31013329330dbe +Merge: f84ab44 e482fc5 +Author: Ziad Sawalha +Date: Wed Jun 22 23:53:34 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit e482fc5c06cc2dfeb6663bb63c76dd2cfb523993 +Merge: ea31dfc 6ace32e +Author: Ziad Sawalha +Date: Wed Jun 22 21:53:24 2011 -0700 + + Merge pull request #64 from yogirackspace/master + + DocBook changes to support endpoints and endpointtemplates. + +commit f84ab44d1a8a3d5536f98024798c559a2233f3c4 +Author: Ziad Sawalha +Date: Wed Jun 22 23:45:16 2011 -0500 + + Removed unnecessary symlink + + keystone/samples | 1 - + 1 file changed, 1 deletion(-) + +commit 6ace32ebc86aa619c9f9540d140aa1587ebf9705 +Merge: db90366 ea31dfc +Author: Yogeshwar Srikrishnan +Date: Wed Jun 22 23:40:37 2011 -0500 + + Merge remote branch 'rackspace/master' + +commit db903662bf1e7c258ab3080674ee57eab6e061ab +Author: Yogeshwar Srikrishnan +Date: Wed Jun 22 23:39:46 2011 -0500 + + Changes to support endpoints and endpointemplates (renaming BaseUrls and BaseURLRefs). + + doc/guide/src/docbkx/identity.wadl | 48 ++--- + doc/guide/src/docbkx/identitydevguide.xml | 111 +++++++----- + doc/guide/src/docbkx/samples/baseURL.json | 11 -- + doc/guide/src/docbkx/samples/baseURL.xml | 12 -- + doc/guide/src/docbkx/samples/baseURLRef.json | 5 - + doc/guide/src/docbkx/samples/baseURLRef.xml | 4 - + doc/guide/src/docbkx/samples/baseURLRefs.json | 24 --- + doc/guide/src/docbkx/samples/baseURLRefs.xml | 20 -- + doc/guide/src/docbkx/samples/baseURLs.json | 43 ----- + doc/guide/src/docbkx/samples/baseURLs.xml | 42 ----- + doc/guide/src/docbkx/samples/endpoint.json | 6 + + doc/guide/src/docbkx/samples/endpoint.xml | 4 + + doc/guide/src/docbkx/samples/endpointTemplate.json | 11 ++ + doc/guide/src/docbkx/samples/endpointTemplate.xml | 12 ++ + .../src/docbkx/samples/endpointTemplates.json | 43 +++++ + doc/guide/src/docbkx/samples/endpointTemplates.xml | 42 +++++ + doc/guide/src/docbkx/samples/endpoints.json | 24 +++ + doc/guide/src/docbkx/samples/endpoints.xml | 20 ++ + doc/guide/src/docbkx/xsd/api.xsd | 2 +- + doc/guide/src/docbkx/xsd/baseURLs.xsd | 201 --------------------- + doc/guide/src/docbkx/xsd/endpoints.xsd | 200 ++++++++++++++++++++ + 21 files changed, 450 insertions(+), 435 deletions(-) + +commit ea31dfc53ff9822da79e5ab6ac7f11a3c2b7fe5e +Merge: 0a25de6 ab8818c +Author: Ziad Sawalha +Date: Wed Jun 22 23:32:15 2011 -0500 + + Merge and fix global endpoint work + +commit ab8818cd9e07fe8bc91152ffc737ba27c0d3b3bf +Merge: 4d6e13e b76348a +Author: Ziad Sawalha +Date: Wed Jun 22 21:27:00 2011 -0700 + + Merge pull request #60 from dolph/master + + Fix for Issue 31 + +commit 4d6e13e528b91e7dfe502e582cc68144a9a9518e +Author: Todd Willey +Date: Wed Jun 22 19:14:26 2011 -0400 + + Make swift middleware live where it should. + + keystone/auth_protocols/swift_auth_token.py | 239 ---------------------------- + keystone/middleware/swift_auth.py | 239 ++++++++++++++++++++++++++++ + setup.py | 2 +- + 3 files changed, 240 insertions(+), 240 deletions(-) + +commit dbbc17b8a5ae96152296eb893a2635909e785bcc +Author: Todd Willey +Date: Wed Jun 22 19:14:07 2011 -0400 + + Remove swift-y bits from generic token auth. + + keystone/auth_protocols/auth_token.py | 13 ------------- + 1 file changed, 13 deletions(-) + +commit 0a25de648412ad9ada37a7962e6f12793cc4451a +Author: Yogeshwar Srikrishnan +Date: Wed Jun 22 18:00:42 2011 -0500 + + Changes on Sample data. + + bin/sampledata.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit fb06f3f5ae05a55fc13f2f0c8ced77ab1f6dd98e +Merge: 4ca8e1b 0e5dcba +Author: Yogeshwar Srikrishnan +Date: Wed Jun 22 17:35:50 2011 -0500 + + Merge remote branch 'rackspace/master' + +commit 4ca8e1b28682d87cbf156d886d99906a801ded8d +Author: Yogeshwar Srikrishnan +Date: Wed Jun 22 17:34:49 2011 -0500 + + Code changes to support global endpointTemplates. + + bin/keystone-manage | 6 ++-- + bin/sampledata.sh | 13 +++++---- + keystone/db/sqlalchemy/api/tenant.py | 12 ++++++-- + keystone/db/sqlalchemy/models.py | 6 ++-- + keystone/logic/service.py | 29 ++++++++++--------- + keystone/logic/types/endpoint.py | 26 ++++++++++++----- + keystone/server.py | 31 +++++++++++---------- + keystone/test/unit/test_authentication.py | 2 ++ + keystone/test/unit/test_endpoints.py | 46 +++++++++++++++++++++++++++++++ + 9 files changed, 123 insertions(+), 48 deletions(-) + +commit 6d2b51e8711ee96212efbdb65c2747a11b16ebf6 +Author: Todd Willey +Date: Wed Jun 22 17:27:01 2011 -0400 + + Swift-specific middleware. + + keystone/auth_protocols/swift_auth_token.py | 239 ++++++++++++++++++++++++++++ + setup.py | 1 + + 2 files changed, 240 insertions(+) + +commit b76348a384c287d3abe5a7aa6b9ab827d7a40903 +Author: Dolph Mathews +Date: Wed Jun 22 16:17:28 2011 -0500 + + Issue 31: Switching default ports to 5000/5001 (public/admin) + + README.md | 18 +++++++++--------- + bin/keystone | 2 +- + bin/sampledata.sh | 2 +- + doc/guide/src/docbkx/identity.wadl | 2 +- + etc/keystone.conf | 4 ++-- + examples/echo/echo/echo.ini | 4 ++-- + examples/echo/echo/echo_basic.ini | 4 ++-- + examples/echo/echo/echo_remote.ini | 2 +- + examples/echo/echo_client.py | 3 +-- + examples/paste/auth_token.ini | 2 +- + examples/paste/nova-api-paste.ini | 2 +- + keystone/common/config.py | 4 ++-- + keystone/test/IdentitySOAPUI.xml | 8 ++++---- + keystone/test/unit/test_common.py | 4 ++-- + 14 files changed, 30 insertions(+), 31 deletions(-) + +commit 0e5dcba3e9c91e310828f4eb9de8b97c018d0544 +Author: Ziad Sawalha +Date: Wed Jun 22 15:36:40 2011 -0500 + + Fixed readme instructions for Nova - Issue #55 + + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fdc8ba27697317c09082c7e55c06c97257ede651 +Author: Ziad Sawalha +Date: Wed Jun 22 15:33:03 2011 -0500 + + Fixed requires for development and in readme + + README.md | 2 +- + tools/pip-requires-dev | 3 --- + 2 files changed, 1 insertion(+), 4 deletions(-) + +commit 03c1da22cca6c3e2d449c18d58f4c9c135efee77 +Author: Yogeshwar Srikrishnan +Date: Wed Jun 22 15:12:14 2011 -0500 + + Bringing back the changes to support endpointTemplates and endpoints. + + bin/keystone-manage | 46 +- + bin/sampledata.sh | 31 +- + keystone/db/sqlalchemy/api/__init__.py | 2 +- + keystone/db/sqlalchemy/api/baseurl.py | 185 --------- + keystone/db/sqlalchemy/api/tenant.py | 14 +- + keystone/db/sqlalchemy/models.py | 14 +- + keystone/logic/service.py | 95 +++-- + keystone/logic/types/baseURL.py | 214 ---------- + keystone/server.py | 73 ++-- + keystone/test/unit/test_BaseURLs.py | 669 ------------------------------ + keystone/test/unit/test_authentication.py | 15 +- + keystone/test/unit/test_common.py | 24 +- + 12 files changed, 158 insertions(+), 1224 deletions(-) + +commit b4a47d27855ea9d3da4ce1edb2c788b113f366b7 +Author: Ziad Sawalha +Date: Tue Jun 21 22:20:54 2011 -0500 + + Readme fix + + README.md | 6 ------ + 1 file changed, 6 deletions(-) + +commit 243bcbb07e39c7670deccf57c7fe7fbb96bb955e +Merge: a8077c2 7e706eb +Author: Ziad Sawalha +Date: Tue Jun 21 19:08:57 2011 -0700 + + Merge pull request #53 from dolph/master + + Fixes for issues 20 & 32 + +commit a8077c2581073e371688f30c55cf66fb12b99b6f +Author: Jesse Andrews +Date: Tue Jun 21 14:23:56 2011 -0700 + + Edited keystone/auth_protocols/nova_auth_token.py via GitHub + + keystone/auth_protocols/nova_auth_token.py | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 7e706eb1c59d18b7448a81d9483ad268b0c29e84 +Author: Dolph Mathews +Date: Tue Jun 21 15:20:58 2011 -0500 + + Issue 32: Updated readme to reflect fix for issue 32 (removed 'cd bin' prefixes before several commands) + + README.md | 25 ++++++++----------------- + 1 file changed, 8 insertions(+), 17 deletions(-) + +commit 3c3e212baef8e56b53a64643bc374727c418e797 +Author: Dolph Mathews +Date: Tue Jun 21 15:18:09 2011 -0500 + + (Related to) Issue 32: bin/sampledata.sh cannot be executed outside of bin/ + + bin/sampledata.sh | 70 +++++++++++++++++++++++++++---------------------------- + 1 file changed, 35 insertions(+), 35 deletions(-) + +commit ac68fbdeeda0e91c5efa9d4c75f2f66ce3b980f2 +Author: Dolph Mathews +Date: Tue Jun 21 15:17:47 2011 -0500 + + Issue 32: ./bin/keystone cannot be executed outside of bin/ + + etc/keystone.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac708ae577bdbed106dbe819238a3b1407446273 +Author: Dolph Mathews +Date: Tue Jun 21 14:56:04 2011 -0500 + + Issue 31: Reverted ports to 8080/8081 while the issue is under discussion + + README.md | 6 +++--- + bin/keystone | 2 +- + bin/sampledata.sh | 2 +- + etc/keystone.conf | 4 ++-- + examples/echo/echo/echo.ini | 4 ++-- + examples/echo/echo/echo_basic.ini | 4 ++-- + examples/echo/echo/echo_remote.ini | 2 +- + examples/paste/auth_token.ini | 2 +- + examples/paste/nova-api-paste.ini | 4 ++-- + keystone/test/unit/test_common.py | 4 ++-- + 10 files changed, 17 insertions(+), 17 deletions(-) + +commit 2b348106339c0afd83bb143d3323e91edd5e1ec5 +Author: Dolph Mathews +Date: Tue Jun 21 14:37:20 2011 -0500 + + Adding endpoint related files + + keystone/db/sqlalchemy/api/endpoint_template.py | 185 +++++++ + keystone/logic/types/endpoint.py | 223 ++++++++ + keystone/test/unit/test_endpoints.py | 669 ++++++++++++++++++++++++ + 3 files changed, 1077 insertions(+) + +commit a38e760447d1e217697aacdd332000845aa1ecb5 +Merge: 99d82c3 722fcd8 +Author: Dolph Mathews +Date: Tue Jun 21 13:38:35 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit 99d82c379e2bd38a354a767afed7c9a0995abc2d +Author: Dolph Mathews +Date: Tue Jun 21 13:37:39 2011 -0500 + + Updated readme to reflect docs/ -> doc/ change + Added tools/pip-requires-dev for depelopment dependencies + + README.md | 34 ++++++++++++++++++++++++++-------- + tools/pip-requires-dev | 3 +++ + 2 files changed, 29 insertions(+), 8 deletions(-) + +commit 722fcd8ebef3fe1268ace5c05e014f6a945abfab +Author: Todd Willey +Date: Tue Jun 21 14:26:47 2011 -0400 + + Basic authorization for swift. + + This first pass only makes sure you don't issue requests against other + accounts (regardless of publicity / acls). + + TODO: + * configurable reseller prefix (AUTH_) + * groups (.reseller_admin) + * don't let users change account except when admin (containerless DELETE/PUT) + * check container ACLs for object access + * add user groups into REMOTE_USER (?) + * get rid of all the useless HTTP headers jammed into the request + + keystone/auth_protocols/auth_token.py | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +commit b30158ccc837f27005bf181586834780d4e099a5 +Author: Dolph Mathews +Date: Tue Jun 21 13:20:27 2011 -0500 + + Republished developer guide for Jun 21, 2011 + + keystone/content/identitydevguide.pdf | Bin 302544 -> 303240 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit a5c9fe1dadc134bd7ec230a9f3781cb42e99d4f0 +Author: Dolph Mathews +Date: Tue Jun 21 13:19:24 2011 -0500 + + Updated token validation sample xml (dev guide) + + doc/guide/src/docbkx/samples/validatetoken.xml | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +commit a614da6a578ee858373c4ca6f1d7a25276ff1224 +Author: Dolph Mathews +Date: Tue Jun 21 13:19:03 2011 -0500 + + Updated dev guide publish date + + doc/guide/src/docbkx/identitydevguide.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3690d027baa18f01e3a6f53514f686c0e9bc3619 +Author: Dolph Mathews +Date: Tue Jun 21 13:18:35 2011 -0500 + + Added developer guide build folder to git ignore list + + .gitignore | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 853fa31bd57b1149fc84d26a3dce080de367d965 +Merge: 69db7bd c8de076 +Author: Dolph Mathews +Date: Tue Jun 21 13:18:12 2011 -0500 + + Auto-formatted and syntacically validated every JSON example in the doc guide + +commit a328b99178f794fa84aba7127230b230189a260a +Author: termie +Date: Tue Jun 21 02:32:38 2011 +0000 + + working with dashboard + + bin/keystone | 2 ++ + keystonelight/keystone_compat.py | 6 ++++++ + keystonelight/service.py | 11 ++++++++++- + 3 files changed, 18 insertions(+), 1 deletion(-) + +commit 8cd7f5c8108c8911007fe1c1e9a37e23f21b0459 +Author: termie +Date: Mon Jun 20 19:27:23 2011 -0700 + + add get_tenants + + bin/keystone | 1 + + keystonelight/backends/pam.py | 3 +++ + keystonelight/identity.py | 3 +++ + keystonelight/service.py | 17 +++++++++++++++++ + 4 files changed, 24 insertions(+) + +commit 9a0ec99e2da07863cb4ea032a1b0c6b5d959a149 +Author: termie +Date: Tue Jun 21 02:08:15 2011 +0000 + + rudimentary login working + + bin/keystone | 3 ++- + keystonelight/backends/pam.py | 11 +++++++--- + keystonelight/keystone_compat.py | 17 ++++++++++----- + keystonelight/service.py | 47 +++++++++++++++++++++++++++++++++------- + 4 files changed, 61 insertions(+), 17 deletions(-) + +commit 158dfbac2aa91a8c0287f4398e11bc90f7d84ac0 +Author: termie +Date: Mon Jun 20 18:37:51 2011 -0700 + + most bits working + + bin/keystone | 40 +++++ + keystonelight/backends/pam.py | 2 +- + keystonelight/identity.py | 4 +- + keystonelight/service.py | 96 +++++++++-- + keystonelight/token.py | 14 +- + keystonelight/utils.py | 7 +- + keystonelight/wsgi.py | 358 ++++++++++++++++++++++++++++++++++++++++++ + tools/pip-requires | 5 + + 8 files changed, 504 insertions(+), 22 deletions(-) + +commit 419c2cb95f5ce0c515fd8636d90065dfcf784c8c +Author: termie +Date: Mon Jun 20 17:56:20 2011 -0700 + + initial + + README.rst | 31 +++++++++++++++++ + keystonelight/__init__.py | 0 + keystonelight/backends/__init__.py | 0 + keystonelight/backends/pam.py | 21 ++++++++++++ + keystonelight/identity.py | 28 +++++++++++++++ + keystonelight/keystone_compat.py | 38 +++++++++++++++++++++ + keystonelight/service.py | 70 ++++++++++++++++++++++++++++++++++++++ + keystonelight/token.py | 16 +++++++++ + keystonelight/utils.py | 39 +++++++++++++++++++++ + tools/pip-requires | 2 ++ + 10 files changed, 245 insertions(+) + +commit c8de07620830c3d9f5bfb7c8d818a0440d1076c4 +Merge: e9b5c42 84adc90 +Author: Ziad Sawalha +Date: Mon Jun 20 18:16:45 2011 -0500 + + Merge conflict + +commit 84adc90e4e378f5774bd2a7ae7e2d7490aa79105 +Merge: 61d1b19 435b534 +Author: Ziad Sawalha +Date: Mon Jun 20 16:14:13 2011 -0700 + + Merge pull request #54 from yogirackspace/master + + Name changes - BaseURLRefs to EndPoints and BaseURLs to EndpointTemplates. + +commit 435b5341001be11b0cb052e7cf1ad2012d1b93cb +Author: Yogeshwar Srikrishnan +Date: Mon Jun 20 17:23:03 2011 -0500 + + Reverting change thats not needed. + + keystone/utils.py | 1 - + 1 file changed, 1 deletion(-) + +commit 30a8b9f718296caf321d164d251ec2f1035047e8 +Author: Yogeshwar Srikrishnan +Date: Mon Jun 20 17:16:06 2011 -0500 + + Fixing some of the failing tests. + + bin/keystone-manage | 12 ++++++------ + keystone/logic/service.py | 2 +- + keystone/test/unit/test_authentication.py | 4 ++-- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit e18fada34ab42ec17c2b100a8f67a05991b72fc6 +Merge: c0c66f4 ea7d9aa +Author: Yogeshwar Srikrishnan +Date: Mon Jun 20 17:05:19 2011 -0500 + + Merging changes from trunk. + +commit 61d1b19770ed87bd86d29fbb79c7df0d84fe401e +Author: Jesse Andrews +Date: Mon Jun 20 15:05:06 2011 -0700 + + demo of membership using keystone in sampledata + + bin/sampledata.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit c0c66f48cc5b3048003807ca69844aee7cae0655 +Author: Yogeshwar Srikrishnan +Date: Mon Jun 20 17:00:05 2011 -0500 + + Name changes BaseURLRefs to EndPoints and BaseURLs to EndpointTemplates. + + bin/keystone-manage | 44 +- + bin/sampledata.sh | 24 +- + keystone/db/sqlalchemy/api/__init__.py | 2 +- + keystone/db/sqlalchemy/api/baseurl.py | 185 ------- + keystone/db/sqlalchemy/api/endpoint_template.py | 185 +++++++ + keystone/db/sqlalchemy/api/tenant.py | 12 +- + keystone/db/sqlalchemy/models.py | 14 +- + keystone/logic/service.py | 88 ++-- + keystone/logic/types/baseURL.py | 214 -------- + keystone/logic/types/endpoint.py | 214 ++++++++ + keystone/server.py | 18 +- + keystone/test/unit/test_BaseURLs.py | 669 ------------------------ + keystone/test/unit/test_authentication.py | 10 +- + keystone/test/unit/test_common.py | 18 +- + keystone/test/unit/test_endpoints.py | 669 ++++++++++++++++++++++++ + 15 files changed, 1183 insertions(+), 1183 deletions(-) + +commit 69db7bd755be5b8a2dfbbbffe3a62f1983cfa357 +Author: Dolph Mathews +Date: Mon Jun 20 16:20:43 2011 -0500 + + Fixed formatting, imports + + bin/keystone | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit 789b22aeabcb5fdf3f0e8717930bf03c33b3ca67 +Author: Dolph Mathews +Date: Mon Jun 20 15:41:30 2011 -0500 + + Issue 31: Updated docs and examples + + README.md | 10 +++++----- + bin/sampledata.sh | 2 +- + examples/echo/echo/echo.ini | 4 ++-- + examples/echo/echo/echo_basic.ini | 4 ++-- + examples/echo/echo/echo_remote.ini | 2 +- + examples/paste/auth_token.ini | 2 +- + examples/paste/nova-api-paste.ini | 4 ++-- + 7 files changed, 14 insertions(+), 14 deletions(-) + +commit 975b58a0dd75b3f221a6cbfe05f14b5b42d916b6 +Author: Dolph Mathews +Date: Mon Jun 20 15:24:48 2011 -0500 + + Committing unit test configuration for issue 31 + + Also fixed the test_authentication.test_a_authorize_legacy unit test by changing the v1 URL + + keystone/test/unit/test_common.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d3def837873ef5dc81400760cc7a3b884e478bed +Author: Dolph Mathews +Date: Mon Jun 20 15:19:32 2011 -0500 + + Issue 31: Changed default ports to 80/8080 + + bin/keystone | 12 +++++++----- + etc/keystone.conf | 4 ++-- + 2 files changed, 9 insertions(+), 7 deletions(-) + +commit e9b5c4286069c5e5999e172ef0040d05c3ab9aa4 +Merge: e45136d ea7d9aa +Author: Ziad Sawalha +Date: Mon Jun 20 12:50:49 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit ea7d9aa133d0e5c2ab340956296dc468371e3f29 +Merge: d5ce055 84b0dbb +Author: Ziad Sawalha +Date: Mon Jun 20 10:50:30 2011 -0700 + + Merge pull request #52 from dolph/master + + Fix for issue #8 + +commit 84b0dbb1ceece24a1f7082d7493e5df5b550702e +Author: Dolph Mathews +Date: Mon Jun 20 12:40:26 2011 -0500 + + Issue #8: Renamed primary key of Token to 'id' + + bin/keystone-manage | 6 +++--- + keystone/db/sqlalchemy/api/token.py | 2 +- + keystone/db/sqlalchemy/models.py | 2 +- + keystone/logic/service.py | 6 +++--- + keystone/logic/types/auth.py | 10 +++++----- + 5 files changed, 13 insertions(+), 13 deletions(-) + +commit 4875da91977f4031251eb3814c6ab375969df38e +Author: Yogeshwar Srikrishnan +Date: Mon Jun 20 12:38:01 2011 -0500 + + Name changes BaseURLRefs to EndPoints and BaseURLs to EndpointTemplates. + + keystone/server.py | 60 +++++++++++++++---------------- + keystone/test/unit/test_BaseURLs.py | 72 ++++++++++++++++++------------------- + keystone/test/unit/test_common.py | 8 ++--- + keystone/utils.py | 2 +- + 4 files changed, 71 insertions(+), 71 deletions(-) + +commit e45136d52f888a9ba91e0783a1a817a27ab98368 +Merge: 999ca68 d5ce055 +Author: Ziad Sawalha +Date: Mon Jun 20 05:00:12 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit d5ce05504bb08202d61c4dde23e39fc8f00618d7 +Merge: dd280ec b29ce66 +Author: Ziad Sawalha +Date: Sun Jun 19 10:17:22 2011 -0700 + + Merge pull request #48 from yogirackspace/master + + Making password hashable. + +commit b29ce66f03e9e785dedff692b893bfc5a7074a8c +Author: Yogeshwar Srikrishnan +Date: Fri Jun 17 15:42:36 2011 -0500 + + Changes to hash password. + + keystone/db/sqlalchemy/api/user.py | 8 ++++++++ + keystone/logic/service.py | 4 ++-- + keystone/test/unit/test_authentication.py | 2 +- + keystone/utils.py | 8 ++++++++ + 4 files changed, 19 insertions(+), 3 deletions(-) + +commit 999ca684c767310d7d1920b7424edb4a06036a6d +Merge: e3e5c3c dd280ec +Author: Ziad Sawalha +Date: Fri Jun 17 14:46:09 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit dd280ec5ca9f3a533dc26ee094aaacdf4a03132c +Merge: af8e879 3fac703 +Author: Ziad Sawalha +Date: Fri Jun 17 11:49:05 2011 -0700 + + Merge pull request #46 from dolph/master + + Includes fix for bin/keystone-manage + +commit af8e879ea67f7373ea199095124283da585a4bc2 +Merge: c3ac911 b93c9b8 +Author: Ziad Sawalha +Date: Fri Jun 17 11:48:37 2011 -0700 + + Merge pull request #45 from yogirackspace/master + + WADL Updates and changes to allow user creation without tenant. + +commit 3fac703c163fb1615b07be73b4a4094b07d66b7c +Author: Dolph Mathews +Date: Fri Jun 17 13:41:13 2011 -0500 + + Restored tools.tracer to bin/ scripts; included fix for empty frames + + bin/keystone | 1 + + bin/keystone-admin | 1 + + bin/keystone-auth | 1 + + bin/keystone-manage | 1 + + tools/tracer.py | 15 +++++++++------ + 5 files changed, 13 insertions(+), 6 deletions(-) + +commit b93c9b8ebe2b563e8fae0b608a35cc0c887bedc9 +Author: Yogeshwar Srikrishnan +Date: Fri Jun 17 11:16:51 2011 -0500 + + Merging changes + + keystone/db/sqlalchemy/api/user.py | 2 +- + keystone/logic/service.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ae3122d304d04497eac54eefc6bf3b05e8e176c0 +Merge: dba9470 c3ac911 +Author: Dolph Mathews +Date: Fri Jun 17 10:52:05 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit dba9470cb086bdffe941121da1624a43edbe5398 +Author: Dolph Mathews +Date: Fri Jun 17 10:51:48 2011 -0500 + + Removed unused import + + keystone/logic/service.py | 1 - + 1 file changed, 1 deletion(-) + +commit 121eb9d0758640e8fe35084354b616d139085596 +Author: Dolph Mathews +Date: Fri Jun 17 10:50:57 2011 -0500 + + Removed redundant sentence in dev guide + + doc/guide/src/docbkx/identitydevguide.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 21a4e235f0ff94abff3dd0ecd623951ee166ad13 +Author: Dolph Mathews +Date: Fri Jun 17 10:50:28 2011 -0500 + + Removed unused imports in bin/ + + bin/keystone | 3 +-- + bin/keystone-admin | 1 - + bin/keystone-auth | 3 +-- + 3 files changed, 2 insertions(+), 5 deletions(-) + +commit c0b87f49edbf2508f67d755db120db236b3b9e2f +Author: Dolph Mathews +Date: Fri Jun 17 10:50:05 2011 -0500 + + Fix for keystone issue 41: https://github.com/rackspace/keystone/issues/41 + + bin/keystone-manage | 47 ++++++++++++++++++++++++----------------------- + 1 file changed, 24 insertions(+), 23 deletions(-) + +commit 12ba4271ffa6889afbb1e2544b10125f74bde5d6 +Merge: ca5ba70 c3ac911 +Author: Yogeshwar Srikrishnan +Date: Fri Jun 17 10:46:27 2011 -0500 + + Merging changes from rackspace. + +commit e7300ae71d7fbcb814462ae35be55efb83dbe3b7 +Author: Dolph Mathews +Date: Fri Jun 17 08:36:00 2011 -0500 + + Fixed spelling error + + doc/guide/src/docbkx/identitydevguide.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e3e5c3c66a50bd599390457e49e12928be82b2da +Merge: 9a15da9 c3ac911 +Author: Ziad Sawalha +Date: Thu Jun 16 17:47:16 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit c3ac911f7cf70c6e8debc7c31d347795c3c6a7d3 +Merge: 80407c4 aa1b3aa +Author: Ziad Sawalha +Date: Thu Jun 16 15:44:23 2011 -0700 + + Merge pull request #39 from dolph/master + + Refactored database API module into a package + +commit ca5ba70f68311c435531167a8e89f465507cf078 +Author: Yogeshwar Srikrishnan +Date: Thu Jun 16 16:47:12 2011 -0500 + + Changes to include support for paginations. + + doc/guide/src/docbkx/xsd/baseURLs.xsd | 17 ++++++++++++++++- + doc/guide/src/docbkx/xsd/roles.xsd | 15 +++++++++++++++ + doc/guide/src/docbkx/xsd/user.xsd | 11 +++++++---- + 3 files changed, 38 insertions(+), 5 deletions(-) + +commit 08699d513f83c104d6e148a8e80afb9b02221e80 +Author: Yogeshwar Srikrishnan +Date: Thu Jun 16 16:00:15 2011 -0500 + + Fixing existing methods on wadl. + + doc/guide/src/docbkx/identity.wadl | 16 +++---- + doc/guide/src/docbkx/xsd/user.xsd | 97 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 105 insertions(+), 8 deletions(-) + +commit aa1b3aa9d02d555796adde126ee6a226dd3e54f9 +Author: Dolph Mathews +Date: Thu Jun 16 15:33:46 2011 -0500 + + Fixed broken unit test code + + keystone/test/unit/test_BaseURLs.py | 36 ++++++++++++++++--------------- + keystone/test/unit/test_authentication.py | 5 ++--- + keystone/test/unit/test_common.py | 14 +++++++----- + keystone/test/unit/test_roles.py | 6 ++++-- + 4 files changed, 34 insertions(+), 27 deletions(-) + +commit 0e7abe3eb9df9e331b784b9ff69239c557bbae1f +Author: Dolph Mathews +Date: Thu Jun 16 15:27:00 2011 -0500 + + Refactored api function names to avoid redundancy with new module names + + keystone/db/sqlalchemy/api/baseurl.py | 24 +-- + keystone/db/sqlalchemy/api/group.py | 18 +- + keystone/db/sqlalchemy/api/role.py | 24 +-- + keystone/db/sqlalchemy/api/tenant.py | 31 ++-- + keystone/db/sqlalchemy/api/tenant_group.py | 23 +-- + keystone/db/sqlalchemy/api/token.py | 14 +- + keystone/db/sqlalchemy/api/user.py | 44 ++--- + keystone/logic/service.py | 288 ++++++++++++++--------------- + keystone/test/unit/base.py | 24 +-- + 9 files changed, 244 insertions(+), 246 deletions(-) + +commit f345bff9397614e8435ca47fd6b73218c3460ca8 +Author: Yogeshwar Srikrishnan +Date: Thu Jun 16 15:10:40 2011 -0500 + + Changes to wadl to support user operations. + + doc/guide/src/docbkx/identity.wadl | 295 ++++++++++++++++++++++++++++++++++++- + doc/guide/src/docbkx/xsd/api.xsd | 1 + + doc/guide/src/docbkx/xsd/roles.xsd | 14 +- + 3 files changed, 302 insertions(+), 8 deletions(-) + +commit 375c81f0820a8088a09c9e08ca25bbf9880fcada +Author: Dolph Mathews +Date: Thu Jun 16 14:17:46 2011 -0500 + + Refactored DB API into modules by model + + bin/keystone-manage | 2 +- + etc/keystone.conf | 4 - + keystone/db/sqlalchemy/__init__.py | 78 ++ + keystone/db/sqlalchemy/api.py | 1317 ---------------------------- + keystone/db/sqlalchemy/api/__init__.py | 1 + + keystone/db/sqlalchemy/api/baseurl.py | 185 ++++ + keystone/db/sqlalchemy/api/group.py | 170 ++++ + keystone/db/sqlalchemy/api/role.py | 174 ++++ + keystone/db/sqlalchemy/api/tenant.py | 192 ++++ + keystone/db/sqlalchemy/api/tenant_group.py | 125 +++ + keystone/db/sqlalchemy/api/token.py | 61 ++ + keystone/db/sqlalchemy/api/user.py | 421 +++++++++ + keystone/db/sqlalchemy/models.py | 9 +- + keystone/frontends/legacy_token_auth.py | 12 +- + keystone/logic/service.py | 327 ++++--- + keystone/server.py | 9 +- + 16 files changed, 1573 insertions(+), 1514 deletions(-) + +commit 22c315b48335e4e1e1ed71426908c3c4de08d9b1 +Author: Yogeshwar Srikrishnan +Date: Thu Jun 16 12:35:46 2011 -0500 + + Pep8 changes. + + keystone/db/sqlalchemy/api.py | 1 + + keystone/logic/service.py | 9 +++------ + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit 80407c4ca0ff031c5b6403bc841c904609afbc1d +Merge: 4cd2756 24a192c +Author: Todd Willey +Date: Thu Jun 16 09:56:43 2011 -0700 + + Merge pull request #38 from sleepsonthefloor/master + + In sample data, need both nova and nova_compat (api versions 1.1 and 1.0) + +commit 696e5a43091fa889fe8d183844952be3ac42f991 +Author: Yogeshwar Srikrishnan +Date: Thu Jun 16 11:55:38 2011 -0500 + + Changes to allow user creation without a tenant. + + keystone/db/sqlalchemy/api.py | 2 +- + keystone/logic/service.py | 59 +++++++++++++--------------------------- + keystone/test/unit/test_users.py | 22 +++++++++++---- + 3 files changed, 37 insertions(+), 46 deletions(-) + +commit 24a192cfca3003a8c5ced420c2932effbe783ccc +Author: Anthony Young +Date: Thu Jun 16 09:42:12 2011 -0700 + + for got to change a 1.1 to 1.0 + + bin/sampledata.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5b02743cd741006cfbe1797aa3d6024a3c720892 +Author: Anthony Young +Date: Thu Jun 16 09:38:13 2011 -0700 + + dash needs both 1.0 and 1.1 compatability - need to fix that! + + bin/sampledata.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4cd2756b9888fb33532558533c3b45f771f4cafd +Author: Jesse Andrews +Date: Thu Jun 16 08:44:59 2011 -0700 + + nova needs 1.0 api currently + + bin/sampledata.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9a15da9b303e1859b4f848a3503845e055a44469 +Author: Ziad Sawalha +Date: Thu Jun 16 02:07:07 2011 -0500 + + Some field validations + + keystone/logic/types/baseURL.py | 9 +++++++++ + keystone/logic/types/role.py | 8 ++++++++ + keystone/logic/types/tenant.py | 14 ++++++++++++++ + 3 files changed, 31 insertions(+) + +commit b462512ae4aab283ef78c574fa5f4395d09526b2 +Merge: 829998a 290bbce +Author: Ziad Sawalha +Date: Thu Jun 16 00:42:20 2011 -0500 + + Merged docs + +commit 290bbce0aaa0ef8307fb8500c67487549c46c877 +Merge: 2f9ad54 428a893 +Author: Ziad Sawalha +Date: Wed Jun 15 22:39:09 2011 -0700 + + Merge pull request #36 from dolph/master + + Cleaning up + +commit 2f9ad542321828a4bff20f652635b97a848e7e88 +Author: Jesse Andrews +Date: Wed Jun 15 22:02:45 2011 -0700 + + make sampledata executable again + + bin/sampledata.sh | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit b92796fb0195a8de182e80e0a41293b32bf8719f +Author: Jesse Andrews +Date: Wed Jun 15 21:23:01 2011 -0700 + + Admin for nova doesn't take a tenant + + bin/sampledata.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5dc37a74007c49e090bfd6464922b299091f1856 +Author: Jesse Andrews +Date: Wed Jun 15 21:13:59 2011 -0700 + + add keystone to its own service catalog + + bin/sampledata.sh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 428a893153478174bf73ad46d3e6952d2d3e7dbf +Author: Dolph Mathews +Date: Wed Jun 15 16:11:40 2011 -0500 + + Fixed error on UrlExtensionFilterTest + + keystone/test/unit/test_exthandler.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 963abf125755899e3886027e7e3565f8fe74fafa +Author: Dolph Mathews +Date: Wed Jun 15 16:04:40 2011 -0500 + + Fixed imports; improved PEP8 formatting compliance + + keystone/test/unit/test_server.py | 49 +++++++++++++++++++-------------------- + 1 file changed, 24 insertions(+), 25 deletions(-) + +commit c2885d531a5952795340cb2e2effcf3fa3eeb6f5 +Author: Dolph Mathews +Date: Wed Jun 15 16:03:23 2011 -0500 + + Fixed imports in keystone.common + + keystone/common/config.py | 6 ------ + keystone/common/exception.py | 2 -- + keystone/common/template.py | 13 +++++++------ + keystone/common/wsgi.py | 2 -- + 4 files changed, 7 insertions(+), 16 deletions(-) + +commit 0af8ae52797b4f761df881462a2a59df582d021e +Author: Dolph Mathews +Date: Wed Jun 15 16:02:47 2011 -0500 + + Removed unused imports and denoted unused variables + + keystone/db/sqlalchemy/api.py | 8 ++++---- + keystone/db/sqlalchemy/models.py | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 4fcf3e86e42aaf7c2e7be8dec79318221423370c +Author: Dolph Mathews +Date: Wed Jun 15 15:36:16 2011 -0500 + + Fixed imports in auth_protocols + + keystone/auth_protocols/auth_basic.py | 15 +++++++++------ + keystone/auth_protocols/auth_openid.py | 10 +++++++++- + keystone/auth_protocols/auth_token.py | 9 ++++----- + 3 files changed, 22 insertions(+), 12 deletions(-) + +commit 091fd30f7fc82fd5ca3f3a504576732c41ff185a +Author: Dolph Mathews +Date: Wed Jun 15 15:20:26 2011 -0500 + + Removed duplicated function + + keystone/db/sqlalchemy/api.py | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +commit f537c222a003fa2fdb09e8790680415f5b47b824 +Author: Dolph Mathews +Date: Wed Jun 15 14:57:04 2011 -0500 + + Added coverage to pip development requirements + + tools/pip-requires-development | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 07e5b8c9d6bb0525e3b2b63070642d7deacc3fcd +Author: Dolph Mathews +Date: Wed Jun 15 14:56:38 2011 -0500 + + Fixed relative & unused imports + + keystone/test/unit/test_authn_v2.py | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 2d0325c31837442c1dd41f9ddea44943be31e491 +Author: Dolph Mathews +Date: Wed Jun 15 14:36:01 2011 -0500 + + Adding py init to functional tests + + keystone/test/functional/__init__.py | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 15da0107e664d05a6288b1f8837652f9355f0548 +Author: Dolph Mathews +Date: Wed Jun 15 14:28:56 2011 -0500 + + Created pip requirements file for development env (added sphinx python doc generation to start) + + tools/pip-requires-development | 1 + + 1 file changed, 1 insertion(+) + +commit 062e8f47d0721516422a6527ea01ed63f672bfd1 +Author: Dolph Mathews +Date: Wed Jun 15 14:27:44 2011 -0500 + + Added pydev files to gitignore + + .gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit 90a1dfe16dbf8f748500fc7c786e696160b2ec27 +Author: Dolph Mathews +Date: Wed Jun 15 14:27:19 2011 -0500 + + Added py init files to directories already being referenced as modules + + doc/__init__.py | 0 + doc/source/__init__.py | 0 + examples/__init__.py | 0 + examples/echo/__init__.py | 0 + 4 files changed, 0 insertions(+), 0 deletions(-) + +commit c43a48303d861a7cafaad299a886dc659667693e +Merge: 77027ce 9fe2024 +Author: Dolph Mathews +Date: Wed Jun 15 14:16:22 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit 9fe20242d7c5a364a21e638580e13805e0b08376 +Author: Todd Willey +Date: Wed Jun 15 11:04:55 2011 -0700 + + Users must have tenants or nova breaks. + + bin/sampledata.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 77027cee329cf41969189cb185bba9ba6e18cd66 +Merge: 488670d 080f553 +Author: Dolph Mathews +Date: Wed Jun 15 09:39:18 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit 829998aedafd6f27c225c18bb40e53b764ada001 +Author: Ziad Sawalha +Date: Wed Jun 15 01:58:22 2011 -0500 + + Doc updates and dev requires + + README.md | 24 ++++++++++++++++++------ + tools/pip-requires-dev | 3 +++ + 2 files changed, 21 insertions(+), 6 deletions(-) + +commit 080f5537550d26522f4c413686909b14249055fd +Merge: 0f50651 56162f3 +Author: Ziad Sawalha +Date: Wed Jun 15 01:13:36 2011 -0500 + + Resolved conflicts + +commit 0f50651b0f0ebfb7eab1416170bbdaac639bc05d +Author: Ziad Sawalha +Date: Wed Jun 15 01:02:56 2011 -0500 + + To PUT or to POST + + HACKING | 11 ----------- + keystone/server.py | 10 ++++++---- + keystone/test/unit/test_common.py | 25 +++++++------------------ + keystone/test/unit/test_users.py | 12 ++++++------ + 4 files changed, 19 insertions(+), 39 deletions(-) + +commit 89d074e54eb37aee78e582161285520c14ca2f26 +Author: Ziad Sawalha +Date: Tue Jun 14 23:41:40 2011 -0500 + + Fixed v1.0 auth test to account for cdn baseURL order + + bin/sampledata.sh | 1 + + keystone/test/unit/test_authentication.py | 2 ++ + 2 files changed, 3 insertions(+) + +commit 5e563c4f80cb1f56358bd89162f313b939aea32a +Merge: ffd2397 ed60cda +Author: Ziad Sawalha +Date: Tue Jun 14 23:36:23 2011 -0500 + + Merge conflict + +commit ffd23970d416e1e8eab3dbe6daecd80ed81c2be1 +Author: Ziad Sawalha +Date: Tue Jun 14 23:33:57 2011 -0500 + + Support for GET /v2.0/users and add cdn back to sampledata for v1.0 support + + bin/sampledata.sh | 3 ++- + etc/keystone.conf | 2 +- + keystone/db/sqlalchemy/api.py | 51 +++++++++++++++++++++++++++++++++++++++++++ + keystone/logic/service.py | 25 ++++++++++++++++++++- + keystone/server.py | 11 ++++++++++ + 5 files changed, 89 insertions(+), 3 deletions(-) + +commit ed60cdaae4befdad472e3b0e2e1c6707157ae338 +Merge: 88419fa 610e997 +Author: Todd Willey +Date: Tue Jun 14 21:09:17 2011 -0700 + + Merge branch 'master' of github.com:rackspace/keystone + +commit 88419fa34413a6693f0b6c554f9911638e3ffed6 +Author: Todd Willey +Date: Tue Jun 14 21:06:36 2011 -0700 + + Update the baseURL data pushed into glance. + + * Change Zone1 to RegionOne to match vernacular from other OpenStack projects. + * Fix splat-spacing issue when associating baseurls to tenants. + * Add a default glance endpoint. + * Change internal host to 127.0.0.1 for all example services. + + bin/sampledata.sh | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 610e997fe665715a463177141c61b79f0df2e217 +Merge: 7da0629 a8cb1b9 +Author: Ziad Sawalha +Date: Tue Jun 14 19:47:31 2011 -0700 + + Merge pull request #30 from dolph/master + + Minor fixes + +commit 7da06298f0ad42796a3b08df405c1730fec8b7d3 +Author: Todd Willey +Date: Tue Jun 14 18:50:55 2011 -0700 + + Fix symlinks after docs -> doc rename. + + keystone/identity.wadl | 2 +- + keystone/samples | 2 +- + keystone/xsd | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 56162f3ecc6efa7e2aaf70ef0de5dfb2f62a3102 +Author: Yogeshwar Srikrishnan +Date: Tue Jun 14 17:13:21 2011 -0500 + + Adding call to modify tenant.Adding more tests and fixing minor issue. + + bin/sampledata.sh | 2 +- + keystone/logic/service.py | 22 ++-- + keystone/logic/types/user.py | 2 +- + keystone/server.py | 4 +- + keystone/test/unit/test_common.py | 22 ++++ + keystone/test/unit/test_users.py | 212 +++++++++++++++++++++++++++++--------- + 6 files changed, 198 insertions(+), 66 deletions(-) + +commit 488670dd3815bb4c8a15eea0ebb2eb6e0d77f953 +Merge: 72e4edc 7ccf7c5 +Author: Dolph Mathews +Date: Tue Jun 14 15:08:28 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit 72e4edcc12f4741bd945adf777fe43f3ffcd62d6 +Author: Dolph Mathews +Date: Tue Jun 14 15:07:48 2011 -0500 + + Added pip requirements file for testing environments. + + README.md | 15 +++++++++------ + tools/pip-requires-testing | 2 ++ + 2 files changed, 11 insertions(+), 6 deletions(-) + +commit 7ccf7c589cef5a6a0b02801fc2147879fabce098 +Merge: d7aed20 9981a1f +Author: Ziad Sawalha +Date: Tue Jun 14 13:05:53 2011 -0700 + + Merge pull request #29 from jaypipes/docs + + Adds Sphinx build ability and RST documentation. + +commit d3489fc71dcaec1d9290a183de6e422be2b0c3f1 +Merge: 7b4385d d7aed20 +Author: Dolph Mathews +Date: Tue Jun 14 14:40:18 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit 7b4385d59808329570cde81abf7858a876cf4172 +Author: Dolph Mathews +Date: Tue Jun 14 14:40:09 2011 -0500 + + Grammar corrections + + docs/guide/src/docbkx/identitydevguide.xml | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 9981a1faa123f14d92ed280f062f8af7b7ccf21e +Author: Jay Pipes +Date: Tue Jun 14 15:19:49 2011 -0400 + + Adds Sphinx build ability and RST documentation. + + .gitignore | 2 + + MANIFEST.in | 5 + + doc/Makefile | 96 + + doc/design/flow_diagram.pdf | 9495 ++++++++++++++++++++ + doc/design/flow_diagram.png | Bin 0 -> 163556 bytes + doc/design/flow_diagram.sdx | 87 + + doc/guide/pom.xml | 99 + + doc/guide/src/docbkx/identity.wadl | 731 ++ + doc/guide/src/docbkx/identitydevguide.xml | 1900 ++++ + doc/guide/src/docbkx/img/Check_mark_23x20_02.svg | 60 + + doc/guide/src/docbkx/samples/auth.json | 37 + + doc/guide/src/docbkx/samples/auth.xml | 29 + + doc/guide/src/docbkx/samples/auth_credentials.json | 7 + + doc/guide/src/docbkx/samples/auth_credentials.xml | 5 + + doc/guide/src/docbkx/samples/baseURL.json | 12 + + doc/guide/src/docbkx/samples/baseURL.xml | 12 + + doc/guide/src/docbkx/samples/baseURLRef.json | 5 + + doc/guide/src/docbkx/samples/baseURLRef.xml | 4 + + doc/guide/src/docbkx/samples/baseURLRefs.json | 24 + + doc/guide/src/docbkx/samples/baseURLRefs.xml | 20 + + doc/guide/src/docbkx/samples/baseURLs.json | 43 + + doc/guide/src/docbkx/samples/baseURLs.xml | 42 + + doc/guide/src/docbkx/samples/choices.json | 72 + + doc/guide/src/docbkx/samples/choices.xml | 41 + + doc/guide/src/docbkx/samples/ext-getuser.json | 21 + + doc/guide/src/docbkx/samples/ext-getuser.xml | 13 + + doc/guide/src/docbkx/samples/extension.json | 21 + + doc/guide/src/docbkx/samples/extension.xml | 23 + + doc/guide/src/docbkx/samples/extensions.json | 44 + + doc/guide/src/docbkx/samples/extensions.xml | 39 + + doc/guide/src/docbkx/samples/getuser-1.json | 29 + + doc/guide/src/docbkx/samples/getuser-1.xml | 14 + + doc/guide/src/docbkx/samples/group.json | 1 + + doc/guide/src/docbkx/samples/group.xml | 4 + + doc/guide/src/docbkx/samples/groups.json | 1 + + doc/guide/src/docbkx/samples/groups.xml | 5 + + doc/guide/src/docbkx/samples/identity_fault.json | 7 + + doc/guide/src/docbkx/samples/identity_fault.xml | 6 + + doc/guide/src/docbkx/samples/item_not_found.json | 7 + + doc/guide/src/docbkx/samples/item_not_found.xml | 6 + + doc/guide/src/docbkx/samples/role.json | 7 + + doc/guide/src/docbkx/samples/role.xml | 4 + + doc/guide/src/docbkx/samples/roleRef.json | 7 + + doc/guide/src/docbkx/samples/roleRef.xml | 4 + + doc/guide/src/docbkx/samples/roleRefs.json | 14 + + doc/guide/src/docbkx/samples/roleRefs.xml | 9 + + doc/guide/src/docbkx/samples/roles.json | 12 + + doc/guide/src/docbkx/samples/roles.xml | 6 + + .../src/docbkx/samples/samplerequestheader.json | 4 + + .../src/docbkx/samples/sampleresponseheader.json | 4 + + doc/guide/src/docbkx/samples/tenant.json | 7 + + doc/guide/src/docbkx/samples/tenant.xml | 5 + + doc/guide/src/docbkx/samples/tenantlock.json | 5 + + doc/guide/src/docbkx/samples/tenantlock.xml | 4 + + doc/guide/src/docbkx/samples/tenants-1.json | 16 + + doc/guide/src/docbkx/samples/tenants-1.xml | 10 + + doc/guide/src/docbkx/samples/tenants-2.json | 20 + + doc/guide/src/docbkx/samples/tenants-2.xml | 13 + + doc/guide/src/docbkx/samples/tenants-3.json | 16 + + doc/guide/src/docbkx/samples/tenants-3.xml | 10 + + doc/guide/src/docbkx/samples/tenants-request.txt | 5 + + doc/guide/src/docbkx/samples/tenants.json | 20 + + doc/guide/src/docbkx/samples/tenants.xml | 14 + + doc/guide/src/docbkx/samples/updatedtenant.json | 7 + + doc/guide/src/docbkx/samples/updatedtenant.xml | 5 + + doc/guide/src/docbkx/samples/validatetoken.json | 27 + + doc/guide/src/docbkx/samples/validatetoken.xml | 14 + + doc/guide/src/docbkx/samples/version-atom.xml | 19 + + doc/guide/src/docbkx/samples/version.json | 33 + + doc/guide/src/docbkx/samples/version.xml | 23 + + doc/guide/src/docbkx/samples/versions-atom.xml | 29 + + doc/guide/src/docbkx/samples/versions.json | 39 + + doc/guide/src/docbkx/samples/versions.xml | 24 + + doc/guide/src/docbkx/xsd/api-common.xsd | 56 + + doc/guide/src/docbkx/xsd/api.xsd | 16 + + doc/guide/src/docbkx/xsd/atom/atom.xsd | 115 + + doc/guide/src/docbkx/xsd/atom/xml.xsd | 287 + + doc/guide/src/docbkx/xsd/baseURLs.xsd | 186 + + doc/guide/src/docbkx/xsd/extensions.xsd | 56 + + doc/guide/src/docbkx/xsd/fault.xsd | 135 + + doc/guide/src/docbkx/xsd/roles.xsd | 97 + + doc/guide/src/docbkx/xsd/tenant.xsd | 40 + + doc/guide/src/docbkx/xsd/token.xsd | 170 + + doc/guide/src/docbkx/xsd/version.xsd | 200 + + doc/source/_static/basic.css | 416 + + doc/source/_static/default.css | 230 + + doc/source/_static/jquery.tweet.js | 154 + + doc/source/_static/tweaks.css | 65 + + doc/source/_templates/.placeholder | 0 + doc/source/_theme/layout.html | 86 + + doc/source/_theme/theme.conf | 5 + + doc/source/architecture.rst | 19 + + doc/source/community.rst | 34 + + doc/source/conf.py | 246 + + doc/source/gettingstarted.rst | 23 + + doc/source/groups.rst | 19 + + doc/source/index.rst | 62 + + doc/source/installing.rst | 100 + + doc/source/man/keystonemanage.rst | 54 + + doc/source/roles.rst | 19 + + doc/source/tenants.rst | 19 + + doc/source/users.rst | 19 + + docs/design/flow_diagram.pdf | 9495 -------------------- + docs/design/flow_diagram.png | Bin 163556 -> 0 bytes + docs/design/flow_diagram.sdx | 87 - + docs/guide/pom.xml | 99 - + docs/guide/src/docbkx/identity.wadl | 731 -- + docs/guide/src/docbkx/identitydevguide.xml | 1900 ---- + docs/guide/src/docbkx/img/Check_mark_23x20_02.svg | 60 - + docs/guide/src/docbkx/samples/auth.json | 37 - + docs/guide/src/docbkx/samples/auth.xml | 29 - + .../guide/src/docbkx/samples/auth_credentials.json | 7 - + docs/guide/src/docbkx/samples/auth_credentials.xml | 5 - + docs/guide/src/docbkx/samples/baseURL.json | 12 - + docs/guide/src/docbkx/samples/baseURL.xml | 12 - + docs/guide/src/docbkx/samples/baseURLRef.json | 5 - + docs/guide/src/docbkx/samples/baseURLRef.xml | 4 - + docs/guide/src/docbkx/samples/baseURLRefs.json | 24 - + docs/guide/src/docbkx/samples/baseURLRefs.xml | 20 - + docs/guide/src/docbkx/samples/baseURLs.json | 43 - + docs/guide/src/docbkx/samples/baseURLs.xml | 42 - + docs/guide/src/docbkx/samples/choices.json | 72 - + docs/guide/src/docbkx/samples/choices.xml | 41 - + docs/guide/src/docbkx/samples/ext-getuser.json | 21 - + docs/guide/src/docbkx/samples/ext-getuser.xml | 13 - + docs/guide/src/docbkx/samples/extension.json | 21 - + docs/guide/src/docbkx/samples/extension.xml | 23 - + docs/guide/src/docbkx/samples/extensions.json | 44 - + docs/guide/src/docbkx/samples/extensions.xml | 39 - + docs/guide/src/docbkx/samples/getuser-1.json | 29 - + docs/guide/src/docbkx/samples/getuser-1.xml | 14 - + docs/guide/src/docbkx/samples/group.json | 1 - + docs/guide/src/docbkx/samples/group.xml | 4 - + docs/guide/src/docbkx/samples/groups.json | 1 - + docs/guide/src/docbkx/samples/groups.xml | 5 - + docs/guide/src/docbkx/samples/identity_fault.json | 7 - + docs/guide/src/docbkx/samples/identity_fault.xml | 6 - + docs/guide/src/docbkx/samples/item_not_found.json | 7 - + docs/guide/src/docbkx/samples/item_not_found.xml | 6 - + docs/guide/src/docbkx/samples/role.json | 7 - + docs/guide/src/docbkx/samples/role.xml | 4 - + docs/guide/src/docbkx/samples/roleRef.json | 7 - + docs/guide/src/docbkx/samples/roleRef.xml | 4 - + docs/guide/src/docbkx/samples/roleRefs.json | 14 - + docs/guide/src/docbkx/samples/roleRefs.xml | 9 - + docs/guide/src/docbkx/samples/roles.json | 12 - + docs/guide/src/docbkx/samples/roles.xml | 6 - + .../src/docbkx/samples/samplerequestheader.json | 4 - + .../src/docbkx/samples/sampleresponseheader.json | 4 - + docs/guide/src/docbkx/samples/tenant.json | 7 - + docs/guide/src/docbkx/samples/tenant.xml | 5 - + docs/guide/src/docbkx/samples/tenantlock.json | 5 - + docs/guide/src/docbkx/samples/tenantlock.xml | 4 - + docs/guide/src/docbkx/samples/tenants-1.json | 16 - + docs/guide/src/docbkx/samples/tenants-1.xml | 10 - + docs/guide/src/docbkx/samples/tenants-2.json | 20 - + docs/guide/src/docbkx/samples/tenants-2.xml | 13 - + docs/guide/src/docbkx/samples/tenants-3.json | 16 - + docs/guide/src/docbkx/samples/tenants-3.xml | 10 - + docs/guide/src/docbkx/samples/tenants-request.txt | 5 - + docs/guide/src/docbkx/samples/tenants.json | 20 - + docs/guide/src/docbkx/samples/tenants.xml | 14 - + docs/guide/src/docbkx/samples/updatedtenant.json | 7 - + docs/guide/src/docbkx/samples/updatedtenant.xml | 5 - + docs/guide/src/docbkx/samples/validatetoken.json | 27 - + docs/guide/src/docbkx/samples/validatetoken.xml | 14 - + docs/guide/src/docbkx/samples/version-atom.xml | 19 - + docs/guide/src/docbkx/samples/version.json | 33 - + docs/guide/src/docbkx/samples/version.xml | 23 - + docs/guide/src/docbkx/samples/versions-atom.xml | 29 - + docs/guide/src/docbkx/samples/versions.json | 39 - + docs/guide/src/docbkx/samples/versions.xml | 24 - + docs/guide/src/docbkx/xsd/api-common.xsd | 56 - + docs/guide/src/docbkx/xsd/api.xsd | 16 - + docs/guide/src/docbkx/xsd/atom/atom.xsd | 115 - + docs/guide/src/docbkx/xsd/atom/xml.xsd | 287 - + docs/guide/src/docbkx/xsd/baseURLs.xsd | 186 - + docs/guide/src/docbkx/xsd/extensions.xsd | 56 - + docs/guide/src/docbkx/xsd/fault.xsd | 135 - + docs/guide/src/docbkx/xsd/roles.xsd | 97 - + docs/guide/src/docbkx/xsd/tenant.xsd | 40 - + docs/guide/src/docbkx/xsd/token.xsd | 170 - + docs/guide/src/docbkx/xsd/version.xsd | 200 - + setup.py | 20 + + 184 files changed, 16453 insertions(+), 14760 deletions(-) + +commit 29819a9caaf6de7a024a1ff62148ad035e2eaef4 +Author: Yogeshwar Srikrishnan +Date: Tue Jun 14 13:58:44 2011 -0500 + + Removing unused references to UserTenantAssociation. + + keystone/db/sqlalchemy/api.py | 8 -------- + 1 file changed, 8 deletions(-) + +commit 2d07c7039703786be0afa6cf455e1b6238969d67 +Author: Yogeshwar Srikrishnan +Date: Tue Jun 14 12:11:09 2011 -0500 + + Introduced a method to get all users @Users resource.Also moved the method to get user groups out of tenant scope. + + keystone/db/sqlalchemy/api.py | 58 +++++++++++++++++ + keystone/logic/service.py | 32 +++++---- + keystone/server.py | 26 ++++++-- + keystone/test/unit/test_common.py | 28 ++++++-- + keystone/test/unit/test_users.py | 132 +++++++++++++++++++++++++++++++------- + 5 files changed, 231 insertions(+), 45 deletions(-) + +commit d7aed2064de3ee39c8a3a05c4e73ba5b18fac9f9 +Author: Ziad Sawalha +Date: Tue Jun 14 11:21:01 2011 -0500 + + Changed BaseURLs to OpenStack names + + bin/sampledata.sh | 5 ++--- + etc/keystone.conf | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit f5bde61b016d398478899fe3560c358648cd2220 +Author: Ziad Sawalha +Date: Tue Jun 14 04:39:21 2011 -0500 + + Test fixes + + keystone/test/unit/test_tenant_groups.py | 10 ++++------ + keystone/test/unit/test_tenants.py | 4 ++-- + 2 files changed, 6 insertions(+), 8 deletions(-) + +commit d9a32c048323eb1a1dbf6fe63e356c16ce9bd49f +Merge: ef2033b 1a4ccd8 +Author: Ziad Sawalha +Date: Tue Jun 14 02:07:27 2011 -0700 + + Merge pull request #28 from yogirackspace/master + + Moving user calls out of tenants. + +commit 1a4ccd8c1b2c6e486801895558f6e27c15f760dc +Author: Yogeshwar Srikrishnan +Date: Mon Jun 13 19:57:43 2011 -0500 + + Seperating user calls from tenants. + + keystone/logic/service.py | 95 +++++----- + keystone/server.py | 100 +++++------ + keystone/test/unit/test_BaseURLs.py | 4 +- + keystone/test/unit/test_auth.py | 2 +- + keystone/test/unit/test_authentication.py | 8 +- + keystone/test/unit/test_authn_v2.py | 0 + keystone/test/unit/test_common.py | 76 ++++---- + keystone/test/unit/test_groups.py | 12 +- + keystone/test/unit/test_keystone.py | 0 + keystone/test/unit/test_roles.py | 4 +- + keystone/test/unit/test_server.py | 2 +- + keystone/test/unit/test_tenant_groups.py | 13 +- + keystone/test/unit/test_tenants.py | 9 +- + keystone/test/unit/test_token.py | 5 +- + keystone/test/unit/test_users.py | 281 +++++++++++++----------------- + keystone/test/unit/test_version.py | 2 +- + 16 files changed, 279 insertions(+), 334 deletions(-) + +commit a8cb1b9ae31aed3911cfb7d13733055d74501c46 +Author: Dolph Mathews +Date: Mon Jun 13 16:54:51 2011 -0500 + + Improved README formatting/consistency + + README.md | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 6d431ae41724d16ba89b8567f228cb0e79e79b31 +Author: Dolph Mathews +Date: Mon Jun 13 16:32:13 2011 -0500 + + Updated paths to unit/function tests in README + + README.md | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +commit 00d9808e90d248aa5614a023aec3cde66a968719 +Author: Dolph Mathews +Date: Mon Jun 13 15:41:13 2011 -0500 + + Updated docs: sampledata.sh can't be executed outside of bin/ + + README.md | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f0567818f3e86357dca815fa2cc0d7a7647d5e4d +Merge: 59d9bb4 ef2033b +Author: Kevin L. Mitchell +Date: Mon Jun 13 13:23:29 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + + Conflicts: + keystone/test/functional/test_tokens.py + +commit 59d9bb49649a3c2de6122e0461ad5d9298b1fd85 +Merge: 53b1027 32d652e +Author: Kevin L. Mitchell +Date: Mon Jun 13 13:20:55 2011 -0500 + + Merge branch 'master' of github.com:klmitch/keystone + +commit 3e7433030eb4a103cedc5c00ee72c2571808dbc5 +Author: Dolph Mathews +Date: Mon Jun 13 11:56:00 2011 -0500 + + Added Routes and httplib2 to production dependencies + + tools/pip-requires | 2 ++ + 1 file changed, 2 insertions(+) + +commit 7a01132cc8498562dbdaa25927c49e422af833d9 +Author: Dolph Mathews +Date: Mon Jun 13 11:32:07 2011 -0500 + + Correcting typo + + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ef2033be3411ade4e43225de0995fa27baa378fc +Author: Ziad Sawalha +Date: Sat Jun 11 16:09:04 2011 -0500 + + Setup.py fix + + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f3a9d9ab933967b94ece010ca6c2aa5262303764 +Author: Ziad Sawalha +Date: Sat Jun 11 16:05:16 2011 -0500 + + Readd test folder + + keystone/test/EchoSOAPUI.xml | 2 + + keystone/test/IdentitySOAPUI.xml | 1355 ++++++++++++++++++++++++ + keystone/test/__init__.py | 0 + keystone/test/functional/base.py | 77 ++ + keystone/test/functional/ksapi.py | 146 +++ + keystone/test/functional/run_tests.py | 61 ++ + keystone/test/functional/sample_test.py | 85 ++ + keystone/test/functional/simplerest.py | 641 ++++++++++++ + keystone/test/functional/test_tokens.py | 51 + + keystone/test/unit/__init__.py | 0 + keystone/test/unit/base.py | 282 +++++ + keystone/test/unit/decorators.py | 49 + + keystone/test/unit/test_BaseURLs.py | 667 ++++++++++++ + keystone/test/unit/test_auth.py | 34 + + keystone/test/unit/test_authentication.py | 215 ++++ + keystone/test/unit/test_authn_v2.py | 463 +++++++++ + keystone/test/unit/test_common.py | 809 +++++++++++++++ + keystone/test/unit/test_exthandler.py | 65 ++ + keystone/test/unit/test_groups.py | 966 ++++++++++++++++++ + keystone/test/unit/test_keystone.py | 60 ++ + keystone/test/unit/test_roles.py | 682 +++++++++++++ + keystone/test/unit/test_server.py | 86 ++ + keystone/test/unit/test_tenant_groups.py | 1217 ++++++++++++++++++++++ + keystone/test/unit/test_tenants.py | 661 ++++++++++++ + keystone/test/unit/test_token.py | 173 ++++ + keystone/test/unit/test_users.py | 1584 +++++++++++++++++++++++++++++ + keystone/test/unit/test_version.py | 49 + + 27 files changed, 10480 insertions(+) + +commit 60db3cbba4c9c560206977bf7791e3682c0186ba +Author: Ziad Sawalha +Date: Sat Jun 11 16:04:34 2011 -0500 + + Forgot to add doc file + + docs/guide/src/docbkx/samples/tenants-request.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 67a3b6aa7f0482e86fbb4a077230cc6b35179bad +Author: Ziad Sawalha +Date: Sat Jun 11 16:03:49 2011 -0500 + + Moved tests to keystone folder and removed old management tools - issue #26 + + test/EchoSOAPUI.xml | 2 - + test/IdentitySOAPUI.xml | 1355 ------------------------------- + test/__init__.py | 0 + test/functional/base.py | 77 -- + test/functional/ksapi.py | 146 ---- + test/functional/run_tests.py | 63 -- + test/functional/sample_test.py | 85 -- + test/functional/simplerest.py | 641 --------------- + test/functional/test_tokens.py | 51 -- + test/kill.sql | 10 - + test/unit/__init__.py | 0 + test/unit/base.py | 282 ------- + test/unit/decorators.py | 49 -- + test/unit/test_BaseURLs.py | 667 ---------------- + test/unit/test_auth.py | 34 - + test/unit/test_authentication.py | 215 ----- + test/unit/test_authn_v2.py | 463 ----------- + test/unit/test_common.py | 809 ------------------- + test/unit/test_exthandler.py | 65 -- + test/unit/test_groups.py | 966 ---------------------- + test/unit/test_keystone.py | 60 -- + test/unit/test_roles.py | 682 ---------------- + test/unit/test_server.py | 86 -- + test/unit/test_tenant_groups.py | 1217 ---------------------------- + test/unit/test_tenants.py | 661 ---------------- + test/unit/test_token.py | 173 ---- + test/unit/test_users.py | 1584 ------------------------------------- + test/unit/test_version.py | 49 -- + tools/management/delgroup.py | 54 -- + tools/management/getgroup.py | 52 -- + tools/management/getgroups.py | 49 -- + tools/management/getgroupusers.py | 51 -- + tools/management/getuser.py | 49 -- + tools/management/getusergroups.py | 50 -- + tools/management/groupadd.py | 52 -- + tools/management/setuserlock.py | 61 -- + tools/management/setuserpswd.py | 53 -- + tools/management/updategroup.py | 54 -- + tools/management/userdel.py | 51 -- + tools/management/userupdate.py | 53 -- + 40 files changed, 11121 deletions(-) + +commit ffd0e032060d5c5c407a50156bf0b0f76d99e57b +Author: Ziad Sawalha +Date: Sat Jun 11 12:09:18 2011 -0500 + + Updated SWIFT endpoint default + + bin/sampledata.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 23098315c530a01f1234bb0d4322116267170b1f +Author: Ziad Sawalha +Date: Sat Jun 11 10:32:41 2011 -0500 + + Update to dev guide explaining admin call auth requirements + + docs/guide/src/docbkx/identitydevguide.xml | 53 ++++++++++++++++++++++++----- + docs/guide/src/docbkx/samples/tenants.json | 5 +++ + docs/guide/src/docbkx/samples/tenants.xml | 5 +++ + keystone/content/identitydevguide.pdf | Bin 298144 -> 302544 bytes + 4 files changed, 55 insertions(+), 8 deletions(-) + +commit 38901ddcce5682d17e96764da37fab8ecfeb0c46 +Author: Ziad Sawalha +Date: Sat Jun 11 09:17:46 2011 -0500 + + Update sample data and keystone-manage for local install of OpenStack + + bin/keystone-manage | 59 ++++++++++++++++++++++++++++++----------------------- + bin/sampledata.sh | 4 ++-- + 2 files changed, 36 insertions(+), 27 deletions(-) + +commit b272479802504797f2b986d8b25e3ecd06317292 +Merge: 6c0f62e 7afbc30 +Author: Ziad Sawalha +Date: Sat Jun 11 06:48:03 2011 -0700 + + Merge pull request #25 from gholt/master + + Put updated Swift Quickstart into README.md + +commit 7afbc306e28fb0d45cf15d8408bbac8ecffde8b5 +Author: gholt +Date: Sat Jun 11 04:06:34 2011 +0000 + + Put updated Swift Quickstart into README.md + + README.md | 95 ++++++++++++++++++++++++++++++++++- + docs/swift-quick-start.txt | 121 --------------------------------------------- + 2 files changed, 93 insertions(+), 123 deletions(-) + +commit 6c0f62e40057079a161e82f6ea0e67c4d8fc7b8a +Author: Ziad Sawalha +Date: Fri Jun 10 18:10:22 2011 -0500 + + API v2.0 Proposal + + docs/guide/src/docbkx/identitydevguide.xml | 35 ++++++++++++++++------------- + keystone/content/identitydevguide.pdf | Bin 285331 -> 298144 bytes + 2 files changed, 20 insertions(+), 15 deletions(-) + +commit dc29d8b7cc9ae44322ccf6f1b6070859c96de078 +Merge: cfce057 d6984f3 +Author: Ziad Sawalha +Date: Fri Jun 10 15:46:29 2011 -0700 + + Merge pull request #24 from yogirackspace/master + + Doc changes. + +commit d6984f31b8b14a14d321605d7ec6c5b15612d844 +Author: Yogeshwar Srikrishnan +Date: Fri Jun 10 16:31:07 2011 -0500 + + Doc updates.Minor keyston-manage changes. + + bin/keystone-manage | 20 ++- + bin/sampledata.sh | 5 + + docs/guide/src/docbkx/identitydevguide.xml | 211 ++++++++++++++++------------- + 3 files changed, 142 insertions(+), 94 deletions(-) + +commit d477f8b8ae14f8f9728bb6b108805940a6dade4d +Author: Yogeshwar Srikrishnan +Date: Fri Jun 10 13:38:48 2011 -0500 + + Doc updates. + + docs/guide/src/docbkx/identitydevguide.xml | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 718e3094d503533ef4d2108522a6fa88b34384f8 +Author: Yogeshwar Srikrishnan +Date: Fri Jun 10 13:19:01 2011 -0500 + + Doc updates. + + docs/guide/src/docbkx/identitydevguide.xml | 157 +++++++++++++++++++++++++++-- + docs/guide/src/docbkx/samples/group.json | 1 + + docs/guide/src/docbkx/samples/group.xml | 4 + + docs/guide/src/docbkx/samples/groups.json | 1 + + docs/guide/src/docbkx/samples/groups.xml | 5 + + keystone/server.py | 4 +- + 6 files changed, 163 insertions(+), 9 deletions(-) + +commit cfce057aaa01ed72bd84d53fe6e64b2e0f912f75 +Author: Jesse Andrews +Date: Thu Jun 9 19:02:12 2011 -0700 + + set nova admin role if keystone user has "Admin" role + + keystone/auth_protocols/nova_auth_token.py | 3 +++ + 1 file changed, 3 insertions(+) + +commit 6ff079a458d32b462c3660f7ac1f39f93cddf48c +Merge: 68c5752 26d9339 +Author: Ziad Sawalha +Date: Thu Jun 9 15:29:02 2011 -0700 + + Merge pull request #23 from yogirackspace/master + + Changes to return service catalog and support auth 1.0/1.1 style calls. + +commit 32d652efe39fd141028141dcf93a872157486d19 +Author: Jesse Andrews +Date: Wed Jun 8 11:09:43 2011 +0800 + + keystone repo is now at github.com/rackspace/keystone + + docs/swift-quick-start.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 69d991f56a97b66611d0856678f0eada38550134 +Author: Jay Pipes +Date: Mon Jun 6 02:23:49 2011 +0800 + + Add success test for GET /v2.0/tokens/ in json and xml + + test/unit/test_authn_v2.py | 79 ++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 70 insertions(+), 9 deletions(-) + +commit 33cd9f114e273b4d2a1bde761d905838fef6afa2 +Author: Jay Pipes +Date: Mon Jun 6 01:19:13 2011 +0800 + + Add Admin API tests for v2 authentication + + test/unit/test_authn_v2.py | 43 ++++++++++++++++++++++++++----------------- + 1 file changed, 26 insertions(+), 17 deletions(-) + +commit 319beab20466e2d33deea5136f912e83cdb7b78a +Author: Jay Pipes +Date: Mon Jun 6 00:56:34 2011 +0800 + + Add test verifying a missing tenantId key in the password creds works properly in JSON + + test/unit/test_authn_v2.py | 36 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + +commit 26d9339b66d3d9ada590f4a8a6880f03083a82f2 +Author: Yogeshwar Srikrishnan +Date: Thu Jun 9 14:45:00 2011 -0500 + + Rename file.Ziad suggestion. + + keystone/frontends/legacy_auth_frontend.py | 129 ----------------------------- + keystone/frontends/legacy_token_auth.py | 129 +++++++++++++++++++++++++++++ + 2 files changed, 129 insertions(+), 129 deletions(-) + +commit d99811e99b996dc05bd7a0d57a6bd7e380b4c20c +Author: Yogeshwar Srikrishnan +Date: Thu Jun 9 10:35:36 2011 -0500 + + Name changes suggested by Ziad. + + bin/keystone-auth | 21 +++++++++++---------- + etc/keystone.conf | 6 +++--- + 2 files changed, 14 insertions(+), 13 deletions(-) + +commit 49a644a25994a31e5a46dc3bd0bbd54267e28831 +Merge: 4cf516f 68c5752 +Author: Yogeshwar Srikrishnan +Date: Thu Jun 9 01:30:44 2011 -0500 + + Merge remote branch 'rackspace/master' + +commit 4cf516ff36f7654fa42c24b83d1d87e3ea87fc31 +Author: Yogeshwar Srikrishnan +Date: Thu Jun 9 01:26:34 2011 -0500 + + Minor fixes. + + bin/keystone | 2 +- + keystone/logic/types/auth.py | 20 +++++++++++--------- + 2 files changed, 12 insertions(+), 10 deletions(-) + +commit 0e1602a6cdb46ea664688ddd48d77b460d820a68 +Author: Yogeshwar Srikrishnan +Date: Thu Jun 9 00:27:42 2011 -0500 + + Code cleanup. + + bin/keystone | 5 ----- + keystone/frontends/legacy_auth_frontend.py | 18 ++++-------------- + keystone/logic/types/auth.py | 2 +- + 3 files changed, 5 insertions(+), 20 deletions(-) + +commit 38c2f72090e71e2376996fb3f5cf8b30aa59508f +Author: Yogeshwar Srikrishnan +Date: Thu Jun 9 00:16:58 2011 -0500 + + PEP8 changes. + + bin/keystone | 14 ++++++++------ + bin/keystone-auth | 7 ++++--- + keystone/common/config.py | 12 +++++------- + keystone/db/sqlalchemy/api.py | 8 ++++---- + keystone/frontends/legacy_auth_frontend.py | 27 +++++++++++++-------------- + keystone/logic/types/auth.py | 29 ++++++++++++++++++----------- + test/unit/test_authentication.py | 15 +++++++-------- + 7 files changed, 59 insertions(+), 53 deletions(-) + +commit ce24b59f91370e1eae2729bacd13a99a3fd343d7 +Author: Yogeshwar Srikrishnan +Date: Wed Jun 8 23:33:49 2011 -0500 + + Removing redundant files. + + bin/rackspace-keystone | 104 ------------------------ + etc/rackspace_legacy_auth.conf | 17 ---- + keystone/frontends/rackspace_legacy_auth.py | 119 ---------------------------- + 3 files changed, 240 deletions(-) + +commit d02151d7cf2ec3a62f45eb869960d429b1f6298d +Author: Yogeshwar Srikrishnan +Date: Wed Jun 8 23:23:08 2011 -0500 + + Changing to legacy auth to standard wsgi middleware.Name change of some of the files. + + keystone/frontends/legacy_auth_frontend.py | 140 +++++++++++++++++++++++++++++ + 1 file changed, 140 insertions(+) + +commit fb50f8aa036d9fe7823f18033518676f0370f967 +Author: Yogeshwar Srikrishnan +Date: Wed Jun 8 18:29:32 2011 -0500 + + Changing to legacy auth to standard wsgi middleware. + + bin/keystone | 18 ++-- + bin/keystone-auth | 2 +- + etc/keystone.conf | 20 +++- + keystone/frontends/rackspace_legacy_auth.py | 149 ++++++++++------------------ + keystone/logic/service.py | 5 +- + keystone/server.py | 94 +----------------- + test/unit/test_common.py | 2 +- + 7 files changed, 87 insertions(+), 203 deletions(-) + +commit 53b1027ecbb6f52e535d9221e5c757ad4bf374cb +Merge: 932c670 68c5752 +Author: Kevin L. Mitchell +Date: Wed Jun 8 16:54:47 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit c41da0a6a7b5b9df491442f1361160193f67d217 +Author: Yogeshwar Srikrishnan +Date: Wed Jun 8 01:21:22 2011 -0500 + + Introducing new frontend component to handle rackspace legacy calls. + + etc/rackspace_legacy_auth.conf | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit c41fab4e8baaef735b4d29560eb0871284a90735 +Author: Yogeshwar Srikrishnan +Date: Wed Jun 8 01:20:48 2011 -0500 + + Introducing new frontend component to handle rackspace legacy calls. + + bin/rackspace-keystone | 104 ++++++++++++++++++ + keystone/common/config.py | 12 ++- + keystone/frontends/__init__.py | 0 + keystone/frontends/rackspace_legacy_auth.py | 160 ++++++++++++++++++++++++++++ + 4 files changed, 271 insertions(+), 5 deletions(-) + +commit 68c5752ee3037a79b4d57f236afccf16ad901f99 +Author: Jesse Andrews +Date: Tue Jun 7 20:09:43 2011 -0700 + + keystone repo is now at github.com/rackspace/keystone + + docs/swift-quick-start.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0a4417c6938232e72f97412b9a7351ad4881c9a4 +Merge: dff1d9d 888ab19 +Author: Ziad Sawalha +Date: Mon Jun 6 21:06:37 2011 -0700 + + Merge pull request #19 from jaypipes/unittest + + Adds more unit tests for v2 Admin API for authentication and GET /tokens/ + +commit 888ab199746ed6f964222f752d21b30cf23f8cfa +Author: Jay Pipes +Date: Sun Jun 5 14:23:49 2011 -0400 + + Add success test for GET /v2.0/tokens/ in json and xml + + test/unit/test_authn_v2.py | 79 ++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 70 insertions(+), 9 deletions(-) + +commit 9a09871daab263e2be6ef33ea95f866d46649fe5 +Author: Jay Pipes +Date: Sun Jun 5 13:19:13 2011 -0400 + + Add Admin API tests for v2 authentication + + test/unit/test_authn_v2.py | 43 ++++++++++++++++++++++++++----------------- + 1 file changed, 26 insertions(+), 17 deletions(-) + +commit 7cc8c6cbc1e1c19d1704e9bda25b6a2da8097bd5 +Author: Jay Pipes +Date: Sun Jun 5 12:56:34 2011 -0400 + + Add test verifying a missing tenantId key in the password creds works properly in JSON + + test/unit/test_authn_v2.py | 36 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + +commit 932c67002f483ff3a8ab0c82a5475dbf02ed17f8 +Merge: 24eaa68 dff1d9d +Author: Kevin L. Mitchell +Date: Fri Jun 3 16:09:33 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit d415e9d00e3a49b0a5dca27c724b56daa7870a6f +Author: Yogeshwar Srikrishnan +Date: Fri Jun 3 14:47:37 2011 -0500 + + Removing debug print + + test/unit/test_authentication.py | 1 - + 1 file changed, 1 deletion(-) + +commit 0db9cef9269ac06d5b7bef8ff5e4badea384948e +Author: Yogeshwar Srikrishnan +Date: Fri Jun 3 14:37:37 2011 -0500 + + Changes to return service urls for Auth1.0 style calls. + + keystone/logic/service.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f5d64f9b6a8bd0f185a7ce4d626476bfd1149a3e +Author: Yogeshwar Srikrishnan +Date: Fri Jun 3 14:31:02 2011 -0500 + + Changes to return service urls for Auth1.0 style calls. + + bin/sampledata.sh | 3 +-- + keystone/logic/service.py | 20 ++++++++++++++------ + keystone/logic/types/auth.py | 1 - + keystone/server.py | 33 +++++++++++++++++++++++++++++++++ + test/unit/test_authentication.py | 8 ++++++++ + 5 files changed, 56 insertions(+), 9 deletions(-) + +commit 5b78f2543a563d2b19f76690b15a3c08bad5ec77 +Author: Yogeshwar Srikrishnan +Date: Fri Jun 3 12:32:46 2011 -0500 + + Updating tests and sample data. + + bin/sampledata.sh | 4 ++-- + test/unit/test_authentication.py | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 6f59ebab12319bce8a3477f1cce33314b39ffe91 +Merge: 25c3e9c dff1d9d +Author: Yogeshwar Srikrishnan +Date: Fri Jun 3 12:19:22 2011 -0500 + + Merging changes from rackspace. + +commit 25c3e9cb648bbb89aca81b9c341383a5a8b87a96 +Author: Yogeshwar Srikrishnan +Date: Fri Jun 3 12:12:50 2011 -0500 + + Changes to support service catalog. + + keystone/db/sqlalchemy/api.py | 11 ++++++++++- + keystone/logic/service.py | 5 ++--- + keystone/logic/types/auth.py | 21 ++++++++++----------- + test/unit/test_authentication.py | 20 ++++++++++++++++++++ + 4 files changed, 42 insertions(+), 15 deletions(-) + +commit dff1d9db40ade13523d92b922f932f67b819200b +Author: Ziad Sawalha +Date: Fri Jun 3 01:50:48 2011 -0500 + + pep8 + + keystone/db/sqlalchemy/api.py | 124 +++++++++++++++++++++++++-------------- + keystone/db/sqlalchemy/models.py | 27 +++++---- + keystone/logic/service.py | 11 ++-- + keystone/logic/types/auth.py | 3 +- + keystone/logic/types/role.py | 1 - + 5 files changed, 106 insertions(+), 60 deletions(-) + +commit 73543aabe9ba241098bcedf814393bcf95a20291 +Author: Ziad Sawalha +Date: Fri Jun 3 01:15:47 2011 -0500 + + Added URLs to sampledata + + bin/sampledata.sh | 3 +++ + 1 file changed, 3 insertions(+) + +commit f50d0e8a2c8c32a92f29029389dae347c358b8be +Author: Ziad Sawalha +Date: Fri Jun 3 01:10:48 2011 -0500 + + Support for listing BaseURL refs in keystone-manage + + bin/keystone-manage | 28 ++++++++++++++++++++++++++++ + keystone/db/sqlalchemy/api.py | 6 ++++++ + 2 files changed, 34 insertions(+) + +commit c40b96a7aea557cf0d62ef133a383343fcc8a07d +Merge: f0be679 acfebcf +Author: Ziad Sawalha +Date: Fri Jun 3 00:29:40 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit acfebcfe511937a4d1065cb909fdaacdc0de84c5 +Merge: 188af64 70d0933 +Author: Ziad Sawalha +Date: Thu Jun 2 22:29:25 2011 -0700 + + Merge pull request #15 from yogirackspace/master + + Code change to support get tenants and to return roles as a part of validate token call. + +commit f0be6794fbba426c2cf047265e4dffe730721504 +Merge: 35e50a5 188af64 +Author: Ziad Sawalha +Date: Fri Jun 3 00:22:27 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit 188af646058b5bea632e676abbb95cc54429a051 +Merge: cd8e681 4478f22 +Author: Ziad Sawalha +Date: Thu Jun 2 19:28:17 2011 -0700 + + Merge pull request #14 from jaypipes/unittest + + Add test case for verifying GET /v2.0/tokens returns 404 Not Found + +commit 71de35489e8cf505687a550f8fe9b634b2072553 +Author: Yogeshwar Srikrishnan +Date: Thu Jun 2 17:19:45 2011 -0500 + + Support transforming service catalog + + keystone/logic/types/auth.py | 49 +++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 48 insertions(+), 1 deletion(-) + +commit 70d0933386056601d191983df1ac9042fe0b8b02 +Author: Yogeshwar Srikrishnan +Date: Thu Jun 2 14:28:41 2011 -0500 + + Removing remerged comments. + + keystone/logic/service.py | 12 ------------ + 1 file changed, 12 deletions(-) + +commit c13a04f1eec659d50059d158a2f7a3b0ce7ac916 +Author: Yogeshwar Srikrishnan +Date: Thu Jun 2 14:11:58 2011 -0500 + + Adding roles as comma seperated values on a single header. + + examples/echo/echo/server.py | 4 ++-- + keystone/auth_protocols/auth_token.py | 15 +++++++++++---- + 2 files changed, 13 insertions(+), 6 deletions(-) + +commit 38b977efd20092c40dd93337dfc647082d37722d +Author: Yogeshwar Srikrishnan +Date: Thu Jun 2 12:57:06 2011 -0500 + + Changes to support getTenants call for user with admin privelage and regular user. + + keystone/db/sqlalchemy/api.py | 62 +++++++++++++++++++++++++++++++++++++++++-- + keystone/logic/service.py | 50 +++++++++++++++++++++++----------- + test/unit/test_tenants.py | 12 ++++----- + 3 files changed, 100 insertions(+), 24 deletions(-) + +commit 4478f229ac7c35388bee3a5803772ae2a5bd13a6 +Author: Jay Pipes +Date: Thu Jun 2 13:10:21 2011 -0400 + + Add more test cases for v2 authentication for bad requests and unauthorized results + + test/unit/base.py | 4 + + test/unit/test_authn_v2.py | 266 ++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 267 insertions(+), 3 deletions(-) + +commit 110af8effb9e353ba0bb5a222e2da942d540f814 +Author: Jay Pipes +Date: Thu Jun 2 12:02:57 2011 -0400 + + Add test case for verifying GET /v2.0/tokens returns 404 Not Found + + test/unit/base.py | 5 ++++- + test/unit/test_authn_v2.py | 36 ++++++++++++++++++++++-------------- + 2 files changed, 26 insertions(+), 15 deletions(-) + +commit 24eaa68d2cd535bfb4b5db9c54c67d1d806b2564 +Author: Kevin L. Mitchell +Date: Thu Jun 2 11:01:08 2011 -0500 + + It's possible to authenticate through the Admin API. + + Note: Had to add more dependencies because Keystone returns extant + tokens, so we have to be very careful about ordering of token + revocations. This shouldn't affect anything that extends + base.KeystoneTest--all that can still run in parallel--but the + test_adminauth() has to be a dependency of + base.KeystoneTest.setUpClass() and has to be dependent on + test_authenticate() so we serialize things properly. + + test/functional/test_tokens.py | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +commit 9a6f3d54e94d31f7be2b8ccfceeb8b835a89cddc +Author: Yogeshwar Srikrishnan +Date: Wed Jun 1 17:29:01 2011 -0500 + + Changes on auth basic middleware component to return roles.Also changes on the application to return roles not tied to a tenant. + + examples/echo/echo/server.py | 4 ++++ + keystone/auth_protocols/auth_token.py | 11 ++++++++++- + keystone/logic/service.py | 6 +++++- + 3 files changed, 19 insertions(+), 2 deletions(-) + +commit 400dbe888b90d4bfac7a0b5379987fbb20974d05 +Author: Kevin L. Mitchell +Date: Wed Jun 1 15:37:27 2011 -0500 + + Update the sample to reflect some minor enhancements to the base framework. + + test/functional/sample_test.py | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit 642922d8d3e3b8f3e5935d39559baab2cbd46fcf +Author: Kevin L. Mitchell +Date: Wed Jun 1 14:32:20 2011 -0500 + + Add test for validate_token + + test/functional/test_tokens.py | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +commit a8758d92072955fa3f7112b6a8b25ec7b238a689 +Author: Kevin L. Mitchell +Date: Wed Jun 1 14:32:05 2011 -0500 + + Save expiration data for later comparison + + test/functional/base.py | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit d79104e4d2cea3f39fc17cedbf98824daa7018ca +Author: Kevin L. Mitchell +Date: Wed Jun 1 14:12:19 2011 -0500 + + Don't need to fiddle around with user tokens here, just admin tokens + + test/functional/test_tokens.py | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +commit 268d5245c566bfec4ac375ee3eee47abd10b4b61 +Author: Kevin L. Mitchell +Date: Wed Jun 1 14:11:40 2011 -0500 + + Get and revoke both admin and user tokens... + + test/functional/base.py | 26 ++++++++++++++++++++------ + 1 file changed, 20 insertions(+), 6 deletions(-) + +commit 7a38f7438caa979c9b1579a3ab17ce5ed10199d4 +Author: Yogeshwar Srikrishnan +Date: Wed Jun 1 14:01:49 2011 -0500 + + Merging changes + + keystone/logic/service.py | 3 --- + 1 file changed, 3 deletions(-) + +commit e0ca09d67b54949540265e6e73b29623d28c2723 +Author: Kevin L. Mitchell +Date: Wed Jun 1 13:57:23 2011 -0500 + + Bah, somehow my sample data failed to include Admin as admin's role + + test/functional/test_tokens.py | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 0bef2450909574f03f175b277ceb435d5aa6afb6 +Merge: 8787944 cd8e681 +Author: Yogeshwar Srikrishnan +Date: Wed Jun 1 13:36:42 2011 -0500 + + Merging changes + +commit 878794491433f3b6f558c32d92c8d0f2a4e87bb1 +Author: Yogeshwar Srikrishnan +Date: Wed Jun 1 13:29:15 2011 -0500 + + Merging changes + + test/__init__.py | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 06093efd33b13520d23a24358337548ce5aa813b +Author: Yogeshwar Srikrishnan +Date: Wed Jun 1 13:28:43 2011 -0500 + + Merging changes + + docs/swift-quick-start.txt | 121 ++++++++++++++++++++ + test/unit/__init__.py | 0 + test/unit/base.py | 275 +++++++++++++++++++++++++++++++++++++++++++++ + test/unit/decorators.py | 49 ++++++++ + test/unit/test_authn_v2.py | 89 +++++++++++++++ + 5 files changed, 534 insertions(+) + +commit 98b251e91bda8a7b7daaa511263650aa3c8c0620 +Author: Yogeshwar Srikrishnan +Date: Wed Jun 1 13:27:05 2011 -0500 + + Meging changes + + bin/sampledata.sh | 6 ++- + docs/guide/src/docbkx/identitydevguide.xml | 6 +-- + keystone/__init__.py | 2 +- + keystone/content/identitydevguide.pdf | Bin 287930 -> 285331 bytes + keystone/db/sqlalchemy/api.py | 1 + + keystone/logic/service.py | 83 ++++++++++++++++++----------- + keystone/logic/types/auth.py | 26 +++++++++ + keystone/logic/types/baseURL.py | 35 +++++++----- + keystone/logic/types/fault.py | 3 +- + keystone/logic/types/tenant.py | 19 ++++--- + keystone/server.py | 80 +++++++++++++++------------ + setup.py | 4 +- + 12 files changed, 170 insertions(+), 95 deletions(-) + +commit 908ededed96b54760188a010e6bd44b7325cf68c +Author: Yogeshwar Srikrishnan +Date: Wed Jun 1 13:11:47 2011 -0500 + + Changes to also return role references as a part of user when get token call is made for a specific tenant. + + keystone/db/sqlalchemy/api.py | 5 +++++ + keystone/logic/service.py | 8 +++++++- + keystone/logic/types/auth.py | 10 +++++++-- + keystone/logic/types/role.py | 12 +++++++++-- + test/unit/test_common.py | 8 ++++++++ + test/unit/test_token.py | 48 ++++++++++++++++++++++++++++++++++++++++--- + 6 files changed, 83 insertions(+), 8 deletions(-) + +commit 48897416c3b6564289c45a3e316d8f6422601115 +Author: Kevin L. Mitchell +Date: Wed Jun 1 11:23:35 2011 -0500 + + Use un-spaced exception names... + + test/functional/simplerest.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 975a9f14801f1dff28747ccd54b383a24fcc33f4 +Author: Kevin L. Mitchell +Date: Wed Jun 1 11:22:48 2011 -0500 + + Try to use an admin credential to revoke the token. + + Not even admin credentials permit revocation of the token. Oh, well; + we put it in a assert_raises() so we'll catch it when revocation is + made to work + + test/functional/test_tokens.py | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +commit 83df3640cc3826bda2733ca4e240b7976da524cc +Author: Kevin L. Mitchell +Date: Wed Jun 1 11:17:23 2011 -0500 + + Split the Keystone service from the Admin service so we can test both + + test/functional/base.py | 24 +++++++++++++++--------- + test/functional/run_tests.py | 22 +++++++++++++++++++++- + 2 files changed, 36 insertions(+), 10 deletions(-) + +commit 9cae7b2af4d22994eaff20e7fe6bb4e0eb7c1ba0 +Author: Kevin L. Mitchell +Date: Wed Jun 1 11:01:09 2011 -0500 + + The API is a moving target; update the test + + test/functional/test_tokens.py | 5 ----- + 1 file changed, 5 deletions(-) + +commit 35e50a53ce2dad91d1f8a5fd3f7d0de036ede18b +Merge: a2f040e cd8e681 +Author: Ziad Sawalha +Date: Wed Jun 1 09:53:44 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit cd8e6816ff7cd99db7c50fa2c9a2f96250d05860 +Merge: 527ed7b 5fa9dfb +Author: Ziad Sawalha +Date: Wed Jun 1 07:50:24 2011 -0700 + + Merge pull request #9 from jaypipes/unittest + + Adds unit testing base class that takes care of + +commit a2f040ef2584b02c672f60449e7c1d2bd4c20c61 +Author: Ziad Sawalha +Date: Wed Jun 1 09:46:21 2011 -0500 + + Support for listing roles in keystone-manage + + bin/keystone-manage | 40 +++++++++++++++++++++++++++++----------- + keystone/db/sqlalchemy/api.py | 5 +++++ + 2 files changed, 34 insertions(+), 11 deletions(-) + +commit 5fa9dfbed03a54a40a3ae18f55b849ef4a522b05 +Author: Jay Pipes +Date: Wed Jun 1 10:23:02 2011 -0400 + + Adds unit testing base class that takes care of + much of the tedium around setting up test fixtures. This + first commit just demoes the new test case functionality + with a new test case /test/unit/test_authn_v2.py. + + If y'all like it, I can convert the existing unit tests + to this approach. + + To run, simply run: + + nosetests -v test.unit.test_authn_v2 + + test/__init__.py | 0 + test/unit/__init__.py | 0 + test/unit/base.py | 275 +++++++++++++++++++++++++++++++++++++++++++++ + test/unit/decorators.py | 49 ++++++++ + test/unit/test_authn_v2.py | 89 +++++++++++++++ + 5 files changed, 413 insertions(+) + +commit 527ed7b06745afca5631c3f725e35f6c705765a2 +Author: Ziad Sawalha +Date: Wed Jun 1 06:18:13 2011 -0500 + + pep8 + + keystone/__init__.py | 2 +- + keystone/logic/service.py | 62 +++++++++++++++++++++---------------- + keystone/logic/types/auth.py | 2 +- + keystone/logic/types/baseURL.py | 35 ++++++++++++--------- + keystone/logic/types/fault.py | 3 +- + keystone/logic/types/role.py | 19 +++++++----- + keystone/logic/types/tenant.py | 19 +++++++----- + keystone/server.py | 68 ++++++++++++++++++++++++----------------- + setup.py | 2 +- + 9 files changed, 123 insertions(+), 89 deletions(-) + +commit 83e6764f8139fbb08e7c83926dfb323c0db799d5 +Author: Ziad Sawalha +Date: Wed Jun 1 05:36:41 2011 -0500 + + Fixed issue #6 + + keystone/logic/service.py | 29 +++++++++++++---------------- + keystone/logic/types/auth.py | 28 +++++++++++++++++++++++++++- + keystone/server.py | 3 ++- + 3 files changed, 42 insertions(+), 18 deletions(-) + +commit df49b1dd7182f2c2205912a637cf02e91eec7ab5 +Author: Ziad Sawalha +Date: Wed Jun 1 05:06:51 2011 -0500 + + Support POST /tokens only - issue #5 + + README.md | 8 ++++++-- + docs/guide/src/docbkx/identitydevguide.xml | 6 +++--- + keystone/content/identitydevguide.pdf | Bin 287930 -> 285331 bytes + keystone/db/sqlalchemy/api.py | 1 + + keystone/server.py | 9 ++++----- + 5 files changed, 14 insertions(+), 10 deletions(-) + +commit 4891277fcbe81748d71f49b36ba6e5f30050362c +Merge: a279b2d e5a9f8b +Author: Ziad Sawalha +Date: Wed Jun 1 04:09:59 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit e5a9f8b31097e4c293dfb632d5718a5fb19666b6 +Merge: ea07831 1294a74 +Author: Ziad Sawalha +Date: Wed Jun 1 02:09:47 2011 -0700 + + Merge pull request #2 from yogirackspace/master + + Changes to support Base URL Refs. + +commit a279b2d6d05d214926f6ff413ab35365b2a0cde9 +Author: gholt +Date: Tue May 31 22:39:32 2011 +0000 + + Added quick start guide to integrating Swift and Keystone; fixed setup.py tokenauth filter installation. + + docs/swift-quick-start.txt | 121 +++++++++++++++++++++++++++++++++++++++++++++ + setup.py | 2 +- + 2 files changed, 122 insertions(+), 1 deletion(-) + +commit d5990cbc6b58ff9a42927b2a424b86cf318936bf +Author: Ziad Sawalha +Date: Wed Jun 1 04:01:46 2011 -0500 + + Added role and user data to sampledata.sh + + bin/sampledata.sh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 1294a7470771074e97a0d1ce68c79a8795501ed6 +Author: Yogeshwar Srikrishnan +Date: Tue May 31 22:04:42 2011 -0500 + + Additional unit tests for base url refs.Minor code refactorings. + + keystone/logic/types/baseURL.py | 1 - + keystone/server.py | 153 ++----------- + test/unit/test_BaseURLs.py | 460 +++++++++++++++++++++++++++++++++++++++- + test/unit/test_common.py | 5 +- + 4 files changed, 477 insertions(+), 142 deletions(-) + +commit 3ce0226adcce1da25f9478af81ade9eabb961324 +Merge: 36a8ddc ea07831 +Author: Yogeshwar Srikrishnan +Date: Tue May 31 00:55:05 2011 -0500 + + Merge remote branch 'rackspace/master' + +commit 36a8ddc6608cb471eaed404ce732713905a8e843 +Author: Yogeshwar Srikrishnan +Date: Tue May 31 00:47:26 2011 -0500 + + Changes to support baseurlrefs operations. + + docs/guide/src/docbkx/identitydevguide.xml | 2 +- + keystone/db/sqlalchemy/api.py | 82 +++++++++++++++++++++ + keystone/logic/service.py | 54 +++++++++++++- + keystone/logic/types/baseURL.py | 111 +++++++++++++++++++++++++++++ + keystone/server.py | 47 +++++++++++- + test/unit/test_BaseURLs.py | 81 +++++++++++++++++++++ + test/unit/test_common.py | 45 ++++++++++++ + 7 files changed, 418 insertions(+), 4 deletions(-) + +commit ea07831a0967c8e0d974a12b651b42d10252b50b +Author: Ziad Sawalha +Date: Sat May 28 15:40:37 2011 -0500 + + MD cleanup + + README.md | 27 +++++++++++++++------------ + 1 file changed, 15 insertions(+), 12 deletions(-) + +commit af1ec2f68993a4f61101fa91b70b641f008a375b +Author: Ziad Sawalha +Date: Sat May 28 15:35:31 2011 -0500 + + md futzing + + README.md | 15 --------------- + 1 file changed, 15 deletions(-) + +commit 596eb93b8e07c84d7fe614a7588c14e1fd795c32 +Author: Ziad Sawalha +Date: Sat May 28 15:17:40 2011 -0500 + + More readme cleanup + + README.md | 148 ++++++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 95 insertions(+), 53 deletions(-) + +commit 922a072e2142e7462bb3e0fcc4dbc88a15906844 +Merge: efa3db4 2846b99 +Author: Ziad Sawalha +Date: Sat May 28 13:08:32 2011 -0500 + + Merge branch 'master' of https://github.com/rackspace/keystone + +commit efa3db4b35113893836e3e3d0f95c0d8be0adf92 +Author: Ziad Sawalha +Date: Sat May 28 13:08:25 2011 -0500 + + Merged DTest tests and moved ini file to examples/paste + + README.md | 4 ++ + docs/nova-api-paste.ini | 114 --------------------------------- + examples/paste/auth_basic.ini | 13 ++++ + examples/paste/auth_token.ini | 18 ++++++ + examples/paste/nova-api-paste.ini | 114 +++++++++++++++++++++++++++++++++ + keystone/auth_protocols/auth_basic.ini | 13 ---- + keystone/auth_protocols/auth_basic.py | 6 +- + keystone/auth_protocols/auth_openid.py | 6 +- + keystone/auth_protocols/auth_token.ini | 18 ------ + keystone/auth_protocols/auth_token.py | 5 +- + test/functional/run_tests.py | 6 +- + test/test_setup.sql | 71 -------------------- + 12 files changed, 166 insertions(+), 222 deletions(-) + +commit 2846b9988835c46a2d95317d236471c4139281a9 +Author: Jesse Andrews +Date: Sat May 28 10:49:21 2011 -0700 + + moved paste example to examples + + docs/nova-api-paste.ini | 114 -------------------------------------- + examples/paste/nova-api-paste.ini | 114 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 114 insertions(+), 114 deletions(-) + +commit 87c9cf8a06226c017f3e3edaff3a972117bdc64e +Merge: d7e0eae ccd5c96 +Author: Ziad Sawalha +Date: Sat May 28 12:30:01 2011 -0500 + + Merge https://github.com/klmitch/keystone + +commit d7e0eae9e045513ea74b4b22b35256488e88964b +Author: Ziad Sawalha +Date: Sat May 28 12:20:13 2011 -0500 + + Readme updates + + README.md | 65 +++++++++++++++++++++++++++------------------------------------ + 1 file changed, 28 insertions(+), 37 deletions(-) + +commit ccd5c969fb095a7d42505b2c3b2aee8350edb626 +Author: Kevin L. Mitchell +Date: Fri May 27 17:03:59 2011 -0500 + + Just making sure leading whitespace is stripped if automated. + + test/functional/sample_test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a78a2853c1abd4bf5630e962d5a47e104000a6a9 +Author: Kevin L. Mitchell +Date: Fri May 27 17:01:13 2011 -0500 + + to->too + + test/functional/sample_test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0947ddd903e6bdafda57466d44a9b9e5385e4e60 +Merge: fd52c3b 778252f +Author: Kevin L. Mitchell +Date: Fri May 27 16:36:41 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + +commit fd52c3bad70aecdf8471d693f6ab4b57cca8d58c +Merge: 5f03a98 316fa74 +Author: Kevin L. Mitchell +Date: Fri May 27 16:34:07 2011 -0500 + + Merge branch 'master' of git://github.com/rackspace/keystone + + Conflicts: + bin/sampledata.sh + docs/guide/src/docbkx/identitydevguide.xml + keystone/db/sqlalchemy/api.py + keystone/db/sqlalchemy/models.py + keystone/logic/service.py + keystone/server.py + test/unit/test_common.py + test/unit/test_roles.py + +commit 778252fff3688248a8d14e283c9ed805715e59b0 +Author: Ziad Sawalha +Date: Fri May 27 16:23:44 2011 -0500 + + Updated dev guide + + docs/guide/src/docbkx/identitydevguide.xml | 9 ++++----- + keystone/content/identitydevguide.pdf | Bin 285993 -> 287930 bytes + 2 files changed, 4 insertions(+), 5 deletions(-) + +commit 5f03a982bf8b823084f4aa8775ee052576acff31 +Author: Kevin L. Mitchell +Date: Fri May 27 16:21:30 2011 -0500 + + Add a sample to document how to create tests. + + test/functional/sample_test.py | 85 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 85 insertions(+) + +commit 551a96ea981c3536f86433d4428b999aedc98e56 +Author: Kevin L. Mitchell +Date: Fri May 27 15:51:49 2011 -0500 + + Add a test for authenticate/revoke_token + + test/functional/test_tokens.py | 51 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 51 insertions(+) + +commit 9571e75202adce1c2abd4de5e0fc58598659d9ca +Author: Kevin L. Mitchell +Date: Fri May 27 15:51:13 2011 -0500 + + Ensure that --username, --password, and --keystone are given + + test/functional/run_tests.py | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit bc44cea775eb16d2ad2c7f46f0ddd418d3223584 +Author: Kevin L. Mitchell +Date: Fri May 27 15:50:52 2011 -0500 + + Build base classes for tests + + test/functional/base.py | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) + +commit 316fa7445c4cab35a164cf5bf7cb3330ae872c2a +Author: Ziad Sawalha +Date: Fri May 27 15:34:29 2011 -0500 + + Documentation fixes to versions + + README.md | 9 +++- + docs/guide/src/docbkx/identity.wadl | 2 +- + docs/guide/src/docbkx/samples/baseURLs.json | 6 +-- + docs/guide/src/docbkx/samples/choices.json | 2 +- + docs/guide/src/docbkx/samples/choices.xml | 62 ++++++++++++++---------- + docs/guide/src/docbkx/samples/extensions.json | 2 +- + docs/guide/src/docbkx/samples/getuser-1.json | 2 +- + docs/guide/src/docbkx/samples/getuser-1.xml | 2 +- + docs/guide/src/docbkx/samples/tenants-1.json | 2 +- + docs/guide/src/docbkx/samples/tenants-1.xml | 2 +- + docs/guide/src/docbkx/samples/tenants-2.json | 4 +- + docs/guide/src/docbkx/samples/tenants-2.xml | 4 +- + docs/guide/src/docbkx/samples/tenants-3.json | 2 +- + docs/guide/src/docbkx/samples/tenants-3.xml | 2 +- + docs/guide/src/docbkx/samples/validatetoken.json | 2 +- + docs/guide/src/docbkx/samples/version-atom.xml | 2 +- + docs/guide/src/docbkx/samples/versions-atom.xml | 9 +++- + docs/guide/src/docbkx/samples/versions.json | 13 ++++- + docs/guide/src/docbkx/samples/versions.xml | 8 ++- + 19 files changed, 89 insertions(+), 48 deletions(-) + +commit 1c8cea8858832584a1f7bfc7faf4259e190b9972 +Author: Kevin L. Mitchell +Date: Fri May 27 14:59:34 2011 -0500 + + Build the skeleton necessary to run tests + + test/functional/base.py | 18 ++++++++++++++++ + test/functional/run_tests.py | 50 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 68 insertions(+) + +commit 1bdcf1e2cbf38151e7dd125825f6e89e35e0abaa +Author: Kevin L. Mitchell +Date: Fri May 27 14:46:04 2011 -0500 + + Add x_auth_token header to most methods + + test/functional/ksapi.py | 79 ++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 57 insertions(+), 22 deletions(-) + +commit fb9d08a7d833a796cd11b310f94201b501d60134 +Author: Kevin L. Mitchell +Date: Fri May 27 14:45:18 2011 -0500 + + Make sure we don't lose the body completely if we can't json.load() it + + test/functional/simplerest.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 3d6c39e01af22cc1c891a8fa6a4e0d3028d6dadb +Author: Kevin L. Mitchell +Date: Fri May 27 14:04:09 2011 -0500 + + Add debugging messages + + test/functional/simplerest.py | 51 ++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 46 insertions(+), 5 deletions(-) + +commit d593ec1ca485aad33cc85f110983a534d00ebe3d +Author: Kevin L. Mitchell +Date: Fri May 27 14:03:28 2011 -0500 + + Add a property to get the RESTClient instance. + + This has to be done such that rc can be overridden, but the RESTClient + instance is still retrievable for the RESTMethod instances. + + test/functional/simplerest.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit d040332a6044938366873231fff636eac52e2c59 +Author: Kevin L. Mitchell +Date: Fri May 27 14:02:17 2011 -0500 + + Fix up get()/put()/post()/delete() calls to make_req() + + test/functional/simplerest.py | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 9c128f3692474f463c09e56e92962bb5c28fd868 +Author: Kevin L. Mitchell +Date: Fri May 27 14:01:36 2011 -0500 + + Deal with the case that no headers are provided + + test/functional/simplerest.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit 9df28d79e5df3eccbc9ba54c5c4fe425b67c78de +Author: Kevin L. Mitchell +Date: Fri May 27 14:00:27 2011 -0500 + + Deal more intelligently with empty strings + + test/functional/simplerest.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 09452520e4aba5afaa01d7c7dcb07fba38dc593d +Author: Ziad Sawalha +Date: Fri May 27 13:31:25 2011 -0500 + + Listing technologies to integrate + + README.md | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 3dec3c1bd30a360c7e101e637e0e0fe2402d2de4 +Author: Kevin L. Mitchell +Date: Fri May 27 12:12:35 2011 -0500 + + Um, queries are supposed to be optional, all others required + + test/functional/simplerest.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5e84c803719f4d9f5109c8a11492b4abd6675239 +Author: Kevin L. Mitchell +Date: Fri May 27 12:12:14 2011 -0500 + + Properly join relative paths + + test/functional/simplerest.py | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit a8b280c852c94403a7238a1b4b0ff90b34ace7af +Author: Kevin L. Mitchell +Date: Fri May 27 12:11:40 2011 -0500 + + Apparently "/token" is actually spelled "/tokens" + + test/functional/ksapi.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f07fd498c9fad5d7c9081fa336053ebfc1de84be +Author: Kevin L. Mitchell +Date: Fri May 27 12:11:14 2011 -0500 + + Accidentally left out the reqwrapper argument + + test/functional/ksapi.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit e7ce6b654582cb31b886d97d87c0e6c8ee5266a1 +Author: Kevin L. Mitchell +Date: Fri May 27 10:42:58 2011 -0500 + + Sketch in a basis for the Keystone API 2.0 + + test/functional/ksapi.py | 110 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 110 insertions(+) + +commit 1fe162ad7b7aac333d1c21b72abe7dff6c406ef8 +Author: Kevin L. Mitchell +Date: Fri May 27 10:42:31 2011 -0500 + + Make argument order a little more natural + + test/functional/simplerest.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3bababc57b4946f1ca69504237d4f9380ffe8314 +Author: Yogeshwar Srikrishnan +Date: Thu May 26 22:14:11 2011 -0500 + + Fixing unit tests.Introduced support for global roles + + bin/keystone-manage | 12 +++-- + bin/sampledata.sh | 2 +- + keystone/db/sqlalchemy/api.py | 7 ++- + keystone/logic/service.py | 20 ++++---- + keystone/server.py | 1 - + test/unit/test_authentication.py | 12 ++--- + test/unit/test_common.py | 4 +- + test/unit/test_groups.py | 19 ++++---- + test/unit/test_tenant_groups.py | 98 ++++++++++++++++++---------------------- + test/unit/test_token.py | 12 ++--- + 10 files changed, 91 insertions(+), 96 deletions(-) + +commit 9d09bb71505a5c7123188751e14d0c2515338374 +Author: Kevin L. Mitchell +Date: Thu May 26 17:28:03 2011 -0500 + + Don't let self._path be the empty string + + test/functional/simplerest.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1c5d91748ef91771b0374c369194f561d7e5615b +Author: Kevin L. Mitchell +Date: Thu May 26 17:27:46 2011 -0500 + + self._scheme isn't set yet + + test/functional/simplerest.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 31ef088e214cf43b6c6d892435563d85d74560a6 +Author: Kevin L. Mitchell +Date: Thu May 26 17:27:25 2011 -0500 + + Don't add a field if there isn't one... + + test/functional/simplerest.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7286b0d9153606522db508c43343d13c72e1ca30 +Author: Kevin L. Mitchell +Date: Thu May 26 16:59:37 2011 -0500 + + Create a simple means of building a REST-based API. + + test/functional/simplerest.py | 585 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 585 insertions(+) + +commit a299ad9559b1e9aafdff64f8af6395d62307169e +Author: Yogeshwar Srikrishnan +Date: Thu May 26 14:09:13 2011 -0500 + + Fixing unit tests for user and groups. + + keystone/db/sqlalchemy/api.py | 42 +++++++++++++++++-------------------- + keystone/logic/service.py | 7 ++----- + test/unit/test_common.py | 6 +++--- + test/unit/test_groups.py | 41 +++++++++++++----------------------- + test/unit/test_users.py | 49 ++++++++++++++++++++++--------------------- + 5 files changed, 64 insertions(+), 81 deletions(-) + +commit a408a9a637a93737b6647340dbb397db63683e97 +Author: Ziad Sawalha +Date: Thu May 26 03:07:51 2011 -0500 + + Docs + + README.md | 74 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 34 insertions(+), 40 deletions(-) + +commit c7fffda311536b4125bfcd8cfa16d7fb0ace8ba1 +Author: Ziad Sawalha +Date: Thu May 26 03:01:49 2011 -0500 + + Link fix + + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bde59e78a37d7af18b6ca85491ee50e367b2750f +Author: Ziad Sawalha +Date: Thu May 26 01:40:34 2011 -0500 + + API Spec updates + + docs/guide/src/docbkx/identitydevguide.xml | 2902 +++++++++++++++------------- + keystone/content/identitydevguide.pdf | Bin 262743 -> 285993 bytes + test/unit/test_groups.py | 8 +- + 3 files changed, 1570 insertions(+), 1340 deletions(-) + +commit 2c00b1fcc8cf763f1c8fac4800fdcccc1eb3e2c4 +Author: Ziad Sawalha +Date: Thu May 26 00:24:05 2011 -0500 + + More /token -> /tokens fixes + + keystone/content/identitydevguide.pdf | Bin 262751 -> 262743 bytes + test/IdentitySOAPUI.xml | 34 +++++++++++++++++----------------- + 2 files changed, 17 insertions(+), 17 deletions(-) + +commit c1122b3319582b514e1b62973ca2859f1f053148 +Author: Ziad Sawalha +Date: Thu May 26 00:09:07 2011 -0500 + + /tokens instead of /token + + README.md | 6 +++--- + docs/guide/src/docbkx/identitydevguide.xml | 2 +- + .../src/docbkx/samples/samplerequestheader.json | 4 ++-- + .../src/docbkx/samples/sampleresponseheader.json | 1 - + examples/echo/echo_client.py | 2 +- + keystone/auth_protocols/auth_token.py | 6 +++--- + keystone/server.py | 20 ++++++++++---------- + test/IdentitySOAPUI.xml | 12 ++++++------ + 8 files changed, 26 insertions(+), 27 deletions(-) + +commit cb724018ffe575ee480586287639b3122273a933 +Author: Ziad Sawalha +Date: Wed May 25 22:16:45 2011 -0500 + + Prep for move to git@github.com:rackspace/keystone.git + + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b3d0041ad73797a554a5f7c29675a4e4ac3dd03b +Author: Ziad Sawalha +Date: Wed May 25 22:15:05 2011 -0500 + + Made URL relative + + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 90d792696461065891e745c5c881172946245e5f +Author: Ziad Sawalha +Date: Wed May 25 21:57:46 2011 -0500 + + pep-8 and minor mapping fix + + keystone/server.py | 4 ++-- + tools/tracer.py | 14 +++++++++----- + 2 files changed, 11 insertions(+), 7 deletions(-) + +commit cae75edb696692f6fcbf404987fdabc7c9d2b46a +Author: Ziad Sawalha +Date: Wed May 25 20:51:42 2011 -0500 + + Dev guide update - BaseURLs and Roles + + keystone/content/identitydevguide.pdf | Bin 262797 -> 262751 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 2f61261678e1df3e6569b60f1eee4242ef654ffe +Author: Ziad Sawalha +Date: Wed May 25 20:38:38 2011 -0500 + + Merge pull 57 + + echo/docs/echo_flow.pdf | 5316 -------------------------------------- + echo/docs/echo_flow.sdx | 75 - + examples/echo/docs/echo_flow.pdf | 5316 ++++++++++++++++++++++++++++++++++++++ + examples/echo/docs/echo_flow.sdx | 75 + + 4 files changed, 5391 insertions(+), 5391 deletions(-) + +commit c7eae23eaaf2041778db4e1e913629babde61a35 +Merge: b0d12a5 61c2444 +Author: Ziad Sawalha +Date: Wed May 25 20:30:26 2011 -0500 + + Merge https://github.com/yogirackspace/keystone + +commit b0d12a558f590a501a42afd1283148961563920e +Merge: 9ce96f4 3eafbea +Author: Ziad Sawalha +Date: Wed May 25 20:24:05 2011 -0500 + + Merge pull request 53 + +commit 9ce96f4f0fd1d2a175fb7ce688a84237cc244603 +Author: Jesse Andrews +Date: Wed May 25 17:16:23 2011 -0700 + + Update docs on how to use nova.sh to deploy openstack on cloud servers + + README.md | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +commit 61c2444f76eae5fb24896c904ec1ed67b6a722aa +Author: Yogeshwar Srikrishnan +Date: Wed May 25 17:46:14 2011 -0500 + + Changes to support calls to getBaseUrls. + + bin/keystone-manage | 27 +++++++- + bin/sampledata.sh | 3 +- + keystone/db/sqlalchemy/api.py | 145 +++++++++++++++++++++++++++++++++++++++ + keystone/db/sqlalchemy/models.py | 25 +++++-- + keystone/logic/service.py | 31 ++++++++- + keystone/logic/types/baseURL.py | 97 ++++++++++++++++++++++++++ + keystone/server.py | 45 +++++++++++- + test/unit/test_BaseURLs.py | 136 ++++++++++++++++++++++++++++++++++++ + 8 files changed, 495 insertions(+), 14 deletions(-) + +commit 1dec39cbaa8066aa2f59f9f19b1a5c2f5514737e +Author: Yogeshwar Srikrishnan +Date: Wed May 25 14:06:20 2011 +0800 + + Changes to support /tokens on docbook and minor roleref changes + + docs/guide/src/docbkx/identitydevguide.xml | 10 +++++----- + docs/guide/src/docbkx/samples/roleRef.json | 2 +- + docs/guide/src/docbkx/samples/roleRef.xml | 2 +- + docs/guide/src/docbkx/samples/roleRefs.json | 4 ++-- + docs/guide/src/docbkx/samples/roleRefs.xml | 4 ++-- + keystone/logic/types/role.py | 20 ++++++++++---------- + test/unit/test_common.py | 6 +++--- + 7 files changed, 24 insertions(+), 24 deletions(-) + +commit 72b09c0b5fe0a235044c48f11013f16cc4f6a1eb +Author: Yogeshwar Srikrishnan +Date: Wed May 25 13:29:20 2011 +0800 + + Changes to support roleref calls. + + keystone/db/sqlalchemy/api.py | 49 ++++++++++--- + keystone/db/sqlalchemy/models.py | 16 ++--- + keystone/logic/service.py | 66 +++++++++++++++-- + keystone/logic/types/role.py | 100 ++++++++++++++++++++++++++ + keystone/server.py | 41 ++++++++++- + test/unit/test_common.py | 30 +++++++- + test/unit/test_roles.py | 150 ++++++++++++++++++++++++++++++++++++++- + 7 files changed, 423 insertions(+), 29 deletions(-) + +commit 2e7ac40e8189d85355a8bff9991cddb203b31bd3 +Author: Jesse Andrews +Date: Thu May 26 03:14:38 2011 +0800 + + Updated to use X_USER as decided in Issue 49 + + keystone/auth_protocols/nova_auth_token.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3663a3bc8f31d40814225d8e1dab1e4a8747e23d +Author: Jesse Andrews +Date: Thu May 26 03:13:25 2011 +0800 + + Updated with feedback from https://github.com/khussein/keystone/issues/49#issuecomment-1237312 + + keystone/auth_protocols/auth_token.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 26808c683f331086bda5cc66c53529580330f87e +Author: Ziad Sawalha +Date: Thu May 26 01:35:06 2011 +0800 + + Fix for issue 49 - parse X_AUTHORIZATION header for user_id + + keystone/auth_protocols/nova_auth_token.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 6fd39177f19f144c9f66b43995e5262517e72c5b +Author: Ziad Sawalha +Date: Wed May 25 21:51:54 2011 +0800 + + Fixed issue where user tenant not returned in GET /token - related to issue #49 + + keystone/logic/service.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 569095e8f6771291c76d64410e2094f2d3d278bc +Author: Jesse Andrews +Date: Wed May 25 04:51:33 2011 +0800 + + user should be what keystone returns + + keystone/auth_protocols/auth_token.py | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 3fadaa6b50e07e2a2ee5e900d27ce5786aabbc4b +Author: Ziad Sawalha +Date: Wed May 25 00:38:56 2011 +0800 + + Fixed issue #54 + + bin/sampledata.sh | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +commit 0e6902733a7e8ee8bd60323abcf72cf5f3c3a3bf +Author: Jesse Andrews +Date: Wed May 25 12:14:38 2011 -0700 + + Updated to use X_USER as decided in Issue 49 + + keystone/auth_protocols/nova_auth_token.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 92fc0268ff882a6773a538cd6bdfc5b0f7e60e9d +Author: Jesse Andrews +Date: Wed May 25 12:13:25 2011 -0700 + + Updated with feedback from https://github.com/khussein/keystone/issues/49#issuecomment-1237312 + + keystone/auth_protocols/auth_token.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit de2d9122ab48f283f345835a0436f073c9c893ae +Author: Ziad Sawalha +Date: Wed May 25 12:35:06 2011 -0500 + + Fix for issue 49 - parse X_AUTHORIZATION header for user_id + + keystone/auth_protocols/nova_auth_token.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 8b1766da819c0d49c8154f5a4e54e0f92964bb27 +Author: Yogeshwar Srikrishnan +Date: Wed May 25 12:00:09 2011 -0500 + + Minor changes to the document. + + docs/guide/src/docbkx/identitydevguide.xml | 3 +-- + docs/guide/src/docbkx/samples/role.json | 2 +- + docs/guide/src/docbkx/samples/role.xml | 2 +- + docs/guide/src/docbkx/samples/roles.json | 8 ++++---- + docs/guide/src/docbkx/samples/roles.xml | 4 ++-- + 5 files changed, 9 insertions(+), 10 deletions(-) + +commit ba87a01546d20cf8c56620b1e477c61c54017ea1 +Author: Yogeshwar Srikrishnan +Date: Wed May 25 11:51:05 2011 -0500 + + Changes to unique relationship definition. + + keystone/db/sqlalchemy/models.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bd27344fcd95edc044a88367ea644b01fb2e2ae8 +Author: Yogeshwar Srikrishnan +Date: Wed May 25 11:04:19 2011 -0500 + + Adding more tests for roleref operations. + + keystone/server.py | 1 + + test/unit/test_common.py | 1 - + test/unit/test_roles.py | 388 +++++++++++++++++++++++++++++++++++++++++++++-- + 3 files changed, 380 insertions(+), 10 deletions(-) + +commit e9be213735e5922a7d24a0f60c6554427303d89d +Author: Ziad Sawalha +Date: Wed May 25 08:51:54 2011 -0500 + + Fixed issue where user tenant not returned in GET /token - related to issue #49 + + keystone/logic/service.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 18daaeba13aef8cd71fe662eee85835b1e00baaf +Merge: 94af36c d3fb3fa +Author: Ziad Sawalha +Date: Wed May 25 08:39:34 2011 -0500 + + Merge branch 'master' of https://github.com/khussein/keystone + +commit d3fb3faed47a555fb5e4ac9ce1f3066087cc1386 +Merge: ddb9512 7c04dc5 +Author: Ziad Sawalha +Date: Wed May 25 06:39:19 2011 -0700 + + Merge pull request #56 from yogirackspace/master + + RoleRef Calls/Minor Docbook changes. + +commit 94af36c61d54a1dc822a48d1ccb5cc9fcdee9bd0 +Merge: fd1f75c ddb9512 +Author: Ziad Sawalha +Date: Wed May 25 08:31:48 2011 -0500 + + Merge branch 'master' of https://github.com/khussein/keystone + +commit 7c04dc579b3380950773f2e2f281c77006f6d951 +Author: Yogeshwar Srikrishnan +Date: Wed May 25 01:06:20 2011 -0500 + + Changes to support /tokens on docbook and minor roleref changes + + docs/guide/src/docbkx/identitydevguide.xml | 10 +++++----- + docs/guide/src/docbkx/samples/roleRef.json | 2 +- + docs/guide/src/docbkx/samples/roleRef.xml | 2 +- + docs/guide/src/docbkx/samples/roleRefs.json | 4 ++-- + docs/guide/src/docbkx/samples/roleRefs.xml | 4 ++-- + keystone/logic/types/role.py | 20 ++++++++++---------- + test/unit/test_common.py | 6 +++--- + 7 files changed, 24 insertions(+), 24 deletions(-) + +commit 3b07e5de1e094a98b928e29ee38b48ab93ba6fe2 +Merge: 9a51696 ddb9512 +Author: Yogeshwar Srikrishnan +Date: Wed May 25 00:34:27 2011 -0500 + + Merge remote branch 'khussein/master' + +commit 9a51696c9d0f5f93db94cbc04ce092b1077cabc9 +Author: Yogeshwar Srikrishnan +Date: Wed May 25 00:29:20 2011 -0500 + + Changes to support roleref calls. + + keystone/db/sqlalchemy/api.py | 49 ++++++++++--- + keystone/db/sqlalchemy/models.py | 16 ++--- + keystone/logic/service.py | 66 +++++++++++++++-- + keystone/logic/types/role.py | 100 ++++++++++++++++++++++++++ + keystone/server.py | 41 ++++++++++- + test/unit/test_common.py | 30 +++++++- + test/unit/test_roles.py | 150 ++++++++++++++++++++++++++++++++++++++- + 7 files changed, 423 insertions(+), 29 deletions(-) + +commit ddb951239b76772761b296662dbbbc3b52e10cbc +Author: Jesse Andrews +Date: Tue May 24 13:51:33 2011 -0700 + + user should be what keystone returns + + keystone/auth_protocols/auth_token.py | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 881bbb143c38ba037188ebd2da8529441546f06b +Author: Jesse Andrews +Date: Tue May 24 09:42:14 2011 -0700 + + midnight typo + + docs/nova-api-paste.ini | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3eafbea484b993bb0f59e90cb05860d5517dc526 +Author: Brian Lamar +Date: Tue May 24 12:40:46 2011 -0400 + + Added examples readme + + examples/README.md | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit fd1f75c52a1887fb5ce53fd199a8947439409c03 +Author: Ziad Sawalha +Date: Tue May 24 11:38:56 2011 -0500 + + Fixed issue #54 + + bin/sampledata.sh | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +commit 1cad985efbfe3916aa4d73cbf5d60afd85666890 +Author: Ziad Sawalha +Date: Tue May 24 11:30:27 2011 -0500 + + Link to latest dev guide in readme + + README.md | 5 +++++ + 1 file changed, 5 insertions(+) + +commit acf17e3895cfc477eaa58e58879f5d612e87c694 +Merge: 44b4131 7ccfbd8 +Author: Ziad Sawalha +Date: Tue May 24 11:26:50 2011 -0500 + + Merge branch 'master' of https://github.com/khussein/keystone + +commit 44b41312107520d33dba57c681c13cc528f87929 +Author: Ziad Sawalha +Date: Tue May 24 11:26:45 2011 -0500 + + Instructions to run with Nova + + README.md | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 7ccfbd826fa290eca962f2aa208ce8f8e9cb3350 +Merge: 8244029 3c6fc8a +Author: Ziad Sawalha +Date: Tue May 24 09:24:17 2011 -0700 + + Merge pull request #52 from gholt/master + + Fix up broken setup.py scripts list. + +commit 8244029c64a246394be1b587c2c02a9d11cd29a6 +Merge: c58de5c af0621e +Author: Ziad Sawalha +Date: Tue May 24 09:23:42 2011 -0700 + + Merge pull request #50 from dprince/fix_identity_wadl_symlink + + Fix the identity.wadl symlink. + +commit 7bee4601197fbfbac5d0aa8804301e62cec2de21 +Merge: 90624dd c58de5c +Author: Ziad Sawalha +Date: Tue May 24 11:16:19 2011 -0500 + + Merge branch 'master' of https://github.com/khussein/keystone + +commit 90624dd6a136fd443651bb7e5ba41984d8e261a6 +Author: Ziad Sawalha +Date: Tue May 24 11:16:13 2011 -0500 + + Documentation update and new API spec + + README.md | 11 +++++++++++ + docs/design/flow_diagram.png | Bin 0 -> 163556 bytes + keystone/content/identitydevguide.pdf | Bin 208102 -> 262797 bytes + 3 files changed, 11 insertions(+) + +commit 13d9fb8f237eb05a5f3ebb6873f7c57df2786519 +Author: Brian Lamar +Date: Tue May 24 12:09:40 2011 -0400 + + Updates to README + + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d006b73564f1b9ccb9188f9915b140d5d1e289f1 +Author: Brian Lamar +Date: Tue May 24 12:08:01 2011 -0400 + + Updates to README + + README.md | 81 +++++++++------------------------------------------------------ + 1 file changed, 11 insertions(+), 70 deletions(-) + +commit 58d1eb090efa274158fdeabd920ae866d17ec5f5 +Author: Brian Lamar +Date: Tue May 24 12:00:07 2011 -0400 + + Updates to README + + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5a12c8e13429ad138e6f14fc743f23cb947c61e1 +Author: Brian Lamar +Date: Tue May 24 11:59:41 2011 -0400 + + Updates to README + + README.md | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit 2ba7a531339e58d48355f32ebd6e1da1364b6ce4 +Author: Brian Lamar +Date: Tue May 24 11:54:41 2011 -0400 + + Updates to README + + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ada1c2137fbc976e87ed24214c6c5ea5df4494e6 +Author: Brian Lamar +Date: Tue May 24 11:53:06 2011 -0400 + + Updates to README + + README.md | 45 ++++++++++++++++++++++++++++++++------------- + 1 file changed, 32 insertions(+), 13 deletions(-) + +commit 3c6fc8a642104f1307083f82b3c22382653772a1 +Author: gholt +Date: Tue May 24 15:41:16 2011 +0000 + + Fix up broken setup.py scripts list. + + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6fdc83234f821a3b893c92ab496e6170818fefd2 +Author: Brian Lamar +Date: Tue May 24 11:36:52 2011 -0400 + + -Removed .project file from project and added it to .gitignore + -Moved pylintrc -> .pylintrc, personal preference that this file should be available, but not seen + -Moved echo to examples directory, seemed a bit odd to be in the top level + -Moved management directory to tools, seemed a bit odd to be in the top level + -Moved pip-requires to tools/, and updated the reference to it in README.md + + .gitignore | 1 + + .project | 11 --- + .pylintrc | 38 ++++++++ + README.md | 10 +-- + echo/bin/echod | 26 ------ + echo/echo/__init__.py | 17 ---- + echo/echo/echo.ini | 36 -------- + echo/echo/echo.wadl | 86 ------------------ + echo/echo/echo_basic.ini | 36 -------- + echo/echo/echo_remote.ini | 19 ---- + echo/echo/samples/echo.json | 11 --- + echo/echo/samples/echo.xml | 8 -- + echo/echo/server.py | 164 ----------------------------------- + echo/echo/xsd/echo.xsd | 48 ---------- + echo/echo/xsl/echo.xsl | 41 --------- + echo/echo_client.py | 98 --------------------- + echo/setup.py | 39 --------- + examples/echo/bin/echod | 26 ++++++ + examples/echo/echo/__init__.py | 17 ++++ + examples/echo/echo/echo.ini | 36 ++++++++ + examples/echo/echo/echo.wadl | 86 ++++++++++++++++++ + examples/echo/echo/echo_basic.ini | 36 ++++++++ + examples/echo/echo/echo_remote.ini | 19 ++++ + examples/echo/echo/samples/echo.json | 11 +++ + examples/echo/echo/samples/echo.xml | 8 ++ + examples/echo/echo/server.py | 164 +++++++++++++++++++++++++++++++++++ + examples/echo/echo/xsd/echo.xsd | 48 ++++++++++ + examples/echo/echo/xsl/echo.xsl | 41 +++++++++ + examples/echo/echo_client.py | 98 +++++++++++++++++++++ + examples/echo/setup.py | 39 +++++++++ + management/delgroup.py | 54 ------------ + management/getgroup.py | 52 ----------- + management/getgroups.py | 49 ----------- + management/getgroupusers.py | 51 ----------- + management/getuser.py | 49 ----------- + management/getusergroups.py | 50 ----------- + management/groupadd.py | 52 ----------- + management/setuserlock.py | 61 ------------- + management/setuserpswd.py | 53 ----------- + management/updategroup.py | 54 ------------ + management/userdel.py | 51 ----------- + management/userupdate.py | 53 ----------- + pip-requires | 8 -- + pylintrc | 38 -------- + tools/management/delgroup.py | 54 ++++++++++++ + tools/management/getgroup.py | 52 +++++++++++ + tools/management/getgroups.py | 49 +++++++++++ + tools/management/getgroupusers.py | 51 +++++++++++ + tools/management/getuser.py | 49 +++++++++++ + tools/management/getusergroups.py | 50 +++++++++++ + tools/management/groupadd.py | 52 +++++++++++ + tools/management/setuserlock.py | 61 +++++++++++++ + tools/management/setuserpswd.py | 53 +++++++++++ + tools/management/updategroup.py | 54 ++++++++++++ + tools/management/userdel.py | 51 +++++++++++ + tools/management/userupdate.py | 53 +++++++++++ + tools/pip-requires | 8 ++ + 57 files changed, 1310 insertions(+), 1320 deletions(-) + +commit af0621e2548d964c9355d47eb942f9964525513b +Author: Dan Prince +Date: Tue May 24 09:31:16 2011 -0400 + + Fix the identity.wadl symlink. + + keystone/identity.wadl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c58de5c6347e8620d4a295d83098e2bcbd86143d +Author: Jesse Andrews +Date: Tue May 24 01:19:19 2011 -0700 + + keystone src directory needs symlinked + + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 169707ab15e24347f74f4b8caf311ca321a0aa7a +Author: Jesse Andrews +Date: Tue May 24 01:18:07 2011 -0700 + + remove copy&paste ware from nova_auth_token and use auth_token middleware + + docs/nova-api-paste.ini | 2 +- + keystone/auth_protocols/nova_auth_token.py | 302 +---------------------------- + 2 files changed, 6 insertions(+), 298 deletions(-) + +commit 8fc352b4c5da2a2c60aa8842ddd9dc4e98045179 +Author: Ziad Sawalha +Date: Mon May 23 22:12:27 2011 -0500 + + Flow diagrams + + docs/design/flow_diagram.pdf | 9495 ++++++++++++++++++++++++++++++++++++++++++ + docs/design/flow_diagram.sdx | 87 + + 2 files changed, 9582 insertions(+) + +commit 2dc7387aa9a36ca4e336ed3170221c879868bf39 +Author: Ziad Sawalha +Date: Mon May 23 21:56:06 2011 -0500 + + simple flow diagrams + + echo/docs/echo_flow.pdf | 5316 +++++++++++++++++++++++++++++++++++++++++++++++ + echo/docs/echo_flow.sdx | 75 + + 2 files changed, 5391 insertions(+) + +commit b49dfce06080c5fc077216f8dcbe62b51ed03644 +Author: Ziad Sawalha +Date: Mon May 23 21:36:36 2011 -0500 + + Multi-tenant token fixes + + keystone/db/sqlalchemy/api.py | 2 +- + keystone/logic/service.py | 6 ++++-- + keystone/logic/types/auth.py | 13 ++++++++++--- + keystone/server.py | 3 ++- + 4 files changed, 17 insertions(+), 7 deletions(-) + +commit 9349a7e1e7b44fdb38b7c9a225272f1ac55054d0 +Author: Ziad Sawalha +Date: Mon May 23 21:01:54 2011 -0500 + + Fixed invalid tenant authentication + + bin/sampledata.sh | 1 + + keystone/db/sqlalchemy/api.py | 9 ++++++++- + keystone/logic/service.py | 3 ++- + keystone/logic/types/auth.py | 4 ++++ + 4 files changed, 15 insertions(+), 2 deletions(-) + +commit b9af3106f89bf24ab0d4375e4f3523dc74435574 +Author: Ziad Sawalha +Date: Mon May 23 20:18:28 2011 -0500 + + Fix error in tenant_is_empty (model has changed) + + keystone/db/sqlalchemy/api.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit aafd477a9b76a86622d4059560879f738093d5dc +Author: Ziad Sawalha +Date: Mon May 23 20:05:15 2011 -0500 + + Fixed debug/verbose flag processing + + bin/keystone | 12 ++++++++++-- + bin/keystone-admin | 10 ++++++++-- + bin/keystone-auth | 10 ++++++++-- + bin/keystone-manage | 11 +++++++++-- + bin/sampledata.sh | 2 +- + keystone/common/config.py | 5 ++++- + 6 files changed, 40 insertions(+), 10 deletions(-) + +commit 5a7d10b93b74896942fd63df9c09765efec5a700 +Merge: 5cb71ca 15f3c81 +Author: Ziad Sawalha +Date: Mon May 23 19:10:07 2011 -0500 + + Merge branch 'master' of https://github.com/khussein/keystone + +commit 15f3c818ff4c131fa2cb1075850657cf95f3223d +Merge: 79f7346 8e759bc +Author: Ziad Sawalha +Date: Mon May 23 17:09:55 2011 -0700 + + Merge pull request #46 from yogirackspace/master + + REST Calls to support roles. DocBook changes. + +commit 5cb71ca44d71417a7970d5b2a6bd9c2d2d09b69e +Merge: 28c9901 79f7346 +Author: Ziad Sawalha +Date: Mon May 23 19:04:04 2011 -0500 + + Merge branch 'master' of https://github.com/khussein/keystone + +commit 79f7346dd5cf10bff17183ee28378fa0e807c1a7 +Merge: 1507b1d f253a1b +Author: Jesse Andrews +Date: Mon May 23 16:47:05 2011 -0700 + + Merge pull request #47 from termie/master + + undo hacks to allow copying of nova_auth_tokens into nova + +commit f253a1b38d878db5d6e95797302b25bfaa283b23 +Author: termie +Date: Mon May 23 16:40:27 2011 -0700 + + update readme + + README.md | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit aea957ebccb9f9186ec938bdb2e088ece09398b0 +Author: termie +Date: Mon May 23 16:13:40 2011 -0700 + + keep nova_auth_token in keystone + + docs/nova-api-paste.ini | 4 ++-- + keystone/auth_protocols/nova_auth_token.py | 3 ++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 8e759bc6759422920a7ccd9f96ede61ea849e421 +Author: Yogeshwar Srikrishnan +Date: Mon May 23 18:05:11 2011 -0500 + + Changes to support /Roles calls.Removing create call from being exposed as of now. + + keystone/server.py | 3 +-- + test/unit/test_roles.py | 38 ++------------------------------------ + 2 files changed, 3 insertions(+), 38 deletions(-) + +commit 80a286d80331733382f51cc9e478bf7432fcac36 +Author: Yogeshwar Srikrishnan +Date: Mon May 23 17:59:39 2011 -0500 + + Changes to support /Roles calls.Description included. + + docs/guide/src/docbkx/samples/roles.json | 4 ++-- + docs/guide/src/docbkx/samples/roles.xml | 4 ++-- + docs/guide/src/docbkx/xsd/roles.xsd | 2 +- + test/IdentitySOAPUI.xml | 12 ++++++------ + 4 files changed, 11 insertions(+), 11 deletions(-) + +commit 42f63b91a7387c6f884386dd7899c376898867af +Author: Yogeshwar Srikrishnan +Date: Mon May 23 17:52:53 2011 -0500 + + Changes to support /Roles calls + + bin/keystone | 3 +- + bin/keystone-admin | 3 +- + bin/keystone-auth | 2 +- + bin/keystone-manage | 3 +- + docs/guide/src/docbkx/samples/role.json | 2 +- + docs/guide/src/docbkx/samples/role.xml | 7 +- + keystone/db/sqlalchemy/api.py | 11 ++ + keystone/logic/service.py | 46 ++++++++ + keystone/logic/types/fault.py | 7 ++ + keystone/logic/types/role.py | 107 +++++++++++++++++ + keystone/server.py | 51 ++++++++ + test/IdentitySOAPUI.xml | 12 +- + test/unit/test_common.py | 28 +++++ + test/unit/test_roles.py | 200 ++++++++++++++++++++++++++++++++ + 14 files changed, 464 insertions(+), 18 deletions(-) + +commit 28c990171f484f508fba9bafe290c45cbe522c25 +Merge: 9e7386e 1507b1d +Author: Ziad Sawalha +Date: Mon May 23 14:01:47 2011 -0500 + + Readme merge + +commit 9e7386e40574d87cb62744149646923b47254864 +Author: Ziad Sawalha +Date: Mon May 23 14:00:39 2011 -0500 + + Readme updaes for load testing + + README.md | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 1507b1d13066bd36ee079f47f40699aa000def76 +Author: Jesse Andrews +Date: Mon May 23 10:12:33 2011 -0700 + + hack nova_auth_token to work + + keystone/auth_protocols/nova_auth_token.py | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit d8fa90c4cde5eaf631bcdbc37f9cc1dbdb0879f2 +Author: Jesse Andrews +Date: Mon May 23 09:51:34 2011 -0700 + + removing unused library + + bin/keystone-manage | 1 - + 1 file changed, 1 deletion(-) + +commit 3d855a4cec46ecc8d8b98090de95bab88864a643 +Merge: 7170c62 7211ce8 +Author: Yogeshwar Srikrishnan +Date: Mon May 23 11:51:01 2011 -0500 + + Merge remote branch 'khussein/master' + +commit 7170c6219b2c635856218290e5fea779eb595642 +Author: Yogeshwar Srikrishnan +Date: Mon May 23 11:46:49 2011 -0500 + + Changes to support roles and baseurls on wadl. + + docs/guide/src/docbkx/samples/auth.json | 52 ++++++++---- + docs/guide/src/docbkx/samples/auth.xml | 29 +++++-- + docs/guide/src/docbkx/samples/baseURL.json | 7 +- + docs/guide/src/docbkx/samples/baseURL.xml | 7 +- + docs/guide/src/docbkx/samples/baseURLRef.json | 3 +- + docs/guide/src/docbkx/samples/baseURLRef.xml | 2 +- + docs/guide/src/docbkx/samples/baseURLRefs.json | 15 ++-- + docs/guide/src/docbkx/samples/baseURLRefs.xml | 16 ++-- + docs/guide/src/docbkx/samples/baseURLs.json | 29 +++---- + docs/guide/src/docbkx/samples/baseURLs.xml | 29 +++---- + docs/guide/src/docbkx/samples/roleRefs.json | 6 +- + docs/guide/src/docbkx/samples/roleRefs.xml | 4 +- + docs/guide/src/docbkx/samples/roles.xml | 10 +-- + docs/guide/src/docbkx/samples/validatetoken.json | 8 ++ + docs/guide/src/docbkx/samples/validatetoken.xml | 4 + + docs/guide/src/docbkx/xsd/roles.xsd | 12 +-- + docs/guide/src/docbkx/xsd/token.xsd | 102 ++++++++++++++++++++++- + 17 files changed, 231 insertions(+), 104 deletions(-) + +commit 7a6378d4e52e016324e41cfca40b61832bbe7c27 +Author: Yogeshwar Srikrishnan +Date: Mon May 23 10:09:08 2011 -0500 + + Changes to support roles and baseurls on wadl. + + docs/guide/src/docbkx/identitydevguide.xml | 4 ++-- + docs/guide/src/docbkx/samples/roleRefs.json | 12 ++++++------ + docs/guide/src/docbkx/xsd/api.xsd | 2 ++ + 3 files changed, 10 insertions(+), 8 deletions(-) + +commit 9a14d18416db3aafeacb787468b1f60af082a4dd +Author: Yogeshwar Srikrishnan +Date: Mon May 23 09:50:14 2011 -0500 + + Changes to support roles and baseURLs. + + docs/guide/src/docbkx/identity.wadl | 376 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 376 insertions(+) + +commit 7211ce8ecb303c3da561f530df7aaad2ea1d68b4 +Author: Jesse Andrews +Date: Mon May 23 01:37:01 2011 -0700 + + missed some nova reqs + + keystone/auth_protocols/nova_auth_token.py | 3 +++ + 1 file changed, 3 insertions(+) + +commit 93625fe282735a1262ac8f61440aa4cdf6566444 +Author: Jesse Andrews +Date: Mon May 23 01:30:28 2011 -0700 + + information on using nova_auth_token + + README.md | 18 ++++++++ + docs/nova-api-paste.ini | 114 ++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 132 insertions(+) + +commit a7bbca14882d8ac5baf4ac923a2459bbfe04eb6b +Author: Jesse Andrews +Date: Mon May 23 01:23:39 2011 -0700 + + lazy provisioning for nova + + keystone/auth_protocols/nova_auth_token.py | 360 +++++++++++++++++++++++++++++ + 1 file changed, 360 insertions(+) + +commit 386db5c8d746397697f1ae88223a76b148b47744 +Author: Ziad Sawalha +Date: Mon May 23 02:22:28 2011 -0500 + + readme fixes + + README.md | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit dca2f7af0b4d5ab98198f04b35783ad1894cae80 +Merge: 888b18e 0bb304a +Author: Ziad Sawalha +Date: Mon May 23 02:16:10 2011 -0500 + + Merged in anotherjesse's changes + +commit 888b18e3f42fd6078fcc9c7079bf058ffad834ff +Author: Ziad Sawalha +Date: Mon May 23 02:11:59 2011 -0500 + + New model working with echo_client.py + + README.md | 13 +- + bin/keystone | 14 +- + bin/keystone-admin | 6 - + bin/keystone-auth | 13 +- + bin/keystone-manage | 264 +++++++++++++++++++++++++++++----- + bin/sampledata.sh | 51 +++++++ + echo/echo/echo.ini | 6 +- + echo/echo/echo_basic.ini | 6 +- + echo/echo/echo_remote.ini | 4 +- + echo/echo_client.py | 1 + + keystone/auth_protocols/auth_token.py | 13 +- + keystone/db/sqlalchemy/api.py | 182 +++++++++++++++-------- + keystone/db/sqlalchemy/models.py | 4 +- + keystone/logic/service.py | 5 +- + keystone/logic/types/auth.py | 2 + + management/getusers.py | 38 ----- + management/useradd.py | 42 ------ + test/unit/test_common.py | 1 - + test/unit/test_exthandler.py | 16 +++ + tools/tracer.py | 20 +++ + 20 files changed, 484 insertions(+), 217 deletions(-) + +commit 656517632d81f1e5c532f7526bd0b07394100a72 +Author: Ziad Sawalha +Date: Sun May 22 21:06:07 2011 -0500 + + Missed a file + + tools/__init__.py | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit a833164247f2678907faddadec78ee8d06686657 +Author: Ziad Sawalha +Date: Sun May 22 21:05:26 2011 -0500 + + Added tracing and modified model + + bin/keystone | 1 - + bin/keystone-admin | 20 +++++---- + bin/keystone-auth | 1 - + bin/keystone-manage | 5 +-- + keystone/__init__.py | 32 +++++++++++++++ + keystone/common/config.py | 57 ++++++++++++++++---------- + keystone/common/exception.py | 2 +- + keystone/common/wsgi.py | 15 +++++-- + keystone/db/sqlalchemy/api.py | 9 +++- + keystone/db/sqlalchemy/models.py | 61 ++++++++++++++++++++-------- + keystone/logic/service.py | 51 ++++++++++------------- + keystone/logic/types/auth.py | 6 ++- + keystone/version.py | 33 --------------- + tools/tracer.py | 88 ++++++++++++++++++++++++++++++++++++++++ + 14 files changed, 260 insertions(+), 121 deletions(-) + +commit 0bb304a456ffe2a8ddd9dc2bec879b11267f0d03 +Author: Jesse Andrews +Date: Sun May 22 18:52:15 2011 -0700 + + echo_client should be executable + + echo/echo_client.py | 1 + + 1 file changed, 1 insertion(+) + +commit 4ae6942dc72782d9e83ea4a87acc3d3bb4f33e27 +Author: Jesse Andrews +Date: Sun May 22 18:45:05 2011 -0700 + + move nova's path injection to management scripts + + management/delgroup.py | 11 +++++++++++ + management/getgroup.py | 11 +++++++++++ + management/getgroups.py | 11 +++++++++++ + management/getgroupusers.py | 11 +++++++++++ + management/getuser.py | 11 +++++++++++ + management/getusergroups.py | 11 +++++++++++ + management/getusers.py | 11 +++++++++++ + management/groupadd.py | 11 +++++++++++ + management/setuserlock.py | 11 +++++++++++ + management/setuserpswd.py | 11 +++++++++++ + management/updategroup.py | 11 +++++++++++ + management/useradd.py | 11 +++++++++++ + management/userdel.py | 11 +++++++++++ + management/userupdate.py | 11 +++++++++++ + 14 files changed, 154 insertions(+) + +commit 7e3332432774f8cf4d91b2956eb01bcfe3917f80 +Author: Jesse Andrews +Date: Sun May 22 18:37:16 2011 -0700 + + server.py/version.py shouldn't be executable while cli tools should + + keystone/server.py | 0 + keystone/version.py | 0 + management/delgroup.py | 85 +++++++++++++++++++------------------- + management/getgroup.py | 81 +++++++++++++++++++------------------ + management/getgroups.py | 75 +++++++++++++++++----------------- + management/getgroupusers.py | 79 ++++++++++++++++++------------------ + management/getuser.py | 75 +++++++++++++++++----------------- + management/getusergroups.py | 77 ++++++++++++++++++----------------- + management/getusers.py | 77 ++++++++++++++++++----------------- + management/groupadd.py | 81 +++++++++++++++++++------------------ + management/setuserlock.py | 99 +++++++++++++++++++++++---------------------- + management/setuserpswd.py | 83 ++++++++++++++++++------------------- + management/updategroup.py | 85 +++++++++++++++++++------------------- + management/useradd.py | 85 +++++++++++++++++++------------------- + management/userdel.py | 79 ++++++++++++++++++------------------ + management/userupdate.py | 83 ++++++++++++++++++------------------- + 16 files changed, 579 insertions(+), 565 deletions(-) + +commit b33f559137b808eac4cdd2c4b2a97b746ceaef24 +Author: Jesse Andrews +Date: Sun May 22 16:57:30 2011 -0700 + + spacing for readme + + README.md | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7fafabfa4a43099b6f6117d4007b8339bd338dba +Author: Ziad Sawalha +Date: Sat May 21 19:23:07 2011 -0500 + + Add keystone-manage to support bootstrapping Keystone with add user command + + bin/keystone | 2 +- + bin/keystone-admin | 2 +- + bin/keystone-auth | 2 +- + bin/keystone-manage | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + setup.py | 3 +- + 5 files changed, 96 insertions(+), 4 deletions(-) + +commit a99175d8ce8fcd7ef701322bd9eaedfd517b1e70 +Author: Ziad Sawalha +Date: Sat May 21 16:21:31 2011 -0500 + + Setup.py update + + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 88a8fadb1ba41d1027a34ca3b376b0bf0a95b982 +Author: Ziad Sawalha +Date: Sat May 21 16:18:42 2011 -0500 + + Updated logging and parameterization for bin scripts + + README.md | 34 ++++++++++++++++-------------- + bin/keystone | 38 +++++++++++++++++----------------- + bin/keystone-admin | 29 +++++++++++++------------- + bin/keystone-auth | 22 ++++++++------------ + etc/keystone.conf | 5 ++--- + keystone/common/config.py | 50 +++++++++++++++++++++++++++++++++++++-------- + keystone/common/template.py | 20 +++++++++++++++++- + keystone/common/wsgi.py | 28 +++++++++++++++++++++---- + 8 files changed, 146 insertions(+), 80 deletions(-) + +commit e0efc009900cbf909644b2b699f57abcfdd935b6 +Author: Ziad Sawalha +Date: Sat May 21 03:03:39 2011 -0500 + + Minor readme fixes + + README.md | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit a77b86cbe7b6d84563c68033af0f169843c1a6d2 +Author: Ziad Sawalha +Date: Sat May 21 03:01:41 2011 -0500 + + Simplified running Keystone and Updated readme + + README.md | 101 ++++++++-------------- + bin/keystone | 12 ++- + bin/keystone-admin | 5 +- + bin/keystone-auth | 5 +- + bin/keystone-control | 225 ------------------------------------------------ + keystone/common/wsgi.py | 3 + + 6 files changed, 55 insertions(+), 296 deletions(-) + +commit 85388cdd88f6d851e34ab6b54c072bdd97e52605 +Author: Ziad Sawalha +Date: Sat May 21 02:28:52 2011 -0500 + + v1 compatibility and Service/Admin API split + + README.md | 4 +- + bin/keystone | 216 ++++++++------------------------- + bin/keystone-admin | 67 ++++++++++ + bin/keystone-control | 6 +- + echo/echo/echo.ini | 4 +- + echo/echo/echo_basic.ini | 4 +- + etc/keystone.conf | 28 +++-- + keystone/auth_protocols/auth_token.ini | 2 +- + keystone/common/config.py | 5 +- + keystone/common/wsgi.py | 2 +- + keystone/keystone.ini | 16 --- + keystone/logic/types/auth.py | 17 +-- + keystone/logic/types/user.py | 25 ++-- + keystone/server.py | 128 ++++++++++++++++++- + keystone/utils.py | 35 +++++- + test/unit/test_authentication.py | 9 +- + test/unit/test_common.py | 37 ++++-- + 17 files changed, 352 insertions(+), 253 deletions(-) + +commit 1644192aa5c5f764d38a9f853dc9cad3521eceb9 +Merge: 4a74b25 84cd345 +Author: Ziad Sawalha +Date: Fri May 20 20:30:31 2011 -0700 + + Merge pull request #44 from yogirackspace/master + + Changes to update doc. + +commit 84cd345763004193b1eddf8577dafd7d25a59f1f +Author: Yogeshwar Srikrishnan +Date: Fri May 20 17:27:32 2011 -0500 + + DocBook Changes + + docs/guide/src/docbkx/identitydevguide.xml | 26 +++++++++----------------- + 1 file changed, 9 insertions(+), 17 deletions(-) + +commit 8e2713a6496657bcc9db2ebc5b60f08c4576655c +Merge: 7a20811 4a74b25 +Author: Yogeshwar Srikrishnan +Date: Fri May 20 17:02:58 2011 -0500 + + Merge remote branch 'khussein/master' + +commit 4a74b256f903d947258f74a4341fe203b562122c +Merge: c580c0b 91f3a86 +Author: Ziad Sawalha +Date: Fri May 20 16:59:42 2011 -0500 + + Merging HCL changes - pull 40 + +commit 7a2081109118e8f9fe910d9408d075cf6184ab59 +Author: Yogeshwar Srikrishnan +Date: Fri May 20 16:50:09 2011 -0500 + + Changes to support baseurls and roles on the document.Adding sample files. + + docs/guide/src/docbkx/samples/baseURL.json | 13 +++++++ + docs/guide/src/docbkx/samples/baseURL.xml | 13 +++++++ + docs/guide/src/docbkx/samples/baseURLRef.json | 6 ++++ + docs/guide/src/docbkx/samples/baseURLRef.xml | 4 +++ + docs/guide/src/docbkx/samples/baseURLRefs.json | 27 +++++++++++++++ + docs/guide/src/docbkx/samples/baseURLRefs.xml | 20 +++++++++++ + docs/guide/src/docbkx/samples/baseURLs.json | 48 ++++++++++++++++++++++++++ + docs/guide/src/docbkx/samples/baseURLs.xml | 47 +++++++++++++++++++++++++ + docs/guide/src/docbkx/samples/role.json | 7 ++++ + docs/guide/src/docbkx/samples/role.xml | 7 ++++ + docs/guide/src/docbkx/samples/roleRef.json | 7 ++++ + docs/guide/src/docbkx/samples/roleRef.xml | 4 +++ + docs/guide/src/docbkx/samples/roleRefs.json | 14 ++++++++ + docs/guide/src/docbkx/samples/roleRefs.xml | 9 +++++ + docs/guide/src/docbkx/samples/roles.json | 12 +++++++ + docs/guide/src/docbkx/samples/roles.xml | 12 +++++++ + 16 files changed, 250 insertions(+) + +commit 07fec74d977c34a8a5f79c50853bdf96950e5b4e +Author: Yogeshwar Srikrishnan +Date: Fri May 20 16:48:14 2011 -0500 + + Changes to support baseurls and roles on the document + + docs/guide/src/docbkx/identitydevguide.xml | 433 +++++++++++++++++++++++++++++ + docs/guide/src/docbkx/xsd/roles.xsd | 4 +- + 2 files changed, 435 insertions(+), 2 deletions(-) + +commit d2fd1667a9dc50917f556cd4f04d2bf2d975ec4d +Author: Yogeshwar Srikrishnan +Date: Fri May 20 15:35:31 2011 -0500 + + Adding xsds to support roles and baseurls + + docs/guide/src/docbkx/xsd/baseURLs.xsd | 186 +++++++++++++++++++++++++++++++++ + docs/guide/src/docbkx/xsd/roles.xsd | 95 +++++++++++++++++ + 2 files changed, 281 insertions(+) + +commit c580c0b03bfe620ff5b291dca54ba9eb58f71fab +Author: Ziad Sawalha +Date: Fri May 20 15:35:01 2011 -0500 + + More version fixes + + README.md | 4 +- + bin/keystone-auth | 2 + + docs/guide/src/docbkx/samples/extension.json | 2 +- + docs/guide/src/docbkx/samples/extension.xml | 4 +- + docs/guide/src/docbkx/samples/extensions.json | 10 +- + docs/guide/src/docbkx/samples/extensions.xml | 10 +- + docs/guide/src/docbkx/samples/identity_fault.json | 2 +- + docs/guide/src/docbkx/samples/identity_fault.xml | 4 +- + .../src/docbkx/samples/samplerequestheader.json | 2 +- + docs/guide/src/docbkx/samples/version-atom.xml | 8 +- + docs/guide/src/docbkx/samples/version.json | 4 +- + docs/guide/src/docbkx/samples/version.xml | 4 +- + docs/guide/src/docbkx/samples/versions-atom.xml | 2 +- + docs/guide/src/docbkx/xsd/api.xsd | 2 +- + docs/guide/src/docbkx/xsd/fault.xsd | 38 ++-- + docs/guide/src/docbkx/xsd/tenant.xsd | 8 +- + docs/guide/src/docbkx/xsd/token.xsd | 16 +- + keystone/common/wsgi.py | 2 +- + test/IdentitySOAPUI.xml | 218 ++++++++++----------- + test/unit/test_exthandler.py | 12 +- + test/unit/test_server.py | 2 +- + 21 files changed, 179 insertions(+), 177 deletions(-) + +commit 17a62b378d721bdf28fe1b21cdb25803cb807864 +Author: Yogeshwar Srikrishnan +Date: Fri May 20 15:08:08 2011 -0500 + + Initial commit + + .project | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 7b620258053a4d77f87c6d8e3cf0eac6bd07a508 +Author: Ziad Sawalha +Date: Fri May 20 14:40:59 2011 -0500 + + Make config compatible with legacy + + etc/keystone.conf | 2 +- + keystone/server.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 147eb197442f8dfcb0e7d675198b8f45377c57cd +Merge: 3426578 ff389cb +Author: Ziad Sawalha +Date: Fri May 20 12:12:37 2011 -0700 + + Merge pull request #42 from yogirackspace/master + + Changes to move the db settings to conf file. + +commit 34265788bbbbb03309d838ce32690597a095c75e +Author: Ziad Sawalha +Date: Fri May 20 14:00:02 2011 -0500 + + Move to v2.0 + + .gitignore | 2 +- + docs/guide/pom.xml | 2 +- + docs/guide/src/docbkx/identity.wadl | 355 +++++++ + docs/guide/src/docbkx/identitydevguide.xml | 1026 ++++++++++++++++++++ + docs/guide/src/docbkx/idm.wadl | 355 ------- + docs/guide/src/docbkx/idmdevguide.xml | 1018 ------------------- + docs/guide/src/docbkx/samples/auth.xml | 2 +- + docs/guide/src/docbkx/samples/auth_credentials.xml | 2 +- + docs/guide/src/docbkx/samples/choices.json | 34 +- + docs/guide/src/docbkx/samples/choices.xml | 12 +- + docs/guide/src/docbkx/samples/ext-getuser.xml | 4 +- + docs/guide/src/docbkx/samples/extension.json | 6 +- + docs/guide/src/docbkx/samples/extension.xml | 2 +- + docs/guide/src/docbkx/samples/extensions.json | 2 +- + docs/guide/src/docbkx/samples/extensions.xml | 2 +- + docs/guide/src/docbkx/samples/getuser-1.json | 2 +- + docs/guide/src/docbkx/samples/getuser-1.xml | 4 +- + docs/guide/src/docbkx/samples/identity_fault.json | 7 + + docs/guide/src/docbkx/samples/identity_fault.xml | 6 + + docs/guide/src/docbkx/samples/idm_fault.json | 7 - + docs/guide/src/docbkx/samples/idm_fault.xml | 6 - + docs/guide/src/docbkx/samples/item_not_found.xml | 2 +- + .../src/docbkx/samples/samplerequestheader.json | 2 +- + docs/guide/src/docbkx/samples/tenant.xml | 2 +- + docs/guide/src/docbkx/samples/tenantlock.xml | 2 +- + docs/guide/src/docbkx/samples/tenants-1.json | 2 +- + docs/guide/src/docbkx/samples/tenants-1.xml | 4 +- + docs/guide/src/docbkx/samples/tenants-2.json | 4 +- + docs/guide/src/docbkx/samples/tenants-2.xml | 6 +- + docs/guide/src/docbkx/samples/tenants-3.json | 2 +- + docs/guide/src/docbkx/samples/tenants-3.xml | 4 +- + docs/guide/src/docbkx/samples/tenants.xml | 2 +- + docs/guide/src/docbkx/samples/updatedtenant.xml | 2 +- + docs/guide/src/docbkx/samples/validatetoken.xml | 2 +- + docs/guide/src/docbkx/samples/version-atom.xml | 12 +- + docs/guide/src/docbkx/samples/version.json | 10 +- + docs/guide/src/docbkx/samples/version.xml | 10 +- + docs/guide/src/docbkx/samples/versions-atom.xml | 12 +- + docs/guide/src/docbkx/samples/versions.json | 4 +- + docs/guide/src/docbkx/samples/versions.xml | 4 +- + docs/guide/src/docbkx/xsd/api.xsd | 4 +- + docs/guide/src/docbkx/xsd/fault.xsd | 4 +- + docs/guide/src/docbkx/xsd/tenant.xsd | 4 +- + docs/guide/src/docbkx/xsd/token.xsd | 4 +- + echo/echo_client.py | 2 +- + keystone/auth_protocols/auth_token.py | 6 +- + keystone/content/extensions.xml | 2 +- + keystone/content/identitydevguide.pdf | Bin 0 -> 208102 bytes + keystone/content/idmdevguide.pdf | Bin 208102 -> 0 bytes + keystone/content/version.json.tpl | 12 +- + keystone/content/version.xml.tpl | 14 +- + keystone/logic/service.py | 12 +- + keystone/logic/types/auth.py | 6 +- + keystone/logic/types/fault.py | 32 +- + keystone/logic/types/tenant.py | 28 +- + keystone/logic/types/user.py | 10 +- + keystone/server.py | 86 +- + test/IdentitySOAPUI.xml | 110 +-- + test/unit/test_auth.py | 2 +- + test/unit/test_authentication.py | 12 +- + test/unit/test_common.py | 18 +- + test/unit/test_groups.py | 116 +-- + test/unit/test_server.py | 6 +- + test/unit/test_tenant_groups.py | 122 +-- + test/unit/test_tenants.py | 82 +- + test/unit/test_token.py | 12 +- + test/unit/test_users.py | 194 ++-- + 67 files changed, 1937 insertions(+), 1907 deletions(-) + +commit 6b7db2ec2c48eb8ff49a621197534681f0277d73 +Merge: 565223a 80681dc +Author: Ziad Sawalha +Date: Fri May 20 10:37:28 2011 -0700 + + Merge pull request #41 from RackerSilva/master + + Removing bottlepy + +commit ff389cbd08d9dcaeb4d311e801ac19f2384c0607 +Author: Yogeshwar Srikrishnan +Date: Tue May 17 15:33:34 2011 -0500 + + Changes to move the db settings to conf file. + + README.md | 4 +-- + etc/keystone.conf | 10 ++++++ + keystone/db/sqlalchemy/__init__.py | 24 -------------- + keystone/db/sqlalchemy/api.py | 58 +++++++++++++++++++++++++++++++++- + keystone/db/sqlalchemy/models.py | 28 ++++++----------- + keystone/db/sqlalchemy/session.py | 64 -------------------------------------- + keystone/server.py | 4 ++- + 7 files changed, 81 insertions(+), 111 deletions(-) + +commit 80681dcc2d0955ad7ae2aeac627392fc4f863f0a +Author: Alex Silva +Date: Tue May 17 10:05:35 2011 -0400 + + removing bottle + + test/unit/test_auth.py | 2 -- + 1 file changed, 2 deletions(-) + +commit c954a970c5d2baca3c1c0e82f7984c16a02531c6 +Author: Alex Silva +Date: Tue May 17 10:01:29 2011 -0400 + + Adding Accept header to is_xml_response logic + + keystone/server.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ce6bda75d45599de7a6846687bae6d9033e87657 +Author: Alex Silva +Date: Tue May 17 10:00:48 2011 -0400 + + Removing bottle dependencies + + test/unit/test_auth.py | 11 ++------- + test/unit/test_server.py | 62 +++++++++++++++++++----------------------------- + 2 files changed, 27 insertions(+), 46 deletions(-) + +commit 91f3a8685adc9933fb73349ad38d23d47d887551 +Author: Sai Krishna +Date: Mon May 16 22:57:42 2011 +0530 + + Mae Pylintrc, reordered imports made pep8 of the files + + keystone/logic/service.py | 10 +++++----- + keystone/logic/types/user.py | 2 +- + keystone/server.py | 7 ------- + keystone/utils.py | 21 --------------------- + test/unit/test_authentication.py | 33 +++++++++++++++++++++++++++------ + test/unit/test_common.py | 34 +++++++++++++++++++++++++--------- + test/unit/test_groups.py | 26 ++++++++++++++++++++++---- + test/unit/test_keystone.py | 3 ++- + test/unit/test_tenant_groups.py | 24 ++++++++++++++++++++---- + test/unit/test_tenants.py | 27 +++++++++++++++++++++------ + test/unit/test_token.py | 25 +++++++++++++++++++++---- + test/unit/test_users.py | 32 ++++++++++++++++++++++++-------- + test/unit/test_version.py | 21 +++++++++++++++++++-- + 13 files changed, 187 insertions(+), 78 deletions(-) + +commit 157f8c6ad7bb067e6cffac7c9ae203ad0e632f11 +Author: Alex Silva +Date: Mon May 16 10:54:58 2011 -0400 + + Foundation for some server and auth unit tests + + test/unit/test_auth.py | 43 +++++++++++++++++++++ + test/unit/test_server.py | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 141 insertions(+) + +commit 11d22448a9b3960a468a1a4ec82657495d39e6b7 +Merge: cdacf85 04c2f95 +Author: Sai Krishna +Date: Mon May 16 19:51:14 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + + Conflicts: + test/unit/test_groups.py + +commit cdacf853221f18ee3cb4d75f35a63f9da979a8fa +Author: Sai Krishna +Date: Mon May 16 19:49:18 2011 +0530 + + Added as per HACKING Files + + keystone/logic/types/auth.py | 7 +++---- + test/unit/test_authentication.py | 18 +++++++++--------- + test/unit/test_groups.py | 19 ++++++++++--------- + test/unit/test_keystone.py | 3 ++- + test/unit/test_users.py | 6 +++--- + 5 files changed, 27 insertions(+), 26 deletions(-) + +commit 04c2f955bbe82b5b8fe9a132c9fc9bdc8abc19a6 +Author: sirish.bitra +Date: Mon May 16 19:28:39 2011 +0530 + + pylint fixes + + test/unit/test_common.py | 5 +- + test/unit/test_groups.py | 281 +++++++++++++++-------------------------------- + 2 files changed, 91 insertions(+), 195 deletions(-) + +commit 2053f355faf44699afe15a6213db628b436b77a4 +Author: sirish.bitra +Date: Mon May 16 18:37:46 2011 +0530 + + fixes + + test/unit/test_common.py | 1 + + test/unit/test_groups.py | 42 +++++++++++++++++++++++++++++------------ + test/unit/test_tenant_groups.py | 21 +++++++++++++++++---- + test/unit/test_tenants.py | 14 +++++++++++--- + test/unit/test_users.py | 15 +++++++++++---- + 5 files changed, 70 insertions(+), 23 deletions(-) + +commit f299f603fa65d6aa22425d58328499de847335ef +Author: jabdul +Date: Mon May 16 16:27:35 2011 +0530 + + fixed test cases + + test/unit/test_groups.py | 8 ++--- + test/unit/test_tenant_groups.py | 78 ++++++++++++++++++++--------------------- + test/unit/test_tenants.py | 14 ++++---- + 3 files changed, 50 insertions(+), 50 deletions(-) + +commit 298e7e82842d3b2edbd35fb61ef3ccac91362307 +Merge: 386be87 969247d +Author: jabdul +Date: Mon May 16 15:46:03 2011 +0530 + + Merged api,service,server,test_common + +commit 386be87914087743a52cc6ede3b244e2338d9c5c +Author: jabdul +Date: Mon May 16 15:38:26 2011 +0530 + + Added test cases for add user to a tenanat + + keystone/db/sqlalchemy/api.py | 11 +- + keystone/logic/service.py | 10 +- + keystone/server.py | 4 +- + test/unit/test_common.py | 43 ++++++-- + test/unit/test_users.py | 248 +++++++++++++++++++++++++++++++++++++++++- + 5 files changed, 290 insertions(+), 26 deletions(-) + +commit 969247d0d52bbf537d2bbc1d7cb71847b422c39a +Merge: 647d4bb 191e037 +Author: sirish.bitra +Date: Mon May 16 15:35:49 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + +commit 647d4bb99cb48789947d2840ca50f8af3dd07c6f +Author: sirish.bitra +Date: Mon May 16 15:35:34 2011 +0530 + + multi token test cases and bug fixes + + keystone/db/sqlalchemy/api.py | 9 +----- + keystone/logic/service.py | 11 ++++---- + test/unit/test_authentication.py | 59 +++++++++++++++++++++++++++++++++++----- + test/unit/test_common.py | 44 +++++++++++++++++++++++------- + test/unit/test_token.py | 7 +++-- + 5 files changed, 97 insertions(+), 33 deletions(-) + +commit 191e0377d5bf02bf1d53c044624e300767e510da +Author: Sai Krishna +Date: Mon May 16 15:22:07 2011 +0530 + + Moved all Server functions to utils.py + + keystone/server.py | 350 ++++++++++++++++++----------------------------- + keystone/utils.py | 152 ++++++++++++++++++++ + test/unit/test_groups.py | 2 +- + 3 files changed, 284 insertions(+), 220 deletions(-) + +commit 61d7addeaf56867a4d1b124bd289e340e9a2e5c9 +Merge: 46cb1d5 565223a +Author: Sai Krishna +Date: Mon May 16 10:22:35 2011 +0530 + + Merge branch 'github/master' + + Conflicts: + keystone/logic/service.py + +commit 565223a519c5f9a24973cacd7a1728e1130dbf73 +Author: Ziad Sawalha +Date: Sun May 15 01:52:58 2011 -0500 + + Fixed failing test - bug introduced in cleanup + + keystone/logic/service.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 4992d0082d229ccd6f8820987691cb8623278f88 +Author: Ziad Sawalha +Date: Sun May 15 01:44:08 2011 -0500 + + Added pylint and cleanup from last commit + + bin/keystone | 4 ++-- + etc/keystone.conf | 14 ++++---------- + keystone/db/sqlalchemy/api.py | 1 + + keystone/logic/service.py | 9 ++++----- + keystone/queryext/exthandler.py | 2 -- + keystone/server.py | 9 ++++----- + pip-requires | 1 - + pylintrc | 38 ++++++++++++++++++++++++++++++++++++++ + 8 files changed, 53 insertions(+), 25 deletions(-) + +commit d0447d4aba2b0fc00e5cd057484d5f0c1c5ce7e2 +Author: Ziad Sawalha +Date: Sat May 14 23:14:51 2011 -0500 + + Merged pull 37. Removes bottle, adds configuration, and adds daemonization + + HACKING | 29 ++++-- + README | 179 -------------------------------- + README.md | 161 ++++++++++++++++++++++++++++ + bin/keystoned | 26 ----- + docs/guide/src/docbkx/xsd/atom/atom.xsd | 10 +- + keystone/common/config.py | 5 +- + keystone/common/exception.py | 4 +- + keystone/common/template.py | 45 ++++++-- + keystone/logic/service.py | 26 ++--- + keystone/logic/types/auth.py | 3 +- + keystone/logic/types/tenant.py | 3 +- + keystone/server.py | 7 +- + pip-requires | 2 +- + 13 files changed, 241 insertions(+), 259 deletions(-) + +commit 46cb1d53d0ee46ea6d68a8430843dbe468624e91 +Author: sirish.bitra +Date: Fri May 13 20:40:25 2011 +0530 + + fixed pylint + + test/unit/test_authentication.py | 2 +- + test/unit/test_groups.py | 491 +++++++++++++++++++++------------------ + test/unit/test_tenant_groups.py | 18 +- + test/unit/test_tenants.py | 12 +- + test/unit/test_token.py | 2 +- + test/unit/test_users.py | 18 +- + test/unit/test_version.py | 2 +- + 7 files changed, 293 insertions(+), 252 deletions(-) + +commit 81995629d9af3b0dde2bccde84ddf5b54277b441 +Author: sirish.bitra +Date: Fri May 13 19:54:34 2011 +0530 + + fixed bugs + + keystone/db/sqlalchemy/api.py | 2 +- + keystone/logic/service.py | 21 ++++++++++++++------- + keystone/logic/types/auth.py | 19 ++++++++++++++++--- + test/unit/test_authentication.py | 17 ++++++++++------- + test/unit/test_common.py | 38 ++++++++++++++++++++++++++------------ + test/unit/test_groups.py | 20 ++++++++++++-------- + test/unit/test_tenant_groups.py | 11 ++++++----- + test/unit/test_tenants.py | 3 ++- + test/unit/test_token.py | 2 +- + 9 files changed, 88 insertions(+), 45 deletions(-) + +commit 2bb3e9624ba6b3794b21a572d0eb7b4345aa36ba +Merge: 519422f 1c03563 +Author: sirish.bitra +Date: Fri May 13 17:24:01 2011 +0530 + + fixes + +commit 519422fc38e90de6e61ff477a784fd5c11794121 +Author: sirish.bitra +Date: Fri May 13 17:22:53 2011 +0530 + + fixes + + keystone/logic/service.py | 1 - + 1 file changed, 1 deletion(-) + +commit 9fb576258ada12e1d635f5ab01147b3bf8f8b077 +Merge: 334d985 7798959 +Author: sirish.bitra +Date: Fri May 13 17:13:59 2011 +0530 + + removed backslashes + +commit 1c03563aaf5635d074a4e6a8999810fe122e0895 +Author: jabdul +Date: Fri May 13 17:13:15 2011 +0530 + + Added functionality add user to a tenant + + keystone/db/sqlalchemy/api.py | 24 +++++++++++++++-------- + keystone/logic/service.py | 45 ++++++++++++++++++++++++++++++++++--------- + keystone/server.py | 9 +++++++++ + 3 files changed, 61 insertions(+), 17 deletions(-) + +commit 334d985be7e8333017eb366b743781f7724fdec5 +Author: sirish.bitra +Date: Fri May 13 17:11:40 2011 +0530 + + fixes + + test/unit/test_users.py | 374 ++++++++++++++++++++++++------------------------ + 1 file changed, 186 insertions(+), 188 deletions(-) + +commit 77989598aed6f0077a4ffcab35ecd6f9ae675ee3 +Author: jabdul +Date: Fri May 13 11:28:22 2011 +0530 + + Pep8 test_users.py + + test/unit/test_users.py | 374 ++++++++++++++++++++++++------------------------ + 1 file changed, 187 insertions(+), 187 deletions(-) + +commit ce4c23bafbd50785b980eb496ac9f1658638869d +Merge: 921e981 a3d6a8d +Author: jabdul +Date: Fri May 13 10:09:00 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + +commit a3d6a8d8b9657efa6fbd9874467b63329a734ea5 +Author: Ramana Juvvadi +Date: Thu May 12 10:43:52 2011 -0500 + + checking SSLv3 problems + + README | 3 +++ + 1 file changed, 3 insertions(+) + +commit 6a3451555a29937552c9445968d67d4cd56a0b0b +Author: Ramana Juvvadi +Date: Thu May 12 10:40:50 2011 -0500 + + checking SSLv3 problems + + README | 2 ++ + 1 file changed, 2 insertions(+) + +commit a3335e9b0a7e007bef604a0b515dc239654d7233 +Author: Ramana Juvvadi +Date: Thu May 12 10:35:46 2011 -0500 + + checking SSLv3 problems + + README | 9 --------- + 1 file changed, 9 deletions(-) + +commit 921e981a1e18bb45033b7565026f58cb3ea7293e +Merge: b96d171 1b4fc95 +Author: jabdul +Date: Thu May 12 20:28:40 2011 +0530 + + Merge branch test_users and test_common + + Conflicts: + test/unit/test_common.py + test/unit/test_users.py + +commit 7fd800780f109ed73d678e1d3c4cb2ec7d29f252 +Author: Ramana Juvvadi +Date: Thu May 12 09:56:27 2011 -0500 + + checking git push problems + + README | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit b96d1716ff0057dcfe4905fef6d598160a23157c +Author: jabdul +Date: Thu May 12 20:09:15 2011 +0530 + + Optimised test_users.py + + test/unit/test_common.py | 195 ++++++- + test/unit/test_users.py | 1356 ++++++++++++++++++---------------------------- + 2 files changed, 693 insertions(+), 858 deletions(-) + +commit 8ceb100d94bea60db77d32bd1e09d6f8fb951ed3 +Merge: efaab73 1b4fc95 +Author: Ramana Juvvadi +Date: Thu May 12 09:02:59 2011 -0500 + + Merge branch 'master' of https://git.hcleai.com/keystone + +commit efaab7304b36ca4dab9ca08e2df7d2ffd75d5d3b +Author: Ramana Juvvadi +Date: Thu May 12 09:00:36 2011 -0500 + + Modified the README and README.md + + README | 59 ++++++++++++++++---------------- + README.md | 113 -------------------------------------------------------------- + 2 files changed, 30 insertions(+), 142 deletions(-) + +commit 1b4fc952f27a292a3f164e42b17d81b1be8bb596 +Merge: 3c018e4 81443df +Author: sirish.bitra +Date: Thu May 12 19:23:42 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + +commit 3c018e49ea1ed883b114fddc8a9d6fcd15456761 +Author: sirish.bitra +Date: Thu May 12 19:23:24 2011 +0530 + + fixed bug raised when included exthandler + + test/unit/test_keystone.py | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 81443dffc3967be0f3c484c273ddc8c84abb626f +Merge: 140387c bbed892 +Author: Sai Krishna +Date: Thu May 12 19:22:02 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + +commit 140387c5d1124f75f7d1e95de39e19a87f6a2fa5 +Author: Sai Krishna +Date: Thu May 12 19:21:41 2011 +0530 + + Removed unwanted file + + keystone/file | 242 ---------------------------------------------------------- + 1 file changed, 242 deletions(-) + +commit bbed8921549de9951099ea7c5053692a7951ae97 +Merge: 6457b72 42e8bf2 +Author: sirish.bitra +Date: Thu May 12 19:07:45 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + + Conflicts: + test/unit/test_authentication.py + test/unit/test_groups.py + test/unit/test_tenant_groups.py + test/unit/test_tenants.py + test/unit/test_token.py + test/unit/test_users.py + test/unit/test_version.py + +commit 6457b72ed03970c0fbd3b8000fa4619d8964edcd +Author: sirish.bitra +Date: Thu May 12 19:01:57 2011 +0530 + + removed unused run method + + setup.py | 2 +- + test/unit/test_authentication.py | 6 ++---- + test/unit/test_groups.py | 3 --- + test/unit/test_tenant_groups.py | 3 --- + test/unit/test_tenants.py | 3 --- + test/unit/test_token.py | 1 - + test/unit/test_users.py | 3 --- + test/unit/test_version.py | 2 -- + 8 files changed, 3 insertions(+), 20 deletions(-) + +commit 42e8bf272ab15998191617bc902d1a10627f7d65 +Author: Adipudi Praveena +Date: Thu May 12 18:42:53 2011 +0530 + + Added PEP8 to test cases + + test/unit/test_authentication.py | 5 +- + test/unit/test_common.py | 4 +- + test/unit/test_exthandler.py | 6 +-- + test/unit/test_groups.py | 12 +++-- + test/unit/test_tenant_groups.py | 103 ++++++++++++++++++--------------------- + test/unit/test_tenants.py | 42 ++++++++-------- + test/unit/test_token.py | 2 +- + test/unit/test_users.py | 4 +- + test/unit/test_version.py | 2 +- + 9 files changed, 90 insertions(+), 90 deletions(-) + +commit e4f2a0a89f17d79c9e4577a0feac2fe507fd9f83 +Merge: 11e6bf8 d5ce3e5 +Author: Sai Krishna +Date: Thu May 12 17:20:41 2011 +0530 + + Merge remote branch 'github/master' + Merged conflicts but added README.md, need to verify if this is needed + Conflicts: + README.md + keystone/logic/service.py + +commit 11e6bf86962c98540e0c6a19832e6544c55f8ffe +Author: Sai Krishna +Date: Thu May 12 17:10:37 2011 +0530 + + Removed importing objects from keystone + + keystone/pylintrc | 38 ----- + pylintrc | 38 ----- + test/unit/test_authentication.py | 48 +++--- + test/unit/test_groups.py | 358 +++++++++++++++++++-------------------- + 4 files changed, 201 insertions(+), 281 deletions(-) + +commit 37cf02db921dd2cc61e35c421de98e74eb43ed6e +Merge: e199cb4 8c813e9 +Author: Sai Krishna +Date: Thu May 12 17:07:36 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + +commit 8c813e9a92d041cc94ea1948a385e57256fceead +Author: sirish.bitra +Date: Thu May 12 17:06:34 2011 +0530 + + pylintrc optimization + + test/unit/test_tenant_groups.py | 533 +++++++++++++++++++++------------------- + test/unit/test_tenants.py | 185 +++++++------- + test/unit/test_token.py | 47 ++-- + test/unit/test_version.py | 11 +- + 4 files changed, 403 insertions(+), 373 deletions(-) + +commit e199cb4541a70709d94deab86657bbde487037e6 +Merge: c98c32d a0c43a0 +Author: Sai Krishna +Date: Thu May 12 16:34:38 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + + Conflicts: + README + +commit a0c43a05126d9cca83b58b788fbc8e24f004fb66 +Author: sirish.bitra +Date: Thu May 12 16:31:26 2011 +0530 + + optimization of test cases and handling multi token + + keystone/db/sqlalchemy/api.py | 7 + + keystone/logic/service.py | 23 +- + test/unit/test_authentication.py | 30 ++- + test/unit/test_common.py | 174 +++++++------ + test/unit/test_groups.py | 3 +- + test/unit/test_keystone.py | 4 - + test/unit/test_tenant_groups.py | 536 +++++++++++++++++++-------------------- + test/unit/test_tenants.py | 188 +++++++------- + test/unit/test_token.py | 34 ++- + test/unit/test_users.py | 371 ++++++++++++++------------- + test/unit/test_version.py | 27 +- + 11 files changed, 692 insertions(+), 705 deletions(-) + +commit 2ca38cc417e103b3364058cc92fa6eea8a96563c +Merge: d0ab5fb 7424db6 +Author: sirish.bitra +Date: Thu May 12 08:55:15 2011 +0530 + + fixes + +commit c98c32d0f1ee4d6f2fd13fad37e9abd0e8801362 +Author: Sai Krishna +Date: Thu May 12 05:47:23 2011 +0530 + + Nochanges + + README | 8 +- + keystone.log | 20860 --------------------------------------------------------- + 2 files changed, 4 insertions(+), 20864 deletions(-) + +commit 7424db60b25a45e84a0fe7481d6eca5ea94e835c +Author: Ramana Juvvadi +Date: Wed May 11 10:50:24 2011 -0500 + + Modified the README for keystone-control issue + + README | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 661554710e87b304e854acc3e2ffc5b778464253 +Merge: 00b602d 7e45922 +Author: Ramana Juvvadi +Date: Wed May 11 09:58:33 2011 -0500 + + Merge branch 'master' of https://git.hcleai.com/keystone + +commit 00b602d67df6074e84acbae635314177f1db50a3 +Author: Ramana Juvvadi +Date: Wed May 11 09:57:48 2011 -0500 + + Modified the README + + README | 85 +- + keystone.log | 20860 --------------------------------------------------------- + 2 files changed, 36 insertions(+), 20909 deletions(-) + +commit 7e4592215f2ce6cd6c3029d8df31d94b69b55095 +Merge: 259d0db 5d8735b +Author: Sai Krishna +Date: Wed May 11 20:24:40 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + + Conflicts: + test/unit/test_tenants.py + +commit 259d0dbc65db8f75e7130795ecd5d54eef5eab71 +Author: Sai Krishna +Date: Wed May 11 20:22:18 2011 +0530 + + Added PEP8 for remaining test cases + + test/unit/test_tenant_groups.py | 101 ++++++------- + test/unit/test_tenants.py | 16 +- + test/unit/test_token.py | 3 +- + test/unit/test_users.py | 321 ++++++++++++++++++++-------------------- + test/unit/test_version.py | 5 +- + 5 files changed, 212 insertions(+), 234 deletions(-) + +commit 5d8735bb3788102eb263f7b18001a3080338a96a +Merge: 81ea900 5582f32 +Author: Adipudi Praveena +Date: Wed May 11 20:10:24 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + + Conflicts: + keystone.log + test/unit/test_common.py + +commit 81ea90027fda08b60ed20aa0bfa7873bbcdaa972 +Author: Adipudi Praveena +Date: Wed May 11 20:09:22 2011 +0530 + + PEP8 for test cases by praveena + + keystone.log | 10942 +++++++++++++++++++++++++++++++++++++ + test/unit/test_authentication.py | 2 +- + test/unit/test_common.py | 72 +- + test/unit/test_groups.py | 299 +- + test/unit/test_identity.py | 11 +- + test/unit/test_tenants.py | 19 +- + 6 files changed, 11132 insertions(+), 213 deletions(-) + +commit 5582f323419e91eab7b5000b3b5fe907387730e9 +Merge: dcedc4d 494d1bb +Author: Ramana Juvvadi +Date: Wed May 11 08:53:18 2011 -0500 + + Merge branch 'master' of https://git.hcleai.com/keystone + + recommitted .gitignore + + Conflicts: + .gitignore + keystone.log + +commit d0ab5fb0c562b90da74bcf3402fe4ef6008fd887 +Merge: e882eda 494d1bb +Author: sirish.bitra +Date: Wed May 11 19:22:43 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + +commit dcedc4d40147a018cbd39fa5a6d1cac8cf0815b6 +Author: Ramana Juvvadi +Date: Wed May 11 08:51:00 2011 -0500 + + renamed test_identity.py to test_keystone + + .gitignore | 3 +++ + test/unit/test_common.py | 1 - + test/unit/test_identity.py | 54 ---------------------------------------------- + test/unit/test_keystone.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 57 insertions(+), 55 deletions(-) + +commit a24be931380ecc3767cf7b07ae052f3dcdd9a89b +Author: Ramana Juvvadi +Date: Wed May 11 08:46:57 2011 -0500 + + added pidfile and removed print statement from test_common + + pidfile | 1 - + 1 file changed, 1 deletion(-) + +commit e882eda53713f24a35028bdb2101ef42a886ef17 +Merge: 19db71d 9dc0e8d +Author: sirish.bitra +Date: Wed May 11 19:12:12 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + +commit 19db71d8019e16f5e4c9bebcfa53d3828a25a4f0 +Merge: b7214f4 b9ab7c8 +Author: sirish.bitra +Date: Wed May 11 19:12:04 2011 +0530 + + fixes + +commit 494d1bb57d1abde666abd18942e3742d2251d5ee +Author: Sai Krishna +Date: Wed May 11 19:11:11 2011 +0530 + + removed print statement + + keystone.log | 1560 ++++++++++++++++++++++++++++++++++++++++++++++ + test/unit/test_common.py | 1 - + 2 files changed, 1560 insertions(+), 1 deletion(-) + +commit b80a8223a7e198a71b82b75507710ea85e76e0b2 +Merge: 9472554 b9ab7c8 +Author: Ramana Juvvadi +Date: Wed May 11 08:38:44 2011 -0500 + + Merge branch 'master' of https://git.hcleai.com/keystone + removed it + + Conflicts: + keystone.log + +commit b7214f4d30f099ac2ebdc8ccbe7ecd843303963c +Merge: fa0fc94 fdc8f67 +Author: sirish.bitra +Date: Wed May 11 19:06:36 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + test fixes + Conflicts: + keystone.log + test/unit/test_identity.py + +commit 9dc0e8d62dfd757231e1507dba9a2b7138ae1337 +Author: Sai Krishna +Date: Wed May 11 19:06:33 2011 +0530 + + Added keystone.log to ignore list + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit b9ab7c850dc693dbc008efc433999c58a2dafe20 +Author: Sai Krishna +Date: Wed May 11 19:03:19 2011 +0530 + + Modified server.py tenant group URL to fix failing test cases + + keystone.log | 3428 +++++++++++++++++++++++++++++++++++++++ + keystone/server.py | 8 +- + test/unit/test_common.py | 33 +- + test/unit/test_tenant_groups.py | 180 +- + 4 files changed, 3540 insertions(+), 109 deletions(-) + +commit 947255476db201c4254a2aeef1629eb353b42d2b +Author: Ramana Juvvadi +Date: Wed May 11 08:15:35 2011 -0500 + + Added *.log to gitignore + + keystone.log | 9918 ---------------------------------------------------------- + 1 file changed, 9918 deletions(-) + +commit fa0fc94facd1c8ce976693a61ffcb197f61f8c81 +Author: sirish.bitra +Date: Wed May 11 18:16:12 2011 +0530 + + neglect changes + + keystone.log | 84328 +++++++++++++++++++++++++++++++++++++ + test/unit/test_authentication.py | 3 + + test/unit/test_groups.py | 4 + + test/unit/test_identity.py | 9444 +---- + test/unit/test_tenant_groups.py | 3 + + test/unit/test_tenants.py | 3 + + test/unit/test_token.py | 3 + + test/unit/test_users.py | 3 + + test/unit/test_version.py | 3 + + 9 files changed, 84399 insertions(+), 9395 deletions(-) + +commit fdc8f67be79cf399235f7a272176081061e0d588 +Author: Sai Krishna +Date: Wed May 11 18:12:09 2011 +0530 + + Added new script to run all tests + + keystone.log | 4916 +++++++++++++++++++++++ + test/unit/test_identity.py | 9446 +------------------------------------------- + 2 files changed, 4966 insertions(+), 9396 deletions(-) + +commit 5ef1c5b04e7404bef5652437bf0a8108aac62e17 +Author: Sai Krishna +Date: Wed May 11 18:02:24 2011 +0530 + + Modified and tests. Tests groups throwing some minor errors still + + etc/keystone.conf | 2 +- + keystone.log | 4983 +++++++++++++++++++++++++++++++++++++++++++++ + keystone/logic/service.py | 4 +- + test/unit/test_token.py | 10 +- + 4 files changed, 4991 insertions(+), 8 deletions(-) + +commit 6ee2bf8ff6184a94aa12ba1fe8e129997aec09db +Merge: 157a426 1daef1f +Author: Sai Krishna +Date: Wed May 11 17:50:35 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + Orangized the code and made PEP8 complaint + The whole of keystone uses now glance framework + Conflicts: + etc/keystone.conf + +commit 1daef1f7f6bbf79fc7b65fd2265d69701fd5f105 +Merge: fe3f343 0175ab7 +Author: Adipudi Praveena +Date: Wed May 11 16:59:44 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + Resolved Conflicts with Sirish' and Abdul's Merge + Conflicts: + keystone/db/sqlalchemy/api.py + keystone/server.py + +commit fe3f343572b55b95ff456eb11dd3211ade8a285b +Author: Adipudi Praveena +Date: Wed May 11 16:43:59 2011 +0530 + + Modified and commented the code + + bin/keystone | 2 +- + keystone/auth_protocols/auth_basic.py | 8 +- + keystone/common/config.py | 2 +- + keystone/db/sqlalchemy/api.py | 250 +++++++++++++++------------------- + keystone/db/sqlalchemy/session.py | 8 +- + keystone/logic/types/atom.py | 16 +-- + keystone/logic/types/fault.py | 14 +- + keystone/logic/types/tenant.py | 30 ++-- + keystone/logic/types/user.py | 104 +++++++------- + keystone/server.py | 47 +++++-- + keystone/version.py | 6 +- + 11 files changed, 240 insertions(+), 247 deletions(-) + +commit 0175ab7d74c83f9aa053a48777dca8180bec0f44 +Author: sirish.bitra +Date: Wed May 11 16:41:11 2011 +0530 + + Split the test cases into individual files + Fixed Bugs of api + + keystone/db/sqlalchemy/api.py | 119 +- + keystone/logic/service.py | 19 +- + keystone/logic/types/user.py | 2 +- + keystone/server.py | 8 +- + test/unit/test_authentication.py | 109 ++ + test/unit/test_common.py | 438 +++++ + test/unit/test_groups.py | 1041 +++++++++++ + test/unit/test_identity.py | 3693 +++++++++++++++++++++++++++++++++++--- + test/unit/test_tenant_groups.py | 1213 +++++++++++++ + test/unit/test_tenants.py | 643 +++++++ + test/unit/test_token.py | 119 ++ + test/unit/test_users.py | 1638 +++++++++++++++++ + test/unit/test_version.py | 39 + + 13 files changed, 8699 insertions(+), 382 deletions(-) + +commit a8381d77fd8ba4fece06a51b2d278f11c6a28157 +Author: Adipudi Praveena +Date: Wed May 11 12:46:09 2011 +0530 + + Made PEP8 of server + + keystone/server.py | 378 +++++++++++++++++++++++++++++------------------------ + 1 file changed, 208 insertions(+), 170 deletions(-) + +commit 2f99d9238719c9376b069e7ef0f03127bb74bab6 +Merge: 01a10fe 91c82cf +Author: Ramana Juvvadi +Date: Wed May 11 00:53:14 2011 -0500 + + Too much of duplication and incomplete conflict resolution in test_identity.py + + Merge branch 'master' of https://git.hcleai.com/keystone + + Conflicts: + keystone/auth_server.py + test/unit/test_identity.py + +commit 01a10feab730567e4181d803ac8f4c0858fe9830 +Author: Ramana Juvvadi +Date: Wed May 11 00:12:02 2011 -0500 + + Sisirhs changes + + keystone/server.py | 212 +++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 132 insertions(+), 80 deletions(-) + +commit 22a07c1aea02ffad979c03657df4f6036ba3d4b3 +Merge: 87621d8 b5194e3 +Author: Ramana Juvvadi +Date: Wed May 11 00:10:29 2011 -0500 + + Merge branch 'sirish' of https://git.hcleai.com/keystone + + Conflicts: + README.auth-server + keystone/auth_server.py + test/unit/test_identity.py + +commit 87621d84a0af828a4d7fdd5c1360991d1617f851 +Merge: f7f36ee bfffddf +Author: Ramana Juvvadi +Date: Tue May 10 18:03:55 2011 -0500 + + Merge branch 'praveena' + + Conflicts: + keystone/auth_server.py + +commit f7f36ee97941bf2f7497dbaf0be6b00f4c3a05dd +Author: Ramana Juvvadi +Date: Tue May 10 17:11:31 2011 -0500 + + Sai and Praveena's Changes + + etc/logging.cnf | 49 ++++++++++++++++++ + keystone/auth_server.py | 105 ++++++++++++++++++-------------------- + keystone/common/config.py | 1 - + keystone/db/sqlalchemy/session.py | 1 - + test/unit/test_identity.py | 2 +- + 5 files changed, 99 insertions(+), 59 deletions(-) + +commit 91c82cfcefd8d0a7719dfbcca6c3e50ec438d074 +Merge: 5aa65ad 3b1cdf2 +Author: jabdul +Date: Wed May 11 00:20:48 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + + Conflicts: + test/unit/test_identity.py + +commit 5aa65ad3b71043ae9b9b4bfbc568369d0266fe6b +Merge: 794ca33 8d26526 +Author: jabdul +Date: Wed May 11 00:14:32 2011 +0530 + + Merge branch 'abdul' of https://git.hcleai.com/keystone + + Conflicts: + bin/keystone-auth + setup.py + +commit 794ca334efbfd4ef473f3411db0f668c6fa62f31 +Author: jabdul +Date: Wed May 11 00:10:19 2011 +0530 + + Added missing tests, mad e enable and disable password work + + keystone/auth_server.py | 13 +- + keystone/db/sqlalchemy/api.py | 31 +- + keystone/logic/service.py | 27 +- + keystone/logic/types/user.py | 11 +- + test/unit/test_identity.py | 3785 ++++++++++++++++++++++++++++++----------- + 5 files changed, 2831 insertions(+), 1036 deletions(-) + +commit b5194e3b96224b27924d0da8234a3b890a13f069 +Merge: 5a96d71 400ad67 +Author: sirish.bitra +Date: Tue May 10 22:11:29 2011 +0530 + + merged conflicts + +commit 5a96d717f9b8b43c1fed558fafd573c1886e024c +Author: sirish.bitra +Date: Tue May 10 22:07:23 2011 +0530 + + test cases modfications and bug fixes + + README.auth-server | 10 +- + keystone/auth_server.py | 111 +- + keystone/db/sqlalchemy/api.py | 35 +- + keystone/logic/service.py | 34 +- + keystone/logic/types/tenant.py | 103 +- + pidfile | 2 +- + test/unit/test_identity.py | 2622 +++++++++++++++++++++++++--------------- + 7 files changed, 1879 insertions(+), 1038 deletions(-) + +commit bfffddfde3fd849f1d1be31aa0984740308a749f +Merge: 3b1cdf2 f4a85e7 +Author: Ramana Juvvadi +Date: Tue May 10 11:18:54 2011 -0500 + + Merge branch 'praveena' of https://git.hcleai.com/keystone into praveena + +commit f4a85e7725a58192a7a5c394b610748e60c714d6 +Author: Adipudi Praveena +Date: Tue May 10 20:23:00 2011 +0530 + + Renamed to server.py and added top dir in config + + keystone/common/config.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ebeda76d08632b3a43d387e8c489dfffb65009ee +Author: Adipudi Praveena +Date: Tue May 10 20:20:16 2011 +0530 + + Added the keystone top dir in configuration + + bin/keystone-auth | 2 +- + etc/keystone.conf | 6 +- + keystone/auth_server.py | 639 ---------------------------------- + keystone/common/config.py | 39 ++- + keystone/server.py | 849 +++++++++++++++++++++++++++++---------------- + setup.py | 18 +- + test/unit/test_identity.py | 2 +- + 7 files changed, 583 insertions(+), 972 deletions(-) + +commit 3b1cdf2ab31e47b020ffa9af36f9593290b043f8 +Author: Ramana Juvvadi +Date: Tue May 10 08:54:12 2011 -0500 + + Modified the README + + README | 205 +++++++++++++++++++++++++++++++++++++++++++++ + README.auth-server | 62 -------------- + README.md | 163 ----------------------------------- + etc/keystone.conf | 4 +- + test/unit/test_identity.py | 1 - + 5 files changed, 208 insertions(+), 227 deletions(-) + +commit 33920faf06eac5195bf2e3d15b99c8866cb4e3a5 +Merge: a52b325 c4cfe98 +Author: sirish.bitra +Date: Tue May 10 12:17:25 2011 +0530 + + latest updates + +commit a52b325d18cdd2299a86821827262976604e21bf +Author: sirish.bitra +Date: Tue May 10 12:07:19 2011 +0530 + + latest updates + + test/unit/test_identity.py | 866 ++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 770 insertions(+), 96 deletions(-) + +commit 157a42626fa6706b3945f279583260783354969a +Merge: 331e8ad c4cfe98 +Author: Sai Krishna +Date: Tue May 10 12:01:46 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + +commit 8b65c4794c14a42fe50b6dfed110cdd98833741c +Author: sirish.bitra +Date: Tue May 10 09:33:46 2011 +0530 + + new merge with installation fixes + + README.auth-server | 62 +++++++++ + bin/keystone-auth | 65 ++++++++++ + bin/keystone-control | 225 ++++++++++++++++++++++++++++++++ + bin/scripts/keystone-control | 66 ---------- + keystone/auth_server.py | 21 ++- + keystone/common/template.py | 25 ++-- + keystone/logic/service.py | 287 ----------------------------------------- + keystone/logic/types/tenant.py | 12 ++ + keystone/version.py | 21 +-- + pidfile | 1 + + setup.py | 1 + + test/unit/test_identity.py | 271 ++++++++++++++++++++++++++++++++++++++ + 12 files changed, 674 insertions(+), 383 deletions(-) + +commit c4cfe98424e6b25ef6fd72d1a62e328a680c4ec9 +Author: Ramana Juvvadi +Date: Mon May 9 18:17:47 2011 -0500 + + A brief README for the auth-server + + README.auth-server | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) + +commit 74999020fa050bebc3b9b007560d4ed9f9c00ca4 +Author: Ramana Juvvadi +Date: Mon May 9 18:01:03 2011 -0500 + + Added keystone-control + + bin/keystone-control | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 225 insertions(+) + +commit 7a11050d0007fa0149128c37b9c1c4c8fd5edc48 +Author: Ramana Juvvadi +Date: Mon May 9 17:13:39 2011 -0500 + + chasing tenant group bug + + keystone/auth_server.py | 169 ++++++++++++++++++------ + keystone/logic/service.py | 287 ----------------------------------------- + keystone/logic/types/tenant.py | 9 ++ + setup.py | 18 +-- + test/unit/test_identity.py | 1 + + 5 files changed, 145 insertions(+), 339 deletions(-) + +commit d5ce3e52fa784c7e1f2b1a6998e38546b3727e8b +Author: John Eo +Date: Mon May 9 14:10:48 2011 -0500 + + Added tests for the URL extension middleware. + + test/unit/test_exthandler.py | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +commit 400ad67e50b750991f17d2ef76d44a918bae0974 +Merge: cbdc5c1 db0df82 +Author: Ramana Juvvadi +Date: Mon May 9 12:11:49 2011 -0500 + + Merge branch 'sirish' of https://git.hcleai.com/keystone into sirish + + Conflicts: + keystone/auth_server.py + +commit 6816821265fb3c973b5c6ce655064ae87eaf8344 +Merge: d32af92 ae0879f +Author: John Eo +Date: Mon May 9 11:58:00 2011 -0500 + + Merge branch 'master' of https://github.com/khussein/keystone + +commit cbdc5c14e102b44d2c6efda166304e63616ce8ac +Author: Ramana Juvvadi +Date: Mon May 9 11:57:33 2011 -0500 + + modified keystone-control and reshuffling of file names + + bin/keystone-auth | 65 +++++++++++++++++++++++++++++++++++++++++++ + bin/scripts/keystone-control | 66 -------------------------------------------- + keystone/auth_server.py | 2 +- + keystone/version.py | 21 ++------------ + setup.py | 19 +++++++------ + 5 files changed, 79 insertions(+), 94 deletions(-) + +commit d32af928464afa3d1c6a233efaee3131be784761 +Author: John Eo +Date: Mon May 9 11:57:33 2011 -0500 + + Adding unit test for the URL extension handler + + test/unit/test_exthandler.py | 35 +++++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) + +commit db0df82f26822fe4a5a2295f8b86b598dfaaa96c +Author: sirish.bitra +Date: Mon May 9 20:46:36 2011 +0530 + + Modified test cases + + keystone/auth_server.py | 172 +++- + keystone/db/sqlalchemy/api.py | 4 +- + keystone/logic/service.py | 31 +- + keystone/logic/types/fault.py | 2 +- + keystone/logic/types/tenant.py | 6 +- + test/unit/test_identity.py | 1765 +++++++++++++++++----------------------- + 6 files changed, 901 insertions(+), 1079 deletions(-) + +commit 331e8add4d35d754e2f6e70dfe81fcc4226bfa9c +Author: Sai Krishna +Date: Mon May 9 20:27:50 2011 +0530 + + Yes, I modified, but I wont commit + + README.md | 5 +++++ + etc/keystone.conf | 5 ++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit 38ddbfc80fb06cb762efd5e2f01ec2f55ab59f7b +Author: Ramana Juvvadi +Date: Mon May 9 08:54:16 2011 -0500 + + merged Sai changes + + keystone/auth_server.py | 7 ++++--- + keystone/common/template.py | 25 ++++++++++++++----------- + 2 files changed, 18 insertions(+), 14 deletions(-) + +commit 8d26526e5d5e414030b96dd89fa3aa610ad20498 +Author: jabdul +Date: Mon May 9 16:31:13 2011 +0530 + + Installation of keystone done + + bin/keystone | 201 +++++++++++++++++++++++++++++++++++++++++-- + bin/scripts/keystone-control | 66 -------------- + keystone/version.py | 21 +---- + setup.py | 19 ++-- + 4 files changed, 209 insertions(+), 98 deletions(-) + +commit 3c53cee318c841e69cb4f81af5e8747e8bb34338 +Author: Ramana Juvvadi +Date: Mon May 9 00:48:23 2011 -0500 + + corrects charset=utf=8 + + test/unit/test_identity.py | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +commit ae0879f5d7ee8f1704c978e57d4b462500eb927a +Author: Ziad Sawalha +Date: Sun May 8 23:23:54 2011 -0500 + + Working on echo server + + README.md | 66 ++++++++++++++--------------------------------------- + echo/echo/server.py | 6 +++-- + 2 files changed, 21 insertions(+), 51 deletions(-) + +commit 0445554a1f1cf45bf8c3633c001fc290e30aba98 +Author: Ramana Juvvadi +Date: Sun May 8 22:42:54 2011 -0500 + + one more push + + keystone/auth_server.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 386214b4900d53c92aa0c7236a4dc1d076d6b65c +Author: Ramana Juvvadi +Date: Sun May 8 21:40:03 2011 -0500 + + move the template code from bottle into a separate file: + + keystone/common/template.py | 287 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 287 insertions(+) + +commit dd4cdc93e77c3dc874791e87d55f97671eec7af8 +Author: Ramana Juvvadi +Date: Sun May 8 21:32:45 2011 -0500 + + modified auth_server.py + + keystone/auth_server.py | 36 ++++++++++++++++++++---------------- + 1 file changed, 20 insertions(+), 16 deletions(-) + +commit b864c54f77dc0d48480a770f5c7983a70b25c056 +Author: Ziad Sawalha +Date: Sun May 8 21:11:21 2011 -0500 + + Added echod and renamed echo.py to server.py + + echo/bin/echod | 26 ++++++++ + echo/echo/__init__.py | 18 +++++- + echo/echo/echo.py | 163 -------------------------------------------------- + echo/echo/server.py | 162 +++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 205 insertions(+), 164 deletions(-) + +commit 64e6e8d147f4b23693b61047e3ae17c06cc47b74 +Author: Ziad Sawalha +Date: Sun May 8 20:02:20 2011 -0500 + + Minor cleanup + pep8 + + keystone/logic/service.py | 27 --------------------------- + keystone/server.py | 1 - + 2 files changed, 28 deletions(-) + +commit f1493d5585ea7cdc2d48c8e83f8cfecae14ac821 +Author: Ramana Juvvadi +Date: Sun May 8 16:02:22 2011 -0500 + + merging changes from sai branch + + keystone/auth_server.py | 110 ++++++++++++++++++++++++++++++++++++++-- + keystone/db/sqlalchemy/api.py | 70 ++++++++++++++++++++++++++ + keystone/logic/types/tenant.py | 112 ++++++++++++++++++++--------------------- + 3 files changed, 230 insertions(+), 62 deletions(-) + +commit 4edf39136f6c40c8e0133549f52a94776c2ec6f3 +Author: Ramana Juvvadi +Date: Sun May 8 11:46:01 2011 -0500 + + saving changes to auth_server.py + + keystone/auth_server.py | 111 ++++++++++++++++++++---------------------------- + 1 file changed, 45 insertions(+), 66 deletions(-) + +commit ad0cbd2e763d010d31428393aab9d2bcd787cbe0 +Author: sirish bitra +Date: Sun May 8 17:41:42 2011 +0530 + + get version implementation + s Please enter the commit message for your changes. Lines starting + + keystone/auth_server.py | 82 ++++++++++++- + keystone/logic/service.py | 287 ++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 363 insertions(+), 6 deletions(-) + +commit c32b81baa25c827f72bde67832b2f4e20f09f10c +Author: Ramana Juvvadi +Date: Sun May 8 00:41:37 2011 -0500 + + get_version_info is still not working + + keystone/auth_server.py | 17 +++++++---------- + 1 file changed, 7 insertions(+), 10 deletions(-) + +commit 71cd6006bd29b804560b564bfff2d9b1609b94bd +Author: Ramana Juvvadi +Date: Sat May 7 23:25:31 2011 -0500 + + in the middle of get_version_info + + bin/scripts/keystone-control | 3 ++- + keystone/auth_server.py | 40 +++++++++++++++++++++++++++++++++++++++- + test/unit/test_identity.py | 4 ++-- + 3 files changed, 43 insertions(+), 4 deletions(-) + +commit 3eb1f32f15b0ed128220c4a5afd40e23e331ca6a +Author: Ramana Juvvadi +Date: Sat May 7 15:09:23 2011 -0500 + + Modified test_identity + + .gitignore | 2 +- + etc/keystone.conf | 2 +- + test/unit/test_identity.py | 1976 ++++++++++++++++++++++---------------------- + 3 files changed, 999 insertions(+), 981 deletions(-) + +commit 7b1a8571d3dad797fe5d2927868345109c12a26e +Author: Ramana Juvvadi +Date: Sat May 7 13:22:16 2011 -0500 + + removed .auth.serve.py.swp + + keystone/.auth_server.py.swp | Bin 16384 -> 0 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 6eacad3fb064fd2ebfc99e1efafbc108a1b91090 +Author: Ramana Juvvadi +Date: Sat May 7 13:08:13 2011 -0500 + + Added some more functions through Routes and mapper + + keystone/auth_server.py | 250 ++- + keystone/db/sqlalchemy/api.py | 286 ++- + keystone/logic/service.py | 592 +++++- + keystone/logic/types/fault.py | 43 +- + keystone/logic/types/user.py | 268 +++ + test/unit/test_identity.py | 4185 ++++++++++++++++++++--------------------- + 6 files changed, 3417 insertions(+), 2207 deletions(-) + +commit 2e1b2f77383f3214f5cb287682e4e864b3ee44aa +Author: Sai Krishna +Date: Sat May 7 16:02:09 2011 +0530 + + Update for Abdul + + .gitignore | 1 + + keystone/.auth_server.py.swp | Bin 0 -> 16384 bytes + keystone/auth_server.py | 19 +++++++++++++++---- + 3 files changed, 16 insertions(+), 4 deletions(-) + +commit ce4151a7ba24e5b28ddb76bef834c72f90b69e06 +Merge: 13cfb38 f7dc6b9 +Author: Sai Krishna +Date: Sat May 7 11:46:29 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + +commit 13cfb386a17f82ce483ac22de9859b1acf3dc12c +Author: Sai Krishna +Date: Sat May 7 11:46:13 2011 +0530 + + My Changes part 2 + + keystone/auth_server.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f7dc6b900025649555cc95b925d1fad5b43a4743 +Author: Ramana Juvvadi +Date: Sat May 7 00:49:36 2011 -0500 + + modified Resposne to resp=Response() + + keystone/auth_server.py | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) + +commit c686c24052864dae5799cbe151f2e70adec8b9d4 +Merge: 75c5275 26c5927 +Author: Sai Krishna +Date: Sat May 7 10:23:46 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + Resolved + + Conflicts: + keystone/auth_server.py + +commit 75c5275875c2e2d1de47cdfbcfb232ded49557f1 +Author: Sai Krishna +Date: Sat May 7 10:21:43 2011 +0530 + + My Changes + + keystone/auth_server.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 26c5927dcc5ad65edab01f2f53736cec8a637b95 +Author: Ramana Juvvadi +Date: Fri May 6 23:50:45 2011 -0500 + + minor tweak + + .gitignore | 4 ++++ + keystone/auth_server.py | 20 ++++++++++---------- + 2 files changed, 14 insertions(+), 10 deletions(-) + +commit b6230e76ff7a6309ec23dd1df8ffd6130699ea8e +Author: Ramana Juvvadi +Date: Fri May 6 15:50:47 2011 -0500 + + Some more cleaning up of git merges + + bin/keystoned | 26 ++++++++++++++++++++++++++ + keystone/auth_protocols/auth_basic.py | 2 +- + keystone/auth_protocols/auth_openid.py | 2 +- + keystone/auth_protocols/auth_token.py | 10 +++++----- + 4 files changed, 33 insertions(+), 7 deletions(-) + +commit 6b5f48369b2a33a7ffd293d1286e7d4b146d4371 +Author: Ramana Juvvadi +Date: Fri May 6 15:35:45 2011 -0500 + + Cleaning up of git merges + + .project | 17 - + .pydevproject | 7 - + keystone/identity.py | 393 -------------------- + keystone/identity.wadl | 0 + keystone/keystone.db | Bin 15360 -> 0 bytes + keystone/samples | 0 + keystone/server.py | 402 +++++++++++++++++++++ + keystone/xsd | 0 + ...ost,8080,v1.0,,85522eae6dcd6ad456db88c3075cbf6a | 29 -- + ...belongsTo=1234,0fa244bf10ab7c434b3f4463c32c9aea | 7 - + ...belongsTo=1234,77b0464187666efba06d39989a9bc06d | 7 - + ...belongsTo=1234,5ebd7c1bf6eadf74f8a3aefe38ad3ff5 | 7 - + ...belongsTo=1234,1dffce92dc7bb016eb3a3f15e276e631 | 7 - + ...belongsTo=1234,e43d485a6a9f051f3438c46306170f4b | 7 - + ...belongsTo=1234,2aed555a6a9ab417f986f527c43053ce | 7 - + ...belongsTo=1234,0623b833d4eaabc4f6fa4ea71ddaf0cd | 7 - + ...belongsTo=1234,f0ce21a332eb08144a41f155c906eb76 | 7 - + ...belongsTo=1234,de9f8c9880e0bfd435080242c614fc9a | 7 - + ...belongsTo=1234,caecc8e023433ef32af15a3476f9cff3 | 7 - + ...belongsTo=1234,857e6fecc90234c75eb4227c96c43b3e | 7 - + ...belongsTo=1234,edf10a9c392a47bd4a1d1bd3b34d64cf | 7 - + ...belongsTo=1234,c4ca8f8a6365a0716c30d5a89e1468e1 | 7 - + ...belongsTo=1234,f246ea7bc0e61bde5ff4e4682cd44da7 | 7 - + ...belongsTo=1234,88c25a69086287d9b00d2ddc5ec40b39 | 7 - + ...belongsTo=1234,149680325e379db00f318a50ce838915 | 7 - + ...belongsTo=1234,659f53f7fe6c635be9c73fc87d6e7f24 | 7 - + ...belongsTo=1234,69a8ca5f093bbfec08f9b554ffd448ad | 7 - + ...belongsTo=1234,c616a44bf119e02ba83a6e8873991e00 | 7 - + ...belongsTo=1234,7820f4f5cbbf3a64120f342a187b1b31 | 7 - + ...belongsTo=1234,cc1e8e2121435d0b585aac476a3d6b28 | 7 - + ...belongsTo=1234,e23ea085d8cac82a62817c48b5620a5f | 7 - + ...belongsTo=1234,c8c570d7427f9d74cfcb059a4df1dbab | 7 - + ...belongsTo=1234,d54f9697fcc652f5ea22279d443a3958 | 7 - + ...belongsTo=1234,d15275d7a8373d8e8a4e9e99e4b1a131 | 7 - + ...belongsTo=1234,7893fd67eec998f22eeb23341b6b76f0 | 7 - + ...belongsTo=1234,de16885f9e62b2ab6448e77b5a45596e | 7 - + ...belongsTo=1234,1ae4f6cd866133338f78e551c6112ebd | 7 - + ...belongsTo=1234,d7094c55f57341beed9cb2d9fe0905cd | 7 - + ...belongsTo=1234,cb4fd0e73df0050d82ce0aa2fb74c7d5 | 7 - + ...belongsTo=1234,5118c00ab276199f32454481cc95425a | 7 - + ...belongsTo=1234,44a71f9072bd57fbb06592bd1ba5707e | 7 - + ...belongsTo=1234,84227a1536908bcfe9447524e123b621 | 7 - + ...belongsTo=1234,69de6c814af92d5fb1adb531c4924299 | 7 - + ...belongsTo=1234,122dd1280ce908c7fa6147c9bce4204b | 7 - + ...belongsTo=1234,8f7cc092700f7accb0370ee2a1763b47 | 7 - + ...belongsTo=1234,2e9d61b14a591668bad54d2df0094e62 | 7 - + ...belongsTo=1234,f1f72455e384c114dad7b6d42eba3ded | 7 - + ...belongsTo=1234,2e199387ac4020d760dfb01330c67428 | 7 - + ...belongsTo=1234,fc72bb1917848fa15e77eec98a6ec1cd | 7 - + ...belongsTo=1234,217efcb67512bb32db662b34660d1c2f | 7 - + ...belongsTo=1234,b9f19b77faa6316da9fdace4b572af27 | 7 - + ...belongsTo=1234,9690360928d8e7516cfe780f517670bb | 7 - + ...belongsTo=1234,389961d72284a96c51c4eb64ba7af01f | 7 - + ...belongsTo=1234,19e354c267653f8e92c319d6b9a79df2 | 7 - + ...belongsTo=1234,fe44efd8f539dffc3e21dd702f42152a | 7 - + ...belongsTo=1234,28b5fd0dcb44cd1686d595f1d6b7a7f2 | 7 - + ...belongsTo=1234,fa1d785f1b4ea0a29294c2aec27c37af | 7 - + ...belongsTo=1234,3ad6cce199bb208a9419d3ce19d10e6d | 7 - + ...belongsTo=1234,eb64a6003237c042f1e74d253263f5ae | 7 - + ...belongsTo=1234,6531c197a51e2224b0d7525f3f2662c8 | 7 - + ...belongsTo=1234,d5360525ee89935761af89b1a0fa04a5 | 7 - + ...belongsTo=1234,e9e234105914348983908e7b6533db63 | 7 - + ...belongsTo=1234,61fe407dd81a2cc7a161d1db59e5411f | 7 - + ...belongsTo=1234,f57d1849548b34321bb1a036509cbfde | 7 - + ...belongsTo=1234,c73db603d563f0c218668190344d198d | 7 - + ...belongsTo=1234,e6a0fa44e043d04aaf035a47365292c8 | 7 - + ...belongsTo=1234,4a6ee4c45741319f4e1d21e7856af4eb | 7 - + ...belongsTo=1234,cfbb0ff0e9cd635218c1f0f096eb45e8 | 7 - + ...belongsTo=1234,f648942384c83c178fdf74ef98c45b4b | 7 - + ...belongsTo=1234,59dcbb3305e18232ce31ccad59021ade | 7 - + ...belongsTo=1234,afd1efb134a84502fde8e62da36113a0 | 7 - + ...belongsTo=1234,ceec223976559709e84ce71034139f37 | 7 - + ...belongsTo=1234,a10487bfd98ec1649d005c62bec260c4 | 7 - + ...belongsTo=1234,2844a3fe17d523d6d3fc576b61ce8943 | 7 - + ...belongsTo=1234,64346ec45c6771c8ac9bdf2906ea05bb | 7 - + 75 files changed, 402 insertions(+), 908 deletions(-) + +commit e6636f63384bac75b800c88d6fdf1fbc0283dc04 +Merge: 95e92bd 1c79b48 +Author: Sai Krishna +Date: Fri May 6 19:31:26 2011 +0530 + + Merge remote branches 'origin/master' and 'github/master' + Added config files + bin/keystone is the keyscript which needs to be kept in + /usr/local/bin/keystone (Assuming this is done when EGG-INSTALL is done + a module of python makes it a binary + + bin/scripts/keystone-control is the keystone-control script which needs + to sit in once python setup.py build and python setup.py install is + done in the EGG-INFO folder with a scripts directory + + Normally this is done through setup.py, the installation of scripts + folder we need to do some change ins setup.py for tha + + Then comes /etc folder should install keystone in the same place + Conflicts: + +commit 95e92bdd1f034f4475390e214dd4b2801d1109c7 +Author: Sai Krishna +Date: Fri May 6 18:02:49 2011 +0530 + + Added glance type of eventlet, because of its plug and play which meets + the need of running everything independently if needed + + keystone/auth_server.py | 130 +++++++++++++++++ + keystone/common/config.py | 325 +++++++++++++++++++++++++++++++++++++++++++ + keystone/common/exception.py | 98 +++++++++++++ + keystone/common/wsgi.py | 315 +++++++++++++++++++++++++++++++++++++++++ + keystone/version.py | 46 ++++++ + 5 files changed, 914 insertions(+) + +commit 1c79b48a68da5827bb1ac15ff637e634101d16c4 +Author: Ziad Sawalha +Date: Fri May 6 00:30:29 2011 -0500 + + pep8 and fixes + + keystone/logic/service.py | 82 ++++++++++++++++++++++++------------------ + keystone/logic/types/auth.py | 5 ++- + keystone/logic/types/fault.py | 2 +- + keystone/logic/types/tenant.py | 19 +++++----- + keystone/server.py | 41 +++++++++++---------- + 5 files changed, 81 insertions(+), 68 deletions(-) + +commit 145f56595f96999a4df10743f5bbeaf868edbdc8 +Author: Ziad Sawalha +Date: Fri May 6 00:00:14 2011 -0500 + + Readme updates + + README.md | 2 ++ + 1 file changed, 2 insertions(+) + +commit 545940dc8b62aaf5ced6ee6bbe34c8abe344f052 +Author: Ziad Sawalha +Date: Thu May 5 23:50:55 2011 -0500 + + Removed keystone.db - should be generated by ORM + + keystone/keystone.db | Bin 15360 -> 0 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 38c8f4ce349ea6babe0ddac2d1cb72d163c25258 +Author: Ziad Sawalha +Date: Thu May 5 23:37:25 2011 -0500 + + Removed extra files from last commit + + keyston.db | 0 + keystone.db | Bin 15360 -> 0 bytes + ...ost,8080,v1.0,,85522eae6dcd6ad456db88c3075cbf6a | 29 --------------------- + ...belongsTo=1234,b5fe9685fe968b442dc2f60b7b572439 | 7 ----- + ...belongsTo=1234,cc6c5731580e04954ec513fc492ef171 | 7 ----- + ...belongsTo=1234,bb39708e487f2e9f65351388122b87a6 | 7 ----- + ...belongsTo=1234,c44949eb2466607cf54a1a4b40a667c2 | 7 ----- + ...belongsTo=1234,552b8567793d2af2543014eed0d9cfe3 | 7 ----- + ...belongsTo=1234,3187a93c77a8a09e931a8f02bc9ffaeb | 7 ----- + ...belongsTo=1234,922d36054837aec606df5658191be0de | 7 ----- + ...belongsTo=1234,97598afe11e68ac0b16a166c31dd9669 | 7 ----- + 11 files changed, 85 deletions(-) + +commit 43e82b5fa73d8c27a6e2075870220595a2f6b648 +Author: Sai Krishna +Date: Thu May 5 21:09:34 2011 +0530 + + Removed Global groups tests, which still needs to be tested. Updated + README on how to run unit test + + README.md | 2 + + keyston.db | 0 + keystone.db | Bin 0 -> 15360 bytes + keystone/keystone.db | Bin 0 -> 15360 bytes + ...ost,8080,v1.0,,85522eae6dcd6ad456db88c3075cbf6a | 29 ++ + ...belongsTo=1234,b5fe9685fe968b442dc2f60b7b572439 | 7 + + ...belongsTo=1234,cc6c5731580e04954ec513fc492ef171 | 7 + + ...belongsTo=1234,bb39708e487f2e9f65351388122b87a6 | 7 + + ...belongsTo=1234,c44949eb2466607cf54a1a4b40a667c2 | 7 + + ...belongsTo=1234,552b8567793d2af2543014eed0d9cfe3 | 7 + + ...belongsTo=1234,3187a93c77a8a09e931a8f02bc9ffaeb | 7 + + ...belongsTo=1234,922d36054837aec606df5658191be0de | 7 + + ...belongsTo=1234,97598afe11e68ac0b16a166c31dd9669 | 7 + + test/unit/test_identity.py | 539 +++++++++------------ + 14 files changed, 316 insertions(+), 310 deletions(-) + +commit 2762ad15ca606718e10857e7e89d15a32405036a +Author: Sai Krishna +Date: Thu May 5 19:45:00 2011 +0530 + + Deleted keystone.db + + keystone/keystone.db | Bin 15360 -> 0 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 4adb3a142a298e12a08ad50525c383407cb0f84d +Author: Sai Krishna +Date: Thu May 5 19:43:40 2011 +0530 + + Merged pagination + + keystone/logic/service.py | 1 + + keystone/logic/types/auth.py | 1 + + keystone/logic/types/fault.py | 1 + + keystone/server.py | 1 + + test/unit/test_identity.py | 1283 ++++++++++++++++++++--------------------- + 5 files changed, 645 insertions(+), 642 deletions(-) + +commit 8716d49c66fe50ab2e64ed97079c0a47bb8ea559 +Merge: 9516c4e a0452fe +Author: Sai Krishna +Date: Thu May 5 19:10:18 2011 +0530 + + Merge branch 'master' of https://github.com/khussein/keystone + + Conflicts: + test/unit/test_identity.py + +commit a0452fe1a376550bddd18987bd6d0d902eb649b4 +Author: Ziad Sawalha +Date: Thu May 5 07:50:29 2011 -0500 + + Git problems - lingering commit + + README.md | 20 +-- + keystone/identity.py | 309 --------------------------------------------- + keystone/server.py | 5 +- + test/unit/test_identity.py | 8 +- + 4 files changed, 11 insertions(+), 331 deletions(-) + +commit 6f9c644f5a55fee3ae34277d4571e5df1e3e44a9 +Author: Ziad Sawalha +Date: Thu May 5 07:42:43 2011 -0500 + + Renamed identity.py to server.py and added bin directory + + bin/keystoned | 26 +++++ + keystone/server.py | 309 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 335 insertions(+) + +commit c9d4453ffab707a29c16dd778a1e2d609729a43c +Merge: 4368fcc 7204593 +Author: Ziad Sawalha +Date: Thu May 5 06:58:49 2011 -0500 + + Merge branch 'master' of github.com:khussein/keystone + +commit 4368fcc01578e2fb3f02b670f9e5e5e00b221e20 +Author: Ziad Sawalha +Date: Thu May 5 06:57:39 2011 -0500 + + Adding router to requires. Updating standards in HACKING. Removing schema (generated from ORM) + + HACKING | 29 ++++++++++++++++++++--------- + README.md | 10 ---------- + pip-requires | 1 + + 3 files changed, 21 insertions(+), 19 deletions(-) + +commit 9516c4e0f446244cba4c3f5a9eba0abca45a822f +Author: Sai Krishna +Date: Wed May 4 22:28:11 2011 +0530 + + Added pagination functionality and tenant_group functionality with unit + tests + + keystone/db/sqlalchemy/api.py | 245 +++++++++ + keystone/identity.py | 96 +++- + keystone/logic/service.py | 187 ++++++- + keystone/logic/types/fault.py | 7 + + keystone/logic/types/tenant.py | 237 +++++++- + test/unit/test_identity.py | 1176 +++++++++++++++++++++++++++++++++++++++- + 6 files changed, 1907 insertions(+), 41 deletions(-) + +commit 7204593270cd6729baad3665c1d61be56d755d5f +Author: John Eo +Date: Wed May 4 09:00:20 2011 -0500 + + Removing unused imports. + + keystone/queryext/exthandler.py | 2 -- + 1 file changed, 2 deletions(-) + +commit c9aafc60fc4491f2a06f4d45834ad7ff37de5e83 +Author: John Eo +Date: Wed May 4 08:58:30 2011 -0500 + + Removing unused function. + + keystone/queryext/exthandler.py | 9 --------- + 1 file changed, 9 deletions(-) + +commit c576bd668fa2bc7378327688a578744f9266fcea +Author: Sai Krishna +Date: Wed May 4 17:44:38 2011 +0530 + + unwanted file + + test/unit/.test_identity.py.swp | Bin 143360 -> 0 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 784e75955c15d2297813abc003a8497701c3f2d0 +Author: Sai Krishna +Date: Wed May 4 17:43:20 2011 +0530 + + added the code that would go to hussein repo + + description | 2 - + keystone/identity.py | 22 +- + test/unit/.test_identity.py.swp | Bin 0 -> 143360 bytes + test/unit/test_identity.py | 506 ++++++++++++++++++++++++++++++++++------ + 4 files changed, 443 insertions(+), 87 deletions(-) + +commit 79f612a34a962bc6e04b9df74ad3422685a6611c +Author: root +Date: Tue May 3 20:05:21 2011 +0530 + + Added tenant groups in identity, created test cases for tenant groups + + .project | 17 + + .pydevproject | 7 + + keystone/db/sqlalchemy/api.py | 245 +++++++ + keystone/identity.py | 96 ++- + keystone/identity.wadl | 0 + keystone/keystone.db | Bin 0 -> 15360 bytes + keystone/logic/service.py | 187 ++++- + keystone/logic/types/atom.py | 31 +- + keystone/logic/types/fault.py | 7 + + keystone/logic/types/tenant.py | 237 ++++++- + keystone/samples | 0 + keystone/xsd | 0 + ...ost,8080,v1.0,,85522eae6dcd6ad456db88c3075cbf6a | 29 + + ...belongsTo=1234,0fa244bf10ab7c434b3f4463c32c9aea | 7 + + ...belongsTo=1234,77b0464187666efba06d39989a9bc06d | 7 + + ...belongsTo=1234,5ebd7c1bf6eadf74f8a3aefe38ad3ff5 | 7 + + ...belongsTo=1234,1dffce92dc7bb016eb3a3f15e276e631 | 7 + + ...belongsTo=1234,e43d485a6a9f051f3438c46306170f4b | 7 + + ...belongsTo=1234,2aed555a6a9ab417f986f527c43053ce | 7 + + ...belongsTo=1234,0623b833d4eaabc4f6fa4ea71ddaf0cd | 7 + + ...belongsTo=1234,f0ce21a332eb08144a41f155c906eb76 | 7 + + ...belongsTo=1234,de9f8c9880e0bfd435080242c614fc9a | 7 + + ...belongsTo=1234,caecc8e023433ef32af15a3476f9cff3 | 7 + + ...belongsTo=1234,857e6fecc90234c75eb4227c96c43b3e | 7 + + ...belongsTo=1234,edf10a9c392a47bd4a1d1bd3b34d64cf | 7 + + ...belongsTo=1234,c4ca8f8a6365a0716c30d5a89e1468e1 | 7 + + ...belongsTo=1234,f246ea7bc0e61bde5ff4e4682cd44da7 | 7 + + ...belongsTo=1234,88c25a69086287d9b00d2ddc5ec40b39 | 7 + + ...belongsTo=1234,149680325e379db00f318a50ce838915 | 7 + + ...belongsTo=1234,659f53f7fe6c635be9c73fc87d6e7f24 | 7 + + ...belongsTo=1234,69a8ca5f093bbfec08f9b554ffd448ad | 7 + + ...belongsTo=1234,c616a44bf119e02ba83a6e8873991e00 | 7 + + ...belongsTo=1234,7820f4f5cbbf3a64120f342a187b1b31 | 7 + + ...belongsTo=1234,cc1e8e2121435d0b585aac476a3d6b28 | 7 + + ...belongsTo=1234,e23ea085d8cac82a62817c48b5620a5f | 7 + + ...belongsTo=1234,c8c570d7427f9d74cfcb059a4df1dbab | 7 + + ...belongsTo=1234,d54f9697fcc652f5ea22279d443a3958 | 7 + + ...belongsTo=1234,d15275d7a8373d8e8a4e9e99e4b1a131 | 7 + + ...belongsTo=1234,7893fd67eec998f22eeb23341b6b76f0 | 7 + + ...belongsTo=1234,de16885f9e62b2ab6448e77b5a45596e | 7 + + ...belongsTo=1234,1ae4f6cd866133338f78e551c6112ebd | 7 + + ...belongsTo=1234,d7094c55f57341beed9cb2d9fe0905cd | 7 + + ...belongsTo=1234,cb4fd0e73df0050d82ce0aa2fb74c7d5 | 7 + + ...belongsTo=1234,5118c00ab276199f32454481cc95425a | 7 + + ...belongsTo=1234,44a71f9072bd57fbb06592bd1ba5707e | 7 + + ...belongsTo=1234,84227a1536908bcfe9447524e123b621 | 7 + + ...belongsTo=1234,69de6c814af92d5fb1adb531c4924299 | 7 + + ...belongsTo=1234,122dd1280ce908c7fa6147c9bce4204b | 7 + + ...belongsTo=1234,8f7cc092700f7accb0370ee2a1763b47 | 7 + + ...belongsTo=1234,2e9d61b14a591668bad54d2df0094e62 | 7 + + ...belongsTo=1234,f1f72455e384c114dad7b6d42eba3ded | 7 + + ...belongsTo=1234,2e199387ac4020d760dfb01330c67428 | 7 + + ...belongsTo=1234,fc72bb1917848fa15e77eec98a6ec1cd | 7 + + ...belongsTo=1234,217efcb67512bb32db662b34660d1c2f | 7 + + ...belongsTo=1234,b9f19b77faa6316da9fdace4b572af27 | 7 + + ...belongsTo=1234,9690360928d8e7516cfe780f517670bb | 7 + + ...belongsTo=1234,389961d72284a96c51c4eb64ba7af01f | 7 + + ...belongsTo=1234,19e354c267653f8e92c319d6b9a79df2 | 7 + + ...belongsTo=1234,fe44efd8f539dffc3e21dd702f42152a | 7 + + ...belongsTo=1234,28b5fd0dcb44cd1686d595f1d6b7a7f2 | 7 + + ...belongsTo=1234,fa1d785f1b4ea0a29294c2aec27c37af | 7 + + ...belongsTo=1234,3ad6cce199bb208a9419d3ce19d10e6d | 7 + + ...belongsTo=1234,eb64a6003237c042f1e74d253263f5ae | 7 + + ...belongsTo=1234,6531c197a51e2224b0d7525f3f2662c8 | 7 + + ...belongsTo=1234,d5360525ee89935761af89b1a0fa04a5 | 7 + + ...belongsTo=1234,e9e234105914348983908e7b6533db63 | 7 + + ...belongsTo=1234,61fe407dd81a2cc7a161d1db59e5411f | 7 + + ...belongsTo=1234,f57d1849548b34321bb1a036509cbfde | 7 + + ...belongsTo=1234,c73db603d563f0c218668190344d198d | 7 + + ...belongsTo=1234,e6a0fa44e043d04aaf035a47365292c8 | 7 + + ...belongsTo=1234,4a6ee4c45741319f4e1d21e7856af4eb | 7 + + ...belongsTo=1234,cfbb0ff0e9cd635218c1f0f096eb45e8 | 7 + + ...belongsTo=1234,f648942384c83c178fdf74ef98c45b4b | 7 + + ...belongsTo=1234,59dcbb3305e18232ce31ccad59021ade | 7 + + ...belongsTo=1234,afd1efb134a84502fde8e62da36113a0 | 7 + + ...belongsTo=1234,ceec223976559709e84ce71034139f37 | 7 + + ...belongsTo=1234,a10487bfd98ec1649d005c62bec260c4 | 7 + + ...belongsTo=1234,2844a3fe17d523d6d3fc576b61ce8943 | 7 + + ...belongsTo=1234,64346ec45c6771c8ac9bdf2906ea05bb | 7 + + test/unit/test_identity.py | 764 ++++++++++++++++++++- + 80 files changed, 2067 insertions(+), 15 deletions(-) + +commit 20ecd99441ba8fc3d58b05d55c08eb17dd43b024 +Author: root +Date: Mon May 2 13:26:46 2011 +0530 + + Added latest changes to sirish branch with pagination for get tenants + + README.md | 1 + + echo/echo/echo.py | 106 +++++++++---- + echo/echo/echo_basic.ini | 36 +++++ + echo/echo_client.py | 24 +++ + keystone/auth_protocols/auth_basic.ini | 13 ++ + keystone/auth_protocols/auth_basic.py | 128 ++++++++++++---- + keystone/auth_protocols/auth_token.py | 265 ++++++++++++++++++++------------- + keystone/db/sqlalchemy/api.py | 62 +------- + keystone/identity.py | 10 +- + keystone/logic/service.py | 27 +--- + keystone/logic/types/atom.py | 12 -- + keystone/logic/types/tenant.py | 3 +- + test/test_setup.sql | 2 +- + test/unit/test_identity.py | 4 +- + 14 files changed, 421 insertions(+), 272 deletions(-) + +commit 1623835e91ac71acdb20c92878aedb90c3da4ec4 +Author: Ziad Sawalha +Date: Sat Apr 30 13:24:34 2011 -0500 + + Annotate TODOs + + docs/guide/src/docbkx/xsd/atom/atom.xsd | 10 +++---- + keystone/auth_protocols/auth_basic.py | 2 +- + keystone/auth_protocols/auth_openid.py | 2 +- + keystone/auth_protocols/auth_token.py | 10 +++---- + keystone/identity.py | 8 ++++-- + keystone/logic/service.py | 2 +- + test/unit/test_identity.py | 47 ++++++++++++++++++++++++++------- + 7 files changed, 56 insertions(+), 25 deletions(-) + +commit 425b08cd50d88c57f47af67c8cdf5c5d4bc7b67b +Author: Ziad Sawalha +Date: Sat Apr 30 12:06:36 2011 -0500 + + argument handling in echo.py + + echo/echo/echo.py | 83 ++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 51 insertions(+), 32 deletions(-) + +commit f606f6b4f5d3c40fbdb074948ed41e4b67da1a5f +Author: Jesse Andrews +Date: Sat Apr 30 09:18:15 2011 -0700 + + getting pep8-y with it + + echo/echo/echo.py | 6 +++-- + echo/echo_client.py | 12 +++++---- + keystone/auth_protocols/auth_basic.py | 20 +++++++------- + keystone/auth_protocols/auth_token.py | 49 ++++++++++++++++++----------------- + 4 files changed, 45 insertions(+), 42 deletions(-) + +commit 4006479c241091453d01915416b155398ab4ff3b +Merge: ea57151 0559081 +Author: Ziad Sawalha +Date: Sat Apr 30 04:50:16 2011 -0500 + + Merged conflicts + +commit ea57151dfba3a82bb6a1169543b1333f28ca17b9 +Author: Ziad Sawalha +Date: Sat Apr 30 04:33:11 2011 -0500 + + Basic auth and refactor + + echo/echo/echo.py | 24 ++-- + echo/echo_client.py | 30 +++- + keystone/auth_protocols/auth_basic.ini | 13 ++ + keystone/auth_protocols/auth_basic.py | 6 +- + keystone/auth_protocols/auth_token.py | 248 ++++++++++++++++++++------------- + test/test_setup.sql | 2 +- + 6 files changed, 213 insertions(+), 110 deletions(-) + +commit 055908196735bc9ebfa1dd96c593c9f7e9b21b29 +Author: Jesse Andrews +Date: Fri Apr 29 11:32:12 2011 -0700 + + more pep8 + + README.md | 1 + + echo/echo/echo.py | 12 ++++++++---- + keystone/auth_protocols/auth_token.py | 15 ++++++++------- + keystone/identity.py | 1 + + test/unit/test_identity.py | 4 ++-- + 5 files changed, 20 insertions(+), 13 deletions(-) + +commit c6c0678a10f66ea7cf373b9fe54cc8878133a574 +Merge: 8b82fb2 aa6221d +Author: Sai Krishna +Date: Fri Apr 29 17:18:06 2011 +0530 + + Merge branch 'sai' + +commit aa6221d2ecb6ac10181c980beedf3f5ae9f2a85e +Author: Sai Krishna +Date: Fri Apr 29 17:00:11 2011 +0530 + + testing merging + + description | 1 + + 1 file changed, 1 insertion(+) + +commit 8b82fb295f462717c1defaba7c4d8789203ecbf3 +Author: bsirish +Date: Fri Apr 29 16:44:48 2011 +0530 + + get _tenants pagination updates + + keystone/db/sqlalchemy/api.py | 62 ++++++++++++++++++++++++++++++++++++++++-- + keystone/identity.py | 9 ++++-- + keystone/logic/service.py | 27 +++++++++++++++--- + keystone/logic/types/atom.py | 12 ++++++++ + keystone/logic/types/tenant.py | 3 +- + 5 files changed, 104 insertions(+), 9 deletions(-) + +commit ec8cae010633b1c5df016d317432ad7db7c46b60 +Merge: 8b9e08b 0d3a4c3 +Author: Sai Krishna +Date: Fri Apr 29 16:24:19 2011 +0530 + + Merge branch 'master' of https://git.hcleai.com/keystone + + Conflicts: + keystone/queryext/__init__.py + test/unit/test_identity.py + +commit 8b9e08b7d424bd4222b9868f5520b8c9d28e378d +Author: Sai Krishna +Date: Fri Apr 29 16:22:19 2011 +0530 + + Merging keystone code + + foo | 0 + keystone/identity.py | 4 ++- + keystone/queryext/__init__.py | 0 + keystone/queryext/exthandler.py | 69 +++++++++++++++++++++++++++++++++++++++++ + test/unit/test_identity.py | 9 ++++++ + 5 files changed, 81 insertions(+), 1 deletion(-) + +commit 0ed0eaaa348e6e785ee220b0e43042be127d22d0 +Author: Ziad Sawalha +Date: Thu Apr 28 19:47:21 2011 -0700 + + Basic Auth support + + echo/echo/echo.py | 22 ++++-- + echo/echo/echo_basic.ini | 36 ++++++++++ + keystone/auth_protocols/auth_basic.py | 128 ++++++++++++++++++++++++++-------- + keystone/auth_protocols/auth_token.py | 3 +- + 4 files changed, 153 insertions(+), 36 deletions(-) + +commit 33bddf30e1823f21db75b9230b8f87d74629fc9b +Author: John Eo +Date: Thu Apr 28 18:59:02 2011 -0500 + + 17: query extension works + + keystone/identity.py | 4 ++- + keystone/queryext/__init__.py | 0 + keystone/queryext/exthandler.py | 69 +++++++++++++++++++++++++++++++++++++++++ + test/unit/test_identity.py | 37 ++-------------------- + 4 files changed, 74 insertions(+), 36 deletions(-) + +commit e6482b36eb24e9713dc5de28d051c19bbe4bd615 +Merge: 62e32e1 b42d40a +Author: John Eo +Date: Thu Apr 28 13:50:57 2011 -0500 + + Merge branch 'master' of https://github.com/khussein/keystone + + Conflicts: + test/unit/test_identity.py + +commit 62e32e1b3399f308e44a4357819faa8575cd5908 +Author: John Eo +Date: Thu Apr 28 13:40:52 2011 -0500 + + Issue 17: Adding tests + + test/unit/test_identity.py | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +commit 0d3a4c383a1da8ba0ee94397d8ac03f96e546082 +Author: Sai Krishna +Date: Thu Apr 28 17:27:09 2011 +0530 + + removed \r chararcter from unit directory + + test/unit/test_identity.py | 1932 ++++++++++++++++++++++---------------------- + 1 file changed, 966 insertions(+), 966 deletions(-) + +commit e913f2df4bb9221c7e2efd5e94431707e32579c1 +Author: Sai Krishna +Date: Thu Apr 28 17:23:52 2011 +0530 + + removed windows newline characters from management folder + + LICENSE | 404 ++++++++++++++++++++++---------------------- + management/delgroup.py | 84 ++++----- + management/getgroup.py | 80 ++++----- + management/getgroups.py | 74 ++++---- + management/getgroupusers.py | 78 ++++----- + management/getuser.py | 74 ++++---- + management/getusergroups.py | 76 ++++----- + management/getusers.py | 76 ++++----- + management/groupadd.py | 80 ++++----- + management/setuserlock.py | 98 +++++------ + management/setuserpswd.py | 82 ++++----- + management/updategroup.py | 84 ++++----- + management/useradd.py | 84 ++++----- + management/userdel.py | 78 ++++----- + management/userupdate.py | 82 ++++----- + 15 files changed, 767 insertions(+), 767 deletions(-) + +commit 217b77d9e892af0d75a354a1cce67acd974bc26f +Author: Sai Krishna +Date: Thu Apr 28 17:17:10 2011 +0530 + + removed unwanted files + + foo | 0 + foo2 | 0 + sai | 0 + 3 files changed, 0 insertions(+), 0 deletions(-) + +commit 112f06fd9377d4e6964f8e0ee447f60267920cc0 +Author: Sai Krishna +Date: Thu Apr 28 17:13:27 2011 +0530 + + Adding First kestone repo + + .gitignore | 1 + + HACKING | 68 + + LICENSE | 202 +++ + README.md | 162 +++ + docs/guide/pom.xml | 99 ++ + docs/guide/src/docbkx/idm.wadl | 355 +++++ + docs/guide/src/docbkx/idmdevguide.xml | 1018 +++++++++++++++ + docs/guide/src/docbkx/img/Check_mark_23x20_02.svg | 60 + + docs/guide/src/docbkx/samples/auth.json | 19 + + docs/guide/src/docbkx/samples/auth.xml | 10 + + .../guide/src/docbkx/samples/auth_credentials.json | 7 + + docs/guide/src/docbkx/samples/auth_credentials.xml | 5 + + docs/guide/src/docbkx/samples/choices.json | 50 + + docs/guide/src/docbkx/samples/choices.xml | 29 + + docs/guide/src/docbkx/samples/ext-getuser.json | 21 + + docs/guide/src/docbkx/samples/ext-getuser.xml | 13 + + docs/guide/src/docbkx/samples/extension.json | 21 + + docs/guide/src/docbkx/samples/extension.xml | 23 + + docs/guide/src/docbkx/samples/extensions.json | 44 + + docs/guide/src/docbkx/samples/extensions.xml | 39 + + docs/guide/src/docbkx/samples/getuser-1.json | 29 + + docs/guide/src/docbkx/samples/getuser-1.xml | 14 + + docs/guide/src/docbkx/samples/idm_fault.json | 7 + + docs/guide/src/docbkx/samples/idm_fault.xml | 6 + + docs/guide/src/docbkx/samples/item_not_found.json | 7 + + docs/guide/src/docbkx/samples/item_not_found.xml | 6 + + .../src/docbkx/samples/samplerequestheader.json | 4 + + .../src/docbkx/samples/sampleresponseheader.json | 5 + + docs/guide/src/docbkx/samples/tenant.json | 7 + + docs/guide/src/docbkx/samples/tenant.xml | 5 + + docs/guide/src/docbkx/samples/tenantlock.json | 5 + + docs/guide/src/docbkx/samples/tenantlock.xml | 4 + + docs/guide/src/docbkx/samples/tenants-1.json | 16 + + docs/guide/src/docbkx/samples/tenants-1.xml | 10 + + docs/guide/src/docbkx/samples/tenants-2.json | 20 + + docs/guide/src/docbkx/samples/tenants-2.xml | 13 + + docs/guide/src/docbkx/samples/tenants-3.json | 16 + + docs/guide/src/docbkx/samples/tenants-3.xml | 10 + + docs/guide/src/docbkx/samples/tenants.json | 15 + + docs/guide/src/docbkx/samples/tenants.xml | 9 + + docs/guide/src/docbkx/samples/updatedtenant.json | 7 + + docs/guide/src/docbkx/samples/updatedtenant.xml | 5 + + docs/guide/src/docbkx/samples/validatetoken.json | 19 + + docs/guide/src/docbkx/samples/validatetoken.xml | 10 + + docs/guide/src/docbkx/samples/version-atom.xml | 19 + + docs/guide/src/docbkx/samples/version.json | 33 + + docs/guide/src/docbkx/samples/version.xml | 23 + + docs/guide/src/docbkx/samples/versions-atom.xml | 22 + + docs/guide/src/docbkx/samples/versions.json | 28 + + docs/guide/src/docbkx/samples/versions.xml | 18 + + docs/guide/src/docbkx/xsd/api-common.xsd | 56 + + docs/guide/src/docbkx/xsd/api.xsd | 14 + + docs/guide/src/docbkx/xsd/atom/atom.xsd | 115 ++ + docs/guide/src/docbkx/xsd/atom/xml.xsd | 287 +++++ + docs/guide/src/docbkx/xsd/extensions.xsd | 56 + + docs/guide/src/docbkx/xsd/fault.xsd | 135 ++ + docs/guide/src/docbkx/xsd/tenant.xsd | 40 + + docs/guide/src/docbkx/xsd/token.xsd | 72 ++ + docs/guide/src/docbkx/xsd/version.xsd | 200 +++ + echo/echo/__init__.py | 1 + + echo/echo/echo.ini | 36 + + echo/echo/echo.py | 121 ++ + echo/echo/echo.wadl | 86 ++ + echo/echo/echo_remote.ini | 19 + + echo/echo/samples/echo.json | 11 + + echo/echo/samples/echo.xml | 8 + + echo/echo/xsd/echo.xsd | 48 + + echo/echo/xsl/echo.xsl | 41 + + echo/echo_client.py | 72 ++ + echo/setup.py | 39 + + keystone/__init__.py | 15 + + keystone/auth_protocols/__init__.py | 0 + keystone/auth_protocols/auth_basic.py | 114 ++ + keystone/auth_protocols/auth_openid.py | 113 ++ + keystone/auth_protocols/auth_token.ini | 18 + + keystone/auth_protocols/auth_token.py | 265 ++++ + keystone/common/__init__.py | 0 + keystone/common/bufferedhttp.py | 165 +++ + keystone/content/extensions.json | 1 + + keystone/content/extensions.xml | 5 + + keystone/content/idmdevguide.pdf | Bin 0 -> 208102 bytes + keystone/content/version.json.tpl | 33 + + keystone/content/version.xml.tpl | 23 + + keystone/db/__init__.py | 0 + keystone/db/sqlalchemy/__init__.py | 24 + + keystone/db/sqlalchemy/api.py | 179 +++ + keystone/db/sqlalchemy/models.py | 135 ++ + keystone/db/sqlalchemy/session.py | 64 + + keystone/identity.py | 302 +++++ + keystone/identity.wadl | 1 + + keystone/keystone.ini | 16 + + keystone/logic/__init__.py | 0 + keystone/logic/service.py | 216 ++++ + keystone/logic/types/__init__.py | 0 + keystone/logic/types/atom.py | 25 + + keystone/logic/types/auth.py | 157 +++ + keystone/logic/types/fault.py | 121 ++ + keystone/logic/types/tenant.py | 119 ++ + keystone/middleware/__init__.py | 0 + keystone/middleware/remoteauth.py | 105 ++ + keystone/samples | 1 + + keystone/xsd | 1 + + management/delgroup.py | 42 + + management/getgroup.py | 40 + + management/getgroups.py | 37 + + management/getgroupusers.py | 39 + + management/getuser.py | 37 + + management/getusergroups.py | 38 + + management/getusers.py | 38 + + management/groupadd.py | 40 + + management/setuserlock.py | 49 + + management/setuserpswd.py | 41 + + management/updategroup.py | 42 + + management/useradd.py | 42 + + management/userdel.py | 39 + + management/userupdate.py | 41 + + pip-requires | 9 + + setup.py | 42 + + test | 1 - + test/EchoSOAPUI.xml | 2 + + test/IdentitySOAPUI.xml | 1355 ++++++++++++++++++++ + test/kill.sql | 10 + + test/test_setup.sql | 71 + + test/unit/test_identity.py | 966 ++++++++++++++ + 124 files changed, 9333 insertions(+), 1 deletion(-) + +commit efd7eb952a478ba968a60daed0dacd52ffe67b89 +Author: Sony K. Philip +Date: Thu Apr 28 16:50:35 2011 +0530 + + Add Description File + + description | 1 + + 1 file changed, 1 insertion(+) + +commit 399bc5e12c36fe8cbf32745d0dd510131d5d8705 +Author: Sai Krishna +Date: Thu Apr 28 16:47:18 2011 +0530 + + sai added by sai + + sai | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit d42602d25c6032ecff818a18e11546679113875c +Author: Sony K. Philip +Date: Thu Apr 28 16:45:50 2011 +0530 + + Foo2 + + foo2 | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit dafc8c782cdb0976e4aaf998e1a4b2244f03425b +Author: Sony K. Philip +Date: Thu Apr 28 16:28:50 2011 +0530 + + Foo + + foo | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 737cf67f935fddc2a58777cf14dd71fbfa0c7494 +Author: root +Date: Thu Apr 28 16:22:28 2011 +0530 + + Initial + + test | 1 + + 1 file changed, 1 insertion(+) + +commit b42d40a726868be543e877706958a0921d4dcd93 +Author: Ziad Sawalha +Date: Thu Apr 28 01:19:15 2011 -0700 + + Minor changes + call using WSGI instead of bottle + + README.md | 22 ++++++++++++---------- + keystone/identity.py | 7 ++++--- + keystone/keystone.ini | 13 ++++++++++++- + 3 files changed, 28 insertions(+), 14 deletions(-) + +commit 43aaff6c20ed87aa7a082156f5ae8ef739572e57 +Merge: fb12e9a 2a77f0a +Author: Ziad Sawalha +Date: Wed Apr 27 23:13:59 2011 -0700 + + Merge branch 'master' of github.com:khussein/keystone + +commit fb12e9a70fef20cb8f0df4220bfb259ca49ca763 +Author: Ziad Sawalha +Date: Wed Apr 27 23:13:40 2011 -0700 + + Restored remoteauth + + keystone/middleware/papiauth.py | 105 -------------------------------------- + keystone/middleware/remoteauth.py | 105 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 105 insertions(+), 105 deletions(-) + +commit 2a77f0a3d9ae638100624971c3e279d0fc1e263c +Author: Jorge L. Williams +Date: Thu Apr 28 00:30:11 2011 -0500 + + Reverted accidental(?) WADL deletion >:-( + + docs/guide/src/docbkx/idm.wadl | 371 +++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 353 insertions(+), 18 deletions(-) + +commit 055aa283d55888a9eafc174c5a7f2a427531fd55 +Author: Ziad Sawalha +Date: Wed Apr 27 18:20:29 2011 -0700 + + Renamed protocol modules to auth_[type] + Renamed PAPIAuth to RemoteAuth - better documented it and added redirect to auth_token (to stop using this) + Cleaned up ini files and ini file handling (removed hard-coded defaults) + + docs/guide/src/docbkx/idm.wadl | 371 ++---------------------- + echo/echo/echo.ini | 3 +- + echo/echo/echo.py | 8 +- + echo/echo/echo_remote.ini | 13 +- + keystone/__init__.py | 12 +- + keystone/auth_protocols/auth_basic.py | 114 ++++++++ + keystone/auth_protocols/auth_openid.py | 113 ++++++++ + keystone/auth_protocols/auth_protocol_basic.py | 114 -------- + keystone/auth_protocols/auth_protocol_openid.py | 113 -------- + keystone/auth_protocols/auth_protocol_token.ini | 15 - + keystone/auth_protocols/auth_protocol_token.py | 252 ---------------- + keystone/auth_protocols/auth_token.ini | 18 ++ + keystone/auth_protocols/auth_token.py | 265 +++++++++++++++++ + 13 files changed, 551 insertions(+), 860 deletions(-) + +commit 4c3936177169868038497688098a867e3a1f1348 +Author: Jesse Andrews +Date: Wed Apr 27 14:28:08 2011 -0700 + + simple json cleanups for tests + + test/unit/test_identity.py | 84 ++++++++++++++++++++++------------------------ + 1 file changed, 40 insertions(+), 44 deletions(-) + +commit b4bcd1d9230b469bc19af5a12ccf1524f7de694b +Author: Jesse Andrews +Date: Wed Apr 27 14:06:51 2011 -0700 + + pep8-ize + + echo/echo/echo.py | 11 ++--- + keystone/auth_protocols/auth_protocol_basic.py | 13 +++--- + keystone/auth_protocols/auth_protocol_openid.py | 15 ++++--- + keystone/auth_protocols/auth_protocol_token.py | 53 +++++++++++++++---------- + keystone/db/sqlalchemy/api.py | 13 +++++- + keystone/db/sqlalchemy/session.py | 10 +++-- + keystone/middleware/papiauth.py | 4 +- + management/getgroupusers.py | 1 - + management/getuser.py | 1 + + management/useradd.py | 1 - + management/userupdate.py | 1 + + 11 files changed, 72 insertions(+), 51 deletions(-) + +commit 7122789e2f17c381b53cb4cf3ebc83f034ae100d +Merge: 79c7808 a1c66e6 +Author: Ziad Sawalha +Date: Wed Apr 27 12:18:55 2011 -0700 + + Merge branch 'master' of github.com:khussein/keystone + +commit 79c78088b600beb5351fed180ada384e012c9db1 +Author: Ziad Sawalha +Date: Wed Apr 27 12:18:32 2011 -0700 + + Added protocol stubs (openid and basic auth) + + keystone/auth_protocols/__init__.py | 0 + keystone/auth_protocols/auth_protocol_basic.py | 113 +++++++++++ + keystone/auth_protocols/auth_protocol_openid.py | 114 +++++++++++ + keystone/auth_protocols/auth_protocol_token.ini | 15 ++ + keystone/auth_protocols/auth_protocol_token.py | 243 ++++++++++++++++++++++++ + 5 files changed, 485 insertions(+) + +commit 87c469c630a32bdf407bfa569a5872943ec5fe9b +Author: Ziad Sawalha +Date: Wed Apr 27 12:16:15 2011 -0700 + + Renamed delegated to 'delay_auth_decision' + Remove PAPIAuth + Rename folder to Auth_protocols (that is where we add protocol components)Get_request -> get_content + Make protocol module more generic (prepare for superclassing and multiple protocol support + Refactor Auth_protocol_token + If no token, bail out quick (clearer) + same with if app + Break out headers: + - here is what is coming in + - here is what we add + - explain the X in headers: extended header + + README.md | 6 +- + echo/echo/echo.ini | 39 ++--- + echo/echo/echo.py | 7 +- + keystone/__init__.py | 12 +- + keystone/auth_protocol/__init__.py | 0 + keystone/auth_protocol/auth_protocol_token.ini | 15 -- + keystone/auth_protocol/auth_protocol_token.py | 209 ------------------------- + keystone/identity.py | 29 +++- + keystone/middleware/papiauth.py | 13 +- + 9 files changed, 71 insertions(+), 259 deletions(-) + +commit a1c66e6112337f9d530db6370886d03e650fe29c +Author: Sai Krishna +Date: Wed Apr 27 11:00:51 2011 +0530 + + Updated Readme, and added TODO + + README.md | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9cbbd847049ee3106df2a1d74fda3ffe1acb9e6c +Author: Sai Krishna +Date: Wed Apr 27 10:58:07 2011 +0530 + + Added XML/Json tests to the identity and updated the README + + README.md | 16 + + test/unit/test_identity.py | 774 ++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 639 insertions(+), 151 deletions(-) + +commit 3b32d5f29c8c59d26203ba597ebeb4c46738704d +Author: Ziad Sawalha +Date: Tue Apr 26 16:21:45 2011 -0700 + + Fixed issue with standalone install + + keystone/auth_protocol/auth_protocol_token.py | 7 ++++++- + keystone/middleware/papiauth.py | 2 -- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit a37f207bf8a3040bfc29aca2e4234818ff6eff6b +Author: Ziad Sawalha +Date: Tue Apr 26 15:57:55 2011 -0700 + + Updated readme + + README.md | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit ab7ddb7fc77e0274ff49ace0dca2db85e8f0cb54 +Author: Ziad Sawalha +Date: Tue Apr 26 15:51:00 2011 -0700 + + Fixed remote proxy issue + + echo/echo_client.py | 1 - + keystone/auth_protocol/auth_protocol_token.ini | 2 +- + keystone/auth_protocol/auth_protocol_token.py | 85 ++++++++++++++++---------- + keystone/middleware/papiauth.py | 1 + + 4 files changed, 55 insertions(+), 34 deletions(-) + +commit 08436d59f1b6b45111202acb8d6de7d77fc63a17 +Merge: a73d346 051e6fc +Author: Khaled Hussein +Date: Tue Apr 26 19:17:39 2011 +0000 + + Merge branch 'master' of github.com:khussein/keystone + +commit a73d34631fef2c6300838753602d938ff29c88ab +Author: Khaled Hussein +Date: Tue Apr 26 19:17:28 2011 +0000 + + draft remote proxy: needs fixing + + keystone/auth_protocol/auth_protocol_token.ini | 15 +++++++++++++++ + keystone/auth_protocol/auth_protocol_token.py | 15 +++++++++++++-- + 2 files changed, 28 insertions(+), 2 deletions(-) + +commit 051e6fcc9ca440382ba2d7b96ddc069317f68704 +Author: Ziad Sawalha +Date: Tue Apr 26 11:29:24 2011 -0700 + + Updated readme and echo_client + + README.md | 15 +++++++++++++-- + echo/echo_client.py | 21 +++++++++++---------- + 2 files changed, 24 insertions(+), 12 deletions(-) + +commit 34a80873994a972abfbba0d6611e88726bbdb343 +Author: Ziad Sawalha +Date: Tue Apr 26 01:54:51 2011 -0700 + + Adding remote echo ini file + + echo/echo/echo_remote.ini | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 308ff0bf6777c1f1ed90e446e88c5e31acbb6f09 +Merge: 356de9d c56f00e +Author: Ziad Sawalha +Date: Tue Apr 26 01:53:31 2011 -0700 + + Merge branch 'master' of github.com:khussein/keystone + + Conflicts: + keystone/auth_protocol/auth_protocol_token.py + +commit 356de9d622e5ff4386b3f20045ae586854d8e06d +Author: Ziad Sawalha +Date: Tue Apr 26 01:45:55 2011 -0700 + + Fixes to middleware, ini parameters, and support for running echo remotely + + echo/echo/echo.ini | 26 ++++++++++++--- + echo/echo/echo.py | 32 ++++++++++++------ + echo/echo_client.py | 20 +++++++++-- + keystone/auth_protocol/auth_protocol_token.py | 48 ++++++++++++++++++++------- + keystone/middleware/papiauth.py | 26 +++++++-------- + 5 files changed, 110 insertions(+), 42 deletions(-) + +commit c56f00effa3c2646b6881be39e94dd1e0559d44c +Author: Khaled Hussein +Date: Tue Apr 26 00:51:11 2011 +0000 + + replaced localhost with config + + keystone/auth_protocol/auth_protocol_token.py | 26 +++++++++++++++++--------- + 1 file changed, 17 insertions(+), 9 deletions(-) + +commit 59b0ef0d8767aaaed7a7bedfa25dd5948e56515e +Author: Khaled Hussein +Date: Mon Apr 25 23:51:30 2011 +0000 + + modifide middleware; echo_client works + + keystone/auth_protocol/auth_protocol_token.py | 28 ++++++++++++++++++++++----- + 1 file changed, 23 insertions(+), 5 deletions(-) + +commit c631f5f531f18684b9537e55232c25e4ae8f1050 +Author: Ziad Sawalha +Date: Mon Apr 25 18:12:13 2011 -0500 + + Fixing and documenting middleware + + keystone/auth_protocol/auth_protocol_token.py | 58 +++++++++++++++++++++++---- + keystone/middleware/papiauth.py | 44 +++++++++++++++++++- + 2 files changed, 92 insertions(+), 10 deletions(-) + +commit 0f05c73bbdd4acaf6ec005561b059f34f25e57cb +Merge: d279860 6686cdc +Author: Ziad Sawalha +Date: Mon Apr 25 14:11:12 2011 -0700 + + Merged pull request #30 from cloudbuilders/master. + + Fixes Issue #29 + +commit d279860452b4c998d94a248efa342519a96fbeaf +Author: Ziad Sawalha +Date: Mon Apr 25 16:08:45 2011 -0500 + + Updated management scripts to use SQLAlchemy + + keystone/db/sqlalchemy/api.py | 47 +++++++++++++++++++++++++++++++++++++++++++ + management/delgroup.py | 25 +++++++++++++---------- + management/getgroup.py | 22 +++++++++----------- + management/getgroups.py | 21 +++++++++---------- + management/getgroupusers.py | 22 +++++++++----------- + management/getuser.py | 23 +++++++++------------ + management/getusergroups.py | 24 +++++++++------------- + management/getusers.py | 22 +++++++++----------- + management/groupadd.py | 21 +++++++++---------- + management/setuserlock.py | 21 ++++++++++--------- + management/setuserpswd.py | 21 ++++++++++--------- + management/updategroup.py | 26 +++++++++++++----------- + management/useradd.py | 5 ++--- + management/userdel.py | 20 +++++++++--------- + management/userupdate.py | 22 ++++++++++---------- + 15 files changed, 187 insertions(+), 155 deletions(-) + +commit 6686cdc791188ace9d231b14d2254b2d8ed405bd +Merge: 3b8404b 011404e +Author: Vishvananda Ishaya +Date: Mon Apr 25 13:09:22 2011 -0700 + + Merge branch 'master' of github.com:khussein/keystone + +commit 011404e7b5a497c3543e3073b1e2b0c00c534494 +Author: Ziad Sawalha +Date: Mon Apr 25 14:53:14 2011 -0500 + + Fixed SQLAlchemy db location to keystone directory + + keystone/db/sqlalchemy/session.py | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +commit b5834294109e771e996330a91737f5743a9a9662 +Author: Ramana Juvvadi +Date: Mon Apr 25 12:54:49 2011 -0500 + + Added unit tests and updated the README.md on how to run it + + test/unit/test_identity.py | 498 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 498 insertions(+) + +commit 3b8404bb4456fee61fba8bde321e3a6d7faea7e9 +Author: Vishvananda Ishaya +Date: Mon Apr 25 01:21:44 2011 -0700 + + made echo test work + + echo/echo/echo.ini | 2 +- + echo/echo/echo.py | 26 +------------------------- + keystone/auth_protocol/auth_protocol_token.py | 25 ++++++++++++++----------- + 3 files changed, 16 insertions(+), 37 deletions(-) + +commit 42fd8a1f5d7a23900c06082948bbf43ca6e50c6c +Author: Jesse Andrews +Date: Sun Apr 24 23:48:34 2011 -0700 + + get_request is actually init model from request contents + + keystone/identity.py | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 614ca53c78f6902d7cbffa3f025fbd873708b07c +Author: Jesse Andrews +Date: Sun Apr 24 23:48:04 2011 -0700 + + missed simplejson assumption + + keystone/logic/types/tenant.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0ff4a9d4e42853b514dced8fe0ef9430235d82e4 +Merge: f60dc86 803ef68 +Author: Jesse Andrews +Date: Sun Apr 24 23:41:35 2011 -0700 + + finish removing simplejson + +commit f60dc8658f801088eefbc8aa66802bec44930036 +Author: Jesse Andrews +Date: Sun Apr 24 23:30:35 2011 -0700 + + pythonizing + + echo/echo/echo.py | 5 +- + echo/echo_client.py | 22 ++++---- + keystone/auth_protocol/auth_protocol_token.py | 2 +- + keystone/logic/types/auth.py | 2 +- + keystone/logic/types/fault.py | 2 +- + keystone/logic/types/tenant.py | 72 ++++++++------------------- + 6 files changed, 39 insertions(+), 66 deletions(-) + +commit 803ef6843e1263659803c9b36119ac6566f7308b +Merge: 196d27a 3ae7e74 +Author: Vishvananda Ishaya +Date: Sun Apr 24 23:28:21 2011 -0700 + + Merge branch 'master' of github.com:cloudbuilders/keystone + +commit 196d27ae46e37be53f2bbc18c3585df637c7152b +Author: Vishvananda Ishaya +Date: Sun Apr 24 23:27:57 2011 -0700 + + update fault to be pythonic + + keystone/logic/types/fault.py | 38 +++++++++++++------------------------- + 1 file changed, 13 insertions(+), 25 deletions(-) + +commit 0ca0d74bb62b9ed26044497bad82331fcd1939f1 +Author: Vishvananda Ishaya +Date: Sun Apr 24 23:23:57 2011 -0700 + + remove unpythonic properties from atom and tenant + + keystone/logic/types/atom.py | 30 ++++------------------ + keystone/logic/types/tenant.py | 57 +++++++++++++----------------------------- + 2 files changed, 22 insertions(+), 65 deletions(-) + +commit 3ae7e740a14327acccb3e35c71c21b8f7914ed1e +Merge: b58375e ade2429 +Author: Jesse Andrews +Date: Sun Apr 24 23:11:05 2011 -0700 + + Merge remote branch 'main/master' + +commit b58375e378f81595783bb99f94d0f8bafc262812 +Merge: f8c81fb 1573637 +Author: Jesse Andrews +Date: Sun Apr 24 23:08:28 2011 -0700 + + Merge branch 'master' of github.com:cloudbuilders/keystone + +commit 157363775fca5901a71ca6c8d8e822d560e011ac +Author: Vishvananda Ishaya +Date: Sun Apr 24 22:45:04 2011 -0700 + + error decorator and logging unhandled errors + + keystone/identity.py | 210 +++++++++++++++++++++++---------------------------- + 1 file changed, 95 insertions(+), 115 deletions(-) + +commit f8c81fb93ce7f8e1164f9dc7517574a645d90f73 +Author: Jesse Andrews +Date: Sun Apr 24 22:39:55 2011 -0700 + + missed auth_data + + keystone/logic/service.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ca46c18d653cfcd38b70057a2632018ef0d86ad7 +Author: Vishvananda Ishaya +Date: Sun Apr 24 22:31:28 2011 -0700 + + fix typos + + keystone/logic/service.py | 2 +- + keystone/logic/types/auth.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ca1b4c83d70da5239f2265ff90c1b12303e65378 +Merge: 198b5ae 6731b9f +Author: Jesse Andrews +Date: Sun Apr 24 20:14:20 2011 -0700 + + Merge branch 'master' of github.com:cloudbuilders/keystone + +commit 198b5ae693c41e14229c5e4bc6009c352d66fe6a +Author: Jesse Andrews +Date: Sun Apr 24 20:13:57 2011 -0700 + + more pythonic + + keystone/identity.py | 41 ++++++++++++++++++++--------------------- + keystone/logic/service.py | 36 +++++++++++++++--------------------- + keystone/logic/types/auth.py | 7 +------ + 3 files changed, 36 insertions(+), 48 deletions(-) + +commit 5bfc134079fc0844a4036b858196069c960a2a6e +Author: Jesse Andrews +Date: Sun Apr 24 19:27:35 2011 -0700 + + we don't need properties yet + + keystone/logic/types/auth.py | 104 ++++++++++--------------------------------- + 1 file changed, 24 insertions(+), 80 deletions(-) + +commit a0aa7fb84ded17d769194c3dea4888c3d6274472 +Author: Jesse Andrews +Date: Sun Apr 24 19:23:47 2011 -0700 + + use string formating + + keystone/middleware/papiauth.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6731b9ffb8487d015bdae037289a53fe7419e5d5 +Author: Vishvananda Ishaya +Date: Sun Apr 24 17:11:30 2011 -0700 + + use relative import in init + + keystone/__init__.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 550d94eb6cf2a5a844cec62dc505492c04ef2bc4 +Author: Vishvananda Ishaya +Date: Sun Apr 24 17:07:50 2011 -0700 + + fixed paste configs to run without eggs + + echo/echo/echo.ini | 7 +++---- + echo/setup.py | 2 +- + keystone/__init__.py | 3 +++ + setup.py | 5 ++--- + 4 files changed, 9 insertions(+), 8 deletions(-) + +commit ade24292780f55ad1bd7b699a956820d83052493 +Author: Ziad Sawalha +Date: Sun Apr 24 16:21:22 2011 -0700 + + Fixed mistake in port for echo service. + + echo/echo_client.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 80e2ed287b9783961fb4168cf96fb01443935e91 +Author: Ziad Sawalha +Date: Sun Apr 24 18:09:44 2011 -0500 + + Added echo_client.py + + echo/echo_client.py | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 54 insertions(+) + +commit 197e7d4d8c05ce757c8636d948d81fcdae92d259 +Author: Vishvananda Ishaya +Date: Sun Apr 24 16:07:14 2011 -0700 + + keystone.db should be in keystone dir + + README.md | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7c1e7d8f8a3a7fd77a93afadd07204d5273225a3 +Author: Jesse Andrews +Date: Sun Apr 24 15:58:18 2011 -0700 + + pep8 / whitespace + + echo/echo/echo.py | 14 +- + echo/setup.py | 24 ++-- + keystone/auth_protocol/auth_protocol_token.py | 3 +- + keystone/db/sqlalchemy/api.py | 138 +++++++++++--------- + keystone/db/sqlalchemy/session.py | 15 ++- + keystone/identity.py | 180 ++++++++++++++++---------- + keystone/logic/service.py | 39 +++--- + keystone/logic/types/auth.py | 25 ++-- + keystone/logic/types/tenant.py | 19 +-- + keystone/middleware/papiauth.py | 4 +- + management/delgroup.py | 32 ++--- + management/getgroup.py | 40 +++--- + management/getgroups.py | 38 +++--- + management/getgroupusers.py | 42 +++--- + management/getuser.py | 39 +++--- + management/getusergroups.py | 42 +++--- + management/getusers.py | 42 +++--- + management/groupadd.py | 39 +++--- + management/setuserlock.py | 53 ++++---- + management/setuserpswd.py | 37 +++--- + management/updategroup.py | 37 +++--- + management/useradd.py | 41 +++--- + management/userdel.py | 33 ++--- + management/userupdate.py | 35 ++--- + setup.py | 33 ++--- + 25 files changed, 556 insertions(+), 488 deletions(-) + +commit f86bdc3c2cc4b47471aa37be6506414d121bf93f +Author: Jesse Andrews +Date: Sun Apr 24 14:37:34 2011 -0700 + + gitignore pyc files + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 577391a9fc10deae163a6fa3143d705e9cdaa6e7 +Author: Vishvananda Ishaya +Date: Sun Apr 24 14:10:13 2011 -0700 + + split out running and installing sections in readme + + README.md | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit 4c28ebbd1fc6e66309a59fe93a482fcc5ba48963 +Author: Vishvananda Ishaya +Date: Sun Apr 24 14:03:27 2011 -0700 + + allow apps to be run without setup.py + + echo/echo/__init__.py | 1 + + echo/echo/echo.py | 24 ++++++++++++++++++++---- + keystone/identity.py | 14 +++++++++++--- + 3 files changed, 32 insertions(+), 7 deletions(-) + +commit b9ab84568e96b2686993dfb644c7eb174242b194 +Author: Vishvananda Ishaya +Date: Sun Apr 24 13:20:59 2011 -0700 + + add command for test database to readme + + README.md | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit 74b5e480fb6a3665d16d0dadc8cf8f8fd2ab44f8 +Author: Jesse Andrews +Date: Sun Apr 24 13:15:36 2011 -0700 + + echo has a separate setup.py + + README.md | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 628a9f9bec5a4fc6c0ae02b9225d1b99d702ca02 +Author: Jesse Andrews +Date: Sun Apr 24 13:11:49 2011 -0700 + + httplib2 isn't used + + README.md | 8 ++++---- + echo/echo/echo.py | 2 +- + pip-requires | 1 - + 3 files changed, 5 insertions(+), 6 deletions(-) + +commit 1e86ecad53a4c8852dbcb9e5a678aee1f9594ac7 +Merge: a498b65 602a07f +Author: Jesse Andrews +Date: Sun Apr 24 13:06:21 2011 -0700 + + Merge branch 'master' of github.com:cloudbuilders/keystone + +commit a498b65d3ed074190c884cdf5dc86c3ee1a0628f +Author: Jesse Andrews +Date: Sun Apr 24 13:06:14 2011 -0700 + + spacing + + README.md | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 602a07fe5c5d36610f2862440cbd52d30d569b2d +Author: Vishvananda Ishaya +Date: Sun Apr 24 13:04:10 2011 -0700 + + add httplib2 to deps and sort them + + README.md | 10 ++++++---- + pip-requires | 1 + + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit 10a9d3c650ff786ad2c66dce94071ad154addf27 +Author: Vishvananda Ishaya +Date: Sun Apr 24 12:46:32 2011 -0700 + + Added pip-requires and updated readme to include missing deps + + README.md | 21 ++++++++++++++------- + pip-requires | 10 ++++++++++ + 2 files changed, 24 insertions(+), 7 deletions(-) + +commit b0286c0fd4184350960b64e3682a55dee54dea40 +Author: Jesse Andrews +Date: Sun Apr 24 12:18:27 2011 -0700 + + explict installs for python libraries + + README.md | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 7a61ba6be27c6cf6f475e1adb683279cbcebfb7a +Author: Jesse Andrews +Date: Sun Apr 24 12:01:13 2011 -0700 + + update readme formating + + README.md | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit a1d276ca3a76c4ae364d591cba50d53dc9a5c73f +Author: Jesse Andrews +Date: Sun Apr 24 11:59:49 2011 -0700 + + update readme to be markdown + + README | 62 --------------------------------------------- + README.md | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 86 insertions(+), 62 deletions(-) + +commit f881101d8a08025854817fbcb829e853b86368b7 +Author: Jorge L. Williams +Date: Sat Apr 23 16:08:54 2011 -0500 + + Updated readme. + + README | 94 +++++++----------------------------------------------------------- + 1 file changed, 9 insertions(+), 85 deletions(-) + +commit 4ec9056516708af10aceb3ed5ab692fd867a99b9 +Author: Jorge L. Williams +Date: Sat Apr 23 16:00:25 2011 -0500 + + Doc fixes. + + docs/guide/src/docbkx/idmdevguide.xml | 9 ++- + docs/guide/src/docbkx/samples/extensions.json | 82 +++++++++++++------------- + keystone/content/idmdevguide.pdf | Bin 207507 -> 208102 bytes + 3 files changed, 50 insertions(+), 41 deletions(-) + +commit 142b37ea2127751ff12925c766435a377d73b3b0 +Author: Jorge L. Williams +Date: Sat Apr 23 15:37:21 2011 -0500 + + Friendly error message if a user is not associated with a tenant. + + keystone/logic/service.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit c7855e193bbf123515bf30c3939211e57e2e6070 +Author: Jorge L. Williams +Date: Sat Apr 23 15:12:05 2011 -0500 + + Ensure schema complience assertion is on in all tests. + + test/IdentitySOAPUI.xml | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit e38a636937b1e65a100cb2211a5f660e519338ab +Author: Jorge L. Williams +Date: Sat Apr 23 15:01:28 2011 -0500 + + Whoops, details element is optional in faults. + + keystone/logic/types/fault.py | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit ab9a70dc119cb9567b676297f5ba0040345a06be +Author: Jorge L. Williams +Date: Sat Apr 23 14:42:46 2011 -0500 + + Remove identity (1) stuff and renamed identity2 to identity. + + db/keystone.db | Bin 20480 -> 0 bytes + keystone/identity.py | 1455 +++++++------------------------------------- + keystone/identity2.py | 253 -------- + test/unit/test_keystone.py | 377 ------------ + 4 files changed, 231 insertions(+), 1854 deletions(-) + +commit a310b6ab7bd9a11bc7121072dd27a9840e6a9407 +Author: Jorge L. Williams +Date: Sat Apr 23 14:11:54 2011 -0500 + + Added wadl and xsd contract links. + + keystone/identity2.py | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit 3939ef451d0d2ece335a8f918b9b2fa1789d3d51 +Author: Jorge L. Williams +Date: Sat Apr 23 14:10:05 2011 -0500 + + Adjust reletive links in schema. + + docs/guide/src/docbkx/xsd/extensions.xsd | 2 +- + docs/guide/src/docbkx/xsd/tenant.xsd | 2 +- + docs/guide/src/docbkx/xsd/version.xsd | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 142f6df62c341548199c88b718f6ba9292a9b83e +Author: Jorge L. Williams +Date: Sat Apr 23 13:28:47 2011 -0500 + + Comment seperators. + + keystone/identity2.py | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit accadb276360f4bfc5885b91bc0089b830d0c9f2 +Author: Jorge L. Williams +Date: Sat Apr 23 13:28:25 2011 -0500 + + Init version links + + keystone/content/idmdevguide.pdf | Bin 0 -> 207507 bytes + keystone/identity2.py | 10 ++++++++++ + 2 files changed, 10 insertions(+) + +commit 0ea0706f27cd7b9073d32db63df55a3634bd8059 +Author: Jorge L. Williams +Date: Sat Apr 23 13:13:32 2011 -0500 + + Initial version support. + + keystone/content/version.json.tpl | 33 +++++++++++++++++++++++++++++++++ + keystone/content/version.xml.tpl | 23 +++++++++++++++++++++++ + keystone/identity2.py | 21 +++++++++++++++++++++ + test/IdentitySOAPUI.xml | 8 +++++--- + 4 files changed, 82 insertions(+), 3 deletions(-) + +commit b464367511941884c1500c991500568810a0fd7a +Author: Jorge L. Williams +Date: Sat Apr 23 12:33:05 2011 -0500 + + Initial extensions support. + + keystone/content/extensions.json | 1 + + keystone/content/extensions.xml | 5 +++++ + keystone/identity2.py | 29 +++++++++++++++++++++++++++++ + test/IdentitySOAPUI.xml | 6 ++++-- + 4 files changed, 39 insertions(+), 2 deletions(-) + +commit d3801964773ac300dc6150eaa1b5bc6ec1c4489d +Author: Jorge L. Williams +Date: Sat Apr 23 11:06:45 2011 -0500 + + Initial update tenant. + + keystone/db/sqlalchemy/api.py | 2 +- + keystone/identity2.py | 8 ++++++ + keystone/logic/service.py | 19 +++++++++++++- + keystone/logic/types/tenant.py | 13 +++++----- + test/IdentitySOAPUI.xml | 57 +++++++++++++++++++++++++++++++++++++++++- + 5 files changed, 90 insertions(+), 9 deletions(-) + +commit 2fcf028a0a1d25c1460237da326098f8fc199646 +Author: Jorge L. Williams +Date: Sat Apr 23 09:06:08 2011 -0500 + + Make sure we don't delete non-empty tenants. + + keystone/db/sqlalchemy/api.py | 11 +++++++++++ + keystone/logic/service.py | 3 +++ + test/IdentitySOAPUI.xml | 12 +++++++++--- + test/test_setup.sql | 3 +++ + 4 files changed, 26 insertions(+), 3 deletions(-) + +commit dc22758ba8869a1fd8e50447d29227d04141ecbb +Author: Jorge L. Williams +Date: Sat Apr 23 08:33:14 2011 -0500 + + Initial delete tenant. + + keystone/identity2.py | 7 +++++++ + keystone/logic/service.py | 9 ++++++++- + test/IdentitySOAPUI.xml | 22 ++++++++++++++++++++-- + 3 files changed, 35 insertions(+), 3 deletions(-) + +commit 555e5786d7001fde519a4fcdb4f1e6b482b60f08 +Author: Jorge L. Williams +Date: Sat Apr 23 08:02:26 2011 -0500 + + Initial getTenant. + + keystone/identity2.py | 7 +++++++ + keystone/logic/service.py | 8 +++++++- + test/IdentitySOAPUI.xml | 20 ++++++++++++++++++-- + 3 files changed, 32 insertions(+), 3 deletions(-) + +commit 0d48b9b412a44bdc13e0eab6a937a516f6364d71 +Author: Jorge L. Williams +Date: Fri Apr 22 22:39:01 2011 -0500 + + Minor updates to tests. + + test/EchoSOAPUI.xml | 2 +- + test/IdentitySOAPUI.xml | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit f7989f34a6a2eefe3ccdbf27d429e0dfb35dc42f +Author: Jorge L. Williams +Date: Fri Apr 22 21:57:02 2011 -0500 + + Initial implementation of get tenants. + + keystone/identity2.py | 13 +++++++++++++ + keystone/logic/service.py | 13 ++++++++++--- + keystone/logic/types/tenant.py | 7 +++++-- + test/IdentitySOAPUI.xml | 6 ++++-- + 4 files changed, 32 insertions(+), 7 deletions(-) + +commit 03b2e5fedce2c7538c023e16624da01210c202f4 +Author: Ramana Juvvadi +Date: Fri Apr 22 12:59:54 2011 -0500 + + added unit tests in test/unit/test_keystone.py + + test/unit/test_keystone.py | 377 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 377 insertions(+) + +commit 72a3196ceb5ae9d6b3c40748281b7c52ef25d298 +Merge: 7985123 169999b +Author: Jorge L. Williams +Date: Fri Apr 22 17:18:42 2011 -0500 + + Merge branch 'master' of github.com:khussein/keystone + +commit 7985123df1dcf29901def03e0df3f58319ce0449 +Author: Jorge L. Williams +Date: Fri Apr 22 17:17:27 2011 -0500 + + Initial create tenant. + + keystone/db/sqlalchemy/api.py | 2 - + keystone/identity2.py | 10 ++++- + keystone/logic/service.py | 21 ++++++++-- + test/IdentitySOAPUI.xml | 90 +++++++++++++++++++++++++++++++++++++++++-- + 4 files changed, 112 insertions(+), 11 deletions(-) + +commit e6eef5ac518d5d9405fa8f938aacf606fe7586d1 +Author: Jorge L. Williams +Date: Fri Apr 22 16:36:37 2011 -0500 + + Minor bug when serializing tenant to JSON. + + keystone/logic/types/tenant.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 169999b82e551647343c127e9f0b47b0fb4e87e9 +Author: Ziad Sawalha +Date: Fri Apr 22 14:53:39 2011 -0500 + + Schema update + + db/keystone.db | Bin 12288 -> 20480 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit ddbfb387e00c478a6b0246adca175c0e65f6d324 +Author: Jorge L. Williams +Date: Fri Apr 22 14:26:02 2011 -0500 + + Whoops forgot 409 in JSON as well! + + docs/guide/src/docbkx/idm.wadl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 61c244a4c9c959f2ec97e0e4d32dec7174c0b5fe +Author: Jorge L. Williams +Date: Fri Apr 22 13:51:46 2011 -0500 + + Whoops missed 409 on create tenant. + + docs/guide/src/docbkx/idm.wadl | 3 +++ + 1 file changed, 3 insertions(+) + +commit 1affe1e2b565404d30697bc04e1380ccbb4270a8 +Merge: 521013e 7116b92 +Author: Ziad Sawalha +Date: Fri Apr 22 13:16:19 2011 -0500 + + setup.py fix + +commit 521013ec7c17fbee013b239a8d0842f2a6b9bc23 +Merge: 6ba7038 89c2363 +Author: Ziad Sawalha +Date: Fri Apr 22 13:13:55 2011 -0500 + + Minor fixes + +commit 7116b9250b431b8f3d31001da26f115cf3c99f04 +Author: John Eo +Date: Fri Apr 22 11:33:29 2011 -0500 + + pep-8 cleanup of model + + keystone/db/sqlalchemy/models.py | 69 ++++++++++++++++++++-------------------- + 1 file changed, 34 insertions(+), 35 deletions(-) + +commit 5aa1d57c99b8202f57df453b8049a93de4d432cb +Author: John Eo +Date: Fri Apr 22 10:54:52 2011 -0500 + + More pep-8 cleanup + + setup.py | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 6ba7038a17a494b30c2217b9a1c3edda696c847c +Author: Ziad Sawalha +Date: Fri Apr 22 10:53:40 2011 -0500 + + Minor fixes + + management/getusers.py | 4 ++-- + management/useradd.py | 1 + + setup.py | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +commit 89c236397252c4c32485313dc6fdb80f2c94418c +Author: John Eo +Date: Fri Apr 22 10:33:37 2011 -0500 + + Some pep-8 cleanup + + setup.py | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +commit 9976647ae34518b6c1671eaf37f1d1b9209c8a2d +Author: Jorge L. Williams +Date: Fri Apr 22 10:00:38 2011 -0500 + + Initial revoke token. + + keystone/db/sqlalchemy/api.py | 7 +++++++ + keystone/identity2.py | 30 ++++++++++++++++++++---------- + keystone/logic/service.py | 10 +++++++++- + test/IdentitySOAPUI.xml | 7 +++++-- + 4 files changed, 41 insertions(+), 13 deletions(-) + +commit 81e7af5159b3a675b6d95bcff114825d8bbc2738 +Author: Jorge L. Williams +Date: Fri Apr 22 08:33:46 2011 -0500 + + Initial support for authenticate. + + keystone/db/sqlalchemy/api.py | 8 +++++- + keystone/identity2.py | 17 ++++++++++++- + keystone/logic/service.py | 57 +++++++++++++++++++++++++++++++++---------- + test/IdentitySOAPUI.xml | 42 +++++++++++++++++++++++++------ + 4 files changed, 101 insertions(+), 23 deletions(-) + +commit f1285fdd5160ba8407d95912c8c194b8eca44618 +Author: Jorge L. Williams +Date: Fri Apr 22 04:34:39 2011 -0500 + + Whoops, bad user data. + + keystone/logic/service.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3afd59d70eb1493329321b6b9b775f273456e043 +Merge: 68438ff 40ec11b +Author: Jorge L. Williams +Date: Fri Apr 22 04:28:12 2011 -0500 + + Merge branch 'master' of github.com:khussein/keystone + +commit 68438ff0c649e3e30b0c953795eef62478d965ef +Author: Jorge L. Williams +Date: Fri Apr 22 04:22:53 2011 -0500 + + Initial working validate token. + + keystone/db/sqlalchemy/api.py | 6 ++++ + keystone/logic/service.py | 45 ++++++++++++++++++----- + test/EchoSOAPUI.xml | 2 +- + test/IdentitySOAPUI.xml | 83 ++++++++++++++++++++++++++++--------------- + 4 files changed, 99 insertions(+), 37 deletions(-) + +commit a448a729154082b5de6164ca73c17148a9885aad +Author: Jorge L. Williams +Date: Fri Apr 22 03:39:58 2011 -0500 + + Whoops need to convert datetimes to iso format. + + keystone/logic/types/auth.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit a8f12bf60f36b0769ffb8b5cce2b51a359a1010e +Author: Jorge L. Williams +Date: Fri Apr 22 02:32:30 2011 -0500 + + Test updates. + + test/EchoSOAPUI.xml | 2 +- + test/IdentitySOAPUI.xml | 29 ++++++++++++++++++++++++++--- + 2 files changed, 27 insertions(+), 4 deletions(-) + +commit 7ab81a8813f915fd7282f683d25b3b093c139c2b +Author: Jorge L. Williams +Date: Fri Apr 22 02:20:55 2011 -0500 + + tokenId should not be a string! + + docs/guide/src/docbkx/xsd/token.xsd | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 53cbd3bc9667bb46f16aa7c23ee4e278e6dd6009 +Author: Jorge L. Williams +Date: Fri Apr 22 01:25:45 2011 -0500 + + Cleaned up validate token call. + + keystone/logic/service.py | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +commit 552ce8f9c5984434b80b8af15f109b8a1850b73c +Author: Jorge L. Williams +Date: Fri Apr 22 00:53:37 2011 -0500 + + Full check admin token with soap ui tests. + + keystone/db/sqlalchemy/api.py | 7 + + keystone/db/sqlalchemy/models.py | 2 +- + keystone/logic/service.py | 11 + + test/EchoSOAPUI.xml | 2 +- + test/IdentitySOAPUI.xml | 1092 +++++++++++++++++++++++++++++++++++++- + test/test_setup.sql | 6 + + 6 files changed, 1117 insertions(+), 3 deletions(-) + +commit fa8027ca947731c98f4f0e8aa06c0616bf95efa8 +Author: Jorge L. Williams +Date: Thu Apr 21 23:36:19 2011 -0500 + + Some SQL testing scripts. + + test/kill.sql | 10 +++++++++ + test/test_setup.sql | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 72 insertions(+) + +commit 9e3eeeb235cb7f762a428e2420a95351a3aa249d +Author: Jorge L. Williams +Date: Thu Apr 21 23:35:39 2011 -0500 + + Initial check admin token from db. + + keystone/db/sqlalchemy/api.py | 6 ++---- + keystone/logic/service.py | 5 ++++- + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit 40ec11bff863923494fbcf6d3464b88817091eaa +Author: Ramana Juvvadi +Date: Thu Apr 21 22:26:28 2011 -0500 + + made identity.py pep8 compliant + + keystone/identity.py | 610 +++++++++++++++++++++++++++++++-------------------- + 1 file changed, 376 insertions(+), 234 deletions(-) + +commit f9689fc6fa0321223c0fc09ec91dc82e59eea8b0 +Author: Jorge L. Williams +Date: Thu Apr 21 21:28:21 2011 -0500 + + Better error handling. + + keystone/identity2.py | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +commit 7eda7dd088e490d3dfff3498fc8fbd88a6df671e +Author: Jorge L. Williams +Date: Thu Apr 21 21:03:53 2011 -0500 + + Initial full response to authenticate token, still having issues with errors. + + keystone/identity2.py | 43 ++++++++++++++++++++++++++++++++++++++++++- + keystone/logic/service.py | 15 ++++++++++----- + 2 files changed, 52 insertions(+), 6 deletions(-) + +commit 8bb4887abf9a56291fe38bd43ece5d5cbc8aebd5 +Merge: c03f897 35fb99e +Author: Jorge L. Williams +Date: Thu Apr 21 16:53:57 2011 -0500 + + Merge branch 'master' of github.com:khussein/keystone + +commit c03f897ce59b437f0fea5c00671997d8a1cab9a0 +Author: Jorge L. Williams +Date: Thu Apr 21 16:53:27 2011 -0500 + + Stubb for token calls. + + keystone/identity2.py | 35 +++++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) + +commit 35fb99ec78f3c30a13036b550284b9f26de2bca0 +Author: Khaled Hussein +Date: Thu Apr 21 20:27:21 2011 +0000 + + Initial prototype of default token based auth protocol + + docs/guide/src/docbkx/samples/auth.json | 2 +- + echo/echo/echo.ini | 7 ++ + keystone/auth_protocol/__init__.py | 0 + keystone/auth_protocol/auth_protocol_token.py | 73 ++++++++++++ + keystone/common/__init__.py | 0 + keystone/common/bufferedhttp.py | 165 ++++++++++++++++++++++++++ + keystone/identity.py | 1 - + setup.py | 1 + + 8 files changed, 247 insertions(+), 2 deletions(-) + +commit f07960914663c6bdefd41493e413df275931800f +Merge: 68269b9 f98bf57 +Author: Jorge L. Williams +Date: Thu Apr 21 14:43:59 2011 -0500 + + Merge branch 'master' of github.com:khussein/keystone + +commit 68269b9442faf7981be4dc1ad5f3e8158ced3f1d +Author: Jorge L. Williams +Date: Thu Apr 21 14:43:44 2011 -0500 + + Initial deserialization of tenant. + + keystone/logic/types/tenant.py | 48 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +commit b84627f8b13f9553a1d6fd3331c75bba7122bfff +Author: Jorge L. Williams +Date: Thu Apr 21 13:55:29 2011 -0500 + + Initial deserialization of password credentials. + + keystone/logic/types/auth.py | 41 +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 41 insertions(+) + +commit f98bf5777a1270472e7cd4f7b4badd3cf5e2f8b0 +Author: Ziad Sawalha +Date: Thu Apr 21 11:26:08 2011 -0500 + + SQL Alchemy additions: Token + + keystone/db/sqlalchemy/api.py | 14 ++++++++++++++ + management/useradd.py | 6 +++--- + 2 files changed, 17 insertions(+), 3 deletions(-) + +commit f7479387cff81c91a7c5cede7c0d511d15dfc269 +Author: Ziad Sawalha +Date: Thu Apr 21 11:20:19 2011 -0500 + + SQL Alchemy additions + + keystone/db/sqlalchemy/api.py | 5 +++++ + management/useradd.py | 25 +++++++++++++++---------- + 2 files changed, 20 insertions(+), 10 deletions(-) + +commit 5abebbd69c65c67d3198411438fce12aee3e3b32 +Author: Jorge L. Williams +Date: Thu Apr 21 05:44:21 2011 -0500 + + Whoops pep8 + + keystone/logic/types/fault.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 323bac0551268afdeb780014126bcb0f28d141dc +Author: Jorge L. Williams +Date: Thu Apr 21 05:41:19 2011 -0500 + + Output serialization of faults. + + keystone/logic/types/fault.py | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +commit 61f495812a648180cd91e6a1d63dfd0e6bfb7aa7 +Author: Jorge L. Williams +Date: Thu Apr 21 05:09:43 2011 -0500 + + XML and JSON rendering on tenant/s + + keystone/logic/types/tenant.py | 46 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +commit 34e212b49135f86f535451afa2fc130876b52fe2 +Author: Jorge L. Williams +Date: Thu Apr 21 04:13:36 2011 -0500 + + Translations of auth to XML and JSON. + + keystone/logic/types/auth.py | 45 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + +commit 2365a53b04d9d4b71bfb7f7b3d4bea54158ee40b +Author: KnightHacker +Date: Thu Apr 21 03:35:40 2011 -0500 + + Sample service.py with sqlalchemy + + keystone/logic/service.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit a507f1e14ae81af08156f0e0b4c4c937378101be +Author: KnightHacker +Date: Thu Apr 21 03:14:00 2011 -0500 + + Fixed relative path issue + + echo/echo/echo.py | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit d5a6dc2ad06c6937114f81c0e08a0c31c802336d +Author: KnightHacker +Date: Thu Apr 21 02:25:26 2011 -0500 + + sqlalchemy draft + + keystone/db/__init__.py | 0 + keystone/db/sqlalchemy/__init__.py | 24 +++++++ + keystone/db/sqlalchemy/api.py | 55 +++++++++++++++ + keystone/db/sqlalchemy/models.py | 136 +++++++++++++++++++++++++++++++++++++ + keystone/db/sqlalchemy/session.py | 49 +++++++++++++ + 5 files changed, 264 insertions(+) + +commit 2982a2ddfc053c36e533134be18023aa193f1dbf +Merge: 34350a8 9c4c01d +Author: Jorge L. Williams +Date: Thu Apr 21 01:35:28 2011 -0500 + + Merge branch 'master' of github.com:khussein/keystone + +commit 34350a8cc4daaf1d96a7be5c279fdac9703de2b1 +Author: Jorge L. Williams +Date: Thu Apr 21 01:35:07 2011 -0500 + + Initial service.py + + keystone/logic/service.py | 67 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 67 insertions(+) + +commit 9c4c01d90a4cacf78a241f057222981c5a405ffc +Author: Ziad Sawalha +Date: Wed Apr 20 22:59:22 2011 -0700 + + Cleaned up setup.py + + setup.py | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 4cfe563d2722228053aedbe779b9e42883c51048 +Author: Jorge L. Williams +Date: Thu Apr 21 00:44:47 2011 -0500 + + Added collections. + + keystone/logic/types/auth.py | 16 ++++++++++++++++ + keystone/logic/types/tenant.py | 16 ++++++++++++++++ + 2 files changed, 32 insertions(+) + +commit b2f7db8df83b62061b98982f2f33e2147bbf500c +Author: Jorge L. Williams +Date: Thu Apr 21 00:38:29 2011 -0500 + + Initial atom link type. + + keystone/logic/types/atom.py | 45 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + +commit d28a2588456fde0f44da6db481772fef1ace2550 +Author: Jorge L. Williams +Date: Thu Apr 21 00:30:17 2011 -0500 + + Initial fault type. + + keystone/logic/types/fault.py | 98 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 98 insertions(+) + +commit 87432b4c00d85656ab531fc7fc5f88830233e267 +Author: Jorge L. Williams +Date: Wed Apr 20 23:50:30 2011 -0500 + + Initial tenant type. + + keystone/logic/types/tenant.py | 35 +++++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) + +commit 415ea9d5a64de8295fa2847f5f3fd8f9b974cfc4 +Author: Ziad Sawalha +Date: Wed Apr 20 23:45:07 2011 -0500 + + PEP-8 for echo.py + + echo/echo/echo.py | 50 +++++++++++++++++++++++++++----------------------- + 1 file changed, 27 insertions(+), 23 deletions(-) + +commit c09425b8d71be4293ff3f853fea789d5f669759f +Author: Jorge L. Williams +Date: Wed Apr 20 23:27:17 2011 -0500 + + Initial auth types. + + keystone/logic/__init__.py | 0 + keystone/logic/types/__init__.py | 0 + keystone/logic/types/auth.py | 111 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 111 insertions(+) + +commit 9790c7258c89b5fbf21b159a6cd5a2290f89c2d3 +Author: Ziad Sawalha +Date: Wed Apr 20 23:30:03 2011 -0500 + + Readme update + + README | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 4476e18d87411414d61348af449531f27ae84b1f +Author: Ziad Sawalha +Date: Wed Apr 20 23:13:29 2011 -0500 + + Fixed identity.py and some styling + + echo/echo/echo.py | 4 +++- + keystone/identity.py | 12 +++++++----- + 2 files changed, 10 insertions(+), 6 deletions(-) + +commit 74c73c9fec5e076afd8433d630f3de3dadec8cfa +Author: Ziad Sawalha +Date: Wed Apr 20 21:59:01 2011 -0500 + + Minor updates + + HACKING | 68 ++++++++++++++++++++++++++++ + echo/echo/echo.py | 6 ++- + keystone/identity.py | 122 ++++++++++++++++----------------------------------- + 3 files changed, 111 insertions(+), 85 deletions(-) + +commit 3dfc06473b2527911cc11c494ed7029803acdf19 +Author: Ziad Sawalha +Date: Wed Apr 20 20:22:17 2011 -0500 + + Keystone WSGI and eventlet + + echo/echo/echo.py | 9 +++------ + keystone/identity.py | 47 ++++++++++++++++++++++++----------------------- + keystone/keystone.ini | 6 ------ + setup.py | 2 +- + 4 files changed, 28 insertions(+), 36 deletions(-) + +commit 931db2b1da270121cfc26b3e432e3562a677e922 +Author: Khaled Hussein +Date: Wed Apr 20 21:42:08 2011 +0000 + + Corrected how to run echo service + + README | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8a9afc1eb28735c6a33ee4ea9f3c6f3c533980c1 +Author: Khaled Hussein +Date: Wed Apr 20 21:39:33 2011 +0000 + + Replaced paster with eventlet for echo service + + echo/echo/echo.ini | 5 ----- + echo/echo/echo.py | 7 ++++--- + echo/setup.py | 4 +--- + keystone/middleware/papiauth.py | 9 +++++---- + 4 files changed, 10 insertions(+), 15 deletions(-) + +commit 0c4137d69626c94113205a173aa87a5691615b44 +Author: Ramana Juvvadi +Date: Wed Apr 20 13:28:49 2011 -0500 + + Added create tables in README and modified keystone.db to reflect the new schema + + README | 11 +++++++---- + db/keystone.db | Bin 5120 -> 12288 bytes + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit cb6cbc200438494cb56753f12d06db383b85d6c7 +Author: Sai Krishna +Date: Wed Apr 20 21:07:49 2011 +0530 + + Merged identity functions second time + + README | 26 +- + keystone/identity.py | 1832 ++++++++++++++++++++++++++++++-------------------- + 2 files changed, 1128 insertions(+), 730 deletions(-) + +commit e94081a567eabfe0423e62a54b53a11d74bb5d64 +Merge: 28f811e f1a000f +Author: Ziad Sawalha +Date: Tue Apr 19 18:50:36 2011 -0500 + + Merge branch 'master' of github.com:khussein/keystone + +commit 28f811e7dd34e0084a3199f3aa32273d1845f669 +Author: Ziad Sawalha +Date: Tue Apr 19 18:50:22 2011 -0500 + + Sync + + README | 2 +- + echo/echo/echo.ini | 11 ++++++----- + echo/echo/echo.py | 5 +++++ + keystone/identity.py | 14 ++++++++------ + keystone/middleware/papiauth.py | 11 +++++++---- + test/EchoSOAPUI.xml | 2 +- + test/IdentitySOAPUI.xml | 2 +- + 7 files changed, 29 insertions(+), 18 deletions(-) + +commit f1a000f86b4b9dae6d2932e83b7b6ad5f7ed7417 +Author: Jorge L. Williams +Date: Tue Apr 19 15:02:24 2011 -0500 + + Whoops should have never checked this in. + + docs/guide/src/docbkx/idmdevguide.xml~ | 1853 -------------------------------- + 1 file changed, 1853 deletions(-) + +commit 8fc9a890193df44015c010e8871d54cc74382258 +Author: Sai Krishna +Date: Tue Apr 19 18:49:18 2011 +0530 + + all management files except user add and delete from group + + management/useradd.py | 78 +++++++++++++++++++++++++-------------------------- + management/userdel.py | 76 ++++++++++++++++++++++++------------------------- + 2 files changed, 77 insertions(+), 77 deletions(-) + +commit e3f11a0c4c67a43b0a5f5a6111930fc54e40604e +Merge: fd604fc cab4a26 +Author: Sai Krishna +Date: Tue Apr 19 18:47:57 2011 +0530 + + Merge branch 'master' of https://github.com/khussein/keystone + +commit fd604fcd93d2e933e48ea37463a0f4f8697c6a75 +Author: saikrishna1511@gmail.com +Date: Tue Apr 19 18:21:36 2011 +0530 + + Management files except for add/delete user from group + + management/delgroup.py | 39 ++++++++++++++++++++++++++++++++++++ + management/getgroup.py | 40 ++++++++++++++++++++++++++++++++++++ + management/getgroups.py | 40 ++++++++++++++++++++++++++++++++++++ + management/getgroupusers.py | 42 ++++++++++++++++++++++++++++++++++++++ + management/getuser.py | 40 ++++++++++++++++++++++++++++++++++++ + management/getusergroups.py | 42 ++++++++++++++++++++++++++++++++++++++ + management/getusers.py | 42 ++++++++++++++++++++++++++++++++++++++ + management/groupadd.py | 42 ++++++++++++++++++++++++++++++++++++++ + management/setuserlock.py | 49 +++++++++++++++++++++++++++++++++++++++++++++ + management/setuserpswd.py | 41 +++++++++++++++++++++++++++++++++++++ + management/updategroup.py | 41 +++++++++++++++++++++++++++++++++++++ + management/userupdate.py | 39 ++++++++++++++++++++++++++++++++++++ + 12 files changed, 497 insertions(+) + +commit cab4a265da4d67fe79df6e4c8ed9950a239371c0 +Author: Ziad Sawalha +Date: Tue Apr 19 01:01:13 2011 -0500 + + Updated README + + README | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +commit 6bb28b0d44a444f766b5cfb446e07c3407a99aab +Author: Khaled Hussein +Date: Mon Apr 18 18:39:38 2011 +0000 + + Setup PasteDeploy and configured PAPIAuth. + + README | 4 +- + echo/echo/__init__.py | 0 + echo/echo/echo.ini | 23 +- + echo/echo/echo.py | 48 +- + echo/setup.py | 41 ++ + keystone/__init__.py | 0 + keystone/identity.py | 1446 ++++++++++++++++++++------------------- + keystone/keystone.ini | 11 + + keystone/middleware/__init__.py | 0 + keystone/middleware/papiauth.py | 9 +- + setup.py | 41 ++ + 11 files changed, 861 insertions(+), 762 deletions(-) + +commit b124c4d1478952c7d3fc0890cc78db67f6824631 +Author: Khaled Hussein +Date: Mon Apr 18 18:17:00 2011 +0000 + + reorganization of files + + echo/echo.ini | 7 --- + echo/echo.py | 104 ---------------------------------------- + echo/echo.wadl | 86 --------------------------------- + echo/echo/echo.ini | 7 +++ + echo/echo/echo.py | 104 ++++++++++++++++++++++++++++++++++++++++ + echo/echo/echo.wadl | 86 +++++++++++++++++++++++++++++++++ + echo/echo/samples/echo.json | 11 +++++ + echo/echo/samples/echo.xml | 8 ++++ + echo/echo/xsd/echo.xsd | 48 +++++++++++++++++++ + echo/echo/xsl/echo.xsl | 41 ++++++++++++++++ + echo/samples/echo.json | 11 ----- + echo/samples/echo.xml | 8 ---- + echo/xsd/echo.xsd | 48 ------------------- + echo/xsl/echo.xsl | 41 ---------------- + keystone/middleware/papiauth.py | 62 ++++++++++++++++++++++++ + middleware/papiauth.py | 62 ------------------------ + 16 files changed, 367 insertions(+), 367 deletions(-) + +commit 9c661d6f14bd02e8461677f70d67d8e4010269a6 +Author: Jorge L. Williams +Date: Mon Apr 18 10:27:06 2011 -0500 + + Add SOAPUI projects + + docs/guide/src/docbkx/idm.wadl | 4 +++- + test/EchoSOAPUI.xml | 2 ++ + test/IdentitySOAPUI.xml | 2 ++ + 3 files changed, 7 insertions(+), 1 deletion(-) + +commit 3091f5b56b770b5414042e733e21d21c4c31eee2 +Author: Khaled Hussein +Date: Mon Apr 18 15:26:35 2011 +0000 + + Resolved Conflicts + + README | 108 -------- + keystone/identity.py | 768 +-------------------------------------------------- + 2 files changed, 7 insertions(+), 869 deletions(-) + +commit 1fc0739687338c77a20b7bb16b1404790c42adca +Author: Khaled Hussein +Date: Mon Apr 18 15:19:54 2011 +0000 + + Removed Conflicts + + keystone/identity.py | 2 -- + 1 file changed, 2 deletions(-) + +commit 5194c76432bc200651a0810f517f28a15a87271f +Author: Khaled Hussein +Date: Mon Apr 18 15:18:36 2011 +0000 + + dos2unix + + README | 202 +++---- + keystone/identity.py | 1510 +++++++++++++++++++++++++------------------------- + 2 files changed, 856 insertions(+), 856 deletions(-) + +commit 0e934ec1dcb5dd53b144980a32842f7bd65b1d24 +Author: Khaled Hussein +Date: Mon Apr 18 15:14:03 2011 +0000 + + Deleted IDE files + + .project | 17 ----------------- + .pydevproject | 7 ------- + 2 files changed, 24 deletions(-) + +commit 531b9bede93df847922acdb72d31502a8a572b3f +Merge: 4ab5bd7 bdb52be +Author: sirishbitra +Date: Mon Apr 18 15:10:43 2011 +0000 + + Importing from DevTeam + + Conflicts: + README + keystone/identity.py + +commit 4ab5bd70652b56df52d26a348a0050fe043b986f +Merge: 06de880 8f8b436 +Author: Khaled Hussein +Date: Mon Apr 18 15:09:18 2011 +0000 + + Merge branch 'DevTeam' of github.com:khussein/keystone into DevTeam + +commit bdb52be4c3af1898ee13eb6f69e9267d7600b10a +Author: sirishbitra +Date: Mon Apr 18 15:03:10 2011 +0000 + + Import from DevTeam + + README | 173 +++++---- + keystone/identity.py | 1055 ++++++++++++++++++++++++++++++++++++-------------- + 2 files changed, 856 insertions(+), 372 deletions(-) + +commit 06de880bce60604055a42d23dd668b42715afca2 +Merge: 2c5a450 7acb778 +Author: Khaled Hussein +Date: Mon Apr 18 14:32:39 2011 +0000 + + Merge branch 'master' into DevTeam + +commit 8f8b43697a1baff132d4f42165ba0682da17c4fb +Author: bsirish +Date: Mon Apr 18 19:51:37 2011 +0530 + + updates DevTeam + + README | 28 +++- + keystone/identity.py | 450 +++++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 375 insertions(+), 103 deletions(-) + +commit 38318ba95f4e71ce23e8907cd3f762e0d5fd0867 +Author: bsirish +Date: Mon Apr 18 19:26:30 2011 +0530 + + Code by Dev Team + + .project | 17 +++++ + .pydevproject | 7 ++ + README | 3 + + db/keystone.db | Bin 4096 -> 5120 bytes + echo/echo.py | 40 +++++----- + keystone/identity.py | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++- + 6 files changed, 257 insertions(+), 20 deletions(-) + +commit 7acb778c74352408cc318db8ceaf6f011879f132 +Author: KnightHacker +Date: Sun Apr 17 14:51:53 2011 -0500 + + Added Power API Auth Middleware + + middleware/papiauth.py | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) + +commit 2c5a4508ef10d16ab353cec5087b04979deabc78 +Author: bsirish +Date: Sun Apr 17 23:16:50 2011 +0530 + + removed unused libraries + + echo/echo.py | 2 +- + keystone/identity.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b4389b177b478d029f479ca8d49e07a1ddcd0ca5 +Author: bsirish +Date: Sun Apr 17 23:13:44 2011 +0530 + + Dev Team: validate_token , create_user ( created for test purpose) and + update_tenant + + README | 14 ++++ + db/keystone.db | Bin 3072 -> 4096 bytes + echo/echo.py | 41 +++++++++++- + keystone/identity.py | 178 +++++++++++++++++++++++++++++++++++++++++++++++---- + 4 files changed, 218 insertions(+), 15 deletions(-) + +commit 38bf1b3b257b98ba3467b98ced057c82ab03a809 +Author: Ziad Sawalha +Date: Sun Apr 17 00:38:14 2011 -0500 + + Added to README + + README | 2 ++ + 1 file changed, 2 insertions(+) + +commit 7a21854ab00f381add512e26fa576a160ee39a37 +Author: Ziad Sawalha +Date: Sun Apr 17 00:36:05 2011 -0500 + + Fixed bug in echo.py + + echo/echo.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 16e9f8ab5c2e7127bfa9e466f6091882e8ad4845 +Author: Jorge L. Williams +Date: Fri Apr 15 13:01:46 2011 -0500 + + Whoops forgot auth header. + + echo/echo.wadl | 1 + + 1 file changed, 1 insertion(+) + +commit 278707ba00e8fc1cccf13d0a8cd58a179d29b56f +Author: Jorge L. Williams +Date: Fri Apr 15 12:57:20 2011 -0500 + + Instructions for soapUI. + + README | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit 3afde4ee520111d651144a47a266bbcf4ea17382 +Author: Jorge L. Williams +Date: Fri Apr 15 07:52:44 2011 -0500 + + Add WADL links for convenience. + + keystone/identity.wadl | 1 + + keystone/samples | 1 + + keystone/xsd | 1 + + 3 files changed, 3 insertions(+) + +commit 8f71e99c09f402c67495e893ceb4a170ce9a920b +Author: Jorge L. Williams +Date: Fri Apr 15 07:49:44 2011 -0500 + + Initial work into paste deploy...commen out for now. + + echo/echo.ini | 7 +++++++ + echo/echo.py | 3 +++ + 2 files changed, 10 insertions(+) + +commit 71330665e229a7a788602a1cb86eb4a3d6b849b7 +Author: Jorge L. Williams +Date: Fri Apr 15 07:28:14 2011 -0500 + + Added echo.wadl. + + echo/echo.wadl | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 85 insertions(+) + +commit 39a9f51694f86c396c7e21dd796426969dc078d8 +Author: Jorge L. Williams +Date: Fri Apr 15 07:27:33 2011 -0500 + + Fixed for case with missing accept header. + + echo/echo.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 52fff33e4b0c3164a07842ddb58e8dd0733aec48 +Author: Jorge L. Williams +Date: Fri Apr 15 07:09:42 2011 -0500 + + Added content nagotiation. + + echo/echo.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 577bab5c6698f7c37dc2930c2576297260d7059e +Author: Jorge L. Williams +Date: Fri Apr 15 07:02:54 2011 -0500 + + Use XSL to convert. + + echo/echo.py | 36 +++++++++++++++++------------------- + 1 file changed, 17 insertions(+), 19 deletions(-) + +commit 945ed0e115e58680ace8a7461eb7af872bc8b441 +Author: Jorge L. Williams +Date: Fri Apr 15 06:54:36 2011 -0500 + + Better quote handling. + + echo/xsl/echo.xsl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3145ac75264edcd1c563562657ea87197e264d4d +Author: Jorge L. Williams +Date: Fri Apr 15 06:36:55 2011 -0500 + + Add JSON transform. + + echo/xsl/echo.xsl | 41 +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 41 insertions(+) + +commit 132ca8b919ab3b547dca32389ff5b1935c140358 +Author: Jorge L. Williams +Date: Fri Apr 15 06:36:40 2011 -0500 + + Whoops samples don't match. + + echo/samples/echo.json | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c97b1d47a86f1cdb4b6bd7de7cf1f040af785a68 +Author: Jorge L. Williams +Date: Fri Apr 15 06:02:58 2011 -0500 + + XSD for echo service. + + echo/xsd/echo.xsd | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +commit a3bde4e19f9867f7d297f80b7792a291e69a4f50 +Author: Jorge L. Williams +Date: Fri Apr 15 05:46:28 2011 -0500 + + Initial echo service. + + echo/echo.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ + echo/samples/echo.json | 11 ++++++++++ + echo/samples/echo.xml | 8 ++++++++ + 3 files changed, 73 insertions(+) + +commit fbdcd8455e2db358c9fddb0b64c7c8ee8a2013ee +Merge: 6154c47 49dee35 +Author: Jorge L. Williams +Date: Fri Apr 15 02:57:10 2011 -0500 + + Merge branch 'master' of github.com:khussein/keystone + +commit 49dee35b10643d89e30cd20b9a5243c2fed112c5 +Author: Ziad Sawalha +Date: Fri Apr 15 02:35:16 2011 -0500 + + Updates to identity.py and README + + README | 32 ++++++++++++++++++++++ + db/keystone.db | Bin 2048 -> 3072 bytes + keystone/identity.py | 76 +++++++++++++++++++++++++++++++++++++++++++++++++-- + 3 files changed, 105 insertions(+), 3 deletions(-) + +commit 6154c47eb7ca5f39ca846f80a518c358e952b66f +Author: Jorge L. Williams +Date: Fri Apr 15 02:27:55 2011 -0500 + + Added X-Auth-Token. + + docs/guide/src/docbkx/idm.wadl | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3b61b3b3a67d8f5d24f6681f011734fe3d941314 +Author: Jorge L. Williams +Date: Fri Apr 15 02:23:30 2011 -0500 + + Added extensions. + + docs/guide/src/docbkx/idm.wadl | 54 +++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 53 insertions(+), 1 deletion(-) + +commit c7331e5830037efe6647bfc9a4f30532de36d6de +Author: Jorge L. Williams +Date: Fri Apr 15 02:15:18 2011 -0500 + + Updated errors for extension requests. + + docs/guide/src/docbkx/idmdevguide.xml | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 884cfb878fe59369995c4d5f17fdf86cf21936bd +Author: Jorge L. Williams +Date: Fri Apr 15 02:04:24 2011 -0500 + + Added getTenant, updateTenant, deleteTenant. + + docs/guide/src/docbkx/idm.wadl | 93 +++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 92 insertions(+), 1 deletion(-) + +commit 83d275dd119b4f2179cd2d0e6767aaabbc334478 +Author: Jorge L. Williams +Date: Fri Apr 15 01:50:47 2011 -0500 + + Added get and create tenants. + + docs/guide/src/docbkx/idm.wadl | 70 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 70 insertions(+) + +commit 82c86e9af9578f2b507de5abaeb5b16690e9ffb7 +Author: Jorge L. Williams +Date: Fri Apr 15 01:35:18 2011 -0500 + + Initial WADL with token operations. + + docs/guide/src/docbkx/idm.wadl | 135 +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 135 insertions(+) + +commit 0a7d594d4e9bc59450e79a7463cb8e41e8e4773d +Author: Jorge L. Williams +Date: Fri Apr 15 01:00:11 2011 -0500 + + Added faults. + + docs/guide/src/docbkx/xsd/api.xsd | 1 + + docs/guide/src/docbkx/xsd/fault.xsd | 135 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 136 insertions(+) + +commit 673f574ae2f232c5111f2619b0466174afddf247 +Author: Jorge L. Williams +Date: Fri Apr 15 00:49:16 2011 -0500 + + Remove refrences to usernameConflict and groupConflict. + + docs/guide/src/docbkx/idmdevguide.xml | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 7bc72749ed6ab6f06108b3ec5add40f3607616a8 +Author: Jorge L. Williams +Date: Fri Apr 15 00:36:34 2011 -0500 + + Added common extensions. + + docs/guide/src/docbkx/xsd/api-common.xsd | 56 +++++++++ + docs/guide/src/docbkx/xsd/extensions.xsd | 56 +++++++++ + docs/guide/src/docbkx/xsd/version.xsd | 200 +++++++++++++++++++++++++++++++ + 3 files changed, 312 insertions(+) + +commit 2484117da7dc281b2e3c96281a41af7e7730c475 +Author: Jorge L. Williams +Date: Fri Apr 15 00:29:53 2011 -0500 + + Added api.xsd schema index. + + docs/guide/src/docbkx/xsd/api.xsd | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit c78eb53632268674cf2f97340d05e89c7b74161b +Author: Jorge L. Williams +Date: Fri Apr 15 00:29:07 2011 -0500 + + Added XSD 1.1 and atom linking support. + + docs/guide/src/docbkx/xsd/atom/atom.xsd | 115 +++++++++++++ + docs/guide/src/docbkx/xsd/atom/xml.xsd | 287 ++++++++++++++++++++++++++++++++ + docs/guide/src/docbkx/xsd/tenant.xsd | 7 + + 3 files changed, 409 insertions(+) + +commit 2530aaa1f637af8d960b39626626a749c9a6ee04 +Author: Jorge L. Williams +Date: Fri Apr 15 00:03:42 2011 -0500 + + Made the tenant xsd extensible. + + docs/guide/src/docbkx/xsd/tenant.xsd | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit f2279dcd8aaeb5bd4259e993bd1b8c879435eb75 +Author: Jorge L. Williams +Date: Fri Apr 15 00:00:03 2011 -0500 + + Initial tenant xsd. + + docs/guide/src/docbkx/xsd/tenant.xsd | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +commit 504ce828c7023e6221c50a7a252675f3fa044e0b +Author: Jorge L. Williams +Date: Thu Apr 14 23:49:46 2011 -0500 + + Made the token schema extensible. + + docs/guide/src/docbkx/xsd/token.xsd | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 95dc3a8b1f2340fac488d1a9c4df88415e2c3d71 +Author: Jorge L. Williams +Date: Thu Apr 14 23:42:32 2011 -0500 + + Initial token schema. + + docs/guide/src/docbkx/xsd/token.xsd | 57 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 57 insertions(+) + +commit b43467c662a7f40c5b198e8bd7af4dc47d4830ca +Author: Jorge L. Williams +Date: Thu Apr 14 23:41:42 2011 -0500 + + Groups should have ids instead of names? + + docs/guide/src/docbkx/samples/auth.json | 2 +- + docs/guide/src/docbkx/samples/auth.xml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d7e4a6b3fe5dde811b5af73938e58a17d1842548 +Merge: e08fbc8 af2672c +Author: KnightHacker +Date: Thu Apr 14 23:03:16 2011 -0500 + + Merge branch 'master' of github.com:khussein/keystone + +commit e08fbc83cf9ad14c27eaec6b5ac9e8dcbd6e4591 +Author: KnightHacker +Date: Thu Apr 14 23:03:07 2011 -0500 + + Added Creating Tenants, JSON only + + keystone/identity.py | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 78 insertions(+) + +commit af2672cd7d6f090345c27a53e100d3df880fbef7 +Author: Jorge L. Williams +Date: Thu Apr 14 22:26:39 2011 -0500 + + Remove mention of service catalog. + + docs/guide/src/docbkx/idmdevguide.xml | 2 +- + docs/guide/src/docbkx/samples/auth.json | 29 ----------------------------- + docs/guide/src/docbkx/samples/auth.xml | 24 ------------------------ + 3 files changed, 1 insertion(+), 54 deletions(-) + +commit 35335e41d926f659c6cfba66412a522b5a18ff4c +Author: Jorge L. Williams +Date: Thu Apr 14 22:19:06 2011 -0500 + + Updated samples. + + docs/guide/src/docbkx/idmdevguide.xml | 24 ++++++------- + .../guide/src/docbkx/samples/add-baseurl-input.xml | 11 ------ + .../src/docbkx/samples/add-baseurlRef-input.xml | 6 ---- + docs/guide/src/docbkx/samples/addclient.json | 4 --- + docs/guide/src/docbkx/samples/addclient.xml | 6 ---- + docs/guide/src/docbkx/samples/addedclient.json | 12 ------- + docs/guide/src/docbkx/samples/addedclient.xml | 12 ------- + docs/guide/src/docbkx/samples/addeduser.json | 9 ----- + .../src/docbkx/samples/addfirstuserresponse.json | 7 ---- + .../src/docbkx/samples/addfirstuserresponse.xml | 8 ----- + docs/guide/src/docbkx/samples/adduser.json | 8 ----- + docs/guide/src/docbkx/samples/adduser.xml | 4 --- + docs/guide/src/docbkx/samples/adduserresponse.xml | 5 --- + docs/guide/src/docbkx/samples/bad_request.json | 5 --- + docs/guide/src/docbkx/samples/bad_request.xml | 7 ---- + docs/guide/src/docbkx/samples/baseURLRefs.json | 27 -------------- + docs/guide/src/docbkx/samples/baseURLRefs.xml | 22 ------------ + .../src/docbkx/samples/base_url_ref_response.json | 5 --- + .../src/docbkx/samples/base_url_ref_response.xml | 6 ---- + .../src/docbkx/samples/base_url_response.json | 10 ------ + .../guide/src/docbkx/samples/base_url_response.xml | 12 ------- + .../src/docbkx/samples/base_urls_response.json | 22 ------------ + .../src/docbkx/samples/base_urls_response.xml | 18 ---------- + .../samples/client-credentials-response.json | 3 -- + .../docbkx/samples/client-credentials-response.xml | 4 --- + docs/guide/src/docbkx/samples/client.json | 16 --------- + docs/guide/src/docbkx/samples/client.xml | 17 --------- + docs/guide/src/docbkx/samples/clientGroup.json | 4 --- + docs/guide/src/docbkx/samples/clientGroup.xml | 5 --- + docs/guide/src/docbkx/samples/clientGroups.json | 6 ---- + docs/guide/src/docbkx/samples/clientGroups.xml | 7 ---- + .../docbkx/samples/clientWithOnlySoftDeleted.json | 3 -- + .../docbkx/samples/clientWithOnlySoftDeleted.xml | 4 --- + .../src/docbkx/samples/client_credentials.json | 3 -- + .../src/docbkx/samples/client_credentials.xml | 4 --- + .../src/docbkx/samples/clientname_conflict.json | 5 --- + .../src/docbkx/samples/clientname_conflict.xml | 7 ---- + docs/guide/src/docbkx/samples/clients.json | 22 ------------ + docs/guide/src/docbkx/samples/clients.xml | 22 ------------ + docs/guide/src/docbkx/samples/customer.json | 7 ---- + docs/guide/src/docbkx/samples/customer.xml | 5 --- + .../src/docbkx/samples/customer_conflict.json | 5 --- + .../guide/src/docbkx/samples/customer_conflict.xml | 7 ---- + docs/guide/src/docbkx/samples/customerlock.json | 5 --- + docs/guide/src/docbkx/samples/customerlock.xml | 4 --- + docs/guide/src/docbkx/samples/customers.json | 15 -------- + docs/guide/src/docbkx/samples/customers.xml | 9 ----- + .../src/docbkx/samples/definedpermissions.json | 16 --------- + .../src/docbkx/samples/definedpermissions.xml | 14 -------- + docs/guide/src/docbkx/samples/email_conflict.json | 5 --- + docs/guide/src/docbkx/samples/email_conflict.xml | 7 ---- + docs/guide/src/docbkx/samples/feed.xml | 21 ----------- + docs/guide/src/docbkx/samples/forbidden.json | 5 --- + docs/guide/src/docbkx/samples/forbidden.xml | 7 ---- + docs/guide/src/docbkx/samples/forgot_password.json | 17 --------- + docs/guide/src/docbkx/samples/forgot_password.xml | 13 ------- + .../src/docbkx/samples/getuser-with-mosso-id.json | 20 ----------- + .../src/docbkx/samples/getuser-with-mosso-id.xml | 21 ----------- + .../src/docbkx/samples/getuser-with-nast-id.json | 20 ----------- + .../src/docbkx/samples/getuser-with-nast-id.xml | 21 ----------- + .../src/docbkx/samples/getuser-with-username.json | 20 ----------- + .../src/docbkx/samples/getuser-with-username.xml | 21 ----------- + docs/guide/src/docbkx/samples/getuser.json | 15 -------- + docs/guide/src/docbkx/samples/getuser.xml | 8 ----- + docs/guide/src/docbkx/samples/globalgroup.json | 6 ---- + docs/guide/src/docbkx/samples/globalgroup.xml | 5 --- + docs/guide/src/docbkx/samples/globalgroups.json | 10 ------ + docs/guide/src/docbkx/samples/globalgroups.xml | 10 ------ + .../src/docbkx/samples/grantedpermissions.json | 16 --------- + .../src/docbkx/samples/grantedpermissions.xml | 14 -------- + docs/guide/src/docbkx/samples/group-create.json | 6 ---- + docs/guide/src/docbkx/samples/group-create.xml | 5 --- + .../guide/src/docbkx/samples/group-updated-nt.json | 6 ---- + docs/guide/src/docbkx/samples/group-updated-nt.xml | 5 --- + docs/guide/src/docbkx/samples/group-updated.json | 7 ---- + docs/guide/src/docbkx/samples/group-updated.xml | 5 --- + docs/guide/src/docbkx/samples/group.json | 7 ---- + docs/guide/src/docbkx/samples/group.xml | 5 --- + docs/guide/src/docbkx/samples/groups-nt.json | 12 ------- + docs/guide/src/docbkx/samples/groups-nt.xml | 9 ----- + docs/guide/src/docbkx/samples/groups.json | 15 -------- + docs/guide/src/docbkx/samples/groups.xml | 9 ----- + .../src/docbkx/samples/methodnotallowedfault.json | 5 --- + .../src/docbkx/samples/methodnotallowedfault.xml | 7 ---- + .../guide/src/docbkx/samples/missing_username.json | 5 --- + docs/guide/src/docbkx/samples/missing_username.xml | 7 ---- + .../samples/mosso-id-authentication-response.json | 4 --- + .../samples/mosso-id-authentication-response.xml | 18 ---------- + docs/guide/src/docbkx/samples/mossoCredentials.xml | 5 --- + docs/guide/src/docbkx/samples/nastCredentials.xml | 5 --- + .../src/docbkx/samples/password_recovery.json | 15 -------- + .../guide/src/docbkx/samples/password_recovery.xml | 12 ------- + docs/guide/src/docbkx/samples/password_rule.json | 5 --- + docs/guide/src/docbkx/samples/password_rule.xml | 6 ---- + .../src/docbkx/samples/password_rule_result.json | 6 ---- + .../src/docbkx/samples/password_rule_result.xml | 7 ---- + .../src/docbkx/samples/password_rule_results.json | 16 --------- + .../src/docbkx/samples/password_rule_results.xml | 15 -------- + docs/guide/src/docbkx/samples/password_rules.json | 14 -------- + docs/guide/src/docbkx/samples/password_rules.xml | 13 ------- + .../src/docbkx/samples/password_validation.json | 17 --------- + .../src/docbkx/samples/password_validation.xml | 17 --------- + .../guide/src/docbkx/samples/passwordrotation.json | 4 --- + docs/guide/src/docbkx/samples/passwordrotation.xml | 6 ---- + .../docbkx/samples/passwordvalidationfault.json | 5 --- + .../src/docbkx/samples/passwordvalidationfault.xml | 7 ---- + docs/guide/src/docbkx/samples/permission.json | 7 ---- + docs/guide/src/docbkx/samples/permission.xml | 7 ---- + docs/guide/src/docbkx/samples/permissions.json | 30 ---------------- + docs/guide/src/docbkx/samples/permissions.xml | 24 ------------- + .../src/docbkx/samples/reset_user_password.json | 3 -- + .../src/docbkx/samples/reset_user_password.xml | 4 --- + .../src/docbkx/samples/resourceId_conflict.json | 5 --- + .../src/docbkx/samples/resourceId_conflict.xml | 7 ---- + docs/guide/src/docbkx/samples/role.json | 4 --- + docs/guide/src/docbkx/samples/role.xml | 4 --- + docs/guide/src/docbkx/samples/roles.json | 12 ------- + docs/guide/src/docbkx/samples/roles.xml | 8 ----- + .../docbkx/samples/service-catalog-response.json | 22 ------------ + .../docbkx/samples/service-catalog-response.xml | 14 -------- + docs/guide/src/docbkx/samples/tenant.json | 7 ++++ + docs/guide/src/docbkx/samples/tenant.xml | 5 +++ + docs/guide/src/docbkx/samples/tenantlock.json | 5 +++ + docs/guide/src/docbkx/samples/tenantlock.xml | 4 +++ + docs/guide/src/docbkx/samples/tenants.json | 15 ++++++++ + docs/guide/src/docbkx/samples/tenants.xml | 9 +++++ + docs/guide/src/docbkx/samples/token.json | 4 --- + docs/guide/src/docbkx/samples/token.xml | 5 --- + docs/guide/src/docbkx/samples/unauthorized.json | 5 --- + docs/guide/src/docbkx/samples/unauthorized.xml | 7 ---- + docs/guide/src/docbkx/samples/unavailable.json | 5 --- + docs/guide/src/docbkx/samples/unavailable.xml | 6 ---- + docs/guide/src/docbkx/samples/updatedcustomer.json | 7 ---- + docs/guide/src/docbkx/samples/updatedcustomer.xml | 5 --- + docs/guide/src/docbkx/samples/updatedtenant.json | 7 ++++ + docs/guide/src/docbkx/samples/updatedtenant.xml | 5 +++ + docs/guide/src/docbkx/samples/updateduser.json | 8 ----- + docs/guide/src/docbkx/samples/updateduser.xml | 4 --- + docs/guide/src/docbkx/samples/updateuser.json | 6 ---- + docs/guide/src/docbkx/samples/updateuser.xml | 3 -- + docs/guide/src/docbkx/samples/user.json | 41 ---------------------- + docs/guide/src/docbkx/samples/user.xml | 19 ---------- + docs/guide/src/docbkx/samples/userGroups.json | 16 --------- + docs/guide/src/docbkx/samples/userGroups.xml | 6 ---- + .../guide/src/docbkx/samples/userWithOnlyLock.json | 5 --- + docs/guide/src/docbkx/samples/userWithOnlyLock.xml | 3 -- + .../docbkx/samples/userWithOnlySoftDeleted.json | 3 -- + .../src/docbkx/samples/userWithOnlySoftDeleted.xml | 4 --- + .../src/docbkx/samples/userWithOnlyStatus.json | 3 -- + .../src/docbkx/samples/userWithOnlyStatus.xml | 4 --- + docs/guide/src/docbkx/samples/user_api_key.json | 5 --- + docs/guide/src/docbkx/samples/user_api_key.xml | 3 -- + .../guide/src/docbkx/samples/user_credentials.json | 8 ----- + docs/guide/src/docbkx/samples/user_credentials.xml | 6 ---- + docs/guide/src/docbkx/samples/user_disabled.json | 5 --- + docs/guide/src/docbkx/samples/user_disabled.xml | 7 ---- + docs/guide/src/docbkx/samples/user_password.json | 3 -- + docs/guide/src/docbkx/samples/user_password.xml | 4 --- + docs/guide/src/docbkx/samples/user_secret.json | 4 --- + docs/guide/src/docbkx/samples/user_secret.xml | 5 --- + .../src/docbkx/samples/usernameCredentials.xml | 5 --- + .../src/docbkx/samples/username_conflict.json | 5 --- + .../guide/src/docbkx/samples/username_conflict.xml | 7 ---- + docs/guide/src/docbkx/samples/users.json | 17 --------- + docs/guide/src/docbkx/samples/users.xml | 7 ---- + 165 files changed, 69 insertions(+), 1462 deletions(-) + +commit 72a8c0fe8aa2169b9c2a93e91dd9b2a65830a3ca +Author: Jorge L. Williams +Date: Thu Apr 14 21:57:39 2011 -0500 + + Updated pubdate. + + docs/guide/src/docbkx/idmdevguide.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 81e57cd197ab87759e6b904686794de2aa2d2239 +Author: Jorge L. Williams +Date: Thu Apr 14 21:57:10 2011 -0500 + + Updates to intro section. + + docs/guide/src/docbkx/idmdevguide.xml | 41 ++++++++++++++++++++--------------- + 1 file changed, 24 insertions(+), 17 deletions(-) + +commit a1be94d3be1378c0a1903582f0fee2a085b517a1 +Author: Jorge L. Williams +Date: Thu Apr 14 21:49:50 2011 -0500 + + Updated concepts. + + docs/guide/src/docbkx/idmdevguide.xml | 20 +++++--------------- + 1 file changed, 5 insertions(+), 15 deletions(-) + +commit 9fdc0e776a8ead520c66f6017fe81e60250b5fc0 +Author: Jorge L. Williams +Date: Thu Apr 14 21:46:48 2011 -0500 + + Better entities in document. + + docs/guide/src/docbkx/idmdevguide.xml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c342842f4784916fb0fc7ae0aa82724cc26033c5 +Author: Jorge L. Williams +Date: Thu Apr 14 21:45:46 2011 -0500 + + Removed init section from docs, we'll get to them later. + + docs/guide/src/docbkx/idmdevguide.xml | 829 ---------------------------------- + 1 file changed, 829 deletions(-) + +commit 05840fd395b7686dbd81a5d9723a244e248a1926 +Author: Khaled Hussein +Date: Thu Apr 14 18:39:50 2011 -0500 + + Added Dependencies section + + README | 5 +++++ + db/keystone.db | Bin 2048 -> 2048 bytes + 2 files changed, 5 insertions(+) + +commit 8dfdb43fb1a5540d67b422d7a52f774c4d78785a +Merge: 559b431 be6eda0 +Author: Khaled Hussein +Date: Thu Apr 14 18:39:29 2011 -0500 + + Merge branch 'master' of github.com:khussein/keystone + +commit 559b431ce0a6dbb7bd1d7b74e45debc25642ad08 +Author: Khaled Hussein +Date: Thu Apr 14 18:39:01 2011 -0500 + + Added License & Create/Delete user management CLI + + LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++ + management/useradd.py | 39 ++++++++++ + management/userdel.py | 38 ++++++++++ + 3 files changed, 279 insertions(+) + +commit be6eda09f221bd65e5e430ba370c9b206196c100 +Author: Jorge L. Williams +Date: Thu Apr 14 17:48:31 2011 -0500 + + Initial docs import. + + docs/guide/pom.xml | 99 ++ + docs/guide/src/docbkx/idmdevguide.xml | 1853 ++++++++++++++++++++ + docs/guide/src/docbkx/idmdevguide.xml~ | 1853 ++++++++++++++++++++ + docs/guide/src/docbkx/img/Check_mark_23x20_02.svg | 60 + + .../guide/src/docbkx/samples/add-baseurl-input.xml | 11 + + .../src/docbkx/samples/add-baseurlRef-input.xml | 6 + + docs/guide/src/docbkx/samples/addclient.json | 4 + + docs/guide/src/docbkx/samples/addclient.xml | 6 + + docs/guide/src/docbkx/samples/addedclient.json | 12 + + docs/guide/src/docbkx/samples/addedclient.xml | 12 + + docs/guide/src/docbkx/samples/addeduser.json | 9 + + .../src/docbkx/samples/addfirstuserresponse.json | 7 + + .../src/docbkx/samples/addfirstuserresponse.xml | 8 + + docs/guide/src/docbkx/samples/adduser.json | 8 + + docs/guide/src/docbkx/samples/adduser.xml | 4 + + docs/guide/src/docbkx/samples/adduserresponse.xml | 5 + + docs/guide/src/docbkx/samples/auth.json | 48 + + docs/guide/src/docbkx/samples/auth.xml | 34 + + .../guide/src/docbkx/samples/auth_credentials.json | 7 + + docs/guide/src/docbkx/samples/auth_credentials.xml | 5 + + docs/guide/src/docbkx/samples/bad_request.json | 5 + + docs/guide/src/docbkx/samples/bad_request.xml | 7 + + docs/guide/src/docbkx/samples/baseURLRefs.json | 27 + + docs/guide/src/docbkx/samples/baseURLRefs.xml | 22 + + .../src/docbkx/samples/base_url_ref_response.json | 5 + + .../src/docbkx/samples/base_url_ref_response.xml | 6 + + .../src/docbkx/samples/base_url_response.json | 10 + + .../guide/src/docbkx/samples/base_url_response.xml | 12 + + .../src/docbkx/samples/base_urls_response.json | 22 + + .../src/docbkx/samples/base_urls_response.xml | 18 + + docs/guide/src/docbkx/samples/choices.json | 50 + + docs/guide/src/docbkx/samples/choices.xml | 29 + + .../samples/client-credentials-response.json | 3 + + .../docbkx/samples/client-credentials-response.xml | 4 + + docs/guide/src/docbkx/samples/client.json | 16 + + docs/guide/src/docbkx/samples/client.xml | 17 + + docs/guide/src/docbkx/samples/clientGroup.json | 4 + + docs/guide/src/docbkx/samples/clientGroup.xml | 5 + + docs/guide/src/docbkx/samples/clientGroups.json | 6 + + docs/guide/src/docbkx/samples/clientGroups.xml | 7 + + .../docbkx/samples/clientWithOnlySoftDeleted.json | 3 + + .../docbkx/samples/clientWithOnlySoftDeleted.xml | 4 + + .../src/docbkx/samples/client_credentials.json | 3 + + .../src/docbkx/samples/client_credentials.xml | 4 + + .../src/docbkx/samples/clientname_conflict.json | 5 + + .../src/docbkx/samples/clientname_conflict.xml | 7 + + docs/guide/src/docbkx/samples/clients.json | 22 + + docs/guide/src/docbkx/samples/clients.xml | 22 + + docs/guide/src/docbkx/samples/customer.json | 7 + + docs/guide/src/docbkx/samples/customer.xml | 5 + + .../src/docbkx/samples/customer_conflict.json | 5 + + .../guide/src/docbkx/samples/customer_conflict.xml | 7 + + docs/guide/src/docbkx/samples/customerlock.json | 5 + + docs/guide/src/docbkx/samples/customerlock.xml | 4 + + docs/guide/src/docbkx/samples/customers.json | 15 + + docs/guide/src/docbkx/samples/customers.xml | 9 + + .../src/docbkx/samples/definedpermissions.json | 16 + + .../src/docbkx/samples/definedpermissions.xml | 14 + + docs/guide/src/docbkx/samples/email_conflict.json | 5 + + docs/guide/src/docbkx/samples/email_conflict.xml | 7 + + docs/guide/src/docbkx/samples/ext-getuser.json | 21 + + docs/guide/src/docbkx/samples/ext-getuser.xml | 13 + + docs/guide/src/docbkx/samples/extension.json | 21 + + docs/guide/src/docbkx/samples/extension.xml | 23 + + docs/guide/src/docbkx/samples/extensions.json | 42 + + docs/guide/src/docbkx/samples/extensions.xml | 39 + + docs/guide/src/docbkx/samples/feed.xml | 21 + + docs/guide/src/docbkx/samples/forbidden.json | 5 + + docs/guide/src/docbkx/samples/forbidden.xml | 7 + + docs/guide/src/docbkx/samples/forgot_password.json | 17 + + docs/guide/src/docbkx/samples/forgot_password.xml | 13 + + docs/guide/src/docbkx/samples/getuser-1.json | 29 + + docs/guide/src/docbkx/samples/getuser-1.xml | 14 + + .../src/docbkx/samples/getuser-with-mosso-id.json | 20 + + .../src/docbkx/samples/getuser-with-mosso-id.xml | 21 + + .../src/docbkx/samples/getuser-with-nast-id.json | 20 + + .../src/docbkx/samples/getuser-with-nast-id.xml | 21 + + .../src/docbkx/samples/getuser-with-username.json | 20 + + .../src/docbkx/samples/getuser-with-username.xml | 21 + + docs/guide/src/docbkx/samples/getuser.json | 15 + + docs/guide/src/docbkx/samples/getuser.xml | 8 + + docs/guide/src/docbkx/samples/globalgroup.json | 6 + + docs/guide/src/docbkx/samples/globalgroup.xml | 5 + + docs/guide/src/docbkx/samples/globalgroups.json | 10 + + docs/guide/src/docbkx/samples/globalgroups.xml | 10 + + .../src/docbkx/samples/grantedpermissions.json | 16 + + .../src/docbkx/samples/grantedpermissions.xml | 14 + + docs/guide/src/docbkx/samples/group-create.json | 6 + + docs/guide/src/docbkx/samples/group-create.xml | 5 + + .../guide/src/docbkx/samples/group-updated-nt.json | 6 + + docs/guide/src/docbkx/samples/group-updated-nt.xml | 5 + + docs/guide/src/docbkx/samples/group-updated.json | 7 + + docs/guide/src/docbkx/samples/group-updated.xml | 5 + + docs/guide/src/docbkx/samples/group.json | 7 + + docs/guide/src/docbkx/samples/group.xml | 5 + + docs/guide/src/docbkx/samples/groups-nt.json | 12 + + docs/guide/src/docbkx/samples/groups-nt.xml | 9 + + docs/guide/src/docbkx/samples/groups.json | 15 + + docs/guide/src/docbkx/samples/groups.xml | 9 + + docs/guide/src/docbkx/samples/idm_fault.json | 7 + + docs/guide/src/docbkx/samples/idm_fault.xml | 6 + + docs/guide/src/docbkx/samples/item_not_found.json | 7 + + docs/guide/src/docbkx/samples/item_not_found.xml | 6 + + .../src/docbkx/samples/methodnotallowedfault.json | 5 + + .../src/docbkx/samples/methodnotallowedfault.xml | 7 + + .../guide/src/docbkx/samples/missing_username.json | 5 + + docs/guide/src/docbkx/samples/missing_username.xml | 7 + + .../samples/mosso-id-authentication-response.json | 4 + + .../samples/mosso-id-authentication-response.xml | 18 + + docs/guide/src/docbkx/samples/mossoCredentials.xml | 5 + + docs/guide/src/docbkx/samples/nastCredentials.xml | 5 + + .../src/docbkx/samples/password_recovery.json | 15 + + .../guide/src/docbkx/samples/password_recovery.xml | 12 + + docs/guide/src/docbkx/samples/password_rule.json | 5 + + docs/guide/src/docbkx/samples/password_rule.xml | 6 + + .../src/docbkx/samples/password_rule_result.json | 6 + + .../src/docbkx/samples/password_rule_result.xml | 7 + + .../src/docbkx/samples/password_rule_results.json | 16 + + .../src/docbkx/samples/password_rule_results.xml | 15 + + docs/guide/src/docbkx/samples/password_rules.json | 14 + + docs/guide/src/docbkx/samples/password_rules.xml | 13 + + .../src/docbkx/samples/password_validation.json | 17 + + .../src/docbkx/samples/password_validation.xml | 17 + + .../guide/src/docbkx/samples/passwordrotation.json | 4 + + docs/guide/src/docbkx/samples/passwordrotation.xml | 6 + + .../docbkx/samples/passwordvalidationfault.json | 5 + + .../src/docbkx/samples/passwordvalidationfault.xml | 7 + + docs/guide/src/docbkx/samples/permission.json | 7 + + docs/guide/src/docbkx/samples/permission.xml | 7 + + docs/guide/src/docbkx/samples/permissions.json | 30 + + docs/guide/src/docbkx/samples/permissions.xml | 24 + + .../src/docbkx/samples/reset_user_password.json | 3 + + .../src/docbkx/samples/reset_user_password.xml | 4 + + .../src/docbkx/samples/resourceId_conflict.json | 5 + + .../src/docbkx/samples/resourceId_conflict.xml | 7 + + docs/guide/src/docbkx/samples/role.json | 4 + + docs/guide/src/docbkx/samples/role.xml | 4 + + docs/guide/src/docbkx/samples/roles.json | 12 + + docs/guide/src/docbkx/samples/roles.xml | 8 + + .../src/docbkx/samples/samplerequestheader.json | 4 + + .../src/docbkx/samples/sampleresponseheader.json | 5 + + .../docbkx/samples/service-catalog-response.json | 22 + + .../docbkx/samples/service-catalog-response.xml | 14 + + docs/guide/src/docbkx/samples/tenants-1.json | 16 + + docs/guide/src/docbkx/samples/tenants-1.xml | 10 + + docs/guide/src/docbkx/samples/tenants-2.json | 20 + + docs/guide/src/docbkx/samples/tenants-2.xml | 13 + + docs/guide/src/docbkx/samples/tenants-3.json | 16 + + docs/guide/src/docbkx/samples/tenants-3.xml | 10 + + docs/guide/src/docbkx/samples/token.json | 4 + + docs/guide/src/docbkx/samples/token.xml | 5 + + docs/guide/src/docbkx/samples/unauthorized.json | 5 + + docs/guide/src/docbkx/samples/unauthorized.xml | 7 + + docs/guide/src/docbkx/samples/unavailable.json | 5 + + docs/guide/src/docbkx/samples/unavailable.xml | 6 + + docs/guide/src/docbkx/samples/updatedcustomer.json | 7 + + docs/guide/src/docbkx/samples/updatedcustomer.xml | 5 + + docs/guide/src/docbkx/samples/updateduser.json | 8 + + docs/guide/src/docbkx/samples/updateduser.xml | 4 + + docs/guide/src/docbkx/samples/updateuser.json | 6 + + docs/guide/src/docbkx/samples/updateuser.xml | 3 + + docs/guide/src/docbkx/samples/user.json | 41 + + docs/guide/src/docbkx/samples/user.xml | 19 + + docs/guide/src/docbkx/samples/userGroups.json | 16 + + docs/guide/src/docbkx/samples/userGroups.xml | 6 + + .../guide/src/docbkx/samples/userWithOnlyLock.json | 5 + + docs/guide/src/docbkx/samples/userWithOnlyLock.xml | 3 + + .../docbkx/samples/userWithOnlySoftDeleted.json | 3 + + .../src/docbkx/samples/userWithOnlySoftDeleted.xml | 4 + + .../src/docbkx/samples/userWithOnlyStatus.json | 3 + + .../src/docbkx/samples/userWithOnlyStatus.xml | 4 + + docs/guide/src/docbkx/samples/user_api_key.json | 5 + + docs/guide/src/docbkx/samples/user_api_key.xml | 3 + + .../guide/src/docbkx/samples/user_credentials.json | 8 + + docs/guide/src/docbkx/samples/user_credentials.xml | 6 + + docs/guide/src/docbkx/samples/user_disabled.json | 5 + + docs/guide/src/docbkx/samples/user_disabled.xml | 7 + + docs/guide/src/docbkx/samples/user_password.json | 3 + + docs/guide/src/docbkx/samples/user_password.xml | 4 + + docs/guide/src/docbkx/samples/user_secret.json | 4 + + docs/guide/src/docbkx/samples/user_secret.xml | 5 + + .../src/docbkx/samples/usernameCredentials.xml | 5 + + .../src/docbkx/samples/username_conflict.json | 5 + + .../guide/src/docbkx/samples/username_conflict.xml | 7 + + docs/guide/src/docbkx/samples/users.json | 17 + + docs/guide/src/docbkx/samples/users.xml | 7 + + docs/guide/src/docbkx/samples/validatetoken.json | 19 + + docs/guide/src/docbkx/samples/validatetoken.xml | 10 + + docs/guide/src/docbkx/samples/version-atom.xml | 19 + + docs/guide/src/docbkx/samples/version.json | 33 + + docs/guide/src/docbkx/samples/version.xml | 23 + + docs/guide/src/docbkx/samples/versions-atom.xml | 22 + + docs/guide/src/docbkx/samples/versions.json | 28 + + docs/guide/src/docbkx/samples/versions.xml | 18 + + 194 files changed, 5982 insertions(+) + +commit a84d1711dadba3073a6ac1fef8c86c29784574a4 +Author: Khaled Hussein +Date: Thu Apr 14 18:51:06 2011 +0000 + + Created DB with users table, simple schema + + db/keystone.db | Bin 0 -> 2048 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 9aec3d6765ad1a5cb54223f5460746819e8652cd +Author: Khaled Hussein +Date: Thu Apr 14 18:10:40 2011 +0000 + + first commit + + README | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) \ No newline at end of file diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/PKG-INFO keystone-2012.1.3+stable-20130423-f48dd0fc/PKG-INFO --- keystone-2012.1+stable~20120824-a16a0ab9/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/PKG-INFO 2013-04-24 13:24:44.000000000 +0000 @@ -0,0 +1,10 @@ +Metadata-Version: 1.0 +Name: keystone +Version: 2012.1.4 +Summary: Authentication service for OpenStack +Home-page: http://www.openstack.org +Author: OpenStack, LLC. +Author-email: openstack@lists.launchpad.net +License: Apache License (2.0) +Description: UNKNOWN +Platform: UNKNOWN diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/debian/changelog keystone-2012.1.3+stable-20130423-f48dd0fc/debian/changelog --- keystone-2012.1+stable~20120824-a16a0ab9/debian/changelog 2013-02-19 17:58:10.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/debian/changelog 2013-05-15 19:41:47.000000000 +0000 @@ -1,3 +1,49 @@ +keystone (2012.1.3+stable-20130423-f48dd0fc-0ubuntu1.1) precise-security; urgency=low + + * SECURITY UPDATE: delete user token immediately upon delete when using v2 + API + - CVE-2013-2059.patch: adjust keystone/identity/core.py to call + token_api.delete_token() during delete. Also update test suite. + - CVE-2013-2059 + - LP: #1166670 + + -- Jamie Strandboge Wed, 15 May 2013 14:41:06 -0500 + +keystone (2012.1.3+stable-20130423-f48dd0fc-0ubuntu1) precise-proposed; urgency=low + + * Resynchronize with stable/essex (LP: #1089488): + - [7402f5e] EC2 authentication does not ensure user or tenant is enabled + LP: 1121494 + - [8945567] DoS through XML entity expansion (CVE-2013-1664) LP: 1100282 + - [7b5b72f] Add size validations for /tokens. + - [ef1e682] docutils 0.10 incompatible with sphinx 1.1.3 LP: 1091333 + - [8735009] Removing user from a tenant isn't invalidating user access to + tenant (LP: #1064914) + - [025b1d5] Jenkins jobs fail because of incompatibility between sqlalchemy- + migrate and the newest sqlalchemy-0.8.0b1 (LP: #1073569) + - [ddb4019] Open 2012.1.4 development + - [0e1f05e] memcache driver needs protection against unicode user keys + (LP: #1056373) + - [176ee9b] Token invalidation in case of role grant/revoke should be + limited to affected tenant (LP: #1050025) + - [58ac669] Token validation includes revoked roles (CVE-2012-4413) + (LP: #1041396) + - [cd1e48a] Memcached Token Backend does not support list tokens + (LP: #1046905) + - [5438d3b] Update user's default tenant partially succeeds without authz + (LP: #1040626) + * Dropped patches, superseeded by new snapshot: + - debian/patches/CVE-2013-0282.patch [7402f5e] + - debian/patches/CVE-2013-1664+1665.patch [8945567] + - debian/patches/keystone-CVE-2012-5571.patch [8735009] + - debian/patches/keystone-CVE-2012-4413.patch [58ac669] + - debian/patches/keystone-CVE-2012-3542.patch [5438d3b] + * Refreshed patches: + - debian/patches/CVE-2013-0247.patch + - debian/patches/fix-ubuntu-tests.patch + + -- Yolanda Tue, 23 Apr 2013 10:30:16 +0200 + keystone (2012.1+stable~20120824-a16a0ab9-0ubuntu2.5) precise-security; urgency=low * SECURITY UPDATE: fix EC2-style authentication for disabled users diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/CVE-2013-0247.patch keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/CVE-2013-0247.patch --- keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/CVE-2013-0247.patch 2013-01-31 18:46:51.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/CVE-2013-0247.patch 2013-04-25 08:30:23.000000000 +0000 @@ -5,19 +5,6 @@ attack against Keystone. Bug: https://launchpad.net/bugs/1098307 -diff --git a/keystone/config.py b/keystone/config.py -index d9ffe23..8080292 100644 ---- a/keystone/config.py -+++ b/keystone/config.py -@@ -143,7 +143,7 @@ register_str('bind_host', default='0.0.0.0') - register_str('compute_port') - register_str('admin_port') - register_str('public_port') -- -+register_int('max_param_size', default=64) - - # sql options - register_str('connection', group='sql') diff --git a/keystone/exception.py b/keystone/exception.py index f1651bf..f9ca96b 100644 --- a/keystone/exception.py @@ -42,177 +29,3 @@ class Unauthorized(Error): """The request you have made requires authentication.""" code = 401 -diff --git a/keystone/service.py b/keystone/service.py -index 830849e..af36c32 100644 ---- a/keystone/service.py -+++ b/keystone/service.py -@@ -19,6 +19,7 @@ import uuid - import routes - - from keystone import catalog -+from keystone import config - from keystone import exception - from keystone import identity - from keystone import policy -@@ -28,6 +29,7 @@ from keystone.common import utils - from keystone.common import wsgi - - -+CONF = config.CONF - LOG = logging.getLogger(__name__) - - -@@ -251,10 +253,22 @@ class TokenController(wsgi.Application): - token_id = uuid.uuid4().hex - if 'passwordCredentials' in auth: - username = auth['passwordCredentials'].get('username', '') -+ if len(username) > CONF.max_param_size: -+ raise exception.ValidationSizeError(attribute='username', -+ size=CONF.max_param_size) - password = auth['passwordCredentials'].get('password', '') -+ max_pw_size = utils.MAX_PASSWORD_LENGTH -+ if len(password) > max_pw_size: -+ raise exception.ValidationSizeError(attribute='password', -+ size=max_pw_size) - tenant_name = auth.get('tenantName', None) -- -+ if tenant_name and len(tenant_name) > CONF.max_param_size: -+ raise exception.ValidationSizeError(attribute='tenantName', -+ size=CONF.max_param_size) - user_id = auth['passwordCredentials'].get('userId', None) -+ if user_id and len(user_id) > CONF.max_param_size: -+ raise exception.ValidationSizeError(attribute='userId', -+ size=CONF.max_param_size) - if username: - user_ref = self.identity_api.get_user_by_name( - context=context, user_name=username) -@@ -263,6 +277,9 @@ class TokenController(wsgi.Application): - - # more compat - tenant_id = auth.get('tenantId', None) -+ if tenant_id and len(tenant_id) > CONF.max_param_size: -+ raise exception.ValidationSizeError(attribute='tenantId', -+ size=CONF.max_param_size) - if tenant_name: - tenant_ref = self.identity_api.get_tenant_by_name( - context=context, tenant_name=tenant_name) -@@ -304,9 +321,13 @@ class TokenController(wsgi.Application): - - elif 'token' in auth: - token = auth['token'].get('id', None) -- -+ if len(token) > CONF.max_param_size: -+ raise exception.ValidationSizeError(attribute='token', -+ size=CONF.max_param_size) - tenant_name = auth.get('tenantName') -- -+ if tenant_name and len(tenant_name) > CONF.max_param_size: -+ raise exception.ValidationSizeError(attribute='tenantName', -+ size=CONF.max_param_size) - # more compat - if tenant_name: - tenant_ref = self.identity_api.get_tenant_by_name( -diff --git a/tests/test_service.py b/tests/test_service.py -new file mode 100644 -index 0000000..80fa17f ---- /dev/null -+++ b/tests/test_service.py -@@ -0,0 +1,98 @@ -+# vim: tabstop=4 shiftwidth=4 softtabstop=4 -+ -+# Copyright 2012 Red Hat, Inc. -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); you may -+# not use this file except in compliance with the License. You may obtain -+# a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -+# License for the specific language governing permissions and limitations -+# under the License. -+ -+from keystone import config -+from keystone import exception -+from keystone import service -+from keystone import test -+ -+import default_fixtures -+ -+CONF = config.CONF -+ -+ -+def _build_user_auth(token=None, user_id=None, username=None, -+ password=None, tenant_id=None, tenant_name=None): -+ """Build auth dictionary. -+ -+ It will create an auth dictionary based on all the arguments -+ that it receives. -+ """ -+ auth_json = {} -+ if token is not None: -+ auth_json['token'] = token -+ if username or password: -+ auth_json['passwordCredentials'] = {} -+ if username is not None: -+ auth_json['passwordCredentials']['username'] = username -+ if user_id is not None: -+ auth_json['passwordCredentials']['userId'] = user_id -+ if password is not None: -+ auth_json['passwordCredentials']['password'] = password -+ if tenant_name is not None: -+ auth_json['tenantName'] = tenant_name -+ if tenant_id is not None: -+ auth_json['tenantId'] = tenant_id -+ return auth_json -+ -+ -+class AuthTest(test.TestCase): -+ def setUp(self): -+ super(AuthTest, self).setUp() -+ -+ CONF.identity.driver = 'keystone.identity.backends.kvs.Identity' -+ self.load_backends() -+ self.load_fixtures(default_fixtures) -+ self.api = service.TokenController() -+ -+ def test_authenticate_user_id_too_large(self): -+ """Verify sending large 'userId' raises the right exception.""" -+ body_dict = _build_user_auth(user_id='0' * 65, username='FOO', -+ password='foo2') -+ self.assertRaises(exception.ValidationSizeError, self.api.authenticate, -+ {}, body_dict) -+ -+ def test_authenticate_username_too_large(self): -+ """Verify sending large 'username' raises the right exception.""" -+ body_dict = _build_user_auth(username='0' * 65, password='foo2') -+ self.assertRaises(exception.ValidationSizeError, self.api.authenticate, -+ {}, body_dict) -+ -+ def test_authenticate_tenant_id_too_large(self): -+ """Verify sending large 'tenantId' raises the right exception.""" -+ body_dict = _build_user_auth(username='FOO', password='foo2', -+ tenant_id='0' * 65) -+ self.assertRaises(exception.ValidationSizeError, self.api.authenticate, -+ {}, body_dict) -+ -+ def test_authenticate_tenant_name_too_large(self): -+ """Verify sending large 'tenantName' raises the right exception.""" -+ body_dict = _build_user_auth(username='FOO', password='foo2', -+ tenant_name='0' * 65) -+ self.assertRaises(exception.ValidationSizeError, self.api.authenticate, -+ {}, body_dict) -+ -+ def test_authenticate_token_too_large(self): -+ """Verify sending large 'token' raises the right exception.""" -+ body_dict = _build_user_auth(token={'id': '0' * 8193}) -+ self.assertRaises(exception.ValidationSizeError, self.api.authenticate, -+ {}, body_dict) -+ -+ def test_authenticate_password_too_large(self): -+ """Verify sending large 'password' raises the right exception.""" -+ body_dict = _build_user_auth(username='FOO', password='0' * 8193) -+ self.assertRaises(exception.ValidationSizeError, self.api.authenticate, -+ {}, body_dict) diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/CVE-2013-0282.patch keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/CVE-2013-0282.patch --- keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/CVE-2013-0282.patch 2013-02-19 17:56:13.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/CVE-2013-0282.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -From 426f9d829d700628dd6ee1f8c73f6abad1254328 Mon Sep 17 00:00:00 2001 -From: Nathanael Burton -Date: Tue, 19 Feb 2013 09:27:54 -0600 -Subject: [PATCH] Ensure user and tenant enabled in EC2 - -Fixes bug 1121494. - -Change-Id: Ia9a149a93dec87f46b667100e0ee2eda56d9489d ---- - keystone/contrib/ec2/core.py | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -diff --git a/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py -index 11107eb..488ec88 100644 ---- a/keystone/contrib/ec2/core.py -+++ b/keystone/contrib/ec2/core.py -@@ -43,12 +43,14 @@ from keystone import identity - from keystone import policy - from keystone import service - from keystone import token -+from keystone.common import logging - from keystone.common import manager - from keystone.common import utils - from keystone.common import wsgi - - - CONF = config.CONF -+LOG = logging.getLogger(__name__) - - - class Manager(manager.Manager): -@@ -112,9 +114,9 @@ class Ec2Controller(wsgi.Application): - credentials['host'] = hostname - signature = signer.generate(credentials) - if not utils.auth_str_equal(credentials.signature, signature): -- raise exception.Unauthorized(message='Invalid EC2 signature.') -+ raise exception.Unauthorized() - else: -- raise exception.Unauthorized(message='EC2 signature not supplied.') -+ raise exception.Unauthorized() - - def authenticate(self, context, credentials=None, - ec2Credentials=None): -@@ -145,7 +147,7 @@ class Ec2Controller(wsgi.Application): - credentials = ec2Credentials - - if not 'access' in credentials: -- raise exception.Unauthorized(message='EC2 signature not supplied.') -+ raise exception.Unauthorized() - - creds_ref = self._get_credentials(context, - credentials['access']) -@@ -157,9 +159,19 @@ class Ec2Controller(wsgi.Application): - tenant_ref = self.identity_api.get_tenant( - context=context, - tenant_id=creds_ref['tenant_id']) -+ # If the tenant is disabled don't allow them to authenticate -+ if tenant_ref and not tenant_ref.get('enabled', True): -+ msg = 'Tenant %s is disabled' % tenant_ref['id'] -+ LOG.warning(msg) -+ raise exception.Unauthorized() - user_ref = self.identity_api.get_user( - context=context, - user_id=creds_ref['user_id']) -+ # If the user is disabled don't allow them to authenticate -+ if not user_ref.get('enabled', True): -+ msg = 'User %s is disabled' % user_ref['id'] -+ LOG.warning(msg) -+ raise exception.Unauthorized() - metadata_ref = self.identity_api.get_metadata( - context=context, - user_id=user_ref['id'], -@@ -170,7 +182,7 @@ class Ec2Controller(wsgi.Application): - # fill out the roles in the metadata - roles = metadata_ref.get('roles', []) - if not roles: -- raise exception.Unauthorized(message='User not valid for tenant.') -+ raise exception.Unauthorized() - roles_ref = [self.identity_api.get_role(context, role_id) - for role_id in roles] - -@@ -275,7 +287,7 @@ class Ec2Controller(wsgi.Application): - creds = self.ec2_api.get_credential(context, - credential_id) - if not creds: -- raise exception.Unauthorized(message='EC2 access key not found.') -+ raise exception.Unauthorized() - return creds - - def _assert_identity(self, context, user_id): --- -1.7.9.5 - diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/CVE-2013-1664+1665.patch keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/CVE-2013-1664+1665.patch --- keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/CVE-2013-1664+1665.patch 2013-02-19 17:56:24.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/CVE-2013-1664+1665.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -From 8945567b5ec39c7f32f27aec4eccf230cc86646c Mon Sep 17 00:00:00 2001 -From: Dolph Mathews -Date: Tue, 19 Feb 2013 09:08:41 -0600 -Subject: [PATCH] Disable XML entity parsing - -Fixes bug 1100282 and bug 1100279. - -Change-Id: Idd3989356dfededc3d863770f0ca1661c1d45782 ---- - keystone/common/serializer.py | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/keystone/common/serializer.py b/keystone/common/serializer.py -index cd662bc..a15beea 100644 ---- a/keystone/common/serializer.py -+++ b/keystone/common/serializer.py -@@ -29,6 +29,16 @@ import re - DOCTYPE = '' - XMLNS = 'http://docs.openstack.org/identity/api/v2.0' - -+PARSER = etree.XMLParser( -+ resolve_entities=False, -+ remove_comments=True, -+ remove_pis=True) -+ -+# NOTE(dolph): lxml.etree.Entity() is just a callable that currently returns an -+# lxml.etree._Entity instance, which doesn't appear to be part of the -+# public API, so we discover the type dynamically to be safe -+ENTITY_TYPE = type(etree.Entity('x')) -+ - - def from_xml(xml): - """Deserialize XML to a dictionary.""" -@@ -51,7 +61,7 @@ def to_xml(d, xmlns=None): - class XmlDeserializer(object): - def __call__(self, xml_str): - """Returns a dictionary populated by decoding the given xml string.""" -- dom = etree.fromstring(xml_str.strip()) -+ dom = etree.fromstring(xml_str.strip(), PARSER) - return self.walk_element(dom) - - @staticmethod -@@ -87,7 +97,8 @@ class XmlDeserializer(object): - # current spec does not have attributes on an element with text - values = values or text or {} - -- for child in [self.walk_element(x) for x in element]: -+ for child in [self.walk_element(x) for x in element -+ if not isinstance(x, ENTITY_TYPE)]: - values = dict(values.items() + child.items()) - - return {XmlDeserializer._tag_name(element.tag): values} --- -1.7.9.5 - diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/CVE-2013-2059.patch keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/CVE-2013-2059.patch --- keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/CVE-2013-2059.patch 1970-01-01 00:00:00.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/CVE-2013-2059.patch 2013-05-15 19:40:33.000000000 +0000 @@ -0,0 +1,58 @@ +Origin: upstream predisclosure +Description: delete user token immediately upon delete when using v2 API +Bug: https://bugs.launchpad.net/keystone/+bug/1166670 + +Index: keystone-2012.1+stable~20120824-a16a0ab9/keystone/identity/core.py +=================================================================== +--- keystone-2012.1+stable~20120824-a16a0ab9.orig/keystone/identity/core.py 2013-05-07 14:18:04.000000000 -0500 ++++ keystone-2012.1+stable~20120824-a16a0ab9/keystone/identity/core.py 2013-05-07 14:18:04.000000000 -0500 +@@ -427,6 +427,14 @@ + raise exception.UserNotFound(user_id=user_id) + + self.identity_api.delete_user(context, user_id) ++ try: ++ for token_id in self.token_api.list_tokens(context, user_id): ++ self.token_api.delete_token(context, token_id) ++ except exception.NotImplemented: ++ # The users status has been changed but tokens remain valid for ++ # backends that can't list tokens for users ++ LOG.warning('User %s status has changed, but existing tokens ' ++ 'remain valid' % user_id) + + def set_user_enabled(self, context, user_id, user): + return self.update_user(context, user_id, user) +Index: keystone-2012.1+stable~20120824-a16a0ab9/tests/test_keystoneclient.py +=================================================================== +--- keystone-2012.1+stable~20120824-a16a0ab9.orig/tests/test_keystoneclient.py 2013-05-07 14:18:04.000000000 -0500 ++++ keystone-2012.1+stable~20120824-a16a0ab9/tests/test_keystoneclient.py 2013-05-07 14:18:04.000000000 -0500 +@@ -370,6 +370,30 @@ + self.get_client, + self.user_foo) + ++ def test_delete_user_invalidates_token(self): ++ from keystoneclient import exceptions as client_exceptions ++ ++ admin_client = self.get_client(admin=True) ++ client = self.get_client(admin=False) ++ ++ username = uuid.uuid4().hex ++ password = uuid.uuid4().hex ++ user_id = admin_client.users.create( ++ name=username, password=password, email=uuid.uuid4().hex).id ++ ++ token_id = client.tokens.authenticate( ++ username=username, password=password).id ++ ++ # token should be usable before the user is deleted ++ client.tokens.authenticate(token=token_id) ++ ++ admin_client.users.delete(user=user_id) ++ ++ # authenticate with a token should not work after the user is deleted ++ self.assertRaises(client_exceptions.Unauthorized, ++ client.tokens.authenticate, ++ token=token_id) ++ + def test_token_expiry_maintained(self): + foo_client = self.get_client(self.user_foo) + orig_token = foo_client.service_catalog.catalog['token'] diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/fix-ubuntu-tests.patch keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/fix-ubuntu-tests.patch --- keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/fix-ubuntu-tests.patch 2012-08-24 10:38:53.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/fix-ubuntu-tests.patch 2013-04-24 15:25:29.000000000 +0000 @@ -16,7 +16,7 @@ =================================================================== --- keystone-2012.1.orig/tests/test_keystoneclient.py 2012-03-29 12:34:00.000000000 -0700 +++ keystone-2012.1/tests/test_keystoneclient.py 2012-03-29 14:08:55.564013183 -0700 -@@ -30,10 +30,6 @@ +@@ -31,10 +31,6 @@ def setUp(self): super(CompatTestCase, self).setUp() @@ -27,7 +27,7 @@ self.load_backends() self.load_fixtures(default_fixtures) -@@ -486,9 +482,6 @@ +@@ -763,9 +759,6 @@ class KcMasterTestCase(CompatTestCase, KeystoneClientTests): @@ -37,7 +37,7 @@ def test_tenant_add_and_remove_user(self): client = self.get_client(admin=True) client.roles.add_user_role(tenant=self.tenant_baz['id'], -@@ -564,10 +557,8 @@ +@@ -884,10 +877,8 @@ class KcEssex3TestCase(CompatTestCase, KeystoneClientTests): @@ -48,8 +48,8 @@ + raise nose.exc.SkipTest('Keystoneclient Essex 3 tests disabled.') client = self.get_client(admin=True) client.roles.add_user_to_tenant(tenant_id=self.tenant_baz['id'], - user_id=self.user_foo['id'], -@@ -596,6 +587,7 @@ + user_id=self.user_two['id'], +@@ -916,6 +907,7 @@ [x.tenantId for x in role_refs]) def test_roles_get_by_user(self): @@ -57,9 +57,9 @@ client = self.get_client(admin=True) roles = client.roles.get_user_role_refs(user_id='foo') self.assertTrue(len(roles) > 0) -@@ -604,6 +596,7 @@ +@@ -927,6 +919,7 @@ raise nose.exc.SkipTest('N/A') - + def test_user_create_update_delete(self): + raise nose.exc.SkipTest('Keystoneclient Essex 3 tests disabled.') from keystoneclient import exceptions as client_exceptions diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/keystone-CVE-2012-3542.patch keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/keystone-CVE-2012-3542.patch --- keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/keystone-CVE-2012-3542.patch 2012-08-30 22:09:58.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/keystone-CVE-2012-3542.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Origin: https://github.com/openstack/keystone/commit/5438d3b5a219d7c8fa67e66e538d325a61617155 -Subject: Require authz to update user's tenant -Bug: https://bugs.launchpad.net/keystone/+bug/1040626 - -CVE-2012-3542 - -diff --git a/keystone/identity/core.py b/keystone/identity/core.py -index a0704f1..db3ce31 100644 ---- a/keystone/identity/core.py -+++ b/keystone/identity/core.py -@@ -436,6 +436,7 @@ def set_user_password(self, context, user_id, user): - - def update_user_tenant(self, context, user_id, user): - """Update the default tenant.""" -+ self.assert_admin(context) - # ensure that we're a member of that tenant - tenant_id = user.get('tenantId') - self.identity_api.add_user_to_tenant(context, tenant_id, user_id) diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/keystone-CVE-2012-4413.patch keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/keystone-CVE-2012-4413.patch --- keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/keystone-CVE-2012-4413.patch 2012-09-12 16:59:58.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/keystone-CVE-2012-4413.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,147 +0,0 @@ -From: Dolph Mathews -Date: Fri, 7 Sep 2012 19:55:31 +0000 (-0500) -Subject: Delete user tokens after role grant/revoke -X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fkeystone.git;a=commitdiff_plain;h=58ac6691a21675be9e2ffb0f84a05fc3cd4d2e2e -Bug: https://bugs.launchpad.net/bugs/1041396 - -Delete user tokens after role grant/revoke - -Delete user tokens when a new role is granted or revoked, in order to -prevent old tokens to continue to be valid for the original set of -roles for the remainder of the token's lifespan. - -Addresses CVE-2012-4413. -Fixes bug 1041396. - -Change-Id: Ib11b5b3a933c6000afe0c875c3f71f1f101bb202 ---- - ---- - keystone/identity/core.py | 7 ++++++- - keystone/token/core.py | 11 +++++++++++ - tests/test_keystoneclient.py | 18 +++++++++--------- - 3 files changed, 26 insertions(+), 10 deletions(-) - -Index: b/keystone/identity/core.py -=================================================================== ---- a/keystone/identity/core.py -+++ b/keystone/identity/core.py -@@ -525,6 +525,8 @@ class RoleController(wsgi.Application): - self.identity_api.add_user_to_tenant(context, tenant_id, user_id) - self.identity_api.add_role_to_user_and_tenant( - context, user_id, tenant_id, role_id) -+ self.token_api.revoke_tokens(context, user_id) -+ - role_ref = self.identity_api.get_role(context, role_id) - return {'role': role_ref} - -@@ -555,7 +557,7 @@ class RoleController(wsgi.Application): - if not roles: - self.identity_api.remove_user_from_tenant( - context, tenant_id, user_id) -- return -+ self.token_api.revoke_tokens(context, user_id) - - # COMPAT(diablo): CRUD extension - def get_role_refs(self, context, user_id): -@@ -597,6 +599,8 @@ class RoleController(wsgi.Application): - self.identity_api.add_user_to_tenant(context, tenant_id, user_id) - self.identity_api.add_role_to_user_and_tenant( - context, user_id, tenant_id, role_id) -+ self.token_api.revoke_tokens(context, user_id) -+ - role_ref = self.identity_api.get_role(context, role_id) - return {'role': role_ref} - -@@ -624,3 +628,4 @@ class RoleController(wsgi.Application): - if not roles: - self.identity_api.remove_user_from_tenant( - context, tenant_id, user_id) -+ self.token_api.revoke_tokens(context, user_id) -Index: b/keystone/token/core.py -=================================================================== ---- a/keystone/token/core.py -+++ b/keystone/token/core.py -@@ -38,6 +38,10 @@ class Manager(manager.Manager): - def __init__(self): - super(Manager, self).__init__(CONF.token.driver) - -+ def revoke_tokens(self, context, user_id): -+ for token_id in self.list_tokens(context, user_id): -+ self.delete_token(context, token_id) -+ - - class Driver(object): - """Interface description for a Token driver.""" -@@ -97,6 +101,13 @@ class Driver(object): - """ - raise exception.NotImplemented() - -+ def revoke_tokens(self, user_id): -+ """Invalidates all tokens held by a user. -+ -+ :raises: keystone.exception.UserNotFound -+ """ -+ raise exception.NotImplemented() -+ - def _get_default_expire_time(self): - """Determine when a token should expire based on the config. - -Index: b/tests/test_keystoneclient.py -=================================================================== ---- a/tests/test_keystoneclient.py -+++ b/tests/test_keystoneclient.py -@@ -762,15 +762,15 @@ class KcMasterTestCase(CompatTestCase, K - def test_tenant_add_and_remove_user(self): - client = self.get_client(admin=True) - client.roles.add_user_role(tenant=self.tenant_baz['id'], -- user=self.user_foo['id'], -+ user=self.user_two['id'], - role=self.role_useless['id']) - user_refs = client.tenants.list_users(tenant=self.tenant_baz['id']) -- self.assert_(self.user_foo['id'] in [x.id for x in user_refs]) -+ self.assert_(self.user_two['id'] in [x.id for x in user_refs]) - client.roles.remove_user_role(tenant=self.tenant_baz['id'], -- user=self.user_foo['id'], -+ user=self.user_two['id'], - role=self.role_useless['id']) - user_refs = client.tenants.list_users(tenant=self.tenant_baz['id']) -- self.assert_(self.user_foo['id'] not in [x.id for x in user_refs]) -+ self.assert_(self.user_two['id'] not in [x.id for x in user_refs]) - - def test_user_role_add_404(self): - from keystoneclient import exceptions as client_exceptions -@@ -881,16 +881,16 @@ class KcEssex3TestCase(CompatTestCase, K - raise nose.exc.SkipTest('Keystoneclient Essex 3 tests disabled.') - client = self.get_client(admin=True) - client.roles.add_user_to_tenant(tenant_id=self.tenant_baz['id'], -- user_id=self.user_foo['id'], -+ user_id=self.user_two['id'], - role_id=self.role_useless['id']) - role_refs = client.roles.get_user_role_refs( -- user_id=self.user_foo['id']) -+ user_id=self.user_two['id']) - self.assert_(self.tenant_baz['id'] in [x.tenantId for x in role_refs]) - - # get the "role_refs" so we get the proper id, this is how the clients - # do it - roleref_refs = client.roles.get_user_role_refs( -- user_id=self.user_foo['id']) -+ user_id=self.user_two['id']) - for roleref_ref in roleref_refs: - if (roleref_ref.roleId == self.role_useless['id'] - and roleref_ref.tenantId == self.tenant_baz['id']): -@@ -898,11 +898,11 @@ class KcEssex3TestCase(CompatTestCase, K - break - - client.roles.remove_user_from_tenant(tenant_id=self.tenant_baz['id'], -- user_id=self.user_foo['id'], -+ user_id=self.user_two['id'], - role_id=roleref_ref.id) - - role_refs = client.roles.get_user_role_refs( -- user_id=self.user_foo['id']) -+ user_id=self.user_two['id']) - self.assert_(self.tenant_baz['id'] not in - [x.tenantId for x in role_refs]) - diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/keystone-CVE-2012-5571.patch keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/keystone-CVE-2012-5571.patch --- keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/keystone-CVE-2012-5571.patch 2012-11-26 20:06:23.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/keystone-CVE-2012-5571.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -From 8735009dc5b895db265a1cd573f39f4acfca2a19 Mon Sep 17 00:00:00 2001 -From: Vishvananda Ishaya -Date: Tue, 13 Nov 2012 15:49:19 -0800 -Subject: [PATCH] Ensures User is member of tenant in ec2 validation - -It is possible that a user is no longer a member of a tenant when -they attempt to use an ec2 token. This checks to make sure that -the user still has at least one valid role in the tenant before -authenticating them. This should automatically work for the s3 -version as well since it is a subclass. - -Fixes bug 1064914 - -Change-Id: Ieb237bae936a7b00ce7ba4d4c59aec6c7a69ec21 ---- - keystone/contrib/ec2/core.py | 23 +++++++++++++---------- - 1 file changed, 13 insertions(+), 10 deletions(-) - -diff --git a/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py -index 4449b6b..11107eb 100644 ---- a/keystone/contrib/ec2/core.py -+++ b/keystone/contrib/ec2/core.py -@@ -161,9 +161,19 @@ def authenticate(self, context, credentials=None, - context=context, - user_id=creds_ref['user_id']) - metadata_ref = self.identity_api.get_metadata( -- context=context, -- user_id=user_ref['id'], -- tenant_id=tenant_ref['id']) -+ context=context, -+ user_id=user_ref['id'], -+ tenant_id=tenant_ref['id']) -+ -+ # TODO(termie): optimize this call at some point and put it into the -+ # the return for metadata -+ # fill out the roles in the metadata -+ roles = metadata_ref.get('roles', []) -+ if not roles: -+ raise exception.Unauthorized(message='User not valid for tenant.') -+ roles_ref = [self.identity_api.get_role(context, role_id) -+ for role_id in roles] -+ - catalog_ref = self.catalog_api.get_catalog( - context=context, - user_id=user_ref['id'], -@@ -176,13 +186,6 @@ def authenticate(self, context, credentials=None, - tenant=tenant_ref, - metadata=metadata_ref)) - -- # TODO(termie): optimize this call at some point and put it into the -- # the return for metadata -- # fill out the roles in the metadata -- roles_ref = [] -- for role_id in metadata_ref.get('roles', []): -- roles_ref.append(self.identity_api.get_role(context, role_id)) -- - # TODO(termie): make this a util function or something - # TODO(termie): i don't think the ec2 middleware currently expects a - # full return, but it contains a note saying that it --- -1.7.10 - diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/series keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/series --- keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/series 2013-02-19 17:56:43.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/series 2013-05-15 19:40:46.000000000 +0000 @@ -1,8 +1,4 @@ fix-ubuntu-tests.patch sql_connection.patch -keystone-CVE-2012-3542.patch -keystone-CVE-2012-4413.patch -keystone-CVE-2012-5571.patch CVE-2013-0247.patch -CVE-2013-0282.patch -CVE-2013-1664+1665.patch +CVE-2013-2059.patch diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/sql_connection.patch keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/sql_connection.patch --- keystone-2012.1+stable~20120824-a16a0ab9/debian/patches/sql_connection.patch 2012-08-24 10:38:53.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/debian/patches/sql_connection.patch 2013-04-24 15:25:29.000000000 +0000 @@ -1,11 +1,9 @@ Description: Specify a path for the sqlite database, enable sql backends Author: Chuck Short -Index: keystone-2012.1/etc/keystone.conf -=================================================================== ---- keystone-2012.1.orig/etc/keystone.conf 2012-03-21 10:57:48.000000000 -0700 -+++ keystone-2012.1/etc/keystone.conf 2012-03-21 10:59:15.331503618 -0700 -@@ -6,7 +6,7 @@ +--- a/etc/keystone.conf ++++ b/etc/keystone.conf +@@ -6,7 +6,7 @@ admin_token = ADMIN compute_port = 8774 verbose = True debug = True @@ -14,7 +12,7 @@ # ================= Syslog Options ============================ # Send logs to syslog (/dev/log) instead of to file specified -@@ -17,7 +17,7 @@ +@@ -17,7 +17,7 @@ use_syslog = False # syslog_log_facility = LOG_LOCAL0 [sql] @@ -23,7 +21,7 @@ idle_timeout = 200 [ldap] -@@ -34,11 +34,10 @@ +@@ -34,11 +34,10 @@ idle_timeout = 200 driver = keystone.identity.backends.sql.Identity [catalog] @@ -37,7 +35,7 @@ # Amount of time a token should remain valid (in seconds) expiration = 86400 -@@ -47,7 +46,7 @@ +@@ -47,7 +46,7 @@ expiration = 86400 driver = keystone.policy.backends.rules.Policy [ec2] diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/doc/keystone_compat_flows.sdx keystone-2012.1.3+stable-20130423-f48dd0fc/doc/keystone_compat_flows.sdx --- keystone-2012.1+stable~20120824-a16a0ab9/doc/keystone_compat_flows.sdx 2012-08-24 10:38:44.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/doc/keystone_compat_flows.sdx 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone/common/serializer.py keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/common/serializer.py --- keystone-2012.1+stable~20120824-a16a0ab9/keystone/common/serializer.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/common/serializer.py 2013-04-24 13:24:40.000000000 +0000 @@ -29,6 +29,16 @@ DOCTYPE = '' XMLNS = 'http://docs.openstack.org/identity/api/v2.0' +PARSER = etree.XMLParser( + resolve_entities=False, + remove_comments=True, + remove_pis=True) + +# NOTE(dolph): lxml.etree.Entity() is just a callable that currently returns an +# lxml.etree._Entity instance, which doesn't appear to be part of the +# public API, so we discover the type dynamically to be safe +ENTITY_TYPE = type(etree.Entity('x')) + def from_xml(xml): """Deserialize XML to a dictionary.""" @@ -51,7 +61,7 @@ class XmlDeserializer(object): def __call__(self, xml_str): """Returns a dictionary populated by decoding the given xml string.""" - dom = etree.fromstring(xml_str.strip()) + dom = etree.fromstring(xml_str.strip(), PARSER) return self.walk_element(dom) @staticmethod @@ -87,7 +97,8 @@ # current spec does not have attributes on an element with text values = values or text or {} - for child in [self.walk_element(x) for x in element]: + for child in [self.walk_element(x) for x in element + if not isinstance(x, ENTITY_TYPE)]: values = dict(values.items() + child.items()) return {XmlDeserializer._tag_name(element.tag): values} diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone/config.py keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/config.py --- keystone-2012.1+stable~20120824-a16a0ab9/keystone/config.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/config.py 2013-04-24 13:24:40.000000000 +0000 @@ -143,7 +143,7 @@ register_str('compute_port') register_str('admin_port') register_str('public_port') - +register_int('max_param_size', default=64) # sql options register_str('connection', group='sql') diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone/contrib/ec2/core.py keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/contrib/ec2/core.py --- keystone-2012.1+stable~20120824-a16a0ab9/keystone/contrib/ec2/core.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/contrib/ec2/core.py 2013-04-24 13:24:40.000000000 +0000 @@ -43,12 +43,14 @@ from keystone import policy from keystone import service from keystone import token +from keystone.common import logging from keystone.common import manager from keystone.common import utils from keystone.common import wsgi CONF = config.CONF +LOG = logging.getLogger(__name__) class Manager(manager.Manager): @@ -112,9 +114,9 @@ credentials['host'] = hostname signature = signer.generate(credentials) if not utils.auth_str_equal(credentials.signature, signature): - raise exception.Unauthorized(message='Invalid EC2 signature.') + raise exception.Unauthorized() else: - raise exception.Unauthorized(message='EC2 signature not supplied.') + raise exception.Unauthorized() def authenticate(self, context, credentials=None, ec2Credentials=None): @@ -145,7 +147,7 @@ credentials = ec2Credentials if not 'access' in credentials: - raise exception.Unauthorized(message='EC2 signature not supplied.') + raise exception.Unauthorized() creds_ref = self._get_credentials(context, credentials['access']) @@ -157,13 +159,33 @@ tenant_ref = self.identity_api.get_tenant( context=context, tenant_id=creds_ref['tenant_id']) + # If the tenant is disabled don't allow them to authenticate + if tenant_ref and not tenant_ref.get('enabled', True): + msg = 'Tenant %s is disabled' % tenant_ref['id'] + LOG.warning(msg) + raise exception.Unauthorized() user_ref = self.identity_api.get_user( context=context, user_id=creds_ref['user_id']) + # If the user is disabled don't allow them to authenticate + if not user_ref.get('enabled', True): + msg = 'User %s is disabled' % user_ref['id'] + LOG.warning(msg) + raise exception.Unauthorized() metadata_ref = self.identity_api.get_metadata( - context=context, - user_id=user_ref['id'], - tenant_id=tenant_ref['id']) + context=context, + user_id=user_ref['id'], + tenant_id=tenant_ref['id']) + + # TODO(termie): optimize this call at some point and put it into the + # the return for metadata + # fill out the roles in the metadata + roles = metadata_ref.get('roles', []) + if not roles: + raise exception.Unauthorized() + roles_ref = [self.identity_api.get_role(context, role_id) + for role_id in roles] + catalog_ref = self.catalog_api.get_catalog( context=context, user_id=user_ref['id'], @@ -176,13 +198,6 @@ tenant=tenant_ref, metadata=metadata_ref)) - # TODO(termie): optimize this call at some point and put it into the - # the return for metadata - # fill out the roles in the metadata - roles_ref = [] - for role_id in metadata_ref.get('roles', []): - roles_ref.append(self.identity_api.get_role(context, role_id)) - # TODO(termie): make this a util function or something # TODO(termie): i don't think the ec2 middleware currently expects a # full return, but it contains a note saying that it @@ -272,7 +287,7 @@ creds = self.ec2_api.get_credential(context, credential_id) if not creds: - raise exception.Unauthorized(message='EC2 access key not found.') + raise exception.Unauthorized() return creds def _assert_identity(self, context, user_id): diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone/exception.py keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/exception.py --- keystone-2012.1+stable~20120824-a16a0ab9/keystone/exception.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/exception.py 2013-04-24 13:24:40.000000000 +0000 @@ -51,6 +51,19 @@ title = 'Bad Request' +class ValidationSizeError(Error): + """Request attribute %(attribute)s must be less than or equal to %(size)i. + + The server could not comply with the request because the attribute + size is invalid (too large). + + The client is assumed to be in error. + + """ + code = 400 + title = 'Bad Request' + + class Unauthorized(Error): """The request you have made requires authentication.""" code = 401 diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone/identity/core.py keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/identity/core.py --- keystone-2012.1+stable~20120824-a16a0ab9/keystone/identity/core.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/identity/core.py 2013-04-24 13:24:40.000000000 +0000 @@ -436,6 +436,7 @@ def update_user_tenant(self, context, user_id, user): """Update the default tenant.""" + self.assert_admin(context) # ensure that we're a member of that tenant tenant_id = user.get('tenantId') self.identity_api.add_user_to_tenant(context, tenant_id, user_id) @@ -524,6 +525,8 @@ self.identity_api.add_user_to_tenant(context, tenant_id, user_id) self.identity_api.add_role_to_user_and_tenant( context, user_id, tenant_id, role_id) + self.token_api.revoke_tokens(context, user_id, tenant_id) + role_ref = self.identity_api.get_role(context, role_id) return {'role': role_ref} @@ -554,7 +557,7 @@ if not roles: self.identity_api.remove_user_from_tenant( context, tenant_id, user_id) - return + self.token_api.revoke_tokens(context, user_id, tenant_id) # COMPAT(diablo): CRUD extension def get_role_refs(self, context, user_id): @@ -596,6 +599,8 @@ self.identity_api.add_user_to_tenant(context, tenant_id, user_id) self.identity_api.add_role_to_user_and_tenant( context, user_id, tenant_id, role_id) + self.token_api.revoke_tokens(context, user_id, tenant_id) + role_ref = self.identity_api.get_role(context, role_id) return {'role': role_ref} @@ -623,3 +628,4 @@ if not roles: self.identity_api.remove_user_from_tenant( context, tenant_id, user_id) + self.token_api.revoke_tokens(context, user_id, tenant_id) diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone/service.py keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/service.py --- keystone-2012.1+stable~20120824-a16a0ab9/keystone/service.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/service.py 2013-04-24 13:24:40.000000000 +0000 @@ -19,6 +19,7 @@ import routes from keystone import catalog +from keystone import config from keystone import exception from keystone import identity from keystone import policy @@ -28,6 +29,7 @@ from keystone.common import wsgi +CONF = config.CONF LOG = logging.getLogger(__name__) @@ -251,10 +253,22 @@ token_id = uuid.uuid4().hex if 'passwordCredentials' in auth: username = auth['passwordCredentials'].get('username', '') + if len(username) > CONF.max_param_size: + raise exception.ValidationSizeError(attribute='username', + size=CONF.max_param_size) password = auth['passwordCredentials'].get('password', '') + max_pw_size = utils.MAX_PASSWORD_LENGTH + if len(password) > max_pw_size: + raise exception.ValidationSizeError(attribute='password', + size=max_pw_size) tenant_name = auth.get('tenantName', None) - + if tenant_name and len(tenant_name) > CONF.max_param_size: + raise exception.ValidationSizeError(attribute='tenantName', + size=CONF.max_param_size) user_id = auth['passwordCredentials'].get('userId', None) + if user_id and len(user_id) > CONF.max_param_size: + raise exception.ValidationSizeError(attribute='userId', + size=CONF.max_param_size) if username: user_ref = self.identity_api.get_user_by_name( context=context, user_name=username) @@ -263,6 +277,9 @@ # more compat tenant_id = auth.get('tenantId', None) + if tenant_id and len(tenant_id) > CONF.max_param_size: + raise exception.ValidationSizeError(attribute='tenantId', + size=CONF.max_param_size) if tenant_name: tenant_ref = self.identity_api.get_tenant_by_name( context=context, tenant_name=tenant_name) @@ -304,9 +321,13 @@ elif 'token' in auth: token = auth['token'].get('id', None) - + if len(token) > CONF.max_param_size: + raise exception.ValidationSizeError(attribute='token', + size=CONF.max_param_size) tenant_name = auth.get('tenantName') - + if tenant_name and len(tenant_name) > CONF.max_param_size: + raise exception.ValidationSizeError(attribute='tenantName', + size=CONF.max_param_size) # more compat if tenant_name: tenant_ref = self.identity_api.get_tenant_by_name( diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone/token/backends/kvs.py keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/token/backends/kvs.py --- keystone-2012.1+stable~20120824-a16a0ab9/keystone/token/backends/kvs.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/token/backends/kvs.py 2013-04-24 13:24:40.000000000 +0000 @@ -45,17 +45,22 @@ except KeyError: raise exception.TokenNotFound(token_id=token_id) - def list_tokens(self, user_id): + def list_tokens(self, user_id, tenant_id=None): tokens = [] now = datetime.datetime.utcnow() - for token, user_ref in self.db.items(): + for token, ref in self.db.items(): if not token.startswith('token-'): continue - if 'user' not in user_ref: + if 'user' not in ref: continue - if user_ref['user'].get('id') != user_id: + if ref['user'].get('id') != user_id: continue - if user_ref.get('expires') and user_ref.get('expires') < now: + if ref.get('expires') and ref.get('expires') < now: continue + if tenant_id is not None: + if 'tenant' not in ref: + continue + if ref['tenant'].get('id') != tenant_id: + continue tokens.append(token.split('-', 1)[1]) return tokens diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone/token/backends/memcache.py keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/token/backends/memcache.py --- keystone-2012.1+stable~20120824-a16a0ab9/keystone/token/backends/memcache.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/token/backends/memcache.py 2013-04-24 13:24:40.000000000 +0000 @@ -45,6 +45,9 @@ def _prefix_token_id(self, token_id): return 'token-%s' % token_id.encode('utf-8') + def _prefix_user_id(self, user_id): + return 'usertokens-%s' % user_id.encode('utf-8') + def get_token(self, token_id): ptk = self._prefix_token_id(token_id) token = self.client.get(ptk) @@ -63,10 +66,37 @@ expires_ts = utils.unixtime(data_copy['expires']) kwargs['time'] = expires_ts self.client.set(ptk, data_copy, **kwargs) + if 'id' in data['user']: + token_data = token_id + user_id = data['user']['id'] + user_key = self._prefix_user_id(user_id) + if not self.client.append(user_key, ',%s' % token_data): + if not self.client.add(user_key, token_data): + if not self.client.append(user_key, ',%s' % token_data): + msg = _('Unable to add token user list.') + raise exception.UnexpectedError(msg) return copy.deepcopy(data_copy) def delete_token(self, token_id): # Test for existence self.get_token(token_id) ptk = self._prefix_token_id(token_id) - return self.client.delete(ptk) + result = self.client.delete(ptk) + return result + + def list_tokens(self, user_id, tenant_id=None): + tokens = [] + user_key = self._prefix_user_id(user_id) + user_record = self.client.get(user_key) or "" + token_list = user_record.split(',') + for token_id in token_list: + ptk = self._prefix_token_id(token_id) + token_ref = self.client.get(ptk) + if token_ref: + if tenant_id is not None: + if 'tenant' not in token_ref: + continue + if token_ref['tenant'].get('id') != tenant_id: + continue + tokens.append(token_id) + return tokens diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone/token/backends/sql.py keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/token/backends/sql.py --- keystone-2012.1+stable~20120824-a16a0ab9/keystone/token/backends/sql.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/token/backends/sql.py 2013-04-24 13:24:40.000000000 +0000 @@ -82,7 +82,7 @@ session.delete(token_ref) session.flush() - def list_tokens(self, user_id): + def list_tokens(self, user_id, tenant_id=None): session = self.get_session() tokens = [] now = datetime.datetime.utcnow() @@ -93,5 +93,10 @@ continue if token_ref_dict['user'].get('id') != user_id: continue + if tenant_id is not None: + if 'tenant' not in token_ref_dict: + continue + if token_ref_dict['tenant'].get('id') != tenant_id: + continue tokens.append(token_ref['id']) return tokens diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone/token/core.py keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/token/core.py --- keystone-2012.1+stable~20120824-a16a0ab9/keystone/token/core.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone/token/core.py 2013-04-24 13:24:40.000000000 +0000 @@ -38,6 +38,15 @@ def __init__(self): super(Manager, self).__init__(CONF.token.driver) + def revoke_tokens(self, context, user_id, tenant_id=None): + """Invalidates all tokens held by a user (optionally for a tenant). + + If a specific tenant ID is not provided, *all* tokens held by user will + be revoked. + """ + for token_id in self.list_tokens(context, user_id, tenant_id): + self.delete_token(context, token_id) + class Driver(object): """Interface description for a Token driver.""" @@ -97,6 +106,14 @@ """ raise exception.NotImplemented() + def revoke_tokens(self, user_id, tenant_id=None): + """Invalidates all tokens held by a user (optionally for a tenant). + + :raises: keystone.exception.UserNotFound, + keystone.exception.TenantNotFound + """ + raise exception.NotImplemented() + def _get_default_expire_time(self): """Determine when a token should expire based on the config. diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone.egg-info/PKG-INFO keystone-2012.1.3+stable-20130423-f48dd0fc/keystone.egg-info/PKG-INFO --- keystone-2012.1+stable~20120824-a16a0ab9/keystone.egg-info/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone.egg-info/PKG-INFO 2013-04-24 13:24:44.000000000 +0000 @@ -0,0 +1,10 @@ +Metadata-Version: 1.0 +Name: keystone +Version: 2012.1.4 +Summary: Authentication service for OpenStack +Home-page: http://www.openstack.org +Author: OpenStack, LLC. +Author-email: openstack@lists.launchpad.net +License: Apache License (2.0) +Description: UNKNOWN +Platform: UNKNOWN diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone.egg-info/SOURCES.txt keystone-2012.1.3+stable-20130423-f48dd0fc/keystone.egg-info/SOURCES.txt --- keystone-2012.1+stable~20120824-a16a0ab9/keystone.egg-info/SOURCES.txt 1970-01-01 00:00:00.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone.egg-info/SOURCES.txt 2013-04-24 13:24:44.000000000 +0000 @@ -0,0 +1,177 @@ +AUTHORS +ChangeLog +HACKING.rst +LICENSE +MANIFEST.in +README.rst +TODO +openstack-common.conf +run_tests.py +run_tests.sh +setup.cfg +setup.py +tox.ini +bin/keystone-all +bin/keystone-manage +doc/Makefile +doc/source/api_curl_examples.rst +doc/source/architecture.rst +doc/source/community.rst +doc/source/conf.py +doc/source/configuration.rst +doc/source/configuringservices.rst +doc/source/developing.rst +doc/source/index.rst +doc/source/installing.rst +doc/source/middleware_architecture.rst +doc/source/setup.rst +doc/source/_templates/.placeholder +doc/source/_theme/layout.html +doc/source/_theme/theme.conf +doc/source/images/authComp.svg +doc/source/images/graphs_authComp.svg +doc/source/images/graphs_authCompDelegate.svg +doc/source/man/keystone-all.rst +doc/source/man/keystone-manage.rst +doc/source/old/backends.rst +doc/source/old/controllingservers.rst +doc/source/old/endpoints.rst +doc/source/old/extensions.rst +doc/source/old/migration.rst +doc/source/old/releases.rst +doc/source/old/services.rst +doc/source/old/ssl.rst +doc/source/static/basic.css +doc/source/static/default.css +doc/source/static/jquery.tweet.js +doc/source/static/tweaks.css +etc/default_catalog.templates +etc/keystone.conf +etc/logging.conf.sample +etc/policy.json +keystone/__init__.py +keystone/cli.py +keystone/config.py +keystone/exception.py +keystone/service.py +keystone/test.py +keystone.egg-info/PKG-INFO +keystone.egg-info/SOURCES.txt +keystone.egg-info/dependency_links.txt +keystone.egg-info/not-zip-safe +keystone.egg-info/requires.txt +keystone.egg-info/top_level.txt +keystone/catalog/__init__.py +keystone/catalog/core.py +keystone/catalog/backends/__init__.py +keystone/catalog/backends/kvs.py +keystone/catalog/backends/sql.py +keystone/catalog/backends/templated.py +keystone/common/__init__.py +keystone/common/bufferedhttp.py +keystone/common/kvs.py +keystone/common/logging.py +keystone/common/manager.py +keystone/common/policy.py +keystone/common/serializer.py +keystone/common/utils.py +keystone/common/wsgi.py +keystone/common/ldap/__init__.py +keystone/common/ldap/core.py +keystone/common/ldap/fakeldap.py +keystone/common/sql/__init__.py +keystone/common/sql/core.py +keystone/common/sql/legacy.py +keystone/common/sql/migration.py +keystone/common/sql/nova.py +keystone/common/sql/util.py +keystone/common/sql/migrate_repo/README +keystone/common/sql/migrate_repo/__init__.py +keystone/common/sql/migrate_repo/manage.py +keystone/common/sql/migrate_repo/migrate.cfg +keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py +keystone/common/sql/migrate_repo/versions/__init__.py +keystone/contrib/__init__.py +keystone/contrib/admin_crud/__init__.py +keystone/contrib/admin_crud/core.py +keystone/contrib/ec2/__init__.py +keystone/contrib/ec2/core.py +keystone/contrib/ec2/backends/__init__.py +keystone/contrib/ec2/backends/kvs.py +keystone/contrib/ec2/backends/sql.py +keystone/contrib/s3/__init__.py +keystone/contrib/s3/core.py +keystone/identity/__init__.py +keystone/identity/core.py +keystone/identity/models.py +keystone/identity/backends/__init__.py +keystone/identity/backends/kvs.py +keystone/identity/backends/pam.py +keystone/identity/backends/sql.py +keystone/identity/backends/ldap/__init__.py +keystone/identity/backends/ldap/core.py +keystone/middleware/__init__.py +keystone/middleware/auth_token.py +keystone/middleware/core.py +keystone/middleware/ec2_token.py +keystone/middleware/s3_token.py +keystone/middleware/swift_auth.py +keystone/openstack/__init__.py +keystone/openstack/common/README +keystone/openstack/common/__init__.py +keystone/openstack/common/cfg.py +keystone/openstack/common/setup.py +keystone/policy/__init__.py +keystone/policy/core.py +keystone/policy/backends/__init__.py +keystone/policy/backends/rules.py +keystone/policy/backends/simple.py +keystone/token/__init__.py +keystone/token/core.py +keystone/token/backends/__init__.py +keystone/token/backends/kvs.py +keystone/token/backends/memcache.py +keystone/token/backends/sql.py +tests/_ldap_livetest.py +tests/backend_ldap.conf +tests/backend_liveldap.conf +tests/backend_sql.conf +tests/default_catalog.templates +tests/default_fixtures.py +tests/legacy_d5.mysql +tests/legacy_d5.sqlite +tests/legacy_diablo.mysql +tests/legacy_diablo.sqlite +tests/legacy_essex.mysql +tests/legacy_essex.sqlite +tests/policy.json +tests/test_auth_token_middleware.py +tests/test_authors.py +tests/test_backend.py +tests/test_backend_kvs.py +tests/test_backend_ldap.py +tests/test_backend_memcache.py +tests/test_backend_sql.py +tests/test_backend_templated.py +tests/test_content_types.py +tests/test_exception.py +tests/test_import_legacy.py +tests/test_keystoneclient.py +tests/test_keystoneclient_sql.py +tests/test_middleware.py +tests/test_migrate_nova_auth.py +tests/test_overrides.conf +tests/test_policy.py +tests/test_s3_token_middleware.py +tests/test_serializer.py +tests/test_service.py +tests/test_swift_auth_middleware.py +tests/test_utils.py +tests/test_versions.py +tests/test_wsgi.py +tools/convert_to_sqlite.sh +tools/install_venv.py +tools/pip-requires +tools/sample_data.sh +tools/test-requires +tools/with_venv.sh \ No newline at end of file diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone.egg-info/dependency_links.txt keystone-2012.1.3+stable-20130423-f48dd0fc/keystone.egg-info/dependency_links.txt --- keystone-2012.1+stable~20120824-a16a0ab9/keystone.egg-info/dependency_links.txt 1970-01-01 00:00:00.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone.egg-info/dependency_links.txt 2013-04-24 13:24:44.000000000 +0000 @@ -0,0 +1 @@ + diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone.egg-info/not-zip-safe keystone-2012.1.3+stable-20130423-f48dd0fc/keystone.egg-info/not-zip-safe --- keystone-2012.1+stable~20120824-a16a0ab9/keystone.egg-info/not-zip-safe 1970-01-01 00:00:00.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone.egg-info/not-zip-safe 2013-04-24 13:24:44.000000000 +0000 @@ -0,0 +1 @@ + diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone.egg-info/requires.txt keystone-2012.1.3+stable-20130423-f48dd0fc/keystone.egg-info/requires.txt --- keystone-2012.1+stable~20120824-a16a0ab9/keystone.egg-info/requires.txt 1970-01-01 00:00:00.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone.egg-info/requires.txt 2013-04-24 13:24:44.000000000 +0000 @@ -0,0 +1,11 @@ +pam==0.1.4 +WebOb==1.0.8 +eventlet +greenlet +PasteDeploy +paste +routes +sqlalchemy<=0.7.9 +sqlalchemy-migrate>=0.7.2 +passlib +lxml \ No newline at end of file diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/keystone.egg-info/top_level.txt keystone-2012.1.3+stable-20130423-f48dd0fc/keystone.egg-info/top_level.txt --- keystone-2012.1+stable~20120824-a16a0ab9/keystone.egg-info/top_level.txt 1970-01-01 00:00:00.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/keystone.egg-info/top_level.txt 2013-04-24 13:24:44.000000000 +0000 @@ -0,0 +1 @@ +keystone diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/setup.cfg keystone-2012.1.3+stable-20130423-f48dd0fc/setup.cfg --- keystone-2012.1+stable~20120824-a16a0ab9/setup.cfg 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/setup.cfg 2013-04-24 13:24:44.000000000 +0000 @@ -1,5 +1,5 @@ [egg_info] -tag_build = +tag_build = tag_date = 0 tag_svn_revision = 0 @@ -9,13 +9,10 @@ source-dir = doc/source [nosetests] -# NOTE(jkoelker) To run the test suite under nose install the following -# coverage http://pypi.python.org/pypi/coverage -# tissue http://pypi.python.org/pypi/tissue (pep8 checker) -# openstack-nose https://github.com/jkoelker/openstack-nose -verbosity=2 -detailed-errors=1 -with-openstack=1 -openstack-red=0.05 -openstack-yellow=0.025 -openstack-show-elapsed=1 +verbosity = 2 +detailed-errors = 1 +with-openstack = 1 +openstack-red = 0.05 +openstack-yellow = 0.025 +openstack-show-elapsed = 1 + diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/setup.py keystone-2012.1.3+stable-20130423-f48dd0fc/setup.py --- keystone-2012.1+stable~20120824-a16a0ab9/setup.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/setup.py 2013-04-24 13:24:40.000000000 +0000 @@ -56,7 +56,7 @@ write_requirements() setup(name='keystone', - version='2012.1.3', + version='2012.1.4', description="Authentication service for OpenStack", license='Apache License (2.0)', author='OpenStack, LLC.', diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/tests/test_backend.py keystone-2012.1.3+stable-20130423-f48dd0fc/tests/test_backend.py --- keystone-2012.1+stable~20120824-a16a0ab9/tests/test_backend.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/tests/test_backend.py 2013-04-24 13:24:40.000000000 +0000 @@ -316,7 +316,8 @@ class TokenTests(object): def test_token_crud(self): token_id = uuid.uuid4().hex - data = {'id': token_id, 'a': 'b'} + data = {'id': token_id, 'a': 'b', + 'user': {'id': 'testuserid'}} data_ref = self.token_api.create_token(token_id, data) expires = data_ref.pop('expires') self.assertTrue(isinstance(expires, datetime.datetime)) @@ -329,22 +330,72 @@ self.token_api.delete_token(token_id) self.assertRaises(exception.TokenNotFound, - self.token_api.delete_token, token_id) + self.token_api.get_token, token_id) self.assertRaises(exception.TokenNotFound, - self.token_api.get_token, token_id) + self.token_api.delete_token, token_id) def test_expired_token(self): token_id = uuid.uuid4().hex expire_time = datetime.datetime.utcnow() - datetime.timedelta(minutes=1) - data = {'id': token_id, 'a': 'b', 'expires': expire_time} + data = {'id': token_id, 'a': 'b', 'expires': expire_time, + 'user': {'id': 'testuserid'}} data_ref = self.token_api.create_token(token_id, data) self.assertDictEquals(data_ref, data) self.assertRaises(exception.TokenNotFound, self.token_api.get_token, token_id) + def create_token_sample_data(self, tenant_id=None): + token_id = uuid.uuid4().hex + data = {'id': token_id, 'a': 'b', + 'user': {'id': 'testuserid'}} + if tenant_id is not None: + data['tenant'] = {'id': tenant_id, 'name': tenant_id} + self.token_api.create_token(token_id, data) + return token_id + + def test_token_list(self): + tokens = self.token_api.list_tokens('testuserid') + self.assertEquals(len(tokens), 0) + token_id1 = self.create_token_sample_data() + tokens = self.token_api.list_tokens('testuserid') + self.assertEquals(len(tokens), 1) + self.assertIn(token_id1, tokens) + token_id2 = self.create_token_sample_data() + tokens = self.token_api.list_tokens('testuserid') + self.assertEquals(len(tokens), 2) + self.assertIn(token_id2, tokens) + self.assertIn(token_id1, tokens) + self.token_api.delete_token(token_id1) + tokens = self.token_api.list_tokens('testuserid') + self.assertIn(token_id2, tokens) + self.assertNotIn(token_id1, tokens) + self.token_api.delete_token(token_id2) + tokens = self.token_api.list_tokens('testuserid') + self.assertNotIn(token_id2, tokens) + self.assertNotIn(token_id1, tokens) + + # tenant-specific tokens + tenant1 = uuid.uuid4().hex + tenant2 = uuid.uuid4().hex + token_id3 = self.create_token_sample_data(tenant_id=tenant1) + token_id4 = self.create_token_sample_data(tenant_id=tenant2) + tokens = self.token_api.list_tokens('testuserid') + self.assertEquals(len(tokens), 2) + self.assertNotIn(token_id1, tokens) + self.assertNotIn(token_id2, tokens) + self.assertIn(token_id3, tokens) + self.assertIn(token_id4, tokens) + tokens = self.token_api.list_tokens('testuserid', tenant2) + self.assertEquals(len(tokens), 1) + self.assertNotIn(token_id1, tokens) + self.assertNotIn(token_id2, tokens) + self.assertNotIn(token_id3, tokens) + self.assertIn(token_id4, tokens) + def test_null_expires_token(self): token_id = uuid.uuid4().hex - data = {'id': token_id, 'a': 'b', 'expires': None} + data = {'id': token_id, 'id_hash': token_id, 'a': 'b', 'expires': None, + 'user': {'id': 'testuserid'}} data_ref = self.token_api.create_token(token_id, data) self.assertDictEquals(data_ref, data) new_data_ref = self.token_api.get_token(token_id) diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/tests/test_backend_memcache.py keystone-2012.1.3+stable-20130423-f48dd0fc/tests/test_backend_memcache.py --- keystone-2012.1+stable~20120824-a16a0ab9/tests/test_backend_memcache.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/tests/test_backend_memcache.py 2013-04-24 13:24:40.000000000 +0000 @@ -34,6 +34,18 @@ """Ignores the passed in args.""" self.cache = {} + def add(self, key, value): + if self.get(key): + return False + return self.set(key, value) + + def append(self, key, value): + existing_value = self.get(key) + if existing_value: + self.set(key, existing_value + value) + return True + return False + def check_key(self, key): if not isinstance(key, str): raise memcache.Client.MemcachedStringEncodingError() @@ -45,8 +57,6 @@ now = time.mktime(datetime.datetime.utcnow().utctimetuple()) if obj and (obj[1] == 0 or obj[1] > now): return obj[0] - else: - raise exception.TokenNotFound(token_id=key) def set(self, key, value, time=0): """Sets the value for a key.""" @@ -69,8 +79,21 @@ fake_client = MemcacheClient() self.token_api = token_memcache.Token(client=fake_client) - def test_get_unicode(self): + def test_create_unicode_token_id(self): token_id = unicode(uuid.uuid4().hex) - data = {'id': token_id, 'a': 'b'} + data = {'id': token_id, 'a': 'b', + 'user': {'id': 'testuserid'}} self.token_api.create_token(token_id, data) self.token_api.get_token(token_id) + + def test_create_unicode_user_id(self): + token_id = uuid.uuid4().hex + user_id = unicode(uuid.uuid4().hex) + data = {'id': token_id, 'a': 'b', + 'user': {'id': user_id}} + self.token_api.create_token(token_id, data) + self.token_api.get_token(token_id) + + def test_list_tokens_unicode_user_id(self): + user_id = unicode(uuid.uuid4().hex) + self.token_api.list_tokens(user_id) diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/tests/test_keystoneclient.py keystone-2012.1.3+stable-20130423-f48dd0fc/tests/test_keystoneclient.py --- keystone-2012.1+stable~20120824-a16a0ab9/tests/test_keystoneclient.py 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/tests/test_keystoneclient.py 2013-04-24 13:24:40.000000000 +0000 @@ -769,15 +769,15 @@ def test_tenant_add_and_remove_user(self): client = self.get_client(admin=True) client.roles.add_user_role(tenant=self.tenant_baz['id'], - user=self.user_foo['id'], + user=self.user_two['id'], role=self.role_useless['id']) user_refs = client.tenants.list_users(tenant=self.tenant_baz['id']) - self.assert_(self.user_foo['id'] in [x.id for x in user_refs]) + self.assert_(self.user_two['id'] in [x.id for x in user_refs]) client.roles.remove_user_role(tenant=self.tenant_baz['id'], - user=self.user_foo['id'], + user=self.user_two['id'], role=self.role_useless['id']) user_refs = client.tenants.list_users(tenant=self.tenant_baz['id']) - self.assert_(self.user_foo['id'] not in [x.id for x in user_refs]) + self.assert_(self.user_two['id'] not in [x.id for x in user_refs]) def test_user_role_add_404(self): from keystoneclient import exceptions as client_exceptions @@ -890,16 +890,16 @@ def test_tenant_add_and_remove_user(self): client = self.get_client(admin=True) client.roles.add_user_to_tenant(tenant_id=self.tenant_baz['id'], - user_id=self.user_foo['id'], + user_id=self.user_two['id'], role_id=self.role_useless['id']) role_refs = client.roles.get_user_role_refs( - user_id=self.user_foo['id']) + user_id=self.user_two['id']) self.assert_(self.tenant_baz['id'] in [x.tenantId for x in role_refs]) # get the "role_refs" so we get the proper id, this is how the clients # do it roleref_refs = client.roles.get_user_role_refs( - user_id=self.user_foo['id']) + user_id=self.user_two['id']) for roleref_ref in roleref_refs: if (roleref_ref.roleId == self.role_useless['id'] and roleref_ref.tenantId == self.tenant_baz['id']): @@ -907,11 +907,11 @@ break client.roles.remove_user_from_tenant(tenant_id=self.tenant_baz['id'], - user_id=self.user_foo['id'], + user_id=self.user_two['id'], role_id=roleref_ref.id) role_refs = client.roles.get_user_role_refs( - user_id=self.user_foo['id']) + user_id=self.user_two['id']) self.assert_(self.tenant_baz['id'] not in [x.tenantId for x in role_refs]) diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/tests/test_service.py keystone-2012.1.3+stable-20130423-f48dd0fc/tests/test_service.py --- keystone-2012.1+stable~20120824-a16a0ab9/tests/test_service.py 1970-01-01 00:00:00.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/tests/test_service.py 2013-04-24 13:24:40.000000000 +0000 @@ -0,0 +1,98 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from keystone import config +from keystone import exception +from keystone import service +from keystone import test + +import default_fixtures + +CONF = config.CONF + + +def _build_user_auth(token=None, user_id=None, username=None, + password=None, tenant_id=None, tenant_name=None): + """Build auth dictionary. + + It will create an auth dictionary based on all the arguments + that it receives. + """ + auth_json = {} + if token is not None: + auth_json['token'] = token + if username or password: + auth_json['passwordCredentials'] = {} + if username is not None: + auth_json['passwordCredentials']['username'] = username + if user_id is not None: + auth_json['passwordCredentials']['userId'] = user_id + if password is not None: + auth_json['passwordCredentials']['password'] = password + if tenant_name is not None: + auth_json['tenantName'] = tenant_name + if tenant_id is not None: + auth_json['tenantId'] = tenant_id + return auth_json + + +class AuthTest(test.TestCase): + def setUp(self): + super(AuthTest, self).setUp() + + CONF.identity.driver = 'keystone.identity.backends.kvs.Identity' + self.load_backends() + self.load_fixtures(default_fixtures) + self.api = service.TokenController() + + def test_authenticate_user_id_too_large(self): + """Verify sending large 'userId' raises the right exception.""" + body_dict = _build_user_auth(user_id='0' * 65, username='FOO', + password='foo2') + self.assertRaises(exception.ValidationSizeError, self.api.authenticate, + {}, body_dict) + + def test_authenticate_username_too_large(self): + """Verify sending large 'username' raises the right exception.""" + body_dict = _build_user_auth(username='0' * 65, password='foo2') + self.assertRaises(exception.ValidationSizeError, self.api.authenticate, + {}, body_dict) + + def test_authenticate_tenant_id_too_large(self): + """Verify sending large 'tenantId' raises the right exception.""" + body_dict = _build_user_auth(username='FOO', password='foo2', + tenant_id='0' * 65) + self.assertRaises(exception.ValidationSizeError, self.api.authenticate, + {}, body_dict) + + def test_authenticate_tenant_name_too_large(self): + """Verify sending large 'tenantName' raises the right exception.""" + body_dict = _build_user_auth(username='FOO', password='foo2', + tenant_name='0' * 65) + self.assertRaises(exception.ValidationSizeError, self.api.authenticate, + {}, body_dict) + + def test_authenticate_token_too_large(self): + """Verify sending large 'token' raises the right exception.""" + body_dict = _build_user_auth(token={'id': '0' * 8193}) + self.assertRaises(exception.ValidationSizeError, self.api.authenticate, + {}, body_dict) + + def test_authenticate_password_too_large(self): + """Verify sending large 'password' raises the right exception.""" + body_dict = _build_user_auth(username='FOO', password='0' * 8193) + self.assertRaises(exception.ValidationSizeError, self.api.authenticate, + {}, body_dict) diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/tools/pip-requires keystone-2012.1.3+stable-20130423-f48dd0fc/tools/pip-requires --- keystone-2012.1+stable~20120824-a16a0ab9/tools/pip-requires 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/tools/pip-requires 2013-04-24 13:24:40.000000000 +0000 @@ -6,7 +6,7 @@ PasteDeploy paste routes -sqlalchemy -sqlalchemy-migrate +sqlalchemy<=0.7.9 +sqlalchemy-migrate>=0.7.2 passlib lxml diff -Nru keystone-2012.1+stable~20120824-a16a0ab9/tools/test-requires keystone-2012.1.3+stable-20130423-f48dd0fc/tools/test-requires --- keystone-2012.1+stable~20120824-a16a0ab9/tools/test-requires 2012-08-24 10:38:57.000000000 +0000 +++ keystone-2012.1.3+stable-20130423-f48dd0fc/tools/test-requires 2013-04-24 13:24:40.000000000 +0000 @@ -13,6 +13,7 @@ pylint # static code analysis pep8==1.0.1 # checks for PEP8 code style compliance Sphinx>=1.1.2 # required to build documentation +docutils==0.9.1 # for bug 1091333, remove after sphinx >1.1.3 is released. unittest2 # backport of unittest lib in python 2.7 webtest # test wsgi apps without starting an http server