build.gradle

@@ -30,7 +30,7 @@ ext {
 }
 
 group = "stirling.software"
-version = "0.46.2"
+version = "0.46.1"
 
 java {
     // 17 is lowest but we support and recommend 21

src/main/java/stirling/software/SPDF/EE/KeygenLicenseVerifier.java

@@ -48,46 +48,30 @@ public class KeygenLicenseVerifier {
     private static final ObjectMapper objectMapper = new ObjectMapper();
     private final ApplicationProperties applicationProperties;
 
-    // Shared HTTP client for connection pooling
-    private static final HttpClient httpClient = HttpClient.newBuilder()
-            .version(HttpClient.Version.HTTP_2)
-            .connectTimeout(java.time.Duration.ofSeconds(10))
-            .build();
-            
-    // License metadata context class to avoid shared mutable state
-    private static class LicenseContext {
-        private boolean isFloatingLicense = false;
-        private int maxMachines = 1; // Default to 1 if not specified
-        private boolean isEnterpriseLicense = false;
-        
-        public LicenseContext() {}
-    }
-
     public License verifyLicense(String licenseKeyOrCert) {
         License license;
-        LicenseContext context = new LicenseContext();
 
         if (isCertificateLicense(licenseKeyOrCert)) {
             log.info("Detected certificate-based license. Processing...");
-            boolean isValid = verifyCertificateLicense(licenseKeyOrCert, context);
+            boolean isValid = verifyCertificateLicense(licenseKeyOrCert);
             if (isValid) {
-                license = context.isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
+                license = isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
             } else {
                 license = License.NORMAL;
             }
         } else if (isJWTLicense(licenseKeyOrCert)) {
             log.info("Detected JWT-style license key. Processing...");
-            boolean isValid = verifyJWTLicense(licenseKeyOrCert, context);
+            boolean isValid = verifyJWTLicense(licenseKeyOrCert);
             if (isValid) {
-                license = context.isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
+                license = isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
             } else {
                 license = License.NORMAL;
             }
         } else {
             log.info("Detected standard license key. Processing...");
-            boolean isValid = verifyStandardLicense(licenseKeyOrCert, context);
+            boolean isValid = verifyStandardLicense(licenseKeyOrCert);
             if (isValid) {
-                license = context.isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
+                license = isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
             } else {
                 license = License.NORMAL;
             }
@@ -95,7 +79,7 @@ public class KeygenLicenseVerifier {
         return license;
     }
 
-    // Removed instance field for isEnterpriseLicense, now using LicenseContext
+    private boolean isEnterpriseLicense = false;
 
     private boolean isCertificateLicense(String license) {
         return license != null && license.trim().startsWith(CERT_PREFIX);
@@ -105,7 +89,7 @@ public class KeygenLicenseVerifier {
         return license != null && license.trim().startsWith(JWT_PREFIX);
     }
 
-    private boolean verifyCertificateLicense(String licenseFile, LicenseContext context) {
+    private boolean verifyCertificateLicense(String licenseFile) {
         try {
             String encodedPayload = licenseFile;
             // Remove the header
@@ -160,7 +144,7 @@ public class KeygenLicenseVerifier {
             }
 
             // Process the certificate data
-            boolean isValid = processCertificateData(decodedData, context);
+            boolean isValid = processCertificateData(decodedData);
 
             return isValid;
         } catch (Exception e) {
@@ -203,7 +187,7 @@ public class KeygenLicenseVerifier {
         }
     }
 
-    private boolean processCertificateData(String certData, LicenseContext context) {
+    private boolean processCertificateData(String certData) {
         try {
             JSONObject licenseData = new JSONObject(certData);
             JSONObject metaObj = licenseData.optJSONObject("meta");
@@ -245,17 +229,15 @@ public class KeygenLicenseVerifier {
             if (attributesObj != null) {
                 log.info("Found attributes in certificate data");
 
-                // Check for floating license
-                context.isFloatingLicense = attributesObj.optBoolean("floating", false);
-                context.maxMachines = attributesObj.optInt("maxMachines", 1);
-                
                 // Extract metadata
                 JSONObject metadataObj = attributesObj.optJSONObject("metadata");
                 if (metadataObj != null) {
-                    int users = metadataObj.optInt("users", 1);
-                    applicationProperties.getPremium().setMaxUsers(users);
-                    log.info("License allows for {} users", users);
-                    context.isEnterpriseLicense = metadataObj.optBoolean("isEnterprise", false);
+                    int users = metadataObj.optInt("users", 0);
+                    if (users > 0) {
+                        applicationProperties.getPremium().setMaxUsers(users);
+                        log.info("License allows for {} users", users);
+                    }
+                    isEnterpriseLicense = metadataObj.optBoolean("isEnterprise", false);
                 }
 
                 // Check license status if available
@@ -275,7 +257,7 @@ public class KeygenLicenseVerifier {
         }
     }
 
-    private boolean verifyJWTLicense(String licenseKey, LicenseContext context) {
+    private boolean verifyJWTLicense(String licenseKey) {
         try {
             log.info("Verifying ED25519_SIGN format license key");
 
@@ -309,7 +291,7 @@ public class KeygenLicenseVerifier {
             String payload = new String(payloadBytes);
 
             // Process the license payload
-            boolean isValid = processJWTLicensePayload(payload, context);
+            boolean isValid = processJWTLicensePayload(payload);
 
             return isValid;
         } catch (Exception e) {
@@ -345,7 +327,7 @@ public class KeygenLicenseVerifier {
         }
     }
 
-    private boolean processJWTLicensePayload(String payload, LicenseContext context) {
+    private boolean processJWTLicensePayload(String payload) {
         try {
             log.info("Processing license payload: {}", payload);
 
@@ -366,13 +348,6 @@ public class KeygenLicenseVerifier {
             String licenseId = licenseObj.optString("id", "unknown");
             log.info("Processing license with ID: {}", licenseId);
 
-            // Check for floating license in license object
-            context.isFloatingLicense = licenseObj.optBoolean("floating", false);
-            context.maxMachines = licenseObj.optInt("maxMachines", 1);
-            if (context.isFloatingLicense) {
-                log.info("Detected floating license with max machines: {}", context.maxMachines);
-            }
-
             // Check expiry date
             String expiryStr = licenseObj.optString("expiry", null);
             if (expiryStr != null && !"null".equals(expiryStr)) {
@@ -408,20 +383,9 @@ public class KeygenLicenseVerifier {
                 String policyId = policyObj.optString("id", "unknown");
                 log.info("License uses policy: {}", policyId);
 
-                // Check for floating license in policy
-                boolean policyFloating = policyObj.optBoolean("floating", false);
-                int policyMaxMachines = policyObj.optInt("maxMachines", 1);
-                
-                // Policy settings take precedence
-                if (policyFloating) {
-                    context.isFloatingLicense = true;
-                    context.maxMachines = policyMaxMachines;
-                    log.info("Policy defines floating license with max machines: {}", context.maxMachines);
-                }
-                
                 // Extract max users and isEnterprise from policy or metadata
-                int users = policyObj.optInt("users", 1);
-                context.isEnterpriseLicense = policyObj.optBoolean("isEnterprise", false);
+                int users = policyObj.optInt("users", 0);
+                isEnterpriseLicense = policyObj.optBoolean("isEnterprise", false);
 
                 if (users > 0) {
                     applicationProperties.getPremium().setMaxUsers(users);
@@ -435,7 +399,7 @@ public class KeygenLicenseVerifier {
                         log.info("License allows for {} users (from metadata)", users);
 
                         // Check for isEnterprise flag in metadata
-                        context.isEnterpriseLicense = metadata.optBoolean("isEnterprise", false);
+                        isEnterpriseLicense = metadata.optBoolean("isEnterprise", false);
                     } else {
                         // Default value
                         applicationProperties.getPremium().setMaxUsers(1);
@@ -451,13 +415,13 @@ public class KeygenLicenseVerifier {
         }
     }
 
-    private boolean verifyStandardLicense(String licenseKey, LicenseContext context) {
+    private boolean verifyStandardLicense(String licenseKey) {
         try {
             log.info("Checking standard license key");
             String machineFingerprint = generateMachineFingerprint();
 
             // First, try to validate the license
-            JsonNode validationResponse = validateLicense(licenseKey, machineFingerprint, context);
+            JsonNode validationResponse = validateLicense(licenseKey, machineFingerprint);
             if (validationResponse != null) {
                 boolean isValid = validationResponse.path("meta").path("valid").asBoolean();
                 String licenseId = validationResponse.path("data").path("id").asText();
@@ -471,10 +435,10 @@ public class KeygenLicenseVerifier {
                                 "License not activated for this machine. Attempting to"
                                         + " activate...");
                         boolean activated =
-                                activateMachine(licenseKey, licenseId, machineFingerprint, context);
+                                activateMachine(licenseKey, licenseId, machineFingerprint);
                         if (activated) {
                             // Revalidate after activation
-                            validationResponse = validateLicense(licenseKey, machineFingerprint, context);
+                            validationResponse = validateLicense(licenseKey, machineFingerprint);
                             isValid =
                                     validationResponse != null
                                             && validationResponse
@@ -494,8 +458,9 @@ public class KeygenLicenseVerifier {
         }
     }
 
-    private JsonNode validateLicense(String licenseKey, String machineFingerprint, LicenseContext context)
+    private JsonNode validateLicense(String licenseKey, String machineFingerprint)
             throws Exception {
+        HttpClient client = HttpClient.newHttpClient();
         String requestBody =
                 String.format(
                         "{\"meta\":{\"key\":\"%s\",\"scope\":{\"fingerprint\":\"%s\"}}}",
@@ -514,7 +479,7 @@ public class KeygenLicenseVerifier {
                         .POST(HttpRequest.BodyPublishers.ofString(requestBody))
                         .build();
 
-        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
         log.info("ValidateLicenseResponse body: {}", response.body());
         JsonNode jsonResponse = objectMapper.readTree(response.body());
         if (response.statusCode() == 200) {
@@ -528,56 +493,18 @@ public class KeygenLicenseVerifier {
             log.info("Validation detail: " + detail);
             log.info("Validation code: " + code);
 
-            // Check if the license itself has floating attribute
-            JsonNode licenseAttrs = jsonResponse.path("data").path("attributes");
-            if (!licenseAttrs.isMissingNode()) {
-                context.isFloatingLicense = licenseAttrs.path("floating").asBoolean(false);
-                context.maxMachines = licenseAttrs.path("maxMachines").asInt(1);
-                
-                log.info("License floating (from license): {}, maxMachines: {}", 
-                        context.isFloatingLicense, context.maxMachines);
-            }
-            
-            // Also check the policy for floating license support if included
-            JsonNode includedNode = jsonResponse.path("included");
-            JsonNode policyNode = null;
-            
-            if (includedNode.isArray()) {
-                for (JsonNode node : includedNode) {
-                    if ("policies".equals(node.path("type").asText())) {
-                        policyNode = node;
-                        break;
-                    }
-                }
-            }
-            
-            if (policyNode != null) {
-                // Check if this is a floating license from policy
-                boolean policyFloating = policyNode.path("attributes").path("floating").asBoolean(false);
-                int policyMaxMachines = policyNode.path("attributes").path("maxMachines").asInt(1);
-                
-                // Policy takes precedence over license attributes
-                if (policyFloating) {
-                    context.isFloatingLicense = true;
-                    context.maxMachines = policyMaxMachines;
-                }
-                
-                log.info("License floating (from policy): {}, maxMachines: {}", 
-                        context.isFloatingLicense, context.maxMachines);
-            }
-
-            // Extract user count, default to 1 if not specified
+            // Extract user count
             int users =
                     jsonResponse
                             .path("data")
                             .path("attributes")
                             .path("metadata")
                             .path("users")
-                            .asInt(1);
+                            .asInt(0);
             applicationProperties.getPremium().setMaxUsers(users);
 
             // Extract isEnterprise flag
-            context.isEnterpriseLicense =
+            isEnterpriseLicense =
                     jsonResponse
                             .path("data")
                             .path("attributes")
@@ -593,87 +520,10 @@ public class KeygenLicenseVerifier {
         return jsonResponse;
     }
 
-    private boolean activateMachine(String licenseKey, String licenseId, String machineFingerprint, 
-            LicenseContext context) throws Exception {
-        // For floating licenses, we first need to check if we need to deregister any machines
-        if (context.isFloatingLicense) {
-            log.info("Processing floating license activation. Max machines allowed: {}", context.maxMachines);
+    private boolean activateMachine(String licenseKey, String licenseId, String machineFingerprint)
+            throws Exception {
+        HttpClient client = HttpClient.newHttpClient();
 
-            // Get the current machines for this license
-            JsonNode machinesResponse = fetchMachinesForLicense(licenseKey, licenseId);
-            if (machinesResponse != null) {
-                JsonNode machines = machinesResponse.path("data");
-                int currentMachines = machines.size();
-                
-                log.info("Current machine count: {}, Max allowed: {}", currentMachines, context.maxMachines);
-                
-                // Check if the current fingerprint is already activated
-                boolean isCurrentMachineActivated = false;
-                String currentMachineId = null;
-                
-                for (JsonNode machine : machines) {
-                    if (machineFingerprint.equals(machine.path("attributes").path("fingerprint").asText())) {
-                        isCurrentMachineActivated = true;
-                        currentMachineId = machine.path("id").asText();
-                        log.info("Current machine is already activated with ID: {}", currentMachineId);
-                        break;
-                    }
-                }
-                
-                // If the current machine is already activated, there's no need to do anything
-                if (isCurrentMachineActivated) {
-                    log.info("Machine already activated. No action needed.");
-                    return true;
-                }
-                
-                // If we've reached the max machines limit, we need to deregister the oldest machine
-                if (currentMachines >= context.maxMachines) {
-                    log.info("Max machines reached. Deregistering oldest machine to make room for the new machine.");
-                    
-                    // Find the oldest machine based on creation timestamp
-                    if (machines.size() > 0) {
-                        // Find the machine with the oldest creation date
-                        String oldestMachineId = null;
-                        java.time.Instant oldestTime = null;
-                        
-                        for (JsonNode machine : machines) {
-                            String createdStr = machine.path("attributes").path("created").asText(null);
-                            if (createdStr != null && !createdStr.isEmpty()) {
-                                try {
-                                    java.time.Instant createdTime = java.time.Instant.parse(createdStr);
-                                    if (oldestTime == null || createdTime.isBefore(oldestTime)) {
-                                        oldestTime = createdTime;
-                                        oldestMachineId = machine.path("id").asText();
-                                    }
-                                } catch (Exception e) {
-                                    log.warn("Could not parse creation time for machine: {}", e.getMessage());
-                                }
-                            }
-                        }
-                        
-                        // If we couldn't determine the oldest by timestamp, use the first one
-                        if (oldestMachineId == null) {
-                            log.warn("Could not determine oldest machine by timestamp, using first machine in list");
-                            oldestMachineId = machines.path(0).path("id").asText();
-                        }
-                        
-                        log.info("Deregistering machine with ID: {}", oldestMachineId);
-                        
-                        boolean deregistered = deregisterMachine(licenseKey, oldestMachineId);
-                        if (!deregistered) {
-                            log.error("Failed to deregister machine. Cannot proceed with activation.");
-                            return false;
-                        }
-                        log.info("Machine deregistered successfully. Proceeding with activation of new machine.");
-                    } else {
-                        log.error("License has reached machine limit but no machines were found to deregister. This is unexpected.");
-                        // We'll still try to activate, but it might fail
-                    }
-                }
-            }
-        }
-        
-        // Proceed with machine activation
         String hostname;
         try {
             hostname = java.net.InetAddress.getLocalHost().getHostName();
@@ -720,7 +570,7 @@ public class KeygenLicenseVerifier {
                         .POST(HttpRequest.BodyPublishers.ofString(body.toString()))
                         .build();
 
-        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
         log.info("activateMachine Response body: " + response.body());
         if (response.statusCode() == 201) {
             log.info("Machine activated successfully");
@@ -738,66 +588,4 @@ public class KeygenLicenseVerifier {
     private String generateMachineFingerprint() {
         return GeneralUtils.generateMachineFingerprint();
     }
-    
-    /**
-     * Fetches all machines associated with a specific license
-     * 
-     * @param licenseKey The license key to check
-     * @param licenseId The license ID 
-     * @return JsonNode containing the list of machines, or null if an error occurs
-     * @throws Exception if an error occurs during the HTTP request
-     */
-    private JsonNode fetchMachinesForLicense(String licenseKey, String licenseId) throws Exception {
-        HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create(BASE_URL + "/" + ACCOUNT_ID + "/licenses/" + licenseId + "/machines"))
-                .header("Content-Type", "application/vnd.api+json")
-                .header("Accept", "application/vnd.api+json")
-                .header("Authorization", "License " + licenseKey)
-                .GET()
-                .build();
-                
-        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-        log.info("fetchMachinesForLicense Response body: {}", response.body());
-        
-        if (response.statusCode() == 200) {
-            return objectMapper.readTree(response.body());
-        } else {
-            log.error("Error fetching machines for license. Status code: {}, error: {}", 
-                    response.statusCode(), response.body());
-            return null;
-        }
-    }
-    
-    /**
-     * Deregisters a machine from a license
-     * 
-     * @param licenseKey The license key
-     * @param machineId The ID of the machine to deregister
-     * @return true if deregistration was successful, false otherwise
-     */
-    private boolean deregisterMachine(String licenseKey, String machineId) {
-        try {
-            HttpRequest request = HttpRequest.newBuilder()
-                    .uri(URI.create(BASE_URL + "/" + ACCOUNT_ID + "/machines/" + machineId))
-                    .header("Content-Type", "application/vnd.api+json")
-                    .header("Accept", "application/vnd.api+json")
-                    .header("Authorization", "License " + licenseKey)
-                    .DELETE()
-                    .build();
-            
-            HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-            
-            if (response.statusCode() == 204) {
-                log.info("Machine {} successfully deregistered", machineId);
-                return true;
-            } else {
-                log.error("Error deregistering machine. Status code: {}, error: {}", 
-                        response.statusCode(), response.body());
-                return false;
-            }
-        } catch (Exception e) {
-            log.error("Exception during machine deregistration: {}", e.getMessage(), e);
-            return false;
-        }
-    }
 }

src/test/java/SpyPDFDocumentFactory.java

@@ -0,0 +1 @@
+// This file has been removed because SpyPDFDocumentFactory is already implemented in stirling/software/SPDF/service.

src/test/java/stirling/software/SPDF/service/CustomPDFDocumentFactoryTest.java

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.service;
 
-import java.nio.file.Files;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
@@ -234,7 +233,7 @@ class CustomPDFDocumentFactoryTest {
     }
 
     private File writeTempFile(byte[] content) throws IOException {
-        File file = Files.createTempFile("pdf-test-", ".pdf").toFile();
+        File file = File.createTempFile("pdf-test-", ".pdf");
         Files.write(file.toPath(), content);
         return file;
     }

src/test/java/stirling/software/SPDF/utils/PDFToFileTest.java

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.utils;
 
-import io.github.pixee.security.ZipSecurity;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -214,7 +213,7 @@ class PDFToFileTest {
 
             // Verify the content by unzipping it
             try (ZipInputStream zipStream =
-                    ZipSecurity.createHardenedInputStream(new java.io.ByteArrayInputStream(response.getBody()))) {
+                    new ZipInputStream(new java.io.ByteArrayInputStream(response.getBody()))) {
                 ZipEntry entry;
                 boolean foundMdFiles = false;
                 boolean foundImage = false;
@@ -286,18 +285,18 @@ class PDFToFileTest {
 
             // Verify the content by unzipping it
             try (ZipInputStream zipStream =
-                    ZipSecurity.createHardenedInputStream(new java.io.ByteArrayInputStream(response.getBody()))) {
+                    new ZipInputStream(new java.io.ByteArrayInputStream(response.getBody()))) {
                 ZipEntry entry;
                 boolean foundMainHtml = false;
                 boolean foundIndexHtml = false;
                 boolean foundImage = false;
 
                 while ((entry = zipStream.getNextEntry()) != null) {
-                    if ("test.html".equals(entry.getName())) {
+                    if (entry.getName().equals("test.html")) {
                         foundMainHtml = true;
-                    } else if ("test_ind.html".equals(entry.getName())) {
+                    } else if (entry.getName().equals("test_ind.html")) {
                         foundIndexHtml = true;
-                    } else if ("test_img.png".equals(entry.getName())) {
+                    } else if (entry.getName().equals("test_img.png")) {
                         foundImage = true;
                     }
                     zipStream.closeEntry();
@@ -437,13 +436,13 @@ class PDFToFileTest {
 
             // Verify the content by unzipping it
             try (ZipInputStream zipStream =
-                    ZipSecurity.createHardenedInputStream(new java.io.ByteArrayInputStream(response.getBody()))) {
+                    new ZipInputStream(new java.io.ByteArrayInputStream(response.getBody()))) {
                 ZipEntry entry;
                 boolean foundMainFile = false;
                 boolean foundMediaFiles = false;
 
                 while ((entry = zipStream.getNextEntry()) != null) {
-                    if ("document.odp".equals(entry.getName())) {
+                    if (entry.getName().equals("document.odp")) {
                         foundMainFile = true;
                     } else if (entry.getName().startsWith("document_media")) {
                         foundMediaFiles = true;