Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dbase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FairDb
dbase
Commits
7b9668cc
Commit
7b9668cc
authored
7 years ago
by
Evgeny Lavrik
Browse files
Options
Downloads
Patches
Plain Diff
Generate root dictionary for FairDbWt lib, fix password verification
parent
1b683cb7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dbWt/CMakeLists.txt
+6
-1
6 additions, 1 deletion
dbWt/CMakeLists.txt
dbWt/FairDbWtLinkDef.h
+18
-0
18 additions, 0 deletions
dbWt/FairDbWtLinkDef.h
dbWt/REST/FairDbWtPasswordService.cxx
+1
-1
1 addition, 1 deletion
dbWt/REST/FairDbWtPasswordService.cxx
with
25 additions
and
2 deletions
dbWt/CMakeLists.txt
+
6
−
1
View file @
7b9668cc
...
...
@@ -26,6 +26,7 @@ set(INCLUDE_DIRECTORIES
${
CMAKE_SOURCE_DIR
}
/dbWt/treeview
${
CMAKE_SOURCE_DIR
}
/dbWt/graphics
${
CMAKE_SOURCE_DIR
}
/dbWt/auth/model
${
CMAKE_SOURCE_DIR
}
/REST
${
CMAKE_SOURCE_DIR
}
/dbInterface
${
CMAKE_SOURCE_DIR
}
/dbValidation
${
CMAKE_SOURCE_DIR
}
/dbInput
...
...
@@ -48,7 +49,7 @@ set(LINK_DIRECTORIES
link_directories
(
${
LINK_DIRECTORIES
}
)
set
(
SRCS
set
(
NO_DICT_
SRCS
FairDbWtApplication.cxx
FairDbWtMainWidget.cxx
FairDbWtConnMySQLWidget.cxx
...
...
@@ -82,12 +83,16 @@ REST/FairDbWtBaseResource.cxx
REST/FairDbWtAuthResource.cxx
REST/FairDbWtUserResource.cxx
REST/FairDbWtAdminResource.cxx
)
set
(
SRCS
REST/FairDbWtPasswordService.cxx
)
install
(
FILES
"REST/FairDbWtGenericResource.h"
DESTINATION include
)
install
(
FILES
"REST/FairDbWtGenericResource.tpl"
DESTINATION include
)
set
(
LINKDEF FairDbWtLinkDef.h
)
set
(
LIBRARY_NAME FairDbWt
)
if
(
Boost_FOUND
)
...
...
This diff is collapsed.
Click to expand it.
dbWt/FairDbWtLinkDef.h
0 → 100644
+
18
−
0
View file @
7b9668cc
/********************************************************************************
* Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence version 3 (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#ifdef __CINT__
#pragma link off all globals;
#pragma link off all classes;
#pragma link off all functions;
#pragma link C++ class FairDbWtPasswordData-;
#pragma link C++ class FairDbWtPasswordService-;
#endif
This diff is collapsed.
Click to expand it.
dbWt/REST/FairDbWtPasswordService.cxx
+
1
−
1
View file @
7b9668cc
...
...
@@ -21,6 +21,6 @@ bool FairDbWtPasswordService::VerifyPassword(std::string password, FairDbWtPassw
Wt
::
Auth
::
BCryptHashFunction
*
bcrypt
=
new
Wt
::
Auth
::
BCryptHashFunction
(
7
);
verifier
.
addHashFunction
(
bcrypt
);
Wt
::
Auth
::
PasswordHash
hash
=
verifier
.
hashPassword
(
password
);
Wt
::
Auth
::
PasswordHash
hash
(
bcrypt
->
name
(),
passwordData
.
Salt
,
passwordData
.
Hash
);
return
verifier
.
verify
(
password
,
hash
);
}
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