mirror of
https://github.com/3lLobo/zkAuth.git
synced 2026-01-10 04:47:56 -05:00
Contract complete ⭕ not yet tested ❌
This commit is contained in:
3lLobo
@@ -3,97 +3,147 @@ pragma solidity ^0.8.9;
|
||||
|
||||
// Uncomment this line to use console.log
|
||||
// import "hardhat/console.sol";
|
||||
import "@openzeppelin/contracts/access/Ownable.sol";
|
||||
|
||||
import '@openzeppelin/contracts/access/Ownable.sol';
|
||||
|
||||
struct AuthData {
|
||||
// fist five digits of the 6-digit totp code tail-padded with a zero and finally parsed to a single number
|
||||
uint32 totp5;
|
||||
// Teh sha256 hash of the complete code parsed to a single number.
|
||||
uint256 totp6hash;
|
||||
// time-stamp of TOTP code creation.
|
||||
uint256 time;
|
||||
// fist five digits of the 6-digit totp code tail-padded with a zero and finally parsed to a single number
|
||||
uint256 totp5;
|
||||
// Teh sha256 hash of the complete code parsed to a single number.
|
||||
uint256 totp6hash;
|
||||
// time-stamp of TOTP code creation.
|
||||
uint256 time;
|
||||
}
|
||||
|
||||
struct AuthResponse {
|
||||
// Has it already been validated. Defaults to false
|
||||
bool isValidated;
|
||||
AuthData response;
|
||||
// Has it already been validated. Defaults to false
|
||||
bool isValidated;
|
||||
AuthData response;
|
||||
}
|
||||
|
||||
struct Authentication {
|
||||
bool isValid;
|
||||
uint256 time;
|
||||
address authenticatedAddress;
|
||||
bool isValid;
|
||||
uint256 time;
|
||||
address authenticatedAddress;
|
||||
}
|
||||
|
||||
contract TotpAuthenticator is Ownable {
|
||||
// Counter provides requestId and increments with each request
|
||||
uint256 requestCounter = 0;
|
||||
// Maps a requestId to the requestor/validator and to the auth requested address
|
||||
mapping(uint256 => address[2]) requests;
|
||||
// Maps a requestId to a address and its response.
|
||||
mapping(uint256 => mapping(address => AuthResponse)) responses;
|
||||
|
||||
// Counter provides requestId and increments with each request
|
||||
uint256 requestCounter;
|
||||
// Maps a requestId to the requestor/validator and to the auth requested address
|
||||
mapping(uint256 => address[2]) requests;
|
||||
// Maps a requestId to a address and its response.
|
||||
mapping(uint256 => mapping(address => AuthResponse)) responses;
|
||||
// // Maps a requestId to a list of address which have already responded (blocklist)
|
||||
// mapping(uint256 => address[]) blocklists;
|
||||
// Maps requestId to completes authentication
|
||||
mapping(uint256 => Authentication) completedAuth;
|
||||
|
||||
// Maps requestId to completes authentication
|
||||
mapping(uint256 => Authentication) completedAuth;
|
||||
// Events to index with theGraph in order to notify both parties
|
||||
event EventAuthRequest(address requestor, address target, uint256 requestId);
|
||||
event EventAuthResponse(
|
||||
address responder,
|
||||
uint256 requestId,
|
||||
AuthResponse response
|
||||
);
|
||||
event EventAuthValid(uint256 requestId, Authentication authentication);
|
||||
event EventResetContract(uint256 time);
|
||||
|
||||
// TODO: define Events
|
||||
// Create a request for a wallet to authenticate.
|
||||
function setRequest(address _target) public {
|
||||
uint256 memory _currentCount = reqestCounter;
|
||||
requests[_currentCount] = [msg.sender, _target];
|
||||
requestCounter++;
|
||||
|
||||
function setRequest(address _authAddress) public {
|
||||
// TODO: emit Event
|
||||
requests[requestCounter] = [msg.sender, _authAddress];
|
||||
requestCounter++;
|
||||
emit EventAuthRequest(msg.sender, _target, _currentCount);
|
||||
}
|
||||
|
||||
}
|
||||
// Submit a repsonse to an authentication request
|
||||
function setResponse(
|
||||
uint256 _requestId,
|
||||
uint256 _totp5,
|
||||
uint256 _totp5hash,
|
||||
uint256 _time
|
||||
) public {
|
||||
require(
|
||||
responses[_requestId][msg.sender] > 0,
|
||||
'Response already submitted'
|
||||
);
|
||||
|
||||
function setResponse(uint256 _requestId, AuthData calldata _authData)
|
||||
public
|
||||
{
|
||||
// TODO: get list of keys from response
|
||||
// loop over keys and check that the sender has not submitted a response to this request yet
|
||||
// or just override it:
|
||||
responses[_requestId][msg.sender] = _authData;
|
||||
|
||||
// TODO: emit Event
|
||||
AuthData _authData = AuthData(_totp5, _totp6hash, _time);
|
||||
responses[_requestId][msg.sender] = _authData;
|
||||
|
||||
}
|
||||
emit EventAuthResponse(msg.sender, _requestId, _authData);
|
||||
}
|
||||
|
||||
function getResponses(uint256 _requestId) public view returns (AuthData memory) {
|
||||
// Assert that caller created the AuthRequest
|
||||
require(isValidator(_requestId), "This address did not submit the request.");
|
||||
// Don't think it's allowed to return a mapping
|
||||
return responses[_requestId];
|
||||
}
|
||||
// The Requestor can get the repsonse data. Preferably though the event indexer graph
|
||||
function getResponses(uint256 _requestId, address _responder)
|
||||
public
|
||||
view
|
||||
returns (AuthData memory)
|
||||
{
|
||||
// Assert that caller created the AuthRequest
|
||||
require(isValidator(_requestId), 'U did not submit this request');
|
||||
// Don't think it's allowed to return a mapping
|
||||
return responses[_requestId][_responder];
|
||||
}
|
||||
|
||||
// @param _requestId the id of the request
|
||||
// @_responseAddress the address which submitted the valid response
|
||||
function authenticate(uint32 _lastDigit, address _responseAddress) public {
|
||||
// Assert that caller created the AuthRequest
|
||||
require(isValidator(_requestId), "This address did not submit the request.");
|
||||
// TODO:
|
||||
// multiply totp5 by 10 and add _lastDigit,
|
||||
// Cumpute sha256 hash and check agains stored hash
|
||||
// TODO: emit Event
|
||||
// @param _requestId the id of the request
|
||||
// @_responseAddress the address which submitted the valid response
|
||||
function authenticate(
|
||||
uint256 _resquestId,
|
||||
uint256 _lastDigit,
|
||||
address _responseAddress
|
||||
) public {
|
||||
// Assert that caller created the AuthRequest
|
||||
require(isValidator(_requestId), 'Validation only by requestor');
|
||||
|
||||
}
|
||||
AuthData memory _authData = responses[_responseId][_responseAddress];
|
||||
bool memory _isValid = checkHash(
|
||||
_authData.totp5,
|
||||
_lastDigit,
|
||||
_authData.totp6hash
|
||||
);
|
||||
require(_isValid, 'Onchain validation failed');
|
||||
|
||||
function getAuthentication(uint256 _requestId) public view returns (Authentication) {
|
||||
return completedAuth[_requestId];
|
||||
}
|
||||
Authentication memory authentication = Authentication(
|
||||
_isValid,
|
||||
block.timestamp,
|
||||
_responseAddress
|
||||
);
|
||||
completedAuth[_resquestId] = authentication;
|
||||
|
||||
function resetAuthenticator() public onlyOwner {
|
||||
// TODO: emit Event
|
||||
// TODO: delete everything
|
||||
}
|
||||
emit EventAuthValid(_requestId, authentication);
|
||||
}
|
||||
|
||||
function isValidator(uint256 _requestId) private returns (bool) {
|
||||
return msg.sender = requests[_requestId][0];
|
||||
}
|
||||
// Returns the authentication details for a completed requestId
|
||||
function getAuthentication(uint256 _requestId)
|
||||
public
|
||||
view
|
||||
returns (Authentication)
|
||||
{
|
||||
return completedAuth[_requestId];
|
||||
}
|
||||
|
||||
function checkHash(uint32 _totp5, uint32 _lastDigit, ) private returns (bool) {
|
||||
// TODO: the hashing check
|
||||
// What type is sha256
|
||||
}
|
||||
// Reset the contract by deleting all data
|
||||
function resetAuthenticator() public onlyOwner {
|
||||
// TODO: delete everything
|
||||
// How do we empty the mappings?
|
||||
emit EventResetContract(block.timestamp);
|
||||
}
|
||||
|
||||
// Check if the sender also submitted the request
|
||||
function isValidator(uint256 _requestId) private returns (bool) {
|
||||
return msg.sender = requests[_requestId][0];
|
||||
}
|
||||
|
||||
// Multiply the 5 didgit response by 10 (smiliar to padding with zero) and add the 6st digit. Then compare the hashes.
|
||||
function checkHash(
|
||||
uint256 _totp5,
|
||||
uint256 _lastDigit,
|
||||
uint256 _totp6hash
|
||||
) private returns (bool) {
|
||||
uint256 memory _totp6 = _totp5 * 10 + _lastDigit;
|
||||
// Not sure if this returns a bool?
|
||||
return sha256(_totp6) == _totp6hash;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user