-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- disable caching of authenticated user in session by default - track server rather than client nonces - better handling of stale nonce values git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1377794 13f79535-47bb-0310-9956-ffa450edef68
- Loading branch information
Showing
4 changed files
with
194 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
java/org/apache/catalina/util/ConcurrentMessageDigest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * 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.catalina.util; | ||
|
|
||
| import java.security.MessageDigest; | ||
| import java.security.NoSuchAlgorithmException; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Queue; | ||
| import java.util.concurrent.ConcurrentLinkedQueue; | ||
|
|
||
| /** | ||
| * A thread safe wrapper around {@link MessageDigest} that does not make use | ||
| * of ThreadLocal and - broadly - only creates enough MessageDigest objects | ||
| * to satisfy the concurrency requirements. | ||
| */ | ||
| public class ConcurrentMessageDigest { | ||
|
|
||
| private static final Map<String,Queue<MessageDigest>> queues = | ||
| new HashMap<>(); | ||
|
|
||
|
|
||
| private ConcurrentMessageDigest() { | ||
| // Hide default constructor for this utility class | ||
| } | ||
|
|
||
|
|
||
| public static byte[] digest(String algorithm, byte[] input) { | ||
|
|
||
| Queue<MessageDigest> queue = queues.get(algorithm); | ||
| if (queue == null) { | ||
| throw new IllegalStateException("Must call init() first"); | ||
| } | ||
|
|
||
| MessageDigest md = queue.poll(); | ||
| if (md == null) { | ||
| try { | ||
| md = MessageDigest.getInstance(algorithm); | ||
| } catch (NoSuchAlgorithmException e) { | ||
| // Ignore. Impossible if init() has been successfully called | ||
| // first. | ||
| throw new IllegalStateException("Must call init() first"); | ||
| } | ||
| } | ||
|
|
||
| byte[] result = md.digest(input); | ||
|
|
||
| queue.add(md); | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Ensures that {@link #digest(String, byte[])} and | ||
| * {@link #digestAsHex(String, byte[])} will support the specified | ||
| * algorithm. This method <b>must</b> be called and return successfully | ||
| * before using {@link #digest(String, byte[])} or | ||
| * {@link #digestAsHex(String, byte[])}. | ||
| * | ||
| * @param algorithm The message digest algorithm to be supported | ||
| * | ||
| * @throws NoSuchAlgorithmException If the algorithm is not supported by the | ||
| * JVM | ||
| */ | ||
| public static void init(String algorithm) throws NoSuchAlgorithmException { | ||
| synchronized (queues) { | ||
| if (!queues.containsKey(algorithm)) { | ||
| MessageDigest md = MessageDigest.getInstance(algorithm); | ||
| Queue<MessageDigest> queue = new ConcurrentLinkedQueue<>(); | ||
| queue.add(md); | ||
| queues.put(algorithm, queue); | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.