summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Removing LDAP API ShimAdam Young2013-06-192-258/+185
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LDAP identity code had many circular dependecies between data objects due to the need to look up DNs from ID. This change pulls the lookups into the driver layer, and modifies most of the data objects to take DNs in as their parameters instead. Only objects that know how to look up their own DNs from thei IDs will continue to take IDs in, to support the "get" methods. Change-Id: I0bac360650ccbf72c7ca8317997031420f66e4f3
* | | | | Merge "Set default 'ou' name for LDAP projects to Projects"Jenkins2013-06-193-4/+4
|\ \ \ \ \
| * | | | | Set default 'ou' name for LDAP projects to ProjectsSahdev Zala2013-06-173-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default ou name for projects/tenants should be Projects, as we normally use in devstack and ldap live test. Since multiple LDAP objects can use groupOfNames, setting projects group to Groups is vague. Fixes Bug1191807 Change-Id: I1718c76320da51a58abf6558a9b8560e908773cb
* | | | | | Merge "Isolate eventlet code into environment."Jenkins2013-06-1942-138/+211
|\ \ \ \ \ \
| * | | | | | Isolate eventlet code into environment.Jamie Lennox2013-06-1842-138/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The environment module will be configured once, during code initialization. Subsequently all other possibly-evented modules will retrieve from environment and transparently obtain either the eventlet or standard library modules. If eventlet, httplib, subprocess or other environment dependant module is referenced outside of the environment module it should be considered a bug. The changes to tests are required to ensure that test is imported first to setup the environment. Hopefully these can all be replaced with an __init__.py in a post-nose keystone. Implements: blueprint extract-eventlet Change-Id: Icacd6f2ee0906ac5d303777c1f87a184f38283bf
* | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-06-1820-101/+101
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Imported Translations from TransifexOpenStack Jenkins2013-06-1720-101/+101
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ia5d0628dc4d1fef13fc2e798d64bc2ceabffa958
* | | | | | Merge "Adds tests for XML version response"Jenkins2013-06-183-26/+184
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Adds tests for XML version responseBrant Knudson2013-06-113-26/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests for the version response when use Accept: application/xml To share code, moved assertEqualXML from test_serializer to keystone.test. Change-Id: I92e28a9167d0c77fc7efbd1eda2893ec1128354f
* | | | | | Merge "Move user fileds type check to identity.Manager"Jenkins2013-06-185-57/+70
|\ \ \ \ \ \
| * | | | | | Move user fileds type check to identity.ManagerWu Wenxiang2013-06-165-57/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fileds type's checking logic during creating and updating users apply to all driver calls. It should be centralized in the identity.Manager rather that continuing the trend of spreading them out between controllers, managers and drivers. This patch move the enable type checking logic to identity.Manager and modify the related test cases in test_backend.py. Change-Id: I37df56a61cd5ab332dcc9d74a7e99ee9041aa32e
* | | | | | | Merge "Correct the resolving api logic in stat middleware"Jenkins2013-06-182-2/+47
|\ \ \ \ \ \ \
| * | | | | | | Correct the resolving api logic in stat middlewareWu Wenxiang2013-06-142-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the admin_port string is a substring of public_port string, all the requests would be stated as 'admin' either their real dest port is admin_port or public_port. It's due to the incorrect logic in stat middleware. For example, if public_port = 35000, admin_port = 5000, the first judgement branch: "if str(CONF.admin_port) in host" in StatsMiddleware::_resolve_api() would always return "True" either the host port number equal to 5000 or 35000, so that the following judgement branches would be incorrectly ignored. Fixes bug #1189121 Change-Id: I1086b7d11f83dd218d66376f79747a1f720eb807
* | | | | | | | Merge "Remove a stat warning log"Jenkins2013-06-181-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove a stat warning logWu Wenxiang2013-06-141-3/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If using load balancer before keystone and the port numbers was different between load balancer and keystone, too many stat warning logs could be found in logs. The root cause is the keystone servers' stat logic getting the request host information which point to load balancer ip address and port rather than the ips and ports of themselves. Fixes bug #1189118 Change-Id: Ic837af77bc2509086c0e37194ba70b683f693ae5
* | | | | | | | Merge "Http 400 when project enabled is not a boolean"Jenkins2013-06-174-2/+77
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Http 400 when project enabled is not a booleanWu Wenxiang2013-06-164-2/+77
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having enabled="true" in json data when updating tenant will produce 500 When updating a project, no type check was performed on the enabled attribute. Therefore, if enabled value in JSON/XML is not a boolean but a string, keystone responds with an incorrect Http 500 error code and the stacktrace. The change introduces a type validation of the enabled attribute at identity manager. If the type is not a boolean, keystone now returns an appropriate Http 400 error code with a message pointing a bad format for the attribute. Test cases have been added to file test_backend and test_content_types for testing the case when enabled attribute is a string or int when updating project. Fixes bug #1191384 Change-Id: I86dd7e71d4bac1e3fd6fcabaa1a2136a47722e5f
* | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-06-1720-135/+21
|\ \ \ \ \ \ \
| * | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-06-1620-135/+21
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Idbe625a32001b08e4e2c125d65397ba61ff58589
* | | | | | | Merge "Remove how to contribute section in favor of CONTRIBUTING.rst"Jenkins2013-06-171-13/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove how to contribute section in favor of CONTRIBUTING.rstDolph Mathews2013-06-101-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5364d9d930ca0871bd839917b23ef3199eff3340
* | | | | | | | Merge "LDAP get_project_users should not return password"Jenkins2013-06-172-4/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | LDAP get_project_users should not return passwordSahdev Zala2013-06-122-4/+5
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also with this fix no need to skip get_project_users for LDAP. Fixes bug1190286 Change-Id: I6ab6b4179c36d49b8a2eab1ea67ce0d6339751f5
* | | | | | | Merge "Correct the default name attribute for role"Jenkins2013-06-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Correct the default name attribute for roleSahdev Zala2013-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug1172801 Change-Id: Id2cdc5775bd1b6da03da1e50e84cfe60ada00314
* | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-06-1520-1158/+1256
|\ \ \ \ \ \ \ \
| * | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-06-1420-1158/+1256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9f027065d4aeaa31fb45274d7664c3920ef40a13
* | | | | | | | | Merge "Using sql as default driver for tokens"Jenkins2013-06-153-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Using sql as default driver for tokensWu Wenxiang2013-06-143-2/+5
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kvs driver for tokens is not a production quality storage method. The shortcomings of using kvs as storage driver for tokens: 1. It requires load balancer to persist connections to a single keystone server by token. 2. The memory will grow out of control until token_flush is run. 3. At some point kvs lookups get very slow because there are millions of keys in the dict. 4. Process restart invalidates all tokens. Fixes: bug #1188370 Change-Id: Ic726e12d798b843412158a7b92f5e3e3a654811f
* | | | | | | | | Merge "Add checks to test if enabled is bool"Jenkins2013-06-144-7/+25
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add checks to test if enabled is boolgalstrom212013-06-124-7/+25
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes: bug #1167593 Change-Id: Ie18fa17f16383f31d8aa083e69fa501d80eb4553
* | | | | | | | Merge "Fix token purging for memcache for user token index."Jenkins2013-06-142-8/+167
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix token purging for memcache for user token index.Morgan Fainberg2013-06-102-8/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When issuing a new token, purge all expired tokens from the user's token index list. New Options: * max_compare_and_set_retry: The number of retries that will be attempted when performing an update of the user_record or the revocation-list record. This is relevant due to the use of CAS (compare and set) function of the memcache client. This allows for multiple keystone processes/wsgi/etc to run without worry of race conditions clobbering the lists. DocImpact - New Options. Change-Id: I9441105b1e46982b0354bccbf8297daaaa1904b2 Fixes: bug #1171985
* | | | | | | | | Merge "Allow request headers access in app context."Jenkins2013-06-143-1/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow request headers access in app context.Chmouel Boudjnah2013-06-103-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Give extensions access to request headers in app context. - Implements: blueprint allow-access-to-headers-for-extension. Change-Id: I22bba172a8ceaba9260487666172586c45aa95d4
* | | | | | | | | | Merge "drop user and group constraints"Jenkins2013-06-142-8/+77
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | drop user and group constraintsAdam Young2013-06-102-8/+77
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop foreign keys that point to user and group tables from other tables. This is required to be able to split up the backends. Blueprint extract-projects-from-id Change-Id: Iea78ddca4ef5ea5ca1bb542cba81da8aefa95b6b
* | | | | | | | | | Correct LDAP configuration docSahdev Zala2013-06-131-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the wrong naming used for domain controller in the configuration doc. Fixes Bug1190647 Change-Id: I10b138f319b309db7c2747920ab5bd9e727a4557
* | | | | | | | | | Force simple Bind for authenticationJose Castro Leon2013-06-132-13/+21
| |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The authentication code was using a common code path with other LDAP code that got an LDAP connection. If the system was configured to do Anonymous binding, users could by pass the authentication check. This patch forces the authentication code to do a simple_bind. Change-Id: Id0c19f09d615446927db1ba074561b129329b5c8
* | | | | | | | | Merge "Replace openstack-common with oslo in docs"Jenkins2013-06-112-7/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Replace openstack-common with oslo in docsThomas Bechtold2013-06-102-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id4a8f285b380478705e5518440b7ed602e7757d4
* | | | | | | | | Merge "Move coverage output dir for Jenkins."Jenkins2013-06-111-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Move coverage output dir for Jenkins.Clark Boylan2013-06-051-0/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tox.ini: Set the coverage html output dir to {toxinidir}/cover so that Jenkins can find it and upload the coverage to the log server. Change-Id: I231485ce46b1ef91eb219e63552203b86d6d65c2
* | | | | | | | Merge "Commit transaction in migration"Jenkins2013-06-111-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Commit transaction in migrationBrant Knudson2013-06-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some databases (e.g., DB2) would deadlock on migration 16 because a lock was held on the domain table for an uncommitted alter and then SQLAlchemy queried the domain table info in a separate transaction. The fix is to commit the ALTER statements to release the lock so that the domain table schema query will not block. I've run this with sqlite, mysql, and postgresql and they all worked. Part of fix for bug 1188785 Change-Id: Ic540a6cb09a0c525df7aaea55b64af96f0dd87c7
* | | | | | | | | Merge "add ca_key to sample configuration"Jenkins2013-06-111-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add ca_key to sample configurationJianing YANG2013-06-091-0/+2
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this gives end-users a clue that they also have to set ca_key for using ssl certificates other than the default place /etc/ssl. Change-Id: I41c4118d02723730c0ba183add866a0e0fa67e7b Fixes: Bug #1188956
* | | | | | | | | Merge "Remove bufferedhttp"Jenkins2013-06-111-173/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Remove bufferedhttpDolph Mathews2013-06-061-173/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module appears to be unused. Change-Id: Ia4c7cd337e15dc58785282c5165ad2dab8e2fa60
* | | | | | | | | Merge "Fix internal doc links (bug 1176211)"Jenkins2013-06-103-17/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |