summaryrefslogtreecommitdiff
path: root/tests/otp.rs
diff options
context:
space:
mode:
Diffstat (limited to 'tests/otp.rs')
-rw-r--r--tests/otp.rs62
1 files changed, 28 insertions, 34 deletions
diff --git a/tests/otp.rs b/tests/otp.rs
index d55d54a..c0bbecf 100644
--- a/tests/otp.rs
+++ b/tests/otp.rs
@@ -3,6 +3,7 @@
mod util;
+use std::fmt::Debug;
use std::ops::DerefMut;
use nitrokey::{
@@ -35,9 +36,10 @@ enum TotpTimestampSize {
U64,
}
-fn make_admin_test_device<'a, T>(device: &'a mut T) -> Admin<'a, T>
+fn make_admin_test_device<T>(device: T) -> Admin<T>
where
T: Device,
+ (T, nitrokey::Error): Debug,
{
unwrap_ok!(device.authenticate_admin(DEFAULT_ADMIN_PIN))
}
@@ -66,8 +68,7 @@ fn set_time(device: DeviceWrapper) {
#[test_device]
fn hotp_no_pin(device: DeviceWrapper) {
- let mut device = device;
- let mut admin = make_admin_test_device(&mut device);
+ let mut admin = make_admin_test_device(device);
let config = Config::new(None, None, None, false);
assert_ok!((), admin.write_config(config));
@@ -78,38 +79,36 @@ fn hotp_no_pin(device: DeviceWrapper) {
check_hotp_codes(admin.deref_mut(), 5);
configure_hotp(&mut admin, 0);
- check_hotp_codes(&mut device, 0);
+ check_hotp_codes(&mut admin.device(), 0);
}
#[test_device]
fn hotp_pin(device: DeviceWrapper) {
- let mut device = device;
- let mut admin = make_admin_test_device(&mut device);
+ let mut admin = make_admin_test_device(device);
let config = Config::new(None, None, None, true);
assert_ok!((), admin.write_config(config));
configure_hotp(&mut admin, 0);
- let mut user = unwrap_ok!(device.authenticate_user(DEFAULT_USER_PIN));
+ let mut user = unwrap_ok!(admin.device().authenticate_user(DEFAULT_USER_PIN));
check_hotp_codes(&mut user, 0);
- assert_cmd_err!(CommandError::NotAuthorized, user.get_hotp_code(1));
+ assert_cmd_err!(CommandError::NotAuthorized, user.device().get_hotp_code(1));
}
#[test_device]
fn hotp_slot_name(device: DeviceWrapper) {
- let mut device = device;
- let mut admin = make_admin_test_device(&mut device);
+ let mut admin = make_admin_test_device(device);
let slot_data = OtpSlotData::new(1, "test-hotp", HOTP_SECRET, OtpMode::SixDigits);
assert_ok!((), admin.write_hotp_slot(slot_data, 0));
+ let device = admin.device();
assert_ok!("test-hotp".to_string(), device.get_hotp_slot_name(1));
assert_lib_err!(LibraryError::InvalidSlot, device.get_hotp_slot_name(4));
}
#[test_device]
fn hotp_error(device: DeviceWrapper) {
- let mut device = device;
- let mut admin = make_admin_test_device(&mut device);
+ let mut admin = make_admin_test_device(device);
let slot_data = OtpSlotData::new(1, "", HOTP_SECRET, OtpMode::SixDigits);
assert_cmd_err!(CommandError::NoName, admin.write_hotp_slot(slot_data, 0));
let slot_data = OtpSlotData::new(4, "test", HOTP_SECRET, OtpMode::SixDigits);
@@ -128,8 +127,7 @@ fn hotp_error(device: DeviceWrapper) {
#[test_device]
fn hotp_erase(device: DeviceWrapper) {
- let mut device = device;
- let mut admin = make_admin_test_device(&mut device);
+ let mut admin = make_admin_test_device(device);
let config = Config::new(None, None, None, false);
assert_ok!((), admin.write_config(config));
let slot_data = OtpSlotData::new(1, "test1", HOTP_SECRET, OtpMode::SixDigits);
@@ -139,6 +137,7 @@ fn hotp_erase(device: DeviceWrapper) {
assert_ok!((), admin.erase_hotp_slot(1));
+ let mut device = admin.device();
let result = device.get_hotp_slot_name(1);
assert_cmd_err!(CommandError::SlotNotProgrammed, result);
let result = device.get_hotp_code(1);
@@ -175,8 +174,7 @@ fn check_totp_codes(device: &mut GenerateOtp, factor: u64, timestamp_size: TotpT
#[test_device]
fn totp_no_pin(device: DeviceWrapper) {
- let mut device = device;
- let mut admin = make_admin_test_device(&mut device);
+ let mut admin = make_admin_test_device(device);
let config = Config::new(None, None, None, false);
assert_ok!((), admin.write_config(config));
@@ -187,15 +185,14 @@ fn totp_no_pin(device: DeviceWrapper) {
check_totp_codes(admin.deref_mut(), 2, TotpTimestampSize::U32);
configure_totp(&mut admin, 1);
- check_totp_codes(&mut device, 1, TotpTimestampSize::U32);
+ check_totp_codes(&mut admin.device(), 1, TotpTimestampSize::U32);
}
#[test_device]
// Nitrokey Storage does only support timestamps that fit in a 32-bit
// unsigned integer, so don't test with it.
fn totp_no_pin_64(device: Pro) {
- let mut device = device;
- let mut admin = make_admin_test_device(&mut device);
+ let mut admin = make_admin_test_device(device);
let config = Config::new(None, None, None, false);
assert_ok!((), admin.write_config(config));
@@ -206,45 +203,43 @@ fn totp_no_pin_64(device: Pro) {
check_totp_codes(admin.deref_mut(), 2, TotpTimestampSize::U64);
configure_totp(&mut admin, 1);
- check_totp_codes(&mut device, 1, TotpTimestampSize::U64);
+ check_totp_codes(&mut admin.device(), 1, TotpTimestampSize::U64);
}
#[test_device]
fn totp_pin(device: DeviceWrapper) {
- let mut device = device;
- let mut admin = make_admin_test_device(&mut device);
+ let mut admin = make_admin_test_device(device);
let config = Config::new(None, None, None, true);
assert_ok!((), admin.write_config(config));
configure_totp(&mut admin, 1);
- let mut user = unwrap_ok!(device.authenticate_user(DEFAULT_USER_PIN));
+ let mut user = unwrap_ok!(admin.device().authenticate_user(DEFAULT_USER_PIN));
check_totp_codes(&mut user, 1, TotpTimestampSize::U32);
- assert_cmd_err!(CommandError::NotAuthorized, user.get_totp_code(1));
+ assert_cmd_err!(CommandError::NotAuthorized, user.device().get_totp_code(1));
}
#[test_device]
// See comment for totp_no_pin_64.
fn totp_pin_64(device: Pro) {
- let mut device = device;
- let mut admin = make_admin_test_device(&mut device);
+ let mut admin = make_admin_test_device(device);
let config = Config::new(None, None, None, true);
assert_ok!((), admin.write_config(config));
configure_totp(&mut admin, 1);
- let mut user = unwrap_ok!(admin.authenticate_user(DEFAULT_USER_PIN));
+ let mut user = unwrap_ok!(admin.device().authenticate_user(DEFAULT_USER_PIN));
check_totp_codes(&mut user, 1, TotpTimestampSize::U64);
- assert_cmd_err!(CommandError::NotAuthorized, device.get_totp_code(1));
+ assert_cmd_err!(CommandError::NotAuthorized, user.device().get_totp_code(1));
}
#[test_device]
fn totp_slot_name(device: DeviceWrapper) {
- let mut device = device;
- let mut admin = make_admin_test_device(&mut device);
+ let mut admin = make_admin_test_device(device);
let slot_data = OtpSlotData::new(1, "test-totp", TOTP_SECRET, OtpMode::EightDigits);
assert_ok!((), admin.write_totp_slot(slot_data, 0));
+ let device = admin.device();
let result = device.get_totp_slot_name(1);
assert_ok!("test-totp", result);
let result = device.get_totp_slot_name(16);
@@ -253,8 +248,7 @@ fn totp_slot_name(device: DeviceWrapper) {
#[test_device]
fn totp_error(device: DeviceWrapper) {
- let mut device = device;
- let mut admin = make_admin_test_device(&mut device);
+ let mut admin = make_admin_test_device(device);
let slot_data = OtpSlotData::new(1, "", TOTP_SECRET, OtpMode::SixDigits);
assert_cmd_err!(CommandError::NoName, admin.write_totp_slot(slot_data, 0));
let slot_data = OtpSlotData::new(20, "test", TOTP_SECRET, OtpMode::SixDigits);
@@ -273,8 +267,7 @@ fn totp_error(device: DeviceWrapper) {
#[test_device]
fn totp_erase(device: DeviceWrapper) {
- let mut device = device;
- let mut admin = make_admin_test_device(&mut device);
+ let mut admin = make_admin_test_device(device);
let config = Config::new(None, None, None, false);
assert_ok!((), admin.write_config(config));
let slot_data = OtpSlotData::new(1, "test1", TOTP_SECRET, OtpMode::SixDigits);
@@ -284,6 +277,7 @@ fn totp_erase(device: DeviceWrapper) {
assert_ok!((), admin.erase_totp_slot(1));
+ let device = admin.device();
let result = device.get_totp_slot_name(1);
assert_cmd_err!(CommandError::SlotNotProgrammed, result);
let result = device.get_totp_code(1);
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-09 09:03:09 +0000