mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-06-21 02:44:49 +02:00
403ecff2b2
Thanks to Stefan Karlsson for helping with the implementation. Also add SASLMechanism.checkIfSuccessfulOrThrow(), to increase the security by verifying the mechanisms state at the end of SASL authentication. SASLMechanism now has a SASLPrep StringTransformer. Refactor SHA1 functions out of StringUtils into SHA1 utility class. Add MAC utility class. Make DummyConnection getSentpacket() methods use generics to make unit testing SCRAM-SHA1 easier. Fixes SMACK-398
77 lines
2.6 KiB
Java
77 lines
2.6 KiB
Java
/**
|
|
*
|
|
* Copyright the original author or authors
|
|
*
|
|
* 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.jivesoftware.smackx.bytestreams.socks5;
|
|
|
|
import java.io.DataInputStream;
|
|
import java.io.IOException;
|
|
|
|
import org.jivesoftware.smack.SmackException;
|
|
import org.jivesoftware.smack.util.SHA1;
|
|
|
|
/**
|
|
* A collection of utility methods for SOcKS5 messages.
|
|
*
|
|
* @author Henning Staib
|
|
*/
|
|
class Socks5Utils {
|
|
|
|
/**
|
|
* Returns a SHA-1 digest of the given parameters as specified in <a
|
|
* href="http://xmpp.org/extensions/xep-0065.html#impl-socks5">XEP-0065</a>.
|
|
*
|
|
* @param sessionID for the SOCKS5 Bytestream
|
|
* @param initiatorJID JID of the initiator of a SOCKS5 Bytestream
|
|
* @param targetJID JID of the target of a SOCKS5 Bytestream
|
|
* @return SHA-1 digest of the given parameters
|
|
*/
|
|
public static String createDigest(String sessionID, String initiatorJID, String targetJID) {
|
|
StringBuilder b = new StringBuilder();
|
|
b.append(sessionID).append(initiatorJID).append(targetJID);
|
|
return SHA1.hex(b.toString());
|
|
}
|
|
|
|
/**
|
|
* Reads a SOCKS5 message from the given InputStream. The message can either be a SOCKS5 request
|
|
* message or a SOCKS5 response message.
|
|
* <p>
|
|
* (see <a href="http://tools.ietf.org/html/rfc1928">RFC1928</a>)
|
|
*
|
|
* @param in the DataInputStream to read the message from
|
|
* @return the SOCKS5 message
|
|
* @throws IOException if a network error occurred
|
|
* @throws SmackException if the SOCKS5 message contains an unsupported address type
|
|
*/
|
|
public static byte[] receiveSocks5Message(DataInputStream in) throws IOException, SmackException {
|
|
byte[] header = new byte[5];
|
|
in.readFully(header, 0, 5);
|
|
|
|
if (header[3] != (byte) 0x03) {
|
|
throw new SmackException("Unsupported SOCKS5 address type");
|
|
}
|
|
|
|
int addressLength = header[4];
|
|
|
|
byte[] response = new byte[7 + addressLength];
|
|
System.arraycopy(header, 0, response, 0, header.length);
|
|
|
|
in.readFully(response, header.length, addressLength + 2);
|
|
|
|
return response;
|
|
}
|
|
|
|
}
|