Skip to content

Allow setting the password in the device's flash only. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
st19311 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow setting the password in the device's flash only. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 63 additions & 48 deletions src/AccessControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1722,67 +1722,82 @@ void AccessControl::handleFunctionPropertySetFingerPassword(uint8_t *data, uint8
newPasswordCrc = crc32.crc32((uint8_t *)newPassword, 16);
logDebugP("newPassword: %s (crc: %u)", newPassword, newPasswordCrc);

// change password
uint32_t oldPasswordCrc = 0;
if (passwordOption == 2)
if (passwordOption == 3)
{
char oldPassword[16] = {};
for (uint8_t i = 0; i < 16; i++)
{
dataOffset++;
memcpy(oldPassword + i, data + dataOffset, 1);
logDebugP("Saving new password directly to flash.");
_fingerprintStorage.writeInt(FLASH_FINGER_SCANNER_PASSWORD_OFFSET, newPasswordCrc);
_fingerprintStorage.commit();

if (oldPassword[i] == 0) // null termination
break;
}
finger->close();
initFingerprintScanner();
finger->start();

if (oldPassword[0] != 48 || // = "0": if user inputs only "0", we just use it as is without CRC
oldPassword[1] != 0) // null termination
oldPasswordCrc = crc32.crc32((uint8_t *)oldPassword, 16);
logDebugP("oldPassword: %s (crc: %u)", oldPassword, oldPasswordCrc);
resultData[0] = 0;
}
else
{
// change password
uint32_t oldPasswordCrc = 0;
if (passwordOption == 2)
{
char oldPassword[16] = {};
for (uint8_t i = 0; i < 16; i++)
{
dataOffset++;
memcpy(oldPassword + i, data + dataOffset, 1);

uint32_t currentCrc = _fingerprintStorage.readInt(FLASH_FINGER_SCANNER_PASSWORD_OFFSET);
logDebugP("currentCrc: %u", currentCrc);
if (oldPassword[i] == 0) // null termination
break;
}

bool success = false;
if (currentCrc == oldPasswordCrc)
{
logDebugP("Current matches old CRC.");
logIndentUp();
if (oldPassword[0] != 48 || // = "0": if user inputs only "0", we just use it as is without CRC
oldPassword[1] != 0) // null termination
oldPasswordCrc = crc32.crc32((uint8_t *)oldPassword, 16);
logDebugP("oldPassword: %s (crc: %u)", oldPassword, oldPasswordCrc);
}

logInfoP("Setting new fingerprint scanner password.");
logIndentUp();
uint32_t currentCrc = _fingerprintStorage.readInt(FLASH_FINGER_SCANNER_PASSWORD_OFFSET);
logDebugP("currentCrc: %u", currentCrc);

if (switchFingerprintPower(true))
success = finger->setPassword(newPasswordCrc);

resetFingerLedTimer = delayTimerInit();
logInfoP(success ? "Success." : "Failed.");
logIndentDown();

if (success)
bool success = false;
if (currentCrc == oldPasswordCrc)
{
logDebugP("Saving new password in flash.");
_fingerprintStorage.writeInt(FLASH_FINGER_SCANNER_PASSWORD_OFFSET, newPasswordCrc);
_fingerprintStorage.commit();
logDebugP("Current matches old CRC.");
logIndentUp();

finger->close();
initFingerprintScanner();
finger->start();
}
logInfoP("Setting new fingerprint scanner password.");
logIndentUp();

resetFingerLedTimer = delayTimerInit();
logIndentDown();
if (switchFingerprintPower(true))
success = finger->setPassword(newPasswordCrc);

resetFingerLedTimer = delayTimerInit();
logInfoP(success ? "Success." : "Failed.");
logIndentDown();

if (success)
{
logDebugP("Saving new password in flash.");
_fingerprintStorage.writeInt(FLASH_FINGER_SCANNER_PASSWORD_OFFSET, newPasswordCrc);
_fingerprintStorage.commit();

resultData[0] = success ? 0 : 2;
}
else
{
logDebugP("Invalid old password provided.");
resultData[0] = 1;
finger->close();
initFingerprintScanner();
finger->start();
}

resetFingerLedTimer = delayTimerInit();
logIndentDown();

resultData[0] = success ? 0 : 2;
}
else
{
logDebugP("Invalid old password provided.");
resultData[0] = 1;
}
}

resultLength = 1;
logIndentDown();
}
Expand Down
4 changes: 2 additions & 2 deletions src/AccessControl.script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ function ACC_setFingerPassword(device, online, progress, context) {
var parPasswordNew = device.getParameterByName("ACC_PasswordNew");
var parPasswordOld = device.getParameterByName("ACC_PasswordOld");

progress.setText("Fingerprint: " + parPasswordOption.value == 1 ? "Passwort festsetzen..." : "Passwort ändern...");
progress.setText("Fingerprint: " + (parPasswordOption.value == 1 || parPasswordOption.value == 3) ? "Passwort festsetzen..." : "Passwort ändern...");
online.connect();

var data = [21]; // internal function ID
Expand Down Expand Up @@ -537,7 +537,7 @@ function ACC_setFingerPassword(device, online, progress, context) {
parPasswordAlreadySet.value = parPasswordNew.value == "0" ? 0 : 1;

online.disconnect();
progress.setText("Fingerprint: " + parPasswordOption.value == 1 ? "Passwort festgesetzt." : "Passwort geändert.");
progress.setText("Fingerprint: " + (parPasswordOption.value == 1 || parPasswordOption.value == 3) ? "Passwort festgesetzt." : "Passwort geändert.");
}

function ACC_checkNfcAction(device, online, progress, context) {
Expand Down
5 changes: 5 additions & 0 deletions src/AccessControl.share.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<Enumeration Text="Deaktiviert" Value="0" Id="%ENID%" />
<Enumeration Text="Erstmalig festsetzen" Value="1" Id="%ENID%" />
<Enumeration Text="Passwort ändern" Value="2" Id="%ENID%" />
<Enumeration Text="Passwort von existierendem Gerät eingeben" Value="3" Id="%ENID%" />
</TypeRestriction>
</ParameterType>
<ParameterType Id="%AID%_PT-Text15Byte" Name="Text15Byte">
Expand Down Expand Up @@ -573,6 +574,10 @@
<ParameterRefRef RefId="%AID%_P-%T%000021_R-%T%00002101" IndentLevel="1" HelpContext="%DOC%" />
<Button Id="%AID%_B-%T%00006" Text="Jetzt Passwort ändern" Name="setPassword" EventHandler="ACC_setFingerPassword" EventHandlerOnline="ConnectionOriented" />
</when>
<when test="3">
<ParameterRefRef RefId="%AID%_P-%T%000021_R-%T%00002101" IndentLevel="1" HelpContext="%DOC%" />
<Button Id="%AID%_B-%T%00005" Text="Passwort speichern" Name="setPassword" EventHandler="ACC_setFingerPassword" EventHandlerOnline="ConnectionOriented" />
</when>
</choose>
<ParameterRefRef RefId="%AID%_P-%T%000015_R-%T%00001501" IndentLevel="1" HelpContext="%DOC%" />
<choose ParamRefId="%AID%_P-%T%000015_R-%T%00001501">
Expand Down