Changeset 8840

Timestamp:

05/19/11 17:30:51 (2 years ago)

Author:

sampson

Message:

Windows certificate support

Location:

branches/windows-client/src/client/windows/client-service

Files:

• cert.c (modified) (6 diffs)
• config.c (modified) (11 diffs)
• config.h (modified) (1 diff)
• service-main.c (modified) (8 diffs)
• user-cache.c (modified) (1 diff)

branches/windows-client/src/client/windows/client-service/cert.c

@@ -228 +228 @@
 }
 
-/* get user profile directory */
-static unsigned int get_profile_dir(char *userid, 
-                                    char *profile_dir)
-{
-    LPUSER_INFO_4 user_info;
+/* get user home directory */
+static unsigned int get_home_dir(char *userid, 
+                                 char *home_dir)
+{
+    LPUSER_INFO_11 user_info;
     LPWSTR wuserid;
     int ret;
@@ -243 +243 @@
 
     /* get user information */
-    ret = NetUserGetInfo(NULL, wuserid, 4, (LPBYTE *) &user_info);
+    ret = NetUserGetInfo(NULL, wuserid, 11, (LPBYTE *) &user_info);
 
     if (ret == 0)
     {
-        mbstr = convert_wstring(user_info->usri4_profile);
+        mbstr = convert_wstring(user_info->usri11_home_dir);
         if (mbstr == NULL) 
         {
@@ -254 +254 @@
         }
         
-        strncpy(profile_dir, mbstr, MAX_PATH);
-
-        free(mbstr);
+        strncpy(home_dir, mbstr, MAX_PATH);
+
+        if (mbstr != NULL)
+            free(mbstr);
 
         NetApiBufferFree(user_info);
@@ -294 +295 @@
 
     /* locate the certificates and CA */
-    if (goptions->cert_dir_prefix != NULL)
+    if (strlen(goptions->cert_dir_prefix) > 0)
     {
         if ((strlen(goptions->cert_dir_prefix) + strlen(userid) + 8) > MAX_PATH)
@@ -309 +310 @@
     {
         /* get profile directory */
-        ret = get_profile_dir(userid, cert_dir);
+        ret = get_home_dir(userid, cert_dir);
         if (ret != 0)
         {
@@ -328 +329 @@
 
     strcpy(cert_pattern, cert_dir);
-    strcat(cert_pattern, "cert.*");
+    strcat(cert_pattern, "\\cert.*");
     h_find = FindFirstFile(cert_pattern, &find_data);
     if (h_find == INVALID_HANDLE_VALUE)

branches/windows-client/src/client/windows/client-service/config.c

@@ -14 +14 @@
 extern struct qhash_table user_cache;
 
-FILE *open_config_file()
+static FILE *open_config_file(char *error_msg, 
+                              unsigned int error_msg_len)
 {
     FILE *f = NULL;
-    char *file_name, exe_path[MAX_PATH], *p;
+    char *file_name = NULL, exe_path[MAX_PATH], *p;
     DWORD ret = 0, malloc_flag = FALSE;
 
@@ -41 +42 @@
         {
             ret = GetLastError();
-            fprintf(stderr, "GetModuleFileName failed: %u\n", ret);
+            _snprintf(error_msg, error_msg_len, "GetModuleFileName failed: %u\n", ret);
         }
     }
@@ -50 +51 @@
 
     if (f == NULL)
-        fprintf(stderr, "Fatal: could not open file %s\n", 
+        _snprintf(error_msg, error_msg_len, "Fatal: could not open configuration file %s\n", 
             file_name == NULL ? "(null)" : file_name);
 
@@ -59 +60 @@
 }
 
-void close_config_file(FILE *f)
+static void close_config_file(FILE *f)
 {
     fclose(f);
@@ -145 +146 @@
 }
 
-int get_config(PORANGEFS_OPTIONS options)
+int get_config(PORANGEFS_OPTIONS options,
+               char *error_msg,
+               unsigned int error_msg_len)
 {
     FILE *config_file;
     char line[256], copy[256], *token;
-
-    config_file = open_config_file();
+    int ret = 0;
+
+    config_file = open_config_file(error_msg, error_msg_len);
     if (config_file == NULL)
         /* config file is required */
@@ -204 +208 @@
                 if (token == NULL)
                 {
-                    fprintf(stderr, "user-mode option must be list, certificate, or ldap\n");
-                    close_config_file(config_file);
-                    return 1;
+                    _snprintf(error_msg, error_msg_len, "user-mode option must be list, certificate, or ldap\n");                    
+                    ret = 1;
+                    goto get_config_exit;
                 }
                 if (!stricmp(token, "list"))
@@ -222 +226 @@
                 else
                 {
-                    fprintf(stderr, "user-mode option must be list, certificate, or ldap\n");
-                    close_config_file(config_file);
-                    return 1;
+                    _snprintf(error_msg, error_msg_len, "user-mode option must be list, certificate, or ldap\n");
+                    ret = 1;
+                    goto get_config_exit;
                 }
             }
@@ -231 +235 @@
                 if (options->user_mode == USER_MODE_NONE)
                 {
-                    fprintf(stderr, "user option: specify 'user-mode list' above user option\n");
-                    close_config_file(config_file);
-                    return 1;
+                    _snprintf(error_msg, error_msg_len, "user option: specify 'user-mode list' above user option\n");
+                    ret = 1;
+                    goto get_config_exit;
                 }
                 else if (options->user_mode != USER_MODE_LIST)
                 {
-                    fprintf(stderr, "user option: not legal with current user mode\n");
-                    close_config_file(config_file);
-                    return 1;
+                    _snprintf(error_msg, error_msg_len, "user option: not legal with current user mode\n");
+                    ret = 1;
+                    goto get_config_exit;
                 }
 
                 if (parse_user() != 0)
                 {
-                    fprintf(stderr, "user option: parse error\n");
-                    close_config_file(config_file);
-                    return 1;
+                    _snprintf(error_msg, error_msg_len, "user option: parse error\n");
+                    ret = 1;
+                    goto get_config_exit;
                 }
             }            
@@ -260 +264 @@
                 else
                 {
-                    fprintf(stderr, "cert-dir-prefix option: parse error\n");
+                    _snprintf(error_msg, error_msg_len, "cert-dir-prefix option: parse error\n");
+                    ret = 1;
+                    goto get_config_exit;
                 }
             }
@@ -272 +278 @@
                 else
                 {
-                    fprintf(stderr, "ca-path option: parse error\n");
+                    _snprintf(error_msg, error_msg_len, "ca-path option: parse error\n");
+                    ret = 1;
+                    goto get_config_exit;
                 }
             }
@@ -280 +288 @@
             }            
             else
-                fprintf(stderr, "Unknown option %s\n", token);
-        }
-    }
+                _snprintf(error_msg, error_msg_len, "Unknown option %s\n", token);
+        }
+    }
+
+    if (options->user_mode == USER_MODE_NONE)
+    {
+        _snprintf(error_msg, error_msg_len, "Must specify user-mode (list, certificate or ldap)\n");
+        ret = 1;
+        goto get_config_exit;
+    }
+
+    if (options->user_mode == USER_MODE_CERT &&
+        strlen(options->ca_path) == 0)
+    {
+        _snprintf(error_msg, error_msg_len, "Must specify ca-path with certificate mode\n");
+        ret = 1;
+    }
+
+get_config_exit:
 
     close_config_file(config_file);
 
-    if (options->user_mode == USER_MODE_NONE)
-    {
-        fprintf(stderr, "Must specify user-mode (list, certificate or ldap)\n");
-        return 1;
-    }
-
-    return 0;
+    return ret;
 }

branches/windows-client/src/client/windows/client-service/config.h

@@ -7 +7 @@
 #include "client-service.h"
 
-int get_config(PORANGEFS_OPTIONS options);
+int get_config(PORANGEFS_OPTIONS options,
+               char *error_msg,
+               unsigned int error_msg_len);
 
 #endif

branches/windows-client/src/client/windows/client-service/service-main.c

@@ -301 +301 @@
     PORANGEFS_OPTIONS options;
     int ret;
+    char error_msg[512];    
 
     /* allocate options */
@@ -314 +315 @@
 
     /* read from config file */
-    ret = get_config(options);
+    ret = get_config(options, error_msg, 512);
 
     /* point global options */
@@ -329 +330 @@
     if (ret != 0)
     {
-        service_debug("Could not parse config file: check user options\n");
+        service_debug(error_msg);
+        service_debug("Could not parse config file: exiting\n");
         close_service_log();
         return;
@@ -543 +545 @@
   DWORD err = 0;
   char mount_point[256];
+  char error_msg[512];
 
   SERVICE_TABLE_ENTRY dispatch_table[2] = 
@@ -602 +605 @@
 
       /* get options from config file */
-      if (get_config(options) != 0)
-          return 1;
+      if (get_config(options, error_msg, 512) != 0)
+      {
+          fprintf(stderr, error_msg);
+          err = 1;
+          goto main_exit;
+      }
 
       /* point goptions */
@@ -623 +630 @@
       {
           fprintf(stderr, "Drive already in use\n");
-          return -1;
+          err = 1;
+          goto main_exit;
       }
 
@@ -631 +639 @@
       {
           fprintf(stderr, "User cache thread did not start: %u\n", err);
-          free(options);
-          return err;
+          goto main_exit;
       }
 
@@ -646 +653 @@
       cache_thread_stop();
 
+main_exit:
+
       qhash_destroy_and_finalize(user_cache, struct user_entry, hash_link, free);
 

branches/windows-client/src/client/windows/client-service/user-cache.c

@@ -135 +135 @@
         {
             head = qhash_search_at_index(user_cache, i);
-            qhash_for_each_safe(link, temp, head)
-            {
-                entry = qhash_entry(link, struct user_entry, hash_link);
-                if (entry->expires != 0 && entry->expires < now)
-                {   
-                    DbgPrint("user_cache_thread: removing %s\n", entry->user_name);
-                    qhash_del(link);
-                    free(entry);
+            if (head != NULL)
+            {    
+                qhash_for_each_safe(link, temp, head)
+                {
+                    entry = qhash_entry(link, struct user_entry, hash_link);
+                    if (entry->expires != 0 && entry->expires < now)
+                    {   
+                        DbgPrint("user_cache_thread: removing %s\n", entry->user_name);
+                        qhash_del(link);
+                        free(entry);
+                    }
                 }
             }