Skip to content

Commit 66a524f

Browse files
committed
fdo.command:execute to have null body
Signed-off-by: Raihan M <muhamedraihan@gmail.com>
1 parent 3ee59a7 commit 66a524f

3 files changed

Lines changed: 18 additions & 5 deletions

File tree

protocol/src/main/java/org/fidoalliance/fdo/protocol/Mapper.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,13 @@ public byte[] writeAsCborByteString(Object value) throws IOException {
135135
return cborMapper.writeValueAsBytes(writeValue(value));
136136
}
137137

138+
/**
139+
* @return A CBOR Null value.
140+
*/
141+
public byte[] cborNull() {
142+
return new byte[]{(byte) 0xf6};
143+
}
144+
138145
/**
139146
* Writes an Object as a yaml encoded string.
140147
*

protocol/src/main/java/org/fidoalliance/fdo/protocol/db/FdoSimCommandOwnerModule.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
import org.fidoalliance.fdo.protocol.message.ServiceInfoDocument;
1717
import org.fidoalliance.fdo.protocol.message.ServiceInfoKeyValuePair;
1818
import org.fidoalliance.fdo.protocol.message.ServiceInfoModuleState;
19-
import org.fidoalliance.fdo.protocol.message.ServiceInfoQueue;
2019
import org.fidoalliance.fdo.protocol.serviceinfo.DevMod;
21-
import org.fidoalliance.fdo.protocol.serviceinfo.FdoSys;
2220

2321
public class FdoSimCommandOwnerModule implements ServiceInfoModule {
2422

@@ -272,7 +270,7 @@ protected void load(ServiceInfoModuleState state, FdoSysModuleExtra extra)
272270

273271
kv = new ServiceInfoKeyValuePair();
274272
kv.setKeyName(EXECUTE);
275-
kv.setValue(Mapper.INSTANCE.writeValue(commandArgs));
273+
kv.setValue(Mapper.INSTANCE.cborNull());
276274
state.getGlobalState().getQueue().add(kv);
277275

278276

protocol/src/test/java/org/fidoalliance/fdo/protocol/SerializationTest.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import org.fidoalliance.fdo.protocol.message.OwnerPublicKey;
1111
import org.fidoalliance.fdo.protocol.message.PublicKeyEncoding;
1212
import org.fidoalliance.fdo.protocol.message.PublicKeyType;
13-
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
14-
import static org.junit.jupiter.api.Assertions.assertTrue;
1513
import org.junit.jupiter.api.Test;
1614

1715
import com.fasterxml.jackson.dataformat.cbor.CBORConstants;
1816

17+
import static org.junit.jupiter.api.Assertions.*;
18+
1919
public class SerializationTest {
2020

2121
@Test
@@ -70,4 +70,12 @@ public void wrapCborTest() throws IOException {
7070
assertArrayEquals(input, Mapper.INSTANCE.readValue(innerCbor, String[].class));
7171
assertArrayEquals(input, Mapper.INSTANCE.readFromCborByteString(outerBstr, String[].class));
7272
}
73+
74+
@Test
75+
public void cborNullTest() {
76+
byte[] cbor = Mapper.INSTANCE.cborNull();
77+
78+
assertTrue(CBORConstants.hasMajorType(CBORConstants.MAJOR_TYPE_MISC, cbor[0]));
79+
assertEquals(CBORConstants.BYTE_NULL, cbor[0]);
80+
}
7381
}

0 commit comments

Comments
 (0)