Skip to content

Commit

Permalink
Revert "Don't allow OTP or RADIUS in FIPS mode"
Browse files Browse the repository at this point in the history
This reverts commit 16a952a.

OTP now works in FIPS mode. RADIUS can be made to be compliant by wrapping
traffic in a VPN.

https://pagure.io/freeipa/issue/7168
https://pagure.io/freeipa/issue/7243

Reviewed-By: Rob Crittenden <rcritten@redhat.com>
  • Loading branch information
npmccallum authored and rcritten committed Mar 13, 2018
1 parent 00044ac commit b031ff2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
5 changes: 1 addition & 4 deletions ipaserver/plugins/baseuser.py
Expand Up @@ -31,8 +31,7 @@
LDAPAddAttributeViaOption, LDAPRemoveAttributeViaOption,
add_missing_object_class)
from ipaserver.plugins.service import (
validate_certificate, validate_realm, normalize_principal)
from ipaserver.plugins.config import check_fips_auth_opts
validate_certificate, validate_realm, normalize_principal)
from ipalib.request import context
from ipalib import _
from ipalib.constants import PATTERN_GROUPUSER_NAME
Expand Down Expand Up @@ -478,7 +477,6 @@ def pre_common_callback(self, ldap, dn, entry_attrs, attrs_list, *keys,
**options):
assert isinstance(dn, DN)
set_krbcanonicalname(entry_attrs)
check_fips_auth_opts(fips_mode=self.api.env.fips_mode, **options)
self.obj.convert_usercertificate_pre(entry_attrs)

def post_common_callback(self, ldap, dn, entry_attrs, *keys, **options):
Expand Down Expand Up @@ -602,7 +600,6 @@ def pre_common_callback(self, ldap, dn, entry_attrs, attrs_list, *keys,
assert isinstance(dn, DN)
add_sshpubkey_to_attrs_pre(self.context, attrs_list)

check_fips_auth_opts(fips_mode=self.api.env.fips_mode, **options)
self.check_namelength(ldap, **options)

self.check_mail(entry_attrs)
Expand Down
16 changes: 0 additions & 16 deletions ipaserver/plugins/config.py
Expand Up @@ -85,20 +85,6 @@

register = Registry()


def check_fips_auth_opts(fips_mode, **options):
"""
OTP and RADIUS are not allowed in FIPS mode since they use MD5
checksums (OTP uses our RADIUS responder daemon ipa-otpd).
"""
if 'ipauserauthtype' in options and fips_mode:
if ('otp' in options['ipauserauthtype'] or
'radius' in options['ipauserauthtype']):
raise errors.InvocationError(
'OTP and RADIUS authentication in FIPS is '
'not yet supported')


@register()
class config(LDAPObject):
"""
Expand Down Expand Up @@ -412,8 +398,6 @@ class config_mod(LDAPUpdate):

def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
assert isinstance(dn, DN)
check_fips_auth_opts(fips_mode=self.api.env.fips_mode, **options)

if 'ipadefaultprimarygroup' in entry_attrs:
group=entry_attrs['ipadefaultprimarygroup']
try:
Expand Down

0 comments on commit b031ff2

Please sign in to comment.