Skip to content

Commit

Permalink
remove usage of Stream API
Browse files Browse the repository at this point in the history
  • Loading branch information
@AdamVe
AdamVe committed Nov 21, 2024
1 parent 5945e5d commit 06ca113
Show file tree
Hide file tree
Showing 5 changed files with 102 additions and 96 deletions.
110 changes: 52 additions & 58 deletions fido/src/main/java/com/yubico/yubikit/fido/client/BasicWebAuthnClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

import javax.annotation.Nullable;

Expand Down Expand Up @@ -450,20 +449,19 @@ protected WithExtensionResults<Ctap2Session.CredentialData> ctapMakeCredential(

Map<String, Boolean> ctapOptions = getCreateCtapOptions(options, pin);

List<Extension.RegistrationProcessor> registrationProcessors =
extensions.stream()
.map(e -> e.makeCredential(ctap, options, clientPin.getPinUvAuth()))
.filter(Objects::nonNull)
.collect(Collectors.toList());

int permissions =
registrationProcessors.stream()
.map(Extension.RegistrationProcessor::getPermissions)
.reduce(ClientPin.PIN_PERMISSION_MC |
(options.getExcludeCredentials().isEmpty()
? ClientPin.PIN_PERMISSION_NONE
: ClientPin.PIN_PERMISSION_GA),
(perms, perm) -> perms | perm);
int permissions = ClientPin.PIN_PERMISSION_MC;
if (!options.getExcludeCredentials().isEmpty()) {
permissions |= ClientPin.PIN_PERMISSION_GA;
}
List<Extension.RegistrationProcessor> registrationProcessors = new ArrayList<>();
for (Extension extension : extensions) {
Extension.RegistrationProcessor processor =
extension.makeCredential(ctap, options, clientPin.getPinUvAuth());
if (processor != null) {
registrationProcessors.add(processor);
permissions |= processor.getPermissions();
}
}

final AuthParams authParams = getAuthParams(
clientDataHash,
Expand All @@ -472,10 +470,10 @@ protected WithExtensionResults<Ctap2Session.CredentialData> ctapMakeCredential(
permissions,
rpId);

Map<String, Object> authenticatorInputs =
registrationProcessors.stream()
.map(p -> p.getInput(authParams.pinToken))
.collect(HashMap::new, HashMap::putAll, HashMap::putAll);
HashMap<String, Object> authenticatorInputs = new HashMap<>();
for (Extension.RegistrationProcessor processor : registrationProcessors) {
authenticatorInputs.putAll(processor.getInput(authParams.pinToken));
}

final List<PublicKeyCredentialDescriptor> excludeCredentials =
removeUnsupportedCredentials(
Expand Down Expand Up @@ -528,14 +526,11 @@ protected WithExtensionResults<Ctap2Session.CredentialData> ctapMakeCredential(
state
);

ClientExtensionResults results =
registrationProcessors.stream()
.map(p -> p.getOutput(
AttestationObject.fromCredential(credentialData),
authParams.pinToken))
.collect(ClientExtensionResults::new,
ClientExtensionResults::add,
ClientExtensionResults::addAll);
ClientExtensionResults results = new ClientExtensionResults();
for (Extension.RegistrationProcessor processor : registrationProcessors) {
AttestationObject attestationObject = AttestationObject.fromCredential(credentialData);
results.add(processor.getOutput(attestationObject, authParams.pinToken));
}
return new WithExtensionResults<>(credentialData, results);
}

Expand Down Expand Up @@ -577,17 +572,16 @@ protected List<WithExtensionResults<Ctap2Session.AssertionData>> ctapGetAssertio
options.getAllowCredentials()
);

List<Extension.AuthenticationProcessor> authenticationProcessors =
extensions.stream()
.map(e -> e.getAssertion(ctap, options, clientPin.getPinUvAuth()))
.filter(Objects::nonNull)
.collect(Collectors.toList());

int permissions =
authenticationProcessors.stream()
.map(Extension.AuthenticationProcessor::getPermissions)
.reduce(ClientPin.PIN_PERMISSION_GA,
(perms, perm) -> perms | perm);
int permissions = ClientPin.PIN_PERMISSION_GA;
List<Extension.AuthenticationProcessor> authenticationProcessors = new ArrayList<>();
for (Extension extension : extensions) {
Extension.AuthenticationProcessor processor =
extension.getAssertion(ctap, options, clientPin.getPinUvAuth());
if (processor != null) {
authenticationProcessors.add(processor);
permissions |= processor.getPermissions();
}
}

final AuthParams authParams = getAuthParams(
clientDataHash,
Expand All @@ -606,12 +600,11 @@ protected List<WithExtensionResults<Ctap2Session.AssertionData>> ctapGetAssertio
authParams.pinToken)
: null;

final Map<String, Object> authenticatorInputs =
authenticationProcessors.stream()
.map(p -> p.getInput(selectedCred, authParams.pinToken))
.collect(HashMap::new,
HashMap::putAll,
HashMap::putAll);
HashMap<String, Object> authenticatorInputs = new HashMap<>();
for (Extension.AuthenticationProcessor processor : authenticationProcessors) {
authenticatorInputs.putAll(processor.getInput(selectedCred, authParams.pinToken));
}

try {
List<Ctap2Session.AssertionData> assertions = ctap.getAssertions(
rpId,
Expand All @@ -630,15 +623,12 @@ protected List<WithExtensionResults<Ctap2Session.AssertionData>> ctapGetAssertio

List<WithExtensionResults<Ctap2Session.AssertionData>> result = new ArrayList<>();
for(final Ctap2Session.AssertionData assertionData : assertions) {
ClientExtensionResults results =
authenticationProcessors.stream()
.map(p -> p.getOutput(assertionData, authParams.pinToken))
.collect(ClientExtensionResults::new,
ClientExtensionResults::add,
ClientExtensionResults::addAll);
ClientExtensionResults results = new ClientExtensionResults();
for (Extension.AuthenticationProcessor processor : authenticationProcessors) {
results.add(processor.getOutput(assertionData, authParams.pinToken));
}
result.add(new WithExtensionResults<>(assertionData, results));
}

return result;

} catch (CtapException exc) {
Expand Down Expand Up @@ -841,10 +831,12 @@ static PublicKeyCredentialDescriptor filterCreds(
Ctap2Session.InfoData info = ctap.getCachedInfo();
Integer maxCredIdLength = info.getMaxCredentialIdLength();
if (maxCredIdLength != null) {
creds = descriptors
.stream()
.filter(desc -> desc.getId().length <= maxCredIdLength)
.collect(Collectors.toList());
creds = new ArrayList<>();
for (PublicKeyCredentialDescriptor desc : descriptors) {
if (desc.getId().length <= maxCredIdLength) {
creds.add(desc);
}
}
} else {
creds = descriptors;
}
Expand Down Expand Up @@ -912,9 +904,11 @@ static PublicKeyCredentialDescriptor filterCreds(
if (descriptors == null || descriptors.isEmpty()) {
return null;
}
return descriptors.stream()
.map(d -> d.toMap(SerializationType.CBOR))
.collect(Collectors.toList());
List<Map<String, ?>> creds = new ArrayList<>();
for (PublicKeyCredentialDescriptor descriptor : descriptors) {
creds.add(descriptor.toMap(SerializationType.CBOR));
}
return creds;
}

/**
Expand Down
9 changes: 5 additions & 4 deletions fido/src/main/java/com/yubico/yubikit/fido/client/extensions/HmacSecretExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -117,10 +118,10 @@ public AuthenticationProcessor getAssertion(
throw new IllegalArgumentException("evalByCredential needs allow list");
}

Set<String> ids = allowCredentials
.stream()
.map(desc -> toUrlSafeString(desc.getId()))
.collect(Collectors.toSet());
Set<String> ids = new HashSet<>();
for (PublicKeyCredentialDescriptor descriptor : allowCredentials) {
ids.add(toUrlSafeString(descriptor.getId()));
}

if (!ids.containsAll(evalByCredential.keySet())) {
throw new IllegalArgumentException("evalByCredentials contains invalid key");
Expand Down
37 changes: 22 additions & 15 deletions fido/src/test/java/com/yubico/yubikit/fido/client/BasicWebAuthnClientUtilsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
import org.junit.Test;

import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import javax.annotation.Nullable;

Expand Down Expand Up @@ -432,26 +432,33 @@ Ctap2Session build() throws Throwable {

List<Map<String, Object>> allowList = invocation.getArgument(2);

List<byte[]> ids = idsForRp != null
? idsForRp.stream().filter(id ->
allowList
.stream()
.anyMatch(desc -> Arrays.equals(
id,
(byte[]) desc.get(PublicKeyCredentialDescriptor.ID
)))
).collect(Collectors.toList())
: Collections.emptyList();
List<byte[]> ids;
if (idsForRp != null) {
ids = new ArrayList<>();
for (byte[] id : idsForRp) {
for (Map<String, Object> desc : allowList) {
byte[] descId = (byte[]) desc.get(PublicKeyCredentialDescriptor.ID);
if (Arrays.equals(id, descId)) {
ids.add(id);
break;
}
}
}
} else {
ids = Collections.emptyList();
}

if (ids.isEmpty()) {
throw new CtapException(CtapException.ERR_NO_CREDENTIALS);
}
return ids.stream().map(id -> {
List<Ctap2Session.AssertionData> list = new ArrayList<>();
for (byte[] bytes : ids) {
Ctap2Session.AssertionData assertionData =
mock(Ctap2Session.AssertionData.class);
when(assertionData.getCredentialId(isNull())).thenReturn(id);
return assertionData;
}).collect(Collectors.toList());
when(assertionData.getCredentialId(isNull())).thenReturn(bytes);
list.add(assertionData);
}
return list;
});

return ctapMock;
Expand Down
21 changes: 11 additions & 10 deletions testing/src/main/java/com/yubico/yubikit/testing/fido/utils/ClientHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@
import com.yubico.yubikit.fido.webauthn.PublicKeyCredentialType;

import java.io.IOException;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

public class ClientHelper {
final BasicWebAuthnClient client;
Expand Down Expand Up @@ -87,17 +86,19 @@ public void deleteCredentialsByIds(

public void deleteCredentials(List<PublicKeyCredential> credentials)
throws IOException, CommandException, ClientError {
deleteCredentialsByIds(credentials
.stream()
.map(PublicKeyCredential::getRawId)
.collect(Collectors.toList()));
List<byte[]> credIds = new ArrayList<>();
for (PublicKeyCredential credential : credentials) {
credIds.add(credential.getRawId());
}
deleteCredentialsByIds(credIds);
}

public void deleteCredentials(PublicKeyCredential... credentials)
throws IOException, CommandException, ClientError {
deleteCredentialsByIds(Arrays
.stream(credentials)
.map(PublicKeyCredential::getRawId)
.collect(Collectors.toList()));
List<byte[]> credIds = new ArrayList<>();
for (PublicKeyCredential credential : credentials) {
credIds.add(credential.getRawId());
}
deleteCredentialsByIds(credIds);
}
}
21 changes: 12 additions & 9 deletions testing/src/main/java/com/yubico/yubikit/testing/fido/utils/CreationOptionsBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
import com.yubico.yubikit.fido.webauthn.ResidentKeyRequirement;

import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import javax.annotation.Nullable;

Expand Down Expand Up @@ -81,10 +81,12 @@ public CreationOptionsBuilder excludeCredentialDescriptors(
return this;
}

public CreationOptionsBuilder excludeCredentials(List<PublicKeyCredential> excludeCredentials) {
this.excludeCredentials = excludeCredentials.stream().map(
c -> new PublicKeyCredentialDescriptor(PUBLIC_KEY, c.getRawId())
).collect(Collectors.toList());
public CreationOptionsBuilder excludeCredentials(List<PublicKeyCredential> credentials) {
List<PublicKeyCredentialDescriptor> list = new ArrayList<>();
for (PublicKeyCredential credential : credentials) {
list.add(new PublicKeyCredentialDescriptor(PUBLIC_KEY, credential.getRawId()));
}
excludeCredentials = list;
return this;
}

Expand All @@ -94,10 +96,11 @@ public CreationOptionsBuilder excludeCredentials(
return this;
}

public CreationOptionsBuilder excludeCredentials(PublicKeyCredential... excludeCredentials) {
this.excludeCredentials = Arrays.stream(excludeCredentials).map(
c -> new PublicKeyCredentialDescriptor(PUBLIC_KEY, c.getRawId())
).collect(Collectors.toList());
public CreationOptionsBuilder excludeCredentials(PublicKeyCredential... credentials) {
excludeCredentials = new ArrayList<>();
for (PublicKeyCredential cred : credentials) {
excludeCredentials.add(new PublicKeyCredentialDescriptor(PUBLIC_KEY, cred.getRawId()));
}
return this;
}

Expand Down

0 comments on commit 06ca113

Please sign in to comment.