wip

tabby/app/admin.py

@@ -1,11 +1,14 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
-from .models import User, Config
+from .models import Gateway, User, Config
+
 
 class CustomUserAdmin(UserAdmin):
     fieldsets = UserAdmin.fieldsets + (
         (None, {'fields': ('custom_connection_gateway', 'custom_connection_gateway_token')}),
     )
 
+
 admin.site.register(User, CustomUserAdmin)
 admin.site.register(Config)
+admin.site.register(Gateway)

tabby/app/api.py

@@ -1,9 +1,10 @@
 import os
+import random
 from dataclasses import dataclass
 from django.conf import settings
 from django.contrib.auth import logout
 from rest_framework import fields
-from rest_framework.exceptions import PermissionDenied
+from rest_framework.exceptions import PermissionDenied, NotFound
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.mixins import ListModelMixin, RetrieveModelMixin, UpdateModelMixin
@@ -12,7 +13,7 @@ from rest_framework.viewsets import GenericViewSet, ModelViewSet
 from rest_framework.serializers import ModelSerializer, Serializer
 from rest_framework_dataclasses.serializers import DataclassSerializer
 
-from .models import Config, User
+from .models import Config, Gateway, User
 
 
 @dataclass
@@ -25,6 +26,17 @@ class AppVersionSerializer(DataclassSerializer):
         dataclass = AppVersion
 
 
+class GatewaySerializer(ModelSerializer):
+    url = fields.SerializerMethodField()
+
+    class Meta:
+        fields = '__all__'
+        model = Gateway
+
+    def get_url(self, gw):
+        return f'{"wss" if gw.secure else "ws"}://{gw.host}:{gw.port}/'
+
+
 class ConfigSerializer(ModelSerializer):
     class Meta:
         model = Config
@@ -103,3 +115,14 @@ class InstanceInfoViewSet(RetrieveModelMixin, GenericViewSet):
         return {
             'login_enabled': settings.ENABLE_LOGIN,
         }
+
+
+class ChooseGatewayViewSet(RetrieveModelMixin, GenericViewSet):
+    queryset = Gateway.objects.filter(enabled=True)
+    serializer_class = GatewaySerializer
+
+    def get_object(self):
+        gateways = list(self.queryset)
+        if not len(gateways):
+            raise NotFound()
+        return random.choice(gateways)

tabby/app/management/commands/add_version.py

@@ -0,0 +1,56 @@
+import logging
+import requests
+import shutil
+import subprocess
+import tempfile
+from django.core.management.base import BaseCommand
+from django.conf import settings
+from pathlib import Path
+
+
+class Command(BaseCommand):
+    help = 'Downloads a new app version'
+
+    def add_arguments(self, parser):
+        parser.add_argument('version', type=str)
+
+    def handle(self, *args, **options):
+        version = options['version']
+        target: Path = settings.APP_DIST_PATH / version
+
+        plugin_list = [
+            'tabby-web-container',
+            'tabby-core',
+            'tabby-settings',
+            'tabby-terminal',
+            'tabby-ssh',
+            'tabby-community-color-schemes',
+            'tabby-web',
+            'tabby-web-demo',
+        ]
+
+        with tempfile.TemporaryDirectory() as tempdir:
+            tempdir = Path(tempdir)
+            for plugin in plugin_list:
+                logging.info(f'Resolving {plugin}@{version}')
+                response = requests.get(f'{settings.NPM_REGISTRY}/{plugin}/{version}')
+                response.raise_for_status()
+                info = response.json()
+                url = info['dist']['tarball']
+
+                logging.info(f'Downloading {plugin}@{version} from {url}')
+                response = requests.get(url)
+
+                with tempfile.NamedTemporaryFile('wb') as f:
+                    f.write(response.content)
+                    plugin_final_target = Path(tempdir) / plugin
+
+                    with tempfile.TemporaryDirectory() as extraction_tmp:
+                        subprocess.check_call(
+                            ['tar', '-xzf', f.name, '-C', str(extraction_tmp)]
+                        )
+                        shutil.move(Path(extraction_tmp) / 'package', plugin_final_target)
+
+            if target.exists():
+                shutil.rmtree(target)
+            shutil.copytree(tempdir, target)

tabby/app/migrations/0001_initial.py

@@ -1,8 +1,10 @@
-# Generated by Django 3.2.3 on 2021-06-05 21:23
+# Generated by Django 3.2.3 on 2021-07-08 17:43
 
+from django.conf import settings
 import django.contrib.auth.models
 import django.contrib.auth.validators
 from django.db import migrations, models
+import django.db.models.deletion
 import django.utils.timezone
 
 
@@ -29,8 +31,11 @@ class Migration(migrations.Migration):
                 ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
                 ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
                 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
-                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
+                ('active_version', models.CharField(max_length=32, null=True)),
+                ('custom_connection_gateway', models.CharField(max_length=255, null=True)),
+                ('custom_connection_gateway_token', models.CharField(max_length=255, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('modified_at', models.DateTimeField(auto_now=True)),
             ],
             options={
                 'verbose_name': 'user',
@@ -41,4 +46,30 @@ class Migration(migrations.Migration):
                 ('objects', django.contrib.auth.models.UserManager()),
             ],
         ),
+        migrations.CreateModel(
+            name='Config',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content', models.TextField(default='{}')),
+                ('last_used_with_version', models.CharField(max_length=32, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('modified_at', models.DateTimeField(auto_now=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='configs', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='active_config',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='app.config'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='groups',
+            field=models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='user_permissions',
+            field=models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions'),
+        ),
     ]

tabby/app/migrations/0002_auto_20210605_2137.py

@@ -1,48 +0,0 @@
-# Generated by Django 3.2.3 on 2021-06-05 21:37
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='active_version',
-            field=models.CharField(max_length=32, null=True),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='created_at',
-            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='modified_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.CreateModel(
-            name='Config',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('content', models.TextField(default='{}')),
-                ('last_used_with_version', models.CharField(max_length=32, null=True)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('modified_at', models.DateTimeField(auto_now=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='configs', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='active_config',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='app.config'),
-        ),
-    ]

tabby/app/migrations/0002_gateway.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.3 on 2021-07-08 20:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Gateway',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('host', models.CharField(max_length=255)),
+                ('port', models.IntegerField(default=1234)),
+                ('enabled', models.BooleanField(default=True)),
+                ('secure', models.BooleanField(default=True)),
+            ],
+        ),
+    ]

tabby/app/migrations/0003_user_custom_connection_gateway.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.3 on 2021-06-20 20:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0002_auto_20210605_2137'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='custom_connection_gateway',
-            field=models.CharField(max_length=255, null=True),
-        ),
-    ]

tabby/app/migrations/0004_user_custom_connection_gateway_token.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.3 on 2021-06-20 20:45
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0003_user_custom_connection_gateway'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='custom_connection_gateway_token',
-            field=models.CharField(max_length=255, null=True),
-        ),
-    ]

tabby/app/models.py

@@ -22,7 +22,11 @@ class User(AbstractUser):
     modified_at = models.DateTimeField(auto_now=True)
 
 
-# @receiver(user_logged_in)
-# def post_login(sender, user, request, **kwargs):
-#     if not user.active_config:
-#         user.active_config = Config.objects.filter()
+class Gateway(models.Model):
+    host = models.CharField(max_length=255)
+    port = models.IntegerField(default=1234)
+    enabled = models.BooleanField(default=True)
+    secure = models.BooleanField(default=True)
+
+    def __str__(self):
+        return f'{self.host}:{self.port}'

tabby/app/urls.py

@@ -14,6 +14,7 @@ urlpatterns = [
     path('api/1/auth/logout', api.LogoutView.as_view()),
     path('api/1/user', api.UserViewSet.as_view({'get': 'retrieve', 'put': 'update'})),
     path('api/1/instance-info', api.InstanceInfoViewSet.as_view({'get': 'retrieve'})),
+    path('api/1/gateways/choose', api.ChooseGatewayViewSet.as_view({'post': 'retrieve'})),
 
     re_path('^(|login|app)$', views.IndexView.as_view()),
 

tabby/app/views.py

@@ -21,6 +21,6 @@ class AppDistView(APIView):
         return static.serve(request, os.path.join(version, path), document_root=str(settings.APP_DIST_PATH))
 
 
-class BuildView(APIView):
-    def get(self, request, path=None, format=None):
-        return static.serve(request, path, document_root=str(settings.BASE_DIR / 'build'))
+# class BuildView(APIView):
+#     def get(self, request, path=None, format=None):
+#         return static.serve(request, path, document_root=str(settings.BASE_DIR / 'build'))

tabby/settings.py

@@ -109,6 +109,29 @@ USE_L10N = True
 
 USE_TZ = True
 
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'formatters': {
+        'simple': {
+            'format': '%(levelname)s %(message)s'
+        },
+    },
+    'handlers': {
+        'console': {
+            'level': 'INFO',
+            'class': 'logging.StreamHandler',
+            'formatter': 'simple'
+        },
+    },
+    'loggers': {
+        '': {
+            'handlers': ['console'],
+            'propagate': False,
+            'level': 'INFO',
+        },
+    },
+}
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.2/howto/static-files/
@@ -140,7 +163,8 @@ SOCIAL_AUTH_GITHUB_SCOPE = ['read:user', 'user:email']
 
 LOGIN_REDIRECT_URL = '/app'
 
-APP_DIST_PATH = os.getenv('APP_DIST_PATH', BASE_DIR / 'app-dist')
+APP_DIST_PATH = Path(os.getenv('APP_DIST_PATH', BASE_DIR / 'app-dist'))
+NPM_REGISTRY = os.getenv('NPM_REGISTRY', 'https://registry.npmjs.org').rstrip('/')
 
 for key in [
     'SOCIAL_AUTH_GITHUB_KEY',
@@ -168,6 +192,12 @@ for key in [
     globals()[key] = int(globals()[key]) if globals()[key] else None
 
 
+for key in [
+    'ENABLE_LOGIN',
+]:
+    globals()[key] = int(globals()[key]) if globals()[key] else None
+
+
 for key in [
     'CONNECTION_GATEWAY_AUTH_CA',
     'CONNECTION_GATEWAY_AUTH_CERTIFICATE',