Skip to content

Commit a361bbc

Browse files
authored
enforce lowercase of username when created (#332)
Signed-off-by: vsoch <vsochat@stanford.edu>
1 parent 0c88404 commit a361bbc

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ represented by the pull requests that fixed them. Critical items to know are:
1212

1313

1414
## [master](https://github.com/singularityhub/sregistry/tree/master) (master)
15+
- enforcing usernames to be all lowercase (1.1.29)
1516
- Added ability to specify Minio direct download from interface (1.1.28)
1617
- Adding cleanup for Minio images no longer referenced in sregistry (1.1.27)
1718
- Django various updates, version bump 2.2.10 to 2.2.13 (1.1.26)

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.28
1+
1.1.29

shub/apps/api/actions/push.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ def collection_auth_check(request):
6262
payload = "push|%s|%s|%s|%s|" % (collection_name, timestamp, name, tag)
6363

6464
# Validate Payload
65-
print(payload)
6665
if not validate_request(auth, payload, "push", timestamp):
6766
raise PermissionDenied(detail="Unauthorized")
6867

shub/apps/main/query.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
def collection_query(q):
1818
return Collection.objects.filter(
1919
Q(name__contains=q)
20-
| Q(containers__name__contains=q)
21-
| Q(containers__tags__name__contains=q)
22-
| Q(containers__tag__contains=q)
20+
| Q(containers__name__icontains=q)
21+
| Q(containers__tags__name__icontains=q)
22+
| Q(containers__tag__icontains=q)
2323
).distinct()
2424

2525

@@ -35,7 +35,7 @@ def container_query(q, across_collections=1):
3535

3636
# Query across collections for image name and tag
3737
return Container.objects.filter(
38-
Q(name__contains=q["image"]) | Q(tag__contains=q["tag"])
38+
Q(name__icontains=q["image"]) | Q(tag__icontains=q["tag"])
3939
).distinct()
4040

4141
# Query across collections for image name
@@ -44,14 +44,14 @@ def container_query(q, across_collections=1):
4444
# Query a particular collection for image name and tag
4545
if q["tag"] is not None:
4646
return Collection.objects.filter(
47-
Q(name__contains=q["image"])
48-
| Q(collection__name__contains=q["collection"])
49-
| Q(containers_tags__contains=q["tag"])
47+
Q(name__icontains=q["image"])
48+
| Q(collection__name__icontains=q["collection"])
49+
| Q(containers_tags__icontains=q["tag"])
5050
).distinct()
5151

5252
# Query a particular collection for image name
5353
return Collection.objects.filter(
54-
Q(name__contains=q["image"]) | Q(collection__name__contains=q["collection"])
54+
Q(name__icontains=q["image"]) | Q(collection__name__icontains=q["collection"])
5555
).distinct()
5656

5757

shub/apps/users/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def _create_user(
5252

5353
email = self.normalize_email(email)
5454
user = self.model(
55-
username=username,
55+
username=username.lower(),
5656
email=email,
5757
is_staff=is_staff,
5858
is_active=True,

0 commit comments

Comments
 (0)