Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Raise exception on unknown usage #203

Merged
merged 1 commit into from
Apr 29, 2020
Merged

Raise exception on unknown usage #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions gssapi/raw/creds.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,11 @@ def acquire_cred(Name name=None, lifetime=None, mechs=None, usage='both'):
c_usage = GSS_C_INITIATE
elif usage == 'accept':
c_usage = GSS_C_ACCEPT
else:
elif usage == 'both':
c_usage = GSS_C_BOTH
else:
raise ValueError(f'Invalid usage "{usage}" - permitted values are '
'"initiate", "accept", and "both"')

cdef gss_cred_id_t creds
cdef gss_OID_set actual_mechs
Expand Down Expand Up @@ -227,8 +230,11 @@ accept_lifetime=None, mutate_input=False)
c_usage = GSS_C_INITIATE
elif usage == 'accept':
c_usage = GSS_C_ACCEPT
else: # usage == 'both'
elif usage == 'both':
c_usage = GSS_C_BOTH
else:
raise ValueError(f'Invalid usage "{usage}" - permitted values are '
'"initiate", "accept", and "both"')

cdef gss_cred_id_t raw_input_cred
if input_cred is not None:
Expand Down
15 changes: 12 additions & 3 deletions gssapi/raw/ext_cred_store.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,11 @@ usage='both')
c_usage = GSS_C_INITIATE
elif usage == 'accept':
c_usage = GSS_C_ACCEPT
else:
elif usage == 'both':
c_usage = GSS_C_BOTH
else:
raise ValueError(f'Invalid usage "{usage}" - permitted values are '
'"initiate", "accept", and "both"')

cdef gss_key_value_set_desc *c_store
if store is not None:
Expand Down Expand Up @@ -232,8 +235,11 @@ init_lifetime=None, accept_lifetime=None)
c_usage = GSS_C_INITIATE
elif usage == 'accept':
c_usage = GSS_C_ACCEPT
else:
elif usage == 'both':
c_usage = GSS_C_BOTH
else:
raise ValueError(f'Invalid usage "{usage}" - permitted values are '
'"initiate", "accept", and "both"')

cdef gss_name_t c_name = name.raw_name
cdef gss_OID c_mech = &mech.raw_oid
Expand Down Expand Up @@ -325,8 +331,11 @@ set_default=False)
c_usage = GSS_C_INITIATE
elif usage == 'accept':
c_usage = GSS_C_ACCEPT
else:
elif usage == 'both':
c_usage = GSS_C_BOTH
else:
raise ValueError(f'Invalid usage "{usage}" - permitted values are '
'"initiate", "accept", and "both"')

cdef gss_key_value_set_desc *c_store
if store is not None:
Expand Down
5 changes: 4 additions & 1 deletion gssapi/raw/ext_password.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,11 @@ usage="initiate")
c_usage = GSS_C_INITIATE
elif usage == "accept":
c_usage = GSS_C_ACCEPT
else:
elif usage == 'both':
c_usage = GSS_C_BOTH
else:
raise ValueError(f'Invalid usage "{usage}" - permitted values are '
'"initiate", "accept", and "both"')

cdef gss_cred_id_t creds
cdef gss_OID_set actual_mechs
Expand Down
5 changes: 4 additions & 1 deletion gssapi/raw/ext_password_add.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,11 @@ usage='initiate', init_lifetime=None, accept_lifetime=None)
c_usage = GSS_C_INITIATE
elif usage == "accept":
c_usage = GSS_C_ACCEPT
else:
elif usage == 'both':
c_usage = GSS_C_BOTH
else:
raise ValueError(f'Invalid usage "{usage}" - permitted values are '
'"initiate", "accept", and "both"')

cdef OM_uint32 input_initiator_ttl = c_py_ttl_to_c(init_lifetime)
cdef OM_uint32 input_acceptor_ttl = c_py_ttl_to_c(accept_lifetime)
Expand Down
5 changes: 4 additions & 1 deletion gssapi/raw/ext_rfc5588.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,11 @@ set_default=False)
c_usage = GSS_C_INITIATE
elif usage == 'accept':
c_usage = GSS_C_ACCEPT
else:
elif usage == 'both':
c_usage = GSS_C_BOTH
else:
raise ValueError(f'Invalid usage "{usage}" - permitted values are '
'"initiate", "accept", and "both"')

cdef gss_cred_id_t c_creds = creds.raw_creds

Expand Down
10 changes: 8 additions & 2 deletions gssapi/raw/ext_s4u.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,11 @@ mechs=None, usage='initiate')
c_usage = GSS_C_INITIATE
elif usage == 'accept':
c_usage = GSS_C_ACCEPT
else:
elif usage == 'both':
c_usage = GSS_C_BOTH
else:
raise ValueError(f'Invalid usage "{usage}" - permitted values are '
'"initiate", "accept", and "both"')

cdef gss_cred_id_t creds
cdef gss_OID_set actual_mechs
Expand Down Expand Up @@ -162,8 +165,11 @@ usage='initiate', init_lifetime=None, accept_lifetime=None)
c_usage = GSS_C_INITIATE
elif usage == 'accept':
c_usage = GSS_C_ACCEPT
else:
elif usage == 'both':
c_usage = GSS_C_BOTH
else:
raise ValueError(f'Invalid usage "{usage}" - permitted values are '
'"initiate", "accept", and "both"')

cdef gss_cred_id_t raw_input_cred
if input_cred is not None:
Expand Down