Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ecsec Public
reqesidta-prototype
client-signer
Commits
ca539a00
Commit
ca539a00
authored
Sep 24, 2019
by
Tobias Wich
Browse files
Return Disp.TIMEOUT when EAC processing hits th 120 sec timeout
parent
283db4f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
addons/tr03112/src/main/java/org/openecard/binding/tctoken/TCTokenHandler.java
View file @
ca539a00
...
@@ -549,6 +549,7 @@ public class TCTokenHandler {
...
@@ -549,6 +549,7 @@ public class TCTokenHandler {
private
String
createResponseFromWsEx
(
WSException
ex
,
TCTokenResponse
response
)
{
private
String
createResponseFromWsEx
(
WSException
ex
,
TCTokenResponse
response
)
{
String
errorMsg
;
String
errorMsg
;
switch
(
ex
.
getResultMinor
())
{
switch
(
ex
.
getResultMinor
())
{
case
ECardConstants
.
Minor
.
Disp
.
TIMEOUT
:
case
ECardConstants
.
Minor
.
SAL
.
CANCELLATION_BY_USER
:
case
ECardConstants
.
Minor
.
SAL
.
CANCELLATION_BY_USER
:
case
ECardConstants
.
Minor
.
IFD
.
CANCELLATION_BY_USER
:
case
ECardConstants
.
Minor
.
IFD
.
CANCELLATION_BY_USER
:
errorMsg
=
LANG_TOKEN
.
translationForKey
(
"cancel"
);
errorMsg
=
LANG_TOKEN
.
translationForKey
(
"cancel"
);
...
...
addons/tr03112/src/main/java/org/openecard/sal/protocol/eac/PACEStep.java
View file @
ca539a00
...
@@ -299,6 +299,7 @@ public class PACEStep implements ProtocolStep<DIDAuthenticate, DIDAuthenticateRe
...
@@ -299,6 +299,7 @@ public class PACEStep implements ProtocolStep<DIDAuthenticate, DIDAuthenticateRe
switch
(
minor
)
{
switch
(
minor
)
{
case
ECardConstants
.
Minor
.
IFD
.
CANCELLATION_BY_USER
:
case
ECardConstants
.
Minor
.
IFD
.
CANCELLATION_BY_USER
:
case
ECardConstants
.
Minor
.
SAL
.
CANCELLATION_BY_USER
:
case
ECardConstants
.
Minor
.
SAL
.
CANCELLATION_BY_USER
:
case
ECardConstants
.
Minor
.
Disp
.
TIMEOUT
:
needsTermination
=
true
;
needsTermination
=
true
;
}
}
}
}
...
...
addons/tr03112/src/main/java/org/openecard/sal/protocol/eac/gui/ProcessingStepAction.java
View file @
ca539a00
...
@@ -72,7 +72,7 @@ public class ProcessingStepAction extends StepAction {
...
@@ -72,7 +72,7 @@ public class ProcessingStepAction extends StepAction {
}
catch
(
TimeoutException
ex
)
{
}
catch
(
TimeoutException
ex
)
{
LOG
.
info
(
"Timeout while waiting for the authentication to finish."
,
ex
);
LOG
.
info
(
"Timeout while waiting for the authentication to finish."
,
ex
);
ctx
.
put
(
EACProtocol
.
PACE_EXCEPTION
,
WSHelper
.
createException
(
WSHelper
.
makeResultError
(
ctx
.
put
(
EACProtocol
.
PACE_EXCEPTION
,
WSHelper
.
createException
(
WSHelper
.
makeResultError
(
ECardConstants
.
Minor
.
SAL
.
CANCELLATION_BY_USER
,
"User canceled the EAC dialog
."
)));
ECardConstants
.
Minor
.
Disp
.
TIMEOUT
,
"Timeout during EAC process
."
)));
return
new
StepActionResult
(
StepActionResultStatus
.
CANCEL
);
return
new
StepActionResult
(
StepActionResultStatus
.
CANCEL
);
}
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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