From 594c7848b0d18e1d1e5d37a6a2be31a0530756b0 Mon Sep 17 00:00:00 2001
From: Tor Brede Vekterli
Date: Tue, 6 Jun 2023 14:56:53 +0200
Subject: Emit fingerprints with delimiters by default
Uses standard fingerprint `hex:hex:hex:...` format
---
.../src/main/java/com/yahoo/security/token/Token.java | 2 +-
.../main/java/com/yahoo/security/token/TokenFingerprint.java | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
(limited to 'security-utils/src/main/java/com/yahoo/security')
diff --git a/security-utils/src/main/java/com/yahoo/security/token/Token.java b/security-utils/src/main/java/com/yahoo/security/token/Token.java
index e830bdfd63d..bc1d7239310 100644
--- a/security-utils/src/main/java/com/yahoo/security/token/Token.java
+++ b/security-utils/src/main/java/com/yahoo/security/token/Token.java
@@ -67,7 +67,7 @@ public class Token {
@Override
public String toString() {
// Avoid leaking raw token secret as part of toString() output
- return "Token(fingerprint: %s)".formatted(fingerprint.toHexString());
+ return "Token(fingerprint: %s)".formatted(fingerprint);
}
/**
diff --git a/security-utils/src/main/java/com/yahoo/security/token/TokenFingerprint.java b/security-utils/src/main/java/com/yahoo/security/token/TokenFingerprint.java
index acbf7c085fd..9ce8d55f161 100644
--- a/security-utils/src/main/java/com/yahoo/security/token/TokenFingerprint.java
+++ b/security-utils/src/main/java/com/yahoo/security/token/TokenFingerprint.java
@@ -2,6 +2,7 @@
package com.yahoo.security.token;
import java.util.Arrays;
+import java.util.HexFormat;
import static com.yahoo.security.ArrayUtils.hex;
@@ -11,6 +12,9 @@ import static com.yahoo.security.ArrayUtils.hex;
*
* Token fingerprints should not be used directly for access checks; use derived
* {@link TokenCheckHash} instances for this purpose.
+ *
+ * Fingerprints are printed in the common hex:hex:hex:... format, e.g.
+ * 53:2e:4e:09:d5:4f:96:f4:1a:44:82:ef:f0:44:b9:a2
*
*/
public record TokenFingerprint(byte[] hashBytes) {
@@ -36,9 +40,13 @@ public record TokenFingerprint(byte[] hashBytes) {
return hex(hashBytes);
}
+ public String toDelimitedHexString() {
+ return HexFormat.ofDelimiter(":").formatHex(hashBytes);
+ }
+
@Override
public String toString() {
- return toHexString();
+ return toDelimitedHexString();
}
public static TokenFingerprint of(Token token) {
--
cgit v1.2.3