better error handling when the btcpay server goes down

.gitignore

@@ -1,5 +1,6 @@
 notes.txt
 .env
+.env.bak
 .vscode
 
 *.pyc

capsulflask/__init__.py

@@ -142,8 +142,12 @@ app.config['HTTP_CLIENT'] = MyHTTPClient(timeout_seconds=int(app.config['INTERNA
 app.config['BTCPAY_ENABLED'] = False
 if app.config['BTCPAY_URL'] != "":
   try:
-    app.config['BTCPAY_CLIENT'] = btcpay.Client(api_uri=app.config['BTCPAY_URL'], pem=app.config['BTCPAY_PRIVATE_KEY'])
-    app.config['BTCPAY_ENABLED'] = True
+    response = requests.get(app.config['BTCPAY_URL'])
+    if response.status_code == 200:
+      app.config['BTCPAY_CLIENT'] = btcpay.Client(api_uri=app.config['BTCPAY_URL'], pem=app.config['BTCPAY_PRIVATE_KEY'])
+      app.config['BTCPAY_ENABLED'] = True
+    else:
+      app.logger.warning(f"Can't reach BTCPAY_URL {app.config['BTCPAY_URL']}: Response status code: {response.status_code}. Capsul will work fine except cryptocurrency payments will not work.")
   except:
     app.logger.warning("unable to create btcpay client. Capsul will work fine except cryptocurrency payments will not work. The error was: " + my_exec_info_message(sys.exc_info()))
 
@@ -155,6 +159,7 @@ is_running_server = ('flask run' in command_line) or ('gunicorn' in command_line
 app.logger.info(f"is_running_server: {is_running_server}")
 
 if app.config['HUB_MODE_ENABLED']:
+
   if app.config['HUB_MODEL'] == "capsul-flask":
     app.config['HUB_MODEL'] = hub_model.CapsulFlaskHub()
 
@@ -176,9 +181,7 @@ if app.config['HUB_MODE_ENABLED']:
   from capsulflask import db
   db.init_app(app, is_running_server)
 
-  from capsulflask import (
-    auth, landing, console, payment, metrics, cli, hub_api, publicapi, admin
-  )
+  from capsulflask import auth, landing, console, payment, metrics, cli, hub_api, admin
 
   app.register_blueprint(landing.bp)
   app.register_blueprint(auth.bp)
@@ -188,13 +191,13 @@ if app.config['HUB_MODE_ENABLED']:
   app.register_blueprint(cli.bp)
   app.register_blueprint(hub_api.bp)
   app.register_blueprint(admin.bp)
-  app.register_blueprint(publicapi.bp)
 
   app.add_url_rule("/", endpoint="index")
 
 
 
 if app.config['SPOKE_MODE_ENABLED']:
+
   if app.config['SPOKE_MODEL'] == "shell-scripts":
     app.config['SPOKE_MODEL'] = spoke_model.ShellScriptSpoke()
   else:

capsulflask/auth.py

@@ -1,4 +1,3 @@
-from base64 import b64decode
 import functools
 import re
 
@@ -25,15 +24,6 @@ def account_required(view):
 
     @functools.wraps(view)
     def wrapped_view(**kwargs):
-        api_token = request.headers.get('authorization', None)
-        if api_token is not None:
-            email = get_model().authenticate_token(b64decode(api_token).decode('utf-8'))
-
-            if email is not None:
-                session.clear()
-                session["account"] = email
-                session["csrf-token"] = generate()
-
         if session.get("account") is None or session.get("csrf-token") is None :
             return redirect(url_for("auth.login"))
 
@@ -66,7 +56,7 @@ def login():
         if not email:
             errors.append("email is required")
         elif len(email.strip()) < 6 or email.count('@') != 1 or email.count('.') == 0: 
-            errors.append("enter a valid email address")
+	        errors.append("enter a valid email address")
 
         if len(errors) == 0:
             result = get_model().login(email)

capsulflask/cli.py

@@ -62,6 +62,18 @@ def sql_script(f, c):
 
     model.connection.commit()
 
+@bp.cli.command('account-balance')
+@click.option('-u', help='users email address')
+@with_appcontext
+def account_balance(u):
+  vms = get_model().list_vms_for_account(u)
+  payments = get_model().list_payments_for_account(u)
+  click.echo(".")
+  click.echo(".")
+  click.echo(get_account_balance(vms, payments, datetime.utcnow()))
+  click.echo(".")
+
+
 
 @bp.cli.command('cron-task')
 @with_appcontext

capsulflask/console.py

@@ -1,9 +1,7 @@
-from base64 import b64encode
-from datetime import datetime, timedelta
-import json
 import re
 import sys
-
+import json
+from datetime import datetime, timedelta
 from flask import Blueprint
 from flask import flash
 from flask import current_app
@@ -100,6 +98,7 @@ def index():
 @bp.route("/<string:id>", methods=("GET", "POST"))
 @account_required
 def detail(id):
+
   duration=request.args.get('duration')
   if not duration:
     duration = "5m"
@@ -189,67 +188,6 @@ def detail(id):
       duration=duration
     )
 
-def _create(vm_sizes, operating_systems, public_keys_for_account, server_data):
-  errors = list()
-
-  size = server_data.get("size")
-  os = server_data.get("os")
-  posted_keys_count = int(server_data.get("ssh_authorized_key_count"))
-
-  if not size:
-    errors.append("Size is required")
-  elif size not in vm_sizes:
-    errors.append(f"Invalid size {size}")
-
-  if not os:
-    errors.append("OS is required")
-  elif os not in operating_systems:
-    errors.append(f"Invalid os {os}")
-
-  posted_keys = list()
-
-  if posted_keys_count > 1000:
-    errors.append("something went wrong with ssh keys")
-  else:
-    for i in range(0, posted_keys_count):
-      if f"ssh_key_{i}" in server_data:
-        posted_name = server_data.get(f"ssh_key_{i}")
-        key = None
-        for x in public_keys_for_account:
-          if x['name'] == posted_name:
-            key = x
-        if key:
-          posted_keys.append(key)
-        else:
-          errors.append(f"SSH Key \"{posted_name}\" doesn't exist")
-
-  if len(posted_keys) == 0:
-    errors.append("At least one SSH Public Key is required")
-
-  capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(
-    vm_sizes[size]['memory_mb']*1024*1024
-  )
-
-  if not capacity_avaliable:
-    errors.append("""
-      host(s) at capacity. no capsuls can be created at this time. sorry. 
-    """)
-
-  if len(errors) == 0:
-    id = make_capsul_id()
-    current_app.config["HUB_MODEL"].create(
-      email = session["account"],
-      id=id,
-      os=os,
-      size=size,
-      template_image_file_name=operating_systems[os]['template_image_file_name'],
-      vcpus=vm_sizes[size]['vcpus'],
-      memory_mb=vm_sizes[size]['memory_mb'],
-      ssh_authorized_keys=list(map(lambda x: x["content"], posted_keys))
-    )
-    return id, errors
-
-  return None, errors
 
 @bp.route("/create", methods=("GET", "POST"))
 @account_required
@@ -261,17 +199,6 @@ def create():
   capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(512*1024*1024)
   errors = list()
 
-  if request.method == "POST":
-    if "csrf-token" not in request.form or request.form['csrf-token'] != session['csrf-token']:
-      return abort(418, f"u want tea")
-    id, errors = _create(
-      vm_sizes, 
-      operating_systems,
-      public_keys_for_account,
-      request.form)
-    if len(errors) == 0: 
-      return redirect(f"{url_for('console.index')}?created={id}")
-  
   affordable_vm_sizes = dict()
   for key, vm_size in vm_sizes.items():
     # if a user deposits $7.50 and then creates an f1-s vm which costs 7.50 a month, 
@@ -280,6 +207,70 @@ def create():
     if vm_size["dollars_per_month"] <= account_balance+0.25:
       affordable_vm_sizes[key] = vm_size
 
+  if request.method == "POST":
+    if "csrf-token" not in request.form or request.form['csrf-token'] != session['csrf-token']:
+      return abort(418, f"u want tea")
+
+    size = request.form["size"]
+    os = request.form["os"]
+    if not size:
+      errors.append("Size is required")
+    elif size not in vm_sizes:
+      errors.append(f"Invalid size {size}")
+    elif size not in affordable_vm_sizes:
+      errors.append(f"Your account must have enough credit to run an {size} for 1 month before you will be allowed to create it")
+
+    if not os:
+      errors.append("OS is required")
+    elif os not in operating_systems:
+      errors.append(f"Invalid os {os}")
+
+    posted_keys_count = int(request.form["ssh_authorized_key_count"])
+    posted_keys = list()
+
+    if posted_keys_count > 1000:
+      errors.append("something went wrong with ssh keys")
+    else:
+      for i in range(0, posted_keys_count):
+        if f"ssh_key_{i}" in request.form:
+          posted_name = request.form[f"ssh_key_{i}"]
+          key = None
+          for x in public_keys_for_account:
+            if x['name'] == posted_name:
+              key = x
+          if key:
+            posted_keys.append(key)
+          else:
+            errors.append(f"SSH Key \"{posted_name}\" doesn't exist")
+
+    if len(posted_keys) == 0:
+      errors.append("At least one SSH Public Key is required")
+
+    capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(vm_sizes[size]['memory_mb']*1024*1024)
+
+    if not capacity_avaliable:
+      errors.append("""
+        host(s) at capacity. no capsuls can be created at this time. sorry. 
+      """)
+
+    if len(errors) == 0:
+      id = make_capsul_id()
+      # we can't create the vm record in the DB yet because its IP address needs to be allocated first.
+      # so it will be created when the allocation happens inside the hub_api.
+      current_app.config["HUB_MODEL"].create(
+        email = session["account"],
+        id=id,
+        os=os,
+        size=size,
+        template_image_file_name=operating_systems[os]['template_image_file_name'],
+        vcpus=vm_sizes[size]['vcpus'],
+        memory_mb=vm_sizes[size]['memory_mb'],
+        ssh_authorized_keys=list(map(lambda x: dict(name=x['name'], content=x['content']), posted_keys)) 
+      )
+      
+      return redirect(f"{url_for('console.index')}?created={id}")
+  
+
   for error in errors:
     flash(error)
 
@@ -299,25 +290,23 @@ def create():
     vm_sizes=affordable_vm_sizes
   )
 
-@bp.route("/keys", methods=("GET", "POST"))
+@bp.route("/ssh", methods=("GET", "POST"))
 @account_required
-def ssh_api_keys():
+def ssh_public_keys():
   errors = list()
 
-  token = None
-
   if request.method == "POST":
     if "csrf-token" not in request.form or request.form['csrf-token'] != session['csrf-token']:
       return abort(418, f"u want tea")
       
-    action = request.form["action"]
-
-    if action == 'upload_ssh_key':
-      content = None
+    method = request.form["method"]
+    content = None
+    if method == "POST":
       content = request.form["content"].replace("\r", " ").replace("\n", " ").strip()
-        
-      name = request.form["name"]
-      if not name or len(name.strip()) < 1:
+      
+    name = request.form["name"]
+    if not name or len(name.strip()) < 1:
+      if method == "POST":
         parts = re.split(" +", content)
         if len(parts) > 2 and len(parts[2].strip()) > 0:
           name = parts[2].strip()
@@ -325,9 +314,10 @@ def ssh_api_keys():
           name = parts[0].strip()
       else:
         errors.append("Name is required")
-      if not re.match(r"^[0-9A-Za-z_@:. -]+$", name):
-        errors.append(f"Key name '{name}' must match \"^[0-9A-Za-z_@:. -]+$\"")
+    if not re.match(r"^[0-9A-Za-z_@:. -]+$", name):
+      errors.append(f"Key name '{name}' must match \"^[0-9A-Za-z_@:. -]+$\"")
 
+    if method == "POST":
       if not content or len(content.strip()) < 1:
         errors.append("Content is required")
       else:
@@ -340,36 +330,24 @@ def ssh_api_keys():
       if len(errors) == 0:
         get_model().create_ssh_public_key(session["account"], name, content)
 
-    elif action == "delete_ssh_key":
-      get_model().delete_ssh_public_key(session["account"], name)
+    elif method == "DELETE":
 
-    elif action == "generate_api_token":
-      name = request.form["name"]
-      if name == '':
-          name = datetime.utcnow().strftime('%y-%m-%d %H:%M:%S')
-      token = b64encode(
-        get_model().generate_api_token(session["account"], name).encode('utf-8')
-      ).decode('utf-8')
-
-    elif action == "delete_api_token":
-      get_model().delete_api_token(session["account"], request.form["id"])
+      if len(errors) == 0:
+        get_model().delete_ssh_public_key(session["account"], name)
 
   for error in errors:
     flash(error)
 
-  ssh_keys_list=list(map(
+  keys_list=list(map(
     lambda x: dict(name=x['name'], content=f"{x['content'][:20]}...{x['content'][len(x['content'])-20:]}"), 
     get_model().list_ssh_public_keys_for_account(session["account"])
   ))
 
-  api_tokens_list = get_model().list_api_tokens(session["account"])
-
   return render_template(
-    "keys.html", 
+    "ssh-public-keys.html", 
     csrf_token = session["csrf-token"],
-    api_tokens=api_tokens_list, 
-    ssh_public_keys=ssh_keys_list,
-    generated_api_token=token,
+    ssh_public_keys=keys_list, 
+    has_ssh_public_keys=len(keys_list) > 0
   )
 
 def get_vms():
@@ -393,6 +371,7 @@ def get_vm_months_float(vm, as_of):
   return days / average_number_of_days_in_a_month
 
 def get_account_balance(vms, payments, as_of):
+
   vm_cost_dollars = 0.0
   for vm in vms:
     vm_months = get_vm_months_float(vm, as_of)
@@ -405,6 +384,7 @@ def get_account_balance(vms, payments, as_of):
 @bp.route("/account-balance")
 @account_required
 def account_balance():
+
   payment_sessions = get_model().list_payment_sessions_for_account(session['account'])
   for payment_session in payment_sessions:
     if payment_session['type'] == 'btcpay':

capsulflask/db.py

@@ -33,7 +33,7 @@ def init_app(app, is_running_server):
     result = re.search(r"^\d+_(up|down)", filename)
     if not result:
       app.logger.error(f"schemaVersion {filename} must match ^\\d+_(up|down). exiting.")
-      continue
+      exit(1)
     key = result.group()
     with open(join(schemaMigrationsPath, filename), 'rb') as file:
       schemaMigrations[key] = file.read().decode("utf8")
@@ -43,7 +43,7 @@ def init_app(app, is_running_server):
   hasSchemaVersionTable = False
   actionWasTaken = False
   schemaVersion = 0
-  desiredSchemaVersion = 19
+  desiredSchemaVersion = 20
 
   cursor = connection.cursor()
 
@@ -128,3 +128,4 @@ def close_db(e=None):
   if db_model is not None:
     db_model.cursor.close()
     current_app.config['PSYCOPG2_CONNECTION_POOL'].putconn(db_model.connection)
+

capsulflask/db_model.py

@@ -1,8 +1,8 @@
+
 import re
 
 # I was never able to get this type hinting to work correctly 
 # from psycopg2.extensions import connection as Psycopg2Connection, cursor as Psycopg2Cursor
-import hashlib
 from nanoid import generate
 from flask import current_app
 from typing import List
@@ -17,6 +17,7 @@ class DBModel:
     self.cursor = cursor
 
 
+
   #     ------    LOGIN     ---------     
 
 
@@ -42,16 +43,6 @@ class DBModel:
     self.connection.commit()
 
     return (token, ignoreCaseMatches)
-
-  def authenticate_token(self, token):
-    m = hashlib.md5()
-    m.update(token.encode('utf-8'))
-    hash_token = m.hexdigest()
-    self.cursor.execute("SELECT email FROM api_tokens WHERE token = %s", (hash_token, ))
-    result = self.cursor.fetchall()
-    if len(result) == 1:
-      return result[0]
-    return None
     
   def consume_token(self, token):
     self.cursor.execute("SELECT email FROM login_tokens WHERE token = %s and created > (NOW() - INTERVAL '20 min')", (token, ))
@@ -141,32 +132,6 @@ class DBModel:
     self.cursor.execute( "DELETE FROM ssh_public_keys where email = %s AND name = %s", (email, name) )
     self.connection.commit()
 
-  def list_api_tokens(self, email):
-    self.cursor.execute(
-      "SELECT id, token, name, created FROM api_tokens WHERE email = %s", 
-      (email, )
-    )
-    return list(map(
-      lambda x: dict(id=x[0], token=x[1], name=x[2], created=x[3]), 
-      self.cursor.fetchall()
-    ))
-
-  def generate_api_token(self, email, name):
-    token = generate()
-    m = hashlib.md5()
-    m.update(token.encode('utf-8'))
-    hash_token = m.hexdigest()
-    self.cursor.execute(
-      "INSERT INTO api_tokens (email, name, token) VALUES (%s, %s, %s)", 
-      (email, name, hash_token)
-    )
-    self.connection.commit()
-    return token
-
-  def delete_api_token(self, email, id_):
-    self.cursor.execute( "DELETE FROM api_tokens where email = %s AND id = %s", (email, id_))
-    self.connection.commit()
-
   def list_vms_for_account(self, email):
     self.cursor.execute(""" 
       SELECT vms.id, vms.public_ipv4, vms.public_ipv6, vms.size, vms.os, vms.created, vms.deleted, vm_sizes.dollars_per_month
@@ -514,3 +479,8 @@ class DBModel:
     #cursor.close()
 
     return to_return
+      
+
+
+
+

capsulflask/hub_model.py

@@ -228,8 +228,8 @@ class CapsulFlaskHub(VirtualizationInterface):
         # no need to do anything here since if it cant be parsed then generic_operation will handle it.
         pass
       
+    assigned_hosts_string = ", ".join(assigned_hosts)
     if number_of_assigned != 1:
-      assigned_hosts_string = ", ".join(assigned_hosts)
       raise ValueError(f"expected create capsul operation {operation_id} to be assigned to one host, it was assigned to {number_of_assigned} ({assigned_hosts_string})")
     if error_message != "":
       raise ValueError(f"create capsul operation {operation_id} on {assigned_hosts_string} failed with {error_message}")

capsulflask/payment.py

@@ -58,14 +58,19 @@ def btcpay_payment():
     dollars = result[1]
 
     if len(errors) == 0:
-      invoice = current_app.config['BTCPAY_CLIENT'].create_invoice(dict(
-        price=float(dollars), 
-        currency="USD",
-        itemDesc="Capsul Cloud Compute",
-        transactionSpeed="high",
-        redirectURL=f"{current_app.config['BASE_URL']}/console/account-balance",
-        notificationURL=f"{current_app.config['BASE_URL']}/payment/btcpay/webhook"
-      ))
+      try:
+        invoice = current_app.config['BTCPAY_CLIENT'].create_invoice(dict(
+          price=float(dollars), 
+          currency="USD",
+          itemDesc="Capsul Cloud Compute",
+          transactionSpeed="high",
+          redirectURL=f"{current_app.config['BASE_URL']}/console/account-balance",
+          notificationURL=f"{current_app.config['BASE_URL']}/payment/btcpay/webhook"
+        ))
+      except:
+        current_app.logger.error(f"An error occurred while attempting to reach BTCPay Server: {my_exec_info_message(sys.exc_info())}")
+        flash("An error occurred while attempting to reach BTCPay Server.")
+        return redirect(url_for("console.account_balance"))
 
       current_app.logger.info(f"created btcpay invoice: {invoice}")
 

capsulflask/publicapi.py

@@ -1,40 +0,0 @@
-import datetime
-
-from flask import Blueprint
-from flask import current_app
-from flask import jsonify
-from flask import request
-from flask import session
-from nanoid import generate
-
-from capsulflask.auth import account_required
-from capsulflask.db import get_model
-
-bp = Blueprint("publicapi", __name__, url_prefix="/api")
-
-@bp.route("/capsul/create", methods=["POST"])
-@account_required
-def capsul_create():
-    email = session["account"]
-    
-    from .console import _create,get_account_balance, get_payments, get_vms
-
-    vm_sizes = get_model().vm_sizes_dict()
-    operating_systems = get_model().operating_systems_dict()
-    public_keys_for_account = get_model().list_ssh_public_keys_for_account(session["account"])
-    account_balance = get_account_balance(get_vms(), get_payments(), datetime.datetime.utcnow())
-    capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(512*1024*1024)
-
-    request.json['ssh_authorized_key_count'] = 1
-
-    id, errors = _create(
-      vm_sizes, 
-      operating_systems,
-      public_keys_for_account,
-      request.json)
-
-    if id is not None:
-        return jsonify(
-            id=id,
-        )
-    return jsonify(errors=errors)

capsulflask/schema_migrations/19_down_api_tokens.py

@@ -1,2 +0,0 @@
-DROP TABLE api_keys;
-UPDATE schemaversion SET version = 18;

capsulflask/schema_migrations/19_down_os_updates.sql

@@ -0,0 +1,8 @@
+DELETE FROM os_images WHERE id = 'guixsystem130';
+DELETE FROM os_images WHERE id = 'archlinux';
+UPDATE os_images SET deprecated = FALSE WHERE id = 'guixsystem120';
+UPDATE os_images SET deprecated = FALSE WHERE id = 'centos7';
+UPDATE os_images SET deprecated = FALSE WHERE id = 'centos8';
+UPDATE os_images SET description = 'Ubuntu 20.04 LTS (Fossa)' WHERE id = 'ubuntu20';
+
+UPDATE schemaversion SET version = 18;

capsulflask/schema_migrations/19_up_api_tokens.py

@@ -1,9 +0,0 @@
-CREATE TABLE api_tokens (
-  id                 SERIAL PRIMARY KEY,
-  email              TEXT REFERENCES accounts(email) ON DELETE RESTRICT,
-  name               TEXT NOT NULL,
-  created            TIMESTAMP NOT NULL DEFAULT NOW(),
-  token              TEXT NOT NULL
-);
-
-UPDATE schemaversion SET version = 19;

capsulflask/schema_migrations/19_up_os_updates.sql

@@ -0,0 +1,12 @@
+INSERT INTO os_images (id, template_image_file_name, description, deprecated)
+VALUES  ('guixsystem130', 'guixsystem/1.3.0/root.img.qcow2', 'Guix System 1.3.0', FALSE);
+INSERT INTO os_images (id, template_image_file_name, description, deprecated)
+VALUES  ('archlinux', 'archlinux/root.img.qcow2', 'Arch Linux', FALSE);
+
+UPDATE os_images SET deprecated = TRUE WHERE id = 'guixsystem120';
+UPDATE os_images SET deprecated = TRUE WHERE id = 'centos7';
+UPDATE os_images SET deprecated = TRUE WHERE id = 'centos8';
+UPDATE os_images SET description = 'Ubuntu 20.04 (Focal)' WHERE id = 'ubuntu20';
+
+
+UPDATE schemaversion SET version = 19;

capsulflask/schema_migrations/20_down_deferrable_constraints.sql

@@ -0,0 +1,21 @@
+
+ALTER TABLE host_network ALTER CONSTRAINT host_network_host_fkey NOT DEFERRABLE;
+ALTER TABLE host_operation ALTER CONSTRAINT host_operation_host_fkey NOT DEFERRABLE;
+ALTER TABLE host_operation ALTER CONSTRAINT host_operation_operation_fkey NOT DEFERRABLE;
+ALTER TABLE login_tokens ALTER CONSTRAINT login_tokens_email_fkey NOT DEFERRABLE;
+ALTER TABLE operations ALTER CONSTRAINT operations_email_fkey NOT DEFERRABLE;
+ALTER TABLE payment_sessions ALTER CONSTRAINT payment_sessions_email_fkey NOT DEFERRABLE;
+ALTER TABLE payments ALTER CONSTRAINT payments_email_fkey NOT DEFERRABLE;
+ALTER TABLE ssh_public_keys ALTER CONSTRAINT ssh_public_keys_email_fkey NOT DEFERRABLE;
+ALTER TABLE unresolved_btcpay_invoices ALTER CONSTRAINT unresolved_btcpay_invoices_email_fkey NOT DEFERRABLE;
+ALTER TABLE unresolved_btcpay_invoices ALTER CONSTRAINT unresolved_btcpay_invoices_email_payment_id_fkey NOT DEFERRABLE;
+ALTER TABLE vm_ssh_authorized_key ALTER CONSTRAINT vm_ssh_public_key_email_ssh_public_key_name_fkey NOT DEFERRABLE;
+ALTER TABLE vm_ssh_authorized_key ALTER CONSTRAINT vm_ssh_public_key_email_vm_id_fkey NOT DEFERRABLE;
+ALTER TABLE vm_ssh_host_key ALTER CONSTRAINT vm_ssh_host_key_email_vm_id_fkey NOT DEFERRABLE;
+ALTER TABLE vms ALTER CONSTRAINT vms_email_fkey NOT DEFERRABLE;
+ALTER TABLE vms ALTER CONSTRAINT vms_host_network_name_fkey NOT DEFERRABLE;
+ALTER TABLE vms ALTER CONSTRAINT vms_host_fkey NOT DEFERRABLE;
+ALTER TABLE vms ALTER CONSTRAINT vms_os_fkey NOT DEFERRABLE;
+ALTER TABLE vms ALTER CONSTRAINT vms_size_fkey NOT DEFERRABLE;
+
+UPDATE schemaversion SET version = 19;

capsulflask/schema_migrations/20_up_deferrable_constraints.sql

@@ -0,0 +1,21 @@
+
+ALTER TABLE host_network ALTER CONSTRAINT host_network_host_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE host_operation ALTER CONSTRAINT host_operation_host_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE host_operation ALTER CONSTRAINT host_operation_operation_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE login_tokens ALTER CONSTRAINT login_tokens_email_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE operations ALTER CONSTRAINT operations_email_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE payment_sessions ALTER CONSTRAINT payment_sessions_email_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE payments ALTER CONSTRAINT payments_email_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE ssh_public_keys ALTER CONSTRAINT ssh_public_keys_email_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE unresolved_btcpay_invoices ALTER CONSTRAINT unresolved_btcpay_invoices_email_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE unresolved_btcpay_invoices ALTER CONSTRAINT unresolved_btcpay_invoices_email_payment_id_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE vm_ssh_authorized_key ALTER CONSTRAINT vm_ssh_public_key_email_ssh_public_key_name_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE vm_ssh_authorized_key ALTER CONSTRAINT vm_ssh_public_key_email_vm_id_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE vm_ssh_host_key ALTER CONSTRAINT vm_ssh_host_key_email_vm_id_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE vms ALTER CONSTRAINT vms_email_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE vms ALTER CONSTRAINT vms_host_network_name_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE vms ALTER CONSTRAINT vms_host_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE vms ALTER CONSTRAINT vms_os_fkey DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE vms ALTER CONSTRAINT vms_size_fkey DEFERRABLE INITIALLY DEFERRED;
+
+UPDATE schemaversion SET version = 20;

capsulflask/spoke_api.py

@@ -182,7 +182,10 @@ def handle_destroy(operation_id, request_body):
     return abort(400, f"bad request; email is required for destroy")
 
   try:
-    current_app.config['SPOKE_MODEL'].destroy(id=request_body['id'], email=request_body['email'])
+    vm = current_app.config['SPOKE_MODEL'].get(request_body['id'], False)
+    current_app.logger.warning(f"destroy {request_body['id']} was called for {request_body['email']}, however the vm does not exist. returning success. ")
+    if vm is not None:
+      current_app.config['SPOKE_MODEL'].destroy(id=request_body['id'], email=request_body['email'])
   except:
     error_message = my_exec_info_message(sys.exc_info())
     params =          f"email='{request_body['email'] if 'email' in request_body else 'KeyError'}', "

capsulflask/templates/base.html

@@ -31,7 +31,7 @@
 
     {% if session["account"] %} 
       <a href="/console">Capsuls</a>
-      <a href="/console/keys">SSH &amp; API Keys</a>
+      <a href="/console/ssh">SSH Public Keys</a>
       <a href="/console/account-balance">Account Balance</a>
     {% endif %}
 

capsulflask/templates/capsul-detail.html

@@ -101,7 +101,7 @@
       </div>
       <div class="row justify-start">
         <label class="align" for="ssh_authorized_keys">SSH Authorized Keys</label>
-        <a id="ssh_authorized_keys" href="/console/keys">{{ vm['ssh_authorized_keys'] }}</a>
+        <a id="ssh_authorized_keys" href="/console/ssh">{{ vm['ssh_authorized_keys'] }}</a>
       </div>
       
     </div>

capsulflask/templates/create-capsul.html

@@ -31,7 +31,7 @@
     <p>(At least one month of funding is required)</p>
   {% elif no_ssh_public_keys %}
     <p>You don't have any ssh public keys yet.</p> 
-    <p>You must <a href="/console/keys">upload one</a> before you can create a Capsul.</p>
+    <p>You must <a href="/console/ssh">upload one</a> before you can create a Capsul.</p>
   {% elif not capacity_avaliable %}
     <p>Host(s) at capacity. No capsuls can be created at this time. sorry. </p> 
   {% else %}

capsulflask/templates/ssh-public-keys.html

@@ -1,18 +1,17 @@
 {% extends 'base.html' %}
 
-{% block title %}SSH & API Keys{% endblock %}
+{% block title %}SSH Public Keys{% endblock %}
 
 {% block content %}
 <div class="row third-margin">
   <h1>SSH PUBLIC KEYS</h1>
 </div>
 <div class="row third-margin"><div>
-    {% if ssh_public_keys|length > 0 %} <hr/> {% endif %}
+  {% if has_ssh_public_keys %} <hr/> {% endif %}
   
   {% for ssh_public_key in ssh_public_keys %}
     <form method="post">
       <input type="hidden" name="method" value="DELETE"></input> 
-      <input type="hidden" name="action" value="delete_ssh_key"></input>
       <input type="hidden" name="name" value="{{ ssh_public_key['name'] }}"></input> 
       <input type="hidden" name="csrf-token" value="{{ csrf_token }}"/>
       <div class="row">
@@ -23,14 +22,13 @@
     </form>
   {% endfor %}
 
-  {% if ssh_public_keys|length > 0 %} <hr/> {% endif %}
+  {% if has_ssh_public_keys %} <hr/> {% endif %}
 
   <div class="third-margin">
     <h1>UPLOAD A NEW SSH PUBLIC KEY</h1>
   </div>
   <form method="post">
     <input type="hidden" name="method" value="POST"></input>
-    <input type="hidden" name="action" value="upload_ssh_key"></input>
     <input type="hidden" name="csrf-token" value="{{ csrf_token }}"/>
     <div class="row justify-start">
       <label class="align" for="content">File Contents</label>
@@ -56,51 +54,6 @@
     </div>
   </form>
 </div></div>
-<hr/>
-<div class="row third-margin">
-  <h1>API KEYS</h1>
-</div>
-<div class="row third-margin"><div>
-  {% if generated_api_token %}
-    <hr/>
-    Generated key:
-    <span class="code">{{ generated_api_token }}</span>
-  {% endif %}
-  {% if api_tokens|length >0 %} <hr/>{% endif %}
-  {% for api_token in api_tokens %}
-    <form method="post">
-      <input type="hidden" name="method" value="DELETE"></input> 
-      <input type="hidden" name="action" value="delete_api_token"></input>
-      <input type="hidden" name="id" value="{{ api_token['id'] }}"></input> 
-      <input type="hidden" name="csrf-token" value="{{ csrf_token }}"/>
-      <div class="row">
-        <span class="code">{{ api_token['name'] }}</span>
-        created {{ api_token['created'].strftime("%b %d %Y") }}
-        <input type="submit" value="Delete">
-      </div>
-    </form>
-  {% endfor %}
-  {% if api_tokens|length >0 %} <hr/>{% endif %}
-
-  <div class="third-margin">
-    <h1>GENERATE A NEW API KEY</h1>
-  </div>
-  <form method="post">
-    <input type="hidden" name="method" value="POST"></input>
-    <input type="hidden" name="action" value="generate_api_token"></input>
-    <input type="hidden" name="csrf-token" value="{{ csrf_token }}"/>
-    <div class="smalltext">
-      <p>Generate a new API key, to integrate with other systems.</p>
-    </div>
-    <div class="row justify-start">
-      <label class="align" for="name">Key Name</label>
-      <input type="text" id="name" name="name"></input> (defaults to creation time)
-    </div>
-    <div class="row justify-end">
-      <input type="submit" value="Generate">
-    </div>
-  </form>
-</div></div>
 {% endblock %}
 
 {% block pagesource %}/templates/ssh-public-keys.html{% endblock %}

capsulflask/templates/support.html

@@ -7,18 +7,11 @@
     <h1>SUPPORT</h1>
   </div>
   <div class="row half-margin">
-    <a href="mailto:support@cyberia.club?subject=Please%20help!">support@cyberia.club</a> 
+    <a href="mailto:support@cyberia.club?subject=capsul%20support%20request">support@cyberia.club</a>
   </div>
 {% endblock %}
 
 {% block subcontent %}
-<p>
-  Note: We maintain a searchable archive of all support emails at 
-  <a href="https://lists.cyberia.club/~cyberia/support">https://lists.cyberia.club/~cyberia/support</a>
-</p>
-<p>
-  If you do not want your mail to appear in a public archive, email <a href="mailto:capsul@cyberia.club?subject=Please%20help!">capsul@cyberia.club</a> instead.
-</p>
 <p>
   Please describe your problem or feature request, and we will do our best to get back to you promptly. Thank you very much.
 </p>

docs/database.md

@@ -48,3 +48,20 @@ $ pipenv run flask cli sql -c "SELECT id, created, email, dollars, invalidated f
 ## how to view the logs on the database server (legion.cyberia.club)
 
 `sudo -u postgres pg_dump capsul-flask | gzip -9 > capsul-backup-2021-02-15.gz`
+
+
+## changing the email address on an account
+
+```
+UPDATE accounts SET lower_case_email = 'new@email.address' WHERE email = 'old@email.address' ;
+UPDATE accounts SET email = 'new@email.address' WHERE email = 'old@email.address' ;
+UPDATE login_tokens SET email = 'new@email.address' WHERE email = 'old@email.address' ;
+UPDATE operations SET email = 'new@email.address' WHERE email = 'old@email.address' ;
+UPDATE payment_sessions SET email = 'new@email.address' WHERE email = 'old@email.address' ;
+UPDATE payments SET email = 'new@email.address' WHERE email = 'old@email.address' ;
+UPDATE ssh_public_keys SET email = 'new@email.address' WHERE email = 'old@email.address' ;
+UPDATE unresolved_btcpay_invoices SET email = 'new@email.address' WHERE email = 'old@email.address' ;
+UPDATE vm_ssh_authorized_key SET email = 'new@email.address' WHERE email = 'old@email.address' ;
+UPDATE vm_ssh_host_key SET email = 'new@email.address' WHERE email = 'old@email.address' ;
+UPDATE vms SET email = 'new@email.address' WHERE email = 'old@email.address' ;
+```