From aa1a9f558b44711fc8be1ab03a8869a324cae593 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.cyberia@doesthisthing.work>
Date: Sun, 11 Jul 2021 12:35:35 +0200
Subject: [PATCH] Updates for upstream IP handling

---
 capsulflask/console.py                               | 12 ++++--------
 capsulflask/db.py                                    |  2 +-
 capsulflask/publicapi.py                             |  4 +++-
 capsulflask/schema_migrations/16_down_api_tokens.py  |  2 --
 capsulflask/schema_migrations/19_down_api_tokens.py  |  2 ++
 .../{16_up_api_tokens.py => 19_up_api_tokens.py}     |  2 +-
 6 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 capsulflask/schema_migrations/16_down_api_tokens.py
 create mode 100644 capsulflask/schema_migrations/19_down_api_tokens.py
 rename capsulflask/schema_migrations/{16_up_api_tokens.py => 19_up_api_tokens.py} (87%)

diff --git a/capsulflask/console.py b/capsulflask/console.py
index f2ef93e..2b1e42e 100644
--- a/capsulflask/console.py
+++ b/capsulflask/console.py
@@ -236,17 +236,12 @@ def _create(vm_sizes, operating_systems, public_keys_for_account, server_data):
     """)
 
   if len(errors) == 0:
-    id = makeCapsulId()
-    get_model().create_vm(
-      email=session["account"], 
-      id=id, 
-      size=size, 
-      os=os,
-      ssh_authorized_keys=list(map(lambda x: x["name"], posted_keys))
-    )
+    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'],
@@ -264,6 +259,7 @@ def create():
   public_keys_for_account = get_model().list_ssh_public_keys_for_account(session["account"])
   account_balance = get_account_balance(get_vms(), get_payments(), datetime.utcnow())
   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']:
diff --git a/capsulflask/db.py b/capsulflask/db.py
index 4616c1d..1edcc9e 100644
--- a/capsulflask/db.py
+++ b/capsulflask/db.py
@@ -43,7 +43,7 @@ def init_app(app, is_running_server):
   hasSchemaVersionTable = False
   actionWasTaken = False
   schemaVersion = 0
-  desiredSchemaVersion = 18
+  desiredSchemaVersion = 19
 
   cursor = connection.cursor()
 
diff --git a/capsulflask/publicapi.py b/capsulflask/publicapi.py
index 413a06a..90c12ec 100644
--- a/capsulflask/publicapi.py
+++ b/capsulflask/publicapi.py
@@ -10,7 +10,7 @@ from nanoid import generate
 from capsulflask.auth import account_required
 from capsulflask.db import get_model
 
-bp = Blueprint("webapi", __name__, url_prefix="/api")
+bp = Blueprint("publicapi", __name__, url_prefix="/api")
 
 @bp.route("/capsul/create", methods=["POST"])
 @account_required
@@ -25,6 +25,8 @@ def capsul_create():
     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,
diff --git a/capsulflask/schema_migrations/16_down_api_tokens.py b/capsulflask/schema_migrations/16_down_api_tokens.py
deleted file mode 100644
index 5f3f93e..0000000
--- a/capsulflask/schema_migrations/16_down_api_tokens.py
+++ /dev/null
@@ -1,2 +0,0 @@
-DROP TABLE api_keys;
-UPDATE schemaversion SET version = 15;
diff --git a/capsulflask/schema_migrations/19_down_api_tokens.py b/capsulflask/schema_migrations/19_down_api_tokens.py
new file mode 100644
index 0000000..9635b50
--- /dev/null
+++ b/capsulflask/schema_migrations/19_down_api_tokens.py
@@ -0,0 +1,2 @@
+DROP TABLE api_keys;
+UPDATE schemaversion SET version = 18;
diff --git a/capsulflask/schema_migrations/16_up_api_tokens.py b/capsulflask/schema_migrations/19_up_api_tokens.py
similarity index 87%
rename from capsulflask/schema_migrations/16_up_api_tokens.py
rename to capsulflask/schema_migrations/19_up_api_tokens.py
index ae15dbd..7c48c76 100644
--- a/capsulflask/schema_migrations/16_up_api_tokens.py
+++ b/capsulflask/schema_migrations/19_up_api_tokens.py
@@ -6,4 +6,4 @@ CREATE TABLE api_tokens (
   token              TEXT NOT NULL
 );
 
-UPDATE schemaversion SET version = 16;
+UPDATE schemaversion SET version = 19;