feat: add java keystore certificate option for pdf signing
This commit is contained in:
sbplat
parent
d96a3db60a
commit
97f581ad6d
4 changed files with 121 additions and 133 deletions
|
|
@ -81,6 +81,7 @@ public class CertSignController {
|
||||||
MultipartFile privateKeyFile = request.getPrivateKeyFile();
|
MultipartFile privateKeyFile = request.getPrivateKeyFile();
|
||||||
MultipartFile certFile = request.getCertFile();
|
MultipartFile certFile = request.getCertFile();
|
||||||
MultipartFile p12File = request.getP12File();
|
MultipartFile p12File = request.getP12File();
|
||||||
|
MultipartFile jksfile = request.getJksFile();
|
||||||
String password = request.getPassword();
|
String password = request.getPassword();
|
||||||
Boolean showSignature = request.isShowSignature();
|
Boolean showSignature = request.isShowSignature();
|
||||||
String reason = request.getReason();
|
String reason = request.getReason();
|
||||||
|
|
@ -95,10 +96,6 @@ public class CertSignController {
|
||||||
KeyStore ks = null;
|
KeyStore ks = null;
|
||||||
|
|
||||||
switch (certType) {
|
switch (certType) {
|
||||||
case "PKCS12":
|
|
||||||
ks = KeyStore.getInstance("PKCS12");
|
|
||||||
ks.load(p12File.getInputStream(), password.toCharArray());
|
|
||||||
break;
|
|
||||||
case "PEM":
|
case "PEM":
|
||||||
ks = KeyStore.getInstance("JKS");
|
ks = KeyStore.getInstance("JKS");
|
||||||
ks.load(null);
|
ks.load(null);
|
||||||
|
|
@ -107,6 +104,14 @@ public class CertSignController {
|
||||||
ks.setKeyEntry(
|
ks.setKeyEntry(
|
||||||
"alias", privateKey, password.toCharArray(), new Certificate[] {cert});
|
"alias", privateKey, password.toCharArray(), new Certificate[] {cert});
|
||||||
break;
|
break;
|
||||||
|
case "PKCS12":
|
||||||
|
ks = KeyStore.getInstance("PKCS12");
|
||||||
|
ks.load(p12File.getInputStream(), password.toCharArray());
|
||||||
|
break;
|
||||||
|
case "JKS":
|
||||||
|
ks = KeyStore.getInstance("JKS");
|
||||||
|
ks.load(jksfile.getInputStream(), password.toCharArray());
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new IllegalArgumentException("Invalid cert type: " + certType);
|
throw new IllegalArgumentException("Invalid cert type: " + certType);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ public class SignPDFWithCertRequest extends PDFFile {
|
||||||
|
|
||||||
@Schema(
|
@Schema(
|
||||||
description = "The type of the digital certificate",
|
description = "The type of the digital certificate",
|
||||||
allowableValues = {"PKCS12", "PEM"})
|
allowableValues = {"PEM", "PKCS12", "JKS"})
|
||||||
private String certType;
|
private String certType;
|
||||||
|
|
||||||
@Schema(
|
@Schema(
|
||||||
|
|
@ -28,6 +28,9 @@ public class SignPDFWithCertRequest extends PDFFile {
|
||||||
@Schema(description = "The PKCS12 keystore file (required for PKCS12 type certificates)")
|
@Schema(description = "The PKCS12 keystore file (required for PKCS12 type certificates)")
|
||||||
private MultipartFile p12File;
|
private MultipartFile p12File;
|
||||||
|
|
||||||
|
@Schema(description = "The JKS keystore file (Java Key Store)")
|
||||||
|
private MultipartFile jksFile;
|
||||||
|
|
||||||
@Schema(description = "The password for the keystore or the private key")
|
@Schema(description = "The password for the keystore or the private key")
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -546,9 +546,11 @@ scalePages.submit=Submit
|
||||||
certSign.title=Certificate Signing
|
certSign.title=Certificate Signing
|
||||||
certSign.header=Sign a PDF with your certificate (Work in progress)
|
certSign.header=Sign a PDF with your certificate (Work in progress)
|
||||||
certSign.selectPDF=Select a PDF File for Signing:
|
certSign.selectPDF=Select a PDF File for Signing:
|
||||||
|
certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
|
||||||
certSign.selectKey=Select Your Private Key File (PKCS#8 format, could be .pem or .der):
|
certSign.selectKey=Select Your Private Key File (PKCS#8 format, could be .pem or .der):
|
||||||
certSign.selectCert=Select Your Certificate File (X.509 format, could be .pem or .der):
|
certSign.selectCert=Select Your Certificate File (X.509 format, could be .pem or .der):
|
||||||
certSign.selectP12=Select Your PKCS#12 Keystore File (.p12 or .pfx) (Optional, If provided, it should contain your private key and certificate):
|
certSign.selectP12=Select Your PKCS#12 Keystore File (.p12 or .pfx) (Optional, If provided, it should contain your private key and certificate):
|
||||||
|
certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
|
||||||
certSign.certType=Certificate Type
|
certSign.certType=Certificate Type
|
||||||
certSign.password=Enter Your Keystore or Private Key Password (If Any):
|
certSign.password=Enter Your Keystore or Private Key Password (If Any):
|
||||||
certSign.showSig=Show Signature
|
certSign.showSig=Show Signature
|
||||||
|
|
|
||||||
|
|
@ -1,135 +1,113 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html th:lang="${#locale.toString()}"
|
<html th:lang="${#locale.toString()}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
|
||||||
th:lang-direction="#{language.direction}"
|
<th:block th:insert="~{fragments/common :: head(title=#{certSign.title}, header=#{certSign.header})}"></th:block>
|
||||||
xmlns:th="http://www.thymeleaf.org">
|
|
||||||
|
|
||||||
<th:block
|
|
||||||
th:insert="~{fragments/common :: head(title=#{certSign.title}, header=#{certSign.header})}"></th:block>
|
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div id="page-container">
|
<div id="page-container">
|
||||||
<div id="content-wrap">
|
<div id="content-wrap">
|
||||||
<div th:insert="~{fragments/navbar.html :: navbar}"></div>
|
<div th:insert="~{fragments/navbar.html :: navbar}"></div>
|
||||||
<br> <br>
|
<br> <br>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row justify-content-center">
|
<div class="row justify-content-center">
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<h2 th:text="#{certSign.header}"></h2>
|
<h2 th:text="#{certSign.header}"></h2>
|
||||||
|
<form action="api/v1/security/cert-sign" method="post" enctype="multipart/form-data">
|
||||||
<form action="api/v1/security/cert-sign" method="post"
|
<div class="mb-3">
|
||||||
enctype="multipart/form-data">
|
<label th:text="#{certSign.selectPDF}"></label>
|
||||||
<div class="mb-3">
|
<div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
|
||||||
<label th:text="#{certSign.selectPDF}"></label>
|
</div>
|
||||||
<div
|
<!-- Tell users to use keytool to generate JKS for other formats -->
|
||||||
th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
|
<div class="mb-3">
|
||||||
</div>
|
<label th:text="#{certSign.jksNote}"></label>
|
||||||
<div class="mb-3">
|
|
||||||
<label for="certType" th:text="#{certSign.certType}"></label> <select
|
|
||||||
class="form-control" id="certType" name="certType">
|
|
||||||
<option value="" th:text="#{selectFillter}"></option>
|
|
||||||
<option value="PKCS12">PKCS12</option>
|
|
||||||
<option value="PEM">PEM</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label for="certType" th:text="#{certSign.certType}"></label> <select class="form-control" id="certType" name="certType">
|
||||||
|
<option value="" th:text="#{selectFillter}"></option>
|
||||||
|
<option value="PEM">PEM</option>
|
||||||
|
<option value="PKCS12">PKCS12</option>
|
||||||
|
<option value="JKS">JKS</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div id="pemGroup" style="display: none;">
|
||||||
|
<div class="mb-3">
|
||||||
|
<label th:text="#{certSign.selectKey}"></label>
|
||||||
|
<div th:replace="~{fragments/common :: fileSelector(name='privateKeyFile', multiple=false, notRequired=true, accept='.pem,.der')}"></div>
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label th:text="#{certSign.selectCert}"></label>
|
||||||
|
<div th:replace="~{fragments/common :: fileSelector(name='certFile', multiple=false, notRequired=true, accept='.pem,.der')}"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="mb-3" id="p12Group" style="display: none;">
|
||||||
|
<label th:text="#{certSign.selectP12}"></label>
|
||||||
|
<div th:replace="~{fragments/common :: fileSelector(name='p12File', notRequired=true, multiple=false, accept='.p12,.pfx')}"></div>
|
||||||
|
</div>
|
||||||
|
<div class="mb-3" id="jksGroup" style="display: none;">
|
||||||
|
<label th:text="#{certSign.selectJKS}"></label>
|
||||||
|
<div th:replace="~{fragments/common :: fileSelector(name='jksFile', notRequired=true, multiple=false, accept='.jks,.keystore')}"></div>
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label th:text="#{certSign.password}"></label> <input type="password" class="form-control" id="password" name="password">
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label><input type="checkbox" id="showSignature" name="showSignature" th:text="#{certSign.showSig}"></label>
|
||||||
|
</div>
|
||||||
|
<div id="signatureDetails" style="display: none;">
|
||||||
|
<div class="mb-3">
|
||||||
|
<label for="reason" th:text="#{certSign.reason}"></label> <input type="text" class="form-control" id="reason" name="reason">
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label for="location" th:text="#{certSign.location}"></label> <input type="text" class="form-control" id="location" name="location">
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label for="name" th:text="#{certSign.name}"></label> <input type="text" class="form-control" id="name" name="name">
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label for="pageNumber" th:text="#{pageNum}"></label> <input type="number" class="form-control" id="pageNumber" name="pageNumber" min="1" disabled>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="mb-3 text-center">
|
||||||
|
<button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{certSign.submit}"></button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div th:insert="~{fragments/footer.html :: footer}"></div>
|
||||||
|
</div>
|
||||||
|
<script type="text/javascript">
|
||||||
|
document
|
||||||
|
.getElementById('certType')
|
||||||
|
.addEventListener(
|
||||||
|
'change',
|
||||||
|
function() {
|
||||||
|
var pemGroup = document.getElementById('pemGroup');
|
||||||
|
var p12Group = document.getElementById('p12Group');
|
||||||
|
var jksGroup = document.getElementById('jksGroup');
|
||||||
|
var valueToGroupMap = {
|
||||||
|
'PEM': pemGroup,
|
||||||
|
'PKCS12': p12Group,
|
||||||
|
'JKS': jksGroup
|
||||||
|
};
|
||||||
|
for (var key in valueToGroupMap) {
|
||||||
|
valueToGroupMap[key].style.display = (this.value === key) ? 'block' : 'none';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
<div class="mb-3" id="p12Group" style="display: none;">
|
document
|
||||||
<label th:text="#{certSign.selectP12}"></label>
|
.getElementById('showSignature')
|
||||||
<div
|
.addEventListener(
|
||||||
th:replace="~{fragments/common :: fileSelector(name='p12File', notRequired=true, multiple=false, accept='.p12,.pfx')}"></div>
|
'change',
|
||||||
</div>
|
function() {
|
||||||
|
var signatureDetails = document.getElementById('signatureDetails');
|
||||||
<div id="pemGroup" style="display: none;">
|
if (this.checked) {
|
||||||
<div class="mb-3">
|
signatureDetails.style.display = 'block';
|
||||||
<label th:text="#{certSign.selectKey}"></label>
|
} else {
|
||||||
<div
|
signatureDetails.style.display = 'none';
|
||||||
th:replace="~{fragments/common :: fileSelector(name='privateKeyFile', multiple=false, notRequired=true, accept='.pem,.der')}"></div>
|
}
|
||||||
</div>
|
});
|
||||||
<div class="mb-3">
|
</script>
|
||||||
<label th:text="#{certSign.selectCert}"></label>
|
|
||||||
<div
|
|
||||||
th:replace="~{fragments/common :: fileSelector(name='certFile', multiple=false, notRequired=true, accept='.pem,.der')}"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mb-3">
|
|
||||||
<label th:text="#{certSign.password}"></label> <input
|
|
||||||
type="password" class="form-control" id="password"
|
|
||||||
name="password">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mb-3">
|
|
||||||
<label><input type="checkbox" id="showSignature"
|
|
||||||
name="showSignature" th:text="#{certSign.showSig}"></label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="signatureDetails" style="display: none;">
|
|
||||||
<div class="mb-3">
|
|
||||||
<label for="reason" th:text="#{certSign.reason}"></label> <input type="text"
|
|
||||||
class="form-control" id="reason" name="reason">
|
|
||||||
</div>
|
|
||||||
<div class="mb-3">
|
|
||||||
<label for="location" th:text="#{certSign.location}"></label> <input type="text"
|
|
||||||
class="form-control" id="location" name="location">
|
|
||||||
</div>
|
|
||||||
<div class="mb-3">
|
|
||||||
<label for="name" th:text="#{certSign.name}"></label> <input type="text"
|
|
||||||
class="form-control" id="name" name="name">
|
|
||||||
</div>
|
|
||||||
<div class="mb-3">
|
|
||||||
<label for="pageNumber" th:text="#{pageNum}"></label> <input
|
|
||||||
type="number" class="form-control" id="pageNumber"
|
|
||||||
name="pageNumber" min="1">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
document
|
|
||||||
.getElementById('certType')
|
|
||||||
.addEventListener(
|
|
||||||
'change',
|
|
||||||
function() {
|
|
||||||
var p12Group = document
|
|
||||||
.getElementById('p12Group');
|
|
||||||
var pemGroup = document
|
|
||||||
.getElementById('pemGroup');
|
|
||||||
if (this.value === 'PKCS12') {
|
|
||||||
p12Group.style.display = 'block';
|
|
||||||
pemGroup.style.display = 'none';
|
|
||||||
} else if (this.value === 'PEM') {
|
|
||||||
p12Group.style.display = 'none';
|
|
||||||
pemGroup.style.display = 'block';
|
|
||||||
} else {
|
|
||||||
p12Group.style.display = 'none';
|
|
||||||
pemGroup.style.display = 'none';
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
document
|
|
||||||
.getElementById('showSignature')
|
|
||||||
.addEventListener(
|
|
||||||
'change',
|
|
||||||
function() {
|
|
||||||
var signatureDetails = document
|
|
||||||
.getElementById('signatureDetails');
|
|
||||||
if (this.checked) {
|
|
||||||
signatureDetails.style.display = 'block';
|
|
||||||
} else {
|
|
||||||
signatureDetails.style.display = 'none';
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="mb-3 text-center">
|
|
||||||
<button type="submit" id="submitBtn" class="btn btn-primary"
|
|
||||||
th:text="#{certSign.submit}"></button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div th:insert="~{fragments/footer.html :: footer}"></div>
|
|
||||||
</div>
|
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue