diff options
| author | Louis Burda <quent.burda@gmail.com> | 2021-10-29 16:20:54 +0200 |
|---|---|---|
| committer | Louis Burda <quent.burda@gmail.com> | 2021-10-29 16:38:48 +0200 |
| commit | 4de4654b1e9012ade6e500895c34b0cc3d7cd06c (patch) | |
| tree | 100b27958b71ad232283e1a78adf1ebc3e92f9ed | |
| parent | 970ca7366a682bed47fdc3bd720495e93928c28c (diff) | |
| download | bambi6-service-postit-4de4654b1e9012ade6e500895c34b0cc3d7cd06c.tar.gz bambi6-service-postit-4de4654b1e9012ade6e500895c34b0cc3d7cd06c.zip | |
flush rsa key gen messages, reduce number of keys for ci runner
| -rw-r--r-- | .github/workflows/enochecker_test.yml | 2 | ||||
| -rw-r--r-- | checker/docker-compose.yml | 1 | ||||
| -rw-r--r-- | checker/entrypoint.sh | 11 | ||||
| -rw-r--r-- | checker/src/util.py | 6 |
4 files changed, 13 insertions, 7 deletions
diff --git a/.github/workflows/enochecker_test.yml b/.github/workflows/enochecker_test.yml index 587ac74..9c37315 100644 --- a/.github/workflows/enochecker_test.yml +++ b/.github/workflows/enochecker_test.yml @@ -49,7 +49,7 @@ jobs: - name: Start checker run: | cd checker - docker-compose up -d + CI_RUNNER=1 docker-compose up -d - name: Obtain Docker host IP run: | echo "ENOCHECKER_TEST_SERVICE_ADDRESS=$(ip -4 address show dev eth0 | grep inet | awk '{ print $2 }' | sed 's|/.*$||')" >> $GITHUB_ENV diff --git a/checker/docker-compose.yml b/checker/docker-compose.yml index 3679028..28c1315 100644 --- a/checker/docker-compose.yml +++ b/checker/docker-compose.yml @@ -13,6 +13,7 @@ services: - MONGO_PORT=27017 - MONGO_USER=postit_mongo - MONGO_PASSWORD=postit_mongo + - CI_RUNNER=${CI_RUNNER} mem_limit: 1G memswap_limit: 2G ulimits: diff --git a/checker/entrypoint.sh b/checker/entrypoint.sh index f75152c..606409f 100644 --- a/checker/entrypoint.sh +++ b/checker/entrypoint.sh @@ -2,20 +2,23 @@ set -e +env + python3 -c ' from Crypto.PublicKey import RSA from sys import argv -from os import listdir +from os import environ, listdir -count = 500 +# use less keys for ci runner +count = 30 if environ.get("CI_RUNNER") == "1" else 500 files = listdir("keys") for i in range(len(files), count): with open(f"keys/{i}.rsa", "w+") as f: - print(f"\rGenerating key {i+1}/{count}", end="") + print(f"Generating key {i+1}/{count}", flush=True) rsa = RSA.generate(1024, e=3) f.write(f"{rsa.e} {rsa.d} {rsa.n}") -print() +print(f"{count} keys available.", flush=True) ' /home/checker/.local/bin/gunicorn -c gunicorn.conf.py checker:app diff --git a/checker/src/util.py b/checker/src/util.py index b85cd17..8f27384 100644 --- a/checker/src/util.py +++ b/checker/src/util.py @@ -6,6 +6,7 @@ import string import time from base64 import b64encode from logging import LoggerAdapter +from os import path from typing import Any leetconv = { @@ -20,9 +21,10 @@ leetconv = { "T": "7", } -wordlist = open("media/wordlist").read().replace(" ", "").split("\n") +srcdir = path.dirname(path.abspath(__file__)) +wordlist = open(f"{srcdir}/media/wordlist").read().replace(" ", "").split("\n") names = [line for line in wordlist if line != ""] -rickroll = open("media/rickroll.b64").read().replace("\n", "") +rickroll = open(f"{srcdir}/media/rickroll.b64").read().replace("\n", "") messages = [ "Remember: invite Paul to lan party", "Shopping list: tomatoes and potatoes", |