1 files changed, 145 insertions, 5 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index e29dc5a..66849b1 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1004,8 +1004,9 @@ bool idle_startup()
                         gDebugInfo["LoginName"] = firstname + " " + lastname;
 
                         // create necessary directories
-                        gDirUtilp->setLindenUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
-                        LLFile::mkdir(gDirUtilp->getLindenUserDir());
+                        // *FIX: these mkdir's should error check
+                        gDirUtilp->setViewerUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
+                        LLFile::mkdir(gDirUtilp->getViewerUserDir());
                 }
                 else
                 {
@@ -1289,7 +1290,7 @@ bool idle_startup()
 
                 char hashed_mac_string[MD5HEX_STR_SIZE];                /* Flawfinder: ignore */
                 LLMD5 hashed_mac;
-                hashed_mac.update( gMACAddress, MAC_ADDRESS_BYTES );
+                hashed_mac.update( (const unsigned char*) "012345", MAC_ADDRESS_BYTES );  // Nope, LL ain't getting our MAC, and meta7 does not need it.
                 hashed_mac.finalize();
                 hashed_mac.hex_digest(hashed_mac_string);
 
@@ -2524,7 +2525,7 @@ bool idle_startup()
                         }
                 }
                 // Either we want to show tutorial because this is the first login
-                // to a Linden Help Island or the user quit with the tutorial
+                // to a grid Help Island or the user quit with the tutorial
                 // visible.  JC
                 if (show_hud
                         || gSavedSettings.getBOOL("ShowTutorial"))
@@ -3102,6 +3103,145 @@ void login_callback(S32 option, void *userdata)
 }
 
 
+// static
+std::string LLStartUp::loadPasswordFromDisk()
+{
+        // Only load password if we also intend to save it (otherwise the user
+        // wonders what we're doing behind his back).  JC
+        BOOL remember_password = gSavedSettings.getBOOL("RememberPassword");
+        if (!remember_password)
+        {
+                return std::string("");
+        }
+
+        std::string hashed_password("");
+
+        // Look for legacy "marker" password from settings.ini
+        hashed_password = gSavedSettings.getString("Marker");
+        if (!hashed_password.empty())
+        {
+                // Stomp the Marker entry.
+                gSavedSettings.setString("Marker", "");
+
+                // Return that password.
+                return hashed_password;
+        }
+
+        // UUID is 16 bytes, written into ASCII is 32 characters
+        // without trailing \0
+        const S32 HASHED_LENGTH = 32;
+
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
+                                                                                                           "password.dat");
+        LLFILE* fp = LLFile::fopen(filepath, "rb");             /* Flawfinder: ignore */
+        if (!fp)
+        {
+#if LL_DARWIN
+                UInt32 passwordLength;
+                char *passwordData;
+                OSStatus stat = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, &passwordLength, (void**)&passwordData, NULL);
+                if (stat == noErr)
+                {
+                        if (passwordLength == HASHED_LENGTH)
+                                hashed_password.assign(passwordData, HASHED_LENGTH);
+                        SecKeychainItemFreeContent(NULL, passwordData);
+                }
+#endif
+                return hashed_password;
+        }
+
+        U8 buffer[HASHED_LENGTH+1];
+
+        if (1 != fread(buffer, HASHED_LENGTH, 1, fp))
+        {
+                return hashed_password;
+        }
+
+        fclose(fp);
+
+        // Decipher with MAC address
+        LLXORCipher cipher(gMACAddress, 6);  // The one and only legitimate use of the users MAC.
+        cipher.decrypt(buffer, HASHED_LENGTH);
+
+        buffer[HASHED_LENGTH] = '\0';
+
+        // Check to see if the mac address generated a bad hashed
+        // password. It should be a hex-string or else the mac adress has
+        // changed. This is a security feature to make sure that if you
+        // get someone's password.dat file, you cannot hack their account.
+        if(is_hex_string(buffer, HASHED_LENGTH))
+        {
+                hashed_password.assign((char*)buffer);
+        }
+#if LL_DARWIN
+        // we're migrating to the keychain
+        LLFile::remove(filepath);
+#endif
+
+        return hashed_password;
+}
+
+
+// static
+void LLStartUp::savePasswordToDisk(const std::string& hashed_password)
+{
+#if LL_DARWIN
+        SecKeychainItemRef keychainItem;
+        OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, NULL, NULL, &keychainItem);
+        if (status == noErr)
+        {
+                SecKeychainItemModifyAttributesAndData(keychainItem, NULL, hashed_password.length(), hashed_password.c_str());
+                CFRelease(keychainItem);
+        }
+        else
+        {
+                SecKeychainAddGenericPassword(NULL, 10, "meta-impy", 0, NULL, hashed_password.length(), hashed_password.c_str(), NULL);
+        }
+#else
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
+                                                                                                           "password.dat");
+        LLFILE* fp = LLFile::fopen(filepath, "wb");             /* Flawfinder: ignore */
+        if (!fp)
+        {
+                return;
+        }
+
+        // Encipher with MAC address
+        const S32 HASHED_LENGTH = 32;
+        U8 buffer[HASHED_LENGTH+1];
+
+        LLStringUtil::copy((char*)buffer, hashed_password.c_str(), HASHED_LENGTH+1);
+
+        LLXORCipher cipher(gMACAddress, 6);  // The one and only legitimate use of the users MAC.
+        cipher.encrypt(buffer, HASHED_LENGTH);
+
+        if (fwrite(buffer, HASHED_LENGTH, 1, fp) != 1)
+        {
+                LL_WARNS("AppInit") << "Short write" << LL_ENDL;
+        }
+
+        fclose(fp);
+#endif
+}
+
+
+// static
+void LLStartUp::deletePasswordFromDisk()
+{
+#if LL_DARWIN
+        SecKeychainItemRef keychainItem;
+        OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, NULL, NULL, &keychainItem);
+        if (status == noErr)
+        {
+                SecKeychainItemDelete(keychainItem);
+                CFRelease(keychainItem);
+        }
+#endif
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
+                                                                                                                  "password.dat");
+        LLFile::remove(filepath);
+}
+
 void show_first_run_dialog()
 {
         LLNotifications::instance().add("FirstRun", LLSD(), LLSD(), first_run_dialog_callback);
@@ -3687,7 +3827,7 @@ void init_start_screen(S32 location_id)
 
         LL_DEBUGS("AppInit") << "Loading startup bitmap..." << LL_ENDL;
 
-        std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
+        std::string temp_str = gDirUtilp->getViewerUserDir() + gDirUtilp->getDirDelimiter();
 
         if ((S32)START_LOCATION_ID_LAST == location_id)
         {