Make static method

square · Apr 14, 2022 · 4664a4e · 4664a4e
1 parent a31ec91
commit 4664a4e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/server/src/main/java/keywhiz/service/crypto/RowHmacGenerator.java b/server/src/main/java/keywhiz/service/crypto/RowHmacGenerator.java
@@ -42,7 +42,7 @@ public String computeRowHmac(String table, List<Object> fields) {
    *
    * Uses MessageDigest to prevent timing attacks.
    * */
-  public boolean compareHmacs(String left, String right) {
+  public static boolean compareHmacs(String left, String right) {
     return MessageDigest.isEqual(
         left.getBytes(UTF_8),
         right.getBytes(UTF_8)

diff --git a/server/src/main/java/keywhiz/service/daos/AclDAO.java b/server/src/main/java/keywhiz/service/daos/AclDAO.java
@@ -370,7 +370,7 @@ private SanitizedSecret processSanitizedSecretRow(Record row, Client client) {
     String secretHmac = rowHmacGenerator.computeRowHmac(
         SECRETS.getName(), List.of(row.getValue(SECRETS.NAME), row.getValue(SECRETS.ID))
     );
-    if (!rowHmacGenerator.compareHmacs(secretHmac, row.getValue(SECRETS.ROW_HMAC))) {
+    if (!RowHmacGenerator.compareHmacs(secretHmac, row.getValue(SECRETS.ROW_HMAC))) {
       String errorMessage = String.format(
           "Secret HMAC verification failed for secret: %s", row.getValue(SECRETS.NAME));
       if (rowHmacLog) {
@@ -384,7 +384,7 @@ private SanitizedSecret processSanitizedSecretRow(Record row, Client client) {
     String clientHmac = rowHmacGenerator.computeRowHmac(
         CLIENTS.getName(), List.of(client.getName(), client.getId())
     );
-    if (!rowHmacGenerator.compareHmacs(clientHmac, row.getValue(CLIENTS.ROW_HMAC))) {
+    if (!RowHmacGenerator.compareHmacs(clientHmac, row.getValue(CLIENTS.ROW_HMAC))) {
       String errorMessage = String.format(
           "Client HMAC verification failed for client: %s", client.getName());
       if (rowHmacLog) {
@@ -397,7 +397,7 @@ private SanitizedSecret processSanitizedSecretRow(Record row, Client client) {
 
     String membershipsHmac = rowHmacGenerator.computeRowHmac(
         MEMBERSHIPS.getName(), List.of(client.getId(), row.getValue(MEMBERSHIPS.GROUPID)));
-    if (!rowHmacGenerator.compareHmacs(membershipsHmac, row.getValue(MEMBERSHIPS.ROW_HMAC))) {
+    if (!RowHmacGenerator.compareHmacs(membershipsHmac, row.getValue(MEMBERSHIPS.ROW_HMAC))) {
       String errorMessage = String.format(
           "Memberships HMAC verification failed for clientId: %d in groupId: %d",
           client.getId(), row.getValue(MEMBERSHIPS.GROUPID));
@@ -412,7 +412,7 @@ private SanitizedSecret processSanitizedSecretRow(Record row, Client client) {
     String accessgrantsHmac = rowHmacGenerator.computeRowHmac(
         ACCESSGRANTS.getName(),
         List.of(row.getValue(MEMBERSHIPS.GROUPID), row.getValue(SECRETS.ID)));
-    if (!rowHmacGenerator.compareHmacs(accessgrantsHmac, row.getValue(ACCESSGRANTS.ROW_HMAC))) {
+    if (!RowHmacGenerator.compareHmacs(accessgrantsHmac, row.getValue(ACCESSGRANTS.ROW_HMAC))) {
       String errorMessage = String.format(
           "Access Grants HMAC verification failed for groupId: %d in secretId: %d",
           row.getValue(MEMBERSHIPS.GROUPID), row.getValue(SECRETS.ID));