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

API to use mechanism specific OID #62

Closed
wants to merge 4 commits into from
Closed

API to use mechanism specific OID #62

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0511584
use mechanism specific OID
Aug 2, 2017
0ebf2c9
update variable type
Aug 17, 2017
ffe394c
compatibilty fix
Aug 17, 2017
0f9d23a
fix: API changes to follow convention
Jun 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions lib/kerberos.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ typedef struct AuthGSSClientCall {
uint32_t flags;
char *uri;
char *credentials_cache;
gss_OID oid;
} AuthGSSClientCall;

typedef struct AuthGSSClientStepCall {
Expand Down Expand Up @@ -119,7 +120,7 @@ static void _authGSSClientInit(Worker *worker) {
// Unpack the parameter data struct
AuthGSSClientCall *call = (AuthGSSClientCall *)worker->parameters;
// Start the kerberos client
response = authenticate_gss_client_init(call->uri, call->flags, call->credentials_cache, state);
response = authenticate_gss_client_init(call->uri, call->flags, call->credentials_cache, state, call->oid);

// Release the parameter struct memory
free(call->uri);
Expand Down Expand Up @@ -151,8 +152,9 @@ NAN_METHOD(Kerberos::AuthGSSClientInit) {
const char *usage = "Requires a service string uri, integer flags, string credentialsCache and a callback function";

// Ensure valid call
if(info.Length() != 4) return Nan::ThrowError(usage);
if(!info[0]->IsString() || !info[1]->IsInt32() || !info[2]->IsString() || !info[3]->IsFunction())
if(info.Length() != 5) return Nan::ThrowError(usage);
if(!info[0]->IsString() || !info[1]->IsInt32() || !info[2]->IsString() || !info[3]->IsFunction()
|| !(info[4]->IsUndefined() || info[4]->IsInt32()))
return Nan::ThrowError(usage);

Local<String> service = info[0]->ToString();
Expand All @@ -177,7 +179,11 @@ NAN_METHOD(Kerberos::AuthGSSClientInit) {
call->flags = Nan::To<uint32_t>(info[1]).FromJust();
call->uri = service_str;
call->credentials_cache = credentials_cache_str;

if(info[4]->IsInt32())
call->oid = GSS_C_NO_OID;
else
call->oid = gss_krb5_nt_service_name;

// Unpack the callback
Local<Function> callbackHandle = Local<Function>::Cast(info[3]);
Nan::Callback *callback = new Nan::Callback(callbackHandle);
Expand Down
12 changes: 11 additions & 1 deletion lib/kerberos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ var Kerberos = function() {
// delegation), specify the cache name here and it will be used for this
// exchange. The credentialsCache is optional.
Kerberos.prototype.authGSSClientInit = function(uri, flags, credentialsCache, callback) {
return authClientInit.call(this, uri, flags, credentialsCache, callback);
}

// uses mechanism specific OID
Kerberos.prototype.authGSSClientInitDefault = function(uri, flags, credentialsCache, callback) {
return authClientInit.call(this, uri, flags, credentialsCache, callback, Kerberos.GSS_C_NO_OID);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

convention is that callback should always be the final parameter for a function, its fine to break the API here because this is private implementation - could you please swap the oid and callback parameters?

}

var authClientInit = function(uri, flags, credentialsCache, callback, oid){
if (typeof(credentialsCache) == 'function') {
callback = credentialsCache;
credentialsCache = '';
Expand All @@ -23,7 +32,7 @@ Kerberos.prototype.authGSSClientInit = function(uri, flags, credentialsCache, ca
credentialsCache = '';
}

return this._native_kerberos.authGSSClientInit(uri, flags, credentialsCache, callback);
return this._native_kerberos.authGSSClientInit(uri, flags, credentialsCache, callback, oid );
}

// This will obtain credentials using a credentials cache. To override the default
Expand Down Expand Up @@ -166,6 +175,7 @@ Kerberos.AUTH_GSS_CONTINUE = 0;
Kerberos.AUTH_GSS_COMPLETE = 1;

// Some useful gss flags
Kerberos.GSS_C_NO_OID = 0;
Kerberos.GSS_C_DELEG_FLAG = 1;
Kerberos.GSS_C_MUTUAL_FLAG = 2;
Kerberos.GSS_C_REPLAY_FLAG = 4;
Expand Down
4 changes: 2 additions & 2 deletions lib/kerberosgss.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ char* server_principal_details(const char* service, const char* hostname)
return result;
}
*/
gss_client_response *authenticate_gss_client_init(const char* service, long int gss_flags, const char* credentials_cache, gss_client_state* state) {
gss_client_response *authenticate_gss_client_init(const char* service, long int gss_flags, const char* credentials_cache, gss_client_state* state, gss_OID oid) {
OM_uint32 maj_stat;
OM_uint32 min_stat;
gss_buffer_desc name_token = GSS_C_EMPTY_BUFFER;
Expand All @@ -168,7 +168,7 @@ gss_client_response *authenticate_gss_client_init(const char* service, long int
name_token.length = strlen(service);
name_token.value = (char *)service;

maj_stat = gss_import_name(&min_stat, &name_token, gss_krb5_nt_service_name, &state->server_name);
maj_stat = gss_import_name(&min_stat, &name_token, oid , &state->server_name);

if (GSS_ERROR(maj_stat)) {
response = gss_error(__func__, "gss_import_name", maj_stat, min_stat);
Expand Down
2 changes: 1 addition & 1 deletion lib/kerberosgss.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ typedef struct {

// char* server_principal_details(const char* service, const char* hostname);

gss_client_response *authenticate_gss_client_init(const char* service, long int gss_flags, const char* credentials_cache, gss_client_state* state);
gss_client_response *authenticate_gss_client_init(const char *service, long int gss_flags, const char *credentials_cache, gss_client_state *state, gss_OID oid);
gss_client_response *authenticate_gss_client_clean(gss_client_state *state);
gss_client_response *authenticate_gss_client_step(gss_client_state *state, const char *challenge);
gss_client_response *authenticate_gss_client_unwrap(gss_client_state* state, const char* challenge);
Expand Down