chg: add appName to filename for root certificate download

[gigi.git] / src / club / wpia / gigi / pages / RootCertPage.java

diff --git a/src/club/wpia/gigi/pages/RootCertPage.java b/src/club/wpia/gigi/pages/RootCertPage.java
index 9d1d9c90eff4ec01f5f7ba1fc22adac68048a25e..25c024138093310a7173d0a4236bece2b3c321b6 100644 (file)
--- a/src/club/wpia/gigi/pages/RootCertPage.java
+++ b/src/club/wpia/gigi/pages/RootCertPage.java
@@ -21,6 +21,7 @@ import club.wpia.gigi.localisation.Language;
 import club.wpia.gigi.output.template.Outputable;
 import club.wpia.gigi.util.HTMLEncoder;
 import club.wpia.gigi.util.PEM;
 import club.wpia.gigi.output.template.Outputable;
 import club.wpia.gigi.util.HTMLEncoder;
 import club.wpia.gigi.util.PEM;

+import club.wpia.gigi.util.ServerConstants;

 
 public class RootCertPage extends Page {
 
 
 public class RootCertPage extends Page {
 


@@ -30,6 +31,8 @@ public class RootCertPage extends Page {
 
     private final OutputableCertificate rootP;
 
 
     private final OutputableCertificate rootP;
 

+    private final String appName = ServerConstants.getAppName().toLowerCase();
+

     private class OutputableCertificate implements Outputable {
 
         private final CACertificate target;
     private class OutputableCertificate implements Outputable {
 
         private final CACertificate target;


@@ -97,6 +100,7 @@ public class RootCertPage extends Page {
     public boolean beforeTemplate(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         if (req.getParameter("pem") != null && root != null) {
             resp.setContentType("application/x-x509-ca-cert");
     public boolean beforeTemplate(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         if (req.getParameter("pem") != null && root != null) {
             resp.setContentType("application/x-x509-ca-cert");

+            resp.setHeader("Content-Disposition", "attachment; filename=\"" + appName + "_roots.crt\"");

             ServletOutputStream out = resp.getOutputStream();
             try {
                 out.println(PEM.encode("CERTIFICATE", root.getEncoded()));
             ServletOutputStream out = resp.getOutputStream();
             try {
                 out.println(PEM.encode("CERTIFICATE", root.getEncoded()));


@@ -106,6 +110,7 @@ public class RootCertPage extends Page {
             return true;
         } else if (req.getParameter("cer") != null && root != null) {
             resp.setContentType("application/x-x509-ca-cert");
             return true;
         } else if (req.getParameter("cer") != null && root != null) {
             resp.setContentType("application/x-x509-ca-cert");

+            resp.setHeader("Content-Disposition", "attachment; filename=\"" + appName + "_roots.cer\"");

             ServletOutputStream out = resp.getOutputStream();
             try {
                 out.write(root.getEncoded());
             ServletOutputStream out = resp.getOutputStream();
             try {
                 out.write(root.getEncoded());