slimmed docker image, fixed some LGTM alerts

Author: eshaan7

.dockerignore

@@ -0,0 +1,6 @@
+__pycache__/
+venv/
+*.pyc
+.vscode/
+*.db
+.idea/

Dockerfile

@@ -7,10 +7,8 @@ RUN export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@postgres:${DB_PORT
     && export REDIS_URL="redis://redis:6379/0"
 
 # update and install packages
-RUN apk update \
-    && apk add libpq postgresql-dev \
-    && apk add build-base \
-    && apk add --no-cache git libssl1.1 g++ make libffi-dev
+RUN apk update --no-cache \
+    && apk add --no-cache postgresql-dev build-base g++ libffi-dev
 
 # Add a new low-privileged user
 RUN adduser --shell /sbin/login www-data -DH

docker-compose-for-tests.yml

@@ -14,7 +14,7 @@ services:
       - DB_PASSWORD=eshaan
       - DB_NAME=rtbctf
       - DB_PORT=5432
-      - WORKERS=8
+      - WORKERS=4
       - ADMIN_PASS=admin
     depends_on:
       - postgres

src/FlaskRTBCTF/main/forms.py

@@ -26,6 +26,7 @@ class SettingsForm(FlaskForm):
     @admin_only
     def setup(self):
         if self.is_submitted():
+            step = 3
             try:
                 settings = Settings.query.get(1)
 
@@ -41,16 +42,19 @@ def setup(self):
 
                 cache.delete(key="past_running_time")
                 cache.delete(key="settings")
-                return redirect(url_for("main.setup", step=3))
+                step = 3
 
             except SQLAlchemyError:
                 db.session.rollback()
                 flash("Transaction failed. Please try again.", "danger")
-                return redirect(url_for("main.setup"), step=2)
+                step = 2
 
         else:
             flash("Form validation failed. Please try again.", "danger")
-            return redirect(url_for("main.setup", step=2))
+            step = 2
+
+        return redirect(url_for("main.setup"), step=step)
+        # lgtm [py/call/wrong-named-argument]
 
 
 class WebsiteForm(FlaskForm):
@@ -86,8 +90,9 @@ def setup(self):
             except SQLAlchemyError:
                 db.session.rollback()
                 flash("Transaction failed. Please try again.", "danger")
-                return redirect(url_for("main.setup"), step=3)
 
         else:
             flash("Error: Couldn't save form data.", "danger")
-            return redirect(url_for("main.setup", step=3))
+
+        return redirect(url_for("main.setup"), step=3)
+        # lgtm [py/call/wrong-named-argument]

src/populate_db_for_testing.py

@@ -1022,7 +1022,7 @@ def gen_email():
 
 
 def gen_ip():
-    return "127.0.{0}.{0}".format(random.randint(1, 100), random.randint(1, 100))
+    return "127.0.{0}.{0}".format(random.randint(1, 100))
 
 
 def populate_users():
@@ -1044,7 +1044,7 @@ def populate_users():
                 db.session.add(log)
                 if x % 5 == 0:
                     db.session.commit()
-            except:
+            except Exception as _:
                 pass
 
     db.session.commit()
@@ -1078,7 +1078,7 @@ def populate_challs():
                 db.session.add(chal)
                 if x % 5 == 0:
                     db.session.commit()
-            except:
+            except Exception as _:
                 pass
 
     db.session.commit()
@@ -1109,7 +1109,7 @@ def populate_machines():
                 db.session.add(m)
                 if x % 5 == 0:
                     db.session.commit()
-            except:
+            except Exception as _:
                 pass
 
     db.session.commit()