add keepass csv export; improve hotp

- export to dedicated totp and hotp csv files for KeePass
- show Typ as totp/hotp instead of OTP_TOTP/OTP_HOTP
  (BREAKING CHANGE in csv, json and stdout, qr codes or urls are not affected)
- add hotp example
- add hotp tests
- export counter for hotp to csv and json files
- add section on KeePass to README
- increase protobuf to 4.21.10
- show file names of exported csv or json files

test_extract_otp_secret_keys_pytest.py

@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from utils import read_csv, read_json, remove_file, remove_dir_with_files, read_file_to_str
+from utils import read_csv, read_json, remove_files, remove_dir_with_files, read_file_to_str, file_exits
 from os import path
 from pytest import raises
 
@@ -47,6 +47,58 @@ def test_extract_csv(capsys):
     cleanup()
 
 
+def test_keepass_csv(capsys):
+    '''Two csv files .totp and .htop are generated.'''
+    # Arrange
+    cleanup()
+
+    # Act
+    extract_otp_secret_keys.main(['-q', '-k', 'test_example_keepass_output.csv', 'example_export.txt'])
+
+    # Assert
+    expected_totp_csv = read_csv('example_keepass_output.totp.csv')
+    expected_hotp_csv = read_csv('example_keepass_output.hotp.csv')
+    actual_totp_csv = read_csv('test_example_keepass_output.totp.csv')
+    actual_hotp_csv = read_csv('test_example_keepass_output.hotp.csv')
+
+    assert actual_totp_csv == expected_totp_csv
+    assert actual_hotp_csv == expected_hotp_csv
+    assert not file_exits('test_example_keepass_output.csv')
+
+    captured = capsys.readouterr()
+
+    assert captured.out == ''
+    assert captured.err == ''
+
+    # Clean up
+    cleanup()
+
+
+def test_single_keepass_csv(capsys):
+    '''Does not add .totp or .hotp pre-suffix'''
+    # Arrange
+    cleanup()
+
+    # Act
+    extract_otp_secret_keys.main(['-q', '-k', 'test_example_keepass_output.csv', 'test/example_export_only_totp.txt'])
+
+    # Assert
+    expected_totp_csv = read_csv('example_keepass_output.totp.csv')
+    actual_totp_csv = read_csv('test_example_keepass_output.csv')
+
+    assert actual_totp_csv == expected_totp_csv
+    assert not file_exits('test_example_keepass_output.totp.csv')
+    assert not file_exits('test_example_keepass_output.hotp.csv')
+
+    captured = capsys.readouterr()
+
+    assert captured.out == ''
+    assert captured.err == ''
+
+    # Clean up
+    cleanup()
+
+
 def test_extract_json(capsys):
     # Arrange
     cleanup()
@@ -76,23 +128,28 @@ def test_extract_stdout(capsys):
     # Assert
     captured = capsys.readouterr()
 
-    expected_stdout = '''Name:   pi@raspberrypi
-Secret: 7KSQL2JTUDIS5EF65KLMRQIIGY
-Issuer: raspberrypi
-Type:   OTP_TOTP
+    expected_stdout = '''Name:    pi@raspberrypi
+Secret:  7KSQL2JTUDIS5EF65KLMRQIIGY
+Issuer:  raspberrypi
+Type:    totp
 
-Name:   pi@raspberrypi
-Secret: 7KSQL2JTUDIS5EF65KLMRQIIGY
-Type:   OTP_TOTP
+Name:    pi@raspberrypi
+Secret:  7KSQL2JTUDIS5EF65KLMRQIIGY
+Type:    totp
 
-Name:   pi@raspberrypi
-Secret: 7KSQL2JTUDIS5EF65KLMRQIIGY
-Type:   OTP_TOTP
+Name:    pi@raspberrypi
+Secret:  7KSQL2JTUDIS5EF65KLMRQIIGY
+Type:    totp
 
-Name:   pi@raspberrypi
-Secret: 7KSQL2JTUDIS5EF65KLMRQIIGY
-Issuer: raspberrypi
-Type:   OTP_TOTP
+Name:    pi@raspberrypi
+Secret:  7KSQL2JTUDIS5EF65KLMRQIIGY
+Issuer:  raspberrypi
+Type:    totp
+
+Name:    hotp demo
+Secret:  7KSQL2JTUDIS5EF65KLMRQIIGY
+Type:    hotp
+Counter: 4
 
 '''
 
@@ -107,25 +164,25 @@ def test_extract_not_encoded_plus(capsys):
     # Assert
     captured = capsys.readouterr()
 
-    expected_stdout = '''Name:   SerenityLabs:test1@serenitylabs.co.uk
-Secret: A4RFDYMF4GSLUIBQV4ZP67OJEZ2XUQVM
-Issuer: SerenityLabs
-Type:   OTP_TOTP
+    expected_stdout = '''Name:    SerenityLabs:test1@serenitylabs.co.uk
+Secret:  A4RFDYMF4GSLUIBQV4ZP67OJEZ2XUQVM
+Issuer:  SerenityLabs
+Type:    totp
 
-Name:   SerenityLabs:test2@serenitylabs.co.uk
-Secret: SCDDZ7PW5MOZLE3PQCAZM7L4S35K3UDX
-Issuer: SerenityLabs
-Type:   OTP_TOTP
+Name:    SerenityLabs:test2@serenitylabs.co.uk
+Secret:  SCDDZ7PW5MOZLE3PQCAZM7L4S35K3UDX
+Issuer:  SerenityLabs
+Type:    totp
 
-Name:   SerenityLabs:test3@serenitylabs.co.uk
-Secret: TR76272RVYO6EAEY2FX7W7R7KUDEGPJ4
-Issuer: SerenityLabs
-Type:   OTP_TOTP
+Name:    SerenityLabs:test3@serenitylabs.co.uk
+Secret:  TR76272RVYO6EAEY2FX7W7R7KUDEGPJ4
+Issuer:  SerenityLabs
+Type:    totp
 
-Name:   SerenityLabs:test4@serenitylabs.co.uk
-Secret: N2ILWSXSJUQUB7S6NONPJSC62NPG7EXN
-Issuer: SerenityLabs
-Type:   OTP_TOTP
+Name:    SerenityLabs:test4@serenitylabs.co.uk
+Secret:  N2ILWSXSJUQUB7S6NONPJSC62NPG7EXN
+Issuer:  SerenityLabs
+Type:    totp
 
 '''
 
@@ -209,6 +266,7 @@ def test_extract_help(capsys):
     assert pytest_wrapped_e.type == SystemExit
     assert pytest_wrapped_e.value.code == 0
 
+
 def test_verbose_and_quiet(capsys):
     with raises(SystemExit) as pytest_wrapped_e:
         # Act
@@ -220,7 +278,14 @@ def test_verbose_and_quiet(capsys):
     assert len(captured.out) > 0
     assert 'The arguments --verbose and --quiet are mutually exclusive.' in captured.out
 
+
+def test_add_pre_suffix(capsys):
+    assert extract_otp_secret_keys.add_pre_suffix("name.csv", "totp") == "name.totp.csv"
+    assert extract_otp_secret_keys.add_pre_suffix("name.csv", "") == "name..csv"
+    assert extract_otp_secret_keys.add_pre_suffix("name", "totp") == "name.totp"
+
+
 def cleanup():
-    remove_file('test_example_output.csv')
-    remove_file('test_example_output.json')
+    remove_files('test_example_*.csv')
+    remove_files('test_example_*.json')
     remove_dir_with_files('testout/')