Prevent buffer overflow (#2212)

Signed-off-by: Morten Tokle <[email protected]>
AthenZ · Jun 26, 2023 · ea2b371 · ea2b371
1 parent 2903dad
commit ea2b371
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/servers/zts/src/main/java/com/yahoo/athenz/zts/cert/impl/FileCertRecordStoreConnection.java b/servers/zts/src/main/java/com/yahoo/athenz/zts/cert/impl/FileCertRecordStoreConnection.java
@@ -110,7 +110,7 @@ public List<X509CertRecord> updateUnrefreshedCertificatesNotificationTimestamp(S
         return new ArrayList<>();
     }
 
-    boolean notExpired(long currentTime, long lastModified, int expiryTimeMins) {
+    boolean notExpired(long currentTime, long lastModified, long expiryTimeMins) {
         return (currentTime - lastModified < expiryTimeMins * 60 * 1000);
     }
 

diff --git a/...s/zts/src/test/java/com/yahoo/athenz/zts/cert/impl/FileCertRecordStoreConnectionTest.java b/...s/zts/src/test/java/com/yahoo/athenz/zts/cert/impl/FileCertRecordStoreConnectionTest.java
@@ -37,7 +37,7 @@ public FileCertRecordStoreConnectionExt(File rootDir) {
         }
 
         @Override
-        boolean notExpired(long currentTime, long lastModified, int expiryTimeMins) {
+        boolean notExpired(long currentTime, long lastModified, long expiryTimeMins) {
             return true;
         }
     }
@@ -172,7 +172,12 @@ public void testdeleteExpiredX509CertRecords() throws Exception {
 
         X509CertRecord certRecordCheck = con.getX509CertRecord("ostk", "instance-id", "cn");
         assertNotNull(certRecordCheck);
-
+
+        // Verify that certificates are not expired immediately
+        con.deleteExpiredX509CertRecords(43200); //30 days
+        certRecordCheck = con.getX509CertRecord("ostk", "instance-id", "cn");
+        assertNotNull(certRecordCheck);
+
         Thread.sleep(1000);
         con.deleteExpiredX509CertRecords(0);