Include o,ou in certificate, add AVA escaping

[gigi.git] / src / org / cacert / gigi / pages / account / certs / Certificates.java

diff --git a/src/org/cacert/gigi/pages/account/certs/Certificates.java b/src/org/cacert/gigi/pages/account/certs/Certificates.java
index 423ec72dd9cdad9d3c29259ea26373c4529460ad..ac2289f342de24c01a9b1cb9be899e15d0b07b07 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/Certificates.java
+++ b/src/org/cacert/gigi/pages/account/certs/Certificates.java
@@ -5,7 +5,6 @@ import java.io.PrintWriter;
 import java.net.URLEncoder;
 import java.security.GeneralSecurityException;
 import java.security.cert.X509Certificate;
-import java.sql.SQLException;
 import java.util.HashMap;
 
 import javax.servlet.ServletOutputStream;
@@ -57,7 +56,7 @@ public class Certificates extends Page {
         String serial = pi;
         try {
             Certificate c = Certificate.getBySerial(serial);
-            if (c == null || getUser(req).getId() != c.getOwnerId()) {
+            if (c == null || getUser(req).getId() != c.getOwner().getId()) {
                 resp.sendError(404);
                 return true;
             }
@@ -77,9 +76,6 @@ public class Certificates extends Page {
         } catch (GeneralSecurityException e) {
             resp.sendError(404);
             return true;
-        } catch (SQLException e) {
-            resp.sendError(404);
-            return true;
         }
 
         return true;
@@ -96,7 +92,7 @@ public class Certificates extends Page {
 
             String serial = pi;
             Certificate c = Certificate.getBySerial(serial);
-            if (c == null || LoginPage.getUser(req).getId() != c.getOwnerId()) {
+            if (c == null || LoginPage.getUser(req).getId() != c.getOwner().getId()) {
                 resp.sendError(404);
                 return;
             }
@@ -106,8 +102,6 @@ public class Certificates extends Page {
                 vars.put("cert", c.cert());
             } catch (GeneralSecurityException e) {
                 e.printStackTrace();
-            } catch (SQLException e) {
-                e.printStackTrace();
             }
             certDisplay.output(out, getLanguage(req), vars);