Skip to content
Snippets Groups Projects
Commit c9b7b2bc authored by Felix Sidokhine's avatar Felix Sidokhine
Browse files

removed a useless class

parent b450bc08
Branches
No related tags found
No related merge requests found
...@@ -18,6 +18,7 @@ import org.bouncycastle.cert.ocsp.OCSPResp; ...@@ -18,6 +18,7 @@ import org.bouncycastle.cert.ocsp.OCSPResp;
import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jce.provider.BouncyCastleProvider;
import java.security.Security; import java.security.Security;
import java.util.Base64;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
@Slf4j @Slf4j
...@@ -86,6 +87,17 @@ public class JamsCA implements CertificateAuthority { ...@@ -86,6 +87,17 @@ public class JamsCA implements CertificateAuthority {
return crlWorker.getExistingCRL(); return crlWorker.getExistingCRL();
} }
@Override
public String getLatestCRLPEMEncoded() {
try {
return Base64.getEncoder().encodeToString(getLatestCRL().get().getEncoded());
}
catch (Exception e){
log.error("Could not return a valid CRL!");
return null;
}
}
@Override @Override
public OCSPResp getOCSPResponse(OCSPReq ocspRequest) { public OCSPResp getOCSPResponse(OCSPReq ocspRequest) {
return null; return null;
......
...@@ -18,5 +18,7 @@ public interface CertificateAuthority { ...@@ -18,5 +18,7 @@ public interface CertificateAuthority {
SystemAccount getSignedCertificate(SystemAccount systemAccount); SystemAccount getSignedCertificate(SystemAccount systemAccount);
void revokeCertificate(RevocationRequest revocationRequest); void revokeCertificate(RevocationRequest revocationRequest);
AtomicReference<X509CRLHolder> getLatestCRL(); AtomicReference<X509CRLHolder> getLatestCRL();
String getLatestCRLPEMEncoded();
OCSPResp getOCSPResponse(OCSPReq ocspRequest); OCSPResp getOCSPResponse(OCSPReq ocspRequest);
} }
...@@ -17,4 +17,5 @@ module jams.server { ...@@ -17,4 +17,5 @@ module jams.server {
exports net.jami.jams.server.servlets.api.auth.device to org.apache.tomcat.embed.core; exports net.jami.jams.server.servlets.api.auth.device to org.apache.tomcat.embed.core;
exports net.jami.jams.server.servlets.api.install to org.apache.tomcat.embed.core; exports net.jami.jams.server.servlets.api.install to org.apache.tomcat.embed.core;
exports net.jami.jams.server.servlets.api.jaminameserver to org.apache.tomcat.embed.core; exports net.jami.jams.server.servlets.api.jaminameserver to org.apache.tomcat.embed.core;
exports net.jami.jams.server.servlets.x509 to org.apache.tomcat.embed.core;
} }
\ No newline at end of file
package net.jami.jams.server.core.utils;
import jakarta.servlet.http.HttpServletResponse;
public class ResponseBuilder {
public void buildResponse(Integer status, String body, HttpServletResponse resp) throws Exception{
resp.setStatus(status);
resp.getOutputStream().write(body.getBytes());
}
}
...@@ -22,7 +22,7 @@ public class CRLServlet extends HttpServlet { ...@@ -22,7 +22,7 @@ public class CRLServlet extends HttpServlet {
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(CRL_HEAD); stringBuilder.append(CRL_HEAD);
stringBuilder.append(Base64.getEncoder().encodeToString(certificateAuthority.getLatestCRL().get().getEncoded())); stringBuilder.append(certificateAuthority.getLatestCRLPEMEncoded());
stringBuilder.append(CRL_TAIL); stringBuilder.append(CRL_TAIL);
resp.getOutputStream().write(stringBuilder.toString().getBytes()); resp.getOutputStream().write(stringBuilder.toString().getBytes());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment