vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-27 14:32:06 +01:00
Code Issues Releases Wiki Activity

Fix merge errorsF

Browse source
This commit is contained in:
vanitasvitae 2017-06-08 23:47:03 +02:00
parent 7785f3d38f
commit a6b27f62d2
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
17 changed files with 60 additions and 823 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

317
smack-experimental/src/main/java/org/jivesoftware/smackx/hash/HashManager.java
View file

@ -1,317 +0,0 @@
/**
*
* Copyright © 2017 Paul Schaub
*
* 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.hash;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.jivesoftware.smack.Manager;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
import org.jivesoftware.smackx.hash.element.HashElement;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.Security;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.WeakHashMap;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.BLAKE2B160;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.BLAKE2B256;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.BLAKE2B384;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.BLAKE2B512;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.MD5;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.SHA3_224;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.SHA3_256;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.SHA3_384;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.SHA3_512;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.SHA_1;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.SHA_224;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.SHA_256;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.SHA_384;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.SHA_512;
/**
* Manager that can be used to determine support for hash functions.
*/
public final class HashManager extends Manager {
static {
Security.addProvider(new BouncyCastleProvider());
}
public static final String PROVIDER = "BC";
public static final String PREFIX_NS_ALGO = "urn:xmpp:hash-function-text-names:";
public enum NAMESPACE {
V1 ("urn:xmpp:hashes:1"),
V2 ("urn:xmpp:hashes:2");
final String name;
NAMESPACE(String name) {
this.name = name;
}
@Override
public String toString() {
return this.name;
}
}
public static final List<ALGORITHM> RECOMMENDED = Collections.unmodifiableList(Arrays.asList(
SHA_256, SHA_384, SHA_512,
SHA3_256, SHA3_384, SHA3_512,
BLAKE2B256, BLAKE2B384, BLAKE2B512));
private static final WeakHashMap<XMPPConnection, HashManager> INSTANCES = new WeakHashMap<>();
/**
* Constructor of the HashManager.
* By default the Manager announces support for XEP-0300, as well as for the RECOMMENDED set of hash algorithms.
* Those contain SHA256, SHA384, SHA512, SHA3-256, SHA3-384, SHA3-512, BLAKE2B256, BLAKE2B384 and BLAKE2B512.
* Those algorithms got recommended here: https://xmpp.org/extensions/xep-0300.html#recommendations
* @param connection connection
*/
private HashManager(XMPPConnection connection) {
super(connection);
ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(connection);
sdm.addFeature(NAMESPACE.V2.toString());
addAlgorithmsToFeatures(RECOMMENDED);
}
public static HashElement calculateHashElement(ALGORITHM algorithm, byte[] data) {
return new HashElement(algorithm, hash(algorithm, data));
}
public static HashElement assembleHashElement(ALGORITHM algorithm, byte[] hash) {
return new HashElement(algorithm, hash);
}
/**
* Announce support for the given list of algorithms.
* @param algorithms
*/
public void addAlgorithmsToFeatures(List<ALGORITHM> algorithms) {
ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(connection());
for (ALGORITHM algo : algorithms) {
sdm.addFeature(asFeature(algo));
}
}
/**
* Get an instance of the HashManager for the given connection.
* @param connection
* @return
*/
public HashManager getInstanceFor(XMPPConnection connection) {
HashManager hashManager = INSTANCES.get(connection);
if (hashManager == null) {
hashManager = new HashManager(connection);
INSTANCES.put(connection, hashManager);
}
return hashManager;
}
/**
* Return the feature name of the given algorithm.
* @param algorithm eg. 'SHA_1'
* @return feature name (eg. urn:xmpp:hash-function-text-names:sha-1')
*/
public static String asFeature(ALGORITHM algorithm) {
return PREFIX_NS_ALGO + algorithm.toString();
}
public enum ALGORITHM { // RECOMMENDATION:
MD5 ("md5"), // MUST NOT use this
SHA_1 ("sha-1"), // SHOULD NOT use this
SHA_224 ("sha-224"),
SHA_256 ("sha-256"), // MUST use this
SHA_384 ("sha-384"),
SHA_512 ("sha-512"), // SHOULD use this
SHA3_224 ("sha3-224"),
SHA3_256 ("sha3-256"), // MUST use this
SHA3_384 ("sha3-384"),
SHA3_512 ("sha3-512"), // SHOULD use this
BLAKE2B160("id-blake2b160"),
BLAKE2B256("id-blake2b256"), // MUST use this
BLAKE2B384("id-blake2b384"),
BLAKE2B512("id-blake2b512"); // SHOULD use this
private final String name;
ALGORITHM(String name) {
this.name = name;
}
/**
* Return the name of the algorithm as it is used in the XEP.
* @return name.
*/
@Override
public String toString() {
return this.name;
}
/**
* Compensational method for static 'valueOf' function.
* @param s
* @return
*/
public static ALGORITHM valueOfName(String s) {
for (ALGORITHM a : ALGORITHM.values()) {
if (a.toString().equals(s)) {
return a;
}
}
throw new IllegalArgumentException("No ALGORITHM enum with this name (" + s + ") found.");
}
}
/**
* Calculate the hash sum of data using algorithm.
* @param algorithm
* @param data
* @return
*/
public static byte[] hash(ALGORITHM algorithm, byte[] data) {
return getMessageDigest(algorithm).digest(data);
}
public static MessageDigest getMessageDigest(ALGORITHM algorithm) {
MessageDigest md;
try {
switch (algorithm) {
case MD5:
md = MessageDigest.getInstance("MD5", PROVIDER);
break;
case SHA_1:
md = MessageDigest.getInstance("SHA-1", PROVIDER);
break;
case SHA_224:
md = MessageDigest.getInstance("SHA-224", PROVIDER);
break;
case SHA_256:
md = MessageDigest.getInstance("SHA-256", PROVIDER);
break;
case SHA_384:
md = MessageDigest.getInstance("SHA-384", PROVIDER);
break;
case SHA_512:
md = MessageDigest.getInstance("SHA-512", PROVIDER);
break;
case SHA3_224:
md = MessageDigest.getInstance("SHA3-224", PROVIDER);
break;
case SHA3_256:
md = MessageDigest.getInstance("SHA3-256", PROVIDER);
break;
case SHA3_384:
md = MessageDigest.getInstance("SHA3-384", PROVIDER);
break;
case SHA3_512:
md = MessageDigest.getInstance("SHA3-512", PROVIDER);
break;
case BLAKE2B160:
md = MessageDigest.getInstance("BLAKE2b-160", PROVIDER);
break;
case BLAKE2B256:
md = MessageDigest.getInstance("BLAKE2b-256", PROVIDER);
break;
case BLAKE2B384:
md = MessageDigest.getInstance("BLAKE2b-384", PROVIDER);
break;
case BLAKE2B512:
md = MessageDigest.getInstance("BLAKE2b-512", PROVIDER);
break;
default:
throw new AssertionError("Invalid enum value.");
}
return md;
} catch (NoSuchAlgorithmException | NoSuchProviderException e) {
throw new AssertionError(e);
}
}
public static byte[] md5(byte[] data) {
return getMessageDigest(MD5).digest(data);
}
public static byte[] sha_1(byte[] data) {
return getMessageDigest(SHA_1).digest(data);
}
public static byte[] sha_224(byte[] data) {
return getMessageDigest(SHA_224).digest(data);
}
public static byte[] sha_256(byte[] data) {
return getMessageDigest(SHA_256).digest(data);
}
public static byte[] sha_384(byte[] data) {
return getMessageDigest(SHA_384).digest(data);
}
public static byte[] sha_512(byte[] data) {
return getMessageDigest(SHA_512).digest(data);
}
public static byte[] sha3_224(byte[] data) {
return getMessageDigest(SHA3_224).digest(data);
}
public static byte[] sha3_256(byte[] data) {
return getMessageDigest(SHA3_256).digest(data);
}
public static byte[] sha3_384(byte[] data) {
return getMessageDigest(SHA3_384).digest(data);
}
public static byte[] sha3_512(byte[] data) {
return getMessageDigest(SHA3_512).digest(data);
}
public static byte[] blake2b160(byte[] data) {
return getMessageDigest(BLAKE2B160).digest(data);
}
public static byte[] blake2b256(byte[] data) {
return getMessageDigest(BLAKE2B256).digest(data);
}
public static byte[] blake2b384(byte[] data) {
return getMessageDigest(BLAKE2B384).digest(data);
}
public static byte[] blake2b512(byte[] data) {
return getMessageDigest(BLAKE2B512).digest(data);
}
/**
* Encode a byte array in HEX.
* @param hash
* @return
*/
public static String hex(byte[] hash) {
return new BigInteger(1, hash).toString(16);
}
}

119
smack-experimental/src/main/java/org/jivesoftware/smackx/hash/element/HashElement.java
View file

@ -1,119 +0,0 @@
/**
*
* Copyright © 2017 Paul Schaub
*
* 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.hash.element;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.util.XmlStringBuilder;
import org.jivesoftware.smack.util.stringencoder.Base64;
import org.jivesoftware.smackx.hash.HashManager;
import static org.jivesoftware.smack.util.Objects.requireNonNull;
/**
* Represent a hash element.
*
* @author Paul Schaub
*/
public class HashElement implements ExtensionElement {
public static final String ELEMENT = "hash";
public static final String ATTR_ALGO = "algo";
private final HashManager.ALGORITHM algorithm;
private final byte[] hash;
private final String hashB64;
/**
* Create a HashElement from pre-calculated values.
* @param algorithm The algorithm which was used.
* @param hash the checksum as byte array.
*/
public HashElement(HashManager.ALGORITHM algorithm, byte[] hash) {
this.algorithm = requireNonNull(algorithm);
this.hash = requireNonNull(hash);
hashB64 = Base64.encodeToString(hash);
}
/**
* Create a HashElement from pre-calculated values.
* @param algorithm the algorithm that was used.
* @param hashB64 the checksum in base 64.
*/
public HashElement(HashManager.ALGORITHM algorithm, String hashB64) {
this.algorithm = algorithm;
this.hash = Base64.decode(hashB64);
this.hashB64 = hashB64;
}
/**
* Return the hash algorithm used in this HashElement.
* @return algorithm
*/
public HashManager.ALGORITHM getAlgorithm() {
return algorithm;
}
/**
* Return the checksum as a byte array.
* @return
*/
public byte[] getHash() {
return hash;
}
/**
* Return the checksum as a base16 (hex) string.
* @return
*/
public String getHashB64() {
return hashB64;
}
@Override
public String getElementName() {
return ELEMENT;
}
@Override
public CharSequence toXML() {
XmlStringBuilder sb = new XmlStringBuilder(this);
sb.attribute(ATTR_ALGO, algorithm.toString());
sb.rightAngleBracket();
sb.append(hashB64);
sb.closeElement(this);
return sb;
}
@Override
public String getNamespace() {
return HashManager.NAMESPACE.V2.toString();
}
@Override
public boolean equals(Object other) {
if (other == null || !(other instanceof HashElement)) {
return false;
}
return this.hashCode() == other.hashCode();
}
@Override
public int hashCode() {
return toXML().toString().hashCode();
}
}

22
smack-experimental/src/main/java/org/jivesoftware/smackx/hash/element/package-info.java
View file

@ -1,22 +0,0 @@
/**
*
* Copyright © 2014 Florian Schmaus
*
* 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.
*/
/**
* XEP-0300 - Use of cryptographic hash functions.
* Element classes.
*/
package org.jivesoftware.smackx.hash.element;

21
smack-experimental/src/main/java/org/jivesoftware/smackx/hash/package-info.java
View file

@ -1,21 +0,0 @@
/**
*
* Copyright © 2014 Florian Schmaus
*
* 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.
*/
/**
* XEP-0300 - Use of cryptographic hash functions.
*/
package org.jivesoftware.smackx.hash;

35
smack-experimental/src/main/java/org/jivesoftware/smackx/hash/provider/HashElementProvider.java
View file

@ -1,35 +0,0 @@
/**
*
* Copyright © 2017 Paul Schaub
*
* 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.hash.provider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smackx.hash.HashManager;
import org.jivesoftware.smackx.hash.element.HashElement;
import org.xmlpull.v1.XmlPullParser;
/**
* Provider for HashElements.
*/
public class HashElementProvider extends ExtensionElementProvider<HashElement> {
@Override
public HashElement parse(XmlPullParser parser, int initialDepth) throws Exception {
String algo = parser.getAttributeValue(null, HashElement.ATTR_ALGO);
String hashB64 = parser.nextText();
return new HashElement(HashManager.ALGORITHM.valueOfName(algo), hashB64);
}
}

22
smack-experimental/src/main/java/org/jivesoftware/smackx/hash/provider/package-info.java
View file

@ -1,22 +0,0 @@
/**
*
* Copyright © 2014 Florian Schmaus
*
* 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.
*/
/**
* XEP-0300 - Use of cryptographic hash functions.
* Provider classes.
*/
package org.jivesoftware.smackx.hash.provider;

6
smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/FileAndHashReader.java
View file

@ -16,14 +16,14 @@
*/ */
package org.jivesoftware.smackx.jingle_filetransfer; package org.jivesoftware.smackx.jingle_filetransfer;
import org.jivesoftware.smackx.hash.HashManager;
import org.jivesoftware.smackx.hash.element.HashElement;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.security.DigestInputStream; import java.security.DigestInputStream;
import org.jivesoftware.smackx.hashes.HashManager;
import org.jivesoftware.smackx.hashes.element.HashElement;
/** /**
* FileReader that reads a file into a byte array while returning the hash of the file. * FileReader that reads a file into a byte array while returning the hash of the file.
*/ */

9
smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java
View file

@ -31,8 +31,8 @@ import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
import org.jivesoftware.smackx.hash.HashManager; import org.jivesoftware.smackx.hashes.HashManager;
import org.jivesoftware.smackx.hash.element.HashElement; import org.jivesoftware.smackx.hashes.element.HashElement;
import org.jivesoftware.smackx.jingle.AbstractJingleContentTransportManager; import org.jivesoftware.smackx.jingle.AbstractJingleContentTransportManager;
import org.jivesoftware.smackx.jingle.JingleContentProviderManager; import org.jivesoftware.smackx.jingle.JingleContentProviderManager;
import org.jivesoftware.smackx.jingle.JingleHandler; import org.jivesoftware.smackx.jingle.JingleHandler;
@ -46,6 +46,7 @@ import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferCon
import org.jivesoftware.smackx.jingle_filetransfer.listener.IncomingJingleFileTransferListener; import org.jivesoftware.smackx.jingle_filetransfer.listener.IncomingJingleFileTransferListener;
import org.jivesoftware.smackx.jingle_filetransfer.provider.JingleFileTransferContentDescriptionProvider; import org.jivesoftware.smackx.jingle_filetransfer.provider.JingleFileTransferContentDescriptionProvider;
import org.jivesoftware.smackx.jingle_ibb.JingleInBandBytestreamTransportManager; import org.jivesoftware.smackx.jingle_ibb.JingleInBandBytestreamTransportManager;
import org.jivesoftware.smackx.jingle_s5b.JingleSocks5BytestreamTransportManager;
import org.jxmpp.jid.FullJid; import org.jxmpp.jid.FullJid;
/** /**
@ -114,7 +115,7 @@ public final class JingleFileTransferManager extends Manager implements JingleHa
* @param file * @param file
*/ */
public void sendFile(File file, final FullJid recipient) throws IOException, SmackException.NotConnectedException, InterruptedException, XMPPException.XMPPErrorException, SmackException.NoResponseException { public void sendFile(File file, final FullJid recipient) throws IOException, SmackException.NotConnectedException, InterruptedException, XMPPException.XMPPErrorException, SmackException.NoResponseException {
AbstractJingleContentTransportManager<?> preferedTransportManager = JingleInBandBytestreamTransportManager.getInstanceFor(connection()); AbstractJingleContentTransportManager<?> preferredTransportManager = JingleSocks5BytestreamTransportManager.getInstanceFor(connection());
JingleFileTransferSession session = new JingleFileTransferSession(connection(), recipient, connection().getUser(), recipient); JingleFileTransferSession session = new JingleFileTransferSession(connection(), recipient, connection().getUser(), recipient);
JingleFileTransferChildElement.Builder b = JingleFileTransferChildElement.getBuilder(); JingleFileTransferChildElement.Builder b = JingleFileTransferChildElement.getBuilder();
@ -135,7 +136,7 @@ public final class JingleFileTransferManager extends Manager implements JingleHa
bb.setDescription(new JingleFileTransferContentDescription(payloads)) bb.setDescription(new JingleFileTransferContentDescription(payloads))
.setCreator(JingleContent.Creator.initiator) .setCreator(JingleContent.Creator.initiator)
.setName(StringUtils.randomString(24)) .setName(StringUtils.randomString(24))
.addTransport(preferedTransportManager.createJingleContentTransport()); .addTransport(preferredTransportManager.createJingleContentTransport(recipient));
Jingle jingle = (Jingle) session.initiate(Collections.singletonList(bb.build())); Jingle jingle = (Jingle) session.initiate(Collections.singletonList(bb.build()));
jingle.setTo(recipient); jingle.setTo(recipient);

8
smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferChildElement.java
View file

@ -16,13 +16,13 @@
*/ */
package org.jivesoftware.smackx.jingle_filetransfer.element; package org.jivesoftware.smackx.jingle_filetransfer.element;
import org.jivesoftware.smack.util.XmlStringBuilder;
import org.jivesoftware.smackx.hash.element.HashElement;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
import java.io.File; import java.io.File;
import java.util.Date; import java.util.Date;
import org.jivesoftware.smack.util.XmlStringBuilder;
import org.jivesoftware.smackx.hashes.element.HashElement;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
/** /**
* Content of type File. * Content of type File.
*/ */

2
smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java
View file

@ -18,7 +18,7 @@ package org.jivesoftware.smackx.jingle_filetransfer.element;
import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.packet.NamedElement;
import org.jivesoftware.smack.util.XmlStringBuilder; import org.jivesoftware.smack.util.XmlStringBuilder;
import org.jivesoftware.smackx.hash.element.HashElement; import org.jivesoftware.smackx.hashes.element.HashElement;
/** /**
* RangeElement which specifies, which range of a file shall be transferred. * RangeElement which specifies, which range of a file shall be transferred.

22
smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/JingleFileTransferContentDescriptionProvider.java
View file

@ -16,20 +16,20 @@
*/ */
package org.jivesoftware.smackx.jingle_filetransfer.provider; package org.jivesoftware.smackx.jingle_filetransfer.provider;
import org.jivesoftware.smackx.hash.element.HashElement; import static org.xmlpull.v1.XmlPullParser.END_TAG;
import org.jivesoftware.smackx.hash.provider.HashElementProvider; import static org.xmlpull.v1.XmlPullParser.START_TAG;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
import org.jivesoftware.smackx.jingle.provider.JingleContentDescriptionProvider;
import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferContentDescription;
import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChildElement;
import org.jivesoftware.smackx.jingle_filetransfer.element.Range;
import org.jxmpp.util.XmppDateTime;
import org.xmlpull.v1.XmlPullParser;
import java.util.ArrayList; import java.util.ArrayList;
import static org.xmlpull.v1.XmlPullParser.END_TAG; import org.jivesoftware.smackx.hashes.element.HashElement;
import static org.xmlpull.v1.XmlPullParser.START_TAG; import org.jivesoftware.smackx.hashes.provider.HashElementProvider;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
import org.jivesoftware.smackx.jingle.provider.JingleContentDescriptionProvider;
import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChildElement;
import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferContentDescription;
import org.jivesoftware.smackx.jingle_filetransfer.element.Range;
import org.jxmpp.util.XmppDateTime;
import org.xmlpull.v1.XmlPullParser;
/** /**
* Provider for JingleContentDescriptionFileTransfer elements. * Provider for JingleContentDescriptionFileTransfer elements.

24
smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_s5b/JingleSocks5BytestreamTransportManager.java
View file

@ -17,16 +17,15 @@
package org.jivesoftware.smackx.jingle_s5b; package org.jivesoftware.smackx.jingle_s5b;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.util.List; import java.util.List;
import java.util.WeakHashMap;
import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager; import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
import org.jivesoftware.smackx.hash.HashManager; import org.jivesoftware.smackx.hashes.HashManager;
import org.jivesoftware.smackx.jingle.AbstractJingleContentTransportManager; import org.jivesoftware.smackx.jingle.AbstractJingleContentTransportManager;
import org.jivesoftware.smackx.jingle.JingleTransportInputStreamCallback; import org.jivesoftware.smackx.jingle.JingleTransportInputStreamCallback;
import org.jivesoftware.smackx.jingle.JingleTransportManager; import org.jivesoftware.smackx.jingle.JingleTransportManager;
@ -42,10 +41,21 @@ import org.jxmpp.jid.Jid;
*/ */
public final class JingleSocks5BytestreamTransportManager extends AbstractJingleContentTransportManager<JingleSocks5BytestreamTransport> { public final class JingleSocks5BytestreamTransportManager extends AbstractJingleContentTransportManager<JingleSocks5BytestreamTransport> {
private static final WeakHashMap<XMPPConnection, JingleSocks5BytestreamTransportManager> INSTANCES = new WeakHashMap<>();
private JingleSocks5BytestreamTransportManager(XMPPConnection connection) { private JingleSocks5BytestreamTransportManager(XMPPConnection connection) {
super(connection); super(connection);
} }
public static JingleSocks5BytestreamTransportManager getInstanceFor(XMPPConnection connection) {
JingleSocks5BytestreamTransportManager manager = INSTANCES.get(connection);
if (manager == null) {
manager = new JingleSocks5BytestreamTransportManager(connection);
INSTANCES.put(connection, manager);
}
return manager;
}
public List<Bytestream.StreamHost> getAvailableStreamHosts() throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException { public List<Bytestream.StreamHost> getAvailableStreamHosts() throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException {
Socks5BytestreamManager s5m = Socks5BytestreamManager.getBytestreamManager(connection()); Socks5BytestreamManager s5m = Socks5BytestreamManager.getBytestreamManager(connection());
List<Jid> proxies = s5m.determineProxies(); List<Jid> proxies = s5m.determineProxies();
@ -101,13 +111,7 @@ public final class JingleSocks5BytestreamTransportManager extends AbstractJingle
sid + sid +
connection().getUser().asFullJidIfPossible().toString() + connection().getUser().asFullJidIfPossible().toString() +
otherUser.asFullJidIfPossible().toString(); otherUser.asFullJidIfPossible().toString();
try { builder.setDestinationAddress(HashManager.sha_1HexString(digestString));
builder.setDestinationAddress(
new String(HashManager.sha_1(digestString.getBytes(StringUtils.UTF8)), StringUtils.UTF8));
} catch (UnsupportedEncodingException e) {
throw new AssertionError(e);
}
return builder.build(); return builder.build();
} }
} }

60
smack-experimental/src/test/java/org/jivesoftware/smackx/hash/HashElementTest.java
View file

@ -1,60 +0,0 @@
/**
*
* Copyright 2014 Andriy Tsykholyas
*
* 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.hash;
import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smack.test.util.TestUtils;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.hash.element.HashElement;
import org.jivesoftware.smackx.hash.provider.HashElementProvider;
import org.junit.Test;
import static junit.framework.TestCase.assertEquals;
import static org.jivesoftware.smackx.hash.HashManager.ALGORITHM.SHA_256;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* Test toXML and parse of HashElement and HashElementProvider.
*/
public class HashElementTest extends SmackTestSuite {
@Test
public void stanzaTest() throws Exception {
String message = "Hello World!";
HashElement element = HashManager.calculateHashElement(SHA_256, message.getBytes(StringUtils.UTF8));
String expected = "<hash xmlns='urn:xmpp:hashes:2' algo='sha-256'>f4OxZX/x/FO5LcGBSKHWXfwtSx+j1ncoSt3SABJtkGk=</hash>";
assertEquals(expected, element.toXML().toString());
HashElement parsed = new HashElementProvider().parse(TestUtils.getParser(expected));
assertEquals(expected, parsed.toXML().toString());
assertEquals(SHA_256, parsed.getAlgorithm());
assertEquals("f4OxZX/x/FO5LcGBSKHWXfwtSx+j1ncoSt3SABJtkGk=", parsed.getHashB64());
assertArrayEquals(HashManager.sha_256(message.getBytes(StringUtils.UTF8)), parsed.getHash());
assertFalse(parsed.equals(expected));
assertFalse(parsed.equals(null));
assertEquals(element, parsed);
assertTrue(element.equals(parsed));
HashElement other = new HashElement(HashManager.ALGORITHM.SHA_512,
"861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8".getBytes(StringUtils.UTF8));
assertFalse(element.equals(other));
}
}

172
smack-experimental/src/test/java/org/jivesoftware/smackx/hash/HashTest.java
View file

@ -1,172 +0,0 @@
/**
*
* Copyright 2014 Andriy Tsykholyas
*
* 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.hash;
import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smack.util.StringUtils;
import org.junit.Test;
import java.io.UnsupportedEncodingException;
import static junit.framework.TestCase.assertEquals;
/**
* Test HashManager functionality.
* The test sums got calculated using 'echo "Hello World!" | { md5sum, sha1sum, sha224sum, sha256sum, sha384sum, sha512sum,
* sha3-224sum -l, sha3-256sum -l, sha3-384sum -l, sha3-512sum -l, b2sum -l 160, b2sum -l 256, b2sum -l 384, b2sum -l 512 }
*/
public class HashTest extends SmackTestSuite {
private static final String testString = "Hello World!";
private static final String md5sum = "ed076287532e86365e841e92bfc50d8c";
private static final String sha1sum = "2ef7bde608ce5404e97d5f042f95f89f1c232871";
private static final String sha224sum = "4575bb4ec129df6380cedde6d71217fe0536f8ffc4e18bca530a7a1b";
private static final String sha256sum = "7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069";
private static final String sha384sum = "bfd76c0ebbd006fee583410547c1887b0292be76d582d96c242d2a792723e3fd6fd061f9d5cfd13b8f961358e6adba4a";
private static final String sha512sum = "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8";
private static final String sha3_224sum = "716596afadfa17cd1cb35133829a02b03e4eed398ce029ce78a2161d";
private static final String sha3_256sum = "d0e47486bbf4c16acac26f8b653592973c1362909f90262877089f9c8a4536af";
private static final String sha3_384sum = "f324cbd421326a2abaedf6f395d1a51e189d4a71c755f531289e519f079b224664961e385afcc37da348bd859f34fd1c";
private static final String sha3_512sum = "32400b5e89822de254e8d5d94252c52bdcb27a3562ca593e980364d9848b8041b98eabe16c1a6797484941d2376864a1b0e248b0f7af8b1555a778c336a5bf48";
private static final String b2_160sum = "e7338d05e5aa2b5e4943389f9475fce2525b92f2";
private static final String b2_256sum = "bf56c0728fd4e9cf64bfaf6dabab81554103298cdee5cc4d580433aa25e98b00";
private static final String b2_384sum = "53fd759520545fe93270e61bac03b243b686af32ed39a4aa635555be47a89004851d6a13ece00d95b7bdf9910cb71071";
private static final String b2_512sum = "54b113f499799d2f3c0711da174e3bc724737ad18f63feb286184f0597e1466436705d6c8e8c7d3d3b88f5a22e83496e0043c44a3c2b1700e0e02259f8ac468e";
private byte[] array() {
if (testArray == null) {
try {
testArray = testString.getBytes(StringUtils.UTF8);
} catch (UnsupportedEncodingException e) {
throw new AssertionError("UTF8 MUST be supported.");
}
}
return testArray;
}
private byte[] testArray;
@Test
public void hashTest() {
assertEquals(md5sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.MD5, array())));
assertEquals(sha1sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.SHA_1, array())));
assertEquals(sha224sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.SHA_224, array())));
assertEquals(sha256sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.SHA_256, array())));
assertEquals(sha384sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.SHA_384, array())));
assertEquals(sha512sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.SHA_512, array())));
assertEquals(sha3_224sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.SHA3_224, array())));
assertEquals(sha3_256sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.SHA3_256, array())));
assertEquals(sha3_384sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.SHA3_384, array())));
assertEquals(sha3_512sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.SHA3_512, array())));
assertEquals(b2_160sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.BLAKE2B160, array())));
assertEquals(b2_256sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.BLAKE2B256, array())));
assertEquals(b2_384sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.BLAKE2B384, array())));
assertEquals(b2_512sum, HashManager.hex(HashManager.hash(HashManager.ALGORITHM.BLAKE2B512, array())));
}
@Test
public void md5Test() {
String actual = HashManager.hex(HashManager.md5(array()));
assertEquals(md5sum, actual);
}
@Test
public void sha1Test() {
String actual = HashManager.hex(HashManager.sha_1(array()));
assertEquals(sha1sum, actual);
}
@Test
public void sha224Test() {
String actual = HashManager.hex(HashManager.sha_224(array()));
assertEquals(sha224sum, actual);
}
@Test
public void sha256Test() {
String actual = HashManager.hex(HashManager.sha_256(array()));
assertEquals(sha256sum, actual);
}
@Test
public void sha384Test() {
String actual = HashManager.hex(HashManager.sha_384(array()));
assertEquals(sha384sum, actual);
}
@Test
public void sha512Test() {
String actual = HashManager.hex(HashManager.sha_512(array()));
assertEquals(sha512sum, actual);
}
@Test
public void sha3_224Test() {
String actual = HashManager.hex(HashManager.sha3_224(array()));
assertEquals(sha3_224sum, actual);
}
@Test
public void sha3_256Test() {
String actual = HashManager.hex(HashManager.sha3_256(array()));
assertEquals(sha3_256sum, actual);
}
@Test
public void sha3_384Test() {
String actual = HashManager.hex(HashManager.sha3_384(array()));
assertEquals(sha3_384sum, actual);
}
@Test
public void sha3_512Test() {
String actual = HashManager.hex(HashManager.sha3_512(array()));
assertEquals(sha3_512sum, actual);
}
@Test
public void blake2b160Test() {
String actual = HashManager.hex(HashManager.blake2b160(array()));
assertEquals(b2_160sum, actual);
}
@Test
public void blake2b256Test() {
String actual = HashManager.hex(HashManager.blake2b256(array()));
assertEquals(b2_256sum, actual);
}
@Test
public void blake2b384Test() {
String actual = HashManager.hex(HashManager.blake2b384(array()));
assertEquals(b2_384sum, actual);
}
@Test
public void blake2b512Test() {
String actual = HashManager.hex(HashManager.blake2b512(array()));
assertEquals(b2_512sum, actual);
}
@Test
public void asFeatureTest() {
assertEquals("urn:xmpp:hash-function-text-names:id-blake2b384", HashManager.asFeature(HashManager.ALGORITHM.BLAKE2B384));
assertEquals("urn:xmpp:hash-function-text-names:md5", HashManager.asFeature(HashManager.ALGORITHM.MD5));
assertEquals("urn:xmpp:hash-function-text-names:sha3-512", HashManager.asFeature(HashManager.ALGORITHM.SHA3_512));
assertEquals("urn:xmpp:hash-function-text-names:sha-512", HashManager.asFeature(HashManager.ALGORITHM.SHA_512));
}
}

4
smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashTest.java
View file

@ -73,13 +73,13 @@ public class HashTest extends SmackTestSuite {
@Test @Test
public void md5Test() { public void md5Test() {
String actual = HashManager.hex(HashManager.md5(array())); String actual = HashManager.md5HexString(array());
assertEquals(md5sum, actual); assertEquals(md5sum, actual);
} }
@Test @Test
public void sha1Test() { public void sha1Test() {
String actual = HashManager.hex(HashManager.sha_1(array())); String actual = HashManager.sha_1HexString(array());
assertEquals(sha1sum, actual); assertEquals(sha1sum, actual);
} }

12
smack-experimental/src/test/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferChildElementTest.java
View file

@ -16,16 +16,16 @@
*/ */
package org.jivesoftware.smackx.jingle_filetransfer; package org.jivesoftware.smackx.jingle_filetransfer;
import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smackx.hash.HashManager;
import org.jivesoftware.smackx.hash.element.HashElement;
import org.jivesoftware.smackx.jingle_filetransfer.element.Range;
import org.junit.Test;
import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNotNull;
import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertNull;
import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smackx.hashes.HashManager;
import org.jivesoftware.smackx.hashes.element.HashElement;
import org.jivesoftware.smackx.jingle_filetransfer.element.Range;
import org.junit.Test;
/** /**
* Test the JingleContentFile class. * Test the JingleContentFile class.
*/ */

28
smack-experimental/src/test/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferContentDescriptionTest.java
View file

@ -16,24 +16,24 @@
*/ */
package org.jivesoftware.smackx.jingle_filetransfer; package org.jivesoftware.smackx.jingle_filetransfer;
import org.jivesoftware.smack.test.util.SmackTestSuite; import static org.junit.Assert.assertEquals;
import org.jivesoftware.smack.test.util.TestUtils; import static org.junit.Assert.assertNotNull;
import org.jivesoftware.smackx.hash.HashManager;
import org.jivesoftware.smackx.hash.element.HashElement;
import org.jivesoftware.smackx.jingle.element.JingleContentDescription;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferContentDescription;
import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChildElement;
import org.jivesoftware.smackx.jingle_filetransfer.element.Range;
import org.jivesoftware.smackx.jingle_filetransfer.provider.JingleFileTransferContentDescriptionProvider;
import org.junit.Test;
import org.jxmpp.util.XmppDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import static org.junit.Assert.assertEquals; import org.jivesoftware.smack.test.util.SmackTestSuite;
import static org.junit.Assert.assertNotNull; import org.jivesoftware.smack.test.util.TestUtils;
import org.jivesoftware.smackx.hashes.HashManager;
import org.jivesoftware.smackx.hashes.element.HashElement;
import org.jivesoftware.smackx.jingle.element.JingleContentDescription;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChildElement;
import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferContentDescription;
import org.jivesoftware.smackx.jingle_filetransfer.element.Range;
import org.jivesoftware.smackx.jingle_filetransfer.provider.JingleFileTransferContentDescriptionProvider;
import org.junit.Test;
import org.jxmpp.util.XmppDateTime;
/** /**
* Test the JingleContentDescriptionFileTransfer element and provider. * Test the JingleContentDescriptionFileTransfer element and provider.