IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix suspicious except statements

Browse Source 
The "except ValueError as UnicodeDecodeError" looks very suspicious.
Commit change except to catch both exceptions.

https://fedorahosted.org/freeipa/ticket/5718

Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
Martin Basti 2016-03-02 17:13:27 +01:00 committed by Tomas Babej
parent 3c519951c5
commit 2c8e100c73
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/ipa-client-install
View File

@ -1798,7 +1798,7 @@ def update_ssh_keys(server, hostname, ssh_dir, create_sshfp):
continue
try:
pubkey = SSHPublicKey(line)
except ValueError as UnicodeDecodeError:
except (ValueError, UnicodeDecodeError):
continue
root_logger.info("Adding SSH public key from %s", filename)
pubkeys.append(pubkey)

6
ipalib/util.py
View File

@ -278,13 +278,13 @@ def normalize_sshpubkey(value):
def validate_sshpubkey(ugettext, value):
try:
SSHPublicKey(value)
except ValueError as UnicodeDecodeError:
except (ValueError, UnicodeDecodeError):
return _('invalid SSH public key')
def validate_sshpubkey_no_options(ugettext, value):
try:
pubkey = SSHPublicKey(value)
except ValueError as UnicodeDecodeError:
except (ValueError, UnicodeDecodeError):
return _('invalid SSH public key')
if pubkey.has_options():
@ -304,7 +304,7 @@ def convert_sshpubkey_post(ldap, dn, entry_attrs):
for pubkey in pubkeys:
try:
pubkey = SSHPublicKey(pubkey)
except ValueError as UnicodeDecodeError:
except (ValueError, UnicodeDecodeError):
continue
fp = pubkey.fingerprint_hex_md5()