Merge branch 'master' into multiple-hosts

Conflicts:
	capsulflask/console.py
	capsulflask/db.py
	capsulflask/shared.py
	capsulflask/virt_model.py

capsulflask/db_model.py

@@ -21,18 +21,26 @@ class DBModel:
 
   def login(self, email):
     self.cursor.execute("SELECT * FROM accounts WHERE email = %s", (email, ))
-    if len(self.cursor.fetchall()) == 0:
-      self.cursor.execute("INSERT INTO accounts (email) VALUES (%s)", (email, ))
+    hasExactMatch = len(self.cursor.fetchall())
+    self.cursor.execute("SELECT * FROM accounts WHERE email = %s AND ever_logged_in = TRUE", (email, ))
+    everLoggedIn = len(self.cursor.fetchall())
+    ignoreCaseMatches = []
+    if everLoggedIn == 0:
+      self.cursor.execute("SELECT email FROM accounts WHERE lower_case_email = %s AND email != %s", (email.lower(), email))
+      ignoreCaseMatches = list(map(lambda x: x[0], self.cursor.fetchall()))
+  
+    if hasExactMatch == 0:
+      self.cursor.execute("INSERT INTO accounts (email, lower_case_email) VALUES (%s, %s)", (email, email.lower()))
 
-    self.cursor.execute("SELECT token FROM login_tokens WHERE email = %s", (email, ))
+    self.cursor.execute("SELECT token FROM login_tokens WHERE email = %s and created > (NOW() - INTERVAL '20 min')", (email, ))
     if len(self.cursor.fetchall()) > 2:
-      return None
+      return (None, ignoreCaseMatches)
 
     token = generate()
     self.cursor.execute("INSERT INTO login_tokens (email, token) VALUES (%s, %s)", (email, token))
     self.connection.commit()
 
-    return token
+    return (token, ignoreCaseMatches)
     
   def consume_token(self, token):
     self.cursor.execute("SELECT email FROM login_tokens WHERE token = %s and created > (NOW() - INTERVAL '20 min')", (token, ))
@@ -40,6 +48,7 @@ class DBModel:
     if row:
       email = row[0]
       self.cursor.execute("DELETE FROM login_tokens WHERE email = %s", (email, ))
+      self.cursor.execute("UPDATE accounts SET ever_logged_in = TRUE WHERE email = %s", (email, ))
       self.connection.commit()
       return email
     return None
@@ -110,7 +119,17 @@ class DBModel:
     self.cursor.execute("UPDATE vms SET last_seen_ipv4 = %s WHERE email = %s AND id = %s", (ipv4, email, id))
     self.connection.commit()
 
-  def create_vm(self, email, id, size, os, ssh_public_keys):
+  def update_vm_ssh_host_keys(self, email, id, ssh_host_keys):
+    for key in ssh_host_keys:
+      self.cursor.execute(""" 
+        INSERT INTO vm_ssh_host_key (email, vm_id, key_type, content, sha256)
+        VALUES  (%s, %s, %s, %s, %s)
+        """, 
+        (email, id, key['key_type'], key['content'], key['sha256'])
+      )
+    self.connection.commit()
+
+  def create_vm(self, email, id, size, os, ssh_authorized_keys):
     self.cursor.execute(""" 
       INSERT INTO vms (email, id, size, os)
       VALUES  (%s, %s, %s, %s)
@@ -118,12 +137,12 @@ class DBModel:
       (email, id, size, os)
     )
     
-    for ssh_public_key in ssh_public_keys:
+    for ssh_authorized_key in ssh_authorized_keys:
       self.cursor.execute(""" 
-        INSERT INTO vm_ssh_public_key (email, vm_id, ssh_public_key_name)
+        INSERT INTO vm_ssh_authorized_key (email, vm_id, ssh_public_key_name)
         VALUES  (%s, %s, %s)
         """, 
-        (email, id, ssh_public_key)
+        (email, id, ssh_authorized_key)
       )
     self.connection.commit()
 
@@ -151,11 +170,19 @@ class DBModel:
     )
 
     self.cursor.execute(""" 
-      SELECT ssh_public_key_name FROM vm_ssh_public_key 
-      WHERE vm_ssh_public_key.email = %s AND vm_ssh_public_key.vm_id = %s""", 
+      SELECT ssh_public_key_name FROM vm_ssh_authorized_key 
+      WHERE vm_ssh_authorized_key.email = %s AND vm_ssh_authorized_key.vm_id = %s""", 
       (email, id)
     )
-    vm["ssh_public_keys"] = list(map( lambda x: x[0], self.cursor.fetchall() ))
+    vm["ssh_authorized_keys"] = list(map( lambda x: x[0], self.cursor.fetchall() ))
+
+
+    self.cursor.execute(""" 
+      SELECT key_type, content, sha256 FROM vm_ssh_host_key 
+      WHERE vm_ssh_host_key.email = %s AND vm_ssh_host_key.vm_id = %s""", 
+      (email, id)
+    )
+    vm["ssh_host_keys"] = list(map( lambda x: dict(key_type=x[0], content=x[1], sha256=x[2]), self.cursor.fetchall() ))
 
     return vm
 
@@ -247,7 +274,7 @@ class DBModel:
     if row:
       self.cursor.execute( "DELETE FROM unresolved_btcpay_invoices WHERE id = %s", (id,) )
       if not completed:
-        self.cursor.execute("UPDATE payments SET invalidated = True WHERE email = %s id = %s", (row[0], row[1]))
+        self.cursor.execute("UPDATE payments SET invalidated = TRUE WHERE email = %s id = %s", (row[0], row[1]))
       
       self.connection.commit()
         
@@ -268,7 +295,7 @@ class DBModel:
     self.connection.commit()
 
   def all_accounts(self):
-    self.cursor.execute("SELECT email, account_balance_warning FROM accounts")
+    self.cursor.execute("SELECT email, account_balance_warning FROM accounts WHERE ever_logged_in = TRUE ")
     return list(map(lambda row: dict(email=row[0], account_balance_warning=row[1]), self.cursor.fetchall()))