Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
18da9ce0
Commit
18da9ce0
authored
4 years ago
by
felmer
Browse files
Options
Downloads
Patches
Plain Diff
SSDM-9734: use user id *and* password to cache session token
parent
95c461bf
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpUserManager.java
+4
-3
4 additions, 3 deletions
...x/cisd/openbis/dss/generic/server/ftp/FtpUserManager.java
with
4 additions
and
3 deletions
datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpUserManager.java
+
4
−
3
View file @
18da9ce0
...
@@ -45,7 +45,7 @@ public class FtpUserManager implements UserManager
...
@@ -45,7 +45,7 @@ public class FtpUserManager implements UserManager
FtpUserManager
.
class
);
FtpUserManager
.
class
);
private
final
IServiceForDataStoreServer
service
;
private
final
IServiceForDataStoreServer
service
;
private
final
Map
<
String
,
String
>
sessionTokensByUser
=
Collections
.
synchronizedMap
(
new
HashMap
<>());
private
final
Map
<
String
,
String
>
sessionTokensByUser
=
Collections
.
synchronizedMap
(
new
HashMap
<>());
public
FtpUserManager
(
IServiceForDataStoreServer
service
)
public
FtpUserManager
(
IServiceForDataStoreServer
service
)
...
@@ -60,7 +60,8 @@ public class FtpUserManager implements UserManager
...
@@ -60,7 +60,8 @@ public class FtpUserManager implements UserManager
{
{
UsernamePasswordAuthentication
upa
=
(
UsernamePasswordAuthentication
)
authentication
;
UsernamePasswordAuthentication
upa
=
(
UsernamePasswordAuthentication
)
authentication
;
String
user
=
upa
.
getUsername
();
String
user
=
upa
.
getUsername
();
String
sessionToken
=
sessionTokensByUser
.
get
(
user
);
String
key
=
String
.
format
(
"%s:%s"
,
upa
.
getUsername
(),
upa
.
getPassword
());
String
sessionToken
=
sessionTokensByUser
.
get
(
key
);
if
(
sessionToken
!=
null
)
if
(
sessionToken
!=
null
)
{
{
SessionContextDTO
session
=
service
.
tryGetSession
(
sessionToken
);
SessionContextDTO
session
=
service
.
tryGetSession
(
sessionToken
);
...
@@ -71,7 +72,7 @@ public class FtpUserManager implements UserManager
...
@@ -71,7 +72,7 @@ public class FtpUserManager implements UserManager
String
password
=
upa
.
getPassword
();
String
password
=
upa
.
getPassword
();
SessionContextDTO
session
=
service
.
tryAuthenticate
(
user
,
password
);
SessionContextDTO
session
=
service
.
tryAuthenticate
(
user
,
password
);
sessionToken
=
session
==
null
?
null
:
session
.
getSessionToken
();
sessionToken
=
session
==
null
?
null
:
session
.
getSessionToken
();
sessionTokensByUser
.
put
(
user
,
sessionToken
);
sessionTokensByUser
.
put
(
key
,
sessionToken
);
}
}
if
(
sessionToken
!=
null
)
if
(
sessionToken
!=
null
)
{
{
...
...
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