grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #834 from ethcore/unlock-pass

Browse Source 
unlocks with no expiration [on top of 833]
This commit is contained in:
Gav Wood 2016-03-27 11:53:06 +02:00
commit f608db3a68
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parity/main.rs
View File

@ -508,13 +508,13 @@ impl Configuration {
.collect::<Vec<_>>() .collect::<Vec<_>>()
.into_iter() .into_iter()
}).collect::<Vec<_>>(); }).collect::<Vec<_>>();
let account_service = AccountService::new(); let account_service = AccountService::new();
for d in &self.args.flag_unlock { for d in &self.args.flag_unlock {
let a = Address::from_str(clean_0x(&d)).unwrap_or_else(|_| { let a = Address::from_str(clean_0x(&d)).unwrap_or_else(|_| {
die!("{}: Invalid address for --unlock. Must be 40 hex characters, without the 0x at the beginning.", d) die!("{}: Invalid address for --unlock. Must be 40 hex characters, without the 0x at the beginning.", d)
}); });
if passwords.iter().find(|p| account_service.unlock_account(&a, p).is_ok()).is_none() { if passwords.iter().find(|p| account_service.unlock_account_no_expire(&a, p).is_ok()).is_none() {
die!("No password given to unlock account {}. Pass the password using `--password`.", a); die!("No password given to unlock account {}. Pass the password using `--password`.", a);
} }
} }

25
util/src/keys/store.rs
View File

@ -75,7 +75,8 @@ pub struct SecretStore {
struct AccountUnlock { struct AccountUnlock {
secret: H256, secret: H256,
expires: DateTime<UTC>, /// expiration datetime (None - never)
expires: Option<DateTime<UTC>>,
} }
/// Basic account management trait /// Basic account management trait
@ -148,6 +149,11 @@ impl AccountService {
pub fn tick(&self) { pub fn tick(&self) {
self.secret_store.write().unwrap().collect_garbage(); self.secret_store.write().unwrap().collect_garbage();
} }
/// Unlocks account for use (no expiration of unlock)
pub fn unlock_account_no_expire(&self, account: &Address, pass: &str) -> Result<(), EncryptedHashMapError> {
self.secret_store.write().unwrap().unlock_account_with_expiration(account, pass, None)
}
} }
@ -226,14 +232,23 @@ impl SecretStore {
/// Unlocks account for use /// Unlocks account for use
pub fn unlock_account(&self, account: &Address, pass: &str) -> Result<(), EncryptedHashMapError> { pub fn unlock_account(&self, account: &Address, pass: &str) -> Result<(), EncryptedHashMapError> {
self.unlock_account_with_expiration(account, pass, Some(UTC::now() + Duration::minutes(20)))
}
/// Unlocks account for use (no expiration of unlock)
pub fn unlock_account_no_expire(&self, account: &Address, pass: &str) -> Result<(), EncryptedHashMapError> {
self.unlock_account_with_expiration(account, pass, None)
}
fn unlock_account_with_expiration(&self, account: &Address, pass: &str, expiration: Option<DateTime<UTC>>) -> Result<(), EncryptedHashMapError> {
let secret_id = try!(self.account(&account).ok_or(EncryptedHashMapError::UnknownIdentifier)); let secret_id = try!(self.account(&account).ok_or(EncryptedHashMapError::UnknownIdentifier));
let secret = try!(self.get(&secret_id, pass)); let secret = try!(self.get(&secret_id, pass));
{ {
let mut write_lock = self.unlocks.write().unwrap(); let mut write_lock = self.unlocks.write().unwrap();
let mut unlock = write_lock.entry(*account) let mut unlock = write_lock.entry(*account)
.or_insert_with(|| AccountUnlock { secret: secret, expires: UTC::now() }); .or_insert_with(|| AccountUnlock { secret: secret, expires: Some(UTC::now()) });
unlock.secret = secret; unlock.secret = secret;
unlock.expires = UTC::now() + Duration::minutes(20); unlock.expires = expiration;
} }
Ok(()) Ok(())
} }
@ -277,7 +292,7 @@ impl SecretStore {
self.directory.collect_garbage(); self.directory.collect_garbage();
let utc = UTC::now(); let utc = UTC::now();
let expired_addresses = garbage_lock.iter() let expired_addresses = garbage_lock.iter()
.filter(|&(_, unlock)| unlock.expires < utc) .filter(|&(_, unlock)| match unlock.expires { Some(ref expire_val) => expire_val < &utc, _ => false })
.map(|(address, _)| address.clone()).collect::<Vec<Address>>(); .map(|(address, _)| address.clone()).collect::<Vec<Address>>();
for expired in expired_addresses { garbage_lock.remove(&expired); } for expired in expired_addresses { garbage_lock.remove(&expired); }
@ -629,7 +644,7 @@ mod tests {
let ss_rw = svc.secret_store.write().unwrap(); let ss_rw = svc.secret_store.write().unwrap();
let mut ua_rw = ss_rw.unlocks.write().unwrap(); let mut ua_rw = ss_rw.unlocks.write().unwrap();
let entry = ua_rw.entry(address); let entry = ua_rw.entry(address);
if let Entry::Occupied(mut occupied) = entry { occupied.get_mut().expires = UTC::now() - Duration::minutes(1); } if let Entry::Occupied(mut occupied) = entry { occupied.get_mut().expires = Some(UTC::now() - Duration::minutes(1)) }
} }
svc.tick(); svc.tick();