Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
client
Commits
18daa8c2
Commit
18daa8c2
authored
Apr 1, 2021
by
Richard T. Carback III
Browse files
Options
Downloads
Plain Diff
Merge branch 'hotfix/autoConfirmVerificationFix' into 'release'
Hotfix/auto confirm verification fix See merge request
!574
parents
0b2c562a
316be0e4
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
auth/callback.go
+6
-6
6 additions, 6 deletions
auth/callback.go
with
6 additions
and
6 deletions
auth/callback.go
+
6
−
6
View file @
18daa8c2
...
...
@@ -152,8 +152,8 @@ func (m *Manager) handleRequest(cmixMsg format.Message,
" msgDigest: %s which has been requested, auto-confirming"
,
partnerID
,
cmixMsg
.
Digest
())
// do the confirmation
if
err
:=
m
.
doConfirm
(
sr2
,
grp
,
partnerPubKey
,
sr2
.
GetPartnerHistoricalPub
Key
(),
ecrFmt
.
GetOwnership
());
err
!=
nil
{
if
err
:=
m
.
doConfirm
(
sr2
,
grp
,
partnerPubKey
,
m
.
storage
.
E2e
()
.
GetDHPrivate
Key
(),
sr2
.
GetPartnerHistoricalPubKey
(),
ecrFmt
.
GetOwnership
());
err
!=
nil
{
jww
.
WARN
.
Printf
(
"Auto Confirmation with %s failed: %s"
,
partnerID
,
err
)
}
...
...
@@ -241,8 +241,8 @@ func (m *Manager) handleConfirm(cmixMsg format.Message, sr *auth.SentRequest,
}
// finalize the confirmation
if
err
:=
m
.
doConfirm
(
sr
,
grp
,
partnerPubKey
,
sr
.
Get
PartnerHistoricalPub
Key
(),
ecrFmt
.
GetOwnership
());
err
!=
nil
{
if
err
:=
m
.
doConfirm
(
sr
,
grp
,
partnerPubKey
,
sr
.
Get
MyPriv
Key
(),
sr
.
GetPartnerHistoricalPubKey
(),
ecrFmt
.
GetOwnership
());
err
!=
nil
{
jww
.
WARN
.
Printf
(
"Confirmation failed: %s"
,
err
)
m
.
storage
.
Auth
()
.
Fail
(
sr
.
GetPartner
())
return
...
...
@@ -250,9 +250,9 @@ func (m *Manager) handleConfirm(cmixMsg format.Message, sr *auth.SentRequest,
}
func
(
m
*
Manager
)
doConfirm
(
sr
*
auth
.
SentRequest
,
grp
*
cyclic
.
Group
,
partnerPubKey
,
partnerPubKeyOwnershipProof
*
cyclic
.
Int
,
ownershipProof
[]
byte
)
error
{
partnerPubKey
,
myPrivateKeyOwnershipProof
,
partnerPubKeyOwnershipProof
*
cyclic
.
Int
,
ownershipProof
[]
byte
)
error
{
// verify the message came from the intended recipient
if
!
cAuth
.
VerifyOwnershipProof
(
sr
.
GetMyPrivKey
()
,
if
!
cAuth
.
VerifyOwnershipProof
(
myPrivateKeyOwnershipProof
,
partnerPubKeyOwnershipProof
,
grp
,
ownershipProof
)
{
return
errors
.
Errorf
(
"Failed authenticate identity for auth "
+
"confirmation of %s"
,
sr
.
GetPartner
())
...
...
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