Author: angela
Date: Wed Mar 26 18:22:51 2014
New Revision: 1581985
URL: http://svn.apache.org/r1581985
Log:
OAK-1623 : TokenConfiguration expects nested configuration options
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImplTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenConfiguration.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java?rev=1581985&r1=1581984&r2=1581985&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
Wed Mar 26 18:22:51 2014
@@ -63,21 +63,13 @@ public class TokenConfigurationImpl exte
/**
* Returns a new instance of {@link
org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider}.
*
- * <h4>Configuration Options</h4>
- * <ul>
- * <li>{@link #PARAM_TOKEN_OPTIONS}: The configuration parameters for
- * the token provider which allows to change the default expiration
time
- * and the length of the generated token.</li>
- * </ul>
- *
* @param root The target root.
* @return A new instance of {@link
org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider}.
*/
@Nonnull
@Override
public TokenProvider getTokenProvider(Root root) {
- ConfigurationParameters tokenOptions =
getParameters().getConfigValue(PARAM_TOKEN_OPTIONS,
ConfigurationParameters.EMPTY);
UserConfiguration uc =
getSecurityProvider().getConfiguration(UserConfiguration.class);
- return new TokenProviderImpl(root, tokenOptions, uc);
+ return new TokenProviderImpl(root, getParameters(), uc);
}
}
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenConfiguration.java?rev=1581985&r1=1581984&r2=1581985&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenConfiguration.java
Wed Mar 26 18:22:51 2014
@@ -28,8 +28,12 @@ public interface TokenConfiguration exte
String NAME = "org.apache.jackrabbit.oak.authentication.token";
- String PARAM_TOKEN_OPTIONS =
"org.apache.jackrabbit.oak.authentication.token";
-
+ /**
+ * Returns a new instance of {@link
org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider}.
+ *
+ * @param root The target root.
+ * @return A new instance of {@link
org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider}.
+ */
@Nonnull
TokenProvider getTokenProvider(Root root);
}
\ No newline at end of file
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImplTest.java?rev=1581985&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImplTest.java
(added)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImplTest.java
Wed Mar 26 18:22:51 2014
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.jackrabbit.oak.security.authentication.token;
+
+import java.util.Collections;
+
+import com.google.common.collect.ImmutableMap;
+import org.apache.jackrabbit.oak.AbstractSecurityTest;
+import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
+import
org.apache.jackrabbit.oak.spi.security.authentication.token.TokenConfiguration;
+import
org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class TokenConfigurationImplTest extends AbstractSecurityTest {
+
+ private TokenConfigurationImpl tc;
+
+ @Override
+ public void before() throws Exception {
+ super.before();
+ tc = new TokenConfigurationImpl(getSecurityProvider());
+ }
+
+ @Override
+ protected ConfigurationParameters getSecurityConfigParameters() {
+ ConfigurationParameters config = ConfigurationParameters.of(
+
Collections.singletonMap(TokenProviderImpl.PARAM_TOKEN_EXPIRATION, 60));
+ return
ConfigurationParameters.of(ImmutableMap.of(TokenConfiguration.NAME, config));
+ }
+
+ @Test
+ public void testConfigOptions() {
+ int exp =
tc.getParameters().getConfigValue(TokenProvider.PARAM_TOKEN_EXPIRATION, 2 *
3600 * 1000);
+ assertEquals(60, exp);
+ }
+}
\ No newline at end of file
