Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-06-19 03:44:50 (GMT) |
|---|---|---|
| committer | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-06-23 14:53:15 (GMT) |
| commit | bc9dade982d8e8efe66c0fc814dafd8bf079e689 (patch) | |
| tree | dd71e35abbf05a191a530d9d6ed421c5c0a1e5dd | |
| parent | 45e302d354d663eed61de58325ac162182497046 (diff) | |
| download | stroke-bc9dade982d8e8efe66c0fc814dafd8bf079e689.zip stroke-bc9dade982d8e8efe66c0fc814dafd8bf079e689.tar.bz2 | |
Add ComponentHandshake Element.
Adds ComponentHandshake Element, its parser and Serializer.
Adds ComponentHandshake Generator.
Adds TopLevelElement.
Updates SafeByteArray.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Test added for ComponentHandshakeGenerator, which passes.
Change-Id: If3026a3db2207e6c65aa2306fee56d8dd5dee86f
7 files changed, 232 insertions, 0 deletions
diff --git a/src/com/isode/stroke/base/SafeByteArray.java b/src/com/isode/stroke/base/SafeByteArray.java index e35ef35..af43261 100644 --- a/src/com/isode/stroke/base/SafeByteArray.java +++ b/src/com/isode/stroke/base/SafeByteArray.java @@ -12,4 +12,7 @@ import com.isode.stroke.base.ByteArray; */ public class SafeByteArray extends ByteArray { + public SafeByteArray(String s) { + super(s); + } }
\ No newline at end of file diff --git a/src/com/isode/stroke/component/ComponentHandshakeGenerator.java b/src/com/isode/stroke/component/ComponentHandshakeGenerator.java new file mode 100644 index 0000000..aa41535 --- /dev/null +++ b/src/com/isode/stroke/component/ComponentHandshakeGenerator.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2010-2013 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.component; + +import com.isode.stroke.crypto.CryptoProvider; +import com.isode.stroke.crypto.JavaCryptoProvider; +import com.isode.stroke.stringcodecs.Hexify; +import com.isode.stroke.base.ByteArray; + +public class ComponentHandshakeGenerator { + + public static String getHandshake(String streamID, String secret, CryptoProvider crypto) { + String concatenatedString = streamID + secret; + concatenatedString = concatenatedString.replaceAll("&", "&"); + concatenatedString = concatenatedString.replaceAll("<", "<"); + concatenatedString = concatenatedString.replaceAll(">", ">"); + concatenatedString = concatenatedString.replaceAll("\'", "'"); + concatenatedString = concatenatedString.replaceAll("\"", """); + return Hexify.hexify(crypto.getSHA1Hash(new ByteArray(concatenatedString))); + } +}
\ No newline at end of file diff --git a/src/com/isode/stroke/elements/ComponentHandshake.java b/src/com/isode/stroke/elements/ComponentHandshake.java new file mode 100644 index 0000000..f5ae830 --- /dev/null +++ b/src/com/isode/stroke/elements/ComponentHandshake.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2010-2014 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.elements; + +import com.isode.stroke.base.NotNull; +import com.isode.stroke.elements.TopLevelElement; + +public class ComponentHandshake implements TopLevelElement { + + private String data = ""; + + /** + * Default Constructor. + */ + public ComponentHandshake() { + this(""); + } + + /** + * Parameterized Constructor. + * @param data, Not Null. + */ + public ComponentHandshake(String data) { + NotNull.exceptIfNull(data, "data"); + this.data = data; + } + + /** + * @return data, NotNull. + */ + public String getData() { + return data; + } + + /** + * @param data, NotNull. + */ + public void setData(String data) { + NotNull.exceptIfNull(data, "data"); + this.data = data; + } +}
\ No newline at end of file diff --git a/src/com/isode/stroke/elements/TopLevelElement.java b/src/com/isode/stroke/elements/TopLevelElement.java new file mode 100644 index 0000000..4b7c0d8 --- /dev/null +++ b/src/com/isode/stroke/elements/TopLevelElement.java @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2010-2014 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.elements; + +import com.isode.stroke.elements.Element; + +public interface TopLevelElement extends Element { + +}
\ No newline at end of file diff --git a/src/com/isode/stroke/parser/ComponentHandshakeParser.java b/src/com/isode/stroke/parser/ComponentHandshakeParser.java new file mode 100644 index 0000000..153a62d --- /dev/null +++ b/src/com/isode/stroke/parser/ComponentHandshakeParser.java @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2010 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.parser; + +import com.isode.stroke.parser.GenericElementParser; +import com.isode.stroke.parser.AttributeMap; +import com.isode.stroke.elements.ComponentHandshake; +import com.isode.stroke.base.NotNull; + +public class ComponentHandshakeParser extends GenericElementParser<ComponentHandshake> { + + private int depth = 0; + private String text = ""; + + public ComponentHandshakeParser() { + super(ComponentHandshake.class); + } + + /** + * @param element. + * @param ns. + * @param attributes. + */ + public void handleStartElement(String element, String ns, AttributeMap attributes) { + ++depth; + } + + /** + * @param element. + * @param ns. + */ + public void handleEndElement(String element, String ns) { + --depth; + if (depth == 0) { + getElementGeneric().setData(text); + } + } + + /** + * @param text, NotNull. + */ + public void handleCharacterData(String text) { + NotNull.exceptIfNull(text, "text"); + this.text += text; + } +}
\ No newline at end of file diff --git a/src/com/isode/stroke/serializer/ComponentHandshakeSerializer.java b/src/com/isode/stroke/serializer/ComponentHandshakeSerializer.java new file mode 100644 index 0000000..a320941 --- /dev/null +++ b/src/com/isode/stroke/serializer/ComponentHandshakeSerializer.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2010-2014 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.serializer; + +import com.isode.stroke.serializer.GenericElementSerializer; +import com.isode.stroke.elements.ComponentHandshake; +import com.isode.stroke.elements.Element; + +public class ComponentHandshakeSerializer extends GenericElementSerializer<ComponentHandshake> { + + public ComponentHandshakeSerializer() { + super(ComponentHandshake.class); + } + + public String serialize(Element element) { + ComponentHandshake handshake = (ComponentHandshake)(element); + return ("<handshake>" + handshake.getData() + "</handshake>"); + } +}
\ No newline at end of file diff --git a/test/com/isode/stroke/component/ComponentHandshakeGeneratorTest.java b/test/com/isode/stroke/component/ComponentHandshakeGeneratorTest.java new file mode 100644 index 0000000..e5cdc84 --- /dev/null +++ b/test/com/isode/stroke/component/ComponentHandshakeGeneratorTest.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2010-2013 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +/* + * Copyright (c) 2015 Tarun Gupta. + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +package com.isode.stroke.component; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import org.junit.Test; +import org.junit.Before; +import com.isode.stroke.component.ComponentHandshakeGenerator; +import com.isode.stroke.crypto.JavaCryptoProvider; +import com.isode.stroke.crypto.CryptoProvider; + +public class ComponentHandshakeGeneratorTest { + + public ComponentHandshakeGeneratorTest() { + + } + + private CryptoProvider crypto; + + @Before + public void setUp() { + crypto = new JavaCryptoProvider(); + } + + @Test + public void testGetHandshake() { + String result = ComponentHandshakeGenerator.getHandshake("myid", "mysecret", crypto); + assertEquals("4011cd31f9b99ac089a0cd7ce297da7323fa2525", result); + } + + @Test + public void testGetHandshake_SpecialChars() { + String result = ComponentHandshakeGenerator.getHandshake("&<", ">'\"", crypto); + assertEquals("33631b3e0aaeb2a11c4994c917919324028873fe", result); + } +}
\ No newline at end of file |