Changeset 8843

Timestamp:

05/25/11 17:43:26 (2 years ago)

Author:

sampson

Message:

Windows certificate support

Location:

branches/windows-client

Files:

• projects/OrangeFS/client-service/client-service.vcxproj (modified) (4 diffs)
• src/client/windows/client-service/cert.c (modified) (5 diffs)
• src/client/windows/client-service/cert.h (modified) (1 diff)
• src/client/windows/client-service/user-cache.c (modified) (1 diff)

branches/windows-client/projects/OrangeFS/client-service/client-service.vcxproj

@@ -100 +100 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(TargetDir);..\..\..\dokansrc-0.6.0\dokan\objchk_wlh_x86\i386;..\..\..\openssl-windows\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;netapi32.lib;bmi.lib;bmi_misc.lib;bmi_wintcp.lib;description.lib;dev.lib;flow.lib;gen-locks.lib;gossip.lib;id-generator.lib;job.lib;misc.lib;request-scheduler.lib;sysint-client.lib;proto.lib;dokan.lib;libeay32mdd.lib;ssleay32mdd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;ws2_32.lib;netapi32.lib;userenv.lib;bmi.lib;bmi_misc.lib;bmi_wintcp.lib;description.lib;dev.lib;flow.lib;gen-locks.lib;gossip.lib;id-generator.lib;job.lib;misc.lib;request-scheduler.lib;sysint-client.lib;proto.lib;dokan.lib;libeay32mdd.lib;ssleay32mdd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -113 +113 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(TargetDir);..\..\..\dokansrc-0.6.0\dokan\objchk_wlh_amd64\amd64;..\..\..\openssl-windows\lib64</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;netapi32.lib;bmi.lib;bmi_misc.lib;bmi_wintcp.lib;description.lib;dev.lib;flow.lib;gen-locks.lib;gossip.lib;id-generator.lib;job.lib;misc.lib;request-scheduler.lib;sysint-client.lib;proto.lib;dokan.lib;libeay32mdd.lib;ssleay32mdd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;ws2_32.lib;netapi32.lib;userenv.lib;bmi.lib;bmi_misc.lib;bmi_wintcp.lib;description.lib;dev.lib;flow.lib;gen-locks.lib;gossip.lib;id-generator.lib;job.lib;misc.lib;request-scheduler.lib;sysint-client.lib;proto.lib;dokan.lib;libeay32mdd.lib;ssleay32mdd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -130 +130 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(TargetDir);..\..\..\dokansrc-0.6.0\dokan\objchk_wlh_x86\i386;..\..\..\openssl-windows\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;netapi32.lib;ws2_32.lib;bmi.lib;bmi_misc.lib;bmi_wintcp.lib;description.lib;dev.lib;flow.lib;gen-locks.lib;gossip.lib;id-generator.lib;job.lib;misc.lib;request-scheduler.lib;sysint-client.lib;proto.lib;dokan.lib;libeay32md.lib;ssleay32md.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;ws2_32.lib;netapi32.lib;userenv.lib;bmi.lib;bmi_misc.lib;bmi_wintcp.lib;description.lib;dev.lib;flow.lib;gen-locks.lib;gossip.lib;id-generator.lib;job.lib;misc.lib;request-scheduler.lib;sysint-client.lib;proto.lib;dokan.lib;libeay32md.lib;ssleay32md.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -147 +147 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(TargetDir);..\..\..\dokansrc-0.6.0\dokan\objchk_wlh_amd64\amd64;..\..\..\openssl-windows\lib64</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;netapi32.lib;ws2_32.lib;bmi.lib;bmi_misc.lib;bmi_wintcp.lib;description.lib;dev.lib;flow.lib;gen-locks.lib;gossip.lib;id-generator.lib;job.lib;misc.lib;request-scheduler.lib;sysint-client.lib;proto.lib;dokan.lib;libeay32md.lib;ssleay32md.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;ws2_32.lib;netapi32.lib;userenv.lib;bmi.lib;bmi_misc.lib;bmi_wintcp.lib;description.lib;dev.lib;flow.lib;gen-locks.lib;gossip.lib;id-generator.lib;job.lib;misc.lib;request-scheduler.lib;sysint-client.lib;proto.lib;dokan.lib;libeay32md.lib;ssleay32md.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

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

@@ -50 +50 @@
 
     *cert = PEM_read_X509(f, NULL, NULL, NULL);
-    if (cert == NULL)
+    if (*cert == NULL)
         return ERR_get_error();
 
@@ -262 +262 @@
     int ret;
 
-    if (userid == NULL || credentials == NULL)
+    if (userid == NULL || credentials == NULL || expires == NULL)
         return -1;
 
@@ -282 +282 @@
         /* get profile directory */
         ret = get_profile_dir(huser, cert_dir);
-        if (ret != 0)
+        if (ret == 0)
+        {
+            if (strlen(cert_dir) > 0 && cert_dir[strlen(cert_dir)-1] != '\\')
+                strcat(cert_dir, "\\");
+        }
+        else
         {
             DbgPrint("User %s: could not locate profile dir: %d\n", userid,
@@ -300 +305 @@
 
     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)
     {
         DbgPrint("User %s: no certificates\n", userid);
+        ret = -1;
         goto get_cert_credentials_exit;
     }
@@ -310 +316 @@
     do
     {
-        strcpy(cert_path, cert_dir);
+        strcpy(cert_path, cert_dir);        
         strcat(cert_path, find_data.cFileName);
         /* load proxy cert */

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

@@ -5 +5 @@
 #include "client-service.h"
 
+void openssl_init();
+
+void openssl_cleanup();
+
 int get_cert_credentials(HANDLE huser,
                          char *userid,

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

@@ -61 +61 @@
     gen_mutex_lock(&user_cache_mutex);
     qhash_add(user_cache, &entry->user_name, &entry->hash_link);
-    DbgPrint("   add_user: adding user %s (%u:%u) expires %u\n", user_name,
-        credentials->uid, credentials->gid, expires);
+    DbgPrint("   add_user: adding user %s (%u:%u) expires %u (entry %08x)\n", 
+             user_name, credentials->uid, credentials->gid, expires, entry);
     gen_mutex_unlock(&user_cache_mutex);