bitlair/revbank
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add assertions

Browse source 
There should already be external checks to prevent double entries in
revbank.accounts, but better safe than sorry.
This commit is contained in:
Juerd Waalboer 2023-11-05 20:56:18 +01:00
parent d54428b092
commit 7dd94eda9b
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/RevBank/Users.pm
View file

@ -17,22 +17,23 @@ sub _read() {
my %users; my %users;
for (@users) { for (@users) {
my $name = $_->[0]; my $name = lc $_->[0];
if ($name =~ /^\*/) {
# user-accessible special account: support without * prefix
$users{ lc($name) =~ s/^\*//r } = $_;
# also support literal account name with * prefix exists $users{$name} and die "$filename: duplicate entry '$name'\n";
$users{ lc($name) } = $_; $users{$name} = $_;
} else {
# hidden or normal account if ($name =~ s/^\*//) {
$users{ lc($name) } = $_; # user-accessible special account: support without * prefix
exists $users{$name} and die "$filename: duplicate entry '$name'\n";
$users{$name} = $_;
} }
} }
return \%users; return \%users;
} }
sub names() { sub names() {
# uniq because *foo causes population of keys '*foo' and 'foo', with
# ->[0] both being 'foo'. However, the keys are lowercase, not canonical.
return List::Util::uniqstr map $_->[0], values %{ _read() }; return List::Util::uniqstr map $_->[0], values %{ _read() };
} }
@ -45,6 +46,8 @@ sub since($username) {
} }
sub create($username) { sub create($username) {
die "Account already exists" if exists _read()->{ lc $username };
my $now = now(); my $now = now();
append $filename, "$username 0.00 $now\n"; append $filename, "$username 0.00 $now\n";
RevBank::Plugins::call_hooks("user_created", $username); RevBank::Plugins::call_hooks("user_created", $username);
@ -52,12 +55,14 @@ sub create($username) {
} }
sub update($username, $delta, $transaction_id) { sub update($username, $delta, $transaction_id) {
my $account = assert_user($username) or die "No such user ($username)";
my $old = RevBank::Amount->new(0); my $old = RevBank::Amount->new(0);
my $new = RevBank::Amount->new(0); my $new = RevBank::Amount->new(0);
rewrite $filename, sub($line) { rewrite $filename, sub($line) {
my @a = split " ", $line; my @a = split " ", $line;
if (lc $a[0] eq lc $username) { if (lc $a[0] eq lc $account) {
$old = RevBank::Amount->parse_string($a[1]); $old = RevBank::Amount->parse_string($a[1]);
die "Fatal error: invalid balance in revbank:accounts:$.\n" die "Fatal error: invalid balance in revbank:accounts:$.\n"
if not defined $old; if not defined $old;
@ -73,7 +78,7 @@ sub update($username, $delta, $transaction_id) {
$since = "0\@" . now() if $newc == 0 and (!$since or $oldc != 0); $since = "0\@" . now() if $newc == 0 and (!$since or $oldc != 0);
return sprintf "%-16s %9s %s %s\n", ( return sprintf "%-16s %9s %s %s\n", (
$username, $new->string("+"), now(), $since $account, $new->string("+"), now(), $since
); );
} else { } else {
return $line; return $line;
@ -81,7 +86,7 @@ sub update($username, $delta, $transaction_id) {
}; };
RevBank::Plugins::call_hooks( RevBank::Plugins::call_hooks(
"user_balance", $username, $old, $delta, $new, $transaction_id "user_balance", $account, $old, $delta, $new, $transaction_id
); );
} }
@ -109,7 +114,7 @@ sub assert_user($username) {
? $users->{ lc $username }->[0] ? $users->{ lc $username }->[0]
: (is_hidden($username) : (is_hidden($username)
? create($username) ? create($username)
: Carp::croak("Account '$username' does not exist") : Carp::croak("No such user ($username)")
); );
} }

2
revbank
View file

@ -17,7 +17,7 @@ use RevBank::Global;
use RevBank::Messages; use RevBank::Messages;
use RevBank::Cart; use RevBank::Cart;
our $VERSION = "4.2.0"; our $VERSION = "4.2.1";
our %HELP1 = ( our %HELP1 = (
"abort" => "Abort the current transaction", "abort" => "Abort the current transaction",
); );