mirror of
https://github.com/retspen/webvirtcloud
synced 2026-11-08 19:26:48 +00:00
40287dbd2a
With OTP_ENABLED the login used django-otp's OTPAuthenticationForm. Under the pinned django-otp 1.7.3 that form could not log anyone in through the shipped page: the page posts only a 6-digit otp_token, but the form now needs the device named explicitly, so an enrolled user got "Please select a device.", and a user who never enrolled got "Please enter your OTP token." with no device to produce one. Verified in an isolated test database. SingleDeviceOTPForm makes OTP per user: a user with a confirmed TOTP device must enter a valid code; a user without one logs in with the password alone. The form chooses the device itself (the user's oldest confirmed TOTP device, locked with select_for_update inside clean_otp's transaction so replay and throttling counters cannot race) and ignores any posted otp_device, which django-otp does not check for confirmed status or type. The login page drops the HTML "required" on the token field (the field is optional for an unenrolled user) and says so. The "Lost OTP?" page (email_otp) created a confirmed device when none existed. With per-user OTP that let anyone who knows an address turn a password-only account into an OTP-required one and, if the mail never arrived, lock it out. It now resends the QR only to a user who already enrolled and never creates a device (get_existing_totp_device); admin enrollment (admin_email_otp) still creates one. Email QR distribution and confirmed-on-create enrollment are unchanged by user decision. Tests: per-user login (no device -> password only; device -> valid token passes, wrong/empty token fails), a posted or another user's device is not used, a token cannot be replayed, and the real login page over HTTP with OTP_ENABLED; email_otp sends nothing and creates no device for an unenrolled user. The new tests fail on the previous code.
70 lines
2 KiB
Python
70 lines
2 KiB
Python
import base64
|
|
import binascii
|
|
import struct
|
|
|
|
from django.core.mail import send_mail
|
|
from django.template.loader import render_to_string
|
|
from django.utils.translation import gettext as _
|
|
from django_otp import devices_for_user
|
|
from django_otp.plugins.otp_totp.models import TOTPDevice
|
|
|
|
|
|
def get_existing_totp_device(user):
|
|
"""The user's confirmed TOTP device, or None. Unlike get_user_totp_device
|
|
it never creates one, so an unauthenticated caller cannot turn a
|
|
password-only account into an OTP-required one."""
|
|
for device in devices_for_user(user, confirmed=True):
|
|
if isinstance(device, TOTPDevice):
|
|
return device
|
|
return None
|
|
|
|
|
|
def get_user_totp_device(user):
|
|
devices = devices_for_user(user)
|
|
for device in devices:
|
|
if isinstance(device, TOTPDevice):
|
|
return device
|
|
|
|
device = user.totpdevice_set.create()
|
|
return device
|
|
|
|
|
|
def validate_ssh_key(key):
|
|
array = key.strip().encode().split()
|
|
# An OpenSSH public key has 2 parts (type, key) or 3 parts (type, key, comment).
|
|
if len(array) not in (2, 3):
|
|
return False
|
|
typeofkey = array[0]
|
|
string = array[1]
|
|
|
|
# must have only valid rsa-ssh key characters ie binascii characters
|
|
try:
|
|
data = base64.decodebytes(string)
|
|
except binascii.Error:
|
|
return False
|
|
# unpack the contents of data, from data[:4] , property of ssh key .
|
|
try:
|
|
str_len = struct.unpack(">I", data[:4])[0]
|
|
except struct.error:
|
|
return False
|
|
# data[4:str_len] must have string which matches with the typeofkey, another ssh key property.
|
|
if data[4 : 4 + str_len] != typeofkey:
|
|
return False
|
|
return True
|
|
|
|
|
|
def send_email_with_otp(user, device):
|
|
send_mail(
|
|
_("OTP QR Code"),
|
|
_("Please view HTML version of this message."),
|
|
None,
|
|
[user.email],
|
|
html_message=render_to_string(
|
|
"accounts/email/otp.html",
|
|
{
|
|
"totp_url": device.config_url,
|
|
"user": user,
|
|
},
|
|
),
|
|
fail_silently=False,
|
|
)
|