From 978b432d7e0a62872103535ca8928d94594f090c Mon Sep 17 00:00:00 2001 From: mcbloch Date: Wed, 1 Jun 2022 17:18:47 +0200 Subject: [PATCH 1/3] use base58 for slugs to remove doubt --- app/models/order.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/order.py b/app/models/order.py index 1405563..3d9f84a 100644 --- a/app/models/order.py +++ b/app/models/order.py @@ -11,9 +11,11 @@ from utils import first from .database import db from .user import User +BASE58_ALPHABET = \ + b'123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz' + def generate_slug(): - alphabet = string.ascii_letters + string.digits - secret = ''.join(secrets.choice(alphabet) for i in range(7)) + secret = ''.join(secrets.choice(BASE58_ALPHABET) for i in range(7)) while Order.query.filter(Order.slug == secret).first() is not None: secret = ''.join(secrets.choice(alphabet) for i in range(7)) return secret From 2bdd07c9afb3df50303b56232a753139d985a53a Mon Sep 17 00:00:00 2001 From: Maxime <12089026+mcbloch@users.noreply.github.com> Date: Wed, 1 Jun 2022 17:24:27 +0200 Subject: [PATCH 2/3] Update app/models/order.py Co-authored-by: Charlotte Van Petegem --- app/models/order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/order.py b/app/models/order.py index 3d9f84a..a56c121 100644 --- a/app/models/order.py +++ b/app/models/order.py @@ -17,7 +17,7 @@ BASE58_ALPHABET = \ def generate_slug(): secret = ''.join(secrets.choice(BASE58_ALPHABET) for i in range(7)) while Order.query.filter(Order.slug == secret).first() is not None: - secret = ''.join(secrets.choice(alphabet) for i in range(7)) + secret = ''.join(secrets.choice(BASE58_ALPHABET) for i in range(7)) return secret class Order(db.Model): From 5d204a40125991ef10650b0673faf43ecdb4e430 Mon Sep 17 00:00:00 2001 From: mcbloch Date: Wed, 1 Jun 2022 17:36:52 +0200 Subject: [PATCH 3/3] use a string, not bytes --- app/models/order.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/order.py b/app/models/order.py index a56c121..8c09cbd 100644 --- a/app/models/order.py +++ b/app/models/order.py @@ -11,8 +11,7 @@ from utils import first from .database import db from .user import User -BASE58_ALPHABET = \ - b'123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz' +BASE58_ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz' def generate_slug(): secret = ''.join(secrets.choice(BASE58_ALPHABET) for i in range(7))