From be9480ab7708f8e4bce8855558b4d78a03bf1917 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 4 Dec 2009 16:38:12 -0500 Subject: DEV-43463: skip() instead of commenting out lllogin_tests --- .../viewer_components/login/tests/lllogin_test.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'indra/viewer_components') diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp index 6255f7ed15..c2b86d3a1c 100644 --- a/indra/viewer_components/login/tests/lllogin_test.cpp +++ b/indra/viewer_components/login/tests/lllogin_test.cpp @@ -29,6 +29,20 @@ #include "llevents.h" #include "stringize.h" +#if LL_WINDOWS +#define skipwin(arg) skip(arg) +#define skipmac(arg) +#define skiplinux(arg) +#elif LL_DARWIN +#define skipwin(arg) +#define skipmac(arg) skip(arg) +#define skiplinux(arg) +#elif LL_LINUX +#define skipwin(arg) +#define skipmac(arg) +#define skiplinux(arg) skip(arg) +#endif + /***************************************************************************** * Helper classes *****************************************************************************/ @@ -231,10 +245,10 @@ namespace tut ensure_equals("Online state", listener.lastEvent()["state"].asString(), "online"); } - /* template<> template<> void llviewerlogin_object::test<2>() { + skipwin("Re-enable when Boost updated for Windows"); DEBUG; // Tests a successful login in with delayed responses. // Also includes 'failure' that cause the login module @@ -327,6 +341,7 @@ namespace tut template<> template<> void llviewerlogin_object::test<3>() { + skipwin("Re-enable when Boost updated for Windows"); DEBUG; // Test completed response, that fails to login. set_test_name("LLLogin valid response, failure (eg. bad credentials)"); @@ -374,6 +389,7 @@ namespace tut template<> template<> void llviewerlogin_object::test<4>() { + skipwin("Re-enable when Boost updated for Windows"); DEBUG; // Test incomplete response, that end the attempt. set_test_name("LLLogin valid response, failure (eg. bad credentials)"); @@ -417,10 +433,10 @@ namespace tut ensure_equals("Failed to offline", listener.lastEvent()["state"].asString(), "offline"); } - *FIX:Mani Disabled unit boost::coro is patched template<> template<> void llviewerlogin_object::test<5>() { + skipwin("Re-enable when Boost updated for Windows"); DEBUG; // Test SRV request timeout. set_test_name("LLLogin SRV timeout testing"); @@ -453,5 +469,4 @@ namespace tut ensure_equals("SRV Failure", listener.lastEvent()["change"].asString(), "fail.login"); } -*/ } -- cgit v1.3 From fde12f0204436dd924203231d4a2eaa2e230de06 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 4 Dec 2009 17:32:09 -0500 Subject: DEV-43463: use fixed Boost package on Windows --- indra/viewer_components/login/tests/lllogin_test.cpp | 4 ---- install.xml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'indra/viewer_components') diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp index c2b86d3a1c..69a8424e87 100644 --- a/indra/viewer_components/login/tests/lllogin_test.cpp +++ b/indra/viewer_components/login/tests/lllogin_test.cpp @@ -248,7 +248,6 @@ namespace tut template<> template<> void llviewerlogin_object::test<2>() { - skipwin("Re-enable when Boost updated for Windows"); DEBUG; // Tests a successful login in with delayed responses. // Also includes 'failure' that cause the login module @@ -341,7 +340,6 @@ namespace tut template<> template<> void llviewerlogin_object::test<3>() { - skipwin("Re-enable when Boost updated for Windows"); DEBUG; // Test completed response, that fails to login. set_test_name("LLLogin valid response, failure (eg. bad credentials)"); @@ -389,7 +387,6 @@ namespace tut template<> template<> void llviewerlogin_object::test<4>() { - skipwin("Re-enable when Boost updated for Windows"); DEBUG; // Test incomplete response, that end the attempt. set_test_name("LLLogin valid response, failure (eg. bad credentials)"); @@ -436,7 +433,6 @@ namespace tut template<> template<> void llviewerlogin_object::test<5>() { - skipwin("Re-enable when Boost updated for Windows"); DEBUG; // Test SRV request timeout. set_test_name("LLLogin SRV timeout testing"); diff --git a/install.xml b/install.xml index efcfe9420c..c76217426c 100644 --- a/install.xml +++ b/install.xml @@ -214,9 +214,9 @@ windows md5sum - 4f05166629caa4c132a7448eefb8d592 + 6746ae9fd9aff98b15f7b9f0f40334ab url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20090917.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20091204.tar.bz2 -- cgit v1.3 From be49b8bed5fbd6cde63d8c5b6de432dc1f4b123d Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Tue, 8 Dec 2009 16:57:45 -0800 Subject: EXT-3158 - Removing logging of users password hash from new login code. Reviewed by Brad --- indra/llcommon/lleventcoro.h | 7 +++++-- indra/viewer_components/login/lllogin.cpp | 20 ++++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) (limited to 'indra/viewer_components') diff --git a/indra/llcommon/lleventcoro.h b/indra/llcommon/lleventcoro.h index c6d9de171d..1981ae7482 100644 --- a/indra/llcommon/lleventcoro.h +++ b/indra/llcommon/lleventcoro.h @@ -203,9 +203,12 @@ LLSD postAndWait(SELF& self, const LLSD& event, const LLEventPumpOrPumpName& req // request event. LLSD modevent(event); LLEventDetail::storeToLLSDPath(modevent, replyPumpNamePath, replyPump.getPump().getName()); - LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName + LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName << " posting to " << requestPump.getPump().getName() - << ": " << modevent << LL_ENDL; + << LL_ENDL; + + // *NOTE:Mani - Removed because modevent could contain user's hashed passwd. + // << ": " << modevent << LL_ENDL; requestPump.getPump().post(modevent); } LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp index b14c59ab9a..02c13716ed 100644 --- a/indra/viewer_components/login/lllogin.cpp +++ b/indra/viewer_components/login/lllogin.cpp @@ -133,9 +133,16 @@ void LLLogin::Impl::connect(const std::string& uri, const LLSD& credentials) void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD credentials) { - LL_INFOS("LLLogin") << "Entering coroutine " << LLCoros::instance().getName(self) - << " with uri '" << uri << "', credentials " << credentials << LL_ENDL; - // Arriving in SRVRequest state + LLSD printable_credentials = credentials; + if(printable_credentials.has("params") + && printable_credentials["params"].has("passwd")) + { + printable_credentials["params"]["passwd"] = "*******"; + } + LL_DEBUGS("LLLogin") << "Entering coroutine " << LLCoros::instance().getName(self) + << " with uri '" << uri << "', credentials " << printable_credentials << LL_ENDL; + + // Arriving in SRVRequest state LLEventStream replyPump("reply", true); // Should be an array of one or more uri strings. LLSD rewrittenURIs; @@ -144,7 +151,7 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD credential sendProgressEvent("offline", "srvrequest"); // Request SRV record. - LL_INFOS("LLLogin") << "Requesting SRV record from " << uri << LL_ENDL; + LL_DEBUGS("LLLogin") << "Requesting SRV record from " << uri << LL_ENDL; // *NOTE:Mani - Completely arbitrary default timeout value for SRV request. F32 seconds_to_timeout = 5.0f; @@ -193,6 +200,11 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD credential LLSD progress_data; progress_data["attempt"] = attempts; progress_data["request"] = request; + if(progress_data["request"].has("params") + && progress_data["request"]["params"].has("passwd")) + { + progress_data["request"]["params"]["passwd"] = "*******"; + } sendProgressEvent("offline", "authenticating", progress_data); // We expect zero or more "Downloading" status events, followed by -- cgit v1.3