Skip to content

Commit 373aac9

Browse files
committed
UY-947 more standard way to generate hash, without jaxb
1 parent a7a2491 commit 373aac9

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

types-api/src/main/java/pl/edu/icm/unity/types/endpoint/EndpointConfiguration.java

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
import java.security.MessageDigest;
99
import java.security.NoSuchAlgorithmException;
1010
import java.util.ArrayList;
11+
import java.util.Base64;
1112
import java.util.List;
1213

13-
import javax.xml.bind.DatatypeConverter;
14-
1514
import com.fasterxml.jackson.annotation.JsonCreator;
1615
import com.fasterxml.jackson.annotation.JsonValue;
1716
import com.fasterxml.jackson.databind.JsonNode;
@@ -74,28 +73,23 @@ public EndpointConfiguration(ObjectNode json)
7473
authenticationOptions.add(node.asText());
7574

7675
}
77-
if (json.has("tag"))
78-
{
79-
tag = json.get("tag").asText();
80-
} else
81-
{
82-
tag = generateTag(configuration);
83-
}
76+
77+
tag = json.has("tag") ? json.get("tag").asText() : generateTag(configuration);
8478
}
8579

8680
private String generateTag(String configuration)
8781
{
88-
if(configuration != null)
82+
if (configuration != null)
8983
{
9084
try
9185
{
92-
return DatatypeConverter
93-
.printHexBinary((MessageDigest.getInstance("SHA-1").digest(
94-
configuration.getBytes(StandardCharsets.UTF_8))))
95-
.toUpperCase();
86+
byte[] digest = MessageDigest.getInstance("SHA-256").digest(
87+
configuration.getBytes(StandardCharsets.UTF_8));
88+
return Base64.getEncoder().encodeToString(digest);
9689
} catch (NoSuchAlgorithmException e)
9790
{
98-
return configuration;
91+
throw new IllegalStateException("Can not generate message fingerprint "
92+
+ "with SHA 256, java platform problem?", e);
9993
}
10094
} else
10195
{

0 commit comments

Comments
 (0)