2761242320

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/kobotoolbox/kpi/commit/<a class=hub.com/kobotoolbox/kpi/commit/3e191e9b69d73d0236fae41b7029de7ce774ef8f">3e191e9b6<a href="https://github.com/kobotoolbox/kpi/commit/3e191e9b69d73d0236fae41b7029de7ce774ef8f">">Merge </a><a class="double-link" href="https://github.com/kobotoolbox/kpi/commit/<a class="double-link" href="https://github.com/kobotoolbox/kpi/commit/87c49be67795f694242e03c7d2480f58e100e0ec">87c49be67</a>">87c49be67</a><a href="https://github.com/kobotoolbox/kpi/commit/3e191e9b69d73d0236fae41b7029de7ce774ef8f"> into d7d37dc2a">d7d37dc2a</a>

Pull Request Pull Request #3793: Update `django-trench` to 0.3.0

Run Details

2153 of 3543 branches covered (60.77%)

31 of 31 new or added lines in 4 files covered. (100.0%)

9243 of 12143 relevant lines covered (76.12%)

1.52 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

71.11

/kobo/apps/mfa/forms.py

# coding: utf-8
from django import forms
from django.conf import settings
from django.contrib.auth.forms import AuthenticationForm
from django.utils.translation import gettext_lazy as t
from trench.command.authenticate_second_factor import (
    authenticate_second_step_command
)
from trench.exceptions import MFAValidationError
from trench.serializers import CodeLoginSerializer
from trench.utils import (
    get_mfa_model,
    user_token_generator,
)


class MfaLoginForm(AuthenticationForm):
    """
    Authenticating users.
    If 2FA is activated, first step (of two) of the login process.
    """

    def __init__(self, request=None, *args, **kwargs):
        self.ephemeral_token_cache = None
        super().__init__(*args, **kwargs)

    def clean(self):
        cleaned_data = super().clean()
        # `super().clean()` initialize the object `self.user_cache` with
        # the user object retrieved from authentication (if any)
        auth_method = get_mfa_model().objects.filter(
            is_active=True, user=self.user_cache
        ).first()
        # Because we only support one 2FA method, we do not filter on
        # `is_primary` too (as django_trench does).
        # ToDo Figure out why `is_primary` is False sometimes after reactivating
        #  2FA
        if auth_method:
            self.ephemeral_token_cache = (
                user_token_generator.make_token(self.user_cache)
            )

        return cleaned_data

    def get_ephemeral_token(self):
        return self.ephemeral_token_cache


class MfaTokenForm(forms.Form):
    """
    Validate 2FA token.
    Second (and last) step of login process when MFA is activated.
    """
    code = forms.CharField(
        label='',
        strip=True,
        required=True,
        widget=forms.TextInput(
            attrs={
                'placeholder': t(
                    'Enter the ##token length##-character token'
                ).replace('##token length##', str(settings.TRENCH_AUTH['CODE_LENGTH']))
            }
        )
    )
    ephemeral_token = forms.CharField(
        required=True,
        widget=forms.HiddenInput(),
    )

    error_messages = {
        'invalid_code': t(
            'Your token is invalid'
        )
    }

    def __init__(self, request=None, *args, **kwargs):
        self.user_cache = None
        super().__init__(*args, **kwargs)

    def clean(self):
        code_login_serializer = CodeLoginSerializer(data=self.cleaned_data)
        if not code_login_serializer.is_valid():
            raise self.get_invalid_mfa_error()

        try:
            self.user_cache = authenticate_second_step_command(
                code=code_login_serializer.validated_data['code'],
                ephemeral_token=code_login_serializer.validated_data['ephemeral_token'],
            )
        except MFAValidationError:
            raise self.get_invalid_mfa_error()

        # When login is successful, `django.contrib.auth.login()` expects the
        # authentication backend class to be attached to user object.
        # See https://github.com/django/django/blob/b87820668e7bd519dbc05f6ee46f551858fb1d6d/django/contrib/auth/__init__.py#L111
        # Since we do not have a bullet-proof way to detect which authentication
        # class is the good one, we use the first element of the list
        self.user_cache.backend = settings.AUTHENTICATION_BACKENDS[0]

        return self.cleaned_data

    def get_invalid_mfa_error(self):
        return forms.ValidationError(
            self.error_messages['invalid_code'],
            code='invalid_code',
        )

    def get_user(self):
        return self.user_cache

1	# coding: utf-8
2	from django import forms	2✔
3	from django.conf import settings	2✔
4	from django.contrib.auth.forms import AuthenticationForm	2✔
5	from django.utils.translation import gettext_lazy as t	2✔
6	from trench.command.authenticate_second_factor import (	2✔
7	authenticate_second_step_command
8	)
9	from trench.exceptions import MFAValidationError	2✔
10	from trench.serializers import CodeLoginSerializer	2✔
11	from trench.utils import (	2✔
12	get_mfa_model,
13	user_token_generator,
14	)
15
16
17	class MfaLoginForm(AuthenticationForm):	2✔
18	"""
19	Authenticating users.
20	If 2FA is activated, first step (of two) of the login process.
21	"""
22
23	def __init__(self, request=None, args, *kwargs):	2✔
24	self.ephemeral_token_cache = None	2✔
25	super().__init__(args, *kwargs)	2✔
26
27	def clean(self):	2✔
28	cleaned_data = super().clean()	2✔
29	# `super().clean()` initialize the object `self.user_cache` with
30	# the user object retrieved from authentication (if any)
31	auth_method = get_mfa_model().objects.filter(	2✔
32	is_active=True, user=self.user_cache
33	).first()
34	# Because we only support one 2FA method, we do not filter on
35	# `is_primary` too (as django_trench does).
36	# ToDo Figure out why `is_primary` is False sometimes after reactivating
37	# 2FA
38	if auth_method:	2✔
39	self.ephemeral_token_cache = (	2✔
40	user_token_generator.make_token(self.user_cache)
41	)
42
43	return cleaned_data	2✔
44
45	def get_ephemeral_token(self):	2✔
46	return self.ephemeral_token_cache	2✔
47
48
49	class MfaTokenForm(forms.Form):	2✔
50	"""
51	Validate 2FA token.
52	Second (and last) step of login process when MFA is activated.
53	"""
54	code = forms.CharField(	2✔
55	label='',
56	strip=True,
57	required=True,
58	widget=forms.TextInput(
59	attrs={
60	'placeholder': t(
61	'Enter the ##token length##-character token'
62	).replace('##token length##', str(settings.TRENCH_AUTH['CODE_LENGTH']))
63	}
64	)
65	)
66	ephemeral_token = forms.CharField(	2✔
67	required=True,
68	widget=forms.HiddenInput(),
69	)
70
71	error_messages = {	2✔
72	'invalid_code': t(
73	'Your token is invalid'
74	)
75	}
76
77	def __init__(self, request=None, args, *kwargs):	2✔
78	self.user_cache = None	2✔
79	super().__init__(args, *kwargs)	2✔
80
81	def clean(self):	2✔
82	code_login_serializer = CodeLoginSerializer(data=self.cleaned_data)	×
83	if not code_login_serializer.is_valid():	×
84	raise self.get_invalid_mfa_error()	×
85
86	try:	×
87	self.user_cache = authenticate_second_step_command(	×
88	code=code_login_serializer.validated_data['code'],
89	ephemeral_token=code_login_serializer.validated_data['ephemeral_token'],
90	)
91	except MFAValidationError:	×
92	raise self.get_invalid_mfa_error()	×
93
94	# When login is successful, `django.contrib.auth.login()` expects the
95	# authentication backend class to be attached to user object.
96	# See https://github.com/django/django/blob/b87820668e7bd519dbc05f6ee46f551858fb1d6d/django/contrib/auth/__init__.py#L111
97	# Since we do not have a bullet-proof way to detect which authentication
98	# class is the good one, we use the first element of the list
99	self.user_cache.backend = settings.AUTHENTICATION_BACKENDS[0]	×
100
101	return self.cleaned_data	×
102
103	def get_invalid_mfa_error(self):	2✔
104	return forms.ValidationError(	×
105	self.error_messages['invalid_code'],
106	code='invalid_code',
107	)
108
109	def get_user(self):	2✔
110	return self.user_cache	×

kobotoolbox / kpi / 2761242320

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous