Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
IRMA
Github mirrors
irmago
Commits
da1cdfe6
Commit
da1cdfe6
authored
Oct 05, 2017
by
Tomas
Browse files
More trivial renames: Ask -> Request, in SessionHandler
parent
5d3a2644
Changes
3
Hide whitespace changes
Inline
Side-by-side
keyshare.go
View file @
da1cdfe6
...
...
@@ -17,7 +17,7 @@ import (
// KeysharePinRequestor is used to asking the user for his PIN.
type
KeysharePinRequestor
interface
{
Ask
Pin
(
remainingAttempts
int
,
callback
func
(
proceed
bool
,
pin
string
))
Request
Pin
(
remainingAttempts
int
,
callback
func
(
proceed
bool
,
pin
string
))
}
type
keyshareSessionHandler
interface
{
...
...
@@ -173,7 +173,7 @@ func startKeyshareSession(
schemeManagers
:
schemeManagers
,
}
ask
Pin
:=
false
request
Pin
:=
false
for
_
,
managerID
:=
range
schemeManagers
{
if
!
ks
.
store
.
SchemeManagers
[
managerID
]
.
Distributed
()
{
...
...
@@ -195,14 +195,14 @@ func startKeyshareSession(
switch
authstatus
.
Status
{
case
kssAuthorized
:
// nop
case
kssTokenExpired
:
ask
Pin
=
true
request
Pin
=
true
default
:
ks
.
sessionHandler
.
KeyshareError
(
errors
.
New
(
"Keyshare server returned unrecognized authorization status"
))
return
}
}
if
ask
Pin
{
if
request
Pin
{
ks
.
VerifyPin
(
-
1
)
}
else
{
ks
.
GetCommitments
()
...
...
@@ -212,7 +212,7 @@ func startKeyshareSession(
// Ask for a pin, repeatedly if necessary, and either continue the keyshare protocol
// with authorization, or stop the keyshare protocol and inform of failure.
func
(
ks
*
keyshareSession
)
VerifyPin
(
attempts
int
)
{
ks
.
pinRequestor
.
Ask
Pin
(
attempts
,
func
(
proceed
bool
,
pin
string
)
{
ks
.
pinRequestor
.
Request
Pin
(
attempts
,
func
(
proceed
bool
,
pin
string
)
{
success
,
attemptsRemaining
,
blocked
,
err
:=
ks
.
verifyPinAttempt
(
pin
)
if
err
!=
nil
{
ks
.
sessionHandler
.
KeyshareError
(
err
)
...
...
session.go
View file @
da1cdfe6
...
...
@@ -25,11 +25,11 @@ type Handler interface {
Failure
(
action
Action
,
err
*
SessionError
)
UnsatisfiableRequest
(
action
Action
,
missing
AttributeDisjunctionList
)
Ask
IssuancePermission
(
request
IssuanceRequest
,
ServerName
string
,
callback
PermissionHandler
)
Ask
VerificationPermission
(
request
DisclosureRequest
,
ServerName
string
,
callback
PermissionHandler
)
Ask
SignaturePermission
(
request
SignatureRequest
,
ServerName
string
,
callback
PermissionHandler
)
Request
IssuancePermission
(
request
IssuanceRequest
,
ServerName
string
,
callback
PermissionHandler
)
Request
VerificationPermission
(
request
DisclosureRequest
,
ServerName
string
,
callback
PermissionHandler
)
Request
SignaturePermission
(
request
SignatureRequest
,
ServerName
string
,
callback
PermissionHandler
)
Ask
Pin
(
remainingAttempts
int
,
callback
func
(
proceed
bool
,
pin
string
))
Request
Pin
(
remainingAttempts
int
,
callback
func
(
proceed
bool
,
pin
string
))
}
// A session is an IRMA session.
...
...
@@ -179,11 +179,11 @@ func (session *session) start() {
session
.
Handler
.
StatusUpdate
(
session
.
Action
,
StatusConnected
)
switch
session
.
Action
{
case
ActionDisclosing
:
session
.
Handler
.
Ask
VerificationPermission
(
*
session
.
irmaSession
.
(
*
DisclosureRequest
),
server
,
callback
)
session
.
Handler
.
Request
VerificationPermission
(
*
session
.
irmaSession
.
(
*
DisclosureRequest
),
server
,
callback
)
case
ActionSigning
:
session
.
Handler
.
Ask
SignaturePermission
(
*
session
.
irmaSession
.
(
*
SignatureRequest
),
server
,
callback
)
session
.
Handler
.
Request
SignaturePermission
(
*
session
.
irmaSession
.
(
*
SignatureRequest
),
server
,
callback
)
case
ActionIssuing
:
session
.
Handler
.
Ask
IssuancePermission
(
*
session
.
irmaSession
.
(
*
IssuanceRequest
),
server
,
callback
)
session
.
Handler
.
Request
IssuancePermission
(
*
session
.
irmaSession
.
(
*
IssuanceRequest
),
server
,
callback
)
default
:
panic
(
"Invalid session type"
)
// does not happen, session.Action has been checked earlier
}
...
...
session_test.go
View file @
da1cdfe6
...
...
@@ -38,7 +38,7 @@ func (th TestHandler) UnsatisfiableRequest(action Action, missing AttributeDisju
ErrorType
:
ErrorType
(
"UnsatisfiableRequest"
),
}
}
func
(
th
TestHandler
)
Ask
VerificationPermission
(
request
DisclosureRequest
,
ServerName
string
,
callback
PermissionHandler
)
{
func
(
th
TestHandler
)
Request
VerificationPermission
(
request
DisclosureRequest
,
ServerName
string
,
callback
PermissionHandler
)
{
choice
:=
&
DisclosureChoice
{
Attributes
:
[]
*
AttributeIdentifier
{},
}
...
...
@@ -51,17 +51,17 @@ func (th TestHandler) AskVerificationPermission(request DisclosureRequest, Serve
}
callback
(
true
,
choice
)
}
func
(
th
TestHandler
)
Ask
IssuancePermission
(
request
IssuanceRequest
,
ServerName
string
,
callback
PermissionHandler
)
{
func
(
th
TestHandler
)
Request
IssuancePermission
(
request
IssuanceRequest
,
ServerName
string
,
callback
PermissionHandler
)
{
dreq
:=
DisclosureRequest
{
SessionRequest
:
request
.
SessionRequest
,
Content
:
request
.
Disclose
,
}
th
.
Ask
VerificationPermission
(
dreq
,
ServerName
,
callback
)
th
.
Request
VerificationPermission
(
dreq
,
ServerName
,
callback
)
}
func
(
th
TestHandler
)
Ask
SignaturePermission
(
request
SignatureRequest
,
ServerName
string
,
callback
PermissionHandler
)
{
th
.
Ask
VerificationPermission
(
request
.
DisclosureRequest
,
ServerName
,
callback
)
func
(
th
TestHandler
)
Request
SignaturePermission
(
request
SignatureRequest
,
ServerName
string
,
callback
PermissionHandler
)
{
th
.
Request
VerificationPermission
(
request
.
DisclosureRequest
,
ServerName
,
callback
)
}
func
(
th
TestHandler
)
Ask
Pin
(
remainingAttempts
int
,
callback
func
(
proceed
bool
,
pin
string
))
{
func
(
th
TestHandler
)
Request
Pin
(
remainingAttempts
int
,
callback
func
(
proceed
bool
,
pin
string
))
{
callback
(
true
,
"12345"
)
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment