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

Jump to bottom

Update FileSignTool #4988

Merged
merged 9 commits into from Feb 15, 2023
Merged

Update FileSignTool #4988

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1cdb9fb
Add more log
JeffreyDallas Feb 14, 2023
f423e00
save
JeffreyDallas Feb 14, 2023
3b76159
Save
JeffreyDallas Feb 14, 2023
c343c14
Save
JeffreyDallas Feb 14, 2023
f3b59a5
save
JeffreyDallas Feb 15, 2023
23196ce
Revert
JeffreyDallas Feb 15, 2023
22bc70a
Fix typos and wordings.
qnswirlds Feb 15, 2023
f403d89
Save
JeffreyDallas Feb 15, 2023
3e8a394
Save
JeffreyDallas Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 16 additions & 7 deletions ...ra-node/hapi-utils/src/main/java/com/hedera/node/app/hapi/utils/exports/FileSignTool.java
View file
Open in desktop
Expand Up @@ -156,10 +156,7 @@ public static byte[] sign(final byte[] data, final KeyPair sigKeyPair)
SignatureType.RSA.signingAlgorithm(), SignatureType.RSA.provider());
signature.initSign(sigKeyPair.getPrivate());
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(
MARKER,
"data is being signed, publicKey={}",
hex(sigKeyPair.getPublic().getEncoded()));
LOGGER.info(MARKER, "data being signed = {}", hex(data));
}

signature.update(data);
Expand Down Expand Up @@ -248,9 +245,7 @@ public static void signSingleFile(
*/
public static StreamType loadStreamTypeFromJson(final String jsonPath) throws IOException {
final ObjectMapper objectMapper = new ObjectMapper();

final File file = new File(jsonPath);

return objectMapper.readValue(file, StreamTypeFromJson.class);
}

Expand Down Expand Up @@ -361,23 +356,35 @@ private static void createSignatureFileForRecordFile(
final int version = recordResult.getKey();
final byte[] serializedBytes = recordResult.getValue().get().toByteArray();

LOGGER.info(MARKER, "Writing file header {}", Arrays.toString(fileHeader));
// update meta digest
for (final int value : fileHeader) {
dosMeta.writeInt(value);
}
LOGGER.info(MARKER, "Writing start running hash {}", hex(startRunningHash));
dosMeta.write(startRunningHash);
LOGGER.info(MARKER, "Writing end running hash {}", hex(endRunningHash));
dosMeta.write(endRunningHash);
LOGGER.info(MARKER, "Writing block number {}", blockNumber);
dosMeta.writeLong(blockNumber);
dosMeta.flush();

// update stream digest
LOGGER.info(MARKER, "Writing version {}", version);
dos.writeInt(version);
LOGGER.info(
MARKER, "Writing serializedBytes {}", hex(serializedBytes).substring(0, 32));
dos.write(serializedBytes);
dos.flush();

} catch (final IOException e) {
final String message =
String.format(
"Got IOException when reading record file %s, error = %s",
recordFile, e);
Thread.currentThread().interrupt();
LOGGER.error(MARKER, "Got IOException when reading record file {}", recordFile, e);
LOGGER.error(MARKER, message);
throw new RuntimeException(message);
}

final SignatureObject metadataSignature =
Expand Down Expand Up @@ -466,6 +473,8 @@ public static void main(final String[] args) {
} catch (final IOException e) {
LOGGER.error(MARKER, "Got IOException", e);
}
} else {
throw new RuntimeException("Could not find log4j2 configuration file " + logConfigFile);
}
}

Expand Down