3 files changed, 173 insertions, 10 deletions

diff --git a/tests/test_generator.py b/tests/test_generator.py
index 74fc3a4..50274e2 100644
--- a/tests/test_generator.py
+++ b/tests/test_generator.py
@@ -62,16 +62,6 @@ def test_constructor_exceptions():
     """
     # test the otp2289.OTPGenerator __init__ and validators
     with pytest.raises(otp2289.OTPGeneratorException) as exc_info:
-        otp2289.OTPGenerator('1234567', 'TeStø'.encode(), otp2289.OTP_ALGO_MD5)
-    assert exc_info.type is otp2289.OTPGeneratorException
-    assert exc_info.value.args[0] == 'Password must be a byte-string'
-    with pytest.raises(otp2289.OTPGeneratorException) as exc_info:
-        otp2289.OTPGenerator('1234567'.encode(),
-                             'TeStø'.encode(),
-                             otp2289.OTP_ALGO_MD5)
-    assert exc_info.type is otp2289.OTPGeneratorException
-    assert exc_info.value.args[0] == 'Password must be longer than 10 bytes'
-    with pytest.raises(otp2289.OTPGeneratorException) as exc_info:
         otp2289.OTPGenerator('This is a test.'.encode(),
                              'TeStø'.encode(),
                              otp2289.OTP_ALGO_MD5)
@@ -108,6 +98,16 @@ def test_constructor_exceptions():
     assert exc_info.type is otp2289.generator.OTPGeneratorException
     assert exc_info.value.args[0] == ('foo is not supported by this version '
                                       'of the hashlib module')
+    with pytest.raises(otp2289.OTPGeneratorException) as exc_info:
+        otp2289.OTPGenerator('1234567', 'TeSt', otp2289.OTP_ALGO_MD5)
+    assert exc_info.type is otp2289.OTPGeneratorException
+    assert exc_info.value.args[0] == 'Password must be a byte-string'
+    with pytest.raises(otp2289.OTPGeneratorException) as exc_info:
+        otp2289.OTPGenerator('1234567'.encode(),
+                             'TeSt',
+                             otp2289.OTP_ALGO_MD5)
+    assert exc_info.type is otp2289.OTPGeneratorException
+    assert exc_info.value.args[0] == 'Password must be longer than 10 bytes'
 
 
 def test_md5():
diff --git a/tests/test_server.py b/tests/test_server.py
new file mode 100644
index 0000000..c7cdb12
--- /dev/null
+++ b/tests/test_server.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2020, Simeon Simeonov
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""Tests for otp2289.server"""
+import pytest
+
+import otp2289
+
+
+def test_state_caller_exceptions():
+    """Tests the exceptions when calling the OTPState objects"""
+    state = otp2289.OTPState('0x7965e05436f5029f',
+                             1,
+                             'TeSt',
+                             otp2289.OTP_ALGO_MD5)
+    with pytest.raises(otp2289.OTPInvalidResponse) as exc_info:
+        state.response_validates('bla')
+    assert exc_info.type is otp2289.OTPInvalidResponse
+    assert exc_info.value.args[0] == (
+        'The response is neither a valid token or hex')
+
+
+def test_state_constructor_exceptions():
+    """Tests the exceptions when initializing new OTPState objects"""
+    with pytest.raises(otp2289.OTPStateException) as exc_info:
+        otp2289.OTPState('0x7965e05436f5029t',
+                         1,
+                         'TeStø'.encode(),
+                         otp2289.OTP_ALGO_MD5)
+    assert exc_info.type is otp2289.OTPStateException
+    assert exc_info.value.args[0] == 'Seed must be a string'
+    with pytest.raises(otp2289.OTPStateException) as exc_info:
+        otp2289.OTPState('0x7965e05436f5029t',
+                         '1',
+                         'TeSt',
+                         otp2289.OTP_ALGO_MD5)
+    assert exc_info.type is otp2289.OTPStateException
+    assert exc_info.value.args[0] == 'Step value MUST be an int'
+
+
+def test_state_validation_md5():
+    """Tests the OTPState validation functionality for MD5"""
+    state = otp2289.OTPState('0x7965e05436f5029f',
+                             1,
+                             'TeSt',
+                             otp2289.OTP_ALGO_MD5)
+    assert state.validated is False
+    assert state.response_validates('0x9e876134d90499dd') is True
+    assert state.response_validates('INCH SEA ANNE LONG AHEM TOUR') is True
+    assert state.validated is True
+
+
+def test_state_validation_sha1():
+    """Tests the OTPState validation functionality for SHA1"""
+    state = otp2289.OTPState('0x63d936639734385b',
+                             1,
+                             'TeSt',
+                             otp2289.OTP_ALGO_SHA1)
+    assert state.validated is False
+    assert state.response_validates('0xbb9e6ae1979d8ff4') is True
+    assert state.response_validates('MILT VARY MAST OK SEES WENT') is True
+    assert state.validated is True
diff --git a/tests/test_static.py b/tests/test_static.py
new file mode 100644
index 0000000..dc6e2d7
--- /dev/null
+++ b/tests/test_static.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2020, Simeon Simeonov
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""Tests for the static methods and basic bit, byte, token functionality"""
+import binascii
+import os
+
+import otp2289
+
+
+def test_bytes_and_tokens():
+    """Tests the official hex and tokens defined in RFC2289"""
+    assert binascii.unhexlify('9e876134d90499dd') == (
+        otp2289.OTPGenerator.tokens_to_bytes('INCH SEA ANNE LONG AHEM TOUR'))
+    assert binascii.unhexlify('7965e05436f5029f') == (
+        otp2289.OTPGenerator.tokens_to_bytes('EASE OIL FUM CURE AWRY AVIS'))
+    assert binascii.unhexlify('50fe1962c4965880') == (
+        otp2289.OTPGenerator.tokens_to_bytes('BAIL TUFT BITS GANG CHEF THY'))
+    assert binascii.unhexlify('87066dd9644bf206') == (
+        otp2289.OTPGenerator.tokens_to_bytes('FULL PEW DOWN ONCE MORT ARC'))
+    assert binascii.unhexlify('7cd34c1040add14b') == (
+        otp2289.OTPGenerator.tokens_to_bytes('FACT HOOF AT FIST SITE KENT'))
+    assert binascii.unhexlify('5aa37a81f212146c') == (
+        otp2289.OTPGenerator.tokens_to_bytes('BODE HOP JAKE STOW JUT RAP'))
+    assert binascii.unhexlify('f205753943de4cf9') == (
+        otp2289.OTPGenerator.tokens_to_bytes('ULAN NEW ARMY FUSE SUIT EYED'))
+    assert binascii.unhexlify('ddcdac956f234937') == (
+        otp2289.OTPGenerator.tokens_to_bytes('SKIM CULT LOB SLAM POE HOWL'))
+    assert binascii.unhexlify('b203e28fa525be47') == (
+        otp2289.OTPGenerator.tokens_to_bytes('LONG IVY JULY AJAR BOND LEE'))
+
+    assert binascii.unhexlify('bb9e6ae1979d8ff4') == (
+        otp2289.OTPGenerator.tokens_to_bytes('MILT VARY MAST OK SEES WENT'))
+    assert binascii.unhexlify('63d936639734385b') == (
+        otp2289.OTPGenerator.tokens_to_bytes('CART OTTO HIVE ODE VAT NUT'))
+    assert binascii.unhexlify('87fec7768b73ccf9') == (
+        otp2289.OTPGenerator.tokens_to_bytes('GAFF WAIT SKID GIG SKY EYED'))
+    assert binascii.unhexlify('ad85f658ebe383c9') == (
+        otp2289.OTPGenerator.tokens_to_bytes('LEST OR HEEL SCOT ROB SUIT'))
+    assert binascii.unhexlify('d07ce229b5cf119b') == (
+        otp2289.OTPGenerator.tokens_to_bytes('RITE TAKE GELD COST TUNE RECK'))
+    assert binascii.unhexlify('27bc71035aaf3dc6') == (
+        otp2289.OTPGenerator.tokens_to_bytes('MAY STAR TIN LYON VEDA STAN'))
+    assert binascii.unhexlify('d51f3e99bf8e6f0b') == (
+        otp2289.OTPGenerator.tokens_to_bytes('RUST WELT KICK FELL TAIL FRAU'))
+    assert binascii.unhexlify('82aeb52d943774e4') == (
+        otp2289.OTPGenerator.tokens_to_bytes('FLIT DOSE ALSO MEW DRUM DEFY'))
+    assert binascii.unhexlify('4f296a74fe1567ec') == (
+        otp2289.OTPGenerator.tokens_to_bytes('AURA ALOE HURL WING BERG WAIT'))
+
+
+def test_random_bytes():
+    """Implement a few tests with random bytes"""
+    for _ in range(10):
+        rnd_bytes = os.urandom(8)  # 64 bits
+        tokens = otp2289.OTPGenerator.bytes_to_tokens(rnd_bytes)
+        assert rnd_bytes == otp2289.OTPGenerator.tokens_to_bytes(tokens)