javier/Stirling-PDF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

format

Browse Source
This commit is contained in:
Anthony Stirling
2024-10-05 15:27:57 +01:00
parent dedfabd630
commit 83e93688ee
13 changed files with 76 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/stirling/software/SPDF/EE/KeygenLicenseVerifier.java
View File

@@ -175,7 +175,10 @@ public class KeygenLicenseVerifier {
log.info("Machine activated successfully");
return true;
} else {
log.error("Error activating machine. Status code: " + response.statusCode());
log.error(
"Error activating machine. Status code: {}, error: {}",
response.statusCode(),
response.body());
return false;
}

2
src/main/java/stirling/software/SPDF/EE/LicenseKeyChecker.java
View File

@@ -37,10 +37,8 @@ public class LicenseKeyChecker {
log.info(applicationProperties.toString());
log.info(applicationProperties.getEnterpriseEdition().toString());
if (!applicationProperties.getEnterpriseEdition().isEnabled()) {
System.out.println("gggggg");
enterpriseEnbaledResult = false;
} else {
System.out.println("ssssssssssss");
enterpriseEnbaledResult =
licenseService.verifyLicense(
applicationProperties.getEnterpriseEdition().getKey());

32
src/main/java/stirling/software/SPDF/config/fingerprint/FingerprintBasedSessionFilter.java
View File

@@ -1,22 +1,22 @@
//package stirling.software.SPDF.config.fingerprint;
// package stirling.software.SPDF.config.fingerprint;
//
//import java.io.IOException;
// import java.io.IOException;
//
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Component;
//import org.springframework.web.filter.OncePerRequestFilter;
// import org.springframework.beans.factory.annotation.Autowired;
// import org.springframework.stereotype.Component;
// import org.springframework.web.filter.OncePerRequestFilter;
//
//import jakarta.servlet.FilterChain;
//import jakarta.servlet.ServletException;
//import jakarta.servlet.http.HttpServletRequest;
//import jakarta.servlet.http.HttpServletResponse;
//import jakarta.servlet.http.HttpSession;
//import lombok.extern.slf4j.Slf4j;
//import stirling.software.SPDF.utils.RequestUriUtils;
// import jakarta.servlet.FilterChain;
// import jakarta.servlet.ServletException;
// import jakarta.servlet.http.HttpServletRequest;
// import jakarta.servlet.http.HttpServletResponse;
// import jakarta.servlet.http.HttpSession;
// import lombok.extern.slf4j.Slf4j;
// import stirling.software.SPDF.utils.RequestUriUtils;
//
////@Component
//@Slf4j
//public class FingerprintBasedSessionFilter extends OncePerRequestFilter {
//// @Component
// @Slf4j
// public class FingerprintBasedSessionFilter extends OncePerRequestFilter {
// private final FingerprintGenerator fingerprintGenerator;
// private final FingerprintBasedSessionManager sessionManager;
//
@@ -65,4 +65,4 @@
// log.debug("Proceeding with request: {}", request.getRequestURI());
// filterChain.doFilter(request, response);
// }
//}
// }

36
src/main/java/stirling/software/SPDF/config/fingerprint/FingerprintBasedSessionManager.java
View File

@@ -1,24 +1,24 @@
//package stirling.software.SPDF.config.fingerprint;
// package stirling.software.SPDF.config.fingerprint;
//
//import java.util.Iterator;
//import java.util.Map;
//import java.util.concurrent.ConcurrentHashMap;
//import java.util.concurrent.TimeUnit;
// import java.util.Iterator;
// import java.util.Map;
// import java.util.concurrent.ConcurrentHashMap;
// import java.util.concurrent.TimeUnit;
//
//import org.springframework.scheduling.annotation.Scheduled;
//import org.springframework.stereotype.Component;
// import org.springframework.scheduling.annotation.Scheduled;
// import org.springframework.stereotype.Component;
//
//import jakarta.servlet.http.HttpSession;
//import jakarta.servlet.http.HttpSessionAttributeListener;
//import jakarta.servlet.http.HttpSessionEvent;
//import jakarta.servlet.http.HttpSessionListener;
//import lombok.AllArgsConstructor;
//import lombok.Data;
//import lombok.extern.slf4j.Slf4j;
// import jakarta.servlet.http.HttpSession;
// import jakarta.servlet.http.HttpSessionAttributeListener;
// import jakarta.servlet.http.HttpSessionEvent;
// import jakarta.servlet.http.HttpSessionListener;
// import lombok.AllArgsConstructor;
// import lombok.Data;
// import lombok.extern.slf4j.Slf4j;
//
//@Slf4j
//@Component
//public class FingerprintBasedSessionManager
// @Slf4j
// @Component
// public class FingerprintBasedSessionManager
// implements HttpSessionListener, HttpSessionAttributeListener {
// private static final ConcurrentHashMap<String, FingerprintInfo> activeFingerprints =
// new ConcurrentHashMap<>();
@@ -131,4 +131,4 @@
// private String sessionId;
// private long lastAccessTime;
// }
//}
// }

16
src/main/java/stirling/software/SPDF/config/fingerprint/FingerprintGenerator.java
View File

@@ -1,14 +1,14 @@
//package stirling.software.SPDF.config.fingerprint;
// package stirling.software.SPDF.config.fingerprint;
//
//import java.security.MessageDigest;
//import java.security.NoSuchAlgorithmException;
// import java.security.MessageDigest;
// import java.security.NoSuchAlgorithmException;
//
//import org.springframework.stereotype.Component;
// import org.springframework.stereotype.Component;
//
//import jakarta.servlet.http.HttpServletRequest;
// import jakarta.servlet.http.HttpServletRequest;
//
//@Component
//public class FingerprintGenerator {
// @Component
// public class FingerprintGenerator {
//
// public String generateFingerprint(HttpServletRequest request) {
// if (request == null) {
@@ -74,4 +74,4 @@
// throw new RuntimeException("Failed to generate fingerprint hash", e);
// }
// }
//}
// }

2
src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java
View File

@@ -79,7 +79,7 @@ public class SecurityConfiguration {
http.authenticationManager(authenticationManager(http));
if (loginEnabledValue) {
http.addFilterBefore(
http.addFilterBefore(
userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
http.csrf(csrf -> csrf.disable());
http.addFilterBefore(rateLimitingFilter(), UsernamePasswordAuthenticationFilter.class);

2
src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java
View File

@@ -61,7 +61,7 @@ public class ConvertPDFToPDFA {
command.add("-dPDFA=" + ("pdfa".equals(outputFormat) ? "2" : "1"));
command.add("-dNOPAUSE");
command.add("-dBATCH");
command.add("-sColorConversionStrategy=UseDeviceIndependentColor");
command.add("-sColorConversionStrategy=sRGB");
command.add("-sDEVICE=pdfwrite");
command.add("-dPDFACompatibilityPolicy=2");
command.add("-o");

12
src/main/java/stirling/software/SPDF/service/PostHogService.java
View File

@@ -39,9 +39,9 @@ public class PostHogService {
}
private void captureSystemInfo() {
if(!Boolean.getBoolean(applicationProperties.getSystem().getEnableAnalytics())) {
return;
}
if (!Boolean.getBoolean(applicationProperties.getSystem().getEnableAnalytics())) {
return;
}
try {
postHog.capture(uniqueId, "system_info_captured", captureServerMetrics());
} catch (Exception e) {
@@ -50,9 +50,9 @@ public class PostHogService {
}
public void captureEvent(String eventName, Map<String, Object> properties) {
if(!Boolean.getBoolean(applicationProperties.getSystem().getEnableAnalytics())) {
return;
}
if (!Boolean.getBoolean(applicationProperties.getSystem().getEnableAnalytics())) {
return;
}
postHog.capture(uniqueId, eventName, properties);
}

3
src/main/java/stirling/software/SPDF/utils/misc/ReplaceAndInvertColorStrategy.java
View File

@@ -6,11 +6,12 @@ import org.springframework.core.io.InputStreamResource;
import org.springframework.web.multipart.MultipartFile;
import lombok.Data;
import lombok.EqualsAndHashCode;
import stirling.software.SPDF.model.api.PDFFile;
import stirling.software.SPDF.model.api.misc.ReplaceAndInvert;
@Data
// @EqualsAndHashCode(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public abstract class ReplaceAndInvertColorStrategy extends PDFFile {
protected ReplaceAndInvert replaceAndInvert;