Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
be49b8be
Commit
be49b8be
authored
15 years ago
by
Mark Palange (Mani)
Browse files
Options
Downloads
Patches
Plain Diff
EXT-3158 - Removing logging of users password hash from new login code.
Reviewed by Brad
parent
e07ef0d0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llcommon/lleventcoro.h
+5
-2
5 additions, 2 deletions
indra/llcommon/lleventcoro.h
indra/viewer_components/login/lllogin.cpp
+16
-4
16 additions, 4 deletions
indra/viewer_components/login/lllogin.cpp
with
21 additions
and
6 deletions
indra/llcommon/lleventcoro.h
+
5
−
2
View file @
be49b8be
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
indra/viewer_components/login/lllogin.cpp
+
16
−
4
View file @
be49b8be
...
...
@@ -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_
INFO
S
(
"LLLogin"
)
<<
"Requesting SRV record from "
<<
uri
<<
LL_ENDL
;
LL_
DEBUG
S
(
"LLLogin"
)
<<
"Requesting SRV record from "
<<
uri
<<
LL_ENDL
;
// *NOTE:Mani - Completely arbitrary default timeout value for SRV request.
F32
seconds_to_timeout
=
5.0
f
;
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment