Skip to content

Commit

Permalink
Normalize 'creds' argument name
Browse files Browse the repository at this point in the history 
Previously, a couple methods used 'cred' instead of 'creds'
as argument names.  Now, all methods use 'creds' (including
'acceptor_cred' becoming 'acceptor_creds')
  • Loading branch information
@DirectXMan12
DirectXMan12 committed Dec 23, 2014
1 parent 1654aba commit 0f70a24
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
18 changes: 9 additions & 9 deletions gssapi/raw/sec_contexts.pyx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ cdef class SecurityContext:


# TODO(directxman12): figure out whether GSS_C_NO_NAME can be passed in here
def init_sec_context(Name target_name not None, Creds cred=None,
def init_sec_context(Name target_name not None, Creds creds=None,
SecurityContext context=None,
OID mech=None,
flags=None, lifetime=None,
Expand All @@ -128,7 +128,7 @@ def init_sec_context(Name target_name not None, Creds cred=None,
Args:
target_name (Name): the target for the security context
cred (Creds): the credentials to use to initiate the context,
creds (Creds): the credentials to use to initiate the context,
or None to use the default credentials
context (SecurityContext): the security context to update, or
None to create a new context
Expand Down Expand Up @@ -181,8 +181,8 @@ def init_sec_context(Name target_name not None, Creds cred=None,
output_context = SecurityContext()

cdef gss_cred_id_t act_cred
if cred is not None:
act_cred = cred.raw_creds
if creds is not None:
act_cred = creds.raw_creds
else:
act_cred = GSS_C_NO_CREDENTIAL

Expand Down Expand Up @@ -228,7 +228,7 @@ def init_sec_context(Name target_name not None, Creds cred=None,
raise GSSError(maj_stat, min_stat, token=output_token)


def accept_sec_context(input_token not None, Creds acceptor_cred=None,
def accept_sec_context(input_token not None, Creds acceptor_creds=None,
SecurityContext context=None,
ChannelBindings channel_bindings=None):
"""
Expand All @@ -244,8 +244,8 @@ def accept_sec_context(input_token not None, Creds acceptor_cred=None,
Args:
input_token (bytes): the token sent by the context initiator
acceptor_cred (Creds): the credentials to be used to accept the context
(or None to use the default credentials)
acceptor_creds (Creds): the credentials to be used to accept the
context (or None to use the default credentials)
context (SecurityContext): the security context to update
(or None to create a new security context object)
channel_bindings (ChannelBindings): The channel bindings (or None for
Expand Down Expand Up @@ -277,8 +277,8 @@ def accept_sec_context(input_token not None, Creds acceptor_cred=None,
output_context = SecurityContext()

cdef gss_cred_id_t act_acceptor_cred
if acceptor_cred is None:
act_acceptor_cred = acceptor_cred.raw_creds
if acceptor_creds is None:
act_acceptor_cred = acceptor_creds.raw_creds
else:
act_acceptor_cred = GSS_C_NO_CREDENTIAL

Expand Down
2 changes: 1 addition & 1 deletion gssapi/tests/test_high_level.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def test_impersonate(self, str_name, kwargs):
server_creds = gsscreds.Credentials(name=server_name,
usage='both')
server_ctx_resp = gb.accept_sec_context(client_token,
acceptor_cred=server_creds)
acceptor_creds=server_creds)

imp_creds = server_creds.impersonate(server_ctx_resp[1], **kwargs)

Expand Down
22 changes: 11 additions & 11 deletions gssapi/tests/test_raw.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def test_context_time(self):
gb.NameType.kerberos_principal)
server_creds = gb.acquire_cred(server_name)[0]
server_resp = gb.accept_sec_context(client_token1,
acceptor_cred=server_creds)
acceptor_creds=server_creds)
server_tok = server_resp[3]

client_resp2 = gb.init_sec_context(target_name,
Expand All @@ -203,7 +203,7 @@ def test_inquire_context(self):
gb.NameType.kerberos_principal)
server_creds = gb.acquire_cred(server_name)[0]
server_resp = gb.accept_sec_context(client_token1,
acceptor_cred=server_creds)
acceptor_creds=server_creds)
server_tok = server_resp[3]

client_resp2 = gb.init_sec_context(target_name,
Expand Down Expand Up @@ -253,7 +253,7 @@ def test_add_cred_impersonate_name(self):
gb.NameType.kerberos_principal)
server_creds = gb.acquire_cred(server_name, usage='both')[0]
server_ctx_resp = gb.accept_sec_context(client_token,
acceptor_cred=server_creds)
acceptor_creds=server_creds)

input_creds = gb.Creds()
imp_resp = gb.add_cred_impersonate_name(input_creds,
Expand Down Expand Up @@ -285,7 +285,7 @@ def test_acquire_creds_impersonate_name(self):
gb.NameType.kerberos_principal)
server_creds = gb.acquire_cred(server_name, usage='both')[0]
server_ctx_resp = gb.accept_sec_context(client_token,
acceptor_cred=server_creds)
acceptor_creds=server_creds)

imp_resp = gb.acquire_cred_impersonate_name(server_creds,
server_ctx_resp[1])
Expand Down Expand Up @@ -315,14 +315,14 @@ def test_store_cred_acquire_cred(self):

client_creds = gb.acquire_cred(None, usage='initiate').creds
client_ctx_resp = gb.init_sec_context(
target_name, cred=client_creds,
target_name, creds=client_creds,
flags=gb.RequirementFlag.delegate_to_peer)

client_token = client_ctx_resp[3]

server_creds = gb.acquire_cred(None, usage='accept').creds
server_ctx_resp = gb.accept_sec_context(client_token,
acceptor_cred=server_creds)
acceptor_creds=server_creds)

deleg_creds = server_ctx_resp.delegated_creds
deleg_creds.shouldnt_be_none()
Expand Down Expand Up @@ -380,7 +380,7 @@ def test_add_cred(self):
gb.NameType.kerberos_principal)
server_creds = gb.acquire_cred(server_name, usage='both')[0]
server_ctx_resp = gb.accept_sec_context(client_token,
acceptor_cred=server_creds)
acceptor_creds=server_creds)

input_creds = gb.Creds()
imp_resp = gb.add_cred(input_creds,
Expand Down Expand Up @@ -651,7 +651,7 @@ def tearDown(self):

def test_basic_accept_context(self):
server_resp = gb.accept_sec_context(self.client_token,
acceptor_cred=self.server_creds)
acceptor_creds=self.server_creds)
server_resp.shouldnt_be_none()

(self.server_ctx, name, mech_type, out_token,
Expand Down Expand Up @@ -697,7 +697,7 @@ def test_channel_bindings(self):
self.server_creds = gb.acquire_cred(self.server_name)[0]

server_resp = gb.accept_sec_context(self.client_token,
acceptor_cred=self.server_creds,
acceptor_creds=self.server_creds,
channel_bindings=bdgs)
server_resp.shouldnt_be_none
self.server_ctx = server_resp.context
Expand All @@ -723,7 +723,7 @@ def test_bad_channel_binding_raises_error(self):

bdgs.acceptor_address = b'127.0.1.0'
gb.accept_sec_context.should_raise(gb.GSSError, self.client_token,
acceptor_cred=self.server_creds,
acceptor_creds=self.server_creds,
channel_bindings=bdgs)


Expand All @@ -739,7 +739,7 @@ def setUp(self):
gb.NameType.kerberos_principal)
self.server_creds = gb.acquire_cred(self.server_name)[0]
server_resp = gb.accept_sec_context(self.client_token1,
acceptor_cred=self.server_creds)
acceptor_creds=self.server_creds)
self.server_ctx = server_resp[0]
self.server_tok = server_resp[3]

Expand Down

0 comments on commit 0f70a24

Please sign in to comment.