Changeset 116

Timestamp:

Feb 2, 2008, 7:30:01 AM (17 years ago)

Author:

Paul Smedley

Message:

Encrypt samba password in Netdrive control files

Location:

branches/samba-3.0/source/ndpsmb

Files:

• ndpsmb.c (modified) (4 diffs)
• rc/rc.dlg (modified) (1 diff)
• rc/rc.h (modified) (1 diff)
• rc/rc.rc (modified) (1 diff)

branches/samba-3.0/source/ndpsmb/ndpsmb.c ¶

@@ -150 +150 @@
         {ND_PROP_STRING, 0, "USER", "guest"},
         {ND_PROP_STRING, 0, "PASSWORD", ""},
+        {ND_PROP_STRING, 0, "SPASSWORD",  ""},
         {ND_PROP_STRING, 0, "MASTER", "WORKGROUP"},
         { ND_PROP_ULONG, 0, "MASTERTYPE", "1"},
@@ -376 +377 @@
 }
 
+static unsigned char fromhex (char c)
+{
+    if ('0' <= c && c <= '9')
+    {
+         return c - '0';
+    }
+    
+    if ('A' <= c && c <= 'F')
+    {
+         return c - 'A';
+    }
+    
+    if ('a' <= c && c <= 'f')
+    {
+         return c - 'a';
+    }
+    
+    return 0;
+}
+
+static char tohex (unsigned char b)
+{
+    b &= 0xF;
+    
+    if (b <= 9)
+    {
+        return b + '0';
+    }
+    
+    return 'A' + (b - 0xA);
+}
+
+static void decryptPassword (const char *pszCrypt, char *pszPlain)
+{
+    /* A simple "decryption", character from the hex value. */
+    const char *s = pszCrypt;
+    char *d = pszPlain;
+    
+    while (*s)
+    {
+        *d++ = (char)((fromhex (*s++) << 4) + fromhex (*s++));
+    }
+    
+    *d++ = 0;
+}
+
+static void encryptPassword (const char *pszPlain, char *pszCrypt)
+{
+    /* A simple "encryption" encode each character as hex value. */
+    const char *s = pszPlain;
+    char *d = pszCrypt;
+    
+    while (*s)
+    {
+        *d++ = tohex ((*s) >> 4);
+        *d++ = tohex (*s);
+        s++;
+    }
+    
+    *d++ = 0;
+}
 
 /* accept parameters in form
@@ -386 +448 @@
         const unsigned char * q = NULL;
         HPIPE pipe;
+        int defaultPassword = 1;
 
         pRes->memlen = 1 << 18;
@@ -429 +492 @@
         {
                 StrNCpy(pRes->srv.password, q, sizeof(pRes->srv.password) - 1);
-        }
+                defaultPassword = 0;
+        }
+
+        t = 0, q = NULL;
+        rc = ph->fsphQueryStringProperty (pRes->properties, "SPASSWORD", &q, &t);
+        if (   rc == NO_ERROR
+            && *q != '\0'
+            && defaultPassword)
+        {
+            char p[1024];
+            p[0] = 0;
+        
+            decryptPassword (q, p);
+        
+            if (*p)
+            {
+                StrNCpy(pRes->srv.password, p, sizeof(pRes->srv.password) - 1);
+        
+                /* clear the plain password */
+                ph->fsphSetProperty (pRes->properties, "PASSWORD", "");
+            }
+        }
+        else
+        {
+            char c[1024];
+            encryptPassword (pRes->srv.password, c);
+        
+            ph->fsphSetProperty (pRes->properties, "SPASSWORD", c);
+        
+            // clear the plain password
+            ph->fsphSetProperty (pRes->properties, "PASSWORD", "");
+        }
 
         t = 0, q = NULL;

branches/samba-3.0/source/ndpsmb/rc/rc.dlg ¶

@@ -31 +31 @@
                         DT_BOTTOM 
         ENTRYFIELD      "", ENT_PASS, 67, 70, 100, 8, ES_MARGIN | ES_UNREADABLE
+        ENTRYFIELD      "", ENT_SPASS, 0, 0, 0, 0, ES_MARGIN | 
+                        ES_UNREADABLE | NOT WS_TABSTOP | NOT WS_VISIBLE
 
         RTEXT           "Master", LBL_MASTER, 5, 57, 30, 10, 

branches/samba-3.0/source/ndpsmb/rc/rc.h ¶

@@ -24 +24 @@
 #define LBL_EASUPPORT               1021
 #define CHK_EASUPPORT               1022
+#define ENT_SPASS                   1023

branches/samba-3.0/source/ndpsmb/rc/rc.rc ¶

@@ -145 +145 @@
 RCDATA (DLG_ID + 11)
 {
+    ENT_SPASS, PARMTYPE_STRING, 1L, 255L, "spassword", "%s", ""
+}
+
+RCDATA (DLG_ID + 12)
+{
     0
 }