rpam2 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 174bfb02ac619c8c0b0a4c8eed1eee25ff1a7c98
-  data.tar.gz: eb1eb25a1c69a4c3e6bbfd33b8175ad77e52e212
+  metadata.gz: 671a7b38ff512a687a10b9d4e407fc85e97ece0d
+  data.tar.gz: 1ccf99986d33defbcc247cc445e1c86ec9c04cab
 SHA512:
-  metadata.gz: f5212c119e74b0f42ce307d7028b0976cad85bd8ca779c8a3587cdfb8f94dbb96d5a62237982888c723fbc86058edb5a4feb57cb9c4120d061405922a1eae327
-  data.tar.gz: 2b50aebcd9124774bb4ff4b17164bebb662bfba607ca78128248fd025565b9eac15a3e0df23e541ec3e877917fc0317754cfcfe8f188bf05ebaddabd5a44de26
+  metadata.gz: a05e7ef83d101d6784bdf6dc1a68fdb402ce7cddd9134cb74f090ff0078b4e7654bd56039d4d30a02c19acd99a9aafc9823e44e97a60bd351241bc23cc72168a
+  data.tar.gz: 3cc90580f55dfffb99a8df76dfaa8175f0f5eee3beaba5f434d44a3706cf1f1fc72edeed5092eb36aaa70a8ebd7b6a2e0c576bf650b70d49734b58ad5a60c3b9

data/ext/rpam2/extconf.rb

@@ -12,6 +12,7 @@ have_func("pam_acct_mgmt")
 have_func("pam_chauthtok")
 have_func("pam_set_item")
 have_func("pam_get_item")
+$CFLAGS << " -std=c99 "
 
 
 create_makefile("rpam2/rpam2")

data/ext/rpam2/rpam2.c

@@ -33,24 +33,24 @@ void Init_rpam2(){
 
 int rpam_auth_conversation(int num_msg, const struct pam_message **msgm,
                            struct pam_response **resp, void *appdata_ptr){
+    struct auth_wrapper *authw = (struct auth_wrapper *)appdata_ptr;
     struct pam_response *responses = calloc(num_msg, sizeof(struct pam_response));
-    // no space for responses
+    /* no space for responses*/
     if (!responses)
         return PAM_BUF_ERR;
-    struct auth_wrapper *authw = (struct auth_wrapper *)appdata_ptr;
     for (int msgc=0; msgc<num_msg; msgc++){
         switch (msgm[msgc]->msg_style) {
             case PAM_PROMPT_ECHO_OFF:
-                // Assume ECHO_OFF is password/secret input
+                /* Assume ECHO_OFF is password/secret input */
                 responses[msgc].resp = strdup(authw->pw);
                 break;
             case PAM_PROMPT_ECHO_ON:
             case PAM_TEXT_INFO:
-                // ignore, they should not occur but some verbose applications exist always
+                /* ignore, they should not occur but some verbose applications exist always */
                 responses[msgc].resp = strdup("");
                 break;
             case PAM_ERROR_MSG:
-                // print error message
+                /* print error message */
                 rb_warn("%s", msgm[msgc]->msg);
                 responses[msgc].resp = strdup("");
                 break;
@@ -58,7 +58,7 @@ int rpam_auth_conversation(int num_msg, const struct pam_message **msgm,
                 free(responses);
                 return PAM_CONV_ERR;
         }
-        // response could not be allocated (no space)
+        /* response could not be allocated (no space) */
         if(responses[msgc].resp==0){
             free(responses);
             return PAM_BUF_ERR;
@@ -70,19 +70,23 @@ int rpam_auth_conversation(int num_msg, const struct pam_message **msgm,
 
 static VALUE method_authpam(VALUE self, VALUE servicename, VALUE username, VALUE password) {
     pam_handle_t* pamh = NULL;
-    unsigned int result=0;
+    unsigned int result = 0;
+    struct pam_conv auth_c;
+    struct auth_wrapper authw;
+    const char *service;
+
     Check_Type(username, T_STRING);
     Check_Type(password, T_STRING);
 
-    char *service = (char*)rpam_default_servicename;
+    
     if(!NIL_P(servicename)){
         service = StringValueCStr(servicename);
+    } else {
+        service = rpam_default_servicename;
     }
 
-    struct pam_conv auth_c;
     auth_c.conv = rpam_auth_conversation;
 
-    struct auth_wrapper authw;
     authw.pw = StringValueCStr(password);
     auth_c.appdata_ptr = &authw;
 
@@ -115,14 +119,18 @@ static VALUE method_authpam(VALUE self, VALUE servicename, VALUE username, VALUE
 static VALUE method_accountpam(VALUE self, VALUE servicename, VALUE username) {
     pam_handle_t* pamh = NULL;
     unsigned int result=0;
+    struct pam_conv auth_c = {0,0};
+    const char *service;
+
     Check_Type(username, T_STRING);
 
-    char *service = (char*)rpam_default_servicename;
+    
     if(!NIL_P(servicename)){
         service = StringValueCStr(servicename);
+    } else {
+        service = rpam_default_servicename;
     }
 
-    struct pam_conv auth_c = {0,0};
     pam_start(service, StringValueCStr(username), &auth_c, &pamh);
     if (result != PAM_SUCCESS) {
         rb_warn("INIT: %s", pam_strerror(pamh, result));
@@ -147,20 +155,25 @@ static VALUE method_accountpam(VALUE self, VALUE servicename, VALUE username) {
 static VALUE method_getenvpam(VALUE self, VALUE servicename, VALUE username, VALUE password, VALUE envname, VALUE opensession) {
     pam_handle_t* pamh = NULL;
     unsigned int result=0;
-    VALUE ret2;
+    struct pam_conv auth_c;
+    struct auth_wrapper authw;
+    const char *service;
+    const char *c_ret;
+    VALUE ruby_ret;
+    
     Check_Type(username, T_STRING);
     Check_Type(password, T_STRING);
     Check_Type(envname, T_STRING);
 
-    char *service = (char*)rpam_default_servicename;
+    
     if(!NIL_P(servicename)){
         service = StringValueCStr(servicename);
+    } else {
+        service = rpam_default_servicename;
     }
 
-    struct pam_conv auth_c;
     auth_c.conv = rpam_auth_conversation;
 
-    struct auth_wrapper authw;
     authw.pw = StringValueCStr(password);
     auth_c.appdata_ptr = &authw;
 
@@ -184,11 +197,11 @@ static VALUE method_getenvpam(VALUE self, VALUE servicename, VALUE username, VAL
             return Qnil;
         }
     }
-    char *ret = pam_getenv(pamh, StringValueCStr(envname));
-    if(ret){
-        ret2 = rb_str_new_cstr(ret);
+    c_ret = pam_getenv(pamh, StringValueCStr(envname));
+    if(c_ret){
+        ruby_ret = rb_str_new_cstr(c_ret);
     } else {
-        ret2 = Qnil;
+        ruby_ret = Qnil;
     }
 
     if (RTEST(opensession)){
@@ -202,24 +215,31 @@ static VALUE method_getenvpam(VALUE self, VALUE servicename, VALUE username, VAL
     if (result != PAM_SUCCESS) {
         rb_warn("END: %s", pam_strerror(pamh, result));
     }
-    return ret2;
+    return ruby_ret;
 }
 
 static VALUE method_listenvpam(VALUE self, VALUE servicename, VALUE username, VALUE password, VALUE opensession) {
     pam_handle_t* pamh = NULL;
     unsigned int result=0;
+    struct pam_conv auth_c;
+    struct auth_wrapper authw;
+    char *last;
+    const char *service;
+    char **envlist;
+    char **tmpenvlist;
+    VALUE ruby_ret;
+
     Check_Type(username, T_STRING);
     Check_Type(password, T_STRING);
 
-    char *service = (char*)rpam_default_servicename;
+    
     if(!NIL_P(servicename)){
         service = StringValueCStr(servicename);
+    } else {
+        service = rpam_default_servicename;
     }
 
-    struct pam_conv auth_c;
     auth_c.conv = rpam_auth_conversation;
-
-    struct auth_wrapper authw;
     authw.pw = StringValueCStr(password);
     auth_c.appdata_ptr = &authw;
 
@@ -244,22 +264,22 @@ static VALUE method_listenvpam(VALUE self, VALUE servicename, VALUE username, VA
         }
     }
 
-    char **envlist = pam_getenvlist(pamh);
-    VALUE ret = rb_hash_new();
-    char **tmpenvlist=envlist;
+    envlist = pam_getenvlist(pamh);
+    ruby_ret = rb_hash_new();
+    tmpenvlist = envlist;
     while(*tmpenvlist!=NULL){
-        char *last = strchr(*tmpenvlist, '=');
-        // should not be needed but better be safe in a security relevant application
+        last = strchr(*tmpenvlist, '=');
+        /* should not be needed but better be safe in a security relevant application */
         if (last!=NULL){
-            rb_hash_aset(ret, rb_str_new(*tmpenvlist, last-*tmpenvlist), rb_str_new_cstr(last+1));
+            rb_hash_aset(ruby_ret, rb_str_new(*tmpenvlist, last-*tmpenvlist), rb_str_new_cstr(last+1));
         }
-        // strings have to be freed (specification)
-        // overwrite them with zero to prevent leakage
+        /* strings have to be freed (specification)
+         overwrite them with zero to prevent leakage */
         memset(*tmpenvlist, 0, strlen(*tmpenvlist));
         free(*tmpenvlist);
         tmpenvlist++;
     }
-    // stringlist have to be freed (specification)
+    /* stringlist have to be freed (specification) */
     free(envlist);
 
     if (RTEST(opensession)){
@@ -273,6 +293,6 @@ static VALUE method_listenvpam(VALUE self, VALUE servicename, VALUE username, VA
         }
     }
 
-    return ret;
+    return ruby_ret;
 }
 

data/rpam2.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "rpam2"
-  s.version = "3.0.1"
-  s.date = "2017-10-03"
+  s.version = "3.0.2"
+  s.date = "2017-10-10"
   s.summary = "PAM integration with ruby."
   s.email = "devkral@web.de"
   s.description = "Ruby PAM (Pluggable Authentication

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpam2
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Alexander Kaftan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Ruby PAM (Pluggable Authentication