Level complete (#603)

Adds a new level unlock type #587
moloch-- · Mar 25, 2024 · d642563 · d642563
1 parent 47e6260
commit d642563
Show file tree

Hide file tree

Showing 105 changed files with 772 additions and 583 deletions.
diff --git a/alembic/env.py b/alembic/env.py
@@ -1,8 +1,11 @@
 from __future__ import with_statement
-from alembic import context
-from sqlalchemy import engine_from_config, pool
+
 from logging.config import fileConfig
 
+from sqlalchemy import engine_from_config, pool
+
+from alembic import context
+
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
 # alembic.context is only available for the env.py

diff --git a/alembic/versions/098ab7c733ea_add_user_to_flag.py b/alembic/versions/098ab7c733ea_add_user_to_flag.py
@@ -5,9 +5,9 @@
 Create Date: 2021-08-08 23:03:49.444306
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "098ab7c733ea"

diff --git a/alembic/versions/18d11f218dfe_box_rewards.py b/alembic/versions/18d11f218dfe_box_rewards.py
@@ -5,9 +5,9 @@
 Create Date: 2019-06-24 11:48:06.497803
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "18d11f218dfe"

diff --git a/alembic/versions/1ee5b63e716f_add_plain_answer_flag.py b/alembic/versions/1ee5b63e716f_add_plain_answer_flag.py
@@ -5,11 +5,11 @@
 Create Date: 2024-02-15 11:17:27.270274
 
 """
-from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.sql.expression import func
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = '1ee5b63e716f'

diff --git a/alembic/versions/31918b83c372_add_box_order.py b/alembic/versions/31918b83c372_add_box_order.py
@@ -5,9 +5,9 @@
 Create Date: 2022-10-12 23:02:22.212759
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "31918b83c372"

diff --git a/alembic/versions/324e65d824d1_fix_password_token_length.py b/alembic/versions/324e65d824d1_fix_password_token_length.py
@@ -5,9 +5,9 @@
 Create Date: 2020-11-07 10:41:52.945898
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "324e65d824d1"

diff --git a/alembic/versions/469f428604aa_box__capture_message.py b/alembic/versions/469f428604aa_box__capture_message.py
@@ -5,9 +5,9 @@
 Create Date: 2019-04-06 21:11:56.017968
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "469f428604aa"

diff --git a/alembic/versions/4aa1bab989f8_add_email_token.py b/alembic/versions/4aa1bab989f8_add_email_token.py
@@ -5,9 +5,9 @@
 Create Date: 2021-01-29 13:39:42.842889
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "4aa1bab989f8"

diff --git a/alembic/versions/5ca019edf61f_cascade_on_delete.py b/alembic/versions/5ca019edf61f_cascade_on_delete.py
@@ -5,9 +5,9 @@
 Create Date: 2019-06-23 05:49:26.061932
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "5ca019edf61f"

diff --git a/alembic/versions/67bf6ca63a9c_add_email_field.py b/alembic/versions/67bf6ca63a9c_add_email_field.py
@@ -5,9 +5,9 @@
 Create Date: 2018-12-09 22:51:59.947266
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "67bf6ca63a9c"

diff --git a/alembic/versions/71aa3c94b7f5_juiceshop_updates.py b/alembic/versions/71aa3c94b7f5_juiceshop_updates.py
@@ -5,9 +5,9 @@
 Create Date: 2019-11-14 08:52:52.530520
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "71aa3c94b7f5"

diff --git a/alembic/versions/729a5113fc9c_flag_original_value_null.py b/alembic/versions/729a5113fc9c_flag_original_value_null.py
@@ -5,9 +5,9 @@
 Create Date: 2019-02-26 21:13:42.243218
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "729a5113fc9c"

diff --git a/alembic/versions/83f862086ff0_add_flag_lock.py b/alembic/versions/83f862086ff0_add_flag_lock.py
@@ -5,9 +5,9 @@
 Create Date: 2022-05-13 21:46:22.838283
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "83f862086ff0"

diff --git a/alembic/versions/8fa7d8ac2b2f_add_password_token_table.py b/alembic/versions/8fa7d8ac2b2f_add_password_token_table.py
@@ -5,9 +5,9 @@
 Create Date: 2020-09-06 19:23:34.831352
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "8fa7d8ac2b2f"

diff --git a/alembic/versions/9443ded40161_add_box_lock.py b/alembic/versions/9443ded40161_add_box_lock.py
@@ -5,9 +5,9 @@
 Create Date: 2020-03-07 17:01:22.454528
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "9443ded40161"

diff --git a/alembic/versions/9783dbd4d5fe_add_original_value.py b/alembic/versions/9783dbd4d5fe_add_original_value.py
@@ -5,9 +5,9 @@
 Create Date: 2018-12-09 16:53:45.599267
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "9783dbd4d5fe"

diff --git a/alembic/versions/a143abd40133_expand_field_size.py b/alembic/versions/a143abd40133_expand_field_size.py
@@ -5,10 +5,12 @@
 Create Date: 2023-08-14 17:01:22.454528
 
 """
-from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.sql.expression import func
+
+from alembic import op
+
 try:
     conn = op.get_bind()
     inspector = Inspector.from_engine(conn)

diff --git a/alembic/versions/bc091b7be912_add_descriptive_columns.py b/alembic/versions/bc091b7be912_add_descriptive_columns.py
@@ -5,9 +5,9 @@
 Create Date: 2020-03-03 18:23:40.855666
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "bc091b7be912"

diff --git a/alembic/versions/bd7bd19e98bd_sourcecode_cascade.py b/alembic/versions/bd7bd19e98bd_sourcecode_cascade.py
@@ -5,9 +5,9 @@
 Create Date: 2020-02-22 10:37:39.239191
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "bd7bd19e98bd"

diff --git a/alembic/versions/cd4d09aa9c68_rename_column_visible.py b/alembic/versions/cd4d09aa9c68_rename_column_visible.py
@@ -5,9 +5,9 @@
 Create Date: 2022-01-05 10:00:05.629776
 
 """
-from alembic import op
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "cd4d09aa9c68"

diff --git a/alembic/versions/de5d615ae090_add_user_to_penalty_stat.py b/alembic/versions/de5d615ae090_add_user_to_penalty_stat.py
@@ -6,9 +6,10 @@
 
 """
 import sqlalchemy as sa
-from alembic import op
 from sqlalchemy.engine.reflection import Inspector
 
+from alembic import op
+
 try:
     conn = op.get_bind()
     inspector = Inspector.from_engine(conn)

diff --git a/alembic/versions/eb3f7dc1b16f_add_flag__order_field.py b/alembic/versions/eb3f7dc1b16f_add_flag__order_field.py
@@ -6,9 +6,10 @@
 
 """
 import sqlalchemy as sa
-from alembic import op
 from sqlalchemy.engine.reflection import Inspector
 
+from alembic import op
+
 try:
     conn = op.get_bind()
     inspector = Inspector.from_engine(conn)

diff --git a/alembic/versions/f443eed40161_add_corp_lock.py b/alembic/versions/f443eed40161_add_corp_lock.py
@@ -5,11 +5,12 @@
 Create Date: 2023-05-27 17:01:22.454528
 
 """
-from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.sql.expression import func
 
+from alembic import op
+
 try:
     conn = op.get_bind()
     inspector = Inspector.from_engine(conn)

diff --git a/alembic/versions/fe5e615ae090_add_game_history_table.py b/alembic/versions/fe5e615ae090_add_game_history_table.py
@@ -6,10 +6,11 @@
 
 """
 import sqlalchemy as sa
-from alembic import op
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.sql.expression import func
 
+from alembic import op
+
 try:
     conn = op.get_bind()
     inspector = Inspector.from_engine(conn)

diff --git a/alembic/versions/ffe623ae412_delete_snapshot_tables.py b/alembic/versions/ffe623ae412_delete_snapshot_tables.py
@@ -5,12 +5,14 @@
 Create Date: 2023-03-11 19:33:02.808038
 
 """
-import sqlalchemy as sa
 from datetime import datetime
-from alembic import op
+
+import sqlalchemy as sa
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.sql.expression import func
 
+from alembic import op
+
 try:
     conn = op.get_bind()
     inspector = Inspector.from_engine(conn)

diff --git a/bot/BotMonitor.py b/bot/BotMonitor.py
@@ -33,29 +33,31 @@
 ###################
 # > Imports
 ###################
-import os
-import sys
-import time
-import json
-import uuid
+import argparse
 import array
-import struct
 import base64
-import socket
-import random
 import hashlib
+import json
 import logging
-import argparse
+import os
 import platform
+import random
+import socket
+import struct
+import sys
 import threading
-from builtins import range, object, chr, str
+import time
+import uuid
+from builtins import chr, object, range, str
+
 from past.utils import old_div
 
 try:
     from urllib.parse import urlparse
 except ImportError:
     from urlparse import urlparse
 from datetime import datetime
+
 from libs.StringCoding import encode
 
 try: