From 54948a386b40dc72f9126dc29992a74ff8f379ce Mon Sep 17 00:00:00 2001 From: forest Date: Mon, 11 May 2020 23:09:11 -0500 Subject: [PATCH] allow . and @ in ssh key names --- capsulflask/console.py | 6 +++--- capsulflask/schema_migrations/02_up_accounts_vms_etc.sql | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/capsulflask/console.py b/capsulflask/console.py index bcd40a9..1aa2162 100644 --- a/capsulflask/console.py +++ b/capsulflask/console.py @@ -171,8 +171,8 @@ def ssh_public_keys(): name = request.form["name"] if not name or len(name.strip()) < 1: errors.append("Name is required") - elif not re.match(r"^[0-9A-Za-z_ -]+$", name): - errors.append("Name must match \"^[0-9A-Za-z_ -]+$\"") + elif not re.match(r"^[0-9A-Za-z_@. -]+$", name): + errors.append("Name must match \"^[0-9A-Za-z_@. -]+$\"") if method == "POST": content = request.form["content"] @@ -223,7 +223,7 @@ def get_account_balance(): vm_months = ( end_datetime - vm["created"] ).days / average_number_of_days_in_a_month vm_cost_dollars += vm_months * float(vm["dollars_per_month"]) - payment_dollars_total = sum(map(lambda x: x["dollars"], get_payments())) + payment_dollars_total = float( sum(map(lambda x: x["dollars"], get_payments())) ) return payment_dollars_total - vm_cost_dollars diff --git a/capsulflask/schema_migrations/02_up_accounts_vms_etc.sql b/capsulflask/schema_migrations/02_up_accounts_vms_etc.sql index 745c24a..2591700 100644 --- a/capsulflask/schema_migrations/02_up_accounts_vms_etc.sql +++ b/capsulflask/schema_migrations/02_up_accounts_vms_etc.sql @@ -82,4 +82,7 @@ VALUES ('f1-s', 5.33, 512, 1, 500), INSERT INTO accounts (email) VALUES ('forest.n.johnson@gmail.com'); +INSERT INTO payments (email, dollars, created) +VALUES ('forest.n.johnson@gmail.com', 100.00, TO_TIMESTAMP('2020-05-05','YYYY-MM-DD')); + UPDATE schemaversion SET version = 2; \ No newline at end of file