coheigea commented on a change in pull request #462: Httpsig URL: https://github.com/apache/cxf/pull/462#discussion_r242219440
########## File path: rt/rs/security/http-signature/src/main/java/org/apache/cxf/rs/security/httpsignature/SignatureHeaderUtils.java ########## @@ -0,0 +1,118 @@ +/** + * 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.cxf.rs.security.httpsignature; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.*; +import java.util.regex.Pattern; + +import static java.nio.charset.StandardCharsets.ISO_8859_1; + +public final class SignatureHeaderUtils { + + private SignatureHeaderUtils() { } + /** + * Maps a multimap to a normal map with comma-separated values in case of duplicate headers + * @param multivaluedMap the multivalued map + * @return A map with comma-separated values + */ + public static Map<String, String> mapHeaders(Map<String, List<String>> multivaluedMap) { + Map<String, String> mappedStrings = new HashMap<>(); + for (String key : multivaluedMap.keySet()) { + mappedStrings.put(key, concatValues(multivaluedMap.get(key))); + } + return mappedStrings; + } + + /** + * Loads and decodes a PEM key to be ready to create a KeySpec + * @param resource The raw bytes from a PEM file + * @return decoded bytes which can be input to a KeySpec + */ + public static byte[] loadPEM(byte[] resource) { + String pem = new String(resource, ISO_8859_1); + Pattern parse = Pattern.compile("(?m)(?s)^---*BEGIN.*---*$(.*)^---*END.*---*$.*"); + String encoded = parse.matcher(pem).replaceFirst("$1"); + return Base64.getMimeDecoder().decode(encoded); + } + + /** + * Get a base64 encoded digest using the Algorithm specified, typically SHA-256 + * + * @param messageBody The body of the message to be used to create the Digest + * @param digestAlgorithmName The name of the algorithm used to create the digest, SHA-256 and SHA-512 are valid + * @return A base64 encoded digest ready to be added as a header to the message + * @throws NoSuchAlgorithmException If the user gives an unexpected digestAlgorithmName + */ + public static String createDigestHeader(String messageBody, String digestAlgorithmName) + throws NoSuchAlgorithmException { + MessageDigest messageDigest = getDigestAlgorithm(digestAlgorithmName); + messageDigest.update(messageBody.getBytes()); + return digestAlgorithmName + "=" + new String(Base64.getEncoder().encode(messageDigest.digest())); Review comment: Base64.getEncoder().encodeToString(...) here ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
