create TestHTTPClient that uses werkzueg test client, tests are passing

request

.env.sample

@@ -1,11 +0,0 @@
-# Optional, default `mock`
-#SPOKE_MODEL=shell-scripts
-# Optional, default `0`
-#FLASK_DEBUG=0
-# Optional, default `http://localhost:5000`
-#BASE_URL=http://localhost:5000
-# Optional, default `qemu:///system` if you're root, otherwise `qemu:///session`
-#VIRSH_DEFAULT_CONNECT_URI=qemu:///system
-#ADMIN_PANEL_ALLOW_EMAIL_ADDRESSES=3wc.capsul@doesthisthing.work
-# Optional, default no theme
-#THEME=yolocolo

.gitignore

@@ -11,7 +11,6 @@ instance/
 .pytest_cache/
 .coverage
 htmlcov/
-/unittest-log-output.log
 
 dist/
 build/

capsulflask/__init__.py

@@ -59,7 +59,6 @@ def create_app(http_client_factory):
     LOG_LEVEL=config.get("LOG_LEVEL", "INFO"),
     SPOKE_HOST_ID=config.get("SPOKE_HOST_ID", "baikal"),
     SPOKE_HOST_TOKEN=config.get("SPOKE_HOST_TOKEN", "changeme"),
-    SSH_USERNAME=os.environ.get("SSH_USERNAME", default="cyberian"),
     HUB_TOKEN=config.get("HUB_TOKEN", "changeme"),
 
     # https://www.postgresql.org/docs/9.1/libpq-ssl.html#LIBPQ-SSL-SSLMODE-STATEMENTS

capsulflask/cli.py

@@ -62,18 +62,6 @@ 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

@@ -27,14 +27,12 @@ def make_capsul_id():
   letters_n_nummers = generate(alphabet="1234567890qwertyuiopasdfghjklzxcvbnm", size=10)
   return f"capsul-{letters_n_nummers}"
 
-def double_check_capsul_address(id, ipv4, ipv6, get_ssh_host_keys):
+def double_check_capsul_address(id, ipv4, get_ssh_host_keys):
   try:
     result = current_app.config["HUB_MODEL"].get(id, get_ssh_host_keys)
     if result != None and result.ipv4 != None and result.ipv4 != ipv4:
-      get_model().update_vm_ipv4(email=session["account"], id=id, ipv4=result.ipv4)
-
-    if result != None and result.ipv6 != None and result.ipv6 != ipv6:
-      get_model().update_vm_ipv6(email=session["account"], id=id, ipv6=result.ipv6)
+      ipv4 = result.ipv4
+      get_model().update_vm_ip(email=session["account"], id=id, ipv4=result.ipv4)
 
     if result != None and result.ssh_host_keys != None and get_ssh_host_keys:
       get_model().update_vm_ssh_host_keys(email=session["account"], id=id, ssh_host_keys=result.ssh_host_keys)
@@ -61,37 +59,36 @@ def index():
   # for now we are going to check the IP according to the virt model
   # on every request. this could be done by a background job and cached later on...
   for vm in vms:
-    result = double_check_capsul_address(vm["id"], vm["ipv4"], vm["ipv6"], False)
+    result = double_check_capsul_address(vm["id"], vm["ipv4"], False)
     if result is not None:
       vm["ipv4"] = result.ipv4
-      vm["ipv6"] = result.ipv6
       vm["state"] = result.state
     else:
       vm["state"] = "unknown"
 
+
   mappedVms = []
   for vm in vms:
-    ip_display = {}
-    ip_display_class = {}
-    for af in ['ipv4', 'ipv6']:
-      ip_display[af] = vm[af]
-      ip_display_class[af] = "ok"
-      if not ip_display[af]:
-        if vm["state"] == "running":
-          ip_display[af] = "..booting.."
-          ip_display_class[af] = "waiting-pulse"
-        else:
-          ip_display[af] = "unknown"
-          ip_display_class[af] = "yellow"
+    ip_display = vm['ipv4']
+    if not ip_display:
+      if vm["state"] == "running":
+        ip_display = "..booting.."
+      else:
+        ip_display = "unknown"
+
+    ip_display_class = "ok"
+    if not vm['ipv4']:
+      if vm["state"] == "running":
+        ip_display_class = "waiting-pulse"
+      else:
+        ip_display_class = "yellow"
 
     mappedVms.append(dict(
       id=vm['id'], 
       size=vm['size'], 
       state=vm['state'],
-      ipv4=ip_display['ipv4'],
-      ipv4_status=ip_display_class['ipv4'],
-      ipv6=ip_display['ipv6'],
-      ipv6_status=ip_display_class['ipv6'],
+      ipv4=ip_display, 
+      ipv4_status=ip_display_class, 
       os=vm['os'], 
       created=vm['created'].strftime("%b %d %Y")
     ))
@@ -111,8 +108,6 @@ def detail(id):
   if vm is None:
     return abort(404, f"{id} doesn't exist.")
 
-  vm['ssh_username'] = current_app.config['SSH_USERNAME']
-
   if vm['deleted']:
     return render_template("capsul-detail.html", vm=vm, delete=True, deleted=True)
 
@@ -172,11 +167,10 @@ def detail(id):
   else:
     needs_ssh_host_keys = "ssh_host_keys" not in vm or len(vm["ssh_host_keys"]) == 0
 
-    vm_from_virt_model = double_check_capsul_address(vm["id"], vm["ipv4"], vm['ipv6'], needs_ssh_host_keys)
+    vm_from_virt_model = double_check_capsul_address(vm["id"], vm["ipv4"], needs_ssh_host_keys)
     
     if vm_from_virt_model is not None:
       vm["ipv4"] = vm_from_virt_model.ipv4
-      vm["ipv6"] = vm_from_virt_model.ipv6
       vm["state"] = vm_from_virt_model.state
       if needs_ssh_host_keys:
         vm["ssh_host_keys"] = vm_from_virt_model.ssh_host_keys

capsulflask/db.py

@@ -43,7 +43,7 @@ def init_app(app, is_running_server):
   hasSchemaVersionTable = False
   actionWasTaken = False
   schemaVersion = 0
-  desiredSchemaVersion = 19
+  desiredSchemaVersion = 18
 
   cursor = connection.cursor()
 

capsulflask/db_model.py

@@ -144,14 +144,10 @@ class DBModel:
       self.cursor.fetchall()
     ))
 
-  def update_vm_ipv4(self, email, id, ipv4):
+  def update_vm_ip(self, email, id, ipv4):
     self.cursor.execute("UPDATE vms SET public_ipv4 = %s WHERE email = %s AND id = %s", (ipv4, email, id))
     self.connection.commit()
 
-  def update_vm_ipv6(self, email, id, ipv6):
-    self.cursor.execute("UPDATE vms SET public_ipv6 = %s WHERE email = %s AND id = %s", (ipv6, email, id))
-    self.connection.commit()
-
   def update_vm_ssh_host_keys(self, email, id, ssh_host_keys):
     for key in ssh_host_keys:
       self.cursor.execute(""" 

capsulflask/landing.py

@@ -23,7 +23,7 @@ def pricing():
 
 @bp.route("/faq")
 def faq():
-  return render_template("faq.html", ssh_username=current_app.config['SSH_USERNAME'])
+  return render_template("faq.html")
 
 @bp.route("/about-ssh")
 def about_ssh():

capsulflask/schema_migrations/19_down_os_updates.sql

@@ -1,8 +0,0 @@
-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_os_updates.sql

@@ -1,12 +0,0 @@
-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/shell_scripts/get.sh

@@ -29,8 +29,7 @@ if virsh domuuid "$vmname" | grep -vqE '^[\t\s\n]*$'; then
   esac
 fi
 
-# this gets the vm ip addresses
-ipv4="$(virsh domifaddr "$vmname" | awk '/ipv4/ {print $4}' | cut -d'/' -f1)"
-ipv6="$(virsh domifaddr "$vmname" | awk '/ipv6/ {print $4}' | cut -d'/' -f1)"
+# this gets the ipv4
+ipv4="$(virsh domifaddr "$vmname" | awk '/vnet/ {print $4}' | cut -d'/' -f1)"
 
-echo "$exists $state $ipv4 $ipv6"
+echo "$exists $state $ipv4"

capsulflask/spoke_model.py

@@ -114,30 +114,24 @@ class ShellScriptSpoke(VirtualizationInterface):
     if len(fields) < 3:
       return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], state=state)
 
-    ip4addr = fields[2]
+    ipaddr = fields[2]
 
-    if not re.match(r"^([0-9]{1,3}\.){3}[0-9]{1,3}$", ip4addr):
+    if not re.match(r"^([0-9]{1,3}\.){3}[0-9]{1,3}$", ipaddr):
       return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], state=state)
 
     if get_ssh_host_keys:
       try:
-        completedProcess2 = run([join(current_app.root_path, 'shell_scripts/ssh-keyscan.sh'), ip4addr], capture_output=True)
+        completedProcess2 = run([join(current_app.root_path, 'shell_scripts/ssh-keyscan.sh'), ipaddr], capture_output=True)
         self.validate_completed_process(completedProcess2)
         ssh_host_keys = json.loads(completedProcess2.stdout.decode("utf-8"))
-        return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], state=state, ipv4=ip4addr, ssh_host_keys=ssh_host_keys)
+        return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], state=state, ipv4=ipaddr, ssh_host_keys=ssh_host_keys)
       except:
         mylog_warning(current_app, f"""
-          failed to ssh-keyscan {id} at {ip4addr}:
+          failed to ssh-keyscan {id} at {ipaddr}:
           {my_exec_info_message(sys.exc_info())}"""
         )
 
-    if len(fields) < 4:
-        return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], state=state, ipv4=ip4addr)
-
-    ip6addr = fields[3]
-
-    return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], state=state, ipv4=ip4addr, ipv6=ip6addr)
-
+    return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], state=state, ipv4=ipaddr)
 
   def list_ids(self) -> list:
     completedProcess = run([join(current_app.root_path, 'shell_scripts/list-ids.sh')], capture_output=True)

capsulflask/templates/capsul-detail.html

@@ -79,10 +79,6 @@
         <label class="align" for="ipv4">IPv4 Address</label>
         <span id="ipv4">{{ vm['ipv4'] }}</span>
       </div>
-      <div class="row justify-start">
-        <label class="align" for="ipv6">IPv6 Address</label>
-        <span id="ipv6">{{ vm['ipv6'] }}</span>
-      </div>
       <div class="row justify-start">
         <label class="align" for="os_description">Operating System</label>
         <span id="os_description">{{ vm['os_description'] }}</span>
@@ -101,7 +97,7 @@
       </div>
       <div class="row justify-start">
         <label class="align" for="ssh_username">SSH Username</label>
-        <span id="ssh_username">{{ vm['ssh_username'] }}</span>
+        <span id="ssh_username">cyberian</span>
       </div>
       <div class="row justify-start">
         <label class="align" for="ssh_authorized_keys">SSH Authorized Keys</label>

capsulflask/templates/faq.html

@@ -21,13 +21,13 @@
    </li>
    <li>
      How do I log in?
-     <p>ssh to the ip provided to you using the "{{ ssh_username }}" user.</p>
-     <pre class='code'>$ ssh {{ ssh_username }}@1.2.3.4</pre>
+     <p>ssh to the ip provided to you using the cyberian user.</p>
+     <pre class='code'>$ ssh cyberian@1.2.3.4</pre>
      <p>For more information, see <a href="/about-ssh">Understanding the Secure Shell Protocol (SSH)</a>.</p>
    </li>
    <li>
      How do I change to the root user?
-     <p>The "{{ ssh_username }}" user has passwordless sudo access by default. This should work:</p>
+     <p>The cyberian user has passwordless sudo access by default. This should work:</p>
      <pre class='code'>
 # Linux
 $ sudo su -

capsulflask/templates/support.html

@@ -7,11 +7,18 @@
     <h1>SUPPORT</h1>
   </div>
   <div class="row half-margin">
-    <a href="mailto:support@cyberia.club?subject=capsul%20support%20request">support@cyberia.club</a>
+    <a href="mailto:support@cyberia.club?subject=Please%20help!">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>

capsulflask/tests/test_auth.py

@@ -12,6 +12,8 @@ class LoginTests(BaseTestCase):
             response = client.get(url_for("auth.login"))
             self.assert_200(response)
 
+            # FIXME test generated login link
+
     def test_login_magiclink(self):
         token, ignoreCaseMatches = get_model().login('test@example.com')
 

capsulflask/tests/test_console.py

@@ -29,6 +29,7 @@ class ConsoleTests(BaseTestCase):
     def setUp(self):
         super().setUp()
 
+
         get_model().cursor.execute("DELETE FROM host_operation")
         get_model().cursor.execute("DELETE FROM operations")
         get_model().cursor.execute("DELETE FROM vm_ssh_host_key")
@@ -47,6 +48,8 @@ class ConsoleTests(BaseTestCase):
         for host_id in host_ids:
           get_model().host_heartbeat(host_id)
 
+      
+
     def test_index(self):
         self._login('test@example.com')
         with self.client as client:
@@ -77,6 +80,7 @@ class ConsoleTests(BaseTestCase):
                 0
             )
 
+
     def test_create_fails_capacity(self):
         with self.client as client:
 
@@ -158,6 +162,7 @@ class ConsoleTests(BaseTestCase):
                 url_for("console.index") + f'?created={vm_id}'
             )
 
+
     def test_keys_loads(self):
         self._login('test@example.com')
         with self.client as client:
@@ -210,3 +215,5 @@ class ConsoleTests(BaseTestCase):
                 'A key with that name already exists',
                 category='message'
             )
+
+

docker-compose.yml

@@ -15,8 +15,8 @@ services:
       - "5000:5000"
     environment:
       - "POSTGRES_CONNECTION_PARAMETERS=host=db port=5432 user=capsul password=capsul dbname=capsul"
-      - SPOKE_MODEL
-      - FLASK_DEBUG
+      - SPOKE_MODEL=shell-scripts
+        #- FLASK_DEBUG=1
       - BASE_URL=http://localhost:5000
       - ADMIN_PANEL_ALLOW_EMAIL_ADDRESSES=3wc.capsul@doesthisthing.work
       - VIRSH_DEFAULT_CONNECT_URI=qemu:///system

docs/configuration.md

@@ -3,7 +3,6 @@
 Create a `.env` file to set up the application configuration:
 
 ```
-cp .env.sample .env
 nano .env
 ```