NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-15 08:12:18 -06:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Rename pepper field to pepper_id for clarity

Browse Source
This commit is contained in:
Jeremy Stretch
2025-10-02 15:38:17 -04:00
parent 5dc48f3a88
commit 11099b01bb
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/users/models/tokens.py
View File

@@ -80,8 +80,8 @@ class Token(models.Model):
validators=[MinLengthValidator(TOKEN_KEY_LENGTH)],
help_text=_('v2 token identification key'),
)
pepper = models.PositiveSmallIntegerField(
verbose_name=_('pepper'),
pepper_id = models.PositiveSmallIntegerField(
verbose_name=_('pepper ID'),
blank=True,
null=True,
help_text=_('ID of the cryptographic pepper used to hash the token (v2 only)'),
@@ -179,7 +179,7 @@ class Token(models.Model):
"""
Recalculate and save the HMAC digest using the currently defined pepper and token values.
"""
self.pepper, pepper_value = get_current_pepper()
self.pepper_id, pepper_value = get_current_pepper()
self.hmac_digest = hmac.new(
pepper_value.encode('utf-8'),
self.token.encode('utf-8'),
@@ -202,7 +202,7 @@ class Token(models.Model):
return token == self.key
if self.v2:
try:
pepper = settings.API_TOKEN_PEPPERS[self.pepper]
pepper = settings.API_TOKEN_PEPPERS[self.pepper_id]
except KeyError:
# Invalid pepper ID
return False