Author: [email protected] Date: Wed Oct 12 14:55:22 2011 New Revision: 1495 Log: [AMDATUAUTH-102] Added in-memory implementation of the OAuth consumer registry
Added: trunk/amdatu-auth/auth-stores/ trunk/amdatu-auth/auth-stores/mem-store-consumer/ trunk/amdatu-auth/auth-stores/mem-store-consumer/LICENSE trunk/amdatu-auth/auth-stores/mem-store-consumer/NOTICE trunk/amdatu-auth/auth-stores/mem-store-consumer/pom.xml trunk/amdatu-auth/auth-stores/mem-store-consumer/src/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/mem/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/mem/osgi/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/mem/osgi/Activator.java trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/mem/service/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/mem/service/InMemConsumerRegistryImpl.java trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/mem/service/OAuthServiceConsumerImpl.java trunk/amdatu-auth/auth-stores/mem-store-consumer/src/test/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/test/java/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/test/java/org/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/test/java/org/amdatu/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/test/java/org/amdatu/auth/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/test/java/org/amdatu/auth/oauth/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/test/java/org/amdatu/auth/oauth/consumerregistry/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/test/java/org/amdatu/auth/oauth/consumerregistry/mem/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/test/java/org/amdatu/auth/oauth/consumerregistry/mem/service/ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/test/java/org/amdatu/auth/oauth/consumerregistry/mem/service/InMemConsumerStoreTest.java trunk/amdatu-auth/auth-stores/pom.xml Modified: trunk/amdatu-auth/pom.xml Added: trunk/amdatu-auth/auth-stores/mem-store-consumer/LICENSE ============================================================================== --- (empty file) +++ trunk/amdatu-auth/auth-stores/mem-store-consumer/LICENSE Wed Oct 12 14:55:22 2011 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. Added: trunk/amdatu-auth/auth-stores/mem-store-consumer/NOTICE ============================================================================== --- (empty file) +++ trunk/amdatu-auth/auth-stores/mem-store-consumer/NOTICE Wed Oct 12 14:55:22 2011 @@ -0,0 +1,22 @@ +Amdatu Auth - oAuth consumer registry fs +Copyright 2010, 2011 The Amdatu Foundation + + +I. Included Software + +This product includes software developed by The Amdatu Foundation (http://www.amdatu.org/). +Copyright 2010, 2011 The Amdatu Foundation +For more information, see http://amdatu.org. +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). + + +II. Used Software + +This product uses software developed at The OSGi Alliance (http://www.osgi.org/). +Copyright (c) OSGi Alliance (2000, 2007). +License: Apache Software License 2.0 (see http://www.apache.org/licenses/LICENSE-2.0.html). + + +III. License Summary +This products is licensed under the Apache Software License 2.0, +see the LICENSE file included in this distribution. Added: trunk/amdatu-auth/auth-stores/mem-store-consumer/pom.xml ============================================================================== --- (empty file) +++ trunk/amdatu-auth/auth-stores/mem-store-consumer/pom.xml Wed Oct 12 14:55:22 2011 @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2010, 2011 The Amdatu Foundation + + 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.verning permissions and limitations + under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.stores</artifactId> + <version>0.2.1-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.auth.oauth.store.consumer.mem</artifactId> + <packaging>bundle</packaging> + <name>Amdatu Auth - OAuth in-memory consumer registry store</name> + <description>This bundle implements an in-memory storage for OAuth service consumers</description> + + <dependencies> + <dependency> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core.tenant</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.api</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId> + <type>bundle</type> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.auth.oauth.consumerregistry.mem.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Import-Package> + org.amdatu.auth.oauth.api;version="[1.0,1.1)", + * + </Import-Package> + <Export-Package /> + </instructions> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/mem/osgi/Activator.java ============================================================================== --- (empty file) +++ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/mem/osgi/Activator.java Wed Oct 12 14:55:22 2011 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010, 2011 The Amdatu Foundation + * + * 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. + */ +package org.amdatu.auth.oauth.consumerregistry.mem.osgi; + +import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry; +import org.amdatu.auth.oauth.consumerregistry.mem.service.InMemConsumerRegistryImpl; +import org.amdatu.core.tenant.Tenant; +import org.apache.felix.dm.DependencyActivatorBase; +import org.apache.felix.dm.DependencyManager; +import org.osgi.framework.BundleContext; +import org.osgi.service.log.LogService; + +/** + * This class represents the OSGi activator for the tenant service fs storage provider. + */ +public final class Activator extends DependencyActivatorBase { + + @Override + public void init(final BundleContext context, final DependencyManager manager) throws Exception { + manager.add( + createAdapterService(Tenant.class, null) + .setImplementation(InMemConsumerRegistryImpl.class) + .setInterface(OAuthServiceConsumerRegistry.class.getName(), null) + .add(createServiceDependency().setService(LogService.class).setRequired(true))); + } + + @Override + public void destroy(final BundleContext context, final DependencyManager manager) throws Exception { + } +} Added: trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/mem/service/InMemConsumerRegistryImpl.java ============================================================================== --- (empty file) +++ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/mem/service/InMemConsumerRegistryImpl.java Wed Oct 12 14:55:22 2011 @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2010, 2011 The Amdatu Foundation + * + * 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. + */ +package org.amdatu.auth.oauth.consumerregistry.mem.service; + +import java.util.ArrayList; +import java.util.Dictionary; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.amdatu.auth.oauth.api.ConsumerAlreadyExistsException; +import org.amdatu.auth.oauth.api.ConsumerNotFoundException; +import org.amdatu.auth.oauth.api.ConsumerRegistryStorageException; +import org.amdatu.auth.oauth.api.OAuthServiceConsumer; +import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry; +import org.osgi.framework.BundleContext; +import org.osgi.framework.Filter; +import org.osgi.framework.InvalidSyntaxException; + +public class InMemConsumerRegistryImpl implements OAuthServiceConsumerRegistry { + // Injected service dependencies + private BundleContext m_bundleContext; + + // Instance variables + List<OAuthServiceConsumer> m_consumers = new ArrayList<OAuthServiceConsumer>(); + Map<String, List<String>> m_accessGrants = new HashMap<String, List<String>>(); + + public synchronized Iterator<OAuthServiceConsumer> getConsumers(String filterString) + throws ConsumerRegistryStorageException { + try { + Filter filter = null; + if (filterString != null) { + filter = m_bundleContext.createFilter(filterString); + } + + List<OAuthServiceConsumer> consumers = new ArrayList<OAuthServiceConsumer>(); + for (OAuthServiceConsumer consumer : m_consumers) { + // If a filter was specified, selectively add the consumers + boolean add = false; + if (filter != null) { + Map<String, String> properties = consumer.getProperties(); + if (properties != null) { + Dictionary<String, String> dict = new Hashtable<String, String>(properties); + if (filter.match(dict)) { + add = true; + } + } + } + else { + add = true; + } + if (add) { + consumers.add(getConsumer(consumer.getConsumerKey())); + } + } + return consumers.listIterator(); + } + catch (InvalidSyntaxException e) { + throw new ConsumerRegistryStorageException(e); + } + } + + public synchronized OAuthServiceConsumer getConsumer(String consumerKey) throws ConsumerRegistryStorageException { + for (OAuthServiceConsumer consumer : m_consumers) { + if (consumer.getConsumerKey().equals(consumerKey)) { + return consumer; + } + } + return null; + } + + public synchronized void addConsumer(OAuthServiceConsumer consumer) throws ConsumerAlreadyExistsException, + ConsumerRegistryStorageException { + if (m_consumers.contains(consumer)) { + throw new ConsumerAlreadyExistsException("Consumer with key '" + consumer.getConsumerKey() + + "' already exists"); + } + m_consumers.add(OAuthServiceConsumerImpl.clone(consumer)); + } + + public synchronized void removeConsumer(OAuthServiceConsumer consumer) throws ConsumerNotFoundException, + ConsumerRegistryStorageException { + if (m_consumers.contains(consumer)) { + m_consumers.remove(consumer); + } + else { + throw new ConsumerNotFoundException("Consumer with key '" + consumer.getConsumerKey() + "' does not exist"); + } + } + + public synchronized void updateConsumer(OAuthServiceConsumer consumer) throws ConsumerNotFoundException, + ConsumerRegistryStorageException { + OAuthServiceConsumer existingConsumer = getConsumer(consumer.getConsumerKey()); + if (existingConsumer == null) { + throw new ConsumerNotFoundException("Consumer with key '" + consumer.getConsumerKey() + "' does not exist"); + } + m_consumers.remove(consumer); + m_consumers.add(OAuthServiceConsumerImpl.clone(consumer)); + } + + public synchronized void grantResourceAccess(OAuthServiceConsumer consumer, String userId) + throws ConsumerRegistryStorageException { + List<String> users = m_accessGrants.get(consumer.getConsumerKey()); + if (users == null) { + users = new ArrayList<String>(); + } + if (!users.contains(userId)) { + users.add(userId); + m_accessGrants.put(consumer.getConsumerKey(), users); + } + } + + public synchronized void withdrawResourceAccess(OAuthServiceConsumer consumer, String userId) + throws ConsumerNotFoundException, ConsumerRegistryStorageException { + List<String> users = m_accessGrants.get(consumer.getConsumerKey()); + if (users != null) { + if (users.contains(userId)) { + users.remove(userId); + m_accessGrants.put(consumer.getConsumerKey(), users); + } + } + } + + public synchronized boolean hasResourceAccess(OAuthServiceConsumer consumer, String userId) + throws ConsumerNotFoundException, ConsumerRegistryStorageException { + List<String> users = m_accessGrants.get(consumer.getConsumerKey()); + if (users != null) { + if (users.contains(userId)) { + return true; + } + } + return false; + } +} Added: trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/mem/service/OAuthServiceConsumerImpl.java ============================================================================== --- (empty file) +++ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/main/java/org/amdatu/auth/oauth/consumerregistry/mem/service/OAuthServiceConsumerImpl.java Wed Oct 12 14:55:22 2011 @@ -0,0 +1,80 @@ +package org.amdatu.auth.oauth.consumerregistry.mem.service; + +import java.util.HashMap; +import java.util.Map; + +import org.amdatu.auth.oauth.api.OAuthServiceConsumer; + +public class OAuthServiceConsumerImpl implements OAuthServiceConsumer { + // Instance variables + private String m_name; + private String m_consumerKey; + private String m_consumerSecret; + private String m_callbackUrl; + private Map<String, String> m_properties = new HashMap<String, String>(); + + public void setName(String name) { + m_name = name; + } + public String getName() { + return m_name; + } + + public void setCallbackUrl(String callbackUrl) { + m_callbackUrl = callbackUrl; + } + + public String getCallbackUrl() { + return m_callbackUrl; + } + + public void setConsumerKey(String consumerKey) { + m_consumerKey = consumerKey; + } + + public String getConsumerKey() { + return m_consumerKey; + } + + public void setConsumerSecret(String consumerSecret) { + m_consumerSecret = consumerSecret; + } + + public String getConsumerSecret() { + return m_consumerSecret; + } + + public Map<String, String> getProperties() { + return m_properties; + } + + public void setProperties(Map<String, String> properties) { + m_properties = properties; + } + + public static OAuthServiceConsumer clone(OAuthServiceConsumer consumer) { + OAuthServiceConsumerImpl newConsumer = new OAuthServiceConsumerImpl(); + newConsumer.setCallbackUrl(consumer.getCallbackUrl()); + newConsumer.setConsumerKey(consumer.getConsumerKey()); + newConsumer.setConsumerSecret(consumer.getConsumerSecret()); + newConsumer.setName(consumer.getName()); + newConsumer.setProperties(clone(consumer.getProperties())); + return newConsumer; + } + + public boolean equals(Object obj) { + if (!(obj instanceof OAuthServiceConsumer)) { + return false; + } + OAuthServiceConsumer consumer = (OAuthServiceConsumer) obj; + return consumer.getConsumerKey().equals(getConsumerKey()); + } + + private static Map<String, String> clone(Map<String, String> map) { + HashMap<String, String> newMap = new HashMap<String, String>(); + for (String key : map.keySet()) { + newMap.put(key, map.get(key)); + } + return newMap; + } +} \ No newline at end of file Added: trunk/amdatu-auth/auth-stores/mem-store-consumer/src/test/java/org/amdatu/auth/oauth/consumerregistry/mem/service/InMemConsumerStoreTest.java ============================================================================== --- (empty file) +++ trunk/amdatu-auth/auth-stores/mem-store-consumer/src/test/java/org/amdatu/auth/oauth/consumerregistry/mem/service/InMemConsumerStoreTest.java Wed Oct 12 14:55:22 2011 @@ -0,0 +1,135 @@ +/* + * Copyright (c) 2010, 2011 The Amdatu Foundation + * + * 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. + */ +package org.amdatu.auth.oauth.consumerregistry.mem.service; + +import java.util.HashMap; +import java.util.Map; + +import org.amdatu.auth.oauth.api.ConsumerAlreadyExistsException; +import org.amdatu.auth.oauth.api.ConsumerNotFoundException; +import org.amdatu.auth.oauth.api.ConsumerRegistryStorageException; +import org.amdatu.auth.oauth.api.OAuthServiceConsumer; +import org.amdatu.auth.oauth.consumerregistry.OAuthServiceConsumerRegistry; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.osgi.service.cm.ConfigurationException; + + +public class InMemConsumerStoreTest { + private OAuthServiceConsumerRegistry m_oauthConsumerRegistry; + + @Before + public void setUp() throws ConsumerRegistryStorageException, ConfigurationException { + m_oauthConsumerRegistry = new InMemConsumerRegistryImpl(); + } + + @Test + public void testSimpleCrud() throws ConsumerAlreadyExistsException, ConsumerRegistryStorageException, + ConsumerNotFoundException { + + OAuthServiceConsumer c = new OAuthServiceConsumerImpl(); + ((OAuthServiceConsumerImpl)c).setName("John Doe"); + ((OAuthServiceConsumerImpl)c).setConsumerKey("key1"); + ((OAuthServiceConsumerImpl)c).setConsumerSecret("42"); + ((OAuthServiceConsumerImpl)c).setCallbackUrl("http://call.me.back/";); + Map<String, String> properties = new HashMap<String, String>(); + properties.put("key1", "value1"); + properties.put("key2", "value2"); + ((OAuthServiceConsumerImpl)c).setProperties(properties); + m_oauthConsumerRegistry.addConsumer(c); + + c = m_oauthConsumerRegistry.getConsumer("key1"); + Assert.assertNotNull(c); + Assert.assertEquals("John Doe", c.getName()); + Assert.assertEquals("key1", c.getConsumerKey()); + Assert.assertEquals("42", c.getConsumerSecret()); + Assert.assertEquals("http://call.me.back/";, c.getCallbackUrl()); + Assert.assertEquals("value1", c.getProperties().get("key1")); + Assert.assertEquals("value2", c.getProperties().get("key2")); + + c = new OAuthServiceConsumerImpl(); + ((OAuthServiceConsumerImpl) c).setName("John Doe2"); + ((OAuthServiceConsumerImpl) c).setConsumerKey("key1"); + ((OAuthServiceConsumerImpl) c).setConsumerSecret("44"); + ((OAuthServiceConsumerImpl) c).setCallbackUrl("http://call.me.back/?1";); + Map<String, String> properties2 = new HashMap<String, String>(); + properties2.put("key1", "value1"); + ((OAuthServiceConsumerImpl) c).setProperties(properties2); + m_oauthConsumerRegistry.updateConsumer(c); + + c = m_oauthConsumerRegistry.getConsumer("key1"); + Assert.assertNotNull(c); + Assert.assertEquals("John Doe2", c.getName()); + Assert.assertEquals("key1", c.getConsumerKey()); + Assert.assertEquals("44", c.getConsumerSecret()); + Assert.assertEquals("http://call.me.back/?1";, c.getCallbackUrl()); + Assert.assertEquals("value1", c.getProperties().get("key1")); + Assert.assertNull(c.getProperties().get("key2")); + + m_oauthConsumerRegistry.removeConsumer(c); + c = m_oauthConsumerRegistry.getConsumer("key1"); + Assert.assertNull(c); + } + + @Test(expected = ConsumerAlreadyExistsException.class) + public void testDuplicateAdd() throws ConsumerAlreadyExistsException, ConsumerRegistryStorageException { + OAuthServiceConsumer c = new OAuthServiceConsumerImpl(); + ((OAuthServiceConsumerImpl) c).setConsumerKey("key1"); + m_oauthConsumerRegistry.addConsumer(c); + m_oauthConsumerRegistry.addConsumer(c); + } + + @Test(expected = ConsumerNotFoundException.class) + public void testFaultyUpdate() throws ConsumerAlreadyExistsException, ConsumerRegistryStorageException, + ConsumerNotFoundException { + OAuthServiceConsumer c1 = new OAuthServiceConsumerImpl(); + ((OAuthServiceConsumerImpl) c1).setConsumerKey("key1"); + m_oauthConsumerRegistry.addConsumer(c1); + OAuthServiceConsumer c2 = new OAuthServiceConsumerImpl(); + ((OAuthServiceConsumerImpl) c2).setConsumerKey("key2"); + m_oauthConsumerRegistry.updateConsumer(c2); + } + + @Test + public void testFaultyConsumer() throws ConsumerAlreadyExistsException, ConsumerRegistryStorageException, + ConsumerNotFoundException { + OAuthServiceConsumer c = new OAuthServiceConsumerImpl(); + ((OAuthServiceConsumerImpl) c).setConsumerKey("key1"); + m_oauthConsumerRegistry.addConsumer(c); + + Assert.assertFalse(m_oauthConsumerRegistry.hasResourceAccess(c, "john")); + Assert.assertFalse(m_oauthConsumerRegistry.hasResourceAccess(c, "eric")); + + m_oauthConsumerRegistry.grantResourceAccess(c, "john"); + c = m_oauthConsumerRegistry.getConsumer("key1"); + + Assert.assertTrue(m_oauthConsumerRegistry.hasResourceAccess(c, "john")); + Assert.assertFalse(m_oauthConsumerRegistry.hasResourceAccess(c, "eric")); + + m_oauthConsumerRegistry.grantResourceAccess(c, "eric"); + c = m_oauthConsumerRegistry.getConsumer("key1"); + + Assert.assertTrue(m_oauthConsumerRegistry.hasResourceAccess(c, "john")); + Assert.assertTrue(m_oauthConsumerRegistry.hasResourceAccess(c, "eric")); + + m_oauthConsumerRegistry.withdrawResourceAccess(c, "john"); + c = m_oauthConsumerRegistry.getConsumer("key1"); + + Assert.assertFalse(m_oauthConsumerRegistry.hasResourceAccess(c, "john")); + Assert.assertTrue(m_oauthConsumerRegistry.hasResourceAccess(c, "eric")); + } +} Added: trunk/amdatu-auth/auth-stores/pom.xml ============================================================================== --- (empty file) +++ trunk/amdatu-auth/auth-stores/pom.xml Wed Oct 12 14:55:22 2011 @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2010, 2011 The Amdatu Foundation + + 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.verning permissions and limitations + under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth</artifactId> + <version>0.2.1-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.auth.stores</artifactId> + <packaging>pom</packaging> + <name>Amdatu Auth - Stores</name> + <description>This module holds Auth storage implementations</description> + + <modules> + <module>mem-store-consumer</module> + </modules> +</project> Modified: trunk/amdatu-auth/pom.xml ============================================================================== --- trunk/amdatu-auth/pom.xml (original) +++ trunk/amdatu-auth/pom.xml Wed Oct 12 14:55:22 2011 @@ -253,6 +253,7 @@ </distributionManagement> <modules> + <module>auth-stores</module> <module>config</module> <module>login-gadget</module> <module>login-service</module> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
