NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-17 04:58:16 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

#8233 Fix PEP8 compliances

Browse Source
This commit is contained in:
Pieter Lambrecht 2022-03-14 12:48:18 +01:00
parent a37d0897c2
commit a8114e9c53
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/netbox/api/authentication.py
View File

@ -13,7 +13,7 @@ class TokenAuthentication(authentication.TokenAuthentication):
__request = False __request = False
def authenticate(self, request): def authenticate(self, request):
self.request=request self.request = request
return super().authenticate(request) return super().authenticate(request)
def authenticate_credentials(self, key): def authenticate_credentials(self, key):
@ -24,7 +24,7 @@ class TokenAuthentication(authentication.TokenAuthentication):
raise exceptions.AuthenticationFailed("Invalid token") raise exceptions.AuthenticationFailed("Invalid token")
# Verify source IP is allowed # Verify source IP is allowed
request=self.request request = self.request
if len(token.allowed_ipranges) > 0 and request: if len(token.allowed_ipranges) > 0 and request:
if settings.PROXY_HEADER_REALIP in request.META: if settings.PROXY_HEADER_REALIP in request.META:
@ -37,7 +37,6 @@ class TokenAuthentication(authentication.TokenAuthentication):
if not token.validateclientip(clientip): if not token.validateclientip(clientip):
raise exceptions.AuthenticationFailed(f"Source IP {clientip} is not allowed to use this token.") raise exceptions.AuthenticationFailed(f"Source IP {clientip} is not allowed to use this token.")
# Enforce the Token's expiration time, if one has been set. # Enforce the Token's expiration time, if one has been set.
if token.is_expired: if token.is_expired:
raise exceptions.AuthenticationFailed("Token expired") raise exceptions.AuthenticationFailed("Token expired")

35
netbox/users/models.py
View File

@ -242,55 +242,56 @@ class Token(BigIDModel):
""" """
Checks that the value is a comma separated list of IPv4 and/or IPv6 addresses, ranges or subnets. Checks that the value is a comma separated list of IPv4 and/or IPv6 addresses, ranges or subnets.
""" """
if len(ip_addresses)==0: if len(ip_addresses) == 0:
return True return True
for ip in ip_addresses.split(','): for ip in ip_addresses.split(','):
try: try:
if '/' in ip: if '/' in ip:
iptest=ipaddress.ip_network(ip) iptest = ipaddress.ip_network(ip)
elif '-' in ip: elif '-' in ip:
ips=ip.split('-') ips = ip.split('-')
ip1=ipaddress.ip_address(ips[0]) ip1 = ipaddress.ip_address(ips[0])
ip2=ipaddress.ip_address(ips[1]) ip2 = ipaddress.ip_address(ips[1])
if ip1>ip2: if ip1>ip2:
raise ValidationError() raise ValidationError()
else: else:
iptest=ipaddress.ip_address(ip) iptest = ipaddress.ip_address(ip)
except: except ValueError:
raise ValidationError(f"{ip} is an invalid value in the Allowed IP Ranges ({ip_addresses})") raise ValidationError(f"{ip} is an invalid value in the Allowed IP Ranges ({ip_addresses})")
return True return True
def validateclientip(self,raw_ip_address): def validateclientip(self, raw_ip_address):
""" """
Checks that an ip address falls within the allowed ip ranges. Checks that an ip address falls within the allowed ip ranges.
""" """
if len(self.allowed_ipranges)==0: if len(self.allowed_ipranges) == 0:
return True return True
try: try:
ip_address=ipaddress.ip_address(raw_ip_address) ip_address = ipaddress.ip_address(raw_ip_address)
except: except ValueError:
raise ValidationError(f"{raw_ip_address} is an invalid IP address") raise ValidationError(f"{raw_ip_address} is an invalid IP address")
for ip in self.allowed_ipranges.split(','): for ip in self.allowed_ipranges.split(','):
if '/' in ip: if '/' in ip:
ipnet=ipaddress.ip_network(ip) ipnet = ipaddress.ip_network(ip)
if ip_address in ipnet: if ip_address in ipnet:
return True return True
elif '-' in ip: elif '-' in ip:
ips=ip.split('-') ips = ip.split('-')
ip1=ipaddress.ip_address(ips[0]) ip1 = ipaddress.ip_address(ips[0])
ip2=ipaddress.ip_address(ips[1]) ip2 = ipaddress.ip_address(ips[1])
if ip_address >= ip1 and ip_address <= ip2: if ip_address >= ip1 and ip_address <= ip2:
return True return True
else: else:
ipaddr=ipaddress.ip_address(ip) ipaddr = ipaddress.ip_address(ip)
if ip_address==ipaddr: if ip_address == ipaddr:
return True return True
return False return False
# #
# Permissions # Permissions
# #