rkerberos 0.2.1 → 0.2.3

data/ext/rkerberos/kadm5.c

@@ -8,6 +8,8 @@ VALUE cKadm5PrincipalNotFoundException;
 
 // Prototype
 static VALUE rkadm5_close(VALUE);
+static void free_tl_data(krb5_tl_data *);
+static void free_db_args(char**);
 char** parse_db_args(VALUE v_db_args);
 void add_db_args(kadm5_principal_ent_rec*, char**);
 void add_tl_data(krb5_int16 *, krb5_tl_data **,
@@ -18,11 +20,13 @@ void add_tl_data(krb5_int16 *, krb5_tl_data **,
 static void rkadm5_typed_free(void *ptr) {
   if (!ptr) return;
   RUBY_KADM5 *k = (RUBY_KADM5 *)ptr;
+  if (k->handle)
+    kadm5_destroy(k->handle);
   if (k->princ)
     krb5_free_principal(k->ctx, k->princ);
   if (k->ctx)
     krb5_free_context(k->ctx);
-  free(k->db_args);
+  free_db_args(k->db_args);
   free(k);
 }
 
@@ -72,6 +76,7 @@ static VALUE rkadm5_initialize(VALUE self, VALUE v_opts){
   char* pass = NULL;
   char* keytab = NULL;
   char* service = NULL;
+  char default_keytab_name[MAX_KEYTAB_NAME_LEN];
   krb5_error_code kerror;
 
   TypedData_Get_Struct(self, RUBY_KADM5, &rkadm5_data_type, ptr);
@@ -126,14 +131,12 @@ static VALUE rkadm5_initialize(VALUE self, VALUE v_opts){
   // The docs say I can use NULL to get the default, but reality appears to be otherwise.
   if(RTEST(v_keytab)){
     if(TYPE(v_keytab) == T_TRUE){
-      char default_name[MAX_KEYTAB_NAME_LEN];
-
-      kerror = krb5_kt_default_name(ptr->ctx, default_name, MAX_KEYTAB_NAME_LEN);
+      kerror = krb5_kt_default_name(ptr->ctx, default_keytab_name, MAX_KEYTAB_NAME_LEN);
 
       if(kerror)
         rb_raise(cKrb5Exception, "krb5_kt_default_name: %s", error_message(kerror));
 
-      keytab = default_name;
+      keytab = default_keytab_name;
     }
     else{
       Check_Type(v_keytab, T_STRING);
@@ -206,6 +209,11 @@ static VALUE rkadm5_set_password(VALUE self, VALUE v_user, VALUE v_pass){
   if(!ptr->ctx)
     rb_raise(cKadm5Exception, "no context has been established");
 
+  if(ptr->princ){
+    krb5_free_principal(ptr->ctx, ptr->princ);
+    ptr->princ = NULL;
+  }
+
   kerror = krb5_parse_name(ptr->ctx, user, &ptr->princ);
 
   if(kerror)
@@ -239,6 +247,11 @@ static VALUE rkadm5_set_pwexpire(VALUE self, VALUE v_user, VALUE v_pwexpire){
   if(!ptr->ctx)
     rb_raise(cKadm5Exception, "no context has been established");
 
+  if(ptr->princ){
+    krb5_free_principal(ptr->ctx, ptr->princ);
+    ptr->princ = NULL;
+  }
+
   kerror = krb5_parse_name(ptr->ctx, user, &ptr->princ);
 
   if(kerror)
@@ -258,6 +271,8 @@ static VALUE rkadm5_set_pwexpire(VALUE self, VALUE v_user, VALUE v_pwexpire){
   ent.pw_expiration=pwexpire;
   kerror = kadm5_modify_principal(ptr->handle, &ent, KADM5_PW_EXPIRATION);
 
+  kadm5_free_principal_ent(ptr->handle, &ent);
+
   if(kerror)
     rb_raise(cKadm5Exception, "kadm5_set_pwexpire: %s", error_message(kerror));
 
@@ -300,22 +315,28 @@ static VALUE rkadm5_create_principal(int argc, VALUE* argv, VALUE self){
 
   db_args = parse_db_args(v_db_args);
   add_db_args(&princ, db_args);
-  free(db_args);
+  free_db_args(db_args);
 
   if(!ptr->ctx)
     rb_raise(cKadm5Exception, "no context has been established");
 
   kerror = krb5_parse_name(ptr->ctx, user, &princ.principal);
 
-  if(kerror)
+  if(kerror){
+    free_tl_data(princ.tl_data);
     rb_raise(cKadm5Exception, "krb5_parse_name: %s", error_message(kerror));
+  }
 
   kerror = kadm5_create_principal(ptr->handle, &princ, mask, pass);
 
-  if(kerror)
+  if(kerror){
+    krb5_free_principal(ptr->ctx, princ.principal);
+    free_tl_data(princ.tl_data);
     rb_raise(cKadm5Exception, "kadm5_create_principal: %s", error_message(kerror));
+  }
 
   krb5_free_principal(ptr->ctx, princ.principal);
+  free_tl_data(princ.tl_data);
 
   return self;
 }
@@ -337,6 +358,11 @@ static VALUE rkadm5_delete_principal(VALUE self, VALUE v_user){
   if(!ptr->ctx)
     rb_raise(cKadm5Exception, "no context has been established");
 
+  if(ptr->princ){
+    krb5_free_principal(ptr->ctx, ptr->princ);
+    ptr->princ = NULL;
+  }
+
   kerror = krb5_parse_name(ptr->ctx, user, &ptr->princ);
 
   if(kerror)
@@ -364,16 +390,16 @@ static VALUE rkadm5_close(VALUE self){
   RUBY_KADM5* ptr;
   TypedData_Get_Struct(self, RUBY_KADM5, &rkadm5_data_type, ptr);
 
+  if(ptr->handle)
+    kadm5_destroy(ptr->handle);
+
   if(ptr->princ)
     krb5_free_principal(ptr->ctx, ptr->princ);
 
   if(ptr->ctx)
     krb5_free_context(ptr->ctx);
 
-  if(ptr->handle)
-    kadm5_destroy(ptr->handle);
-
-  free(ptr->db_args);
+  free_db_args(ptr->db_args);
 
   ptr->db_args = NULL;
   ptr->ctx    = NULL;
@@ -405,10 +431,10 @@ static VALUE create_principal_from_entry(VALUE v_name, RUBY_KADM5* ptr, kadm5_pr
   if(ent->last_failed)
     rb_iv_set(v_principal, "@last_failed", rb_time_new(ent->last_failed, 0));
 
-  if(ent->last_failed)
+  if(ent->last_pwd_change)
     rb_iv_set(v_principal, "@last_password_change", rb_time_new(ent->last_pwd_change, 0));
 
-  if(ent->last_failed)
+  if(ent->last_success)
     rb_iv_set(v_principal, "@last_success", rb_time_new(ent->last_success, 0));
 
   rb_iv_set(v_principal, "@max_life", LONG2FIX(ent->max_life));
@@ -421,10 +447,13 @@ static VALUE create_principal_from_entry(VALUE v_name, RUBY_KADM5* ptr, kadm5_pr
     char* mod_name;
     kerror = krb5_unparse_name(ptr->ctx, ent->mod_name, &mod_name);
 
-    if(kerror)
+    if(kerror){
+      kadm5_free_principal_ent(ptr->handle, ent);
       rb_raise(cKadm5Exception, "krb5_unparse_name: %s", error_message(kerror));
+    }
 
     rb_iv_set(v_principal, "@mod_name", rb_str_new2(mod_name));
+    krb5_free_unparsed_name(ptr->ctx, mod_name);
   }
 
   if(ent->pw_expiration)
@@ -433,6 +462,8 @@ static VALUE create_principal_from_entry(VALUE v_name, RUBY_KADM5* ptr, kadm5_pr
   if(ent->policy)
     rb_iv_set(v_principal, "@policy", rb_str_new2(ent->policy));
 
+  kadm5_free_principal_ent(ptr->handle, ent);
+
   return v_principal;
 }
 
@@ -464,6 +495,11 @@ static VALUE rkadm5_find_principal(VALUE self, VALUE v_user){
   if(!ptr->ctx)
     rb_raise(cKadm5Exception, "no context has been established");
 
+  if(ptr->princ){
+    krb5_free_principal(ptr->ctx, ptr->princ);
+    ptr->princ = NULL;
+  }
+
   kerror = krb5_parse_name(ptr->ctx, user, &ptr->princ);
 
   if(kerror)
@@ -520,6 +556,11 @@ static VALUE rkadm5_get_principal(VALUE self, VALUE v_user){
   if(!ptr->ctx)
     rb_raise(cKadm5Exception, "no context has been established");
 
+  if(ptr->princ){
+    krb5_free_principal(ptr->ctx, ptr->princ);
+    ptr->princ = NULL;
+  }
+
   kerror = krb5_parse_name(ptr->ctx, user, &ptr->princ);
 
   if(kerror)
@@ -609,7 +650,7 @@ static VALUE rkadm5_create_policy(VALUE self, VALUE v_policy){
 
   if(RTEST(v_history_num)){
     mask |= KADM5_PW_HISTORY_NUM;
-    ent.pw_max_life = NUM2LONG(v_history_num);
+    ent.pw_history_num = NUM2LONG(v_history_num);
   }
 
   kerror = kadm5_create_policy(ptr->handle, &ent, mask);
@@ -694,6 +735,8 @@ static VALUE rkadm5_get_policy(VALUE self, VALUE v_name){
     v_arg[0] = v_hash;
 
     v_policy = rb_class_new_instance(1, v_arg, cKadm5Policy);
+
+    kadm5_free_policy_ent(ptr->handle, &ent);
   }
 
   return v_policy;
@@ -749,6 +792,8 @@ static VALUE rkadm5_find_policy(VALUE self, VALUE v_name){
     v_arg[0] = v_hash;
 
     v_policy = rb_class_new_instance(1, v_arg, cKadm5Policy);
+
+    kadm5_free_policy_ent(ptr->handle, &ent);
   }
 
   return v_policy;
@@ -906,15 +951,14 @@ static VALUE rkadm5_get_principals(int argc, VALUE* argv, VALUE self){
  * KADM5_PRIV_ADD    (0x02) => "ADD"
  * KADM5_PRIV_MODIFY (0x04) => "MODIFY"
  * KADM5_PRIV_DELETE (0x08) => "DELETE"
+ *
  */
 static VALUE rkadm5_get_privs(int argc, VALUE* argv, VALUE self){
   RUBY_KADM5* ptr;
   VALUE v_return = Qnil;
   VALUE v_strings = Qfalse;
   kadm5_ret_t kerror;
-  unsigned int i;
   long privs;
-  int result = 0;
 
   TypedData_Get_Struct(self, RUBY_KADM5, &rkadm5_data_type, ptr);
 
@@ -928,31 +972,17 @@ static VALUE rkadm5_get_privs(int argc, VALUE* argv, VALUE self){
   if(RTEST(v_strings)){
     v_return = rb_ary_new();
 
-    for(i = 0; i < sizeof(privs); i++){
-      result |= (privs & 1 << i);
-      switch(privs & 1 << i){
-        case KADM5_PRIV_GET:
-          rb_ary_push(v_return, rb_str_new2("GET"));
-          break;
-        case KADM5_PRIV_ADD:
-          rb_ary_push(v_return, rb_str_new2("ADD"));
-          break;
-        case KADM5_PRIV_MODIFY:
-          rb_ary_push(v_return, rb_str_new2("MODIFY"));
-          break;
-        case KADM5_PRIV_DELETE:
-          rb_ary_push(v_return, rb_str_new2("DELETE"));
-          break;
-        default:
-          rb_ary_push(v_return, rb_str_new2("UNKNOWN"));
-      };
-    }
+    if(privs & KADM5_PRIV_GET)
+      rb_ary_push(v_return, rb_str_new2("GET"));
+    if(privs & KADM5_PRIV_ADD)
+      rb_ary_push(v_return, rb_str_new2("ADD"));
+    if(privs & KADM5_PRIV_MODIFY)
+      rb_ary_push(v_return, rb_str_new2("MODIFY"));
+    if(privs & KADM5_PRIV_DELETE)
+      rb_ary_push(v_return, rb_str_new2("DELETE"));
   }
   else{
-    for(i = 0; i < sizeof(privs); i++){
-      result |= (privs & 1 << i);
-    }
-    v_return = INT2FIX(result);
+    v_return = LONG2FIX(privs);
   }
 
   return v_return;
@@ -987,13 +1017,16 @@ static VALUE rkadm5_randkey_principal(VALUE self, VALUE v_user){
 
   kerror = kadm5_randkey_principal(ptr->handle, princ, &keys, &n_keys);
 
-  if(kerror)
+  if(kerror){
+    krb5_free_principal(ptr->ctx, princ);
     rb_raise(cKadm5Exception, "kadm5_randkey_principal: %s (%li)", error_message(kerror), kerror);
+  }
 
   for(i = 0; i < n_keys; i++)
     krb5_free_keyblock_contents(ptr->ctx, &keys[i]);
 
   free(keys);
+  krb5_free_principal(ptr->ctx, princ);
 
   return INT2NUM(n_keys);
 }
@@ -1008,17 +1041,17 @@ char** parse_db_args(VALUE v_db_args){
   switch(TYPE(v_db_args)){
     case T_STRING:
       db_args = (char **) malloc(2 * sizeof(char *));
-      db_args[0] = StringValueCStr(v_db_args);
+      db_args[0] = strdup(StringValueCStr(v_db_args));
       db_args[1] = NULL;
       break;
     case T_ARRAY:
       // Multiple arguments
       array_length = RARRAY_LEN(v_db_args);
-      db_args = (char **) malloc(array_length * sizeof(char *) + 1);
+      db_args = (char **) malloc((array_length + 1) * sizeof(char *));
       for(long i = 0; i < array_length; ++i){
         VALUE elem = rb_ary_entry(v_db_args, i);
         Check_Type(elem, T_STRING);
-        db_args[i] = StringValueCStr(elem);
+        db_args[i] = strdup(StringValueCStr(elem));
       }
       db_args[array_length] = NULL;
       break;
@@ -1031,6 +1064,16 @@ char** parse_db_args(VALUE v_db_args){
   return db_args;
 }
 
+/**
+ * Free a NULL-terminated array of strings returned by parse_db_args.
+ */
+static void free_db_args(char** db_args){
+  if(!db_args) return;
+  for(int i = 0; db_args[i] != NULL; i++)
+    free(db_args[i]);
+  free(db_args);
+}
+
 /**
  * Add parsed db-args to principal entry
  */
@@ -1046,6 +1089,15 @@ void add_db_args(kadm5_principal_ent_rec* entry, char** db_args){
 /**
  * Source code taken from kadmin source code at https://github.com/krb5/krb5/blob/master/src/kadmin/cli/kadmin.c
  */
+static void free_tl_data(krb5_tl_data *tl){
+  while(tl){
+    krb5_tl_data *next = tl->tl_data_next;
+    free(tl->tl_data_contents);
+    free(tl);
+    tl = next;
+  }
+}
+
 void add_tl_data(krb5_int16 *n_tl_datap, krb5_tl_data **tl_datap,
   krb5_int16 tl_type, krb5_ui_2 len, krb5_octet *contents){
   krb5_tl_data* tl_data;