Merge branch 'release/v0.8.7'

Author: indietyp

ajax/views/admin.py

@@ -1,6 +1,7 @@
 from django.contrib.auth.decorators import login_required, permission_required
 from django.db.models import F, Count, Value, CharField, IntegerField
 from django.views.decorators.http import require_http_methods
+from django.conf import settings
 
 from ajax.views import renderer
 from core.models import User, ServerGroup
@@ -21,7 +22,7 @@ def user(request, page, *args, **kwargs):
 
   ext = User.objects.filter(is_superuser=True) \
     .annotate(server=Value(None, CharField(null=True))) \
-    .annotate(role=Value('root', CharField())) \
+    .annotate(role=Value(settings.ROOT, CharField())) \
     .annotate(role_id=Value(0, IntegerField())) \
     .annotate(location=F('country__code'))
   return renderer(request, 'partials/admin/user.pug', obj, page, extra=ext)

api/lib/steam.py

@@ -33,7 +33,7 @@ def search(query=''):
       files={
       },
     )
-    response = json.loads(response.content)
+    response = json.loads(response.content.decode())
 
     html = etree.HTML(response['html'])
     results = CSSSelector('div.search_row')

api/views/user.py

@@ -6,6 +6,7 @@
 from django.contrib.auth.models import Group, Permission
 from django.db.models import F, Q, DateTimeField, ExpressionWrapper
 from django.utils import timezone
+from django.conf import settings
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 
@@ -173,7 +174,7 @@ def detailed(request, u=None, s=None, validated={}, *args, **kwargs):
 
     if user.is_superuser:
       # fake root role
-      output['roles'].append({'name': 'root',
+      output['roles'].append({'name': settings.ROOT,
                               'server': None,
                               'flags': 'ABCDEFGHIJKLNMNOPQRSTUVXYZ'.lower(),
                               'immunity': 100,

cli/install.sh

@@ -154,7 +154,7 @@ install() {
       case $yn in
           [Yy]* ) read -p "Where should hawthorne be installed? " directory; break;;
           [Nn]* ) break;;
-          * ) echo "Please answer with the answers provided.";;
+          * ) echo "Please answer with the choices provided.";;
       esac
     done
   fi
@@ -226,6 +226,7 @@ install() {
     }
 
     ln -s /usr/local/bin/python3 /usr/bin/python3
+    ln -s /usr/local/bin/pip3 /usr/bin/pip3
     /usr/sbin/setsebool -P httpd_can_network_connect 1
   else
     printf "Your package manager is currently not supported. Please contact the maintainer\n"
@@ -335,6 +336,7 @@ configure() {
       exit 1
     fi
   fi
+  mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u $dbuser mysql
 
   if [ "$stapi" = "" ]; then
     printf "\n\n${GREEN}SteamAPI configuration:${NORMAL}\n"
@@ -379,13 +381,12 @@ configure() {
     while true; do
       read -p "Is your webserver ${BOLD}(A)${NORMAL}pache, ${BOLD}(N)${NORMAL}ginx or ${BOLD}(D)${NORMAL}ifferent? " yn
       case $yn in
-          [Aa]* ) sed -i "s#bind = 'unix:/tmp/sockets/hawthorne.sock'#bind = '127.0.0.1:8000'#g" $directory/gunicorn.conf.py
-                  web="apache"
+          [Aa]* ) web="apache"
                   break;;
           [Nn]* ) break;;
           [Dd]* ) web="unspecified"
                   break;;
-          * ) echo "Please answer with the answers provided.";;
+          * ) echo "Please answer with the choices provided.";;
       esac
     done
   fi
@@ -396,7 +397,7 @@ configure() {
       case $yn in
           [Ii]* ) domain=$(curl -sSSL "https://api.ipify.org/?format=text"); break;;
           [Dd]* ) read -p "Which (sub-)domain will hawthorne be hosted? " domain; break;;
-          * ) echo "Please answer with the answers provided.";;
+          * ) echo "Please answer with the choices provided.";;
       esac
     done
   fi
@@ -422,6 +423,7 @@ configure() {
     export LC_ALL=en_US.UTF-8
 
     sed -i "s#bind = 'unix:/tmp/sockets/hawthorne.sock'#bind = '0.0.0.0:8000'#g" $directory/gunicorn.conf.py
+    sed -i "s#ROOT = 'root'#ROOT = '$ROOT'#g" $directory/panel/local.py
 
     cd $directory
     python3 -m gunicorn.app.wsgiapp panel.wsgi:application
@@ -448,10 +450,12 @@ configure() {
     printf "For additional information about the configuration please refer to ${YELLOW}https://docs.hawthorne.in/#/getting-started?id=web-server-configuration${NORMAL}\n\n\n"
 
     if [ $nginx -ne 2 ]; then
+      echo "$web"
       printf "${GREEN}These example configurations have been specificially generated for your system, they might need some tweaking: ${NORMAL}\n\n\n"
       if [ "$web" = "nginx" ]; then
         sed "s/server_name example.com;/server_name '$domain';/g" $directory/cli/configs/nginx.example.conf
       elif [ "$web" = "apache" ]; then
+        sed -i "s#bind = 'unix:/tmp/sockets/hawthorne.sock'#bind = '127.0.0.1:8000'#g" $directory/gunicorn.conf.py
         sed "s/ServerName example.com/ServerName '$domain'/g" $directory/cli/configs/apache.example.conf
       fi
     fi

cli/toolchain.sh

@@ -58,6 +58,12 @@ update () {
     # echo "ALTER TABLE auth_permission AUTO_INCREMENT = 1;" | python3 manage.py dbshell
     # python3 manage.py migrate --run-syncdb
 
+    dbuser=$(cat panel/local.py | grep -oP "(?<='USER': ')[a-zA-Z0-9\.-]*(?=',)")
+    export MYSQL_PWD=$(cat panel/local.py | grep -oP "(?<='PASSWORD': ')[a-zA-Z0-9\.-]*(?=',)")
+    export MYSQL_HOST=$(cat panel/local.py | grep -oP "(?<='HOST': ')[a-zA-Z0-9\.-]*(?=',)")
+    export MYSQL_TCP_PORT=$(cat panel/local.py | grep -oP "(?<='PORT': ')[a-zA-Z0-9\.-]*(?=',)")
+    mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u $dbuser mysql
+
     hash supervisorctl >/dev/null 2>&1 || {
       printf "${YELLOW}Was unable to detect supervisor - not attempting to restart wsgi\n${NORMAL}"
       exit 1

cli/utils/docker.sh

@@ -5,6 +5,7 @@ DB_PORT=$(echo $DB | sed -nE 's#.*[\:]([0-9]+)\/.*#\1#p')
 DB_PORT=${DB_PORT:-3306}
 
 DEMO=${DEMO:-0}
+ROOT=${ROOT:-root}
 
 edis-server --daemonize yes
 /hawthorne/cli/utils/wait.sh ${DB_HOST}:${DB_PORT}

core/migrations/0063_auto_20180615_2033.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.0.5 on 2018-06-15 20:33
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0062_punishment_is_kicked'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='user',
+            name='tag'
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='tag',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.Tag'),
+        ),
+    ]

core/models.py

@@ -13,6 +13,37 @@ class Meta:
     abstract = True
 
 
+class Tag(BaseModel):
+  name = models.CharField(max_length=255, null=True)
+
+  COLORS = (
+      ("default", "Default Color"),
+      ("teamcolor", "Current Team Color"),
+      ("red", "Red"),
+      ("lightred", "Lighter Red"),
+      ("darkred", "Darker Red"),
+      ("bluegrey", "Blueish Grey"),
+      ("blue", "Blue"),
+      ("darkblue", "Darker Blue"),
+      ("purple", "Purple"),
+      ("orchid", "Orchid"),
+      ("yellow", "Yellow"),
+      ("gold", "Gold"),
+      ("lightgreen", "Lighter Green"),
+      ("green", "Green"),
+      ("lime", "Lime"),
+      ("grey", "Grey"),
+      ("darkgrey", "Darker Grey"),
+  )
+
+  # colors
+  chat = models.CharField(max_length=10, choices=COLORS, default="default")
+  name = models.CharField(max_length=10, choices=COLORS, default="default")
+
+  # nametag
+  base = models.CharField(max_length=10, choices=COLORS, default="default")
+
+
 class Mainframe(BaseModel):
   assigned = models.UUIDField(null=True)
   token = models.UUIDField(null=True)
@@ -57,7 +88,7 @@ class User(AbstractUser):
   created_at = models.DateTimeField(auto_now_add=True)
   updated_at = models.DateTimeField(auto_now=True)
 
-  tag = models.CharField(max_length=255, null=True)
+  tag = models.ForeignKey(Tag, on_delete=models.CASCADE, null=True)
 
   class Meta:
     permissions = [
@@ -167,37 +198,6 @@ def __str__(self):
     return self.convert()
 
 
-class Tag(BaseModel):
-  name = models.CharField(max_length=255, null=True)
-
-  COLORS = (
-      ("default", "Default Color"),
-      ("teamcolor", "Current Team Color"),
-      ("red", "Red"),
-      ("lightred", "Lighter Red"),
-      ("darkred", "Darker Red"),
-      ("bluegrey", "Blueish Grey"),
-      ("blue", "Blue"),
-      ("darkblue", "Darker Blue"),
-      ("purple", "Purple"),
-      ("orchid", "Orchid"),
-      ("yellow", "Yellow"),
-      ("gold", "Gold"),
-      ("lightgreen", "Lighter Green"),
-      ("green", "Green"),
-      ("lime", "Lime"),
-      ("grey", "Grey"),
-      ("darkgrey", "Darker Grey"),
-  )
-
-  # colors
-  chat = models.CharField(max_length=10, choices=COLORS, default="default")
-  name = models.CharField(max_length=10, choices=COLORS, default="default")
-
-  # nametag
-  base = models.CharField(max_length=10, choices=COLORS, default="default")
-
-
 class ServerGroup(BaseModel):
   name = models.CharField(max_length=255)
   flags = models.OneToOneField(ServerPermission, on_delete=models.CASCADE)

interface/templates/partials/admin/user.pug

@@ -24,7 +24,7 @@
       span= data.server|truncatechars:18
   .column.icon.username.pure-u-3-24
     .spacer
-    - if data.role != 'root'
+    - if not data.is_superuser
       - if perms.core.change_user
         .action
           i.animate.opacity.animated(data-feather="edit-2", onclick="window.api.edit('admin__administrator', this)")

panel/defaults.py

@@ -68,3 +68,4 @@
 )
 
 DEMO = False
+ROOT = "root"