Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #83: Null pointer exception for unencrypted request #84

Merged
merged 1 commit into from
Sep 8, 2021
Merged

Fix #83: Null pointer exception for unencrypted request #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion ...rc/main/java/com/wultra/app/enrollmentserver/controller/api/ActivationCodeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import io.getlime.security.powerauth.crypto.lib.encryptor.ecies.model.EciesScope;
import io.getlime.security.powerauth.crypto.lib.enums.PowerAuthSignatureTypes;
import io.getlime.security.powerauth.rest.api.base.authentication.PowerAuthApiAuthentication;
import io.getlime.security.powerauth.rest.api.base.encryption.EciesEncryptionContext;
import io.getlime.security.powerauth.rest.api.base.exception.PowerAuthAuthenticationException;
import io.getlime.security.powerauth.rest.api.spring.annotation.EncryptedRequestBody;
import io.getlime.security.powerauth.rest.api.spring.annotation.PowerAuth;
Expand Down Expand Up @@ -83,13 +84,26 @@ public ActivationCodeController(ActivationCodeService activationCodeService) {
PowerAuthSignatureTypes.POSSESSION_BIOMETRY,
PowerAuthSignatureTypes.POSSESSION_KNOWLEDGE
})
public ObjectResponse<ActivationCodeResponse> requestActivationCode(@EncryptedRequestBody ObjectRequest<ActivationCodeRequest> request, @Parameter(hidden = true) PowerAuthApiAuthentication apiAuthentication) throws PowerAuthAuthenticationException, InvalidRequestObjectException, ActivationCodeException {
public ObjectResponse<ActivationCodeResponse> requestActivationCode(@EncryptedRequestBody ObjectRequest<ActivationCodeRequest> request,
@Parameter(hidden = true) EciesEncryptionContext eciesContext,
@Parameter(hidden = true) PowerAuthApiAuthentication apiAuthentication) throws PowerAuthAuthenticationException, InvalidRequestObjectException, ActivationCodeException {
// Check if the authentication object is present
if (apiAuthentication == null) {
logger.error("Unable to verify device registration when fetching activation code");
throw new PowerAuthAuthenticationException("Unable to verify device registration when fetching activation code");
}

// Check if the request was correctly decrypted
if (eciesContext == null) {
logger.error("ECIES encryption failed when fetching activation code");
throw new PowerAuthAuthenticationException("ECIES decryption failed when fetching activation code");
}

if (request == null || request.getRequestObject() == null) {
logger.error("Invalid request received when fetching activation code");
throw new PowerAuthAuthenticationException("Invalid request received when fetching activation code");
}

// Request the activation code details.
final ActivationCodeResponse response = activationCodeService.requestActivationCode(request.getRequestObject(), apiAuthentication);
return new ObjectResponse<>(response);
Expand Down