From 4cc7302baf1aaca8dfb8a4c5c320371b03b13327 Mon Sep 17 00:00:00 2001
From: Colin Finck <colin@reactos.org>
Date: Thu, 8 Jan 2009 23:09:10 +0000
Subject: [PATCH] - It actually wasn't a very good idea to authenticate against
 the MD5 password hash instead of the password itself.   This didn't really
 improve security, but just made things more difficult for the user. Change
 that, so the web service and rosautotest expect a password in the
 "rosautotest.ini" file now. - Read the "rosautotest.ini" from the
 application's directory instead of the Windows directory. - Little
 adjustmensts here and there

svn path=/trunk/; revision=38655
---
 rostests/rosautotest/main.c       | 26 +++++++++++++++-----------
 rostests/rosautotest/webservice.c |  2 ++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/rostests/rosautotest/main.c b/rostests/rosautotest/main.c
index 31c984c536b..85acfd800f9 100644
--- a/rostests/rosautotest/main.c
+++ b/rostests/rosautotest/main.c
@@ -53,22 +53,22 @@ IntGetINIValueA(PCWCH AppName, PCWCH KeyName, PCWCH FileName, char** ReturnedVal
 }
 
 /**
- * Gets the username and password hash from the "rosautotest.ini" file if the user enabled submitting the results to the web service.
+ * Gets the username and password from the "rosautotest.ini" file if the user enabled submitting the results to the web service.
  * The "rosautotest.ini" file should look like this:
  *
  * [Login]
  * UserName=TestMan
- * PasswordHash=1234567890abcdef1234567890abcdef
+ * Password=TestPassword
  */
 static BOOL
 IntGetConfigurationValues()
 {
-    const CHAR PasswordHashProp[] = "&passwordhash=";
+    const CHAR PasswordProp[] = "&password=";
     const CHAR UserNameProp[] = "&username=";
 
     DWORD DataLength;
     DWORD Length;
-    PCHAR PasswordHash;
+    PCHAR Password;
     PCHAR UserName;
     WCHAR ConfigFile[MAX_PATH];
 
@@ -76,13 +76,17 @@ IntGetConfigurationValues()
     if(!AppOptions.Submit)
         return TRUE;
 
-    /* Build the path to the configuration file */
-    Length = GetWindowsDirectoryW(ConfigFile, MAX_PATH);
+    /* Build the path to the configuration file from the application's path */
+    GetModuleFileNameW(NULL, ConfigFile, MAX_PATH);
+    Length = wcsrchr(ConfigFile, '\\') - ConfigFile;
     wcscpy(&ConfigFile[Length], L"\\rosautotest.ini");
 
     /* Check if it exists */
     if(GetFileAttributesW(ConfigFile) == INVALID_FILE_ATTRIBUTES)
+    {
+        StringOut("Missing \"rosautotest.ini\" configuration file!\n");
         return FALSE;
+    }
 
     /* Get the required length of the authentication request string */
     DataLength = sizeof(UserNameProp) - 1;
@@ -97,12 +101,12 @@ IntGetConfigurationValues()
     /* Some characters might need to be escaped and an escaped character takes 3 bytes */
     DataLength += 3 * Length;
 
-    DataLength += sizeof(PasswordHashProp) - 1;
-    Length = IntGetINIValueA(L"Login", L"PasswordHash", ConfigFile, &PasswordHash);
+    DataLength += sizeof(PasswordProp) - 1;
+    Length = IntGetINIValueA(L"Login", L"Password", ConfigFile, &Password);
 
     if(!Length)
     {
-        StringOut("PasswordHash is missing in the configuration file\n");
+        StringOut("Password is missing in the configuration file\n");
         return FALSE;
     }
 
@@ -114,8 +118,8 @@ IntGetConfigurationValues()
     strcpy(AuthenticationRequestString, UserNameProp);
     EscapeString(&AuthenticationRequestString[strlen(AuthenticationRequestString)], UserName);
 
-    strcat(AuthenticationRequestString, PasswordHashProp);
-    EscapeString(&AuthenticationRequestString[strlen(AuthenticationRequestString)], PasswordHash);
+    strcat(AuthenticationRequestString, PasswordProp);
+    EscapeString(&AuthenticationRequestString[strlen(AuthenticationRequestString)], Password);
 
     return TRUE;
 }
diff --git a/rostests/rosautotest/webservice.c b/rostests/rosautotest/webservice.c
index dcfd79fa51f..ab4eb38193b 100644
--- a/rostests/rosautotest/webservice.c
+++ b/rostests/rosautotest/webservice.c
@@ -170,6 +170,7 @@ GetTestID(TESTTYPES TestType)
     {
         StringOut("Expected Test ID, but received:\n");
         StringOut(Data);
+        StringOut("\n");
         HeapFree(hProcessHeap, 0, Data);
         return NULL;
     }
@@ -248,6 +249,7 @@ GetSuiteID(TESTTYPES TestType, const PVOID TestData)
     {
         StringOut("Expected Suite ID, but received:\n");
         StringOut(Data);
+        StringOut("\n");
         HeapFree(hProcessHeap, 0, Data);
         return NULL;
     }
-- 
2.17.1